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 +-
 phpBB/memberlist.php                      |   7 +-
 phpBB/viewtopic.php                       |   4 +-
 11 files changed, 198 insertions(+), 32 deletions(-)
 create mode 100644 phpBB/includes/avatars/avatar_base.php

(limited to 'phpBB')

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'),
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 741ac2f430..a2bac28be3 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -554,7 +554,7 @@ switch ($mode)
 			$member['user_sig'] = smiley_text($member['user_sig']);
 		}
 
-		$poster_avatar = get_user_avatar($member['user_avatar'], $member['user_avatar_type'], $member['user_avatar_width'], $member['user_avatar_height']);
+		$poster_avatar = get_user_avatar($member);
 
 		// We need to check if the modules 'zebra' ('friends' & 'foes' mode),  'notes' ('user_notes' mode) and  'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links
 		$zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false;
@@ -1219,8 +1219,7 @@ switch ($mode)
 				break;
 			}
 
-			// Misusing the avatar function for displaying group avatars...
-			$avatar_img = get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR');
+			$avatar_img = get_group_avatar($group_row);
 
 			$rank_title = $rank_img = $rank_img_src = '';
 			if ($group_row['group_rank'])
@@ -1716,7 +1715,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 
 		'A_USERNAME'		=> addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])),
 
-		'AVATAR_IMG'		=> get_user_avatar($data['user_avatar'], $data['user_avatar_type'], $data['user_avatar_width'], $data['user_avatar_height']),
+		'AVATAR_IMG'		=> get_user_avatar($data),
 		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
 		'S_ONLINE'			=> ($config['load_onlinetrack'] && $online) ? true : false,
 		'RANK_IMG'			=> $rank_img,
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 7cb6df3660..4ad80210f8 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1055,7 +1055,7 @@ while ($row = $db->sql_fetchrow($result))
 				'sig_bbcode_bitfield'	=> '',
 
 				'online'			=> false,
-				'avatar'			=> ($user->optionget('viewavatars')) ? get_user_avatar($row['user_avatar'], $row['user_avatar_type'], $row['user_avatar_width'], $row['user_avatar_height']) : '',
+				'avatar'			=> ($user->optionget('viewavatars')) ? get_user_avatar($row) : '',
 				'rank_title'		=> '',
 				'rank_image'		=> '',
 				'rank_image_src'	=> '',
@@ -1107,7 +1107,7 @@ while ($row = $db->sql_fetchrow($result))
 				'viewonline'	=> $row['user_allow_viewonline'],
 				'allow_pm'		=> $row['user_allow_pm'],
 
-				'avatar'		=> ($user->optionget('viewavatars')) ? get_user_avatar($row['user_avatar'], $row['user_avatar_type'], $row['user_avatar_width'], $row['user_avatar_height']) : '',
+				'avatar'		=> ($user->optionget('viewavatars')) ? get_user_avatar($row) : '',
 				'age'			=> '',
 
 				'rank_title'		=> '',
-- 
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')

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')

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')

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 +++++++++++++--------
 .../prosilver/template/ucp_avatar_options.html     |  63 ++++--------
 .../template/ucp_avatar_options_local.html         |  14 +++
 .../template/ucp_avatar_options_remote.html        |   4 +
 .../template/ucp_avatar_options_upload.html        |  11 +++
 .../prosilver/template/ucp_profile_avatar.html     |  10 +-
 11 files changed, 262 insertions(+), 91 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/ucp_avatar_options_local.html
 create mode 100644 phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
 create mode 100644 phpBB/styles/prosilver/template/ucp_avatar_options_upload.html

(limited to 'phpBB')

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)
 					);
 				}
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 7012c42f3b..680267bb10 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -7,31 +7,12 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-
-	<!-- IF S_UPLOAD_AVATAR_FILE -->
-		<dl>
-			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-			<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_UPLOAD_AVATAR_URL -->
-		<dl>
-			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-			<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_LINK_AVATAR -->
 		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input type="text" name="remotelink" id="remotelink" value="{AVATAR_REMOTE}" class="inputbox" /></dd>
+			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
+			<!-- IF AVATAR && S_AVATARS_ENABLED --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
 		</dl>
+		<!-- IF S_AVATARS_ENABLED -->
 		<dl>
 			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 			<dd>
@@ -39,32 +20,26 @@
 				<label for="height"><input type="text" name="height" id="height" size="3" value="{AVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 			</dd>
 		</dl>
-	<!-- ENDIF -->
+		<!-- ENDIF -->
 	</fieldset>
 
-	<!-- IF S_IN_AVATAR_GALLERY -->
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_AVATAR_GALLERY}</h3>
+<!-- BEGIN avatar_drivers -->
+	<h3>{avatar_drivers.L_TITLE}</h3>
+	<p>{avatar_drivers.L_EXPLAIN}</p>
 
-		<fieldset>
-			<label for="category">{L_AVATAR_CATEGORY}: <select name="category" id="category">{S_CAT_OPTIONS}</select></label>
-			<input type="submit" value="{L_GO}" name="display_gallery" class="button2" />
-			<input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />
-		</fieldset>
-
-		<div id="gallery">
-		<!-- BEGIN avatar_row --><!-- BEGIN avatar_column -->
-			<label for="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="" /><br />
-				<input type="radio" name="avatar_select" id="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}" value="{avatar_row.avatar_column.AVATAR_FILE}" /></label>
-		<!-- END avatar_column --><!-- END avatar_row -->
-		</div>
+	<fieldset>
+	{avatar_drivers.OUTPUT}
+	</fieldset>
+	<fieldset class="submit-buttons">
+		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
+		<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
+	</fieldset>
+<!-- END avatar_drivers -->
 
+	<fieldset>
+	<!-- IF S_LINK_AVATAR -->
 	<!-- ENDIF -->
+	</fieldset>
 
 	<span class="corners-bottom"><span></span></span></div>
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
new file mode 100644
index 0000000000..2644397e0d
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -0,0 +1,14 @@
+<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
+<option value="">{L_NO_AVATAR_CATEGORY}</option>
+<!-- BEGIN av_local_cats -->
+<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
+<!-- END av_local_cats -->
+</select></label>
+<input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
+
+<div id="gallery">
+<!-- BEGIN av_local_imgs -->
+	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="avatar_select" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
+<!-- END av_local_imgs -->
+</div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
new file mode 100644
index 0000000000..70869086a9
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -0,0 +1,4 @@
+<dl>
+	<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="remotelink" id="remotelink" value="" class="inputbox" /></dd>
+</dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
new file mode 100644
index 0000000000..9caab72444
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
+</dl>
+
+<!-- IF S_UPLOAD_AVATAR_URL -->
+	<dl>
+		<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
+	</dl>
+<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_avatar.html b/phpBB/styles/prosilver/template/ucp_profile_avatar.html
index a25c43a588..8157d8c15b 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_avatar.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_avatar.html
@@ -6,14 +6,8 @@
 
 <!-- INCLUDE ucp_avatar_options.html -->
 
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}
-	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />&nbsp; <!-- ENDIF -->
-	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />&nbsp; <!-- ELSE -->
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; <!-- ENDIF -->
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
+{S_HIDDEN_FIELDS}
+{S_FORM_TOKEN}
 </form>
 
 <!-- INCLUDE ucp_footer.html -->
-- 
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')

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 +++++-------
 .../prosilver/template/ucp_avatar_options.html     |   9 --
 .../template/ucp_avatar_options_local.html         |   2 +-
 .../template/ucp_avatar_options_remote.html        |  11 ++-
 .../template/ucp_avatar_options_upload.html        |   8 +-
 9 files changed, 165 insertions(+), 64 deletions(-)

(limited to 'phpBB')

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;
 		}
 
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 680267bb10..e30fcc74aa 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -12,15 +12,6 @@
 			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
 			<!-- IF AVATAR && S_AVATARS_ENABLED --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
 		</dl>
-		<!-- IF S_AVATARS_ENABLED -->
-		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-			<dd>
-				<label for="width"><input type="text" name="width" id="width" size="3" value="{AVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-				<label for="height"><input type="text" name="height" id="height" size="3" value="{AVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
-			</dd>
-		</dl>
-		<!-- ENDIF -->
 	</fieldset>
 
 <!-- BEGIN avatar_drivers -->
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 2644397e0d..0dd83db017 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -9,6 +9,6 @@
 <div id="gallery">
 <!-- BEGIN av_local_imgs -->
 	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="avatar_select" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
+	<input type="radio" name="av_local_file" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
 <!-- END av_local_imgs -->
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index 70869086a9..4e62e96d9d 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -1,4 +1,11 @@
 <dl>
-	<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="text" name="remotelink" id="remotelink" value="" class="inputbox" /></dd>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
+</dl>
+<dl>
+	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dd>
+		<label for="width"><input type="text" name="width" id="width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="height"><input type="text" name="height" id="height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
 </dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
index 9caab72444..9c8dd9af01 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
-- 
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 ++++++++++++----------
 .../template/ucp_avatar_options_remote.html        |  4 ++--
 3 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'phpBB')

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;
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index 4e62e96d9d..02704c5be8 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="width"><input type="text" name="width" id="width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="height"><input type="text" name="height" id="height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>
-- 
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')

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')

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/adm/style/acp_avatar_options_local.html      | 14 ++++
 phpBB/adm/style/acp_avatar_options_remote.html     | 11 +++
 phpBB/adm/style/acp_avatar_options_upload.html     | 11 +++
 phpBB/adm/style/acp_users_avatar.html              | 85 ++++------------------
 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 +++++++++
 .../prosilver/template/ucp_avatar_options.html     |  7 +-
 11 files changed, 129 insertions(+), 80 deletions(-)
 create mode 100644 phpBB/adm/style/acp_avatar_options_local.html
 create mode 100644 phpBB/adm/style/acp_avatar_options_remote.html
 create mode 100644 phpBB/adm/style/acp_avatar_options_upload.html

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
new file mode 100644
index 0000000000..0dd83db017
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -0,0 +1,14 @@
+<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
+<option value="">{L_NO_AVATAR_CATEGORY}</option>
+<!-- BEGIN av_local_cats -->
+<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
+<!-- END av_local_cats -->
+</select></label>
+<input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
+
+<div id="gallery">
+<!-- BEGIN av_local_imgs -->
+	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="av_local_file" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
+<!-- END av_local_imgs -->
+</div>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
new file mode 100644
index 0000000000..02704c5be8
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
+</dl>
+<dl>
+	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dd>
+		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
+</dl>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
new file mode 100644
index 0000000000..9c8dd9af01
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
+</dl>
+
+<!-- IF S_UPLOAD_AVATAR_URL -->
+	<dl>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
+	</dl>
+<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 35d8374237..3d6754830b 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -1,78 +1,23 @@
-	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+	<form id="avatar_settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">
 
 	<fieldset>
 		<legend>{L_ACP_USER_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_UPLOAD_FILE -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_REMOTE_UPLOAD -->
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_REMOTE -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
+	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
+			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
+			<!-- IF AVATAR --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
 		</dl>
+	</fieldset>
+	<!-- BEGIN avatar_drivers -->
+		<fieldset>
+			<legend>{avatar_drivers.L_TITLE}</legend>
+			<p>{avatar_drivers.L_EXPLAIN}</p>
+			{avatar_drivers.OUTPUT}
 		</fieldset>
-		
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		<fieldset class="quick">
+			<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
+			<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
 		</fieldset>
-	
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	
+	<!-- END avatar_drivers -->
 	</form>
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);
 
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index e30fcc74aa..f05e96410d 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -10,7 +10,7 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-			<!-- IF AVATAR && S_AVATARS_ENABLED --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
+			<!-- IF AVATAR && S_AVATARS_ENABLED --><dd><input type="submit" name="av_delete" id="av_delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
 		</dl>
 	</fieldset>
 
@@ -27,10 +27,5 @@
 	</fieldset>
 <!-- END avatar_drivers -->
 
-	<fieldset>
-	<!-- IF S_LINK_AVATAR -->
-	<!-- ENDIF -->
-	</fieldset>
-
 	<span class="corners-bottom"><span></span></span></div>
 </div>
-- 
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')

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/adm/style/acp_users_avatar.html |   6 +-
 phpBB/includes/acp/acp_users.php      | 136 +++++++++++++++++++++++-----------
 phpBB/includes/ucp/ucp_profile.php    |   9 ++-
 3 files changed, 103 insertions(+), 48 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 3d6754830b..c0ec9e5f8c 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -5,8 +5,8 @@
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-			<!-- IF AVATAR --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
+			<dd>{AVATAR}</dd>
+			<!-- IF AV_SHOW_DELETE --><dd><input type="submit" name="av_delete" id="av_delete" value="{LA_DELETE_AVATAR}" class="button2" /></dd><!-- ENDIF -->
 		</dl>
 	</fieldset>
 	<!-- BEGIN avatar_drivers -->
@@ -16,8 +16,8 @@
 			{avatar_drivers.OUTPUT}
 		</fieldset>
 		<fieldset class="quick">
-			<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
 			<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
 		</fieldset>
 	<!-- END avatar_drivers -->
+	{S_FORM_TOKEN}
 	</form>
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 +++++++++++++++-------
 .../prosilver/template/ucp_avatar_options.html     | 49 +++++++++++++--
 3 files changed, 94 insertions(+), 26 deletions(-)

(limited to 'phpBB')

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'),
 								));
 							}
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index f05e96410d..eb78e9f77c 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -10,22 +10,61 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-			<!-- IF AVATAR && S_AVATARS_ENABLED --><dd><input type="submit" name="av_delete" id="av_delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
 		</dl>
 	</fieldset>
-
+	<h3>{L_AVATAR_SELECT_NEW}</h3>
+	<fieldset>
+		<dl>
+			<dt><label>{L_AVATAR_TYPE}</label></dt>
+			<dd><select name="avatar_driver" id="avatar_driver">
+				<option value="">{L_NO_AVATAR}</option>
+				<!-- BEGIN avatar_drivers -->
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<!-- END avatar_drivers -->
+			</select></dd>
+	</fieldset>
+	<div id="av_options">
 <!-- BEGIN avatar_drivers -->
-	<h3>{avatar_drivers.L_TITLE}</h3>
+	<div id="av_option_{avatar_drivers.DRIVER}">
+	<noscript>
+	<h3 class="avatar_section_header">{avatar_drivers.L_TITLE}</h3>
+	</noscript>
 	<p>{avatar_drivers.L_EXPLAIN}</p>
 
 	<fieldset>
 	{avatar_drivers.OUTPUT}
 	</fieldset>
+	</div>
+<!-- END avatar_drivers -->
+	</div>
 	<fieldset class="submit-buttons">
 		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
-		<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
-<!-- END avatar_drivers -->
+
+	<script type="text/javascript">
+		// <![CDATA[
+			function avatar_simplify() {
+				var node = document.getElementById('av_options');
+				for (var i = 0; i < node.children.length; i++) {
+					child = node.children[i];
+					child.style.display = 'none';
+				}
+
+				var selected = document.getElementById('avatar_driver').value;
+				var id = 'av_option_' + selected;
+				node = document.getElementById(id);
+				if (node != null) {
+					node.style.display = 'block';
+				}
+			}
+
+			avatar_simplify();
+			document.getElementById('avatar_driver').onchange = avatar_simplify;
+		// ]]>
+	</script>
 
 	<span class="corners-bottom"><span></span></span></div>
 </div>
+<script type="text/javascript">
+</script>
-- 
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/adm/style/acp_users_avatar.html | 56 ++++++++++++++++++-----
 phpBB/includes/acp/acp_users.php      | 84 ++++++++++++++++++-----------------
 phpBB/includes/avatar/driver.php      |  2 +-
 phpBB/includes/ucp/ucp_profile.php    | 31 ++-----------
 4 files changed, 92 insertions(+), 81 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index c0ec9e5f8c..6316ff4a22 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -6,18 +6,52 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
-			<!-- IF AV_SHOW_DELETE --><dd><input type="submit" name="av_delete" id="av_delete" value="{LA_DELETE_AVATAR}" class="button2" /></dd><!-- ENDIF -->
 		</dl>
 	</fieldset>
-	<!-- BEGIN avatar_drivers -->
-		<fieldset>
-			<legend>{avatar_drivers.L_TITLE}</legend>
-			<p>{avatar_drivers.L_EXPLAIN}</p>
-			{avatar_drivers.OUTPUT}
-		</fieldset>
-		<fieldset class="quick">
-			<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
-		</fieldset>
-	<!-- END avatar_drivers -->
+	<fieldset>
+		<legend>{L_AVATAR_SELECT_NEW}</legend>
+		<dl>
+			<dt><label>{L_AVATAR_TYPE}</label></dt>
+			<dd><select name="avatar_driver" id="avatar_driver">
+				<option value="">{L_NO_AVATAR}</option>
+				<!-- BEGIN avatar_drivers -->
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<!-- END avatar_drivers -->
+			</select></dd>
+		</dl>
+		<div id="av_options">
+		<!-- BEGIN avatar_drivers -->
+			<div id="av_option_{avatar_drivers.DRIVER}">
+				<p>{avatar_drivers.L_EXPLAIN}</p>
+				{avatar_drivers.OUTPUT}
+			</div>
+		<!-- END avatar_drivers -->
+		</div>
+	</fieldset>
+	<script type="text/javascript">
+		// <![CDATA[
+			function avatar_simplify() {
+				var node = document.getElementById('av_options');
+				for (var i = 0; i < node.children.length; i++) {
+					child = node.children[i];
+					child.style.display = 'none';
+				}
+
+				var selected = document.getElementById('avatar_driver').value;
+				var id = 'av_option_' + selected;
+				node = document.getElementById(id);
+				if (node != null) {
+					node.style.display = 'block';
+				}
+			}
+
+			avatar_simplify();
+			document.getElementById('avatar_driver').onchange = avatar_simplify;
+		// ]]>
+	</script>
+
+	<fieldset class="quick">
+		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+	</fieldset>
 	{S_FORM_TOKEN}
 	</form>
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')

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/adm/style/acp_avatar_options_local.html      | 39 ++++++++++++++--------
 phpBB/includes/acp/acp_users.php                   | 14 ++++++--
 phpBB/includes/avatar/driver/local.php             | 32 ++++++++++++++----
 .../template/ucp_avatar_options_local.html         | 10 +++---
 4 files changed, 68 insertions(+), 27 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 0dd83db017..0a50a4eed4 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,14 +1,25 @@
-<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
-<option value="">{L_NO_AVATAR_CATEGORY}</option>
-<!-- BEGIN av_local_cats -->
-<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
-<!-- END av_local_cats -->
-</select></label>
-<input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
-
-<div id="gallery">
-<!-- BEGIN av_local_imgs -->
-	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="av_local_file" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
-<!-- END av_local_imgs -->
-</div>
+<dl>
+	<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+	<dd><select name="av_local_cat" id="category">
+		<option value="">{L_NO_AVATAR_CATEGORY}</option>
+		<!-- BEGIN av_local_cats -->
+		<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
+		<!-- END av_local_cats -->
+	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
+</dl>
+<dl>
+	<table cellspacing="1">
+	<!-- BEGIN av_local_row -->
+	<tr>
+		<!-- BEGIN av_local_col -->
+			<td class="row1" style="text-align: center;"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="{av_local_row.av_local_col.AVATAR_NAME}" title="{av_local_row.av_local_col.AVATAR_NAME}"/></td>
+		<!-- END av_local_col -->
+	</tr>
+	<tr>
+		<!-- BEGIN av_local_col -->
+			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></td>
+		<!-- END av_local_col -->
+	</tr>
+	<!-- END av_local_row -->
+	</table>
+</dl>
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;
 			}
 		}
 
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 0dd83db017..9f726e2ff9 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -7,8 +7,10 @@
 <input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
 
 <div id="gallery">
-<!-- BEGIN av_local_imgs -->
-	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="av_local_file" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
-<!-- END av_local_imgs -->
+<!-- BEGIN av_local_row -->
+<!-- BEGIN av_local_col -->
+	<label for="av-{av_local_row.av_local_col.S_ROW_COUNT}"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></label>
+<!-- END av_local_col -->
+<!-- END av_local_row -->
 </div>
-- 
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/adm/style/acp_avatar_options_local.html |   2 +
 phpBB/adm/style/acp_groups.html               |  98 ++++++--------
 phpBB/includes/acp/acp_groups.php             | 180 +++++++++++++-------------
 phpBB/includes/acp/acp_users.php              |   1 -
 phpBB/includes/avatar/driver/local.php        |   4 +
 5 files changed, 137 insertions(+), 148 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 0a50a4eed4..d762fa9008 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -8,6 +8,7 @@
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
 </dl>
 <dl>
+	<!-- IF AV_LOCAL_SHOW -->
 	<table cellspacing="1">
 	<!-- BEGIN av_local_row -->
 	<tr>
@@ -22,4 +23,5 @@
 	</tr>
 	<!-- END av_local_row -->
 	</table>
+	<!-- ENDIF -->
 </dl>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 158751623a..1c78c0c344 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -104,66 +104,46 @@
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
+		<dd>{AVATAR}</dd>
 	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
-			<dl>
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
-		</dl>
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl>
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr>
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</dl>
-		</fieldset>
-
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-		</fieldset>
-
-	<!-- ENDIF -->
+	<dl>
+		<dt><label>{L_AVATAR_TYPE}</label></dt>
+		<dd><select name="avatar_driver" id="avatar_driver">
+			<option value="">{L_NO_AVATAR}</option>
+			<!-- BEGIN avatar_drivers -->
+			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+			<!-- END avatar_drivers -->
+		</select></dd>
+	</dl>
+	<div id="av_options">
+	<!-- BEGIN avatar_drivers -->
+	<div id="av_option_{avatar_drivers.DRIVER}">
+		<p>{avatar_drivers.L_EXPLAIN}</p>
+		{avatar_drivers.OUTPUT}
+	</div>
+	<!-- END avatar_drivers -->
+	</div>
+	<script type="text/javascript">
+		// <![CDATA[
+			function avatar_simplify() {
+				var node = document.getElementById('av_options');
+				for (var i = 0; i < node.children.length; i++) {
+					child = node.children[i];
+					child.style.display = 'none';
+				}
+
+				var selected = document.getElementById('avatar_driver').value;
+				var id = 'av_option_' + selected;
+				node = document.getElementById(id);
+				if (node != null) {
+					node.style.display = 'block';
+				}
+			}
+
+			avatar_simplify();
+			document.getElementById('avatar_driver').onchange = avatar_simplify;
+		// ]]>
+	</script>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
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 3963b39634225a68687cf1b817a47ae1eeb6ac79 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Mon, 4 Jul 2011 17:19:18 -0700
Subject: [feature/avatars] Making schema changes for db tables

These schema changes make manual column chaning uncessesary.

PHPBB3-10018
---
 phpBB/install/database_update.php         | 4 ++++
 phpBB/install/schemas/firebird_schema.sql | 4 ++--
 phpBB/install/schemas/mssql_schema.sql    | 4 ++--
 phpBB/install/schemas/mysql_40_schema.sql | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 843e8c2f23..ba6d5d34e2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1092,6 +1092,10 @@ function database_update_info()
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
 					'group_legend'		=> array('UINT', 0),
+					'group_avatar_type'		=> array('VCHAR:32', 0),
+				),
+				USERS_TABLE		=> array(
+					'user_avatar_type'		=> array('VCHAR:32', 0),
 				),
 			),
 			'drop_columns'      => array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index daeba45864..8b5bc90afa 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -445,7 +445,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_display INTEGER DEFAULT 0 NOT NULL,
 	group_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	group_avatar_type INTEGER DEFAULT 0 NOT NULL,
+	group_avatar_type VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_avatar_width INTEGER DEFAULT 0 NOT NULL,
 	group_avatar_height INTEGER DEFAULT 0 NOT NULL,
 	group_rank INTEGER DEFAULT 0 NOT NULL,
@@ -1317,7 +1317,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail INTEGER DEFAULT 1 NOT NULL,
 	user_options INTEGER DEFAULT 230271 NOT NULL,
 	user_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	user_avatar_type INTEGER DEFAULT 0 NOT NULL,
+	user_avatar_type VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	user_avatar_width INTEGER DEFAULT 0 NOT NULL,
 	user_avatar_height INTEGER DEFAULT 0 NOT NULL,
 	user_sig BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 736917fdcb..65ef420877 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -553,7 +553,7 @@ CREATE TABLE [phpbb_groups] (
 	[group_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[group_display] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[group_avatar_type] [int] DEFAULT (0) NOT NULL ,
+	[group_avatar_type] [varchar] (32) DEFAULT ('') NOT NULL ,
 	[group_avatar_width] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar_height] [int] DEFAULT (0) NOT NULL ,
 	[group_rank] [int] DEFAULT (0) NOT NULL ,
@@ -1603,7 +1603,7 @@ CREATE TABLE [phpbb_users] (
 	[user_allow_massemail] [int] DEFAULT (1) NOT NULL ,
 	[user_options] [int] DEFAULT (230271) NOT NULL ,
 	[user_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[user_avatar_type] [int] DEFAULT (0) NOT NULL ,
+	[user_avatar_type] [varchar] (32) DEFAULT ('') NOT NULL ,
 	[user_avatar_width] [int] DEFAULT (0) NOT NULL ,
 	[user_avatar_height] [int] DEFAULT (0) NOT NULL ,
 	[user_sig] [text] DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 97c378621b..a41a55494c 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -317,7 +317,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varbinary(8) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varbinary(255) DEFAULT '' NOT NULL,
-	group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
+	group_avatar_type varbinary(32) DEFAULT '' NOT NULL,
 	group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -941,7 +941,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	user_options int(11) UNSIGNED DEFAULT '230271' NOT NULL,
 	user_avatar varbinary(255) DEFAULT '' NOT NULL,
-	user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
+	user_avatar_type varbinary(32) DEFAULT '' NOT NULL,
 	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_sig mediumblob NOT NULL,
-- 
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')

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')

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')

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')

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 e8a9c0ae6d92822699de9a2d7fc1aae9377ade8a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 16:11:06 +0200
Subject: [feature/avatars] Fix avatar_type in create_schema_files

PHPBB3-10018
---
 phpBB/develop/create_schema_files.php     | 4 ++--
 phpBB/install/schemas/mssql_schema.sql    | 2 +-
 phpBB/install/schemas/mysql_41_schema.sql | 4 ++--
 phpBB/install/schemas/oracle_schema.sql   | 4 ++--
 phpBB/install/schemas/postgres_schema.sql | 4 ++--
 phpBB/install/schemas/sqlite_schema.sql   | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 4088657743..6418bb57f0 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1168,7 +1168,7 @@ function get_schema_struct()
 			'group_desc_uid'		=> array('VCHAR:8', ''),
 			'group_display'			=> array('BOOL', 0),
 			'group_avatar'			=> array('VCHAR', ''),
-			'group_avatar_type'		=> array('TINT:2', 0),
+			'group_avatar_type'		=> array('VCHAR:32', ''),
 			'group_avatar_width'	=> array('USINT', 0),
 			'group_avatar_height'	=> array('USINT', 0),
 			'group_rank'			=> array('UINT', 0),
@@ -1821,7 +1821,7 @@ function get_schema_struct()
 			'user_allow_massemail'		=> array('BOOL', 1),
 			'user_options'				=> array('UINT:11', 230271),
 			'user_avatar'				=> array('VCHAR', ''),
-			'user_avatar_type'			=> array('TINT:2', 0),
+			'user_avatar_type'			=> array('VCHAR:32', ''),
 			'user_avatar_width'			=> array('USINT', 0),
 			'user_avatar_height'		=> array('USINT', 0),
 			'user_sig'					=> array('MTEXT_UNI', ''),
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 2cf60e9f02..516b030f5a 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1109,7 +1109,7 @@ CREATE TABLE [phpbb_reports] (
 	[report_closed] [int] DEFAULT (0) NOT NULL ,
 	[report_time] [int] DEFAULT (0) NOT NULL ,
 	[report_text] [text] DEFAULT ('') NOT NULL ,
-	[reported_post_text] [text] DEFAULT ('') NOT NULL
+	[reported_post_text] [text] DEFAULT ('') NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 3fd8d4f1d1..11286e2526 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -317,7 +317,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
-	group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
+	group_avatar_type varchar(32) DEFAULT '' NOT NULL,
 	group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -917,7 +917,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	user_options int(11) UNSIGNED DEFAULT '230271' NOT NULL,
 	user_avatar varchar(255) DEFAULT '' NOT NULL,
-	user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
+	user_avatar_type varchar(32) DEFAULT '' NOT NULL,
 	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_sig mediumtext NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8a0f3e56b1..3bc6a853ca 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -610,7 +610,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar2(8) DEFAULT '' ,
 	group_display number(1) DEFAULT '0' NOT NULL,
 	group_avatar varchar2(255) DEFAULT '' ,
-	group_avatar_type number(2) DEFAULT '0' NOT NULL,
+	group_avatar_type varchar2(32) DEFAULT '' ,
 	group_avatar_width number(4) DEFAULT '0' NOT NULL,
 	group_avatar_height number(4) DEFAULT '0' NOT NULL,
 	group_rank number(8) DEFAULT '0' NOT NULL,
@@ -1665,7 +1665,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail number(1) DEFAULT '1' NOT NULL,
 	user_options number(11) DEFAULT '230271' NOT NULL,
 	user_avatar varchar2(255) DEFAULT '' ,
-	user_avatar_type number(2) DEFAULT '0' NOT NULL,
+	user_avatar_type varchar2(32) DEFAULT '' ,
 	user_avatar_width number(4) DEFAULT '0' NOT NULL,
 	user_avatar_height number(4) DEFAULT '0' NOT NULL,
 	user_sig clob DEFAULT '' ,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index c624024362..f139dc0ced 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -463,7 +463,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0),
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
-	group_avatar_type INT2 DEFAULT '0' NOT NULL,
+	group_avatar_type varchar(32) DEFAULT '' NOT NULL,
 	group_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_width >= 0),
 	group_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_height >= 0),
 	group_rank INT4 DEFAULT '0' NOT NULL CHECK (group_rank >= 0),
@@ -1167,7 +1167,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail INT2 DEFAULT '1' NOT NULL CHECK (user_allow_massemail >= 0),
 	user_options INT4 DEFAULT '230271' NOT NULL CHECK (user_options >= 0),
 	user_avatar varchar(255) DEFAULT '' NOT NULL,
-	user_avatar_type INT2 DEFAULT '0' NOT NULL,
+	user_avatar_type varchar(32) DEFAULT '' NOT NULL,
 	user_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_width >= 0),
 	user_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_height >= 0),
 	user_sig TEXT DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index bd002c93ed..417464110b 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -309,7 +309,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar(8) NOT NULL DEFAULT '',
 	group_display INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_avatar varchar(255) NOT NULL DEFAULT '',
-	group_avatar_type tinyint(2) NOT NULL DEFAULT '0',
+	group_avatar_type varchar(32) NOT NULL DEFAULT '',
 	group_avatar_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_avatar_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
@@ -891,7 +891,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	user_options INTEGER UNSIGNED NOT NULL DEFAULT '230271',
 	user_avatar varchar(255) NOT NULL DEFAULT '',
-	user_avatar_type tinyint(2) NOT NULL DEFAULT '0',
+	user_avatar_type varchar(32) NOT NULL DEFAULT '',
 	user_avatar_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_avatar_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_sig mediumtext(16777215) NOT NULL DEFAULT '',
-- 
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/common.php                     |  2 ++
 phpBB/download/file.php              |  2 ++
 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 ++++++-------
 6 files changed, 21 insertions(+), 28 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index b3b8d7e4f7..c59c231d28 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -130,6 +130,8 @@ $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_
 $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
 $phpbb_subscriber_loader->load();
 
+$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->get_driver());
+
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index c01b0789de..55364b3fd0 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -82,6 +82,8 @@ if (isset($_GET['avatar']))
 	$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
 	$phpbb_subscriber_loader->load();
 
+	$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->get_driver());
+
 	$filename = request_var('avatar', '');
 	$avatar_group = false;
 	$exit = false;
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')

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')

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 +++++++-----------------------------
 phpBB/install/database_update.php    | 24 +++++++++++--
 2 files changed, 35 insertions(+), 59 deletions(-)

(limited to 'phpBB')

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) . '" />';
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e85fe1810d..75f1ada749 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2391,13 +2391,33 @@ function change_database_data(&$no_updates, $version)
 			{
 				set_config('teampage_memberships', '1');
 			}
-			
+
 			// Clear styles table and add prosilver entry
 			_sql('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, '')";
 			_sql($sql, $errored, $error_ary);
-			
+
+			// Update avatars to modular types
+			$avatar_type_map = array(
+				AVATAR_UPLOAD	=> 'upload',
+				AVATAR_GALLERY	=> 'local',
+				AVATAR_REMOTE	=> 'remote',
+			);
+
+			foreach ($avatar_type_map as $old => $new)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . "
+					SET user_avatar_type = '" . $db->sql_escape($new) . "'
+					WHERE user_avatar_type = '" . $db->sql_escape($old) . "'";
+				_sql($sql, $errored, $error_ary);
+
+				$sql = 'UPDATE ' . GROUPS_TABLE . "
+					SET group_avatar_type = '" . $db->sql_escape($new) . "'
+					WHERE group_avatar_type = '" . $db->sql_escape($old) . "'";
+				_sql($sql, $errored, $error_ary);
+			}
+
 			$no_updates = false;
 
 		break;
-- 
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')

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')

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')

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 d5a788ae5b615c1b6b642c631884a4d936be2a4c Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 21 Jun 2012 19:16:05 +0100
Subject: [ticket/10949] Converted AJAX coding standards to new guidelines.

Basically, moved parentheses to same line and changed variable names to
camel case.

PHPBB3-10949
---
 phpBB/assets/javascript/core.js         | 195 +++++++++++++-------------------
 phpBB/styles/prosilver/template/ajax.js |  24 ++--
 2 files changed, 87 insertions(+), 132 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 958b6c9ff6..53b85e677a 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1,5 +1,5 @@
 var phpbb = {};
-phpbb.alert_time = 100;
+phpbb.alertTime = 100;
 
 (function($) {  // Avoid conflicts with other libraries
 
@@ -12,35 +12,31 @@ var keymap = {
 };
 
 var dark = $('#darkenwrapper');
-var loading_alert = $('#loadingalert');
+var loadingAlert = $('#loadingalert');
 
 
 /**
- * Display a loading screen.
+ * Display a loading screen
  *
- * @returns object Returns loading_alert.
+ * @returns object Returns loadingAlert.
  */
-phpbb.loading_alert = function() {
-	if (dark.is(':visible'))
-	{
-		loading_alert.fadeIn(phpbb.alert_time);
-	}
-	else
-	{
-		loading_alert.show();
-		dark.fadeIn(phpbb.alert_time, function() {
+phpbb.loadingAlert = function() {
+	if (dark.is(':visible')) {
+		loadingAlert.fadeIn(phpbb.alertTime);
+	} else {
+		loadingAlert.show();
+		dark.fadeIn(phpbb.alertTime, function() {
 			// Wait five seconds and display an error if nothing has been returned by then.
 			setTimeout(function() {
-				if (loading_alert.is(':visible'))
-				{
+				if (loadingAlert.is(':visible')) {
 					phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
 				}
 			}, 5000);
 		});
 	}
 
-	return loading_alert;
-}
+	return loadingAlert;
+};
 
 /**
  * Display a simple alert similar to JSs native alert().
@@ -67,7 +63,7 @@ phpbb.alert = function(title, msg, fadedark) {
 
 		div.find('.alert_close').unbind('click');
 		fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark;
-		fade.fadeOut(phpbb.alert_time, function() {
+		fade.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
 
@@ -90,27 +86,22 @@ phpbb.alert = function(title, msg, fadedark) {
 		e.preventDefault();
 	});
 
-	if (loading_alert.is(':visible'))
-	{
-		loading_alert.fadeOut(phpbb.alert_time, function() {
+	if (loadingAlert.is(':visible')) {
+		loadingAlert.fadeOut(phpbb.alertTime, function() {
 			dark.append(div);
-			div.fadeIn(phpbb.alert_time);
+			div.fadeIn(phpbb.alertTime);
 		});
-	}
-	else if (dark.is(':visible'))
-	{
+	} else if (dark.is(':visible')) {
 		dark.append(div);
-		div.fadeIn(phpbb.alert_time);
-	}
-	else
-	{
+		div.fadeIn(phpbb.alertTime);
+	} else {
 		dark.append(div);
 		div.show();
-		dark.fadeIn(phpbb.alert_time);
+		dark.fadeIn(phpbb.alertTime);
 	}
 
 	return div;
-}
+};
 
 /**
  * Display a simple yes / no box to the user.
@@ -136,7 +127,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
 	var click_handler = function(e) {
 		var res = this.className === 'button1';
 		var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
-		fade.fadeOut(phpbb.alert_time, function() {
+		fade.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
 		div.find('input[type="button"]').unbind('click', click_handler);
@@ -151,7 +142,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
 
 	dark.one('click', function(e) {
 		div.find('.alert_close').unbind('click');
-		dark.fadeOut(phpbb.alert_time, function() {
+		dark.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
 		callback(false);
@@ -174,7 +165,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
 
 	div.find('.alert_close').one('click', function(e) {
 		var fade = (typeof fadedark !== 'undefined' && fadedark) ? div : dark;
-		fade.fadeOut(phpbb.alert_time, function() {
+		fade.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
 		callback(false);
@@ -182,27 +173,22 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		e.preventDefault();
 	});
 
-	if (loading_alert.is(':visible'))
-	{
-		loading_alert.fadeOut(phpbb.alert_time, function() {
+	if (loadingAlert.is(':visible')) {
+		loadingAlert.fadeOut(phpbb.alertTime, function() {
 			dark.append(div);
-			div.fadeIn(phpbb.alert_time);
+			div.fadeIn(phpbb.alertTime);
 		});
-	}
-	else if (dark.is(':visible'))
-	{
+	} else if (dark.is(':visible')) {
 		dark.append(div);
-		div.fadeIn(phpbb.alert_time);
-	}
-	else
-	{
+		div.fadeIn(phpbb.alertTime);
+	} else {
 		dark.append(div);
 		div.show();
-		dark.fadeIn(phpbb.alert_time);
+		dark.fadeIn(phpbb.alertTime);
 	}
 
 	return div;
-}
+};
 
 /**
  * Turn a querystring into an array.
@@ -214,13 +200,12 @@ phpbb.parse_querystring = function(string) {
 	var params = {}, i, split;
 
 	string = string.split('&');
-	for (i = 0; i < string.length; i++)
-	{
+	for (i = 0; i < string.length; i++) {
 		split = string[i].split('=');
 		params[split[0]] = decodeURIComponent(split[1]);
 	}
 	return params;
-}
+};
 
 
 /**
@@ -246,14 +231,13 @@ phpbb.ajaxify = function(options) {
 		refresh = options.refresh,
 		callback = options.callback,
 		overlay = (typeof options.overlay !== 'undefined') ? options.overlay : true,
-		is_form = elements.is('form'),
-		event_name = is_form ? 'submit' : 'click';
+		isForm = elements.is('form'),
+		eventName = isForm ? 'submit' : 'click';
 
-	elements.bind(event_name, function(event) {
+	elements.bind(eventName, function(event) {
 		var action, method, data, submit, that = this, $this = $(this);
 
-		if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false')
-		{
+		if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false') {
 			return;
 		}
 
@@ -267,84 +251,69 @@ phpbb.ajaxify = function(options) {
 		 *
 		 * @param object res The object sent back by the server.
 		 */
-		function return_handler(res)
-		{
+		function returnHandler(res) {
 			var alert;
 
 			// Is a confirmation required?
-			if (typeof res.S_CONFIRM_ACTION === 'undefined')
-			{
+			if (typeof res.S_CONFIRM_ACTION === 'undefined') {
 				// If a confirmation is not required, display an alert and call the
 				// callbacks.
-				if (typeof res.MESSAGE_TITLE !== 'undefined')
-				{
+				if (typeof res.MESSAGE_TITLE !== 'undefined') {
 					alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
-				}
-				else
-				{
-					dark.fadeOut(phpbb.alert_time);
+				} else {
+					dark.fadeOut(phpbb.alertTime);
 				}
 
-				if (typeof phpbb.ajax_callbacks[callback] === 'function')
-				{
-					phpbb.ajax_callbacks[callback].call(that, res);
+				if (typeof phpbb.ajaxCallbacks[callback] === 'function') {
+					phpbb.ajaxCallbacks[callback].call(that, res);
 				}
 
 				// If the server says to refresh the page, check whether the page should
 				// be refreshed and refresh page after specified time if required.
-				if (res.REFRESH_DATA)
-				{
-					if (typeof refresh === 'function')
-					{
+				if (res.REFRESH_DATA) {
+					if (typeof refresh === 'function') {
 						refresh = refresh(res.REFRESH_DATA.url);
-					}
-					else if (typeof refresh !== 'boolean')
-					{
+					} else if (typeof refresh !== 'boolean') {
 						refresh = false;
 					}
 
 					setTimeout(function() {
-						if (refresh)
-						{
+						if (refresh) {
 							window.location = res.REFRESH_DATA.url;
 						}
 
 						// Hide the alert even if we refresh the page, in case the user
 						// presses the back button.
-						dark.fadeOut(phpbb.alert_time, function() {
+						dark.fadeOut(phpbb.alertTime, function() {
 							alert.hide();
 						});
 					}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
 				}
-			}
-			else
-			{
+			} else {
 				// If confirmation is required, display a diologue to the user.
 				phpbb.confirm(res.MESSAGE_TEXT, function(del) {
-					if (del)
-					{
-						phpbb.loading_alert();
+					if (del) {
+						phpbb.loadingAlert();
 						data =  $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize();
 						$.ajax({
 							url: res.S_CONFIRM_ACTION,
 							type: 'POST',
 							data: data + '&confirm=' + res.YES_VALUE,
-							success: return_handler,
-							error: error_handler
+							success: returnHandler,
+							error: errorHandler
 						});
 					}
 				}, false);
 			}
 		}
 
-		function error_handler()
-		{
+		function errorHandler() {
 			var alert;
 
 			alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text'));
 
 			setTimeout(function () {
-				dark.fadeOut(phpbb.alert_time, function() {
+				dark.fadeOut(phpbb.alertTime, function() {
 					alert.hide();
 				});
 			}, 5000);
@@ -352,25 +321,21 @@ phpbb.ajaxify = function(options) {
 
 		// If the element is a form, POST must be used and some extra data must
 		// be taken from the form.
-		var run_filter = (typeof options.filter === 'function');
+		var runFilter = (typeof options.filter === 'function');
 
-		if (is_form)
-		{
+		if (isForm) {
 			action = $this.attr('action').replace('&amp;', '&');
 			data = $this.serializeArray();
 			method = $this.attr('method') || 'GET';
 
-			if ($this.find('input[type="submit"][data-clicked]'))
-			{
+			if ($this.find('input[type="submit"][data-clicked]')) {
 				submit = $this.find('input[type="submit"][data-clicked]');
 				data.push({
 					name: submit.attr('name'),
 					value: submit.val()
 				});
 			}
-		}
-		else
-		{
+		} else {
 			action = this.href;
 			data = null;
 			method = 'GET';
@@ -378,28 +343,26 @@ phpbb.ajaxify = function(options) {
 
 		// If filter function returns false, cancel the AJAX functionality,
 		// and return true (meaning that the HTTP request will be sent normally).
-		if (run_filter && !options.filter.call(this, data))
-		{
+		if (runFilter && !options.filter.call(this, data)) {
 			return;
 		}
 
-		if (overlay)
-		{
-			phpbb.loading_alert();
+		if (overlay) {
+			phpbb.loadingAlert();
 		}
 
 		$.ajax({
 			url: action,
 			type: method,
 			data: data,
-			success: return_handler,
-			error: error_handler
+			success: returnHandler,
+			error: errorHandler
 		});
 
 		event.preventDefault();
 	});
 
-	if (is_form) {
+	if (isForm) {
 		elements.find('input:submit').click(function () {
 			var $this = $(this);
 
@@ -409,9 +372,9 @@ phpbb.ajaxify = function(options) {
 	}
 
 	return this;
-}
+};
 
-phpbb.ajax_callbacks = {};
+phpbb.ajaxCallbacks = {};
 
 /**
  * Adds an AJAX callback to be used by phpbb.ajaxify.
@@ -421,14 +384,12 @@ phpbb.ajax_callbacks = {};
  * @param string id The name of the callback.
  * @param function callback The callback to be called.
  */
-phpbb.add_ajax_callback = function(id, callback)
-{
-	if (typeof callback === 'function')
-	{
-		phpbb.ajax_callbacks[id] = callback;
+phpbb.add_ajax_callback = function(id, callback) {
+	if (typeof callback === 'function') {
+		phpbb.ajaxCallbacks[id] = callback;
 	}
 	return this;
-}
+};
 
 
 /**
@@ -438,11 +399,11 @@ phpbb.add_ajax_callback = function(id, callback)
  */
 phpbb.add_ajax_callback('alt_text', function(data) {
 	var el = $(this),
-		alt_text;
+		altText;
 
-	alt_text = el.attr('data-alt-text');
-	el.attr('title', alt_text);
-	el.text(alt_text);
+	altText = el.attr('data-alt-text');
+	el.attr('title', altText);
+	el.text(altText);
 });
 
 
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 54f34e4204..83335b23af 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -5,14 +5,12 @@
 // This callback finds the post from the delete link, and removes it.
 phpbb.add_ajax_callback('post_delete', function() {
 	var el = $(this),
-		post_id;
-
-	if (el.attr('data-refresh') === undefined)
-	{
-		post_id = el[0].href.split('&p=')[1];
-		var post = el.parents('#p' + post_id).css('pointer-events', 'none');
-		if (post.hasClass('bg1') || post.hasClass('bg2'))
-		{
+		postId;
+
+	if (el.attr('data-refresh') === undefined) {
+		postId = el[0].href.split('&p=')[1];
+		var post = el.parents('#p' + postId).css('pointer-events', 'none');
+		if (post.hasClass('bg1') || post.hasClass('bg2')) {
 			var posts1 = post.nextAll('.bg1');
 			post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
 			posts1.removeClass('bg1').addClass('bg2');
@@ -54,8 +52,7 @@ $('[data-ajax]').each(function() {
 		ajax = $this.attr('data-ajax'),
 		fn;
 
-	if (ajax !== 'false')
-	{
+	if (ajax !== 'false') {
 		fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({
 			selector: this,
@@ -89,12 +86,9 @@ phpbb.ajaxify({
 	filter: function (data) {
 		var action = $('#quick-mod-select').val();
 
-		if (action === 'make_normal')
-		{
+		if (action === 'make_normal') {
 			return $(this).find('select option[value="make_global"]').length > 0;
-		}
-		else if (action === 'lock' || action === 'unlock')
-		{
+		} else if (action === 'lock' || action === 'unlock') {
 			return true;
 		}
 
-- 
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')

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')

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 f40e6963c61548d746c59b78cb60c0f7459c7696 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 17:11:20 +0200
Subject: [feature/avatars] Remove empty script tag

PHPBB3-10018
---
 phpBB/styles/prosilver/template/ucp_avatar_options.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index e8114da3ea..a246b00ddd 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -1,4 +1,3 @@
-
 <div class="panel">
 	<div class="inner">
 	<!-- IF not S_AVATARS_ENABLED -->
@@ -66,5 +65,3 @@
 
 	</div>
 </div>
-<script type="text/javascript">
-</script>
-- 
cgit v1.2.1


From 21df013210d1de2cffae568c0620a7ccd6d8f426 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 18:23:26 +0200
Subject: [feature/avatars] Move avatars JavaScript code to external JS file

PHPBB3-10018
---
 phpBB/adm/style/acp_groups.html                    | 23 ++-------------------
 phpBB/adm/style/acp_users_avatar.html              | 23 ++-------------------
 phpBB/adm/style/avatars.js                         | 17 +++++++++++++++
 phpBB/styles/prosilver/template/avatars.js         | 17 +++++++++++++++
 .../prosilver/template/ucp_avatar_options.html     | 24 ++--------------------
 5 files changed, 40 insertions(+), 64 deletions(-)
 create mode 100644 phpBB/adm/style/avatars.js
 create mode 100644 phpBB/styles/prosilver/template/avatars.js

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 42cb434ad3..167642e5cb 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -123,27 +123,6 @@
 	</div>
 	<!-- END avatar_drivers -->
 	</div>
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
@@ -154,6 +133,8 @@
 	</fieldset>
 	</form>
 
+	<!-- INCLUDEJS avatars.js -->
+
 <!-- ELSEIF S_LIST -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 6316ff4a22..9649fa923e 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -28,30 +28,11 @@
 		<!-- END avatar_drivers -->
 		</div>
 	</fieldset>
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
 
 	<fieldset class="quick">
 		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
 	{S_FORM_TOKEN}
 	</form>
+
+	<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
new file mode 100644
index 0000000000..baa2623ac9
--- /dev/null
+++ b/phpBB/adm/style/avatars.js
@@ -0,0 +1,17 @@
+function avatar_simplify() {
+    var node = document.getElementById('av_options');
+    for (var i = 0; i < node.children.length; i++) {
+        child = node.children[i];
+        child.style.display = 'none';
+    }
+
+    var selected = document.getElementById('avatar_driver').value;
+    var id = 'av_option_' + selected;
+    node = document.getElementById(id);
+    if (node != null) {
+        node.style.display = 'block';
+    }
+}
+
+avatar_simplify();
+document.getElementById('avatar_driver').onchange = avatar_simplify;
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
new file mode 100644
index 0000000000..baa2623ac9
--- /dev/null
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -0,0 +1,17 @@
+function avatar_simplify() {
+    var node = document.getElementById('av_options');
+    for (var i = 0; i < node.children.length; i++) {
+        child = node.children[i];
+        child.style.display = 'none';
+    }
+
+    var selected = document.getElementById('avatar_driver').value;
+    var id = 'av_option_' + selected;
+    node = document.getElementById(id);
+    if (node != null) {
+        node.style.display = 'block';
+    }
+}
+
+avatar_simplify();
+document.getElementById('avatar_driver').onchange = avatar_simplify;
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index a246b00ddd..2438deefd5 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -41,27 +41,7 @@
 		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
 
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
-
 	</div>
 </div>
+
+<!-- INCLUDEJS template/avatars.js -->
-- 
cgit v1.2.1


From b060667ac102109c0c8f198925bb81b489a30f34 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 18:26:44 +0200
Subject: [feature/avatars] Rewrite avatars event handler to use jQuery

PHPBB3-10018
---
 phpBB/adm/style/avatars.js                 | 16 ++++------------
 phpBB/styles/prosilver/template/avatars.js | 16 ++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index baa2623ac9..252081ee08 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -1,17 +1,9 @@
 function avatar_simplify() {
-    var node = document.getElementById('av_options');
-    for (var i = 0; i < node.children.length; i++) {
-        child = node.children[i];
-        child.style.display = 'none';
-    }
+    $('#av_options').hide();
 
-    var selected = document.getElementById('avatar_driver').value;
-    var id = 'av_option_' + selected;
-    node = document.getElementById(id);
-    if (node != null) {
-        node.style.display = 'block';
-    }
+    var selected = $('#avatar_driver').val();
+    $('#av_option_' + selected).show();
 }
 
 avatar_simplify();
-document.getElementById('avatar_driver').onchange = avatar_simplify;
+$('#avatar_driver').on('change', avatar_simplify);
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
index baa2623ac9..252081ee08 100644
--- a/phpBB/styles/prosilver/template/avatars.js
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -1,17 +1,9 @@
 function avatar_simplify() {
-    var node = document.getElementById('av_options');
-    for (var i = 0; i < node.children.length; i++) {
-        child = node.children[i];
-        child.style.display = 'none';
-    }
+    $('#av_options').hide();
 
-    var selected = document.getElementById('avatar_driver').value;
-    var id = 'av_option_' + selected;
-    node = document.getElementById(id);
-    if (node != null) {
-        node.style.display = 'block';
-    }
+    var selected = $('#avatar_driver').val();
+    $('#av_option_' + selected).show();
 }
 
 avatar_simplify();
-document.getElementById('avatar_driver').onchange = avatar_simplify;
+$('#avatar_driver').on('change', avatar_simplify);
-- 
cgit v1.2.1


From 2f3581fe3ef928d91f12c442ab5e4890c6620f58 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 18:37:23 +0200
Subject: [feature/avatars] Add self-invoking closure around avatars.js

PHPBB3-10018
---
 phpBB/adm/style/avatars.js                 | 6 ++++++
 phpBB/styles/prosilver/template/avatars.js | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index 252081ee08..cb19aa9b7a 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -1,3 +1,7 @@
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
 function avatar_simplify() {
     $('#av_options').hide();
 
@@ -7,3 +11,5 @@ function avatar_simplify() {
 
 avatar_simplify();
 $('#avatar_driver').on('change', avatar_simplify);
+
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
index 252081ee08..cb19aa9b7a 100644
--- a/phpBB/styles/prosilver/template/avatars.js
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -1,3 +1,7 @@
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
 function avatar_simplify() {
     $('#av_options').hide();
 
@@ -7,3 +11,5 @@ function avatar_simplify() {
 
 avatar_simplify();
 $('#avatar_driver').on('change', avatar_simplify);
+
+})(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From 13f4bfabbeab77698f06c3431931b73ebedc587c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 21:00:00 +0200
Subject: [feature/avatars] Fixup avatars.js rewrite

PHPBB3-10018
---
 phpBB/adm/style/avatars.js                 | 4 ++--
 phpBB/styles/prosilver/template/avatars.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index cb19aa9b7a..2068bdbbc4 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -3,13 +3,13 @@
 "use strict";
 
 function avatar_simplify() {
-    $('#av_options').hide();
+    $('#av_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#av_option_' + selected).show();
 }
 
 avatar_simplify();
-$('#avatar_driver').on('change', avatar_simplify);
+$('#avatar_driver').bind('change', avatar_simplify);
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
index cb19aa9b7a..2068bdbbc4 100644
--- a/phpBB/styles/prosilver/template/avatars.js
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -3,13 +3,13 @@
 "use strict";
 
 function avatar_simplify() {
-    $('#av_options').hide();
+    $('#av_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#av_option_' + selected).show();
 }
 
 avatar_simplify();
-$('#avatar_driver').on('change', avatar_simplify);
+$('#avatar_driver').bind('change', avatar_simplify);
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
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/common.php                             |   2 +-
 phpBB/download/file.php                      |   2 +-
 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 +-
 12 files changed, 564 insertions(+), 534 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')

diff --git a/phpBB/common.php b/phpBB/common.php
index 11b84ee858..52666685ac 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -130,7 +130,7 @@ $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_
 $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
 $phpbb_subscriber_loader->load();
 
-$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->get_driver());
+$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $phpbb_extension_manager, $cache->get_driver());
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 55364b3fd0..34999ab24c 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -82,7 +82,7 @@ if (isset($_GET['avatar']))
 	$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
 	$phpbb_subscriber_loader->load();
 
-	$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->get_driver());
+	$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $phpbb_extension_manager, $cache->get_driver());
 
 	$filename = request_var('avatar', '');
 	$avatar_group = false;
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 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')

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')

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')

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 87eec7cfb66f6072344680743b04bf0186e8ca17 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 Mar 2012 00:07:09 +0100
Subject: [ticket/10714] Create a phpbb_log object and inject it into add_log

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

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index c7c5859c25..bbcf8b894f 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -139,6 +139,10 @@ foreach ($cache->obtain_hooks() as $hook)
 	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 }
 
+// make sure add_log uses this log instance
+$phpbb_log = new phpbb_log(LOG_TABLE);
+add_log($phpbb_log); // "dependency injection" for a function
+
 if (!$config['use_system_cron'])
 {
 	$cron = new phpbb_cron_manager(new phpbb_cron_task_provider($phpbb_extension_manager), $cache->get_driver());
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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 325827c40f778ef7efd3c195706cb0b1fb28805b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Mar 2012 16:43:26 +0100
Subject: [ticket/10714] Inject the global $phpbb_log into view_log()

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

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index bbcf8b894f..799c1162b1 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -76,6 +76,7 @@ if (!empty($load_extensions) && function_exists('dl'))
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
 
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
@@ -142,6 +143,10 @@ foreach ($cache->obtain_hooks() as $hook)
 // make sure add_log uses this log instance
 $phpbb_log = new phpbb_log(LOG_TABLE);
 add_log($phpbb_log); // "dependency injection" for a function
+// Parameter 2 and 3 are passed by reference, so we need to create a variable for it.
+$tmp_var = '';
+view_log($phpbb_log, $tmp_var, $tmp_var); // "dependency injection" for a function
+unset($tmp_var);
 
 if (!$config['use_system_cron'])
 {
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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/common.php                   | 11 ++---------
 phpBB/includes/functions.php       | 19 +++++--------------
 phpBB/includes/functions_admin.php | 26 ++++++--------------------
 3 files changed, 13 insertions(+), 43 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 799c1162b1..2d2b31df83 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -76,7 +76,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
 
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
@@ -119,6 +118,8 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
+$phpbb_log = new phpbb_log(LOG_TABLE);
+
 // load extensions
 $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
 
@@ -140,14 +141,6 @@ foreach ($cache->obtain_hooks() as $hook)
 	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 }
 
-// make sure add_log uses this log instance
-$phpbb_log = new phpbb_log(LOG_TABLE);
-add_log($phpbb_log); // "dependency injection" for a function
-// Parameter 2 and 3 are passed by reference, so we need to create a variable for it.
-$tmp_var = '';
-view_log($phpbb_log, $tmp_var, $tmp_var); // "dependency injection" for a function
-unset($tmp_var);
-
 if (!$config['use_system_cron'])
 {
 	$cron = new phpbb_cron_manager(new phpbb_cron_task_provider($phpbb_extension_manager), $cache->get_driver());
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 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/config/services.yml                         |   5 +
 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 +++++++
 9 files changed, 530 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')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 133a43b77e..b9c697b481 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -89,6 +89,11 @@ services:
             - .%core.php_ext%
             - @cache.driver
 
+    notifications:
+        class: phpbb_notifications_service
+        arguments:
+            - @container
+
     processor.config:
         class: phpbb_di_processor_ext
         arguments:
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')

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/common.php                                    |  3 +++
 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 ++++++++++++-
 phpBB/styles/prosilver/template/overall_header.html |  7 +++++++
 6 files changed, 45 insertions(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 281eb88c4d..52879deb9c 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -146,6 +146,9 @@ if (!$config['use_system_cron'])
 	$cron = $phpbb_container->get('cron.manager');
 }
 
+// Load notifications
+$phpbb_notifications = $phpbb_container->get('notifications');
+
 /**
 * Main event which is triggered on every page
 *
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'));
 	}
 
 	/**
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 43ae83767d..77fdb230ad 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -166,3 +166,10 @@
 			</div>
 		</div>
 		<!-- ENDIF -->
+
+<!-- BEGIN notifications -->
+	<p>
+		<a href="{notifications.URL}">{notifications.TITLE}</a><br />
+		{notifications.TIME}
+	</p>
+<!-- END notifications -->
\ No newline at end of file
-- 
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')

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/develop/create_schema_files.php             | 41 ++++++++++++++++++++
 phpBB/includes/notifications/method/base.php      | 32 +++++++++++++++
 phpBB/includes/notifications/method/interface.php |  1 +
 phpBB/includes/notifications/service.php          | 38 +++++++++---------
 phpBB/install/database_update.php                 | 47 +++++++++++++++++++++++
 5 files changed, 140 insertions(+), 19 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 6eb4a80199..88aa9b70dd 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1295,6 +1295,28 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_notifications'] = array(
+		'COLUMNS'			=> array(
+			'item_type'			=> array('UINT', 0),
+			'item_id'			=> array('UINT', 0),
+			'user_id'			=> array('UINT', 0),
+			'unread'			=> array('BOOL', 1),
+			'time'				=> array('TIMESTAMP', 1),
+			'data'				=> array('TEXT_UNI', ''),
+		),
+		'PRIMARY_KEY'		=> array(
+			'item_type',
+			'item_id',
+			'user_id',
+		),
+		'KEYS'				=> array(
+			'item_type'			=> array('INDEX', 'item_type'),
+			'item_id'			=> array('INDEX', 'item_id'),
+			'user_id'			=> array('INDEX', 'user_id'),
+			'time'				=> array('INDEX', 'time'),
+		),
+	);
+
 	$schema_data['phpbb_poll_options'] = array(
 		'COLUMNS'		=> array(
 			'poll_option_id'		=> array('TINT:4', 0),
@@ -1751,6 +1773,25 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_user_notifications'] = array(
+		'COLUMNS'			=> array(
+			'item_type'			=> array('UINT', 0),
+			'item_id'			=> array('UINT', 0),
+			'user_id'			=> array('UINT', 0),
+			'method'			=> array('VCHAR:25', ''),
+		),
+		'PRIMARY_KEY'		=> array(
+			'item_type',
+			'item_id',
+			'user_id',
+			'method',
+		),
+		'KEYS'				=> array(
+			'it'				=> array('INDEX', 'item_type'),
+			'uid'				=> array('INDEX', 'user_id'),
+		),
+	);
+
 	$schema_data['phpbb_user_group'] = array(
 		'COLUMNS'		=> array(
 			'group_id'			=> array('UINT', 0),
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));
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0b470ced26..99e40ddee9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -106,6 +106,14 @@ if (!defined('EXT_TABLE'))
 {
 	define('EXT_TABLE', $table_prefix . 'ext');
 }
+if (!defined('NOTIFICATIONS_TABLE'))
+{
+	define('NOTIFICATIONS_TABLE', $table_prefix . 'notifications');
+}
+if (!defined('USER_NOTIFICATIONS_TABLE'))
+{
+	define('USER_NOTIFICATIONS_TABLE', $table_prefix . 'user_notifications');
+}
 
 $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
 $phpbb_class_loader_ext->register();
@@ -1097,6 +1105,45 @@ function database_update_info()
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
 					),
 				),
+				NOTIFICATIONS_TABLE		=> array(
+					'COLUMNS'			=> array(
+						'item_type'			=> array('UINT', 0),
+						'item_id'			=> array('UINT', 0),
+						'user_id'			=> array('UINT', 0),
+						'unread'			=> array('BOOL', 1),
+						'time'				=> array('TIMESTAMP', 1),
+						'data'				=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> array(
+						'item_type',
+						'item_id',
+						'user_id',
+					),
+					'KEYS'				=> array(
+						'item_type'			=> array('INDEX', 'item_type'),
+						'item_id'			=> array('INDEX', 'item_id'),
+						'user_id'			=> array('INDEX', 'user_id'),
+						'time'				=> array('INDEX', 'time'),
+					),
+				),
+				USER_NOTIFICATIONS_TABLE	=> array(
+					'COLUMNS'			=> array(
+						'item_type'			=> array('UINT', 0),
+						'item_id'			=> array('UINT', 0),
+						'user_id'			=> array('UINT', 0),
+						'method'			=> array('VCHAR:25', ''),
+					),
+					'PRIMARY_KEY'		=> array(
+						'item_type',
+						'item_id',
+						'user_id',
+						'method',
+					),
+					'KEYS'				=> array(
+						'it'				=> array('INDEX', 'item_type'),
+						'uid'				=> array('INDEX', 'user_id'),
+					),
+				),
 			),
 			'add_columns'		=> array(
 				GROUPS_TABLE		=> array(
-- 
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')

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')

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')

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/develop/create_schema_files.php           |  4 ++--
 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 ++
 phpBB/install/database_update.php               |  8 ++++----
 6 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 88aa9b70dd..a2f7463dd4 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1297,7 +1297,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_notifications'] = array(
 		'COLUMNS'			=> array(
-			'item_type'			=> array('UINT', 0),
+			'item_type'			=> array('VCHAR:25', ''),
 			'item_id'			=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'unread'			=> array('BOOL', 1),
@@ -1775,7 +1775,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_user_notifications'] = array(
 		'COLUMNS'			=> array(
-			'item_type'			=> array('UINT', 0),
+			'item_type'			=> array('VCHAR:25', ''),
 			'item_id'			=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'method'			=> array('VCHAR:25', ''),
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
 */
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 99e40ddee9..c3c2da4451 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1107,7 +1107,7 @@ function database_update_info()
 				),
 				NOTIFICATIONS_TABLE		=> array(
 					'COLUMNS'			=> array(
-						'item_type'			=> array('UINT', 0),
+						'item_type'			=> array('VCHAR:25', ''),
 						'item_id'			=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
 						'unread'			=> array('BOOL', 1),
@@ -1128,7 +1128,7 @@ function database_update_info()
 				),
 				USER_NOTIFICATIONS_TABLE	=> array(
 					'COLUMNS'			=> array(
-						'item_type'			=> array('UINT', 0),
+						'item_type'			=> array('VCHAR:25', ''),
 						'item_id'			=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
 						'method'			=> array('VCHAR:25', ''),
@@ -2676,10 +2676,10 @@ function change_database_data(&$no_updates, $version)
 
 			// Create config value for displaying last subject on forum list
 			if (!isset($config['display_last_subject']))
-			{			
+			{
 				$config->set('display_last_subject', '1');
 			}
-			
+
 			$no_updates = false;
 
 			if (!isset($config['assets_version']))
-- 
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')

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')

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')

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')

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')

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 ++++++++++++++--
 phpBB/language/en/email/notification.txt          | 16 ++++++++++++++++
 8 files changed, 65 insertions(+), 25 deletions(-)
 create mode 100644 phpBB/language/en/email/notification.txt

(limited to 'phpBB')

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
 	*
diff --git a/phpBB/language/en/email/notification.txt b/phpBB/language/en/email/notification.txt
new file mode 100644
index 0000000000..ed35e96c85
--- /dev/null
+++ b/phpBB/language/en/email/notification.txt
@@ -0,0 +1,16 @@
+Subject: Notification from {SITENAME}
+
+Hello {USERNAME},
+
+{MESSAGE}
+
+You can view this by clicking on the following link:
+
+{U_VIEW_MESSAGE}
+
+<!-- IF U_UNSUBSCRIBE -->
+You may unsubscribe by clicking on the following link:
+{U_UNSUBSCRIBE}
+<!-- ENDIF -->
+
+{EMAIL_SIG}
\ No newline at end of file
-- 
cgit v1.2.1


From 570fe6cee87da807f0917cdc0c84aee604b50510 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 12:27:37 -0500
Subject: [ticket/11103] Do not initialize the notifications in common.php

DIC initializes it when it is needed.

PHPBB3-11103
---
 phpBB/common.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 52879deb9c..281eb88c4d 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -146,9 +146,6 @@ if (!$config['use_system_cron'])
 	$cron = $phpbb_container->get('cron.manager');
 }
 
-// Load notifications
-$phpbb_notifications = $phpbb_container->get('notifications');
-
 /**
 * Main event which is triggered on every page
 *
-- 
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')

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 ++++++++++++++++++++++++++
 phpBB/language/en/common.php                  |   3 +
 5 files changed, 200 insertions(+), 8 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/topic.php

(limited to 'phpBB')

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);
+	}
+}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e6022e3b79..23f205dcc7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -385,6 +385,9 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
+	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message titled: %2$s.',
+	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
-- 
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')

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 ++++
 .../styles/prosilver/template/overall_header.html  | 25 ++++++++----
 phpBB/styles/prosilver/theme/common.css            |  8 ++++
 10 files changed, 98 insertions(+), 30 deletions(-)

(limited to 'phpBB')

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
 	*
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 77fdb230ad..1695f8d03a 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -132,6 +132,22 @@
 			<ul class="linklist leftside">
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
+					<a href="#" title="{L_NOTIFICATIONS}" onClick="$('#notification_list').toggle();">{L_NOTIFICATIONS}</a>
+					<div id="notification_list" style="display: block; position: absolute; width: 330px; background-color: #FFFFFF; z-index: 1;">
+						<ul style="list-style-type: none;">
+						<!-- BEGIN notifications -->
+							<li style="margin: 10px;">
+								<a href="{notifications.URL}" style="text-decoration: none;">
+									{notifications.AVATAR}
+									<div>
+										{notifications.FORMATTED_TITLE}<br />
+										{notifications.TIME}
+									</div>
+								</a>
+							</li>
+				   			<!-- END notifications -->
+						</ul>
+					</div>
 						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
@@ -165,11 +181,4 @@
 				<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
 			</div>
 		</div>
-		<!-- ENDIF -->
-
-<!-- BEGIN notifications -->
-	<p>
-		<a href="{notifications.URL}">{notifications.TITLE}</a><br />
-		{notifications.TIME}
-	</p>
-<!-- END notifications -->
\ No newline at end of file
+		<!-- ENDIF -->
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 4b4fa263b1..a3f2a83886 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -665,3 +665,11 @@ p.rules a {
 .smilies {
 	vertical-align: text-bottom;
 }
+
+.notifications-avatar {
+	float: left;
+	padding: 0 10px 10px 0;
+
+	max-width: 50px;
+	max-height: 50px;
+}
-- 
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')

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')

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 ++++--
 phpBB/language/en/common.php               | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB')

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']);
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 23f205dcc7..a437c924cf 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -385,7 +385,8 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message titled: %2$s.',
+	'NOTIFICATIONS'				=> '[ Notifications ]',
+	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
-- 
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')

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')

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')

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')

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 ++++++++++++++++++++++++++++
 phpBB/language/en/common.php                |   1 +
 4 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/includes/notifications/type/quote.php

(limited to 'phpBB')

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'))
+		);
+	}
+}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a437c924cf..75ca5c0000 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -388,6 +388,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATIONS'				=> '[ Notifications ]',
 	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_QUOTE'		=> '%1$s quoted you in the post "%2$s".',
 	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
-- 
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')

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/develop/create_schema_files.php              |   3 +
 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 ++-
 phpBB/install/database_update.php                  |   3 +
 .../styles/prosilver/template/overall_header.html  |   2 +-
 10 files changed, 190 insertions(+), 88 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index a2f7463dd4..0483ae009d 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1299,6 +1299,7 @@ function get_schema_struct()
 		'COLUMNS'			=> array(
 			'item_type'			=> array('VCHAR:25', ''),
 			'item_id'			=> array('UINT', 0),
+			'item_parent_id'	=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'unread'			=> array('BOOL', 1),
 			'time'				=> array('TIMESTAMP', 1),
@@ -1312,8 +1313,10 @@ function get_schema_struct()
 		'KEYS'				=> array(
 			'item_type'			=> array('INDEX', 'item_type'),
 			'item_id'			=> array('INDEX', 'item_id'),
+			'item_pid'			=> array('INDEX', 'item_parent_id'),
 			'user_id'			=> array('INDEX', 'user_id'),
 			'time'				=> array('INDEX', 'time'),
+			'unread'			=> array('INDEX', 'unread'),
 		),
 	);
 
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);
 	}
 }
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c3c2da4451..a79c04f8df 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1109,6 +1109,7 @@ function database_update_info()
 					'COLUMNS'			=> array(
 						'item_type'			=> array('VCHAR:25', ''),
 						'item_id'			=> array('UINT', 0),
+						'item_parent_id'	=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
 						'unread'			=> array('BOOL', 1),
 						'time'				=> array('TIMESTAMP', 1),
@@ -1122,8 +1123,10 @@ function database_update_info()
 					'KEYS'				=> array(
 						'item_type'			=> array('INDEX', 'item_type'),
 						'item_id'			=> array('INDEX', 'item_id'),
+						'item_pid'			=> array('INDEX', 'item_parent_id'),
 						'user_id'			=> array('INDEX', 'user_id'),
 						'time'				=> array('INDEX', 'time'),
+						'unread'			=> array('INDEX', 'unread'),
 					),
 				),
 				USER_NOTIFICATIONS_TABLE	=> array(
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 1695f8d03a..8c0cc562ae 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -136,7 +136,7 @@
 					<div id="notification_list" style="display: block; position: absolute; width: 330px; background-color: #FFFFFF; z-index: 1;">
 						<ul style="list-style-type: none;">
 						<!-- BEGIN notifications -->
-							<li style="margin: 10px;">
+							<li style="padding: 10px; width: 310px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
 								<a href="{notifications.URL}" style="text-decoration: none;">
 									{notifications.AVATAR}
 									<div>
-- 
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')

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')

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')

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 ++++--------------
 phpBB/language/en/common.php                   |  1 +
 8 files changed, 178 insertions(+), 76 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/bookmark.php

(limited to 'phpBB')

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
 	*
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 75ca5c0000..3e69c6bb03 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,6 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> '[ Notifications ]',
+	'NOTIFICATION_BOOKMARK'		=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_QUOTE'		=> '%1$s quoted you in the post "%2$s".',
-- 
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')

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 ++++++++++++++-----
 phpBB/language/en/email/notification.txt           | 16 ------------
 phpBB/language/en/email/notifications/bookmark.txt | 20 +++++++++++++++
 phpBB/language/en/email/notifications/quote.txt    | 20 +++++++++++++++
 13 files changed, 147 insertions(+), 50 deletions(-)
 delete mode 100644 phpBB/language/en/email/notification.txt
 create mode 100644 phpBB/language/en/email/notifications/bookmark.txt
 create mode 100644 phpBB/language/en/email/notifications/quote.txt

(limited to 'phpBB')

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}");
 	}
 
 	/**
diff --git a/phpBB/language/en/email/notification.txt b/phpBB/language/en/email/notification.txt
deleted file mode 100644
index ed35e96c85..0000000000
--- a/phpBB/language/en/email/notification.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Subject: Notification from {SITENAME}
-
-Hello {USERNAME},
-
-{MESSAGE}
-
-You can view this by clicking on the following link:
-
-{U_VIEW_MESSAGE}
-
-<!-- IF U_UNSUBSCRIBE -->
-You may unsubscribe by clicking on the following link:
-{U_UNSUBSCRIBE}
-<!-- ENDIF -->
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt
new file mode 100644
index 0000000000..9888008604
--- /dev/null
+++ b/phpBB/language/en/email/notifications/bookmark.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}" has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
new file mode 100644
index 0000000000..96fd527c8f
--- /dev/null
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic, "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+
+If you want to view the quoted post, click the following link:
+{U_QUOTED_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
-- 
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/develop/create_schema_files.php              |  7 +---
 phpBB/includes/functions.php                       | 16 ++++----
 phpBB/includes/notifications/service.php           | 44 +++++++++++++++++++++-
 phpBB/install/database_update.php                  |  7 +---
 .../styles/prosilver/template/overall_header.html  |  2 +-
 5 files changed, 56 insertions(+), 20 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 0483ae009d..a1bef4a85a 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1297,6 +1297,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_notifications'] = array(
 		'COLUMNS'			=> array(
+			'notification_id'	=> array('UINT', NULL, 'auto_increment'),
 			'item_type'			=> array('VCHAR:25', ''),
 			'item_id'			=> array('UINT', 0),
 			'item_parent_id'	=> array('UINT', 0),
@@ -1305,11 +1306,7 @@ function get_schema_struct()
 			'time'				=> array('TIMESTAMP', 1),
 			'data'				=> array('TEXT_UNI', ''),
 		),
-		'PRIMARY_KEY'		=> array(
-			'item_type',
-			'item_id',
-			'user_id',
-		),
+		'PRIMARY_KEY'		=> 'notification_id',
 		'KEYS'				=> array(
 			'item_type'			=> array('INDEX', 'item_type'),
 			'item_id'			=> array('INDEX', 'item_id'),
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,
+		);
 	}
 
 	/**
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 562871be57..5048403881 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1127,6 +1127,7 @@ function database_update_info()
 				),
 				NOTIFICATIONS_TABLE		=> array(
 					'COLUMNS'			=> array(
+						'notification_id'	=> array('UINT', NULL, 'auto_increment'),
 						'item_type'			=> array('VCHAR:25', ''),
 						'item_id'			=> array('UINT', 0),
 						'item_parent_id'	=> array('UINT', 0),
@@ -1135,11 +1136,7 @@ function database_update_info()
 						'time'				=> array('TIMESTAMP', 1),
 						'data'				=> array('TEXT_UNI', ''),
 					),
-					'PRIMARY_KEY'		=> array(
-						'item_type',
-						'item_id',
-						'user_id',
-					),
+					'PRIMARY_KEY'		=> 'notification_id',
 					'KEYS'				=> array(
 						'item_type'			=> array('INDEX', 'item_type'),
 						'item_id'			=> array('INDEX', 'item_id'),
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 8c0cc562ae..1805ca6b8a 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -5,7 +5,7 @@
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
-<title><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
+<title><!-- IF NUM_UNREAD_NOTIFICATIONS -->({NUM_UNREAD_NOTIFICATIONS}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
 <!-- IF S_ENABLE_FEEDS -->
 	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
-- 
cgit v1.2.1


From aaf6711b44c8f86d8fc5ca0d29fb95598ddba762 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 10:15:50 -0500
Subject: [ticket/11103] Some tweaks to the notifications output

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

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 1805ca6b8a..a702c6fc69 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -133,10 +133,10 @@
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
 					<a href="#" title="{L_NOTIFICATIONS}" onClick="$('#notification_list').toggle();">{L_NOTIFICATIONS}</a>
-					<div id="notification_list" style="display: block; position: absolute; width: 330px; background-color: #FFFFFF; z-index: 1;">
+					<div id="notification_list" style="display: none; position: absolute; width: 330px; max-height: 450px; background-color: #FFFFFF; z-index: 1; overflow-y: scroll;">
 						<ul style="list-style-type: none;">
 						<!-- BEGIN notifications -->
-							<li style="padding: 10px; width: 310px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
+							<li style="padding: 10px; width: 290px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
 								<a href="{notifications.URL}" style="text-decoration: none;">
 									{notifications.AVATAR}
 									<div>
-- 
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')

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')

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 +++-----
 phpBB/language/en/common.php                       |  16 +--
 .../styles/prosilver/template/overall_header.html  |   4 +-
 17 files changed, 416 insertions(+), 145 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')

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);
 	}
 }
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3e69c6bb03..4229b41fb8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -385,12 +385,16 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS'				=> '[ Notifications ]',
-	'NOTIFICATION_BOOKMARK'		=> '%1$s replied to the topic "%2$s" you have bookmarked.',
-	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
-	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
-	'NOTIFICATION_QUOTE'		=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
+	'NOTIFICATIONS'						=> '[ Notifications ]',
+	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
+	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
+	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
+	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
+	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
+	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
+	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e217ceb449..87e0a2fa92 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,13 +137,13 @@
 						<ul style="list-style-type: none;">
 						<!-- BEGIN notifications -->
 							<li style="padding: 10px; width: 290px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
-								<a href="{notifications.URL}" style="text-decoration: none;">
+								<!-- IF notifications.URL --><a href="{notifications.URL}" style="text-decoration: none;"><!-- ENDIF -->
 									{notifications.AVATAR}
 									<div>
 										{notifications.FORMATTED_TITLE}<br />
 										{notifications.TIME}
 									</div>
-								</a>
+								<!-- IF notifications.URL --></a><!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
-- 
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 ++++++++++++++++++++++
 phpBB/language/en/common.php                       |  2 +
 .../en/email/notifications/post_in_queue.txt       | 17 ++++
 phpBB/language/en/email/notifications/quote.txt    |  2 +-
 .../en/email/notifications/topic_in_queue.txt      | 17 ++++
 16 files changed, 325 insertions(+), 56 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/post_in_queue.php
 create mode 100644 phpBB/includes/notifications/type/topic_in_queue.php
 create mode 100644 phpBB/language/en/email/notifications/post_in_queue.txt
 create mode 100644 phpBB/language/en/email/notifications/topic_in_queue.txt

(limited to 'phpBB')

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;
+	}
+}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 4229b41fb8..90acd0854b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -391,10 +391,12 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
new file mode 100644
index 0000000000..5ce2b8fe09
--- /dev/null
+++ b/phpBB/language/en/email/notifications/post_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
index 96fd527c8f..8b8584a794 100644
--- a/phpBB/language/en/email/notifications/quote.txt
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -5,7 +5,7 @@ Hello {USERNAME},
 You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic, "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
 
 If you want to view the quoted post, click the following link:
-{U_QUOTED_POST}
+{U_VIEW_POST}
 
 If you want to view the topic, click the following link:
 {U_TOPIC}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
new file mode 100644
index 0000000000..17c8b15880
--- /dev/null
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic , "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
-- 
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 +++----
 phpBB/styles/prosilver/theme/common.css | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'phpBB')

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) . '" />';
 }
 
 /**
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a3f2a83886..a1c71fe228 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -666,7 +666,7 @@ p.rules a {
 	vertical-align: text-bottom;
 }
 
-.notifications-avatar {
+#notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
 
-- 
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')

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 +-
 phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +-
 phpBB/styles/prosilver/theme/common.css                  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB')

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;
 }
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
index 17c8b15880..e1ff486ac5 100644
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the topic , "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+You are receiving this notification because the topic, "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
 
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a1c71fe228..d459c6e559 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -669,7 +669,6 @@ p.rules a {
 #notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
-
 	max-width: 50px;
 	max-height: 50px;
 }
-- 
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 +
 phpBB/index.php                                    |  8 +++
 phpBB/language/en/common.php                       |  3 +-
 phpBB/styles/prosilver/template/ajax.js            |  7 +++
 .../styles/prosilver/template/overall_header.html  | 18 +++---
 phpBB/styles/prosilver/theme/common.css            | 20 ++++++
 8 files changed, 104 insertions(+), 32 deletions(-)

(limited to 'phpBB')

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),
 		);
 	}
 
diff --git a/phpBB/index.php b/phpBB/index.php
index 0ac8034d7f..38eeb2514e 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -56,6 +56,14 @@ if ($ext = $request->variable('ext', ''))
 	exit_handler();
 }
 
+// Mark notifications read
+$mark_notifications = request_var('mark_notification', array(0));
+if (!empty($mark_notifications))
+{
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	$phpbb_notifications->mark_notifications_read_by_id($mark_notifications);
+}
+
 include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
 $user->add_lang('viewforum');
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 90acd0854b..8ad7628891 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -347,6 +347,7 @@ $lang = array_merge($lang, array(
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
+	'MARK_READ'				=> 'Mark read',
 	'MARK_SUBFORUMS_READ'	=> 'Mark subforums read',
 	'MB'					=> 'MB',
 	'MIB'					=> 'MiB',
@@ -385,7 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS'						=> '[ Notifications ]',
+	'NOTIFICATIONS'						=> 'Notifications',
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 54f34e4204..d98070a114 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -77,6 +77,13 @@ $('#qr_full_editor').click(function() {
 });
 
 
+/**
+ * Toggle notification list
+ */
+$('#notification_list_button').click(function() {
+	$('#notification_list').toggle();
+});
+
 
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 87e0a2fa92..242ad60e70 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -130,25 +130,27 @@
 
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
-				<li class="icon-ucp">
-					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-					<a href="#" title="{L_NOTIFICATIONS}" onClick="$('#notification_list').toggle();">{L_NOTIFICATIONS}</a>
-					<div id="notification_list" style="display: none; position: absolute; width: 330px; max-height: 450px; background-color: #FFFFFF; z-index: 1; overflow-y: scroll;">
-						<ul style="list-style-type: none;">
+				<li>
+					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{L_NOTIFICATIONS}</a> ] &bull;
+					<div id="notification_list">
+						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
-							<li style="padding: 10px; width: 290px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
-								<!-- IF notifications.URL --><a href="{notifications.URL}" style="text-decoration: none;"><!-- ENDIF -->
+							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
+								<!-- IF notifications.URL --><a href="{notifications.URL}"><!-- ENDIF -->
 									{notifications.AVATAR}
 									<div>
 										{notifications.FORMATTED_TITLE}<br />
 										{notifications.TIME}
 									</div>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
+								<!-- IF notifications.UNREAD --><a href="{notifications.U_MARK_READ}" title="{L_MARK_READ}">{L_MARK_READ}</a><!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
 					</div>
-						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
+				</li>
+				<li class="icon-ucp">
+					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index d459c6e559..1f5b45e006 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -666,6 +666,26 @@ p.rules a {
 	vertical-align: text-bottom;
 }
 
+#notification_list {
+	display: none;
+	position: absolute;
+	width: 330px;
+	max-height: 350px;
+	z-index: 1;
+	overflow-y: auto;
+	overflow-x: hidden;
+	background-color: #FFFFFF;
+}
+
+#notification_list ul li {
+	padding: 10px;
+	width: 310px;
+}
+
+#notification_list ul li a {
+	text-decoration: none;
+}
+
 #notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
-- 
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')

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')

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 a8e53bda36ee88e5aeb3eec6a7ffee3ddadec5a9 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Sep 2012 10:10:49 -0500
Subject: [ticket/11103] Display number of notifications in the [ Notifications
 ] link

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 242ad60e70..94830bb3a5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -131,7 +131,7 @@
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
 				<li>
-					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{L_NOTIFICATIONS}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{NUM_UNREAD_NOTIFICATIONS} {L_NOTIFICATIONS}</a> ] &bull;
 					<div id="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
-- 
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')

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')

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')

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 +++++++++++++++++++++-
 phpBB/language/en/ucp.php                          | 14 ++++
 .../prosilver/template/ucp_notifications.html      | 48 +++++++++++
 4 files changed, 175 insertions(+), 3 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/ucp_notifications.html

(limited to 'phpBB')

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)),
+			));
+		}
 	}
 }
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 648de587aa..85845d2b27 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -287,6 +287,18 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD'					=> 'New password',
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
+
+	'NOTIFICATION_METHOD_EMAIL'					=> 'Email',
+	'NOTIFICATION_METHOD_JABBER'				=> 'Jabber',
+	'NOTIFICATION_TYPE'							=> 'Notification type',
+	'NOTIFICATION_TYPE_BOOKMARK'				=> 'Someone replies to a topic you have bookmarked',
+	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'		=> 'A post or topic needs approval',
+	'NOTIFICATION_TYPE_MODERATION_QUEUE'   		=> 'Your topics/posts are approved or disapproved by a moderator',
+	'NOTIFICATION_TYPE_PM'						=> 'Someone sends you a private message',
+	'NOTIFICATION_TYPE_POST'					=> 'Someone replies to a topic you are subscribed to',
+	'NOTIFICATION_TYPE_QUOTE'					=> 'Someone quotes you in a post',
+	'NOTIFICATION_TYPE_TOPIC'					=> 'Someone creates a topic in a forum you are subscribed to',
+
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
 	'NOTIFY_METHOD_EMAIL'			=> 'Email only',
@@ -456,6 +468,8 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
+	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification Options',
+
 	'UCP_PREFS'					=> 'Board preferences',
 	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
 	'UCP_PREFS_POST'			=> 'Edit posting defaults',
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
new file mode 100644
index 0000000000..776e565dd0
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -0,0 +1,48 @@
+<!-- INCLUDE ucp_header.html -->
+
+<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
+
+<div class="panel">
+	<div class="inner">
+		<ul class="topiclist">
+			<li class="header">
+				<dl class="icon">
+					<dt>{L_NOTIFICATION_TYPE}</dt>
+						<dd class="topics">{L_NOTIFICATIONS}</dd>
+					<!-- BEGIN notification_methods -->
+						<dd class="topics">{notification_methods.NAME}</dd>
+					<!-- END notification_methods -->
+				</dl>
+			</li>
+		</ul>
+	<ul class="topiclist cplist">
+
+		<!-- BEGIN notification_types -->
+			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+				<dl class="icon">
+					<dt>
+						{notification_types.NAME}<br />
+						{notification_types.DESC}
+					</dt>
+						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
+					<!-- BEGIN notification_methods -->
+						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
+					<!-- END notification_methods -->
+				</dl>
+			</li>
+		<!-- END notification_types -->
+
+		</ul>
+	</div>
+</div>
+
+
+<fieldset class="submit-buttons">
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_FORM_TOKEN}
+</fieldset>
+
+</form>
+
+<!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 544fbe35f4b5cd12e4556c9c300f471a4092dc41 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 22:59:22 -0500
Subject: [ticket/11103] Some tweaks to the template output

PHPBB3-11103
---
 phpBB/language/en/ucp.php                          | 22 +++++++++++-----------
 .../prosilver/template/ucp_notifications.html      | 11 +++++------
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 85845d2b27..66662d2f63 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,16 +288,16 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
-	'NOTIFICATION_METHOD_EMAIL'					=> 'Email',
-	'NOTIFICATION_METHOD_JABBER'				=> 'Jabber',
-	'NOTIFICATION_TYPE'							=> 'Notification type',
-	'NOTIFICATION_TYPE_BOOKMARK'				=> 'Someone replies to a topic you have bookmarked',
-	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'		=> 'A post or topic needs approval',
-	'NOTIFICATION_TYPE_MODERATION_QUEUE'   		=> 'Your topics/posts are approved or disapproved by a moderator',
-	'NOTIFICATION_TYPE_PM'						=> 'Someone sends you a private message',
-	'NOTIFICATION_TYPE_POST'					=> 'Someone replies to a topic you are subscribed to',
-	'NOTIFICATION_TYPE_QUOTE'					=> 'Someone quotes you in a post',
-	'NOTIFICATION_TYPE_TOPIC'					=> 'Someone creates a topic in a forum you are subscribed to',
+	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
+	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
+	'NOTIFICATION_TYPE'									=> 'Notification type',
+	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
+	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
+	'NOTIFICATION_TYPE_MODERATION_QUEUE'   				=> 'Your topics/posts are approved or disapproved by a moderator',
+	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
+	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic you are subscribed to',
+	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
+	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum you are subscribed to',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
@@ -468,7 +468,7 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
-	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification Options',
+	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification options',
 
 	'UCP_PREFS'					=> 'Board preferences',
 	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 776e565dd0..7ded4d01fe 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -8,10 +8,10 @@
 			<li class="header">
 				<dl class="icon">
 					<dt>{L_NOTIFICATION_TYPE}</dt>
-						<dd class="topics">{L_NOTIFICATIONS}</dd>
 					<!-- BEGIN notification_methods -->
-						<dd class="topics">{notification_methods.NAME}</dd>
+						<dd class="mark">{notification_methods.NAME}</dd>
 					<!-- END notification_methods -->
+					<dd class="mark">{L_NOTIFICATIONS}</dd>
 				</dl>
 			</li>
 		</ul>
@@ -21,13 +21,12 @@
 			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl class="icon">
 					<dt>
-						{notification_types.NAME}<br />
-						{notification_types.DESC}
+						{notification_types.NAME}
 					</dt>
-						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
 					<!-- BEGIN notification_methods -->
-						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
+						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
 					<!-- END notification_methods -->
+					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
 				</dl>
 			</li>
 		<!-- END notification_types -->
-- 
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 +-
 .../prosilver/template/ucp_notifications.html      |  6 +--
 12 files changed, 153 insertions(+), 20 deletions(-)

(limited to 'phpBB')

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);
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 7ded4d01fe..0479e66efe 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -6,7 +6,7 @@
 	<div class="inner">
 		<ul class="topiclist">
 			<li class="header">
-				<dl class="icon">
+				<dl>
 					<dt>{L_NOTIFICATION_TYPE}</dt>
 					<!-- BEGIN notification_methods -->
 						<dd class="mark">{notification_methods.NAME}</dd>
@@ -15,11 +15,11 @@
 				</dl>
 			</li>
 		</ul>
-	<ul class="topiclist cplist">
+		<ul class="topiclist cplist">
 
 		<!-- BEGIN notification_types -->
 			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl class="icon">
+				<dl>
 					<dt>
 						{notification_types.NAME}
 					</dt>
-- 
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')

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 ++++++++++++++-------
 phpBB/language/en/common.php                       |  5 ++-
 .../styles/prosilver/template/overall_header.html  |  2 +-
 .../prosilver/template/ucp_notifications.html      |  4 +-
 6 files changed, 80 insertions(+), 19 deletions(-)

(limited to 'phpBB')

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)
 		{
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8ad7628891..43bc6328fe 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,7 +386,10 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS'						=> 'Notifications',
+	'NOTIFICATIONS_CNT'			=> array(
+		1	=> '%d Notification',
+		2	=> '%d Notifications',
+	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 94830bb3a5..ff4e5d7b25 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -131,7 +131,7 @@
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
 				<li>
-					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{NUM_UNREAD_NOTIFICATIONS} {L_NOTIFICATIONS}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_CNT}">{NOTIFICATIONS_CNT}</a> ] &bull;
 					<div id="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 0479e66efe..c6665c16c0 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -24,9 +24,9 @@
 						{notification_types.NAME}
 					</dt>
 					<!-- BEGIN notification_methods -->
-						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
+						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
 					<!-- END notification_methods -->
-					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
+					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
 				</dl>
 			</li>
 		<!-- END notification_types -->
-- 
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')

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')

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')

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 d07cb7b2af2cb7f4ec9459e035561e89f1e69f5c Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 18:56:15 -0500
Subject: [ticket/11103] UCP Notifications module added to db updater

PHPBB3-11103
---
 phpBB/install/database_update.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1c9070a54a..39544bf9ca 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2465,6 +2465,13 @@ function change_database_data(&$no_updates, $version)
 					'auth'		=> '',
 					'cat'		=> 'UCP_PROFILE',
 				),
+				'notification_options'	=> array(
+					'base'		=> 'ucp_notification_options',
+					'class'		=> 'ucp',
+					'title'		=> 'UCP_NOTIFICATION_OPTIONS',
+					'auth'		=> '',
+					'cat'		=> 'UCP_MAIN',
+				),
 			);
 
 			_add_modules($modules_to_install);
@@ -2732,7 +2739,7 @@ function change_database_data(&$no_updates, $version)
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
 			}
-			
+
 			if (!isset($config['site_home_url']))
 			{
 				$config->set('site_home_url', '');
-- 
cgit v1.2.1


From dfb17f444ae560a0af1b242cfbf85008cd993816 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:04:47 -0500
Subject: [ticket/11103] Fix module setup, add explanation to template

PHPBB3-11103
---
 phpBB/install/database_update.php                      | 4 ++--
 phpBB/language/en/ucp.php                              | 3 ++-
 phpBB/styles/prosilver/template/ucp_notifications.html | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 39544bf9ca..b3a1213bb1 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2465,8 +2465,8 @@ function change_database_data(&$no_updates, $version)
 					'auth'		=> '',
 					'cat'		=> 'UCP_PROFILE',
 				),
-				'notification_options'	=> array(
-					'base'		=> 'ucp_notification_options',
+				'notifications'	=> array(
+					'base'		=> 'ucp_notifications',
 					'class'		=> 'ucp',
 					'title'		=> 'UCP_NOTIFICATION_OPTIONS',
 					'auth'		=> '',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 66662d2f63..843039635c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -468,7 +468,8 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
-	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification options',
+	'UCP_NOTIFICATION_OPTIONS'			=> 'Notification options',
+	'UCP_NOTIFICATION_OPTIONS_EXPLAIN'	=> 'Here you can set your preferred notification methods for the board.',
 
 	'UCP_PREFS'					=> 'Board preferences',
 	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index c6665c16c0..531ffd3e6a 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -2,8 +2,12 @@
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
+<h2>{L_UCP_NOTIFICATION_OPTIONS}</h2>
 <div class="panel">
 	<div class="inner">
+
+		<p>{L_UCP_NOTIFICATION_OPTIONS_EXPLAIN}</p>
+
 		<ul class="topiclist">
 			<li class="header">
 				<dl>
-- 
cgit v1.2.1


From 521992215cfaac6ae22421325fbcfb0c3fefecb7 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:08:22 -0500
Subject: [ticket/11103] Language key needed in the UCP

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 843039635c..7ad860673b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,6 +288,7 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
+	'NOTIFICATIONS'										=> 'Notifications',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
-- 
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 ---------------
 .../prosilver/template/ucp_prefs_personal.html     | 24 --------------------
 3 files changed, 11 insertions(+), 57 deletions(-)

(limited to 'phpBB')

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']),
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 29c01e03b9..f03cb2af38 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -38,31 +38,7 @@
 				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-	<!-- ENDIF -->		
-	<!-- IF S_SELECT_NOTIFY -->
-		<dl>
-			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
-			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
-				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
-			</dd>
-		</dl>
 	<!-- ENDIF -->
-	<dl>
-		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd>
-			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt>
-		<dd>
-			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
 	<dl>
 		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
 		<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
-- 
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')

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')

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')

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 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/config/services.yml                              | 2 +-
 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 ++++----
 20 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index d427820f89..598c152fce 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -90,7 +90,7 @@ services:
             - @cache.driver
 
     notifications:
-        class: phpbb_notifications_service
+        class: phpbb_notification_manager
         arguments:
             - @container
 
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')

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/config/services.yml                          | 10 ++-
 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 ++---
 18 files changed, 204 insertions(+), 218 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 598c152fce..f9ae35ba57 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -92,7 +92,15 @@ services:
     notifications:
         class: phpbb_notification_manager
         arguments:
-            - @container
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
 
     processor.ext:
         class: phpbb_di_processor_ext
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 ++--
 phpBB/language/en/common.php                        | 2 +-
 phpBB/styles/prosilver/template/overall_header.html | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB')

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'],
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 43bc6328fe..f05ce5b175 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,7 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS_CNT'			=> array(
+	'NOTIFICATIONS_COUNT'		=> array(
 		1	=> '%d Notification',
 		2	=> '%d Notifications',
 	),
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index ff4e5d7b25..690caea36b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -5,7 +5,7 @@
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
-<title><!-- IF NUM_UNREAD_NOTIFICATIONS -->({NUM_UNREAD_NOTIFICATIONS}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
+<title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
 <!-- IF S_ENABLE_FEEDS -->
 	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
@@ -131,7 +131,7 @@
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
 				<li>
-					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_CNT}">{NOTIFICATIONS_CNT}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
-- 
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/common.php                         |  3 +++
 phpBB/config/services.yml                |  2 +-
 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 +------
 phpBB/index.php                          |  3 +--
 9 files changed, 28 insertions(+), 46 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index c6bb5c6cfe..8035b31d49 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -125,6 +125,9 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 $template = $phpbb_container->get('template');
 $phpbb_style = $phpbb_container->get('style');
 
+// Notifications manager
+$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 $ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
 foreach ($ids as $id)
 {
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index f9ae35ba57..4ae519091b 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -89,7 +89,7 @@ services:
             - .%core.php_ext%
             - @cache.driver
 
-    notifications:
+    notification_manager:
         class: phpbb_notification_manager
         arguments:
             - @dbal.conn
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
diff --git a/phpBB/index.php b/phpBB/index.php
index 38eeb2514e..af0441f5e3 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -31,7 +31,7 @@ if ($ext = $request->variable('ext', ''))
 	if (!$phpbb_extension_manager->available($ext))
 	{
 		send_status_line(404, 'Not Found');
-		trigger_error($user->lang('EXTENSION_DOES_NOT_EXIST', $ext));	
+		trigger_error($user->lang('EXTENSION_DOES_NOT_EXIST', $ext));
 	}
 	else if (!$phpbb_extension_manager->enabled($ext))
 	{
@@ -60,7 +60,6 @@ if ($ext = $request->variable('ext', ''))
 $mark_notifications = request_var('mark_notification', array(0));
 if (!empty($mark_notifications))
 {
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$phpbb_notifications->mark_notifications_read_by_id($mark_notifications);
 }
 
-- 
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')

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 fa605402f79e54c5ac5e1af4f08683c1c17d5201 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 20:48:19 -0500
Subject: [ticket/11103] Create schema files with notification tables

PHPBB3-11103
---
 phpBB/install/schemas/firebird_schema.sql | 45 ++++++++++++++++++++
 phpBB/install/schemas/mssql_schema.sql    | 71 ++++++++++++++++++++++++++++++-
 phpBB/install/schemas/mysql_40_schema.sql | 32 ++++++++++++++
 phpBB/install/schemas/mysql_41_schema.sql | 32 ++++++++++++++
 phpBB/install/schemas/oracle_schema.sql   | 62 +++++++++++++++++++++++++++
 phpBB/install/schemas/postgres_schema.sql | 38 +++++++++++++++++
 phpBB/install/schemas/sqlite_schema.sql   | 31 ++++++++++++++
 7 files changed, 310 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 588557b92a..a122f5818f 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -618,6 +618,38 @@ BEGIN
 END;;
 
 
+# Table: 'phpbb_notifications'
+CREATE TABLE phpbb_notifications (
+	notification_id INTEGER NOT NULL,
+	item_type VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	item_id INTEGER DEFAULT 0 NOT NULL,
+	item_parent_id INTEGER DEFAULT 0 NOT NULL,
+	user_id INTEGER DEFAULT 0 NOT NULL,
+	unread INTEGER DEFAULT 1 NOT NULL,
+	time INTEGER DEFAULT 1 NOT NULL,
+	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
+);;
+
+ALTER TABLE phpbb_notifications ADD PRIMARY KEY (notification_id);;
+
+CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications(item_type);;
+CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications(item_id);;
+CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications(item_parent_id);;
+CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications(user_id);;
+CREATE INDEX phpbb_notifications_time ON phpbb_notifications(time);;
+CREATE INDEX phpbb_notifications_unread ON phpbb_notifications(unread);;
+
+CREATE GENERATOR phpbb_notifications_gen;;
+SET GENERATOR phpbb_notifications_gen TO 0;;
+
+CREATE TRIGGER t_phpbb_notifications FOR phpbb_notifications
+BEFORE INSERT
+AS
+BEGIN
+	NEW.notification_id = GEN_ID(phpbb_notifications_gen, 1);
+END;;
+
+
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
 	poll_option_id INTEGER DEFAULT 0 NOT NULL,
@@ -1201,6 +1233,19 @@ CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch(topic_id);;
 CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch(user_id);;
 CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch(notify_status);;
 
+# Table: 'phpbb_user_notifications'
+CREATE TABLE phpbb_user_notifications (
+	item_type VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	item_id INTEGER DEFAULT 0 NOT NULL,
+	user_id INTEGER DEFAULT 0 NOT NULL,
+	method VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL
+);;
+
+ALTER TABLE phpbb_user_notifications ADD PRIMARY KEY (item_type, item_id, user_id, method);;
+
+CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications(item_type);;
+CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications(user_id);;
+
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
 	group_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 9d0e81a66d..d056e4ceb5 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -751,6 +751,47 @@ CREATE  INDEX [class_left_id] ON [phpbb_modules]([module_class], [left_id]) ON [
 GO
 
 
+/*
+	Table: 'phpbb_notifications'
+*/
+CREATE TABLE [phpbb_notifications] (
+	[notification_id] [int] IDENTITY (1, 1) NOT NULL ,
+	[item_type] [varchar] (25) DEFAULT ('') NOT NULL ,
+	[item_id] [int] DEFAULT (0) NOT NULL ,
+	[item_parent_id] [int] DEFAULT (0) NOT NULL ,
+	[user_id] [int] DEFAULT (0) NOT NULL ,
+	[unread] [int] DEFAULT (1) NOT NULL ,
+	[time] [int] DEFAULT (1) NOT NULL ,
+	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [phpbb_notifications] WITH NOCHECK ADD 
+	CONSTRAINT [PK_phpbb_notifications] PRIMARY KEY  CLUSTERED 
+	(
+		[notification_id]
+	)  ON [PRIMARY] 
+GO
+
+CREATE  INDEX [item_type] ON [phpbb_notifications]([item_type]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [item_id] ON [phpbb_notifications]([item_id]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [item_pid] ON [phpbb_notifications]([item_parent_id]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [user_id] ON [phpbb_notifications]([user_id]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [time] ON [phpbb_notifications]([time]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [unread] ON [phpbb_notifications]([unread]) ON [PRIMARY]
+GO
+
+
 /*
 	Table: 'phpbb_poll_options'
 */
@@ -1110,7 +1151,7 @@ CREATE TABLE [phpbb_reports] (
 	[report_closed] [int] DEFAULT (0) NOT NULL ,
 	[report_time] [int] DEFAULT (0) NOT NULL ,
 	[report_text] [text] DEFAULT ('') NOT NULL ,
-	[reported_post_text] [text] DEFAULT ('') NOT NULL
+	[reported_post_text] [text] DEFAULT ('') NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
@@ -1474,6 +1515,34 @@ CREATE  INDEX [notify_stat] ON [phpbb_topics_watch]([notify_status]) ON [PRIMARY
 GO
 
 
+/*
+	Table: 'phpbb_user_notifications'
+*/
+CREATE TABLE [phpbb_user_notifications] (
+	[item_type] [varchar] (25) DEFAULT ('') NOT NULL ,
+	[item_id] [int] DEFAULT (0) NOT NULL ,
+	[user_id] [int] DEFAULT (0) NOT NULL ,
+	[method] [varchar] (25) DEFAULT ('') NOT NULL 
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [phpbb_user_notifications] WITH NOCHECK ADD 
+	CONSTRAINT [PK_phpbb_user_notifications] PRIMARY KEY  CLUSTERED 
+	(
+		[item_type],
+		[item_id],
+		[user_id],
+		[method]
+	)  ON [PRIMARY] 
+GO
+
+CREATE  INDEX [it] ON [phpbb_user_notifications]([item_type]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [uid] ON [phpbb_user_notifications]([user_id]) ON [PRIMARY]
+GO
+
+
 /*
 	Table: 'phpbb_user_group'
 */
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index e71afcd5b3..eff9dc46b8 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -430,6 +430,26 @@ CREATE TABLE phpbb_modules (
 );
 
 
+# Table: 'phpbb_notifications'
+CREATE TABLE phpbb_notifications (
+	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	item_type varbinary(25) DEFAULT '' NOT NULL,
+	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
+	data blob NOT NULL,
+	PRIMARY KEY (notification_id),
+	KEY item_type (item_type),
+	KEY item_id (item_id),
+	KEY item_pid (item_parent_id),
+	KEY user_id (user_id),
+	KEY time (time),
+	KEY unread (unread)
+);
+
+
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
 	poll_option_id tinyint(4) DEFAULT '0' NOT NULL,
@@ -849,6 +869,18 @@ CREATE TABLE phpbb_topics_watch (
 );
 
 
+# Table: 'phpbb_user_notifications'
+CREATE TABLE phpbb_user_notifications (
+	item_type varbinary(25) DEFAULT '' NOT NULL,
+	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	method varbinary(25) DEFAULT '' NOT NULL,
+	PRIMARY KEY (item_type, item_id, user_id, method),
+	KEY it (item_type),
+	KEY uid (user_id)
+);
+
+
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
 	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 20af6f3566..e7e3018572 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -430,6 +430,26 @@ CREATE TABLE phpbb_modules (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_notifications'
+CREATE TABLE phpbb_notifications (
+	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
+	data text NOT NULL,
+	PRIMARY KEY (notification_id),
+	KEY item_type (item_type),
+	KEY item_id (item_id),
+	KEY item_pid (item_parent_id),
+	KEY user_id (user_id),
+	KEY time (time),
+	KEY unread (unread)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
 	poll_option_id tinyint(4) DEFAULT '0' NOT NULL,
@@ -849,6 +869,18 @@ CREATE TABLE phpbb_topics_watch (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_user_notifications'
+CREATE TABLE phpbb_user_notifications (
+	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	method varchar(25) DEFAULT '' NOT NULL,
+	PRIMARY KEY (item_type, item_id, user_id, method),
+	KEY it (item_type),
+	KEY uid (user_id)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
 	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 04155fe28b..6269cfcdbc 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -840,6 +840,51 @@ END;
 /
 
 
+/*
+	Table: 'phpbb_notifications'
+*/
+CREATE TABLE phpbb_notifications (
+	notification_id number(8) NOT NULL,
+	item_type varchar2(25) DEFAULT '' ,
+	item_id number(8) DEFAULT '0' NOT NULL,
+	item_parent_id number(8) DEFAULT '0' NOT NULL,
+	user_id number(8) DEFAULT '0' NOT NULL,
+	unread number(1) DEFAULT '1' NOT NULL,
+	time number(11) DEFAULT '1' NOT NULL,
+	data clob DEFAULT '' ,
+	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
+)
+/
+
+CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications (item_type)
+/
+CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications (item_id)
+/
+CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id)
+/
+CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id)
+/
+CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time)
+/
+CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread)
+/
+
+CREATE SEQUENCE phpbb_notifications_seq
+/
+
+CREATE OR REPLACE TRIGGER t_phpbb_notifications
+BEFORE INSERT ON phpbb_notifications
+FOR EACH ROW WHEN (
+	new.notification_id IS NULL OR new.notification_id = 0
+)
+BEGIN
+	SELECT phpbb_notifications_seq.nextval
+	INTO :new.notification_id
+	FROM dual;
+END;
+/
+
+
 /*
 	Table: 'phpbb_poll_options'
 */
@@ -1589,6 +1634,23 @@ CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id)
 CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status)
 /
 
+/*
+	Table: 'phpbb_user_notifications'
+*/
+CREATE TABLE phpbb_user_notifications (
+	item_type varchar2(25) DEFAULT '' ,
+	item_id number(8) DEFAULT '0' NOT NULL,
+	user_id number(8) DEFAULT '0' NOT NULL,
+	method varchar2(25) DEFAULT '' ,
+	CONSTRAINT pk_phpbb_user_notifications PRIMARY KEY (item_type, item_id, user_id, method)
+)
+/
+
+CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type)
+/
+CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id)
+/
+
 /*
 	Table: 'phpbb_user_group'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 659a32bf19..d8716be70d 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -596,6 +596,30 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
 CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);
 CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);
 
+/*
+	Table: 'phpbb_notifications'
+*/
+CREATE SEQUENCE phpbb_notifications_seq;
+
+CREATE TABLE phpbb_notifications (
+	notification_id INT4 DEFAULT nextval('phpbb_notifications_seq'),
+	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
+	item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
+	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
+	unread INT2 DEFAULT '1' NOT NULL CHECK (unread >= 0),
+	time INT4 DEFAULT '1' NOT NULL CHECK (time >= 0),
+	data varchar(4000) DEFAULT '' NOT NULL,
+	PRIMARY KEY (notification_id)
+);
+
+CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications (item_type);
+CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications (item_id);
+CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id);
+CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
+CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
+CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
+
 /*
 	Table: 'phpbb_poll_options'
 */
@@ -1093,6 +1117,20 @@ CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id);
 CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id);
 CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status);
 
+/*
+	Table: 'phpbb_user_notifications'
+*/
+CREATE TABLE phpbb_user_notifications (
+	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
+	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
+	method varchar(25) DEFAULT '' NOT NULL,
+	PRIMARY KEY (item_type, item_id, user_id, method)
+);
+
+CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type);
+CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id);
+
 /*
 	Table: 'phpbb_user_group'
 */
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 8360bc30ea..4cb20b868f 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -417,6 +417,25 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
 CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);
 CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);
 
+# Table: 'phpbb_notifications'
+CREATE TABLE phpbb_notifications (
+	notification_id INTEGER PRIMARY KEY NOT NULL ,
+	item_type varchar(25) NOT NULL DEFAULT '',
+	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	item_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	time INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	data text(65535) NOT NULL DEFAULT ''
+);
+
+CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications (item_type);
+CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications (item_id);
+CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id);
+CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
+CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
+CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
+
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
 	poll_option_id tinyint(4) NOT NULL DEFAULT '0',
@@ -823,6 +842,18 @@ CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id);
 CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id);
 CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status);
 
+# Table: 'phpbb_user_notifications'
+CREATE TABLE phpbb_user_notifications (
+	item_type varchar(25) NOT NULL DEFAULT '',
+	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	method varchar(25) NOT NULL DEFAULT '',
+	PRIMARY KEY (item_type, item_id, user_id, method)
+);
+
+CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type);
+CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id);
+
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
 	group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
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')

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')

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')

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 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 +++++++++++++--------
 phpBB/install/database_update.php                   |  5 +++++
 phpBB/install/schemas/schema_data.sql               |  1 +
 phpBB/language/en/acp/common.php                    |  2 ++
 phpBB/styles/prosilver/template/overall_header.html |  2 ++
 6 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'phpBB')

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'],
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b3a1213bb1..9cb0785c89 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2746,6 +2746,11 @@ function change_database_data(&$no_updates, $version)
 				$config->set('site_home_text', '');
 			}
 
+			if (!isset($config['load_notifications']))
+			{
+				$config->set('load_notifications', 1);
+			}
+
 		break;
 	}
 }
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index dbb5fd7481..0d47f4995e 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -175,6 +175,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_cdn',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_notifications', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_guests', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_time', '5');
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5eb10d50b3..0096a84878 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -250,6 +250,8 @@ $lang = array_merge($lang, array(
 	'IP'					=> 'User IP',
 	'IP_HOSTNAME'			=> 'IP addresses or hostnames',
 
+	'LOAD_NOTIFICATIONS'			=> 'Display Notifications',
+	'LOAD_NOTIFICATIONS_EXPLAIN'	=> 'Display the notifications list on every page (typically in the header).',
 	'LOGGED_IN_AS'			=> 'You are logged in as:',
 	'LOGIN_ADMIN'			=> 'To administer the board you must be an authenticated user.',
 	'LOGIN_ADMIN_CONFIRM'	=> 'To administer the board you must re-authenticate yourself.',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 690caea36b..2f789f3f2c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -130,6 +130,7 @@
 
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
+				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list">
@@ -149,6 +150,7 @@
 						</ul>
 					</div>
 				</li>
+				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
-- 
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')

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')

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 +-
 phpBB/install/database_update.php             | 2 +-
 phpBB/language/en/ucp.php                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

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')),
 			),
 		);
 	}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9cb0785c89..965cb45dce 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2470,7 +2470,7 @@ function change_database_data(&$no_updates, $version)
 					'class'		=> 'ucp',
 					'title'		=> 'UCP_NOTIFICATION_OPTIONS',
 					'auth'		=> '',
-					'cat'		=> 'UCP_MAIN',
+					'cat'		=> 'UCP_PREFS',
 				),
 			);
 
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7ad860673b..78f863541c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -469,7 +469,7 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
-	'UCP_NOTIFICATION_OPTIONS'			=> 'Notification options',
+	'UCP_NOTIFICATION_OPTIONS'			=> 'Edit notification options',
 	'UCP_NOTIFICATION_OPTIONS_EXPLAIN'	=> 'Here you can set your preferred notification methods for the board.',
 
 	'UCP_PREFS'					=> 'Board preferences',
-- 
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')

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 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')

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')

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 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 ++++++++++++++++
 phpBB/language/en/common.php                       |   1 +
 .../en/email/notifications/report_post.txt         |  17 ++
 phpBB/language/en/ucp.php                          |   1 +
 phpBB/report.php                                   |   8 +-
 9 files changed, 349 insertions(+), 88 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
 create mode 100644 phpBB/language/en/email/notifications/report_post.txt

(limited to 'phpBB')

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);
+	}
+}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f05ce5b175..ae487f7159 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,6 +397,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
+	'NOTIFICATION_REPORT'				=> 'A post "%1$s" was reported because "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
new file mode 100644
index 0000000000..f0863d346e
--- /dev/null
+++ b/phpBB/language/en/email/notifications/report_post.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 78f863541c..e2dbd542f9 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -298,6 +298,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
 	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic you are subscribed to',
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
+	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
 	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum you are subscribed to',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
diff --git a/phpBB/report.php b/phpBB/report.php
index 29b46a6211..8bede2cffd 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -131,7 +131,7 @@ else
 		$message .= '<br /><br />' . sprintf($user->lang['RETURN_PM'], '<a href="' . $redirect_url . '">', '</a>');
 		trigger_error($message);
 	}
-	
+
 	$reported_post_text = $report_data['message_text'];
 }
 
@@ -184,6 +184,9 @@ if ($submit && $reason_id)
 
 		$lang_return = $user->lang['RETURN_TOPIC'];
 		$lang_success = $user->lang['POST_REPORTED_SUCCESS'];
+
+		// Notify relevant users
+		$phpbb_notifications->add_notifications('report_post', array_merge($report_data, $row, $forum_data));
 	}
 	else
 	{
@@ -210,6 +213,9 @@ if ($submit && $reason_id)
 
 		$lang_return = $user->lang['RETURN_PM'];
 		$lang_success = $user->lang['PM_REPORTED_SUCCESS'];
+
+		// Notify relevant users
+		//$phpbb_notifications->add_notifications('report_pm', $report_data);
 	}
 
 	meta_refresh(3, $redirect_url);
-- 
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 +-
 phpBB/language/en/common.php                       |  3 +-
 .../language/en/email/notifications/report_pm.txt  | 14 +++++++
 phpBB/report.php                                   |  5 ++-
 6 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 phpBB/language/en/email/notifications/report_pm.txt

(limited to 'phpBB')

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)
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ae487f7159..cbf8e6ee4c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,7 +397,8 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_REPORT'				=> 'A post "%1$s" was reported because "%2$s".',
+	'NOTIFICATION_REPORT_PM'			=> 'A Private Message "%1$s" was reported because "%2$s".',
+	'NOTIFICATION_REPORT_POST'			=> 'A post "%1$s" was reported because "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
new file mode 100644
index 0000000000..eeaa8ee9b9
--- /dev/null
+++ b/phpBB/language/en/email/notifications/report_pm.txt
@@ -0,0 +1,14 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a Private Message titled, "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/report.php b/phpBB/report.php
index 8bede2cffd..dd1cc2514c 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -215,7 +215,10 @@ if ($submit && $reason_id)
 		$lang_success = $user->lang['PM_REPORTED_SUCCESS'];
 
 		// Notify relevant users
-		//$phpbb_notifications->add_notifications('report_pm', $report_data);
+		$phpbb_notifications->add_notifications('report_pm', array_merge($report_data, $row, array(
+			'from_user_id'	=> $report_data['author_id'],
+			'report_id'		=> $report_id,
+		)));
 	}
 
 	meta_refresh(3, $redirect_url);
-- 
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 +++++++++++++++++++++
 phpBB/language/en/common.php                       |   5 +-
 6 files changed, 345 insertions(+), 24 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')

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;
+	}
+}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index cbf8e6ee4c..78ba02ed0f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,8 +397,9 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_REPORT_PM'			=> 'A Private Message "%1$s" was reported because "%2$s".',
-	'NOTIFICATION_REPORT_POST'			=> 'A post "%1$s" was reported because "%2$s".',
+	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" because "%3$s".',
+	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" because "%3$s".',
+	'NOTIFICATION_REPORT_CLOSED'   		=> '%1$s closed the report you made for "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
-- 
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')

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')

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')

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')

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 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')

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')

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')

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')

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')

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 +++++++++++++-
 phpBB/install/database_update.php                  |   9 +-
 phpBB/language/en/ucp.php                          |   5 +
 .../styles/prosilver/template/overall_header.html  |   2 +-
 .../prosilver/template/ucp_notifications.html      | 122 +++++++++++++++------
 phpBB/styles/prosilver/theme/common.css            |   4 +-
 9 files changed, 215 insertions(+), 49 deletions(-)

(limited to 'phpBB')

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(),
+		));
 	}
 
 	/**
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 76af67545a..958db6b531 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2465,13 +2465,20 @@ function change_database_data(&$no_updates, $version)
 					'auth'		=> '',
 					'cat'		=> 'UCP_PROFILE',
 				),
-				'notifications'	=> array(
+				'notification_options'	=> array(
 					'base'		=> 'ucp_notifications',
 					'class'		=> 'ucp',
 					'title'		=> 'UCP_NOTIFICATION_OPTIONS',
 					'auth'		=> '',
 					'cat'		=> 'UCP_PREFS',
 				),
+				'notification_list'	=> array(
+					'base'		=> 'ucp_notifications',
+					'class'		=> 'ucp',
+					'title'		=> 'UCP_NOTIFICATION_LIST',
+					'auth'		=> '',
+					'cat'		=> 'UCP_MAIN',
+				),
 			);
 
 			_add_modules($modules_to_install);
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index e2dbd542f9..d75609880b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -289,6 +289,9 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
 	'NOTIFICATIONS'										=> 'Notifications',
+	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
+	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
+	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
@@ -470,6 +473,8 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
+	'UCP_NOTIFICATION_LIST'				=> 'Manage notifications',
+	'UCP_NOTIFICATION_LIST_EXPLAIN'		=> 'Here you may view all past notifications.',
 	'UCP_NOTIFICATION_OPTIONS'			=> 'Edit notification options',
 	'UCP_NOTIFICATION_OPTIONS_EXPLAIN'	=> 'Here you can set your preferred notification methods for the board.',
 
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2f789f3f2c..e00ad555ff 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -133,7 +133,7 @@
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
-					<div id="notification_list">
+					<div id="notification_list" class="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
 							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 531ffd3e6a..3ee58a278e 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -2,45 +2,105 @@
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
-<h2>{L_UCP_NOTIFICATION_OPTIONS}</h2>
+<h2>{TITLE}</h2>
 <div class="panel">
 	<div class="inner">
 
-		<p>{L_UCP_NOTIFICATION_OPTIONS_EXPLAIN}</p>
-
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_NOTIFICATION_TYPE}</dt>
-					<!-- BEGIN notification_methods -->
-						<dd class="mark">{notification_methods.NAME}</dd>
-					<!-- END notification_methods -->
-					<dd class="mark">{L_NOTIFICATIONS}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN notification_types -->
-			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl>
-					<dt>
-						{notification_types.NAME}
-					</dt>
-					<!-- BEGIN notification_methods -->
-						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-					<!-- END notification_methods -->
-					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-				</dl>
-			</li>
-		<!-- END notification_types -->
-
-		</ul>
+		<p>{TITLE_EXPLAIN}</p>
+
+		<!-- IF MODE == 'notification_options' -->
+			<ul class="topiclist">
+				<li class="header">
+					<dl>
+						<dt>{L_NOTIFICATION_TYPE}</dt>
+						<!-- BEGIN notification_methods -->
+							<dd class="mark">{notification_methods.NAME}</dd>
+						<!-- END notification_methods -->
+						<dd class="mark">{L_NOTIFICATIONS}</dd>
+					</dl>
+				</li>
+			</ul>
+			<ul class="topiclist cplist">
+
+			<!-- BEGIN notification_types -->
+				<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+					<dl>
+						<dt>
+							{notification_types.NAME}
+						</dt>
+						<!-- BEGIN notification_methods -->
+							<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+						<!-- END notification_methods -->
+						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+					</dl>
+				</li>
+			<!-- END notification_types -->
+			</ul>
+		<!-- ELSE -->
+			<!-- IF .pagination or TOTAL_COUNT -->
+				<div class="topic-actions">
+					<div class="pagination">
+						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
+						<!-- IF TOTAL_COUNT -->{TOTAL_COUNT} &bull; <!-- ENDIF -->
+						<!-- IF .pagination -->
+							<!-- INCLUDE pagination.html -->
+						<!-- ELSE -->
+							{PAGE_NUMBER}
+						<!-- ENDIF -->
+					</div>
+				</div>
+			<!-- ENDIF -->
+
+			<ul class="topiclist">
+				<li class="header">
+					<dl>
+						<dt>{L_NOTIFICATIONS}</dt>
+						<dd class="mark">{L_MARK_READ}</dd>
+					</dl>
+				</li>
+			</ul>
+
+			<div class="notification_list">
+				<ul class="topiclist cplist">
+				<!-- BEGIN notification_list -->
+					<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
+						<dl>
+							<dt>
+								<!-- IF notification_list.URL --><a href="{notification_list.URL}"><!-- ENDIF -->
+									{notification_list.AVATAR}
+									<div>
+										{notification_list.FORMATTED_TITLE}<br />
+										{notification_list.TIME}
+									</div>
+								<!-- IF notification_list.URL --></a><!-- ENDIF -->
+							</dt>
+							<dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd>
+						</dl>
+					</li>
+				<!-- END notification_list -->
+				</ul>
+			</div>
+
+			<!-- IF .pagination or TOTAL_COUNT -->
+				<div class="topic-actions">
+					<div class="pagination">
+						<!-- IF TOTAL_COUNT -->{TOTAL_COUNT} &bull; <!-- ENDIF -->
+						<!-- IF .pagination -->
+							<!-- INCLUDE pagination.html -->
+						<!-- ELSE -->
+							{PAGE_NUMBER}
+						<!-- ENDIF -->
+					</div>
+				</div>
+			<!-- ENDIF -->
+
+		<!-- ENDIF -->
 	</div>
 </div>
 
 
 <fieldset class="submit-buttons">
+	<input type="hidden" name="form_time" value="{FORM_TIME}" />
 	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 1f5b45e006..3d8d640598 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -682,11 +682,11 @@ p.rules a {
 	width: 310px;
 }
 
-#notification_list ul li a {
+.notification_list ul li a {
 	text-decoration: none;
 }
 
-#notification_list ul li img {
+.notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
 	max-width: 50px;
-- 
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/develop/create_schema_files.php         |  2 ++
 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 ++++--
 phpBB/install/database_update.php             |  2 ++
 phpBB/install/schemas/firebird_schema.sql     |  2 ++
 phpBB/install/schemas/mssql_schema.sql        |  4 ++++
 phpBB/install/schemas/mysql_40_schema.sql     |  4 +++-
 phpBB/install/schemas/mysql_41_schema.sql     |  4 +++-
 phpBB/install/schemas/oracle_schema.sql       |  3 +++
 phpBB/install/schemas/postgres_schema.sql     |  2 ++
 phpBB/install/schemas/sqlite_schema.sql       |  2 ++
 14 files changed, 45 insertions(+), 12 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index a1bef4a85a..69aca10e6c 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1303,6 +1303,7 @@ function get_schema_struct()
 			'item_parent_id'	=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'unread'			=> array('BOOL', 1),
+			'is_disabled'		=> array('BOOL', 0),
 			'time'				=> array('TIMESTAMP', 1),
 			'data'				=> array('TEXT_UNI', ''),
 		),
@@ -1314,6 +1315,7 @@ function get_schema_struct()
 			'user_id'			=> array('INDEX', 'user_id'),
 			'time'				=> array('INDEX', 'time'),
 			'unread'			=> array('INDEX', 'unread'),
+			'is_disabled'		=> array('INDEX', 'is_disabled'),
 		),
 	);
 
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))
 		{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 958db6b531..73637122ce 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1133,6 +1133,7 @@ function database_update_info()
 						'item_parent_id'	=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
 						'unread'			=> array('BOOL', 1),
+						'is_disabled'		=> array('BOOL', 0),
 						'time'				=> array('TIMESTAMP', 1),
 						'data'				=> array('TEXT_UNI', ''),
 					),
@@ -1144,6 +1145,7 @@ function database_update_info()
 						'user_id'			=> array('INDEX', 'user_id'),
 						'time'				=> array('INDEX', 'time'),
 						'unread'			=> array('INDEX', 'unread'),
+						'is_disabled'		=> array('INDEX', 'is_disabled'),
 					),
 				),
 				USER_NOTIFICATIONS_TABLE	=> array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index a122f5818f..1e4ae2e132 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -626,6 +626,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
 	unread INTEGER DEFAULT 1 NOT NULL,
+	is_disabled INTEGER DEFAULT 0 NOT NULL,
 	time INTEGER DEFAULT 1 NOT NULL,
 	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
@@ -638,6 +639,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications(item_parent_id)
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications(user_id);;
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications(time);;
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications(unread);;
+CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications(is_disabled);;
 
 CREATE GENERATOR phpbb_notifications_gen;;
 SET GENERATOR phpbb_notifications_gen TO 0;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index d056e4ceb5..5a397743c4 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -761,6 +761,7 @@ CREATE TABLE [phpbb_notifications] (
 	[item_parent_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[unread] [int] DEFAULT (1) NOT NULL ,
+	[is_disabled] [int] DEFAULT (0) NOT NULL ,
 	[time] [int] DEFAULT (1) NOT NULL ,
 	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
@@ -791,6 +792,9 @@ GO
 CREATE  INDEX [unread] ON [phpbb_notifications]([unread]) ON [PRIMARY]
 GO
 
+CREATE  INDEX [is_disabled] ON [phpbb_notifications]([is_disabled]) ON [PRIMARY]
+GO
+
 
 /*
 	Table: 'phpbb_poll_options'
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index eff9dc46b8..fd7f9a6025 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -438,6 +438,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	is_disabled tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data blob NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -446,7 +447,8 @@ CREATE TABLE phpbb_notifications (
 	KEY item_pid (item_parent_id),
 	KEY user_id (user_id),
 	KEY time (time),
-	KEY unread (unread)
+	KEY unread (unread),
+	KEY is_disabled (is_disabled)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index e7e3018572..8700b46c91 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -438,6 +438,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	is_disabled tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data text NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -446,7 +447,8 @@ CREATE TABLE phpbb_notifications (
 	KEY item_pid (item_parent_id),
 	KEY user_id (user_id),
 	KEY time (time),
-	KEY unread (unread)
+	KEY unread (unread),
+	KEY is_disabled (is_disabled)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 6269cfcdbc..f2f22e2f5e 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -850,6 +850,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	unread number(1) DEFAULT '1' NOT NULL,
+	is_disabled number(1) DEFAULT '0' NOT NULL,
 	time number(11) DEFAULT '1' NOT NULL,
 	data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
@@ -868,6 +869,8 @@ CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time)
 /
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread)
 /
+CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled)
+/
 
 CREATE SEQUENCE phpbb_notifications_seq
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d8716be70d..ffba657475 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -608,6 +608,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	unread INT2 DEFAULT '1' NOT NULL CHECK (unread >= 0),
+	is_disabled INT2 DEFAULT '0' NOT NULL CHECK (is_disabled >= 0),
 	time INT4 DEFAULT '1' NOT NULL CHECK (time >= 0),
 	data varchar(4000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (notification_id)
@@ -619,6 +620,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
+CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled);
 
 /*
 	Table: 'phpbb_poll_options'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 4cb20b868f..b63569ce3e 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -425,6 +425,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	is_disabled INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	time INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	data text(65535) NOT NULL DEFAULT ''
 );
@@ -435,6 +436,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
+CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled);
 
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
-- 
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 +++++++++++++---------
 phpBB/language/en/ucp.php                          |  3 +
 .../prosilver/template/ucp_notifications.html      | 33 +++++++----
 15 files changed, 115 insertions(+), 55 deletions(-)

(limited to 'phpBB')

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,
+					));
+				}
 			}
 		}
 	}
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d75609880b..1d17ed5caf 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -292,6 +292,9 @@ $lang = array_merge($lang, array(
 	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
 	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
 	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
+	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
+	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
+	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 3ee58a278e..94e8432508 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -23,17 +23,28 @@
 			<ul class="topiclist cplist">
 
 			<!-- BEGIN notification_types -->
-				<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-					<dl>
-						<dt>
-							{notification_types.NAME}
-						</dt>
-						<!-- BEGIN notification_methods -->
-							<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-						<!-- END notification_methods -->
-						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-					</dl>
-				</li>
+				<!-- IF notification_types.GROUP_NAME -->
+					<li class="row bg3">
+						<dl>
+							<dt>
+								{notification_types.GROUP_NAME}
+							</dt>
+						</dl>
+					</li>
+				<!-- ELSE -->
+					<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+						<dl>
+							<dt>
+								{notification_types.NAME}
+								<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
+							</dt>
+							<!-- BEGIN notification_methods -->
+								<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+							<!-- END notification_methods -->
+							<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+						</dl>
+					</li>
+				<!-- ENDIF -->
 			<!-- END notification_types -->
 			</ul>
 		<!-- ELSE -->
-- 
cgit v1.2.1


From 716635c834dd2d6644f3d47c67f7184f95a35c0b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 10:58:23 -0500
Subject: [ticket/11103] Fix some language strings

Newlines at end of email files

PHPBB3-11103
---
 phpBB/language/en/common.php                             | 8 ++++----
 phpBB/language/en/email/notifications/bookmark.txt       | 4 ++--
 phpBB/language/en/email/notifications/post_in_queue.txt  | 2 +-
 phpBB/language/en/email/notifications/quote.txt          | 2 +-
 phpBB/language/en/email/notifications/report_pm.txt      | 2 +-
 phpBB/language/en/email/notifications/report_post.txt    | 2 +-
 phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +-
 phpBB/styles/prosilver/template/ajax.js                  | 6 +-----
 8 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 78ba02ed0f..2f9f646cd3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -394,15 +394,15 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
-	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" because "%3$s".',
-	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" because "%3$s".',
+	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
+	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_CLOSED'   		=> '%1$s closed the report you made for "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
-	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt
index 9888008604..95f17b5693 100644
--- a/phpBB/language/en/email/notifications/bookmark.txt
+++ b/phpBB/language/en/email/notifications/bookmark.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}" has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
@@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
index 5ce2b8fe09..5208182a70 100644
--- a/phpBB/language/en/email/notifications/post_in_queue.txt
+++ b/phpBB/language/en/email/notifications/post_in_queue.txt
@@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
index 8b8584a794..0efcf7940c 100644
--- a/phpBB/language/en/email/notifications/quote.txt
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies quoting you, please updat
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
index eeaa8ee9b9..f515242893 100644
--- a/phpBB/language/en/email/notifications/report_pm.txt
+++ b/phpBB/language/en/email/notifications/report_pm.txt
@@ -11,4 +11,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
index f0863d346e..4ece935ccb 100644
--- a/phpBB/language/en/email/notifications/report_post.txt
+++ b/phpBB/language/en/email/notifications/report_post.txt
@@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
index e1ff486ac5..782fc4d629 100644
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index d98070a114..0fd56f0e28 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -76,15 +76,11 @@ $('#qr_full_editor').click(function() {
 	});
 });
 
-
-/**
- * Toggle notification list
- */
+// Toggle notification list
 $('#notification_list_button').click(function() {
 	$('#notification_list').toggle();
 });
 
-
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
  * callback / data attribute is that it requires filtering - some of the options
-- 
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 +++++-----
 phpBB/index.php                                    | 24 ++++++++++++++------
 phpBB/language/en/common.php                       |  4 ++--
 .../styles/prosilver/template/overall_header.html  | 15 +++++++------
 .../prosilver/template/ucp_notifications.html      | 15 ++++++++-----
 phpBB/styles/prosilver/theme/common.css            | 26 +++++++++++++++++-----
 7 files changed, 63 insertions(+), 35 deletions(-)

(limited to 'phpBB')

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);
 	}
diff --git a/phpBB/index.php b/phpBB/index.php
index af0441f5e3..7f85879d23 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -23,6 +23,23 @@ $user->session_begin();
 $auth->acl($user->data);
 $user->setup();
 
+// Mark notifications read
+if (($mark_notification = request_var('mark_notification', 0)))
+{
+	$notification = $phpbb_notifications->load_notifications(array(
+		'notification_id'	=> $mark_notification
+	));
+
+	if (isset($notification['notifications'][$mark_notification]))
+	{
+		$notification = $notification['notifications'][$mark_notification];
+
+		$notification->mark_read();
+
+		redirect($notification->get_url());
+	}
+}
+
 // Handle the display of extension front pages
 if ($ext = $request->variable('ext', ''))
 {
@@ -56,13 +73,6 @@ if ($ext = $request->variable('ext', ''))
 	exit_handler();
 }
 
-// Mark notifications read
-$mark_notifications = request_var('mark_notification', array(0));
-if (!empty($mark_notifications))
-{
-	$phpbb_notifications->mark_notifications_read_by_id($mark_notifications);
-}
-
 include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
 $user->add_lang('viewforum');
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 2f9f646cd3..8980c274ef 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -395,7 +395,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
-	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
+	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
 	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
@@ -403,7 +403,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved for reason: "%2$s".',
-	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.',
+	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e00ad555ff..20b98c6f8c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,14 +137,15 @@
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
 							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-								<!-- IF notifications.URL --><a href="{notifications.URL}"><!-- ENDIF -->
-									{notifications.AVATAR}
-									<div>
-										{notifications.FORMATTED_TITLE}<br />
-										{notifications.TIME}
-									</div>
+								<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<span>
+										{notifications.AVATAR}
+										<span class="notification_title">
+											{notifications.FORMATTED_TITLE}
+											<div class="notification_time">{notifications.TIME}</div>
+										</span>
+								</span>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
-								<!-- IF notifications.UNREAD --><a href="{notifications.U_MARK_READ}" title="{L_MARK_READ}">{L_MARK_READ}</a><!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 94e8432508..f71d8698b9 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -77,14 +77,17 @@
 					<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
 						<dl>
 							<dt>
-								<!-- IF notification_list.URL --><a href="{notification_list.URL}"><!-- ENDIF -->
-									{notification_list.AVATAR}
-									<div>
-										{notification_list.FORMATTED_TITLE}<br />
-										{notification_list.TIME}
-									</div>
+								<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<span>
+										{notification_list.AVATAR}
+										<span class="notification_title">
+											{notification_list.FORMATTED_TITLE}
+											<div class="notification_time">{notification_list.TIME}</div>
+										</span>
+								</span>
 								<!-- IF notification_list.URL --></a><!-- ENDIF -->
 							</dt>
+
 							<dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd>
 						</dl>
 					</li>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3d8d640598..c82fa5b7c8 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -680,15 +680,29 @@ p.rules a {
 #notification_list ul li {
 	padding: 10px;
 	width: 310px;
+	line-height: 1.5em;
 }
 
-.notification_list ul li a {
-	text-decoration: none;
-}
-
-.notification_list ul li img {
+.notification_list ul li a span img {
 	float: left;
-	padding: 0 10px 10px 0;
 	max-width: 50px;
 	max-height: 50px;
 }
+
+.notification_list ul li span .notification_title {
+	float: left;
+	width: 240px;
+	margin: 0 0 0 5px;
+	word-wrap: break-word;
+	position: relative;
+	top: -0.2em;
+}
+
+.notification_list ul li dl dt span .notification_title {
+	width: auto;
+	padding: 10px 0 0 0;
+}
+
+.notification_time {
+	margin-top: 0.5em;
+}
-- 
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')

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 31502cdd6c3a5bac5164ec30530e5b4bf63f3196 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:45:04 -0500
Subject: [ticket/11103] Fix comma usage

https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084

PHPBB3-11103
---
 phpBB/language/en/email/forum_notify.txt                 | 2 +-
 phpBB/language/en/email/newtopic_notify.txt              | 2 +-
 phpBB/language/en/email/notifications/post_in_queue.txt  | 2 +-
 phpBB/language/en/email/notifications/quote.txt          | 2 +-
 phpBB/language/en/email/notifications/report_pm.txt      | 2 +-
 phpBB/language/en/email/notifications/report_post.txt    | 2 +-
 phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +-
 phpBB/language/en/email/topic_notify.txt                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index fae5a83885..bbfd3ad7e7 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
 
 {U_NEWEST_POST}
 
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index 529bbf0f8f..badc48b5a9 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
 
 {U_FORUM}
 
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
index 5208182a70..8d56ce6c4d 100644
--- a/phpBB/language/en/email/notifications/post_in_queue.txt
+++ b/phpBB/language/en/email/notifications/post_in_queue.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
 
 If you want to view the post, click the following link:
 {U_VIEW_POST}
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
index 0efcf7940c..2b9525801f 100644
--- a/phpBB/language/en/email/notifications/quote.txt
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic, "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
 
 If you want to view the quoted post, click the following link:
 {U_VIEW_POST}
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
index f515242893..66ae82d074 100644
--- a/phpBB/language/en/email/notifications/report_pm.txt
+++ b/phpBB/language/en/email/notifications/report_pm.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because a Private Message titled, "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
 
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
index 4ece935ccb..46983be1ed 100644
--- a/phpBB/language/en/email/notifications/report_post.txt
+++ b/phpBB/language/en/email/notifications/report_post.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" was reported.
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
 
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
index 782fc4d629..ae8f9e2484 100644
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the topic, "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
 
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index 99587b28e0..a6a3d2df36 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
-- 
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')

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 6ded18b6e26e74f3eea723a90296ec6c7de6f0f3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 13:26:33 -0500
Subject: [ticket/11103] subsilver2 ucp_prefs_personal.html edits

PHPBB3-11103
---
 phpBB/styles/subsilver2/template/ucp_prefs_personal.html | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index bf0e67d68b..7f706eb97c 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -47,20 +47,6 @@
 		<td class="row2"><input type="radio" class="radio" name="hideonline" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="hideonline" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 	</tr>
 <!-- ENDIF -->
-<!-- IF S_SELECT_NOTIFY -->
-	<tr> 
-		<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}:</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td>
-		<td class="row2"><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_EMAIL}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_IM}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_BOTH}</span></td>
-	</tr>
-<!-- ENDIF -->
-<tr> 
-	<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_ON_PM}:</b></td>
-	<td class="row2"><input type="radio" class="radio" name="notifypm" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifypm" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
-</tr>
-<tr> 
-	<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}:</b></td>
-	<td class="row2"><input type="radio" class="radio" name="popuppm" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="popuppm" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
-</tr>
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}:</b></td>
 	<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
-- 
cgit v1.2.1


From 2284a14813ec0d6ef82a622f33c70d442a761f38 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 13:45:00 -0500
Subject: [ticket/11103] If notification display is disabled, show PM Info in
 header

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 20b98c6f8c..f6bc57fa4b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -154,6 +154,7 @@
 				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
+					<!-- IF not S_NOTIFICATIONS_DISPLAY and S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
-- 
cgit v1.2.1


From c1f8c96bd705f7c87826c65947a8292debf0bd4a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 13:46:15 -0500
Subject: [ticket/11103] subsilver2 overall_header.html

PHPBB3-11103
---
 .../styles/subsilver2/template/overall_header.html | 26 +++++++++++++++++++---
 phpBB/styles/subsilver2/theme/stylesheet.css       | 16 +++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 8bedec4c9e..62e251b709 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -5,7 +5,7 @@
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
-<title><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
+<title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
 <!-- IF S_ENABLE_FEEDS -->
 	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
@@ -149,12 +149,32 @@ function marklist(id, name, state)
 		<table width="100%" cellspacing="0">
 		<tr>
 			<td class="genmed">
+				<!-- IF S_NOTIFICATIONS_DISPLAY -->
+					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}" onclick="$('#notification_list').toggle();">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					<div id="notification_list" class="notification_list">
+						<table class="tablebg" width="310px" cellspacing="1">
+							<!-- BEGIN notifications -->
+								<tr>
+									<td class="row1" width="50px">
+										{notifications.AVATAR}
+									</td>
+									<td class="row1" valign="top">
+										<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+											{notifications.FORMATTED_TITLE}
+										<!-- IF notifications.URL --></a><!-- ENDIF --><br />
+										{notifications.TIME}
+									</td>
+				   				</tr>
+				   			<!-- END notifications -->
+				   		</table>
+					</div>
+				<!-- ENDIF -->
 				<!-- IF not S_IS_BOT --><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_LOGIN_LOGOUT}</a>&nbsp;<!-- ENDIF -->
 				<!-- IF U_RESTORE_PERMISSIONS --> &nbsp;<a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
 				<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> &nbsp;<span style="color: red;">{L_BOARD_DISABLED}</span><!-- ENDIF -->
 				<!-- IF not S_IS_BOT -->
-					<!-- IF S_USER_LOGGED_IN -->
-						<!-- IF S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" alt="*" /> {PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a><!-- ENDIF -->
+					<!-- IF S_USER_LOGGED_IN-->
+						<!-- IF not S_NOTIFICATIONS_DISPLAY and S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" alt="*" /> {PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a><!-- ENDIF -->
 					<!-- ELSEIF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --> &nbsp;<a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" alt="*" /> {L_REGISTER}</a>
 					<!-- ENDIF -->
 				<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 977e5c20c6..1312d9edd4 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1141,3 +1141,19 @@ a.imageset {
 	padding-right: 18px;
 	padding-left: 0;
 }
+
+#notification_list {
+	display: none;
+	position: absolute;
+	width: 330px;
+	max-height: 350px;
+	z-index: 1;
+	overflow-y: auto;
+	overflow-x: hidden;
+	background-color: #FFFFFF;
+}
+
+.notification_list img {
+	max-width: 50px;
+	max-height: 50px;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 4e3abdb7c556d6151b3bd3a83c203ae86df1a6c5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 14:28:28 -0500
Subject: [ticket/11103] subsilver2 ucp_notifications.html

PHPBB3-11103
---
 .../subsilver2/template/ucp_notifications.html     | 140 +++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 phpBB/styles/subsilver2/template/ucp_notifications.html

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
new file mode 100644
index 0000000000..ae8d2b2589
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -0,0 +1,140 @@
+<!-- INCLUDE ucp_header.html -->
+
+<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
+
+<table width="100%" cellspacing="1">
+	<tr>
+		<th colspan="4">{TITLE}</th>
+	</tr>
+	<tr>
+		<td class="row1" colspan="4" align="center"><span class="genmed">{TITLE_EXPLAIN}</span></td>
+	</tr>
+	<!-- IF MODE == 'notification_options' -->
+		<tr>
+			<th>{L_NOTIFICATION_TYPE}</th>
+			<th width="10%">{L_NOTIFICATIONS}</th>
+			<!-- BEGIN notification_methods -->
+				<th width="10%">{notification_methods.NAME}</th>
+			<!-- END notification_methods -->
+		</tr>
+
+		<!-- BEGIN notification_types -->
+			<!-- IF notification_types.GROUP_NAME -->
+				<tr>
+					<td class="row3" colspan="3">{notification_types.GROUP_NAME}</td>
+				</tr>
+			<!-- ELSE -->
+				<!-- IF notification_types.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+					<td>
+						{notification_types.NAME}
+						<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
+					</td>
+					<td align="center"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+					<!-- BEGIN notification_methods -->
+						<td align="center"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+					<!-- END notification_methods -->
+				</tr>
+			<!-- ENDIF -->
+		<!-- END notification_types -->
+		<tr>
+			<td class="cat" colspan="3" align="center">
+				<input type="hidden" name="form_time" value="{FORM_TIME}" />
+				{S_HIDDEN_FIELDS}
+				<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;
+				<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
+				{S_FORM_TOKEN}
+			</td>
+		</tr>
+	<!-- ELSE -->
+		<tr>
+			<td>
+				<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
+					<tr>
+						<td class="row1">
+							<table border="0" cellspacing="0" cellpadding="0" width="100%">
+								<tr>
+									<td align="{S_CONTENT_FLOW_BEGIN}">
+										<!-- IF TOTAL_COUNT -->
+											<table width="100%" cellspacing="1">
+												<tr>
+													<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}</td>
+													<td class="gensmall" nowrap="nowrap" width="100%">&nbsp;[ <b>{TOTAL_COUNT}</b> ]&nbsp;</td>
+												</tr>
+											</table>
+										<!-- ENDIF -->
+									</td>
+									<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE pagination.html --></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+
+				<div style="padding: 2px;"></div>
+
+				<div class="notification_list">
+					<table class="tablebg" width="100%" cellspacing="1">
+						<tr>
+							<td class="cat" colspan="3">
+								<table width="100%" cellspacing="0">
+									<tr class="nav">
+										<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a><!-- ENDIF --></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+						<tr>
+							<th colspan="2">{L_NOTIFICATIONS}</th>
+							<th width="15%">{L_MARK_READ}</th>
+						</tr>
+						<!-- BEGIN notification_list -->
+							<!-- IF notification_list.UNREAD --><tr class="row3"><!-- ELSEIF notification_list.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+								<td  width="50px">
+									{notification_list.AVATAR}
+								</td>
+								<td valign="top">
+									<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+										{notification_list.FORMATTED_TITLE}
+									<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
+									{notification_list.TIME}
+								</td>
+								<td align="center">
+									<!-- IF not notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
+								</td>
+							</tr>
+						<!-- END notification_list -->
+						<tr>
+							<td class="cat" colspan="3" align="center">
+								<input type="hidden" name="form_time" value="{FORM_TIME}" />
+								{S_HIDDEN_FIELDS}
+								<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;
+								<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
+								{S_FORM_TOKEN}
+							</td>
+						</tr>
+					</table>
+				</div>
+
+				<div style="padding: 2px;"></div>
+
+				<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
+				<tr>
+					<td class="row1">
+						<table border="0" cellspacing="0" cellpadding="0" width="100%">
+						<tr>
+							<td align="{S_CONTENT_FLOW_BEGIN}">
+								<!-- INCLUDE pagination.html -->
+							</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+	<!-- ENDIF -->
+</table>
+
+</form>
+
+<!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 077c526f156ccf752ece0c99d88de968ea933fbb Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 14:30:05 -0500
Subject: [ticket/11103] ss2 - do not include footer bar if no pagination

PHPBB3-11103
---
 .../subsilver2/template/ucp_notifications.html     | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index ae8d2b2589..054e9a62b9 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -117,19 +117,21 @@
 
 				<div style="padding: 2px;"></div>
 
-				<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-				<tr>
-					<td class="row1">
-						<table border="0" cellspacing="0" cellpadding="0" width="100%">
+				<!-- IF .pagination -->
+					<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
 						<tr>
-							<td align="{S_CONTENT_FLOW_BEGIN}">
-								<!-- INCLUDE pagination.html -->
+							<td class="row1">
+								<table border="0" cellspacing="0" cellpadding="0" width="100%">
+								<tr>
+									<td align="{S_CONTENT_FLOW_BEGIN}">
+										<!-- INCLUDE pagination.html -->
+									</td>
+								</tr>
+								</table>
 							</td>
 						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
+					</table>
+				<!-- ENDIF -->
 			</td>
 		</tr>
 	<!-- ENDIF -->
-- 
cgit v1.2.1


From a2d6e40f1b7e359b0be87452a01eb3e46b4694e8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 15 Oct 2012 09:27:01 -0500
Subject: [ticket/11103] If no avatar, do not display an empty box in
 subsilver2

PHPBB3-11103
---
 phpBB/styles/subsilver2/template/overall_header.html    | 12 ++++++++----
 phpBB/styles/subsilver2/template/ucp_notifications.html | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 62e251b709..e41095ad38 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -155,10 +155,14 @@ function marklist(id, name, state)
 						<table class="tablebg" width="310px" cellspacing="1">
 							<!-- BEGIN notifications -->
 								<tr>
-									<td class="row1" width="50px">
-										{notifications.AVATAR}
-									</td>
-									<td class="row1" valign="top">
+									<!-- IF notifications.AVATAR -->
+										<td class="row1" width="50px">
+											{notifications.AVATAR}
+										</td>
+										<td class="row1" valign="top">
+									<!-- ELSE -->
+										<td class="row1" colspan="2" valign="top">
+									<!-- ENDIF -->
 										<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 											{notifications.FORMATTED_TITLE}
 										<!-- IF notifications.URL --></a><!-- ENDIF --><br />
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index 054e9a62b9..7c3a516521 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -89,10 +89,14 @@
 						</tr>
 						<!-- BEGIN notification_list -->
 							<!-- IF notification_list.UNREAD --><tr class="row3"><!-- ELSEIF notification_list.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-								<td  width="50px">
-									{notification_list.AVATAR}
-								</td>
-								<td valign="top">
+								<!-- IF notification_list.AVATAR -->
+									<td  width="50px">
+										{notification_list.AVATAR}
+									</td>
+									<td valign="top">
+								<!-- ELSE -->
+									<td colspan="2" valign="top">
+								<!-- ENDIF -->
 									<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 										{notification_list.FORMATTED_TITLE}
 									<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
-- 
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 ++++++++++++-
 phpBB/index.php                                         |  5 +++++
 phpBB/styles/prosilver/template/overall_header.html     |  7 ++++++-
 phpBB/styles/prosilver/template/ucp_notifications.html  |  9 +++++++--
 phpBB/styles/prosilver/theme/common.css                 | 10 ++++++++++
 phpBB/styles/subsilver2/template/overall_header.html    | 13 ++++++++-----
 phpBB/styles/subsilver2/template/ucp_notifications.html | 10 +++++-----
 7 files changed, 53 insertions(+), 14 deletions(-)

(limited to 'phpBB')

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 : '',
 		);
 	}
 
diff --git a/phpBB/index.php b/phpBB/index.php
index 7f85879d23..3cb49f1a28 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -36,6 +36,11 @@ if (($mark_notification = request_var('mark_notification', 0)))
 
 		$notification->mark_read();
 
+		if (($redirect = request_var('redirect', '')))
+		{
+			redirect(append_sid($phpbb_root_path . $redirect));
+		}
+
 		redirect($notification->get_url());
 	}
 }
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index f6bc57fa4b..8fcd595972 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,7 +137,7 @@
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
 							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-								<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 								<span>
 										{notifications.AVATAR}
 										<span class="notification_title">
@@ -146,6 +146,11 @@
 										</span>
 								</span>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
+								<!-- IF not notifications.URL and notifications.UNREAD -->
+									<span class="mark_notification_read">
+										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
+									</span>
+								<!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index f71d8698b9..08b5396827 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -77,7 +77,7 @@
 					<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
 						<dl>
 							<dt>
-								<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 								<span>
 										{notification_list.AVATAR}
 										<span class="notification_title">
@@ -86,9 +86,14 @@
 										</span>
 								</span>
 								<!-- IF notification_list.URL --></a><!-- ENDIF -->
+								<!-- IF not notifications.URL and notifications.UNREAD -->
+									<span class="mark_notification_read">
+										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
+									</span>
+								<!-- ENDIF -->
 							</dt>
 
-							<dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd>
+							<dd class="mark">&nbsp;<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF -->&nbsp;</dd>
 						</dl>
 					</li>
 				<!-- END notification_list -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index c82fa5b7c8..6e825f82ce 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -683,6 +683,10 @@ p.rules a {
 	line-height: 1.5em;
 }
 
+.notification_list ul.topiclist dt {
+	width: 70%;
+}
+
 .notification_list ul li a span img {
 	float: left;
 	max-width: 50px;
@@ -706,3 +710,9 @@ p.rules a {
 .notification_time {
 	margin-top: 0.5em;
 }
+
+.mark_notification_read {
+	clear: both;
+	float: left;
+	margin-top: 0.5em;
+}
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index e41095ad38..560f6a32b3 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -154,19 +154,22 @@ function marklist(id, name, state)
 					<div id="notification_list" class="notification_list">
 						<table class="tablebg" width="310px" cellspacing="1">
 							<!-- BEGIN notifications -->
-								<tr>
+								<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
 									<!-- IF notifications.AVATAR -->
-										<td class="row1" width="50px">
+										<td width="50px">
 											{notifications.AVATAR}
 										</td>
-										<td class="row1" valign="top">
+										<td valign="top">
 									<!-- ELSE -->
-										<td class="row1" colspan="2" valign="top">
+										<td colspan="2" valign="top">
 									<!-- ENDIF -->
-										<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+										<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 											{notifications.FORMATTED_TITLE}
 										<!-- IF notifications.URL --></a><!-- ENDIF --><br />
 										{notifications.TIME}
+										<!-- IF not notifications.URL and notifications.UNREAD -->
+											<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
+										<!-- ENDIF -->
 									</td>
 				   				</tr>
 				   			<!-- END notifications -->
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index 7c3a516521..a2dc90c9f3 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -88,22 +88,22 @@
 							<th width="15%">{L_MARK_READ}</th>
 						</tr>
 						<!-- BEGIN notification_list -->
-							<!-- IF notification_list.UNREAD --><tr class="row3"><!-- ELSEIF notification_list.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+							<tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->">
 								<!-- IF notification_list.AVATAR -->
-									<td  width="50px">
+									<td width="50px">
 										{notification_list.AVATAR}
 									</td>
 									<td valign="top">
 								<!-- ELSE -->
-									<td colspan="2" valign="top">
+									<td colspan="2" valign="top" height="50px">
 								<!-- ENDIF -->
-									<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 										{notification_list.FORMATTED_TITLE}
 									<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
 									{notification_list.TIME}
 								</td>
 								<td align="center">
-									<!-- IF not notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
+									<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
 								</td>
 							</tr>
 						<!-- END notification_list -->
-- 
cgit v1.2.1


From 25ef4d6f91e7723b0573ecbf66c0109170eae5d0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 11:14:51 -0500
Subject: [ticket/11103] Correct some CSS

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6e825f82ce..9b2475384e 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -687,7 +687,7 @@ p.rules a {
 	width: 70%;
 }
 
-.notification_list ul li a span img {
+.notification_list ul li span img {
 	float: left;
 	max-width: 50px;
 	max-height: 50px;
-- 
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 ++
 phpBB/language/en/common.php | 2 ++
 phpBB/language/en/ucp.php    | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB')

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'],
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8980c274ef..75c681e86a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,6 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
+	'NOTIFICATIONS'				=> 'Notifications',
 	'NOTIFICATIONS_COUNT'		=> array(
 		1	=> '%d Notification',
 		2	=> '%d Notifications',
@@ -591,6 +592,7 @@ $lang = array_merge($lang, array(
 	'SEARCH_UNREAD'				=> 'View unread posts',
 	'SEARCH_USER_POSTS'			=> 'Search user’s posts',
 	'SECONDS'					=> 'Seconds',
+	'SEE_ALL'					=> 'See All',
 	'SELECT'					=> 'Select',
 	'SELECT_ALL_CODE'			=> 'Select all',
 	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1d17ed5caf..a09f0a62a1 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,7 +288,6 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
-	'NOTIFICATIONS'										=> 'Notifications',
 	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
 	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
 	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
-- 
cgit v1.2.1


From ee006888296c38e650a62f0c19e4fd3e241327ee Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 16:47:45 -0500
Subject: [ticket/11103] Restyling notifications list for prosilver

PHPBB3-11103
---
 .../styles/prosilver/template/overall_header.html  | 34 +++++-----
 .../prosilver/template/ucp_notifications.html      | 56 +++++++---------
 phpBB/styles/prosilver/theme/colours.css           | 31 ++++++---
 phpBB/styles/prosilver/theme/common.css            | 77 ++++++++++++++--------
 4 files changed, 115 insertions(+), 83 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 8fcd595972..3b50ca732d 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -134,26 +134,30 @@
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
-						<ul class="topiclist forums">
-						<!-- BEGIN notifications -->
-							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
+						<div class="header">
+							{L_NOTIFICATIONS}
+						</div>
+						<ul>
+							<!-- BEGIN notifications -->
+							<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
 								<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-								<span>
-										{notifications.AVATAR}
-										<span class="notification_title">
-											{notifications.FORMATTED_TITLE}
-											<div class="notification_time">{notifications.TIME}</div>
-										</span>
-								</span>
+									{notifications.AVATAR}
+									<div>
+										<p>{notifications.FORMATTED_TITLE}</p>
+										<p>{notifications.TIME}</p>
+
+										<!-- IF not notifications.URL and notifications.U_MARK_READ -->
+											<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
+										<!-- ENDIF -->
+									</div>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
-								<!-- IF not notifications.URL and notifications.UNREAD -->
-									<span class="mark_notification_read">
-										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
-									</span>
-								<!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
+
+						<div class="footer">
+							<a style="display: block;" href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+						</div>
 					</div>
 				</li>
 				<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 08b5396827..728fe972b1 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -62,41 +62,35 @@
 				</div>
 			<!-- ENDIF -->
 
-			<ul class="topiclist">
-				<li class="header">
-					<dl>
-						<dt>{L_NOTIFICATIONS}</dt>
-						<dd class="mark">{L_MARK_READ}</dd>
-					</dl>
-				</li>
-			</ul>
-
 			<div class="notification_list">
-				<ul class="topiclist cplist">
-				<!-- BEGIN notification_list -->
-					<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
+				<ul class="topiclist">
+					<li class="header">
 						<dl>
-							<dt>
-								<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
-								<span>
-										{notification_list.AVATAR}
-										<span class="notification_title">
-											{notification_list.FORMATTED_TITLE}
-											<div class="notification_time">{notification_list.TIME}</div>
-										</span>
-								</span>
-								<!-- IF notification_list.URL --></a><!-- ENDIF -->
-								<!-- IF not notifications.URL and notifications.UNREAD -->
-									<span class="mark_notification_read">
-										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
-									</span>
-								<!-- ENDIF -->
-							</dt>
-
-							<dd class="mark">&nbsp;<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF -->&nbsp;</dd>
+							<dt>{L_NOTIFICATIONS}</dt>
+							<dd class="mark">{L_MARK_READ}</dd>
 						</dl>
 					</li>
-				<!-- END notification_list -->
+					<!-- BEGIN notification_list -->
+						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
+							<dl>
+								<dt>
+									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+										{notification_list.AVATAR}
+										<div>
+											<p>{notification_list.FORMATTED_TITLE}</p>
+											<p>{notification_list.TIME}</p>
+
+											<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
+												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
+											<!-- ENDIF -->
+										</div>
+									<!-- IF notification_list.URL --></a><!-- ENDIF -->
+								</dt>
+
+								<dd class="mark">&nbsp;<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF -->&nbsp;</dd>
+							</dl>
+						</li>
+					<!-- END notification_list -->
 				</ul>
 			</div>
 
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 29968cbb14..49e404a903 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1,4 +1,4 @@
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for common.css
 -------------------------------------------------------------- */
@@ -65,7 +65,7 @@ hr {
 
 .panel {
 	background-color: #ECF1F3;
-	color: #28313F;	
+	color: #28313F;
 }
 
 .post:target .content {
@@ -219,7 +219,7 @@ p.rules {
 	background-image: none;
 }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for links.css
 -------------------------------------------------------------- */
@@ -312,7 +312,7 @@ a.topictitle:active {
 	color: #105289;
 }
 
-/* Profile searchresults */	
+/* Profile searchresults */
 .search .postprofile a {
 	color: #105289;
 }
@@ -349,7 +349,7 @@ a.right:hover {
 }
 
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for content.css
 -------------------------------------------------------------- */
@@ -644,7 +644,7 @@ fieldset.polls dd div {
 	background-image: url("./en/icon_user_online.gif");
 }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for buttons.css
 -------------------------------------------------------------- */
@@ -752,7 +752,7 @@ a.sendemail {
 .pm_read														{ background-image: url("./images/topic_read.gif"); }
 .pm_unread														{ background-image: url("./images/topic_unread.gif"); }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for cp.css
 -------------------------------------------------------------- */
@@ -921,7 +921,7 @@ dl.mini dt {
 	background-color: #EEE;
 }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for forms.css
 -------------------------------------------------------------- */
@@ -976,7 +976,7 @@ fieldset.quick-login input.inputbox {
 /* Input field styles
 ---------------------------------------- */
 .inputbox {
-	background-color: #FFFFFF; 
+	background-color: #FFFFFF;
 	border-color: #B4BAC0;
 	color: #333333;
 }
@@ -1044,3 +1044,16 @@ input.disabled {
 	background-color: #000000;
 }
 
+#notification_list {
+	background-color: #FFFFFF;
+	border-color: #00608F;
+}
+
+#notification_list ul li:hover {
+	background-color: #CFE1F6;
+	color: #000000;
+}
+
+#notification_list > .header, .notification_list > .footer {
+	border-color: #00608F;
+}
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 9b2475384e..cbbc829a27 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -9,8 +9,8 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
 	margin: 0;
@@ -21,7 +21,7 @@ time, mark, audio, video {
 	vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
+article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
 	display: block;
 }
@@ -164,7 +164,7 @@ ul ul, ol ul {
 
 ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 	list-style-type: square;
-} 
+}
 
 
 /* Main blocks
@@ -670,49 +670,70 @@ p.rules a {
 	display: none;
 	position: absolute;
 	width: 330px;
-	max-height: 350px;
 	z-index: 1;
+	border: 1px solid;
+	border-radius: 4px;
+	box-shadow: 4px 4px 5px;
+}
+
+#notification_list ul {
+	max-height: 350px;
 	overflow-y: auto;
 	overflow-x: hidden;
-	background-color: #FFFFFF;
 }
 
 #notification_list ul li {
+	width: ;
 	padding: 10px;
+	margin: 0;
+	float: left;
+	border-bottom: 1px solid;
+	list-style-type: none;
+	font-size: 0.95em;
+	clear: both;
+}
+
+#notification_list ul li {
 	width: 310px;
-	line-height: 1.5em;
 }
 
-.notification_list ul.topiclist dt {
-	width: 70%;
+#notification_list ul li:last-child {
+	border-bottom: 0px;
 }
 
-.notification_list ul li span img {
-	float: left;
-	max-width: 50px;
-	max-height: 50px;
+#notification_list > .header {
+	padding: 0 5px;
+	font-weight: bold;
+	border-bottom: 1px solid;
 }
 
-.notification_list ul li span .notification_title {
-	float: left;
-	width: 240px;
-	margin: 0 0 0 5px;
-	word-wrap: break-word;
-	position: relative;
-	top: -0.2em;
+#notification_list > .footer {
+	text-align: center;
+	font-size: 1.2em;
+	border-top: 1px solid;
 }
 
-.notification_list ul li dl dt span .notification_title {
-	width: auto;
-	padding: 10px 0 0 0;
+#notification_list ul li a, .notification_list dt > a {
+	display: block;
 }
 
-.notification_time {
-	margin-top: 0.5em;
+.notification_list ul li img {
+	float: left;
+	max-width: 50px;
+	max-height: 50px;
+	margin-right: 5px;
 }
 
-.mark_notification_read {
-	clear: both;
+#notification_list ul li div {
+	width: 240px;
 	float: left;
-	margin-top: 0.5em;
 }
+
+.notification_list ul li p {
+	margin: 0;
+	word-wrap: break-word;
+}
+
+.notification_list ul.topiclist dt {
+	width: 88%;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 901739b0c6f0034fe91e38b19eba010975dd8fdd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:28:08 -0500
Subject: [ticket/11103] Fix some style code I missed in prosilver

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 3 ++-
 phpBB/styles/prosilver/theme/common.css             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3b50ca732d..21a1fde7ea 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,6 +137,7 @@
 						<div class="header">
 							{L_NOTIFICATIONS}
 						</div>
+
 						<ul>
 							<!-- BEGIN notifications -->
 							<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
@@ -156,7 +157,7 @@
 						</ul>
 
 						<div class="footer">
-							<a style="display: block;" href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+							<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
 						</div>
 					</div>
 				</li>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index cbbc829a27..863feb576b 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -713,7 +713,7 @@ p.rules a {
 	border-top: 1px solid;
 }
 
-#notification_list ul li a, .notification_list dt > a {
+#notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
 	display: block;
 }
 
-- 
cgit v1.2.1


From a080af4b05603dadf12adc171508db9c16dd73a4 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:28:45 -0500
Subject: [ticket/11103] Add title/view all link to subsilver2

PHPBB3-11103
---
 .../styles/subsilver2/template/overall_header.html | 54 +++++++++++++---------
 phpBB/styles/subsilver2/theme/stylesheet.css       | 36 +++++++++++++--
 2 files changed, 64 insertions(+), 26 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 560f6a32b3..069c39aaae 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -152,28 +152,40 @@ function marklist(id, name, state)
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}" onclick="$('#notification_list').toggle();">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
-						<table class="tablebg" width="310px" cellspacing="1">
-							<!-- BEGIN notifications -->
-								<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
-									<!-- IF notifications.AVATAR -->
-										<td width="50px">
-											{notifications.AVATAR}
-										</td>
-										<td valign="top">
-									<!-- ELSE -->
-										<td colspan="2" valign="top">
-									<!-- ENDIF -->
-										<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-											{notifications.FORMATTED_TITLE}
-										<!-- IF notifications.URL --></a><!-- ENDIF --><br />
-										{notifications.TIME}
-										<!-- IF not notifications.URL and notifications.UNREAD -->
-											<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
+						<div class="row1 header">
+							{L_NOTIFICATIONS}
+						</div>
+
+						<div class="notification_scroll">
+							<table class="tablebg" width="310px" cellspacing="1">
+								<!-- BEGIN notifications -->
+									<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
+										<!-- IF notifications.AVATAR -->
+											<td width="50px">
+												{notifications.AVATAR}
+											</td>
+											<td valign="top">
+										<!-- ELSE -->
+											<td colspan="2" valign="top">
 										<!-- ENDIF -->
-									</td>
-				   				</tr>
-				   			<!-- END notifications -->
-				   		</table>
+											<div class="notification_title">
+												<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+													{notifications.FORMATTED_TITLE}
+												<!-- IF notifications.URL --></a><!-- ENDIF -->
+													<br />{notifications.TIME}
+												<!-- IF not notifications.URL and notifications.UNREAD -->
+													<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
+												<!-- ENDIF -->
+											</div>
+										</td>
+				   					</tr>
+				   				<!-- END notifications -->
+				   			</table>
+				   		</div>
+
+						<div class="row1 footer">
+							<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+						</div>
 					</div>
 				<!-- ENDIF -->
 				<!-- IF not S_IS_BOT --><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_LOGIN_LOGOUT}</a>&nbsp;<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 1312d9edd4..b41860d130 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -181,7 +181,7 @@ p.datetime {
 p.searchbar {
 	padding: 2px 0;
 	white-space: nowrap;
-} 
+}
 
 p.searchbarreg {
 	margin: 0;
@@ -464,7 +464,7 @@ textarea {
 	background-color: #FAFAFA;
 	color: #333333;
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1.3em; 
+	font-size: 1.3em;
 	line-height: 1.4em;
 	font-weight: normal;
 	border: 1px solid #A9B8C2;
@@ -1145,15 +1145,41 @@ a.imageset {
 #notification_list {
 	display: none;
 	position: absolute;
-	width: 330px;
-	max-height: 350px;
+	width: 310px;
 	z-index: 1;
+}
+
+#notification_list .notification_scroll {
+	max-height: 350px;
 	overflow-y: auto;
 	overflow-x: hidden;
-	background-color: #FFFFFF;
+}
+
+#notification_list .notification_title {
+	width: 240px;
+}
+
+#notification_list .header {
+	width: 298px;
+	padding: 5px;
+	font-weight: bold;
+	border: 1px solid #A9B8C2;
+	border-bottom: 0;
+}
+
+#notification_list .footer {
+	width: 300px;
+	text-align: center;
+	font-size: 1.2em;
+	border: 1px solid #A9B8C2;
+	border-top: 0;
 }
 
 .notification_list img {
 	max-width: 50px;
 	max-height: 50px;
+}
+
+#notification_list .footer > a {
+	display: block;
 }
\ No newline at end of file
-- 
cgit v1.2.1


From 3557b391154286d1cb18a6e6f88925758247860d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:31:48 -0500
Subject: [ticket/11103] Hide notifications flyout on a click outside of the
 list.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js              |  7 +++++++
 phpBB/styles/subsilver2/template/overall_footer.html | 14 ++++++++++++++
 2 files changed, 21 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 0fd56f0e28..f4519bf7aa 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -80,6 +80,13 @@ $('#qr_full_editor').click(function() {
 $('#notification_list_button').click(function() {
 	$('#notification_list').toggle();
 });
+$('#phpbb').click(function(e) {
+    var target = e.target;
+
+    if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) {
+        $('#notification_list').hide();
+    }
+});
 
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 24c6f8105c..210159732e 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -12,5 +12,19 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
+<script type="text/javascript">
+// <![CDATA[
+<!-- IF S_NOTIFICATIONS_DISPLAY -->
+$(document).click(function(e) {
+    var target = e.target;
+
+    if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) {
+        $('#notification_list').hide();
+    }
+});
+<!-- ENDIF -->
+// ]]>
+</script>
+
 </body>
 </html>
-- 
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 ++++++++++++++++++++++++
 phpBB/report.php                                 |  5 ++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

(limited to 'phpBB')

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);
 	}
diff --git a/phpBB/report.php b/phpBB/report.php
index dd1cc2514c..9f3b09d5ba 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -186,7 +186,9 @@ if ($submit && $reason_id)
 		$lang_success = $user->lang['POST_REPORTED_SUCCESS'];
 
 		// Notify relevant users
-		$phpbb_notifications->add_notifications('report_post', array_merge($report_data, $row, $forum_data));
+		$phpbb_notifications->add_notifications('report_post', array_merge($report_data, $row, $forum_data, array(
+			'report_text'	=> $report_text,
+		)));
 	}
 	else
 	{
@@ -216,6 +218,7 @@ if ($submit && $reason_id)
 
 		// Notify relevant users
 		$phpbb_notifications->add_notifications('report_pm', array_merge($report_data, $row, array(
+			'report_text'	=> $report_text,
 			'from_user_id'	=> $report_data['author_id'],
 			'report_id'		=> $report_id,
 		)));
-- 
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')

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')

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 0d098ae5e5768e6ceb21a65f350f521ebe3c1908 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 18:14:06 -0500
Subject: [ticket/11103] Return false to prevent appending # to the URL

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js              | 1 +
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index f4519bf7aa..3c5e1a1c12 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -79,6 +79,7 @@ $('#qr_full_editor').click(function() {
 // Toggle notification list
 $('#notification_list_button').click(function() {
 	$('#notification_list').toggle();
+	return false;
 });
 $('#phpbb').click(function(e) {
     var target = e.target;
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 069c39aaae..aec754c444 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -150,7 +150,7 @@ function marklist(id, name, state)
 		<tr>
 			<td class="genmed">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
-					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}" onclick="$('#notification_list').toggle();">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}" onclick="$('#notification_list').toggle(); return false;">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
-- 
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')

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 883a96172065b5eb7b07f7c6e19ff2b1d5079ef9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 18:25:26 -0500
Subject: [ticket/11103] Use e.preventDefault();

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 3c5e1a1c12..c221a47b48 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -77,9 +77,9 @@ $('#qr_full_editor').click(function() {
 });
 
 // Toggle notification list
-$('#notification_list_button').click(function() {
+$('#notification_list_button').click(function(e) {
 	$('#notification_list').toggle();
-	return false;
+	e.preventDefault();
 });
 $('#phpbb').click(function(e) {
     var target = e.target;
-- 
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/common.php                         |  1 -
 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 ----
 phpBB/report.php                         |  2 --
 9 files changed, 28 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index c1787f6773..dc059887e3 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -130,7 +130,6 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 $template = $phpbb_container->get('template');
 $phpbb_style = $phpbb_container->get('style');
 
-// Notifications manager
 $phpbb_notifications = $phpbb_container->get('notification_manager');
 
 $ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
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);
 								}
 							}
diff --git a/phpBB/report.php b/phpBB/report.php
index 9f3b09d5ba..07b9711ae1 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -185,7 +185,6 @@ if ($submit && $reason_id)
 		$lang_return = $user->lang['RETURN_TOPIC'];
 		$lang_success = $user->lang['POST_REPORTED_SUCCESS'];
 
-		// Notify relevant users
 		$phpbb_notifications->add_notifications('report_post', array_merge($report_data, $row, $forum_data, array(
 			'report_text'	=> $report_text,
 		)));
@@ -216,7 +215,6 @@ if ($submit && $reason_id)
 		$lang_return = $user->lang['RETURN_PM'];
 		$lang_success = $user->lang['PM_REPORTED_SUCCESS'];
 
-		// Notify relevant users
 		$phpbb_notifications->add_notifications('report_pm', array_merge($report_data, $row, array(
 			'report_text'	=> $report_text,
 			'from_user_id'	=> $report_data['author_id'],
-- 
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')

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')

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 ++--
 phpBB/styles/prosilver/theme/common.css              | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html | 4 ++++
 phpBB/styles/subsilver2/theme/stylesheet.css         | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB')

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;
 			}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 863feb576b..bf1f4edeea 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -736,4 +736,4 @@ p.rules a {
 
 .notification_list ul.topiclist dt {
 	width: 88%;
-}
\ No newline at end of file
+}
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 210159732e..11989feca6 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -15,6 +15,8 @@
 <script type="text/javascript">
 // <![CDATA[
 <!-- IF S_NOTIFICATIONS_DISPLAY -->
+(function($) {  // Avoid conflicts with other libraries
+
 $(document).click(function(e) {
     var target = e.target;
 
@@ -22,6 +24,8 @@ $(document).click(function(e) {
         $('#notification_list').hide();
     }
 });
+
+})(jQuery); // Avoid conflicts with other libraries
 <!-- ENDIF -->
 // ]]>
 </script>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index b41860d130..c411edd367 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1182,4 +1182,4 @@ a.imageset {
 
 #notification_list .footer > a {
 	display: block;
-}
\ No newline at end of file
+}
-- 
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/develop/create_schema_files.php         |  4 ++--
 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 ++--
 phpBB/install/database_update.php             |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 69aca10e6c..aa0f13ccb3 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1303,7 +1303,7 @@ function get_schema_struct()
 			'item_parent_id'	=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'unread'			=> array('BOOL', 1),
-			'is_disabled'		=> array('BOOL', 0),
+			'is_enabled'		=> array('BOOL', 0),
 			'time'				=> array('TIMESTAMP', 1),
 			'data'				=> array('TEXT_UNI', ''),
 		),
@@ -1315,7 +1315,7 @@ function get_schema_struct()
 			'user_id'			=> array('INDEX', 'user_id'),
 			'time'				=> array('INDEX', 'time'),
 			'unread'			=> array('INDEX', 'unread'),
-			'is_disabled'		=> array('INDEX', 'is_disabled'),
+			'is_enabled'		=> array('INDEX', 'is_enabled'),
 		),
 	);
 
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))
 		{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 73637122ce..eceb0c8fc3 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1133,7 +1133,7 @@ function database_update_info()
 						'item_parent_id'	=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
 						'unread'			=> array('BOOL', 1),
-						'is_disabled'		=> array('BOOL', 0),
+						'is_enabled'		=> array('BOOL', 0),
 						'time'				=> array('TIMESTAMP', 1),
 						'data'				=> array('TEXT_UNI', ''),
 					),
@@ -1145,7 +1145,7 @@ function database_update_info()
 						'user_id'			=> array('INDEX', 'user_id'),
 						'time'				=> array('INDEX', 'time'),
 						'unread'			=> array('INDEX', 'unread'),
-						'is_disabled'		=> array('INDEX', 'is_disabled'),
+						'is_enabled'		=> array('INDEX', 'is_enabled'),
 					),
 				),
 				USER_NOTIFICATIONS_TABLE	=> array(
-- 
cgit v1.2.1


From a93067eb4196454c147ea516733182abd1612e84 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 19 Oct 2012 16:00:37 -0500
Subject: [ticket/11103] Create common.js for subsilver2, move added JS code
 there

PHPBB3-11103
---
 phpBB/styles/subsilver2/template/common.js           | 18 ++++++++++++++++++
 phpBB/styles/subsilver2/template/overall_footer.html | 19 +------------------
 phpBB/styles/subsilver2/template/overall_header.html |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 phpBB/styles/subsilver2/template/common.js

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/common.js b/phpBB/styles/subsilver2/template/common.js
new file mode 100644
index 0000000000..c9e6221e2e
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/common.js
@@ -0,0 +1,18 @@
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
+// Toggle notification list
+$('#notification_list_button').click(function(e) {
+	$('#notification_list').toggle();
+	e.preventDefault();
+});
+$(document).click(function(e) {
+    var target = e.target;
+
+    if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) {
+        $('#notification_list').hide();
+    }
+});
+
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 11989feca6..8cc5591478 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -10,25 +10,8 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- INCLUDEJS template/common.js -->
 {SCRIPTS}
 
-<script type="text/javascript">
-// <![CDATA[
-<!-- IF S_NOTIFICATIONS_DISPLAY -->
-(function($) {  // Avoid conflicts with other libraries
-
-$(document).click(function(e) {
-    var target = e.target;
-
-    if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) {
-        $('#notification_list').hide();
-    }
-});
-
-})(jQuery); // Avoid conflicts with other libraries
-<!-- ENDIF -->
-// ]]>
-</script>
-
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index aec754c444..a48828bb3a 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -150,7 +150,7 @@ function marklist(id, name, state)
 		<tr>
 			<td class="genmed">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
-					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}" onclick="$('#notification_list').toggle(); return false;">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
-- 
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')

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')

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 6861af22eecfa4a254eb62245ee109d8e5635f93 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 19:19:26 -0500
Subject: [ticket/11103] Message of no notifications if you have none

PHPBB3-11103
---
 phpBB/language/en/common.php                       |  1 +
 .../styles/prosilver/template/overall_header.html  | 31 +++++++++++++---------
 .../prosilver/template/ucp_notifications.html      |  7 +++++
 3 files changed, 26 insertions(+), 13 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 75c681e86a..f3c597af89 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -382,6 +382,7 @@ $lang = array_merge($lang, array(
 	'NEXT_STEP'					=> 'Next',
 	'NEVER'						=> 'Never',
 	'NO'						=> 'No',
+	'NO_NOTIFICATIONS'			=> 'You have no notifications',
 	'NOT_ALLOWED_MANAGE_GROUP'	=> 'You are not allowed to manage this group.',
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 21a1fde7ea..5ec707dbcf 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -139,20 +139,25 @@
 						</div>
 
 						<ul>
+							<!-- IF not .notifications -->
+								<li>
+									{L_NO_NOTIFICATIONS}
+								</li>
+							<!-- ENDIF -->
 							<!-- BEGIN notifications -->
-							<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-								<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-									{notifications.AVATAR}
-									<div>
-										<p>{notifications.FORMATTED_TITLE}</p>
-										<p>{notifications.TIME}</p>
-
-										<!-- IF not notifications.URL and notifications.U_MARK_READ -->
-											<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
-										<!-- ENDIF -->
-									</div>
-								<!-- IF notifications.URL --></a><!-- ENDIF -->
-							</li>
+								<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
+									<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+										{notifications.AVATAR}
+										<div>
+											<p>{notifications.FORMATTED_TITLE}</p>
+											<p>{notifications.TIME}</p>
+
+											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
+												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
+											<!-- ENDIF -->
+										</div>
+									<!-- IF notifications.URL --></a><!-- ENDIF -->
+								</li>
 				   			<!-- END notifications -->
 						</ul>
 
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 728fe972b1..85edf4629b 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -70,6 +70,13 @@
 							<dd class="mark">{L_MARK_READ}</dd>
 						</dl>
 					</li>
+					<!-- IF not .notifications -->
+						<li>
+							<dl>
+								<dt>{L_NO_NOTIFICATIONS}</dt>
+							</dl>
+						</li>
+					<!-- ENDIF -->
 					<!-- BEGIN notification_list -->
 						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
 							<dl>
-- 
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/develop/create_schema_files.php              |   8 +-
 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 +-
 phpBB/install/database_update.php                  |   8 +-
 phpBB/install/schemas/firebird_schema.sql          |  10 +-
 phpBB/install/schemas/mssql_schema.sql             |  10 +-
 phpBB/install/schemas/mysql_40_schema.sql          |  10 +-
 phpBB/install/schemas/mysql_41_schema.sql          |  10 +-
 phpBB/install/schemas/oracle_schema.sql            |  10 +-
 phpBB/install/schemas/postgres_schema.sql          |  10 +-
 phpBB/install/schemas/sqlite_schema.sql            |  10 +-
 phpBB/language/en/ucp.php                          |   4 +-
 phpBB/report.php                                   |   4 +-
 37 files changed, 250 insertions(+), 370 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index aa0f13ccb3..b0cffd167f 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1298,12 +1298,12 @@ function get_schema_struct()
 	$schema_data['phpbb_notifications'] = array(
 		'COLUMNS'			=> array(
 			'notification_id'	=> array('UINT', NULL, 'auto_increment'),
-			'item_type'			=> array('VCHAR:25', ''),
+			'item_type'			=> array('VCHAR:255', ''),
 			'item_id'			=> array('UINT', 0),
 			'item_parent_id'	=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'unread'			=> array('BOOL', 1),
-			'is_enabled'		=> array('BOOL', 0),
+			'is_enabled'		=> array('BOOL', 1),
 			'time'				=> array('TIMESTAMP', 1),
 			'data'				=> array('TEXT_UNI', ''),
 		),
@@ -1777,10 +1777,10 @@ function get_schema_struct()
 
 	$schema_data['phpbb_user_notifications'] = array(
 		'COLUMNS'			=> array(
-			'item_type'			=> array('VCHAR:25', ''),
+			'item_type'			=> array('VCHAR:255', ''),
 			'item_id'			=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
-			'method'			=> array('VCHAR:25', ''),
+			'method'			=> array('VCHAR:255', ''),
 		),
 		'PRIMARY_KEY'		=> array(
 			'item_type',
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)),
 			));
 		}
 	}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index eceb0c8fc3..c24877fd74 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1128,12 +1128,12 @@ function database_update_info()
 				NOTIFICATIONS_TABLE		=> array(
 					'COLUMNS'			=> array(
 						'notification_id'	=> array('UINT', NULL, 'auto_increment'),
-						'item_type'			=> array('VCHAR:25', ''),
+						'item_type'			=> array('VCHAR:255', ''),
 						'item_id'			=> array('UINT', 0),
 						'item_parent_id'	=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
 						'unread'			=> array('BOOL', 1),
-						'is_enabled'		=> array('BOOL', 0),
+						'is_enabled'		=> array('BOOL', 1),
 						'time'				=> array('TIMESTAMP', 1),
 						'data'				=> array('TEXT_UNI', ''),
 					),
@@ -1150,10 +1150,10 @@ function database_update_info()
 				),
 				USER_NOTIFICATIONS_TABLE	=> array(
 					'COLUMNS'			=> array(
-						'item_type'			=> array('VCHAR:25', ''),
+						'item_type'			=> array('VCHAR:255', ''),
 						'item_id'			=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
-						'method'			=> array('VCHAR:25', ''),
+						'method'			=> array('VCHAR:255', ''),
 					),
 					'PRIMARY_KEY'		=> array(
 						'item_type',
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 1e4ae2e132..5e13f98f25 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -621,12 +621,12 @@ END;;
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id INTEGER NOT NULL,
-	item_type VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	item_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	item_id INTEGER DEFAULT 0 NOT NULL,
 	item_parent_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
 	unread INTEGER DEFAULT 1 NOT NULL,
-	is_disabled INTEGER DEFAULT 0 NOT NULL,
+	is_enabled INTEGER DEFAULT 1 NOT NULL,
 	time INTEGER DEFAULT 1 NOT NULL,
 	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
@@ -639,7 +639,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications(item_parent_id)
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications(user_id);;
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications(time);;
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications(unread);;
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications(is_disabled);;
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications(is_enabled);;
 
 CREATE GENERATOR phpbb_notifications_gen;;
 SET GENERATOR phpbb_notifications_gen TO 0;;
@@ -1237,10 +1237,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch(notify_status)
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	item_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	item_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
-	method VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL
+	method VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_user_notifications ADD PRIMARY KEY (item_type, item_id, user_id, method);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 5a397743c4..d463afb17c 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -756,12 +756,12 @@ GO
 */
 CREATE TABLE [phpbb_notifications] (
 	[notification_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[item_type] [varchar] (25) DEFAULT ('') NOT NULL ,
+	[item_type] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[item_id] [int] DEFAULT (0) NOT NULL ,
 	[item_parent_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[unread] [int] DEFAULT (1) NOT NULL ,
-	[is_disabled] [int] DEFAULT (0) NOT NULL ,
+	[is_enabled] [int] DEFAULT (1) NOT NULL ,
 	[time] [int] DEFAULT (1) NOT NULL ,
 	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
@@ -792,7 +792,7 @@ GO
 CREATE  INDEX [unread] ON [phpbb_notifications]([unread]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [is_disabled] ON [phpbb_notifications]([is_disabled]) ON [PRIMARY]
+CREATE  INDEX [is_enabled] ON [phpbb_notifications]([is_enabled]) ON [PRIMARY]
 GO
 
 
@@ -1523,10 +1523,10 @@ GO
 	Table: 'phpbb_user_notifications'
 */
 CREATE TABLE [phpbb_user_notifications] (
-	[item_type] [varchar] (25) DEFAULT ('') NOT NULL ,
+	[item_type] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[item_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[method] [varchar] (25) DEFAULT ('') NOT NULL 
+	[method] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index fd7f9a6025..9272e18735 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -433,12 +433,12 @@ CREATE TABLE phpbb_modules (
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	item_type varbinary(25) DEFAULT '' NOT NULL,
+	item_type varbinary(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	is_disabled tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	is_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data blob NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -448,7 +448,7 @@ CREATE TABLE phpbb_notifications (
 	KEY user_id (user_id),
 	KEY time (time),
 	KEY unread (unread),
-	KEY is_disabled (is_disabled)
+	KEY is_enabled (is_enabled)
 );
 
 
@@ -873,10 +873,10 @@ CREATE TABLE phpbb_topics_watch (
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type varbinary(25) DEFAULT '' NOT NULL,
+	item_type varbinary(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	method varbinary(25) DEFAULT '' NOT NULL,
+	method varbinary(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method),
 	KEY it (item_type),
 	KEY uid (user_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 8700b46c91..a73fda41f5 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -433,12 +433,12 @@ CREATE TABLE phpbb_modules (
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	is_disabled tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	is_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data text NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -448,7 +448,7 @@ CREATE TABLE phpbb_notifications (
 	KEY user_id (user_id),
 	KEY time (time),
 	KEY unread (unread),
-	KEY is_disabled (is_disabled)
+	KEY is_enabled (is_enabled)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
@@ -873,10 +873,10 @@ CREATE TABLE phpbb_topics_watch (
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	method varchar(25) DEFAULT '' NOT NULL,
+	method varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method),
 	KEY it (item_type),
 	KEY uid (user_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f2f22e2f5e..02be9566dc 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -845,12 +845,12 @@ END;
 */
 CREATE TABLE phpbb_notifications (
 	notification_id number(8) NOT NULL,
-	item_type varchar2(25) DEFAULT '' ,
+	item_type varchar2(255) DEFAULT '' ,
 	item_id number(8) DEFAULT '0' NOT NULL,
 	item_parent_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	unread number(1) DEFAULT '1' NOT NULL,
-	is_disabled number(1) DEFAULT '0' NOT NULL,
+	is_enabled number(1) DEFAULT '1' NOT NULL,
 	time number(11) DEFAULT '1' NOT NULL,
 	data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
@@ -869,7 +869,7 @@ CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time)
 /
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread)
 /
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled)
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled)
 /
 
 CREATE SEQUENCE phpbb_notifications_seq
@@ -1641,10 +1641,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status
 	Table: 'phpbb_user_notifications'
 */
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar2(25) DEFAULT '' ,
+	item_type varchar2(255) DEFAULT '' ,
 	item_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	method varchar2(25) DEFAULT '' ,
+	method varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_user_notifications PRIMARY KEY (item_type, item_id, user_id, method)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index ffba657475..784e3c8c68 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -603,12 +603,12 @@ CREATE SEQUENCE phpbb_notifications_seq;
 
 CREATE TABLE phpbb_notifications (
 	notification_id INT4 DEFAULT nextval('phpbb_notifications_seq'),
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
 	item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	unread INT2 DEFAULT '1' NOT NULL CHECK (unread >= 0),
-	is_disabled INT2 DEFAULT '0' NOT NULL CHECK (is_disabled >= 0),
+	is_enabled INT2 DEFAULT '1' NOT NULL CHECK (is_enabled >= 0),
 	time INT4 DEFAULT '1' NOT NULL CHECK (time >= 0),
 	data varchar(4000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (notification_id)
@@ -620,7 +620,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled);
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled);
 
 /*
 	Table: 'phpbb_poll_options'
@@ -1123,10 +1123,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status
 	Table: 'phpbb_user_notifications'
 */
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
-	method varchar(25) DEFAULT '' NOT NULL,
+	method varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index b63569ce3e..2fdac43947 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -420,12 +420,12 @@ CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id INTEGER PRIMARY KEY NOT NULL ,
-	item_type varchar(25) NOT NULL DEFAULT '',
+	item_type varchar(255) NOT NULL DEFAULT '',
 	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	item_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	is_disabled INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	is_enabled INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	time INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	data text(65535) NOT NULL DEFAULT ''
 );
@@ -436,7 +436,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled);
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled);
 
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
@@ -846,10 +846,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar(25) NOT NULL DEFAULT '',
+	item_type varchar(255) NOT NULL DEFAULT '',
 	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	method varchar(25) NOT NULL DEFAULT '',
+	method varchar(255) NOT NULL DEFAULT '',
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7c3960204a..5b1e7add02 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -295,8 +295,6 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
 	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
-	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
-	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
 	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
@@ -376,6 +374,8 @@ $lang = array_merge($lang, array(
 	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
 	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
 	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
+	'PHPBB_NOTIFICATION_METHOD_EMAIL'					=> 'Email',
+	'PHPBB_NOTIFICATION_METHOD_JABBER'					=> 'Jabber',
 	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
 	'PM_FROM'					=> 'From',
 	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
diff --git a/phpBB/report.php b/phpBB/report.php
index 07b9711ae1..63e6afcf66 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -185,7 +185,7 @@ if ($submit && $reason_id)
 		$lang_return = $user->lang['RETURN_TOPIC'];
 		$lang_success = $user->lang['POST_REPORTED_SUCCESS'];
 
-		$phpbb_notifications->add_notifications('report_post', array_merge($report_data, $row, $forum_data, array(
+		$phpbb_notifications->add_notifications('phpbb_notification_type_report_post', array_merge($report_data, $row, $forum_data, array(
 			'report_text'	=> $report_text,
 		)));
 	}
@@ -215,7 +215,7 @@ if ($submit && $reason_id)
 		$lang_return = $user->lang['RETURN_PM'];
 		$lang_success = $user->lang['PM_REPORTED_SUCCESS'];
 
-		$phpbb_notifications->add_notifications('report_pm', array_merge($report_data, $row, array(
+		$phpbb_notifications->add_notifications('phpbb_notification_type_report_pm', array_merge($report_data, $row, array(
 			'report_text'	=> $report_text,
 			'from_user_id'	=> $report_data['author_id'],
 			'report_id'		=> $report_id,
-- 
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')

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')

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')

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')

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 +++++++++++
 phpBB/styles/prosilver/template/ucp_prefs_personal.html  | 10 ++++++++++
 phpBB/styles/subsilver2/template/ucp_prefs_personal.html |  6 ++++++
 3 files changed, 27 insertions(+)

(limited to 'phpBB')

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'],
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index f03cb2af38..53d1e629a8 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -38,6 +38,16 @@
 				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
+	<!-- ENDIF -->		
+	<!-- IF S_SELECT_NOTIFY -->
+		<dl>
+			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
+			<dd>
+				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
+				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
+				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
+			</dd>
+		</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index 7f706eb97c..37e5390ae3 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -47,6 +47,12 @@
 		<td class="row2"><input type="radio" class="radio" name="hideonline" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="hideonline" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 	</tr>
 <!-- ENDIF -->
+<!-- IF S_SELECT_NOTIFY -->
+	<tr> 
+		<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}:</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td>
+		<td class="row2"><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_EMAIL}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_IM}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_BOTH}</span></td>
+	</tr>
+<!-- ENDIF -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}:</b></td>
 	<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
-- 
cgit v1.2.1


From eddb56f8426161923d8870ca5f8f899c342075db Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 27 Oct 2012 12:03:11 -0500
Subject: [ticket/11103] Working on default notifications on install/update

PHPBB3-11103
---
 phpBB/install/database_update.php     | 105 +++++++++++++++++++++++++++++++++-
 phpBB/install/schemas/schema_data.sql |  11 ++++
 2 files changed, 115 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c24877fd74..3e4edc0b8f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2755,9 +2755,112 @@ function change_database_data(&$no_updates, $version)
 				$config->set('site_home_text', '');
 			}
 
-			if (!isset($config['load_notifications']))
+			if (true)//!isset($config['load_notifications']))
 			{
 				$config->set('load_notifications', 1);
+
+				// Convert notifications
+				$convert_notifications = array(
+					array(
+						'check'			=> ($config['allow_topic_notify']),
+						'item_type'		=> 'phpbb_notification_type_post',
+					),
+					array(
+						'check'			=> ($config['allow_forum_notify']),
+						'item_type'		=> 'phpbb_notification_type_topic',
+					),
+					array(
+						'check'			=> ($config['allow_bookmarks']),
+						'item_type'		=> 'phpbb_notification_type_bookmark',
+					),
+					array(
+						'check'			=> ($config['allow_privmsg']),
+						'item_type'		=> 'phpbb_notification_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 = $db->sql_query($sql);
+						while ($row = $db->sql_fetchrow($result))
+						{
+							_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+								'item_type'		=> $convert_data['item_type'],
+								'item_id'		=> 0,
+								'user_id'		=> $row['user_id'],
+								'method'		=> '',
+							)), $errored, $error_ary);
+
+							if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+							{
+								_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+									'item_type'		=> $convert_data['item_type'],
+									'item_id'		=> 0,
+									'user_id'		=> $row['user_id'],
+									'method'		=> 'phpbb_notification_method_email',
+								)), $errored, $error_ary);
+							}
+
+							if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+							{
+								_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+									'item_type'		=> $convert_data['item_type'],
+									'item_id'		=> 0,
+									'user_id'		=> $row['user_id'],
+									'method'		=> 'phpbb_notification_method_jabber',
+								)), $errored, $error_ary);
+							}
+						}
+						$db->sql_freeresult($result);
+					}
+				}
+/*
+				// Add default notifications
+				$default_notifications = array(
+					array(
+						'check'			=> ($config['allow_topic_notify']),
+						'item_type'		=> 'phpbb_notification_type_post',
+					),
+					array(
+						'check'			=> ($config['allow_forum_notify']),
+						'item_type'		=> 'phpbb_notification_type_topic',
+					),
+					array(
+						'check'			=> ($config['allow_bookmarks']),
+						'item_type'		=> 'phpbb_notification_type_bookmark',
+					),
+					array(
+						'check'			=> ($config['allow_privmsg']),
+						'item_type'		=> 'phpbb_notification_type_pm',
+					),
+				);
+
+				foreach ($default_notifications as $convert_data)
+				{
+					if ($convert_data['check'])
+					{
+						$sql = 'SELECT user_id
+							FROM ' . USERS_TABLE . '
+							WHERE user_id <> ' . ANONYMOUS . '
+								AND user_type <> ' . USER_IGNORE;
+						$result = $db->sql_query($sql);
+						while ($row = $db->sql_fetchrow($result))
+						{
+							_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+								'item_type'		=> $convert_data['item_type'],
+								'item_id'		=> 0,
+								'user_id'		=> $row['user_id'],
+								'method'		=> '',
+							)), $errored, $error_ary);
+						}
+						$db->sql_freeresult($result);
+					}
+				}*/
 			}
 
 		break;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 0d47f4995e..28f8b1c3b6 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -770,4 +770,15 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'mp3');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
 
+# User Notification Options (for first user)
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('report', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('needs_approval', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_bookmark', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_pm', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, 'phpbb_notification_method_email');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_quote', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, 'phpbb_notification_method_email');
+
 # POSTGRES COMMIT #
-- 
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/develop/create_schema_files.php              |   2 +
 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 ++--
 phpBB/install/database_update.php                  |  46 +-------
 phpBB/install/schemas/firebird_schema.sql          |   4 +-
 phpBB/install/schemas/mssql_schema.sql             |   6 +-
 phpBB/install/schemas/mysql_40_schema.sql          |   4 +-
 phpBB/install/schemas/mysql_41_schema.sql          |   4 +-
 phpBB/install/schemas/oracle_schema.sql            |   3 +
 phpBB/install/schemas/postgres_schema.sql          |   2 +
 phpBB/install/schemas/schema_data.sql              |   5 -
 phpBB/install/schemas/sqlite_schema.sql            |   2 +
 23 files changed, 213 insertions(+), 336 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index b0cffd167f..9b0afc241d 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1781,6 +1781,7 @@ function get_schema_struct()
 			'item_id'			=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'method'			=> array('VCHAR:255', ''),
+			'notify'			=> array('BOOL', 1),
 		),
 		'PRIMARY_KEY'		=> array(
 			'item_type',
@@ -1791,6 +1792,7 @@ function get_schema_struct()
 		'KEYS'				=> array(
 			'it'				=> array('INDEX', 'item_type'),
 			'uid'				=> array('INDEX', 'user_id'),
+			'no'				=> array('INDEX', 'notify'),
 		),
 	);
 
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)
 		{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3e4edc0b8f..94a4749313 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1154,6 +1154,7 @@ function database_update_info()
 						'item_id'			=> array('UINT', 0),
 						'user_id'			=> array('UINT', 0),
 						'method'			=> array('VCHAR:255', ''),
+						'notify'			=> array('BOOL', 1),
 					),
 					'PRIMARY_KEY'		=> array(
 						'item_type',
@@ -1164,6 +1165,7 @@ function database_update_info()
 					'KEYS'				=> array(
 						'it'				=> array('INDEX', 'item_type'),
 						'uid'				=> array('INDEX', 'user_id'),
+						'no'				=> array('INDEX', 'notify'),
 					),
 				),
 			),
@@ -2755,7 +2757,7 @@ function change_database_data(&$no_updates, $version)
 				$config->set('site_home_text', '');
 			}
 
-			if (true)//!isset($config['load_notifications']))
+			if (!isset($config['load_notifications']))
 			{
 				$config->set('load_notifications', 1);
 
@@ -2819,48 +2821,6 @@ function change_database_data(&$no_updates, $version)
 						$db->sql_freeresult($result);
 					}
 				}
-/*
-				// Add default notifications
-				$default_notifications = array(
-					array(
-						'check'			=> ($config['allow_topic_notify']),
-						'item_type'		=> 'phpbb_notification_type_post',
-					),
-					array(
-						'check'			=> ($config['allow_forum_notify']),
-						'item_type'		=> 'phpbb_notification_type_topic',
-					),
-					array(
-						'check'			=> ($config['allow_bookmarks']),
-						'item_type'		=> 'phpbb_notification_type_bookmark',
-					),
-					array(
-						'check'			=> ($config['allow_privmsg']),
-						'item_type'		=> 'phpbb_notification_type_pm',
-					),
-				);
-
-				foreach ($default_notifications as $convert_data)
-				{
-					if ($convert_data['check'])
-					{
-						$sql = 'SELECT user_id
-							FROM ' . USERS_TABLE . '
-							WHERE user_id <> ' . ANONYMOUS . '
-								AND user_type <> ' . USER_IGNORE;
-						$result = $db->sql_query($sql);
-						while ($row = $db->sql_fetchrow($result))
-						{
-							_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-								'item_type'		=> $convert_data['item_type'],
-								'item_id'		=> 0,
-								'user_id'		=> $row['user_id'],
-								'method'		=> '',
-							)), $errored, $error_ary);
-						}
-						$db->sql_freeresult($result);
-					}
-				}*/
 			}
 
 		break;
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 5e13f98f25..4364641fe4 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1240,13 +1240,15 @@ CREATE TABLE phpbb_user_notifications (
 	item_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	item_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
-	method VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
+	method VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	notify INTEGER DEFAULT 1 NOT NULL
 );;
 
 ALTER TABLE phpbb_user_notifications ADD PRIMARY KEY (item_type, item_id, user_id, method);;
 
 CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications(item_type);;
 CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications(user_id);;
+CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications(notify);;
 
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index d463afb17c..17786e27e2 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1526,7 +1526,8 @@ CREATE TABLE [phpbb_user_notifications] (
 	[item_type] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[item_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[method] [varchar] (255) DEFAULT ('') NOT NULL 
+	[method] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[notify] [int] DEFAULT (1) NOT NULL 
 ) ON [PRIMARY]
 GO
 
@@ -1546,6 +1547,9 @@ GO
 CREATE  INDEX [uid] ON [phpbb_user_notifications]([user_id]) ON [PRIMARY]
 GO
 
+CREATE  INDEX [no] ON [phpbb_user_notifications]([notify]) ON [PRIMARY]
+GO
+
 
 /*
 	Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 9272e18735..fb91d55e5f 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -877,9 +877,11 @@ CREATE TABLE phpbb_user_notifications (
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	method varbinary(255) DEFAULT '' NOT NULL,
+	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method),
 	KEY it (item_type),
-	KEY uid (user_id)
+	KEY uid (user_id),
+	KEY no (notify)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index a73fda41f5..3601f2a43c 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -877,9 +877,11 @@ CREATE TABLE phpbb_user_notifications (
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	method varchar(255) DEFAULT '' NOT NULL,
+	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method),
 	KEY it (item_type),
-	KEY uid (user_id)
+	KEY uid (user_id),
+	KEY no (notify)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 02be9566dc..15c3012e28 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1645,6 +1645,7 @@ CREATE TABLE phpbb_user_notifications (
 	item_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	method varchar2(255) DEFAULT '' ,
+	notify number(1) DEFAULT '1' NOT NULL,
 	CONSTRAINT pk_phpbb_user_notifications PRIMARY KEY (item_type, item_id, user_id, method)
 )
 /
@@ -1653,6 +1654,8 @@ CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type)
 /
 CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id)
 /
+CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications (notify)
+/
 
 /*
 	Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 784e3c8c68..263a9884b7 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1127,11 +1127,13 @@ CREATE TABLE phpbb_user_notifications (
 	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	method varchar(255) DEFAULT '' NOT NULL,
+	notify INT2 DEFAULT '1' NOT NULL CHECK (notify >= 0),
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
 CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type);
 CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id);
+CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications (notify);
 
 /*
 	Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 28f8b1c3b6..e100a1dc14 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -771,13 +771,8 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
 
 # User Notification Options (for first user)
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('report', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('needs_approval', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_bookmark', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_pm', 0, 2, '');
 INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, '');
 INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, 'phpbb_notification_method_email');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_quote', 0, 2, '');
 INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, '');
 INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, 'phpbb_notification_method_email');
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 2fdac43947..1ca904e3bd 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -850,11 +850,13 @@ CREATE TABLE phpbb_user_notifications (
 	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	method varchar(255) NOT NULL DEFAULT '',
+	notify INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
 CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type);
 CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id);
+CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications (notify);
 
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
-- 
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 --------------------
 phpBB/styles/prosilver/theme/colours.css           |  2 +-
 4 files changed, 2 insertions(+), 64 deletions(-)

(limited to 'phpBB')

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)
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 49e404a903..88e48e845a 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1056,4 +1056,4 @@ input.disabled {
 
 #notification_list > .header, .notification_list > .footer {
 	border-color: #00608F;
-}
\ No newline at end of file
+}
-- 
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')

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')

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')

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')

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')

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 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/config/notifications.yml                     | 272 +++++++++++++++++++++
 phpBB/config/services.yml                          |   2 +
 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 +-
 phpBB/language/en/ucp.php                          |   4 +-
 25 files changed, 505 insertions(+), 75 deletions(-)
 create mode 100644 phpBB/config/notifications.yml

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
new file mode 100644
index 0000000000..78fcd7c2d9
--- /dev/null
+++ b/phpBB/config/notifications.yml
@@ -0,0 +1,272 @@
+services:
+    notification.type.approve_post:
+        class: phpbb_notification_type_approve_post
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.approve_topic:
+        class: phpbb_notification_type_approve_topic
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.bookmark:
+        class: phpbb_notification_type_bookmark
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.disapprove_post:
+        class: phpbb_notification_type_disapprove_post
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.disapprove_topic:
+        class: phpbb_notification_type_disapprove_topic
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.pm:
+        class: phpbb_notification_type_pm
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.post:
+        class: phpbb_notification_type_post
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.post_in_queue:
+        class: phpbb_notification_type_post_in_queue
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.quote:
+        class: phpbb_notification_type_quote
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.report_pm:
+        class: phpbb_notification_type_report_pm
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.report_pm_closed:
+        class: phpbb_notification_type_report_pm_closed
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.report_post:
+        class: phpbb_notification_type_report_post
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.report_post_closed:
+        class: phpbb_notification_type_report_post
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.topic:
+        class: phpbb_notification_type_topic
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.type.topic_in_queue:
+        class: phpbb_notification_type_topic_in_queue
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.type }
+
+    notification.method.email:
+        class: phpbb_notification_method_email
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.method }
+
+    notification.method.jabber:
+        class: phpbb_notification_method_jabber
+        arguments:
+            - @notification_manager
+            - @dbal.conn
+            - @cache.driver
+            - @template
+            - @ext.manager
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: notification.method }
\ No newline at end of file
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 4ae519091b..e780dc986f 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -1,6 +1,7 @@
 imports:
     - { resource: tables.yml }
     - { resource: cron_tasks.yml }
+    - { resource: notifications.yml }
 
 services:
     auth:
@@ -92,6 +93,7 @@ services:
     notification_manager:
         class: phpbb_notification_manager
         arguments:
+            - @container
             - @dbal.conn
             - @cache.driver
             - @template
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']),
 			));
 		}
 	}
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 5b1e7add02..7c3960204a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -295,6 +295,8 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
 	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
+	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
+	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
 	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
@@ -374,8 +376,6 @@ $lang = array_merge($lang, array(
 	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
 	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
 	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
-	'PHPBB_NOTIFICATION_METHOD_EMAIL'					=> 'Email',
-	'PHPBB_NOTIFICATION_METHOD_JABBER'					=> 'Jabber',
 	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
 	'PM_FROM'					=> 'From',
 	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
-- 
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')

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')

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/config/notifications.yml            | 30 ++++++++++++++++++
 phpBB/config/services.yml                 |  2 ++
 phpBB/config/tables.yml                   |  2 ++
 phpBB/includes/constants.php              |  3 --
 phpBB/includes/notification/manager.php   | 52 ++++++++++++++++++-------------
 phpBB/includes/notification/type/base.php | 12 ++++++-
 phpBB/install/database_update.php         | 18 +++--------
 7 files changed, 81 insertions(+), 38 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index 78fcd7c2d9..7c8e05494c 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -12,6 +12,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -28,6 +30,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -44,6 +48,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -60,6 +66,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -76,6 +84,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -92,6 +102,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -108,6 +120,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -124,6 +138,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -140,6 +156,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -156,6 +174,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -172,6 +192,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -188,6 +210,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -204,6 +228,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -220,6 +246,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
@@ -236,6 +264,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
         tags:
             - { name: notification.type }
 
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index e780dc986f..cbae3d49dd 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -103,6 +103,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notifications%
+            - %tables.user_notifications%
 
     processor.ext:
         class: phpbb_di_processor_ext
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index cfc6dbcfed..8791c5e89b 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -1,3 +1,5 @@
 parameters:
     tables.config: %core.table_prefix%config
     tables.ext: %core.table_prefix%ext
+    tables.notifications: %core.table_prefix%notifications
+    tables.user_notifications: %core.table_prefix%user_notifications
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;
 	}
 
 	/**
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 94a4749313..9e884b0a37 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -110,14 +110,6 @@ if (!defined('EXT_TABLE'))
 {
 	define('EXT_TABLE', $table_prefix . 'ext');
 }
-if (!defined('NOTIFICATIONS_TABLE'))
-{
-	define('NOTIFICATIONS_TABLE', $table_prefix . 'notifications');
-}
-if (!defined('USER_NOTIFICATIONS_TABLE'))
-{
-	define('USER_NOTIFICATIONS_TABLE', $table_prefix . 'user_notifications');
-}
 
 $phpbb_container = new ContainerBuilder();
 $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
@@ -1125,7 +1117,7 @@ function database_update_info()
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
 					),
 				),
-				NOTIFICATIONS_TABLE		=> array(
+				$table_prefix . 'notifications'		=> array(
 					'COLUMNS'			=> array(
 						'notification_id'	=> array('UINT', NULL, 'auto_increment'),
 						'item_type'			=> array('VCHAR:255', ''),
@@ -1148,7 +1140,7 @@ function database_update_info()
 						'is_enabled'		=> array('INDEX', 'is_enabled'),
 					),
 				),
-				USER_NOTIFICATIONS_TABLE	=> array(
+				$table_prefix . 'user_notifications'	=> array(
 					'COLUMNS'			=> array(
 						'item_type'			=> array('VCHAR:255', ''),
 						'item_id'			=> array('UINT', 0),
@@ -2791,7 +2783,7 @@ function change_database_data(&$no_updates, $version)
 						$result = $db->sql_query($sql);
 						while ($row = $db->sql_fetchrow($result))
 						{
-							_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+							_sql('INSERT INTO ' . $table_prefix . 'user_notifications ' . $db->sql_build_array('INSERT', array(
 								'item_type'		=> $convert_data['item_type'],
 								'item_id'		=> 0,
 								'user_id'		=> $row['user_id'],
@@ -2800,7 +2792,7 @@ function change_database_data(&$no_updates, $version)
 
 							if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
 							{
-								_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+								_sql('INSERT INTO ' . $table_prefix . 'user_notifications ' . $db->sql_build_array('INSERT', array(
 									'item_type'		=> $convert_data['item_type'],
 									'item_id'		=> 0,
 									'user_id'		=> $row['user_id'],
@@ -2810,7 +2802,7 @@ function change_database_data(&$no_updates, $version)
 
 							if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
 							{
-								_sql('INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+								_sql('INSERT INTO ' . $table_prefix . 'user_notifications ' . $db->sql_build_array('INSERT', array(
 									'item_type'		=> $convert_data['item_type'],
 									'item_id'		=> 0,
 									'user_id'		=> $row['user_id'],
-- 
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')

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')

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')

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 +-
 phpBB/language/en/email/bookmark.txt                 | 20 ++++++++++++++++++++
 phpBB/language/en/email/notifications/bookmark.txt   | 20 --------------------
 .../en/email/notifications/post_in_queue.txt         | 17 -----------------
 phpBB/language/en/email/notifications/quote.txt      | 20 --------------------
 phpBB/language/en/email/notifications/report_pm.txt  | 14 --------------
 .../language/en/email/notifications/report_post.txt  | 17 -----------------
 .../en/email/notifications/topic_in_queue.txt        | 17 -----------------
 phpBB/language/en/email/post_in_queue.txt            | 17 +++++++++++++++++
 phpBB/language/en/email/quote.txt                    | 20 ++++++++++++++++++++
 phpBB/language/en/email/report_pm.txt                | 14 ++++++++++++++
 phpBB/language/en/email/report_post.txt              | 17 +++++++++++++++++
 phpBB/language/en/email/short/bookmark.txt           | 20 ++++++++++++++++++++
 phpBB/language/en/email/short/newtopic_notify.txt    | 13 +++++++++++++
 phpBB/language/en/email/short/post_approved.txt      | 14 ++++++++++++++
 phpBB/language/en/email/short/post_disapproved.txt   | 12 ++++++++++++
 phpBB/language/en/email/short/post_in_queue.txt      | 17 +++++++++++++++++
 phpBB/language/en/email/short/privmsg_notify.txt     | 15 +++++++++++++++
 phpBB/language/en/email/short/quote.txt              | 20 ++++++++++++++++++++
 phpBB/language/en/email/short/report_pm.txt          | 14 ++++++++++++++
 phpBB/language/en/email/short/report_post.txt        | 17 +++++++++++++++++
 phpBB/language/en/email/short/topic_approved.txt     | 11 +++++++++++
 phpBB/language/en/email/short/topic_disapproved.txt  | 12 ++++++++++++
 phpBB/language/en/email/short/topic_in_queue.txt     | 17 +++++++++++++++++
 phpBB/language/en/email/short/topic_notify.txt       | 20 ++++++++++++++++++++
 phpBB/language/en/email/topic_in_queue.txt           | 17 +++++++++++++++++
 31 files changed, 313 insertions(+), 111 deletions(-)
 create mode 100644 phpBB/language/en/email/bookmark.txt
 delete mode 100644 phpBB/language/en/email/notifications/bookmark.txt
 delete mode 100644 phpBB/language/en/email/notifications/post_in_queue.txt
 delete mode 100644 phpBB/language/en/email/notifications/quote.txt
 delete mode 100644 phpBB/language/en/email/notifications/report_pm.txt
 delete mode 100644 phpBB/language/en/email/notifications/report_post.txt
 delete mode 100644 phpBB/language/en/email/notifications/topic_in_queue.txt
 create mode 100644 phpBB/language/en/email/post_in_queue.txt
 create mode 100644 phpBB/language/en/email/quote.txt
 create mode 100644 phpBB/language/en/email/report_pm.txt
 create mode 100644 phpBB/language/en/email/report_post.txt
 create mode 100644 phpBB/language/en/email/short/bookmark.txt
 create mode 100644 phpBB/language/en/email/short/newtopic_notify.txt
 create mode 100644 phpBB/language/en/email/short/post_approved.txt
 create mode 100644 phpBB/language/en/email/short/post_disapproved.txt
 create mode 100644 phpBB/language/en/email/short/post_in_queue.txt
 create mode 100644 phpBB/language/en/email/short/privmsg_notify.txt
 create mode 100644 phpBB/language/en/email/short/quote.txt
 create mode 100644 phpBB/language/en/email/short/report_pm.txt
 create mode 100644 phpBB/language/en/email/short/report_post.txt
 create mode 100644 phpBB/language/en/email/short/topic_approved.txt
 create mode 100644 phpBB/language/en/email/short/topic_disapproved.txt
 create mode 100644 phpBB/language/en/email/short/topic_in_queue.txt
 create mode 100644 phpBB/language/en/email/short/topic_notify.txt
 create mode 100644 phpBB/language/en/email/topic_in_queue.txt

(limited to 'phpBB')

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';
 	}
 }
diff --git a/phpBB/language/en/email/bookmark.txt b/phpBB/language/en/email/bookmark.txt
new file mode 100644
index 0000000000..95f17b5693
--- /dev/null
+++ b/phpBB/language/en/email/bookmark.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt
deleted file mode 100644
index 95f17b5693..0000000000
--- a/phpBB/language/en/email/notifications/bookmark.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
-
-If you want to view the newest post made since your last visit, click the following link:
-{U_NEWEST_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
deleted file mode 100644
index 8d56ce6c4d..0000000000
--- a/phpBB/language/en/email/notifications/post_in_queue.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
deleted file mode 100644
index 2b9525801f..0000000000
--- a/phpBB/language/en/email/notifications/quote.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
-
-If you want to view the quoted post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
deleted file mode 100644
index 66ae82d074..0000000000
--- a/phpBB/language/en/email/notifications/report_pm.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
-
-If you want to view the report, click the following link:
-{U_VIEW_REPORT}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
deleted file mode 100644
index 46983be1ed..0000000000
--- a/phpBB/language/en/email/notifications/report_post.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
-
-If you want to view the report, click the following link:
-{U_VIEW_REPORT}
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
deleted file mode 100644
index ae8f9e2484..0000000000
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt
new file mode 100644
index 0000000000..8d56ce6c4d
--- /dev/null
+++ b/phpBB/language/en/email/post_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/quote.txt b/phpBB/language/en/email/quote.txt
new file mode 100644
index 0000000000..2b9525801f
--- /dev/null
+++ b/phpBB/language/en/email/quote.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+
+If you want to view the quoted post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt
new file mode 100644
index 0000000000..66ae82d074
--- /dev/null
+++ b/phpBB/language/en/email/report_pm.txt
@@ -0,0 +1,14 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_post.txt b/phpBB/language/en/email/report_post.txt
new file mode 100644
index 0000000000..46983be1ed
--- /dev/null
+++ b/phpBB/language/en/email/report_post.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt
new file mode 100644
index 0000000000..95f17b5693
--- /dev/null
+++ b/phpBB/language/en/email/short/bookmark.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
new file mode 100644
index 0000000000..d4f5cae620
--- /dev/null
+++ b/phpBB/language/en/email/short/newtopic_notify.txt
@@ -0,0 +1,13 @@
+Subject: New topic notification - "{FORUM_NAME}"
+
+Hello {USERNAME},
+
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+
+{U_FORUM}
+
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
+
+{U_STOP_WATCHING_FORUM}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt
new file mode 100644
index 0000000000..e715b54026
--- /dev/null
+++ b/phpBB/language/en/email/short/post_approved.txt
@@ -0,0 +1,14 @@
+Subject: Post approved - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt
new file mode 100644
index 0000000000..3bc64bb611
--- /dev/null
+++ b/phpBB/language/en/email/short/post_disapproved.txt
@@ -0,0 +1,12 @@
+Subject: Post disapproved - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator.
+
+The following reason was given for the disapproval:
+
+{REASON}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt
new file mode 100644
index 0000000000..8d56ce6c4d
--- /dev/null
+++ b/phpBB/language/en/email/short/post_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt
new file mode 100644
index 0000000000..d3a86cc73c
--- /dev/null
+++ b/phpBB/language/en/email/short/privmsg_notify.txt
@@ -0,0 +1,15 @@
+Subject: New private message has arrived
+
+Hello {USERNAME},
+
+You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject:
+
+{SUBJECT}
+
+You can view your new message by clicking on the following link:
+
+{U_VIEW_MESSAGE}
+
+You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/quote.txt b/phpBB/language/en/email/short/quote.txt
new file mode 100644
index 0000000000..2b9525801f
--- /dev/null
+++ b/phpBB/language/en/email/short/quote.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+
+If you want to view the quoted post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt
new file mode 100644
index 0000000000..66ae82d074
--- /dev/null
+++ b/phpBB/language/en/email/short/report_pm.txt
@@ -0,0 +1,14 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt
new file mode 100644
index 0000000000..46983be1ed
--- /dev/null
+++ b/phpBB/language/en/email/short/report_post.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt
new file mode 100644
index 0000000000..ffda378d30
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_approved.txt
@@ -0,0 +1,11 @@
+Subject: Topic approved - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt
new file mode 100644
index 0000000000..49ef58bf39
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_disapproved.txt
@@ -0,0 +1,12 @@
+Subject: Topic disapproved - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator.
+
+The following reason was given for the disapproval:
+
+{REASON}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt
new file mode 100644
index 0000000000..ae8f9e2484
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
new file mode 100644
index 0000000000..fa2481dd9a
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_notify.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
+
+{U_STOP_WATCHING_TOPIC}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt
new file mode 100644
index 0000000000..ae8f9e2484
--- /dev/null
+++ b/phpBB/language/en/email/topic_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
-- 
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')

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 3e03f95cb73ad090e22514be856c9b0613e0448a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 11 Nov 2012 19:07:00 +0100
Subject: [ticket/10431] CSS3 buttons

CSS3 replacements for big buttons

PHPBB3-10431
---
 phpBB/styles/prosilver/theme/buttons.css        |  83 ++++++++++++++++--------
 phpBB/styles/prosilver/theme/colours.css        |   8 ---
 phpBB/styles/prosilver/theme/en/stylesheet.css  |  16 -----
 phpBB/styles/prosilver/theme/images/buttons.png | Bin 0 -> 2563 bytes
 4 files changed, 57 insertions(+), 50 deletions(-)
 create mode 100644 phpBB/styles/prosilver/theme/images/buttons.png

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index e817380f8e..9a69956368 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -14,40 +14,71 @@
 .buttons div {
 	float: left;
 	margin: 0 5px 0 0;
-	background-position: 0 100%;
 }
 
 /* Rolloff state */
 .buttons div a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	background-position: 0 0;
-	position: relative;
-	overflow: hidden;
+    display: inline-block;
+    line-height: 16px;
+    font-size: 13px;
+	white-space: nowrap;
+    border: 1px solid #c7c3bf;
+    border-radius: 4px;
+	background: #fff none 0 0 repeat-x;
+    background-image: -moz-linear-gradient(top, #fff, #e9e9e9);
+    background-image: -webkit-linear-gradient(top, #fff, #e9e9e9);
+    background-image: -o-linear-gradient(top, #fff, #e9e9e9);
+    background-image: linear-gradient(to bottom, #fff, #e9e9e9);
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#e9e9e9')";
+    box-shadow: 0 0 0 1px #fff inset;
+    -webkit-box-shadow: 0 0 0 1px #fff inset;
+    text-shadow: 1px 1px 0 #fff, -1px -1px 0 rgba(188, 42, 77, 0.25);
+    padding: 3px 22px 3px 8px;
+    color: #bc2a4d !important;
+    position: relative;
+    text-decoration: none !important;
+    outline-style: none !important;
 }
 
-/* Hide <a> text and hide off-state image when rolling over (prevents flicker in IE) */
-/*.buttons div span		{ display: none; }*/
-/*.buttons div a:hover	{ background-image: none; }*/
-.buttons div span			{ position: absolute; width: 100%; height: 100%; cursor: pointer;}
-.buttons div a:hover span	{ background-position: 0 100%; }
+.buttons div span { display: none; }
 
+.buttons div a:hover {
+    border-color: #0a8ed0;
+    background-image: -moz-linear-gradient(top, #e9e9e9, #fff);
+    background-image: -webkit-linear-gradient(top, #e9e9e9, #fff);
+    background-image: -o-linear-gradient(top, #e9e9e9, #fff);
+    background-image: linear-gradient(to bottom, #e9e9e9, #fff);
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#e9e9e9', EndColorStr='#ffffff')";
+    text-shadow: 1px 1px 0 #fff, -1px -1px 0 #fff, -1px -1px 0 rgba(188, 42, 77, 0.2);
+}
+
+.buttons div a:after {
+    content: '';
+    display: block;
+    position: absolute;
+    top: 50%;
+    right: 6px;
+    width: 12px;
+    height: 12px;
+	margin-top: -6px;
+    background: url("images/buttons.png") 0px 0 no-repeat;
+}
+
+.buttons div a:hover:after {
+    background-position: 0 -20px;
+}
 /* Big button images */
-.reply-icon span	{ background: transparent none 0 0 no-repeat; }
-.post-icon span		{ background: transparent none 0 0 no-repeat; }
-.locked-icon span	{ background: transparent none 0 0 no-repeat; }
-.pmreply-icon span	{ background: none 0 0 no-repeat; }
-.newpm-icon span 	{ background: none 0 0 no-repeat; }
-.forwardpm-icon span 	{ background: none 0 0 no-repeat; }
-
-/* Set big button dimensions */
-.buttons div.reply-icon		{ width: 96px; height: 25px; }
-.buttons div.post-icon		{ width: 96px; height: 25px; }
-.buttons div.locked-icon	{ width: 88px; height: 25px; }
-.buttons div.pmreply-icon	{ width: 96px; height: 25px; }
-.buttons div.newpm-icon		{ width: 84px; height: 25px; }
-.buttons div.forwardpm-icon	{ width: 96px; height: 25px; }
+.buttons div.reply-icon a:after, .buttons div.pmreply-icon a:after { background-position: -20px 0; }
+.buttons div.reply-icon a:hover:after, .buttons div.pmreply-icon a:hover:after	{ background-position: -20px -20px; }
+
+.buttons div.post-icon a:after, .buttons div.newpm-icon a:after	{ background-position: 0 0; }
+.buttons div.post-icon a:hover:after, .buttons div.newpm-icon a:hover:after	{ background-position: 0 -20px; }
+
+.buttons div.locked-icon a:after	{ background-position: -60px 0; }
+.buttons div.locked-icon a:hover:after	{ background-position: -60px -20px; }
+
+.buttons div.forwardpm-icon a:after	{ background-position: -40px 0; }
+.buttons div.forwardpm-icon a:hover:after	{ background-position: -40px -20px; }
 
 /* Sub-header (navigation bar)
 --------------------------------------------- */
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index d7ce9a7622..0a8e011171 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -649,14 +649,6 @@ fieldset.polls dd div {
 Colours and backgrounds for buttons.css
 -------------------------------------------------------------- */
 
-/* Big button images */
-.reply-icon span	{ background-image: url("./en/button_topic_reply.gif"); }
-.post-icon span		{ background-image: url("./en/button_topic_new.gif"); }
-.locked-icon span	{ background-image: url("./en/button_topic_locked.gif"); }
-.pmreply-icon span	{ background-image: url("./en/button_pm_reply.gif") ;}
-.newpm-icon span 	{ background-image: url("./en/button_pm_new.gif") ;}
-.forwardpm-icon span	{ background-image: url("./en/button_pm_forward.gif") ;}
-
 a.print {
 	background-image: url("./images/icon_print.gif");
 }
diff --git a/phpBB/styles/prosilver/theme/en/stylesheet.css b/phpBB/styles/prosilver/theme/en/stylesheet.css
index d17f9a5be4..1a3d0acb4b 100644
--- a/phpBB/styles/prosilver/theme/en/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/en/stylesheet.css
@@ -1,11 +1,3 @@
-/* Set big button dimensions */
-.buttons div.reply-icon		{ width: 96px; height: 25px; }
-.buttons div.post-icon		{ width: 96px; height: 25px; }
-.buttons div.locked-icon	{ width: 88px; height: 25px; }
-.buttons div.pmreply-icon	{ width: 96px; height: 25px; }
-.buttons div.newpm-icon		{ width: 84px; height: 25px; }
-.buttons div.forwardpm-icon	{ width: 96px; height: 25px; }
-
 /* Set profile icon dimensions */
 ul.profile-icons li.pm-icon		{ width: 28px; height: 20px; }
 ul.profile-icons li.quote-icon	{ width: 54px; height: 20px; }
@@ -14,14 +6,6 @@ ul.profile-icons li.edit-icon	{ width: 42px; height: 20px; }
 /* Online image */
 .online { background-image: url("./icon_user_online.gif"); }
 
-/* Big button images */
-.reply-icon span	{ background-image: url("./button_topic_reply.gif"); }
-.post-icon span		{ background-image: url("./button_topic_new.gif"); }
-.locked-icon span	{ background-image: url("./button_topic_locked.gif"); }
-.pmreply-icon span	{ background-image: url("./button_pm_reply.gif") ;}
-.newpm-icon span 	{ background-image: url("./button_pm_new.gif") ;}
-.forwardpm-icon span	{ background-image: url("./button_pm_forward.gif") ;}
-
 /* Icon images */
 .pm-icon, .pm-icon a				{ background-image: url("./icon_contact_pm.gif"); }
 .quote-icon, .quote-icon a		{ background-image: url("./icon_post_quote.gif"); }
diff --git a/phpBB/styles/prosilver/theme/images/buttons.png b/phpBB/styles/prosilver/theme/images/buttons.png
new file mode 100644
index 0000000000..a19abdc2b8
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/buttons.png differ
-- 
cgit v1.2.1


From 8b1920adb59d2cc6e8bed558c56fb33ab5c4b0f7 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 12 Nov 2012 10:25:12 +0100
Subject: [ticket/10431] Different font for iOS

Different font for buttons on iOS devices because Verdana looks
incorrectly aligned in Safari/iOS. Also slightly changed text shadow.

PHPBB3-10431
---
 phpBB/styles/prosilver/theme/buttons.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 9a69956368..2ba17a7717 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -32,8 +32,9 @@
 	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#e9e9e9')";
     box-shadow: 0 0 0 1px #fff inset;
     -webkit-box-shadow: 0 0 0 1px #fff inset;
-    text-shadow: 1px 1px 0 #fff, -1px -1px 0 rgba(188, 42, 77, 0.25);
+    text-shadow: 1px 1px 0 #fff, -1px -1px 1px rgba(188, 42, 77, 0.25);
     padding: 3px 22px 3px 8px;
+	font-family: "Futura-Medium", Verdana;
     color: #bc2a4d !important;
     position: relative;
     text-decoration: none !important;
-- 
cgit v1.2.1


From 25124b361e8e23f338efb0f649abf46a37c66e3d Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 12 Nov 2012 10:42:11 +0100
Subject: [ticket/10431] Adjustments for IE7

Adjustments to buttons for IE7

PHPBB3-10431
---
 phpBB/styles/prosilver/theme/buttons.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 2ba17a7717..544f4d3def 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -39,6 +39,7 @@
     position: relative;
     text-decoration: none !important;
     outline-style: none !important;
+	*padding-right: 8px;
 }
 
 .buttons div span { display: none; }
-- 
cgit v1.2.1


From 8e700f7e2bfecc514f8ed4ae8db43dd37703ca1e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 12 Nov 2012 11:03:30 +0100
Subject: [ticket/10431] Changed fonts for Linux

Added backup fonts for Linux systems that do not have Verdana font

PHPBB3-10431
---
 phpBB/styles/prosilver/theme/buttons.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 544f4d3def..02f973d0ff 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -34,7 +34,7 @@
     -webkit-box-shadow: 0 0 0 1px #fff inset;
     text-shadow: 1px 1px 0 #fff, -1px -1px 1px rgba(188, 42, 77, 0.25);
     padding: 3px 22px 3px 8px;
-	font-family: "Futura-Medium", Verdana;
+	font-family: "Futura-Medium", Verdana, Arial, Helvetica;
     color: #bc2a4d !important;
     position: relative;
     text-decoration: none !important;
-- 
cgit v1.2.1


From 4c9820d1ca47d088146f3f52fb1126821efe3646 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Nov 2012 15:01:25 +0100
Subject: [feature/avatars] add missing html closing tags and fix tabbing

PHPBB3-10018
---
 phpBB/adm/style/acp_users_avatar.html                   | 9 +++++----
 phpBB/styles/prosilver/template/ucp_avatar_options.html | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 93a7b38390..62c80f14c1 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -37,14 +37,15 @@
 			</dl>
 		<!-- ENDIF -->
 	<!-- ELSE -->
-		</fieldset>
+	</fieldset>
 
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
+	<fieldset>
+		<legend>{L_AVATAR_GALLERY}</legend>
 		<dl>
 			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+		</dl>
+		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index d9763adc85..30015c5ec2 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -21,6 +21,7 @@
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
 			</select></dd>
+		</dl>
 	</fieldset>
 	<div id="av_options">
 <!-- BEGIN avatar_drivers -->
-- 
cgit v1.2.1


From 4c4b82416b8c7b3a8f97b12ca96699bea0bde91d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Nov 2012 15:06:44 +0100
Subject: [feature/avatars] Replace colon usage with {L_COLON}

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html                  | 2 +-
 phpBB/adm/style/acp_avatar_options_remote.html                 | 4 ++--
 phpBB/adm/style/acp_avatar_options_upload.html                 | 4 ++--
 phpBB/adm/style/acp_groups.html                                | 2 +-
 phpBB/adm/style/acp_users_avatar.html                          | 2 +-
 phpBB/styles/prosilver/template/ucp_avatar_options_local.html  | 2 +-
 phpBB/styles/prosilver/template/ucp_avatar_options_remote.html | 4 ++--
 phpBB/styles/prosilver/template/ucp_avatar_options_upload.html | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index d762fa9008..02ff58fe15 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,5 +1,5 @@
 <dl>
-	<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 	<dd><select name="av_local_cat" id="category">
 		<option value="">{L_NO_AVATAR_CATEGORY}</option>
 		<!-- BEGIN av_local_cats -->
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index 02704c5be8..ec5a22b691 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -1,9 +1,9 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
 		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index 9c8dd9af01..d0a4f516e1 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
 	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 3a551adca7..6fb2908b0a 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -103,7 +103,7 @@
 	<fieldset>
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR}</dd>
 	</dl>
 	<dl>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 62c80f14c1..c179e1958d 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -47,7 +47,7 @@
 		</dl>
 		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
-			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
 		</dl>
 	</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 9f726e2ff9..9ca9b6e9ec 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -1,4 +1,4 @@
-<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
+<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="av_local_cat" id="category">
 <option value="">{L_NO_AVATAR_CATEGORY}</option>
 <!-- BEGIN av_local_cats -->
 <option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index 02704c5be8..ec5a22b691 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -1,9 +1,9 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
 		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
index 9c8dd9af01..d0a4f516e1 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
 	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
-- 
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')

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')

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/develop/create_schema_files.php     | 11 +++++++++++
 phpBB/includes/constants.php              |  1 +
 phpBB/install/schemas/firebird_schema.sql | 27 ++++++++++++++++++++++++--
 phpBB/install/schemas/mssql_schema.sql    | 24 +++++++++++++++++++++--
 phpBB/install/schemas/mysql_40_schema.sql | 13 ++++++++++++-
 phpBB/install/schemas/mysql_41_schema.sql | 13 ++++++++++++-
 phpBB/install/schemas/oracle_schema.sql   | 32 ++++++++++++++++++++++++++++++-
 phpBB/install/schemas/postgres_schema.sql | 17 +++++++++++++++-
 phpBB/install/schemas/sqlite_schema.sql   | 14 ++++++++++++--
 9 files changed, 142 insertions(+), 10 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 3d3e478032..366f4a9d48 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1669,6 +1669,17 @@ function get_schema_struct()
 		),
 	);
 
+	$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'),
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');
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 767ce68b4a..b25d0216d9 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -912,8 +912,8 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER DEFAULT 0 NOT NULL,
 	report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
-	reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL
+	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
@@ -1111,6 +1111,29 @@ BEGIN
 END;;
 
 
+# Table: 'phpbb_teampage'
+CREATE TABLE phpbb_teampage (
+	teampage_id INTEGER NOT NULL,
+	group_id INTEGER DEFAULT 0 NOT NULL,
+	teampage_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
+	teampage_position INTEGER DEFAULT 0 NOT NULL,
+	teampage_parent INTEGER DEFAULT 0 NOT NULL
+);;
+
+ALTER TABLE phpbb_teampage ADD PRIMARY KEY (teampage_id);;
+
+
+CREATE GENERATOR phpbb_teampage_gen;;
+SET GENERATOR phpbb_teampage_gen TO 0;;
+
+CREATE TRIGGER t_phpbb_teampage FOR phpbb_teampage
+BEFORE INSERT
+AS
+BEGIN
+	NEW.teampage_id = GEN_ID(phpbb_teampage_gen, 1);
+END;;
+
+
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id INTEGER NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 84c975942f..bc7164325d 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1111,8 +1111,8 @@ CREATE TABLE [phpbb_reports] (
 	[report_time] [int] DEFAULT (0) NOT NULL ,
 	[report_text] [text] DEFAULT ('') NOT NULL ,
 	[reported_post_text] [text] DEFAULT ('') NOT NULL ,
-	[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL 
+	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
+	[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
@@ -1344,6 +1344,26 @@ CREATE  UNIQUE  INDEX [style_name] ON [phpbb_styles]([style_name]) ON [PRIMARY]
 GO
 
 
+/*
+	Table: 'phpbb_teampage'
+*/
+CREATE TABLE [phpbb_teampage] (
+	[teampage_id] [int] IDENTITY (1, 1) NOT NULL ,
+	[group_id] [int] DEFAULT (0) NOT NULL ,
+	[teampage_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[teampage_position] [int] DEFAULT (0) NOT NULL ,
+	[teampage_parent] [int] DEFAULT (0) NOT NULL 
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [phpbb_teampage] WITH NOCHECK ADD 
+	CONSTRAINT [PK_phpbb_teampage] PRIMARY KEY  CLUSTERED 
+	(
+		[teampage_id]
+	)  ON [PRIMARY] 
+GO
+
+
 /*
 	Table: 'phpbb_topics'
 */
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 8aab949103..ce4c43c9c3 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -649,8 +649,8 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumblob NOT NULL,
 	reported_post_text mediumblob NOT NULL,
-	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	reported_post_uid varbinary(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
@@ -773,6 +773,17 @@ CREATE TABLE phpbb_styles (
 );
 
 
+# Table: 'phpbb_teampage'
+CREATE TABLE phpbb_teampage (
+	teampage_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	teampage_name blob NOT NULL,
+	teampage_position mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	teampage_parent mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	PRIMARY KEY (teampage_id)
+);
+
+
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 04aef2844a..c15a3f81d5 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -649,8 +649,8 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumtext NOT NULL,
 	reported_post_text mediumtext NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
@@ -773,6 +773,17 @@ CREATE TABLE phpbb_styles (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_teampage'
+CREATE TABLE phpbb_teampage (
+	teampage_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	teampage_name varchar(255) DEFAULT '' NOT NULL,
+	teampage_position mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	teampage_parent mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	PRIMARY KEY (teampage_id)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 91f906bc8b..95f23c7359 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1216,8 +1216,8 @@ CREATE TABLE phpbb_reports (
 	report_time number(11) DEFAULT '0' NOT NULL,
 	report_text clob DEFAULT '' ,
 	reported_post_text clob DEFAULT '' ,
-	reported_post_bitfield varchar2(255) DEFAULT '' ,
 	reported_post_uid varchar2(8) DEFAULT '' ,
+	reported_post_bitfield varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
 )
 /
@@ -1474,6 +1474,36 @@ END;
 /
 
 
+/*
+	Table: 'phpbb_teampage'
+*/
+CREATE TABLE phpbb_teampage (
+	teampage_id number(8) NOT NULL,
+	group_id number(8) DEFAULT '0' NOT NULL,
+	teampage_name varchar2(765) DEFAULT '' ,
+	teampage_position number(8) DEFAULT '0' NOT NULL,
+	teampage_parent number(8) DEFAULT '0' NOT NULL,
+	CONSTRAINT pk_phpbb_teampage PRIMARY KEY (teampage_id)
+)
+/
+
+
+CREATE SEQUENCE phpbb_teampage_seq
+/
+
+CREATE OR REPLACE TRIGGER t_phpbb_teampage
+BEFORE INSERT ON phpbb_teampage
+FOR EACH ROW WHEN (
+	new.teampage_id IS NULL OR new.teampage_id = 0
+)
+BEGIN
+	SELECT phpbb_teampage_seq.nextval
+	INTO :new.teampage_id
+	FROM dual;
+END;
+/
+
+
 /*
 	Table: 'phpbb_topics'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 619985e0d6..15d50035d6 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -855,8 +855,8 @@ CREATE TABLE phpbb_reports (
 	report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
 	report_text TEXT DEFAULT '' NOT NULL,
 	reported_post_text TEXT DEFAULT '' NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id)
 );
 
@@ -1007,6 +1007,21 @@ CREATE TABLE phpbb_styles (
 
 CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
 
+/*
+	Table: 'phpbb_teampage'
+*/
+CREATE SEQUENCE phpbb_teampage_seq;
+
+CREATE TABLE phpbb_teampage (
+	teampage_id INT4 DEFAULT nextval('phpbb_teampage_seq'),
+	group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0),
+	teampage_name varchar(255) DEFAULT '' NOT NULL,
+	teampage_position INT4 DEFAULT '0' NOT NULL CHECK (teampage_position >= 0),
+	teampage_parent INT4 DEFAULT '0' NOT NULL CHECK (teampage_parent >= 0),
+	PRIMARY KEY (teampage_id)
+);
+
+
 /*
 	Table: 'phpbb_topics'
 */
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 1690a7dcab..f5d5d8e0bf 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -630,8 +630,8 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_text mediumtext(16777215) NOT NULL DEFAULT '',
 	reported_post_text mediumtext(16777215) NOT NULL DEFAULT '',
-	reported_post_bitfield varchar(255) NOT NULL DEFAULT '',
-	reported_post_uid varchar(8) NOT NULL DEFAULT ''
+	reported_post_uid varchar(8) NOT NULL DEFAULT '',
+	reported_post_bitfield varchar(255) NOT NULL DEFAULT ''
 );
 
 CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
@@ -748,6 +748,16 @@ CREATE TABLE phpbb_styles (
 
 CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
 
+# Table: 'phpbb_teampage'
+CREATE TABLE phpbb_teampage (
+	teampage_id INTEGER PRIMARY KEY NOT NULL ,
+	group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	teampage_name varchar(255) NOT NULL DEFAULT '',
+	teampage_position INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	teampage_parent INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
+
+
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id INTEGER PRIMARY KEY NOT NULL ,
-- 
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')

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 8ee908d32e898c31fb1b76c8c42c34a7e7dcf8c3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 12:14:39 +0100
Subject: [ticket/10411] Remove duplicated ids from the template

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 1e309d4cbc..5ee63093bd 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -17,8 +17,8 @@
 		</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
 		<input type="hidden" name="action" value="set_config_legend" />
 		{S_FORM_TOKEN}
 	</p>
@@ -66,7 +66,7 @@
 	</tbody>
 	</table>
 
-	<form id="acp_groups" method="post" action="{U_ACTION_LEGEND}">
+	<form id="legend_add_group" method="post" action="{U_ACTION_LEGEND}">
 		<fieldset class="quick">
 			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
@@ -82,7 +82,7 @@
 	<fieldset>
 		<legend>{L_TEAMPAGE_SETTINGS}</legend>
 		<dl>
-			<dt><label for="teampage_multiple">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>
+			<dt><label for="teampage_memberships">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>
 			<dd>
 				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br />
 				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br />
@@ -98,8 +98,8 @@
 		</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
 		<input type="hidden" name="action" value="set_config_teampage" />
 		{S_FORM_TOKEN}
 	</p>
@@ -147,7 +147,7 @@
 	</tbody>
 	</table>
 
-	<form id="acp_groups" method="post" action="{U_ACTION_TEAMPAGE}">
+	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
 			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-- 
cgit v1.2.1


From 075e7755c3d68621dbb01c993c4d3a00645b2fb3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 13 Nov 2012 20:04:33 +0100
Subject: [feature/avatars] fix 'user_avatar_type' in database updater

PHPBB3-10018
---
 phpBB/install/database_update.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7522720909..b2d0eaedb4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1130,13 +1130,11 @@ function database_update_info()
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
 					'group_legend'		=> array('UINT', 0),
-					'group_avatar_type'		=> array('VCHAR:32', 0),
-				),
-				USERS_TABLE		=> array(
-					'user_avatar_type'		=> array('VCHAR:32', 0),
+					'group_avatar_type'		=> array('VCHAR:255', ''),
 				),
 				USERS_TABLE			=> array(
 					'user_timezone'		=> array('VCHAR:100', ''),
+					'user_avatar_type'		=> array('VCHAR:255', ''),
 				),
 			),
 		),
-- 
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 +++++++++++++++++++++
 .../template/ucp_avatar_options_gravatar.html      |  11 ++
 2 files changed, 159 insertions(+)
 create mode 100644 phpBB/includes/avatar/driver/core/gravatar.php
 create mode 100644 phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html

(limited to 'phpBB')

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,
+		);
+	}
+}
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
new file mode 100644
index 0000000000..c0bae47162
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="av_gravatar_email">{L_EMAIL_GRAVATAR_AVATAR}{L_COLON}</label><br /><span>{L_EMAIL_GRAVATAR_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+</dl>
+<dl>
+	<dt><label for="width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EXPLAIN}</span></dt>
+	<dd>
+		<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
+</dl>
-- 
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')

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/adm/style/acp_groups_position.html |  24 ++++-
 phpBB/includes/acp/acp_groups.php        | 166 +++++++++++++++++++++++--------
 phpBB/language/en/acp/groups.php         |   3 +
 phpBB/memberlist.php                     |  39 ++++++--
 4 files changed, 180 insertions(+), 52 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 5ee63093bd..ade3cf3e57 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -108,6 +108,8 @@
 
 	<p>{L_TEAMPAGE_EXPLAIN}</p>
 
+	<!-- IF S_TEAMPAGE_CATEGORY and CUR_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CUR_CATEGORY_NAME}</strong></p><!-- ENDIF -->
+
 	<table cellspacing="1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
@@ -120,8 +122,15 @@
 	<tbody>
 	<!-- BEGIN teampage -->
 		<tr>
-			<td><strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong></td>
-			<td style="text-align: center;">{teampage.GROUP_TYPE}</td>
+			<td>
+				<!-- IF teampage.U_CATEGORY -->
+					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
+				<!-- ELSE -->
+					<strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong>
+				<!-- ENDIF -->
+			</td>
+			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
+			</td></td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
 					{ICON_MOVE_UP_DISABLED}
@@ -147,6 +156,17 @@
 	</tbody>
 	</table>
 
+	<!-- IF not S_TEAMPAGE_CATEGORY -->
+	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
+		<fieldset class="quick">
+			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_CATEGORY_NAME}" />
+			<input class="button2" type="submit" name="submit" value="{L_ADD_CATEGORY}" />
+			<input type="hidden" name="action" value="add_category" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</form>
+	<!-- ENDIF -->
+
 	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
 			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
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,
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index a5c0af933c..18e5cbaa1d 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -36,12 +36,14 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
+	'ADD_CATEGORY'					=> 'Add category',
 	'ADD_USERS'						=> 'Add users',
 	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
 
 	'COPY_PERMISSIONS'				=> 'Copy permissions from',
 	'COPY_PERMISSIONS_EXPLAIN'		=> 'Once created, the group will have the same permissions as the one you select here.',
 	'CREATE_GROUP'					=> 'Create new group',
+	'CATEGORY_NAME'					=> 'Category name',
 
 	'GROUPS_NO_MEMBERS'				=> 'This group has no members',
 	'GROUPS_NO_MODS'				=> 'No group leaders defined',
@@ -130,6 +132,7 @@ $lang = array_merge($lang, array(
 	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
 	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
 
+	'TEAMPAGE'					=> 'Teampage',
 	'TEAMPAGE_DISP_ALL'			=> 'All memberships',
 	'TEAMPAGE_DISP_DEFAULT'		=> 'User’s default group only',
 	'TEAMPAGE_DISP_FIRST'		=> 'First membership only',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index d9ba147c70..e3fc2dec81 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -71,12 +71,23 @@ switch ($mode)
 		$page_title = $user->lang['THE_TEAM'];
 		$template_html = 'memberlist_leaders.html';
 
+		$sql = 'SELECT *
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position ASC';
+		$result = $db->sql_query($sql, 3600);
+		$teampage_data = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
 		$sql_ary = array(
-			'SELECT'	=> 'g.group_id, g.group_name, g.group_colour, g.group_type, g.group_teampage, ug.user_id as ug_user_id',
+			'SELECT'	=> 'g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id, t.teampage_id',
 
 			'FROM'		=> array(GROUPS_TABLE => 'g'),
 
 			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(TEAMPAGE_TABLE => 't'),
+					'ON'	=> 't.group_id = g.group_id',
+				),
 				array(
 					'FROM'	=> array(USER_GROUP_TABLE => 'ug'),
 					'ON'	=> 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . (int) $user->data['user_id'],
@@ -85,7 +96,7 @@ switch ($mode)
 
 			'WHERE'		=> '',
 
-			'ORDER_BY'	=> 'g.group_teampage ASC',
+			'ORDER_BY'	=> '',
 		);
 
 		$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
@@ -104,7 +115,7 @@ switch ($mode)
 				$row['u_group'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']);
 			}
 
-			if ($row['group_teampage'])
+			if ($row['teampage_id'])
 			{
 				// Only put groups into the array we want to display.
 				// We are fetching all groups, to ensure we got all data for default groups.
@@ -204,10 +215,26 @@ switch ($mode)
 			}
 		}
 
-		foreach ($groups_ary as $group_id => $group_data)
+		$parent_team = 0;
+		foreach ($teampage_data as $team_data)
 		{
-			if ($group_data['group_teampage'])
+			// If this team entry has no group, it's a category
+			if (!$team_data['group_id'])
+			{
+				$template->assign_block_vars('group', array(
+					'GROUP_NAME'  => $team_data['teampage_name'],
+				));
+
+				$parent_team = (int) $team_data['teampage_id'];
+				continue;
+			}
+
+			$group_data = $groups_ary[(int) $team_data['group_id']];
+			$group_id = (int) $team_data['group_id'];
+
+			if (!$team_data['teampage_parent'])
 			{
+				// If the group does not have a parent category, we display the groupname as category
 				$template->assign_block_vars('group', array(
 					'GROUP_NAME'	=> $group_data['group_name'],
 					'GROUP_COLOR'	=> $group_data['group_colour'],
@@ -223,7 +250,7 @@ switch ($mode)
 					if (isset($user_ary[$user_id]))
 					{
 						$row = $user_ary[$user_id];
-						if ($config['teampage_memberships'] == 1 && ($group_id != $groups_ary[$row['default_group']]['group_id']) && $groups_ary[$row['default_group']]['group_teampage'])
+						if ($config['teampage_memberships'] == 1 && ($group_id != $groups_ary[$row['default_group']]['group_id']) && $groups_ary[$row['default_group']]['teampage_id'])
 						{
 							// Display users in their primary group, instead of the first group, when it is displayed on the teampage.
 							continue;
-- 
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')

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 8fc022033a16b50aa07d06af8dc2a2508f0d94a6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 16:24:02 +0100
Subject: [ticket/10411] Update schema and fix database update

PHPBB3-10411
---
 phpBB/develop/create_schema_files.php     |  1 -
 phpBB/install/database_update.php         | 52 +++++++++++++++++++++----------
 phpBB/install/schemas/firebird_schema.sql |  3 +-
 phpBB/install/schemas/mssql_schema.sql    |  3 +-
 phpBB/install/schemas/mysql_40_schema.sql |  1 -
 phpBB/install/schemas/mysql_41_schema.sql |  1 -
 phpBB/install/schemas/oracle_schema.sql   |  1 -
 phpBB/install/schemas/postgres_schema.sql |  1 -
 phpBB/install/schemas/sqlite_schema.sql   |  3 +-
 9 files changed, 39 insertions(+), 27 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 366f4a9d48..6f5594bd52 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1178,7 +1178,6 @@ function get_schema_struct()
 			'group_message_limit'	=> array('UINT', 0),
 			'group_max_recipients'	=> array('UINT', 0),
 			'group_legend'			=> array('UINT', 0),
-			'group_teampage'		=> array('UINT', 0),
 		),
 		'PRIMARY_KEY'	=> 'group_id',
 		'KEYS'			=> array(
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 27cc4951a9..540b66d030 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1107,11 +1107,18 @@ function database_update_info()
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
 					),
 				),
+				TEAMPAGE_TABLE				=> 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',
+				),
 			),
 			'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),
 				),
@@ -2381,26 +2388,39 @@ function change_database_data(&$no_updates, $version)
 				set_config('use_system_cron', 0);
 			}
 
-			$sql = 'SELECT group_teampage
-				FROM ' . GROUPS_TABLE . '
-				WHERE group_teampage > 0';
+			$sql = 'SELECT teampage_id
+				FROM ' . TEAMPAGE_TABLE;
 			$result = $db->sql_query_limit($sql, 1);
-			$added_groups_teampage = (bool) $db->sql_fetchfield('group_teampage');
+			$added_groups_teampage = (bool) $db->sql_fetchfield('teampage_id');
 			$db->sql_freeresult($result);
 
 			if (!$added_groups_teampage)
 			{
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_teampage = 1
+				$sql = 'SELECT *
+					FROM ' . GROUPS_TABLE . '
 					WHERE group_type = ' . GROUP_SPECIAL . "
-						AND group_name = 'ADMINISTRATORS'";
-				_sql($sql, $errored, $error_ary);
+						AND (group_name = 'ADMINISTRATORS'
+							OR group_name = 'GLOBAL_MODERATORS')
+					ORDER BY group_name ASC";
+				$result = $db->sql_query($sql);
 
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_teampage = 2
-					WHERE group_type = ' . GROUP_SPECIAL . "
-						AND group_name = 'GLOBAL_MODERATORS'";
-				_sql($sql, $errored, $error_ary);
+				$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))
+				{
+					$db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_entries);
+				}
+				unset($teampage_entries);
 			}
 
 			if (!isset($config['legend_sort_groupname']))
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index b25d0216d9..2e8458a263 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -454,8 +454,7 @@ CREATE TABLE phpbb_groups (
 	group_receive_pm INTEGER DEFAULT 0 NOT NULL,
 	group_message_limit INTEGER DEFAULT 0 NOT NULL,
 	group_max_recipients INTEGER DEFAULT 0 NOT NULL,
-	group_legend INTEGER DEFAULT 0 NOT NULL,
-	group_teampage INTEGER DEFAULT 0 NOT NULL
+	group_legend INTEGER DEFAULT 0 NOT NULL
 );;
 
 ALTER TABLE phpbb_groups ADD PRIMARY KEY (group_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index bc7164325d..79ff8df86a 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -562,8 +562,7 @@ CREATE TABLE [phpbb_groups] (
 	[group_receive_pm] [int] DEFAULT (0) NOT NULL ,
 	[group_message_limit] [int] DEFAULT (0) NOT NULL ,
 	[group_max_recipients] [int] DEFAULT (0) NOT NULL ,
-	[group_legend] [int] DEFAULT (0) NOT NULL ,
-	[group_teampage] [int] DEFAULT (0) NOT NULL 
+	[group_legend] [int] DEFAULT (0) NOT NULL 
 ) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index ce4c43c9c3..824b3faecc 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -327,7 +327,6 @@ CREATE TABLE phpbb_groups (
 	group_message_limit mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	group_max_recipients mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	group_legend mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_teampage mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (group_id),
 	KEY group_legend_name (group_legend, group_name(255))
 );
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index c15a3f81d5..dd92a4eb31 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -327,7 +327,6 @@ CREATE TABLE phpbb_groups (
 	group_message_limit mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	group_max_recipients mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	group_legend mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_teampage mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (group_id),
 	KEY group_legend_name (group_legend, group_name)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 95f23c7359..90759a94ea 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -620,7 +620,6 @@ CREATE TABLE phpbb_groups (
 	group_message_limit number(8) DEFAULT '0' NOT NULL,
 	group_max_recipients number(8) DEFAULT '0' NOT NULL,
 	group_legend number(8) DEFAULT '0' NOT NULL,
-	group_teampage number(8) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_groups PRIMARY KEY (group_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 15d50035d6..1e8d390b99 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -473,7 +473,6 @@ CREATE TABLE phpbb_groups (
 	group_message_limit INT4 DEFAULT '0' NOT NULL CHECK (group_message_limit >= 0),
 	group_max_recipients INT4 DEFAULT '0' NOT NULL CHECK (group_max_recipients >= 0),
 	group_legend INT4 DEFAULT '0' NOT NULL CHECK (group_legend >= 0),
-	group_teampage INT4 DEFAULT '0' NOT NULL CHECK (group_teampage >= 0),
 	PRIMARY KEY (group_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index f5d5d8e0bf..48530615b7 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -318,8 +318,7 @@ CREATE TABLE phpbb_groups (
 	group_receive_pm INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_message_limit INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_max_recipients INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	group_legend INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	group_teampage INTEGER UNSIGNED NOT NULL DEFAULT '0'
+	group_legend INTEGER UNSIGNED NOT NULL DEFAULT '0'
 );
 
 CREATE INDEX phpbb_groups_group_legend_name ON phpbb_groups (group_legend, group_name);
-- 
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/config/services.yml                  | 13 +++++++++
 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 +++++++++++++++++++++++++-----
 6 files changed, 82 insertions(+), 38 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 42bb473e66..eccdbc7631 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -91,6 +91,19 @@ services:
             - .%core.php_ext%
             - @cache.driver
 
+    groupposition.legend:
+        class: phpbb_groupposition_legend
+        arguments:
+            - @dbal.conn
+            - @user
+
+    groupposition.teampage:
+        class: phpbb_groupposition_teampage
+        arguments:
+            - @dbal.conn
+            - @user
+            - @cache.driver
+
     request:
         class: phpbb_request
 
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/adm/style/acp_groups_position.html | 48 +++++++++++++++++++-------------
 phpBB/includes/acp/acp_groups.php        | 18 ++++++++----
 2 files changed, 40 insertions(+), 26 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index ade3cf3e57..5532b9ea21 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -38,24 +38,24 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN legend -->
-		<tr>
+		<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}">
 			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					{ICON_MOVE_UP_DISABLED}
-					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
-					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
-					{ICON_MOVE_UP_DISABLED}
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
+				<a href="{legend.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -121,7 +121,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN teampage -->
-		<tr>
+		<tr data-down="{teampage.U_MOVE_DOWN}" data-up="{teampage.U_MOVE_UP}">
 			<td>
 				<!-- IF teampage.U_CATEGORY -->
 					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
@@ -133,19 +133,19 @@
 			</td></td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					{ICON_MOVE_UP_DISABLED}
-					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
-					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
-					{ICON_MOVE_UP_DISABLED}
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
+				<a href="{teampage.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -176,4 +176,12 @@
 		</fieldset>
 	</form>
 
+	<div class="hidden">
+		<a class="template-up-img" href="#">{ICON_MOVE_UP}</a>
+		<span class="template-up-img-disabled">{ICON_MOVE_UP_DISABLED}</span>
+
+		<a class="template-down-img" href="#">{ICON_MOVE_DOWN}</a>
+		<span class="template-down-img-disabled">{ICON_MOVE_DOWN_DISABLED}</span>
+	</div>
+
 <!-- INCLUDE overall_footer.html -->
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')

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 +++--
 phpBB/memberlist.php                      | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'phpBB')

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)
 	{
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index e3fc2dec81..f15176e9d8 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -93,10 +93,6 @@ switch ($mode)
 					'ON'	=> 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . (int) $user->data['user_id'],
 				),
 			),
-
-			'WHERE'		=> '',
-
-			'ORDER_BY'	=> '',
 		);
 
 		$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
-- 
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')

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')

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 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/common.php                               |  2 +-
 phpBB/config/avatars.yml                       | 44 ++++++++++++++++++++++++
 phpBB/config/services.yml                      | 19 +++++++++++
 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 ++--
 10 files changed, 122 insertions(+), 53 deletions(-)
 create mode 100644 phpBB/config/avatars.yml

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 068cf4e067..17e7c76465 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -128,7 +128,7 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 $template = $phpbb_container->get('template');
 $phpbb_style = $phpbb_container->get('style');
 
-$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $phpbb_extension_manager, $cache->get_driver());
+$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
new file mode 100644
index 0000000000..4f49d21b34
--- /dev/null
+++ b/phpBB/config/avatars.yml
@@ -0,0 +1,44 @@
+services:
+    avatar.driver.core.gravatar:
+        class: phpbb_avatar_driver_core_gravatar
+        arguments:
+            - @config
+            - @request
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        tags:
+            - { name: avatar.driver }
+
+    avatar.driver.core.local:
+        class: phpbb_avatar_driver_core_local
+        arguments:
+            - @config
+            - @request
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        tags:
+            - { name: avatar.driver }
+
+    avatar.driver.core.remote:
+        class: phpbb_avatar_driver_core_remote
+        arguments:
+            - @config
+            - @request
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        tags:
+            - { name: avatar.driver }
+
+    avatar.driver.core.upload:
+        class: phpbb_avatar_driver_core_upload
+        arguments:
+            - @config
+            - @request
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        tags:
+            - { name: avatar.driver }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 20aa0546d5..3d33731eea 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -1,11 +1,30 @@
 imports:
     - { resource: tables.yml }
     - { resource: cron_tasks.yml }
+    - { resource: avatars.yml }
 
 services:
     auth:
         class: phpbb_auth
 
+    avatar.driver_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: avatar.driver }
+
+    avatar.manager:
+        class: phpbb_avatar_manager
+        arguments:
+            - %core.root_path%
+            - .%core.php_ext%
+            - @config
+            - @request
+            - @cache.driver
+            - @avatar.driver_collection
+            - @service_container
+
     cache:
         class: phpbb_cache_service
         arguments:
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 a05a73e04716dbe424daf6efae6e6c9b28a3a7fd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Nov 2012 21:53:55 +0100
Subject: [ticket/10411] Use new ajax callback name row_up/row_down

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 5532b9ea21..99864f75ce 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -44,12 +44,12 @@
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
-					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
@@ -134,12 +134,12 @@
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
-					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-- 
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')

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')

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/config/avatars.yml                       |  16 +--
 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 +-
 12 files changed, 654 insertions(+), 654 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')

diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
index 4f49d21b34..cc9ed05836 100644
--- a/phpBB/config/avatars.yml
+++ b/phpBB/config/avatars.yml
@@ -1,6 +1,6 @@
 services:
-    avatar.driver.core.gravatar:
-        class: phpbb_avatar_driver_core_gravatar
+    avatar.driver.gravatar:
+        class: phpbb_avatar_driver_gravatar
         arguments:
             - @config
             - @request
@@ -10,8 +10,8 @@ services:
         tags:
             - { name: avatar.driver }
 
-    avatar.driver.core.local:
-        class: phpbb_avatar_driver_core_local
+    avatar.driver.local:
+        class: phpbb_avatar_driver_local
         arguments:
             - @config
             - @request
@@ -21,8 +21,8 @@ services:
         tags:
             - { name: avatar.driver }
 
-    avatar.driver.core.remote:
-        class: phpbb_avatar_driver_core_remote
+    avatar.driver.remote:
+        class: phpbb_avatar_driver_remote
         arguments:
             - @config
             - @request
@@ -32,8 +32,8 @@ services:
         tags:
             - { name: avatar.driver }
 
-    avatar.driver.core.upload:
-        class: phpbb_avatar_driver_core_upload
+    avatar.driver.upload:
+        class: phpbb_avatar_driver_upload
         arguments:
             - @config
             - @request
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')

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 +
 phpBB/language/en/acp/board.php  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB')

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),
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index a4380486cc..50121160c4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -99,6 +99,7 @@ $lang = array_merge($lang, array(
 
 	'ALLOW_AVATARS'					=> 'Enable avatars',
 	'ALLOW_AVATARS_EXPLAIN'			=> 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.',
+	'ALLOW_GRAVATAR'				=> 'Enable gravatar avatars',
 	'ALLOW_LOCAL'					=> 'Enable gallery avatars',
 	'ALLOW_REMOTE'					=> 'Enable remote avatars',
 	'ALLOW_REMOTE_EXPLAIN'			=> 'Avatars linked to from another website.',
-- 
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 +-
 phpBB/install/database_update.php       | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'phpBB')

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')),
 			),
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b2d0eaedb4..9498d3963b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2732,6 +2732,14 @@ function change_database_data(&$no_updates, $version)
 				_sql($sql, $errored, $error_ary);
 			}
 
+			// update avatar 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 || cfg_allow_avatar_gravatar)\'
+				WHERE module_class = \'ucp\'
+					AND module_basename = \'ucp_profile\'
+					AND module_mode = \'avatar\'';
+			_sql($sql, $errored, $error_ary);
+
 			$no_updates = false;
 
 			if (!isset($config['assets_version']))
-- 
cgit v1.2.1


From 5d0a20bbb684055143b77a630ab1b02270f7f900 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 23:07:51 +0100
Subject: [feature/avatars] Add missing language variables for avatars

PHPBB3-10018
---
 phpBB/language/en/ucp.php                                 | 15 +++++++++++++++
 phpBB/styles/prosilver/template/ucp_avatar_options.html   |  6 +++---
 .../prosilver/template/ucp_avatar_options_gravatar.html   |  4 ++--
 .../prosilver/template/ucp_avatar_options_remote.html     |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 705b07b170..d397ca5538 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -89,12 +89,22 @@ $lang = array_merge($lang, array(
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
 	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected persistent login keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
+	'AVATAR_DRIVER_GRAVATAR_TITLE'	=> 'Gravatar',
+	'AVATAR_DRIVER_GRAVATAR_EXPLAIN'=> 'Gravatar is a service that provides you with a globally unique avatar.',
+	'AVATAR_DRIVER_LOCAL_TITLE'		=> 'Gallery avatar',
+	'AVATAR_DRIVER_LOCAL_EXPLAIN'	=> 'You can choose your avatar from a locally available set of avatars.',
+	'AVATAR_DRIVER_REMOTE_TITLE'	=> 'Remote avatar',
+	'AVATAR_DRIVER_REMOTE_EXPLAIN'	=> 'Link to avatar images from another website.',
+	'AVATAR_DRIVER_UPLOAD_TITLE'	=> 'Upload avatar',
+	'AVATAR_DRIVER_UPLOAD_EXPLAIN'	=> 'Upload your own custom avatar.',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
 	'AVATAR_NOT_ALLOWED'			=> 'Your avatar cannot be displayed because avatars have been disallowed.',
 	'AVATAR_PAGE'					=> 'Page',
+	'AVATAR_SELECT'					=> 'Select your avatar',
+	'AVATAR_TYPE'					=> 'Avatar type',
 	'AVATAR_TYPE_NOT_ALLOWED'		=> 'Your current avatar cannot be displayed because its type has been disallowed.',
 
 	'BACK_TO_DRAFTS'			=> 'Back to saved drafts',
@@ -236,6 +246,11 @@ $lang = array_merge($lang, array(
 
 	'GLOBAL_ANNOUNCEMENT'		=> 'Global announcement',
 
+	'GRAVATAR_AVATAR_EMAIL'			=> 'Gravatar email',
+	'GRAVATAR_AVATAR_EMAIL_EXPLAIN'	=> 'Enter the email address you used for registering your account on <a href="http://www.gravatar.com/">Gravatar</a>.',
+	'GRAVATAR_AVATAR_SIZE'			=> 'Avatar dimensions',
+	'GRAVATAR_AVATAR_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
+
 	'HIDE_ONLINE'				=> 'Hide my online status',
 	'HIDE_ONLINE_EXPLAIN'		=> 'Changing this setting won’t become effective until your next visit to the board.',
 	'HOLD_NEW_MESSAGES'			=> 'Do not accept new messages (New messages will be held back until enough space is available)',
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 30015c5ec2..bca957043b 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -11,12 +11,12 @@
 			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
 		</dl>
 	</fieldset>
-	<h3>{L_AVATAR_SELECT_NEW}</h3>
+	<h3>{L_AVATAR_SELECT}</h3>
 	<fieldset>
 		<dl>
-			<dt><label>{L_AVATAR_TYPE}</label></dt>
+			<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
 			<dd><select name="avatar_driver" id="avatar_driver">
-				<option value="">{L_NO_AVATAR}</option>
+				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
index c0bae47162..5629e873cf 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
@@ -1,9 +1,9 @@
 <dl>
-	<dt><label for="av_gravatar_email">{L_EMAIL_GRAVATAR_AVATAR}{L_COLON}</label><br /><span>{L_EMAIL_GRAVATAR_AVATAR_EXPLAIN}</span></dt>
+	<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
 	<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EXPLAIN}</span></dt>
+	<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
 		<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index ec5a22b691..cf3eb20a39 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -3,7 +3,7 @@
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
 		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
-- 
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/adm/style/acp_avatar_options_gravatar.html | 11 ++++++
 phpBB/adm/style/acp_avatar_options_remote.html   |  2 +-
 phpBB/adm/style/acp_groups.html                  |  4 +-
 phpBB/adm/style/acp_users_avatar.html            | 49 ++----------------------
 phpBB/includes/acp/acp_groups.php                | 37 +++++++++---------
 phpBB/includes/acp/acp_users.php                 | 26 +++++++------
 phpBB/includes/ucp/ucp_profile.php               |  2 +-
 7 files changed, 51 insertions(+), 80 deletions(-)
 create mode 100644 phpBB/adm/style/acp_avatar_options_gravatar.html

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
new file mode 100644
index 0000000000..5629e873cf
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+</dl>
+<dl>
+	<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dd>
+		<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
+</dl>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index ec5a22b691..cf3eb20a39 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -3,7 +3,7 @@
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
 		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 6fb2908b0a..d062064fe9 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -107,9 +107,9 @@
 		<dd>{AVATAR}</dd>
 	</dl>
 	<dl>
-		<dt><label>{L_AVATAR_TYPE}</label></dt>
+		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
 		<dd><select name="avatar_driver" id="avatar_driver">
-			<option value="">{L_NO_AVATAR}</option>
+			<option value="">{L_NO_AVATAR_CATEGORY}</option>
 			<!-- BEGIN avatar_drivers -->
 			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index c179e1958d..069f7f6e50 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -2,61 +2,18 @@
 
 	<fieldset>
 		<legend>{L_ACP_USER_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_UPLOAD_FILE -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_REMOTE_UPLOAD -->
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_REMOTE -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}{L_COLON}</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
 		</dl>
 	</fieldset>
 	<fieldset>
-		<legend>{L_AVATAR_SELECT_NEW}</legend>
+		<legend>{L_AVATAR_SELECT}</legend>
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
 			<dd><select name="avatar_driver" id="avatar_driver">
-				<option value="">{L_NO_AVATAR}</option>
+				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
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 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/download/file.php                 | 2 +-
 phpBB/includes/avatar/driver/upload.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index cb5fcbbef0..70093db7dc 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -101,7 +101,7 @@ if (isset($_GET['avatar']))
 	// worst-case default
 	$browser = strtolower($request->header('User-Agent', 'msie 6.0'));
 
-	$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $phpbb_extension_manager, $cache->get_driver());
+	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 
 	$filename = request_var('avatar', '');
 	$avatar_group = false;
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')

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 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')

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 d8510356d6a0f838017ae94bec1a5ed8254432da Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 20:47:29 +0100
Subject: [feature/avatars] Add subsilver2 support

This implementation might not be perfect though.

PHPBB3-10018
---
 phpBB/styles/subsilver2/template/avatars.js        | 15 +++++
 .../template/ucp_avatar_options_gravatar.html      | 13 ++++
 .../template/ucp_avatar_options_local.html         | 29 +++++++++
 .../template/ucp_avatar_options_remote.html        | 10 +++
 .../template/ucp_avatar_options_upload.html        | 12 ++++
 .../subsilver2/template/ucp_profile_avatar.html    | 76 +++++++---------------
 6 files changed, 101 insertions(+), 54 deletions(-)
 create mode 100644 phpBB/styles/subsilver2/template/avatars.js
 create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
 create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
 create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
 create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js
new file mode 100644
index 0000000000..a9b2cc5722
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/avatars.js
@@ -0,0 +1,15 @@
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
+function avatar_simplify() {
+    $('.[class^="av_option_"]').hide();
+
+    var selected = $('#avatar_driver').val();
+    $('.av_option_' + selected).show();
+}
+
+avatar_simplify();
+$('#avatar_driver').bind('change', avatar_simplify);
+
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
new file mode 100644
index 0000000000..9bf8a3fc39
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
@@ -0,0 +1,13 @@
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></td>
+		<td class="row2"><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></td>
+	</tr>
+	<tr>
+		<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></td>
+		<td class="row2">
+			<input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+			<input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		</td>
+	</tr>
+</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
new file mode 100644
index 0000000000..37ac864b27
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
@@ -0,0 +1,29 @@
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr> 
+		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="av_local_cat" id="category">
+			<option value="">{L_NO_AVATAR_CATEGORY}</option>
+			<!-- BEGIN av_local_cats -->
+			<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
+			<!-- END av_local_cats -->
+			</select>&nbsp; <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="av_local_go" />
+		</td>
+	</tr>
+	<tr> 
+		<td class="row1" colspan="2" align="center">
+			<table cellspacing="1" cellpadding="4" border="0">
+			<!-- BEGIN av_local_row -->
+			<tr> 
+				<!-- BEGIN av_local_col -->
+					<td class="row1" align="center"><img src="{av_local_col.av_local_col.AVATAR_IMAGE}" alt="{av_local_col.av_local_col.AVATAR_NAME}" title="{av_local_col.av_local_col.AVATAR_NAME}" /></td>
+				<!-- END av_local_col -->
+			</tr>
+			<tr>
+				<!-- BEGIN av_local_option -->
+					<td class="row2" align="center"><input type="radio" class="radio" name="av_local_file" value="{av_local_col.av_local_option.S_OPTIONS_AVATAR}" /></td>
+				<!-- END av_local_option -->
+			</tr>
+			<!-- END av_local_col -->
+			</table>
+		</td>
+	</tr>
+</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
new file mode 100644
index 0000000000..8fe7201953
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
@@ -0,0 +1,10 @@
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr> 
+		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
+		<td class="row2"><input class="post" type="text" name="av_remote_url" size="40" value="{AV_REMOTE_URL}" /></td>
+	</tr>
+	<tr> 
+		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
+		<td class="row2"><input class="post" type="text" name="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" /> <span class="gen">{L_PIXEL} &times; </span> <input class="post" type="text" name="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td>
+	</tr>
+</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
new file mode 100644
index 0000000000..e76abc0433
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
@@ -0,0 +1,12 @@
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr> 
+		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}{L_COLON} </b></td>
+		<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="av_upload_file" /></td>
+	</tr>
+<!-- IF S_UPLOAD_AVATAR_URL -->
+	<tr> 
+		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}{L_COLON} </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
+		<td class="row2"><input class="post" type="text" name="av_upload_url" size="40" value="" /></td>
+	</tr>
+<!-- ENDIF -->
+</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index 160f8a2399..f8129e60e6 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -21,61 +21,27 @@
 		<td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td>
 	</tr>
 <!-- ENDIF -->
-<!-- IF S_UPLOAD_AVATAR_FILE -->
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}{L_COLON} </b></td>
-		<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="uploadfile" /></td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF S_UPLOAD_AVATAR_URL -->
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}{L_COLON} </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="uploadurl" size="40" value="{AVATAR_URL}" /></td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF S_LINK_AVATAR -->
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="remotelink" size="40" value="{AVATAR_REMOTE}" /></td>
-	</tr>
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="width" size="3" value="{AVATAR_WIDTH}" /> <span class="gen">{L_PIXEL} &times; </span> <input class="post" type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- IF S_DISPLAY_GALLERY -->
-	<tr> 
-		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_GALLERY}{L_COLON} </b></td>
-		<td class="row2"><strong><a href="{U_GALLERY}">{L_DISPLAY_GALLERY}</a></strong></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_IN_AVATAR_GALLERY -->
-	<tr> 
-		<th colspan="2">{L_AVATAR_GALLERY}</th>
-	</tr>
-	<tr> 
-		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="category">{S_CAT_OPTIONS}</select>&nbsp; <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="display_gallery" /></td>
-	</tr>
-	<tr> 
-		<td class="row1" colspan="2" align="center">
-			<table cellspacing="1" cellpadding="4" border="0">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" align="center"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</td>
+	<tr>
+		<th colspan="2">{L_AVATAR_SELECT}</th>
 	</tr>
-<!-- ENDIF -->
+	<tr>
+		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
+		<td class="row2">
+			<select name="avatar_driver" id="avatar_driver">
+				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+				<!-- BEGIN avatar_drivers -->
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<!-- END avatar_drivers -->
+			</select></td>
+	</tr>
+<!-- BEGIN avatar_drivers -->
+	<tr class="av_option_{avatar_drivers.DRIVER}">
+		<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
+	</tr>
+	<tr class="av_option_{avatar_drivers.DRIVER}">
+		<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
+	</tr>
+<!-- END avatar_drivers -->
 
 <!-- IF S_DISPLAY_GALLERY or S_IN_AVATAR_GALLERY or S_LINK_AVATAR or S_UPLOAD_AVATAR_URL or S_UPLOAD_AVATAR_FILE or AVATAR -->
 	<tr>
@@ -84,4 +50,6 @@
 <!-- ENDIF -->
 </table>
 
+<!-- INCLUDEJS template/avatars.js -->
+
 <!-- INCLUDE ucp_footer.html -->
-- 
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/adm/style/acp_groups.html                         | 1 +
 phpBB/adm/style/acp_users_avatar.html                   | 1 +
 phpBB/includes/acp/acp_groups.php                       | 8 +++++++-
 phpBB/includes/acp/acp_users.php                        | 8 +++++++-
 phpBB/includes/ucp/ucp_profile.php                      | 4 ++--
 phpBB/styles/prosilver/template/ucp_avatar_options.html | 1 +
 6 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index d062064fe9..b38d61bef3 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -105,6 +105,7 @@
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR}</dd>
+		<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 069f7f6e50..e32d8f379b 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -6,6 +6,7 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
+			<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<fieldset>
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);
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index bca957043b..e7300a075d 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -9,6 +9,7 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
+			<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<h3>{L_AVATAR_SELECT}</h3>
-- 
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/adm/style/acp_avatar_options_local.html | 7 +++----
 phpBB/adm/style/acp_groups.html               | 2 +-
 phpBB/includes/avatar/driver/local.php        | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 02ff58fe15..b317cd2aa5 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -17,11 +17,10 @@
 		<!-- END av_local_col -->
 	</tr>
 	<tr>
-		<!-- BEGIN av_local_col -->
-			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></td>
-		<!-- END av_local_col -->
+		<!-- BEGIN av_local_option -->
+			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_option.S_ROW_COUNT}" value="{av_local_row.av_local_option.AVATAR_FILE}" /></td>
+		<!-- END av_local_option -->
 	</tr>
 	<!-- END av_local_row -->
 	</table>
 	<!-- ENDIF -->
-</dl>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index b38d61bef3..e96adcee90 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -17,7 +17,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF --> enctype="multipart/form-data">
 
 	<fieldset>
 		<legend>{L_GROUP_DETAILS}</legend>
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 7521c077a9c0b3201dffcbe33114d9da715eb9e0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 23:16:37 +0100
Subject: [feature/avatars] Miscellaenous template fixes

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html                  | 3 +--
 phpBB/styles/prosilver/template/ucp_avatar_options_local.html  | 4 ++--
 phpBB/styles/subsilver2/template/ucp_avatar_options_local.html | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index b317cd2aa5..08ec170195 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -7,9 +7,8 @@
 		<!-- END av_local_cats -->
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
 </dl>
-<dl>
 	<!-- IF AV_LOCAL_SHOW -->
-	<table cellspacing="1">
+	<table style="border-spacing: 1px;">
 	<!-- BEGIN av_local_row -->
 	<tr>
 		<!-- BEGIN av_local_col -->
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 9ca9b6e9ec..8b46dfa7f5 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -9,8 +9,8 @@
 <div id="gallery">
 <!-- BEGIN av_local_row -->
 <!-- BEGIN av_local_col -->
-	<label for="av-{av_local_row.av_local_col.S_ROW_COUNT}"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></label>
+	<label for="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></label>
 <!-- END av_local_col -->
 <!-- END av_local_row -->
 </div>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
index 37ac864b27..352052f9f4 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
@@ -22,6 +22,10 @@
 					<td class="row2" align="center"><input type="radio" class="radio" name="av_local_file" value="{av_local_col.av_local_option.S_OPTIONS_AVATAR}" /></td>
 				<!-- END av_local_option -->
 			</tr>
+			<!-- BEGINELSE -->
+			<tr>
+				<td class="row1" colspan="2">{L_NO_AVATAR_CATEGORY}</td>
+			</tr>
 			<!-- END av_local_col -->
 			</table>
 		</td>
-- 
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')

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 +++++++++++++++++++++++-------
 phpBB/install/database_update.php          |  5 ++++
 7 files changed, 71 insertions(+), 20 deletions(-)

(limited to 'phpBB')

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)
 	{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9498d3963b..2015ef0475 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2740,6 +2740,11 @@ function change_database_data(&$no_updates, $version)
 					AND module_mode = \'avatar\'';
 			_sql($sql, $errored, $error_ary);
 
+			if (!isset($config['allow_avatar_gravatar']))
+			{
+				$config->set('allow_avatar_gravatar', '');
+			}
+
 			$no_updates = false;
 
 			if (!isset($config['assets_version']))
-- 
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')

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/config/notifications.yml                     |  82 +++++--------
 phpBB/config/services.yml                          |  18 ++-
 phpBB/config/tables.yml                            |   1 +
 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 +++++++++++++++++++
 phpBB/install/database_update.php                  |  12 +-
 phpBB/report.php                                   |   4 +-
 26 files changed, 336 insertions(+), 271 deletions(-)
 create mode 100644 phpBB/includes/user_loader.php

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index 7c8e05494c..f8a5b5f9fa 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -1,12 +1,24 @@
 services:
+    notification.type_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: notification.type }
+
+    notification.method_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: notification.method }
+
     notification.type.approve_post:
         class: phpbb_notification_type_approve_post
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -20,11 +32,9 @@ services:
     notification.type.approve_topic:
         class: phpbb_notification_type_approve_topic
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -38,11 +48,9 @@ services:
     notification.type.bookmark:
         class: phpbb_notification_type_bookmark
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -56,11 +64,9 @@ services:
     notification.type.disapprove_post:
         class: phpbb_notification_type_disapprove_post
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -74,11 +80,9 @@ services:
     notification.type.disapprove_topic:
         class: phpbb_notification_type_disapprove_topic
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -92,11 +96,9 @@ services:
     notification.type.pm:
         class: phpbb_notification_type_pm
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -110,11 +112,9 @@ services:
     notification.type.post:
         class: phpbb_notification_type_post
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -128,11 +128,9 @@ services:
     notification.type.post_in_queue:
         class: phpbb_notification_type_post_in_queue
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -146,11 +144,9 @@ services:
     notification.type.quote:
         class: phpbb_notification_type_quote
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -164,11 +160,9 @@ services:
     notification.type.report_pm:
         class: phpbb_notification_type_report_pm
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -182,11 +176,9 @@ services:
     notification.type.report_pm_closed:
         class: phpbb_notification_type_report_pm_closed
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -200,11 +192,9 @@ services:
     notification.type.report_post:
         class: phpbb_notification_type_report_post
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -218,11 +208,9 @@ services:
     notification.type.report_post_closed:
         class: phpbb_notification_type_report_post
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -236,11 +224,9 @@ services:
     notification.type.topic:
         class: phpbb_notification_type_topic
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -254,11 +240,9 @@ services:
     notification.type.topic_in_queue:
         class: phpbb_notification_type_topic_in_queue
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -272,11 +256,9 @@ services:
     notification.method.email:
         class: phpbb_notification_method_email
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
@@ -288,11 +270,9 @@ services:
     notification.method.jabber:
         class: phpbb_notification_method_jabber
         arguments:
-            - @notification_manager
+            - @user_loader
             - @dbal.conn
             - @cache.driver
-            - @template
-            - @ext.manager
             - @user
             - @auth
             - @config
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index af80d28b15..bbc28e903f 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -97,14 +97,12 @@ services:
     notification_manager:
         class: phpbb_notification_manager
         arguments:
-            - @container
+            - @notification.type_collection
+            - @notification.method_collection
+            - @service_container
+            - @user_loader
             - @dbal.conn
-            - @cache.driver
-            - @template
-            - @ext.manager
             - @user
-            - @auth
-            - @config
             - %core.root_path%
             - %core.php_ext%
             - %tables.notifications%
@@ -151,3 +149,11 @@ services:
 
     user:
         class: phpbb_user
+
+    user_loader:
+        class: phpbb_user_loader
+        arguments:
+            - @dbal.conn
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.users%
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index 8791c5e89b..528470d6ca 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -3,3 +3,4 @@ parameters:
     tables.ext: %core.table_prefix%ext
     tables.notifications: %core.table_prefix%notifications
     tables.user_notifications: %core.table_prefix%user_notifications
+    tables.users: %core.table_prefix%users
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
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ab48da059d..768280ec7e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2814,19 +2814,19 @@ function change_database_data(&$no_updates, $version)
 				$convert_notifications = array(
 					array(
 						'check'			=> ($config['allow_topic_notify']),
-						'item_type'		=> 'phpbb_notification_type_post',
+						'item_type'		=> 'post',
 					),
 					array(
 						'check'			=> ($config['allow_forum_notify']),
-						'item_type'		=> 'phpbb_notification_type_topic',
+						'item_type'		=> 'topic',
 					),
 					array(
 						'check'			=> ($config['allow_bookmarks']),
-						'item_type'		=> 'phpbb_notification_type_bookmark',
+						'item_type'		=> 'bookmark',
 					),
 					array(
 						'check'			=> ($config['allow_privmsg']),
-						'item_type'		=> 'phpbb_notification_type_pm',
+						'item_type'		=> 'pm',
 					),
 				);
 
@@ -2853,7 +2853,7 @@ function change_database_data(&$no_updates, $version)
 									'item_type'		=> $convert_data['item_type'],
 									'item_id'		=> 0,
 									'user_id'		=> $row['user_id'],
-									'method'		=> 'phpbb_notification_method_email',
+									'method'		=> 'email',
 								)), $errored, $error_ary);
 							}
 
@@ -2863,7 +2863,7 @@ function change_database_data(&$no_updates, $version)
 									'item_type'		=> $convert_data['item_type'],
 									'item_id'		=> 0,
 									'user_id'		=> $row['user_id'],
-									'method'		=> 'phpbb_notification_method_jabber',
+									'method'		=> 'jabber',
 								)), $errored, $error_ary);
 							}
 						}
diff --git a/phpBB/report.php b/phpBB/report.php
index 95043a6978..07cec7afbc 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -191,7 +191,7 @@ if ($submit && $reason_id)
 		$lang_return = $user->lang['RETURN_TOPIC'];
 		$lang_success = $user->lang['POST_REPORTED_SUCCESS'];
 
-		$phpbb_notifications->add_notifications('phpbb_notification_type_report_post', array_merge($report_data, $row, $forum_data, array(
+		$phpbb_notifications->add_notifications('report_post', array_merge($report_data, $row, $forum_data, array(
 			'report_text'	=> $report_text,
 		)));
 	}
@@ -221,7 +221,7 @@ if ($submit && $reason_id)
 		$lang_return = $user->lang['RETURN_PM'];
 		$lang_success = $user->lang['PM_REPORTED_SUCCESS'];
 
-		$phpbb_notifications->add_notifications('phpbb_notification_type_report_pm', array_merge($report_data, $row, array(
+		$phpbb_notifications->add_notifications('report_pm', array_merge($report_data, $row, array(
 			'report_text'	=> $report_text,
 			'from_user_id'	=> $report_data['author_id'],
 			'report_id'		=> $report_id,
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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 ++++++++++-----------
 .../prosilver/template/ucp_avatar_options.html     |   2 +
 .../prosilver/template/ucp_groups_manage.html      |   4 +-
 .../subsilver2/template/ucp_groups_manage.html     |  91 ++++------
 .../subsilver2/template/ucp_profile_avatar.html    |   4 +-
 5 files changed, 125 insertions(+), 160 deletions(-)

(limited to 'phpBB')

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,
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index e7300a075d..354ddcc69c 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -38,10 +38,12 @@
 	</div>
 <!-- END avatar_drivers -->
 	</div>
+<!-- IF not S_GROUP_MANAGE -->
 	<fieldset class="submit-buttons">
 		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
 		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
+<!-- ENDIF -->
 	</div>
 </div>
 
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 6b017ea3fa..f6fcfa043d 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -70,9 +70,7 @@
 
 <fieldset class="submit-buttons">
 	{S_HIDDEN_FIELDS}
-	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />&nbsp; <!-- ENDIF -->
-	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />&nbsp; <!-- ELSE -->
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; <!-- ENDIF -->
+	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
 	<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index 12319c9e4e..e15335f4e1 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -60,74 +60,43 @@
 	</tr>
 	<tr>
 		<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></td>
-		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
+		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="av_delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
 	</tr>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_UPLOAD_AVATAR_FILE -->
-			<tr>
-				<td class="row1" width="35%"><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></td>
-				<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF S_UPLOAD_AVATAR_URL -->
-			<tr>
-				<td class="row1" width="35%"><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
-				<td class="row2"><input name="uploadurl" type="text" id="uploadurl" value="" /></td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF S_LINK_AVATAR -->
-		<tr>
-			<td class="row1" width="35%"><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
-			<td class="row2"><input name="remotelink" type="text" id="remotelink" value="" /></td>
-		</tr>
-		<tr>
-			<td class="row1" width="35%"><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
-			<td class="row2"><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></td>
-		</tr>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<tr>
-				<td class="row1" width="35%"><label>{L_AVATAR_GALLERY}{L_COLON}</label></td>
-				<td class="row2"><input class="btnmain" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td>
-			</tr>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-
-		<tr>
-			<th colspan="2">{L_AVATAR_GALLERY}</th>
-		</tr>
-		<tr>
-			<td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></td>
-			<td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="btnmain" type="submit" value="{L_GO}" name="display_gallery" /></td>
-		</tr>
-		<tr>
-			<td class="row1" width="35%">
-				<table cellspacing="1">
-				<!-- BEGIN avatar_row -->
-				<tr>
-					<!-- BEGIN avatar_column -->
-						<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-					<!-- END avatar_column -->
-				</tr>
-				<tr>
-					<!-- BEGIN avatar_option_column -->
-						<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-					<!-- END avatar_option_column -->
-				</tr>
-				<!-- END avatar_row -->
-				</table>
-			</td>
-			<td class="row2"><input class="btnmain" type="submit" name="cancel" value="{L_CANCEL}" /></td>
-		</tr>
-
-	<!-- ENDIF -->
+<!-- IF not S_AVATARS_ENABLED -->
+	<tr>
+		<td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td>
+	</tr>
+<!-- ENDIF -->
+	<tr>
+		<th colspan="2">{L_AVATAR_SELECT}</th>
+	</tr>
+	<tr>
+		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
+		<td class="row2">
+			<select name="avatar_driver" id="avatar_driver">
+				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+				<!-- BEGIN avatar_drivers -->
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<!-- END avatar_drivers -->
+			</select></td>
+	</tr>
+<!-- BEGIN avatar_drivers -->
+	<tr class="av_option_{avatar_drivers.DRIVER}">
+		<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
+	</tr>
+	<tr class="av_option_{avatar_drivers.DRIVER}">
+		<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
+	</tr>
+<!-- END avatar_drivers -->
 
 	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
 		<input class="btnmain" type="reset" id="reset" name="reset" value="{L_RESET}" /></td>
 	</tr>
 	</table>
 
+<!-- INCLUDEJS template/avatars.js -->
+
 <!-- ELSEIF S_LIST -->
 
 	<h1>{L_GROUP_MEMBERS}</h1>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index f8129e60e6..4e65b37e3c 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -12,7 +12,7 @@
 <tr> 
 	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
 	<td class="row2" align="center"><br />
-		<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span>
+		<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="av_delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span>
 		<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" />
 		<!-- ENDIF --></td>
 </tr>
@@ -43,11 +43,9 @@
 	</tr>
 <!-- END avatar_drivers -->
 
-<!-- IF S_DISPLAY_GALLERY or S_IN_AVATAR_GALLERY or S_LINK_AVATAR or S_UPLOAD_AVATAR_URL or S_UPLOAD_AVATAR_FILE or AVATAR -->
 	<tr>
 		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<!-- IF S_IN_AVATAR_GALLERY --><input class="btnlite" type="submit" name="cancel" value="{L_CANCEL}" /><!-- ELSE --><input class="btnlite" type="reset" value="{L_RESET}" name="reset" /><!-- ENDIF --></td>
 	</tr>
-<!-- ENDIF -->
 </table>
 
 <!-- INCLUDEJS template/avatars.js -->
-- 
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')

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 5ff343f1e6714fd88d64cb17884f88ceee681cb6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 22 Nov 2012 11:58:45 +0100
Subject: [feature/avatars] Remove duplicate form enctype

PHPBB3-10018
---
 phpBB/adm/style/acp_groups.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index e96adcee90..a4699571d6 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -17,7 +17,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF --> enctype="multipart/form-data">
+	<form id="settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">
 
 	<fieldset>
 		<legend>{L_GROUP_DETAILS}</legend>
-- 
cgit v1.2.1


From 2b917199066cb06aa9c6c846ce06252d6f8036e9 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 22 Nov 2012 18:38:36 +0100
Subject: [feature/avatars] Add allow_avatar_gravatar to schema_data.sql

PHPBB3-10018
---
 phpBB/install/schemas/schema_data.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index dbb5fd7481..262221fcf3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -9,6 +9,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_attachments', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_autologin', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_gravatar', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '1');
-- 
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/adm/style/acp_avatar_options_gravatar.html   | 10 ++++----
 phpBB/adm/style/acp_avatar_options_local.html      | 28 ++++++++++----------
 phpBB/adm/style/acp_avatar_options_remote.html     | 10 ++++----
 phpBB/adm/style/acp_avatar_options_upload.html     |  8 +++---
 phpBB/adm/style/acp_groups.html                    |  6 ++---
 phpBB/adm/style/acp_users_avatar.html              |  6 ++---
 phpBB/adm/style/avatars.js                         |  4 +--
 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 ++++++------
 phpBB/styles/prosilver/template/avatars.js         |  4 +--
 .../prosilver/template/ucp_avatar_options.html     |  6 ++---
 .../template/ucp_avatar_options_gravatar.html      | 10 ++++----
 .../template/ucp_avatar_options_local.html         | 22 ++++++++--------
 .../template/ucp_avatar_options_remote.html        | 10 ++++----
 .../template/ucp_avatar_options_upload.html        |  8 +++---
 phpBB/styles/subsilver2/template/avatars.js        |  4 +--
 .../template/ucp_avatar_options_gravatar.html      |  6 ++---
 .../template/ucp_avatar_options_local.html         | 26 +++++++++----------
 .../template/ucp_avatar_options_remote.html        |  4 +--
 .../template/ucp_avatar_options_upload.html        |  4 +--
 .../subsilver2/template/ucp_groups_manage.html     |  6 ++---
 .../subsilver2/template/ucp_profile_avatar.html    |  6 ++---
 28 files changed, 157 insertions(+), 157 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index 5629e873cf..04fd5c459d 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 08ec170195..927c4821f7 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,25 +1,25 @@
 <dl>
 	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
-	<dd><select name="av_local_cat" id="category">
+	<dd><select name="avatar_local_cat" id="category">
 		<option value="">{L_NO_AVATAR_CATEGORY}</option>
-		<!-- BEGIN av_local_cats -->
-		<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
-		<!-- END av_local_cats -->
-	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
+		<!-- BEGIN avatar_local_cats -->
+		<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
+		<!-- END avatar_local_cats -->
+	</select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
 </dl>
-	<!-- IF AV_LOCAL_SHOW -->
+	<!-- IF AVATAR_LOCAL_SHOW -->
 	<table style="border-spacing: 1px;">
-	<!-- BEGIN av_local_row -->
+	<!-- BEGIN avatar_local_row -->
 	<tr>
-		<!-- BEGIN av_local_col -->
-			<td class="row1" style="text-align: center;"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="{av_local_row.av_local_col.AVATAR_NAME}" title="{av_local_row.av_local_col.AVATAR_NAME}"/></td>
-		<!-- END av_local_col -->
+		<!-- BEGIN avatar_local_col -->
+			<td class="row1" style="text-align: center;"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="{avatar_local_row.avatar_local_col.AVATAR_NAME}" title="{avatar_local_row.avatar_local_col.AVATAR_NAME}"/></td>
+		<!-- END avatar_local_col -->
 	</tr>
 	<tr>
-		<!-- BEGIN av_local_option -->
-			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_option.S_ROW_COUNT}" value="{av_local_row.av_local_option.AVATAR_FILE}" /></td>
-		<!-- END av_local_option -->
+		<!-- BEGIN avatar_local_option -->
+			<td class="row2" style="text-align: center;"><input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_option.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_option.AVATAR_FILE}" /></td>
+		<!-- END avatar_local_option -->
 	</tr>
-	<!-- END av_local_row -->
+	<!-- END avatar_local_row -->
 	</table>
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index cf3eb20a39..ab91e90c27 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
+	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index d0a4f516e1..9d3efbd018 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
+	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
+		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index a4699571d6..bab30a7b6f 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -105,7 +105,7 @@
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR}</dd>
-		<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
+		<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
@@ -116,9 +116,9 @@
 			<!-- END avatar_drivers -->
 		</select></dd>
 	</dl>
-	<div id="av_options">
+	<div id="avatar_options">
 	<!-- BEGIN avatar_drivers -->
-	<div id="av_option_{avatar_drivers.DRIVER}">
+	<div id="avatar_option_{avatar_drivers.DRIVER}">
 		<p>{avatar_drivers.L_EXPLAIN}</p>
 		{avatar_drivers.OUTPUT}
 	</div>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index e32d8f379b..bc3a19a25e 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -6,7 +6,7 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
-			<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
+			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<fieldset>
@@ -20,9 +20,9 @@
 				<!-- END avatar_drivers -->
 			</select></dd>
 		</dl>
-		<div id="av_options">
+		<div id="avatar_options">
 		<!-- BEGIN avatar_drivers -->
-			<div id="av_option_{avatar_drivers.DRIVER}">
+			<div id="avatar_option_{avatar_drivers.DRIVER}">
 				<p>{avatar_drivers.L_EXPLAIN}</p>
 				{avatar_drivers.OUTPUT}
 			</div>
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index 2068bdbbc4..882bcfe36d 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -3,10 +3,10 @@
 "use strict";
 
 function avatar_simplify() {
-    $('#av_options > div').hide();
+    $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
-    $('#av_option_' + selected).show();
+    $('#avatar_option_' + selected).show();
 }
 
 avatar_simplify();
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'),
 								));
 							}
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
index 2068bdbbc4..882bcfe36d 100644
--- a/phpBB/styles/prosilver/template/avatars.js
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -3,10 +3,10 @@
 "use strict";
 
 function avatar_simplify() {
-    $('#av_options > div').hide();
+    $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
-    $('#av_option_' + selected).show();
+    $('#avatar_option_' + selected).show();
 }
 
 avatar_simplify();
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 354ddcc69c..e7f4a48e11 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -9,7 +9,7 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-			<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
+			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<h3>{L_AVATAR_SELECT}</h3>
@@ -24,9 +24,9 @@
 			</select></dd>
 		</dl>
 	</fieldset>
-	<div id="av_options">
+	<div id="avatar_options">
 <!-- BEGIN avatar_drivers -->
-	<div id="av_option_{avatar_drivers.DRIVER}">
+	<div id="avatar_option_{avatar_drivers.DRIVER}">
 	<noscript>
 	<h3 class="avatar_section_header">{avatar_drivers.L_TITLE}</h3>
 	</noscript>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
index 5629e873cf..04fd5c459d 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 8b46dfa7f5..d885abcd5b 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -1,16 +1,16 @@
-<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="av_local_cat" id="category">
+<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category">
 <option value="">{L_NO_AVATAR_CATEGORY}</option>
-<!-- BEGIN av_local_cats -->
-<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
-<!-- END av_local_cats -->
+<!-- BEGIN avatar_local_cats -->
+<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
+<!-- END avatar_local_cats -->
 </select></label>
-<input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
+<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" />
 
 <div id="gallery">
-<!-- BEGIN av_local_row -->
-<!-- BEGIN av_local_col -->
-	<label for="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></label>
-<!-- END av_local_col -->
-<!-- END av_local_row -->
+<!-- BEGIN avatar_local_row -->
+<!-- BEGIN avatar_local_col -->
+	<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
+<!-- END avatar_local_col -->
+<!-- END avatar_local_row -->
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index cf3eb20a39..ab91e90c27 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
+	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
index d0a4f516e1..9d3efbd018 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
+	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
+		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js
index a9b2cc5722..df6aad178a 100644
--- a/phpBB/styles/subsilver2/template/avatars.js
+++ b/phpBB/styles/subsilver2/template/avatars.js
@@ -3,10 +3,10 @@
 "use strict";
 
 function avatar_simplify() {
-    $('.[class^="av_option_"]').hide();
+    $('.[class^="avatar_option_"]').hide();
 
     var selected = $('#avatar_driver').val();
-    $('.av_option_' + selected).show();
+    $('.avatar_option_' + selected).show();
 }
 
 avatar_simplify();
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
index 9bf8a3fc39..b8840e0aab 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
@@ -1,13 +1,13 @@
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></td>
+		<td class="row2"><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></td>
 	</tr>
 	<tr>
 		<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></td>
 		<td class="row2">
-			<input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-			<input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+			<input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+			<input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 		</td>
 	</tr>
 </table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
index 352052f9f4..f4273192ad 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
@@ -1,32 +1,32 @@
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
-		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="av_local_cat" id="category">
+		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="avatar_local_cat" id="category">
 			<option value="">{L_NO_AVATAR_CATEGORY}</option>
-			<!-- BEGIN av_local_cats -->
-			<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
-			<!-- END av_local_cats -->
-			</select>&nbsp; <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="av_local_go" />
+			<!-- BEGIN avatar_local_cats -->
+			<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
+			<!-- END avatar_local_cats -->
+			</select>&nbsp; <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="avatar_local_go" />
 		</td>
 	</tr>
 	<tr> 
 		<td class="row1" colspan="2" align="center">
 			<table cellspacing="1" cellpadding="4" border="0">
-			<!-- BEGIN av_local_row -->
+			<!-- BEGIN avatar_local_row -->
 			<tr> 
-				<!-- BEGIN av_local_col -->
-					<td class="row1" align="center"><img src="{av_local_col.av_local_col.AVATAR_IMAGE}" alt="{av_local_col.av_local_col.AVATAR_NAME}" title="{av_local_col.av_local_col.AVATAR_NAME}" /></td>
-				<!-- END av_local_col -->
+				<!-- BEGIN avatar_local_col -->
+					<td class="row1" align="center"><img src="{avatar_local_col.avatar_local_col.AVATAR_IMAGE}" alt="{avatar_local_col.avatar_local_col.AVATAR_NAME}" title="{avatar_local_col.avatar_local_col.AVATAR_NAME}" /></td>
+				<!-- END avatar_local_col -->
 			</tr>
 			<tr>
-				<!-- BEGIN av_local_option -->
-					<td class="row2" align="center"><input type="radio" class="radio" name="av_local_file" value="{av_local_col.av_local_option.S_OPTIONS_AVATAR}" /></td>
-				<!-- END av_local_option -->
+				<!-- BEGIN avatar_local_option -->
+					<td class="row2" align="center"><input type="radio" class="radio" name="avatar_local_file" value="{avatar_local_col.avatar_local_option.S_OPTIONS_AVATAR}" /></td>
+				<!-- END avatar_local_option -->
 			</tr>
 			<!-- BEGINELSE -->
 			<tr>
 				<td class="row1" colspan="2">{L_NO_AVATAR_CATEGORY}</td>
 			</tr>
-			<!-- END av_local_col -->
+			<!-- END avatar_local_col -->
 			</table>
 		</td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
index 8fe7201953..50ebb9b93d 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
@@ -1,10 +1,10 @@
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
 		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="av_remote_url" size="40" value="{AV_REMOTE_URL}" /></td>
+		<td class="row2"><input class="post" type="text" name="avatar_remote_url" size="40" value="{AVATAR_REMOTE_URL}" /></td>
 	</tr>
 	<tr> 
 		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" /> <span class="gen">{L_PIXEL} &times; </span> <input class="post" type="text" name="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td>
+		<td class="row2"><input class="post" type="text" name="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" /> <span class="gen">{L_PIXEL} &times; </span> <input class="post" type="text" name="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td>
 	</tr>
 </table>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
index e76abc0433..6b813baeaa 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
@@ -1,12 +1,12 @@
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
 		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}{L_COLON} </b></td>
-		<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="av_upload_file" /></td>
+		<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="avatar_upload_file" /></td>
 	</tr>
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<tr> 
 		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}{L_COLON} </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="av_upload_url" size="40" value="" /></td>
+		<td class="row2"><input class="post" type="text" name="avatar_upload_url" size="40" value="" /></td>
 	</tr>
 <!-- ENDIF -->
 </table>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index e15335f4e1..8064e1e6e9 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -60,7 +60,7 @@
 	</tr>
 	<tr>
 		<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></td>
-		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="av_delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
+		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="avatar_delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
 	</tr>
 <!-- IF not S_AVATARS_ENABLED -->
 	<tr>
@@ -81,10 +81,10 @@
 			</select></td>
 	</tr>
 <!-- BEGIN avatar_drivers -->
-	<tr class="av_option_{avatar_drivers.DRIVER}">
+	<tr class="avatar_option_{avatar_drivers.DRIVER}">
 		<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
 	</tr>
-	<tr class="av_option_{avatar_drivers.DRIVER}">
+	<tr class="avatar_option_{avatar_drivers.DRIVER}">
 		<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
 	</tr>
 <!-- END avatar_drivers -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index 4e65b37e3c..4c7458e940 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -12,7 +12,7 @@
 <tr> 
 	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
 	<td class="row2" align="center"><br />
-		<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="av_delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span>
+		<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="avatar_delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span>
 		<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" />
 		<!-- ENDIF --></td>
 </tr>
@@ -35,10 +35,10 @@
 			</select></td>
 	</tr>
 <!-- BEGIN avatar_drivers -->
-	<tr class="av_option_{avatar_drivers.DRIVER}">
+	<tr class="avatar_option_{avatar_drivers.DRIVER}">
 		<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
 	</tr>
-	<tr class="av_option_{avatar_drivers.DRIVER}">
+	<tr class="avatar_option_{avatar_drivers.DRIVER}">
 		<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
 	</tr>
 <!-- END avatar_drivers -->
-- 
cgit v1.2.1


From 7945ffa2a131c1539a4aa929039c4d44b8e4d336 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 01:02:43 +0100
Subject: [feature/avatars] Use new avatar types in database updater

PHPBB3-10018
---
 phpBB/install/database_update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2015ef0475..d471833442 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2714,9 +2714,9 @@ function change_database_data(&$no_updates, $version)
 
 			// Update avatars to modular types
 			$avatar_type_map = array(
-				AVATAR_UPLOAD	=> 'upload',
-				AVATAR_GALLERY	=> 'local',
-				AVATAR_REMOTE	=> 'remote',
+				AVATAR_UPLOAD	=> 'avatar.driver.upload',
+				AVATAR_GALLERY	=> 'avatar.driver.local',
+				AVATAR_REMOTE	=> 'avatar.driver.remote',
 			);
 
 			foreach ($avatar_type_map as $old => $new)
-- 
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 +-
 phpBB/install/database_update.php         | 20 ++++++++++----------
 7 files changed, 30 insertions(+), 27 deletions(-)

(limited to 'phpBB')

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))
 							{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index d471833442..b27613168f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2722,27 +2722,27 @@ function change_database_data(&$no_updates, $version)
 			foreach ($avatar_type_map as $old => $new)
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_avatar_type = '" . $db->sql_escape($new) . "'
-					WHERE user_avatar_type = '" . $db->sql_escape($old) . "'";
+					SET user_avatar_type = '" . $new . "'
+					WHERE user_avatar_type = '" . $old . "'";
 				_sql($sql, $errored, $error_ary);
 
 				$sql = 'UPDATE ' . GROUPS_TABLE . "
-					SET group_avatar_type = '" . $db->sql_escape($new) . "'
-					WHERE group_avatar_type = '" . $db->sql_escape($old) . "'";
+					SET group_avatar_type = '" . $new . "'
+					WHERE group_avatar_type = '" . $old . "'";
 				_sql($sql, $errored, $error_ary);
 			}
 
 			// update avatar 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 || cfg_allow_avatar_gravatar)\'
-				WHERE module_class = \'ucp\'
-					AND module_basename = \'ucp_profile\'
-					AND module_mode = \'avatar\'';
+			$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 || cfg_allow_avatar_gravatar)'
+				WHERE module_class = 'ucp'
+					AND module_basename = 'ucp_profile'
+					AND module_mode = 'avatar'";
 			_sql($sql, $errored, $error_ary);
 
 			if (!isset($config['allow_avatar_gravatar']))
 			{
-				$config->set('allow_avatar_gravatar', '');
+				$config->set('allow_avatar_gravatar', '0');
 			}
 
 			$no_updates = false;
-- 
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/common.php                     | 2 --
 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 ++-
 7 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 17e7c76465..c4237dfcf5 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -128,8 +128,6 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 $template = $phpbb_container->get('template');
 $phpbb_style = $phpbb_container->get('style');
 
-$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
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')

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')

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')

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')

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')

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')

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 0abec06b09c71feb709b6101949181ff7ec4d882 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 21:16:21 +0100
Subject: [feature/avatars] Change gravatar explain as discussed in PR

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

(limited to 'phpBB')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d397ca5538..7223b13b29 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -90,7 +90,7 @@ $lang = array_merge($lang, array(
 	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected persistent login keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
 	'AVATAR_DRIVER_GRAVATAR_TITLE'	=> 'Gravatar',
-	'AVATAR_DRIVER_GRAVATAR_EXPLAIN'=> 'Gravatar is a service that provides you with a globally unique avatar.',
+	'AVATAR_DRIVER_GRAVATAR_EXPLAIN'=> 'Gravatar is a service that allows you to maintain the same avatar across multiple websites. Visit <a href="http://www.gravatar.com/">Gravatar</a> for more information.',
 	'AVATAR_DRIVER_LOCAL_TITLE'		=> 'Gallery avatar',
 	'AVATAR_DRIVER_LOCAL_EXPLAIN'	=> 'You can choose your avatar from a locally available set of avatars.',
 	'AVATAR_DRIVER_REMOTE_TITLE'	=> 'Remote avatar',
-- 
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')

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 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')

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')

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 562ebe5c12b8a238b94a63ba53b694af4d061bc9 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 30 Nov 2012 14:36:18 +0100
Subject: [feature/avatars] Unify size of avatar_type

Previously it was set to 255 in one file while it was 32 in other files.
As the size of 32 is rather low this was increased to 255.

PHPBB3-10018
---
 phpBB/develop/create_schema_files.php     | 4 ++--
 phpBB/install/schemas/firebird_schema.sql | 4 ++--
 phpBB/install/schemas/mssql_schema.sql    | 4 ++--
 phpBB/install/schemas/mysql_40_schema.sql | 4 ++--
 phpBB/install/schemas/mysql_41_schema.sql | 4 ++--
 phpBB/install/schemas/oracle_schema.sql   | 4 ++--
 phpBB/install/schemas/postgres_schema.sql | 4 ++--
 phpBB/install/schemas/sqlite_schema.sql   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 1d03a5b06e..895a945e4e 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1168,7 +1168,7 @@ function get_schema_struct()
 			'group_desc_uid'		=> array('VCHAR:8', ''),
 			'group_display'			=> array('BOOL', 0),
 			'group_avatar'			=> array('VCHAR', ''),
-			'group_avatar_type'		=> array('VCHAR:32', ''),
+			'group_avatar_type'		=> array('VCHAR:255', ''),
 			'group_avatar_width'	=> array('USINT', 0),
 			'group_avatar_height'	=> array('USINT', 0),
 			'group_rank'			=> array('UINT', 0),
@@ -1823,7 +1823,7 @@ function get_schema_struct()
 			'user_allow_massemail'		=> array('BOOL', 1),
 			'user_options'				=> array('UINT:11', 230271),
 			'user_avatar'				=> array('VCHAR', ''),
-			'user_avatar_type'			=> array('VCHAR:32', ''),
+			'user_avatar_type'			=> array('VCHAR:255', ''),
 			'user_avatar_width'			=> array('USINT', 0),
 			'user_avatar_height'		=> array('USINT', 0),
 			'user_sig'					=> array('MTEXT_UNI', ''),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 45ab3af337..d830f0db77 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -445,7 +445,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_display INTEGER DEFAULT 0 NOT NULL,
 	group_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	group_avatar_type VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	group_avatar_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_avatar_width INTEGER DEFAULT 0 NOT NULL,
 	group_avatar_height INTEGER DEFAULT 0 NOT NULL,
 	group_rank INTEGER DEFAULT 0 NOT NULL,
@@ -1271,7 +1271,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail INTEGER DEFAULT 1 NOT NULL,
 	user_options INTEGER DEFAULT 230271 NOT NULL,
 	user_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	user_avatar_type VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	user_avatar_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	user_avatar_width INTEGER DEFAULT 0 NOT NULL,
 	user_avatar_height INTEGER DEFAULT 0 NOT NULL,
 	user_sig BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 1925935dc4..d2dd1c1d60 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -553,7 +553,7 @@ CREATE TABLE [phpbb_groups] (
 	[group_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[group_display] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[group_avatar_type] [varchar] (32) DEFAULT ('') NOT NULL ,
+	[group_avatar_type] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[group_avatar_width] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar_height] [int] DEFAULT (0) NOT NULL ,
 	[group_rank] [int] DEFAULT (0) NOT NULL ,
@@ -1555,7 +1555,7 @@ CREATE TABLE [phpbb_users] (
 	[user_allow_massemail] [int] DEFAULT (1) NOT NULL ,
 	[user_options] [int] DEFAULT (230271) NOT NULL ,
 	[user_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[user_avatar_type] [varchar] (32) DEFAULT ('') NOT NULL ,
+	[user_avatar_type] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_avatar_width] [int] DEFAULT (0) NOT NULL ,
 	[user_avatar_height] [int] DEFAULT (0) NOT NULL ,
 	[user_sig] [text] DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 6634615e9f..dfaf3b28e2 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -317,7 +317,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varbinary(8) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varbinary(255) DEFAULT '' NOT NULL,
-	group_avatar_type varbinary(32) DEFAULT '' NOT NULL,
+	group_avatar_type varbinary(255) DEFAULT '' NOT NULL,
 	group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -919,7 +919,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	user_options int(11) UNSIGNED DEFAULT '230271' NOT NULL,
 	user_avatar varbinary(255) DEFAULT '' NOT NULL,
-	user_avatar_type varbinary(32) DEFAULT '' NOT NULL,
+	user_avatar_type varbinary(255) DEFAULT '' NOT NULL,
 	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_sig mediumblob NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 7823c91fb8..5c27538f86 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -317,7 +317,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
-	group_avatar_type varchar(32) DEFAULT '' NOT NULL,
+	group_avatar_type varchar(255) DEFAULT '' NOT NULL,
 	group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -919,7 +919,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	user_options int(11) UNSIGNED DEFAULT '230271' NOT NULL,
 	user_avatar varchar(255) DEFAULT '' NOT NULL,
-	user_avatar_type varchar(32) DEFAULT '' NOT NULL,
+	user_avatar_type varchar(255) DEFAULT '' NOT NULL,
 	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_sig mediumtext NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 78592decd5..718dd02601 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -610,7 +610,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar2(8) DEFAULT '' ,
 	group_display number(1) DEFAULT '0' NOT NULL,
 	group_avatar varchar2(255) DEFAULT '' ,
-	group_avatar_type varchar2(32) DEFAULT '' ,
+	group_avatar_type varchar2(255) DEFAULT '' ,
 	group_avatar_width number(4) DEFAULT '0' NOT NULL,
 	group_avatar_height number(4) DEFAULT '0' NOT NULL,
 	group_rank number(8) DEFAULT '0' NOT NULL,
@@ -1667,7 +1667,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail number(1) DEFAULT '1' NOT NULL,
 	user_options number(11) DEFAULT '230271' NOT NULL,
 	user_avatar varchar2(255) DEFAULT '' ,
-	user_avatar_type varchar2(32) DEFAULT '' ,
+	user_avatar_type varchar2(255) DEFAULT '' ,
 	user_avatar_width number(4) DEFAULT '0' NOT NULL,
 	user_avatar_height number(4) DEFAULT '0' NOT NULL,
 	user_sig clob DEFAULT '' ,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index f85cee4277..3d4d01484e 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -463,7 +463,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0),
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
-	group_avatar_type varchar(32) DEFAULT '' NOT NULL,
+	group_avatar_type varchar(255) DEFAULT '' NOT NULL,
 	group_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_width >= 0),
 	group_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_height >= 0),
 	group_rank INT4 DEFAULT '0' NOT NULL CHECK (group_rank >= 0),
@@ -1169,7 +1169,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail INT2 DEFAULT '1' NOT NULL CHECK (user_allow_massemail >= 0),
 	user_options INT4 DEFAULT '230271' NOT NULL CHECK (user_options >= 0),
 	user_avatar varchar(255) DEFAULT '' NOT NULL,
-	user_avatar_type varchar(32) DEFAULT '' NOT NULL,
+	user_avatar_type varchar(255) DEFAULT '' NOT NULL,
 	user_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_width >= 0),
 	user_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_height >= 0),
 	user_sig TEXT DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 900ed06bfe..8f488416ce 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -309,7 +309,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varchar(8) NOT NULL DEFAULT '',
 	group_display INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_avatar varchar(255) NOT NULL DEFAULT '',
-	group_avatar_type varchar(32) NOT NULL DEFAULT '',
+	group_avatar_type varchar(255) NOT NULL DEFAULT '',
 	group_avatar_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_avatar_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
@@ -893,7 +893,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	user_options INTEGER UNSIGNED NOT NULL DEFAULT '230271',
 	user_avatar varchar(255) NOT NULL DEFAULT '',
-	user_avatar_type varchar(32) NOT NULL DEFAULT '',
+	user_avatar_type varchar(255) NOT NULL DEFAULT '',
 	user_avatar_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_avatar_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_sig mediumtext(16777215) NOT NULL DEFAULT '',
-- 
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')

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')

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')

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')

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/config/services.yml         |  4 ----
 phpBB/includes/avatar/manager.php | 10 +---------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 3d33731eea..6649b36ae6 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -17,11 +17,7 @@ services:
     avatar.manager:
         class: phpbb_avatar_manager
         arguments:
-            - %core.root_path%
-            - .%core.php_ext%
             - @config
-            - @request
-            - @cache.driver
             - @avatar.driver_collection
             - @service_container
 
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 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/adm/style/acp_users_avatar.html       | 2 +-
 phpBB/adm/style/avatars.js                  | 6 +++---
 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 ++--
 phpBB/styles/prosilver/template/avatars.js  | 6 +++---
 phpBB/styles/subsilver2/template/avatars.js | 6 +++---
 8 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index bc3a19a25e..0a72bb0b62 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -32,8 +32,8 @@
 
 	<fieldset class="quick">
 		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
-	</fieldset>
 	{S_FORM_TOKEN}
+	</fieldset>
 	</form>
 
 	<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index 882bcfe36d..a53814c15f 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_simplify() {
+function avatar_hide() {
     $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#avatar_option_' + selected).show();
 }
 
-avatar_simplify();
-$('#avatar_driver').bind('change', avatar_simplify);
+avatar_hide();
+$('#avatar_driver').bind('change', avatar_hide);
 
 })(jQuery); // Avoid conflicts with other libraries
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'),
 							));
 						}
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
index 882bcfe36d..a53814c15f 100644
--- a/phpBB/styles/prosilver/template/avatars.js
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_simplify() {
+function avatar_hide() {
     $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#avatar_option_' + selected).show();
 }
 
-avatar_simplify();
-$('#avatar_driver').bind('change', avatar_simplify);
+avatar_hide();
+$('#avatar_driver').bind('change', avatar_hide);
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js
index df6aad178a..733056a32d 100644
--- a/phpBB/styles/subsilver2/template/avatars.js
+++ b/phpBB/styles/subsilver2/template/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_simplify() {
+function avatar_hide() {
     $('.[class^="avatar_option_"]').hide();
 
     var selected = $('#avatar_driver').val();
     $('.avatar_option_' + selected).show();
 }
 
-avatar_simplify();
-$('#avatar_driver').bind('change', avatar_simplify);
+avatar_hide();
+$('#avatar_driver').bind('change', avatar_hide);
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
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')

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 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')

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')

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 9b018bd460376abce3f4fe9d8c11feef0c547b0d Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sun, 2 Dec 2012 21:47:18 +0000
Subject: [ticket/11171] DB additions for these changes

Made the required changes to develop/create_schema_files.php
and this is what resulted of that.

PHPBB3-11171
---
 phpBB/develop/create_schema_files.php     | 27 +++++++++++++++------------
 phpBB/install/schemas/firebird_schema.sql |  5 ++++-
 phpBB/install/schemas/mssql_schema.sql    |  5 ++++-
 phpBB/install/schemas/mysql_40_schema.sql |  5 ++++-
 phpBB/install/schemas/mysql_41_schema.sql |  5 ++++-
 phpBB/install/schemas/oracle_schema.sql   |  5 ++++-
 phpBB/install/schemas/postgres_schema.sql |  5 ++++-
 phpBB/install/schemas/sqlite_schema.sql   |  5 ++++-
 8 files changed, 43 insertions(+), 19 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 3d3e478032..0ae75c2681 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1520,18 +1520,21 @@ function get_schema_struct()
 
 	$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', ''),
+			'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(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 767ce68b4a..bd97fefb36 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -912,8 +912,11 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER DEFAULT 0 NOT NULL,
 	report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
+	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL
+	reported_post_enable_magic_url INTEGER DEFAULT 1 NOT NULL,
+	reported_post_enable_smilies INTEGER DEFAULT 1 NOT NULL,
+	reported_post_enable_bbcode INTEGER DEFAULT 1 NOT NULL
 );;
 
 ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 84c975942f..bb0890e439 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1111,8 +1111,11 @@ CREATE TABLE [phpbb_reports] (
 	[report_time] [int] DEFAULT (0) NOT NULL ,
 	[report_text] [text] DEFAULT ('') NOT NULL ,
 	[reported_post_text] [text] DEFAULT ('') NOT NULL ,
+	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL 
+	[reported_post_enable_magic_url] [int] DEFAULT (1) NOT NULL ,
+	[reported_post_enable_smilies] [int] DEFAULT (1) NOT NULL ,
+	[reported_post_enable_bbcode] [int] DEFAULT (1) NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 8aab949103..bf3d7fecfa 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -649,8 +649,11 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumblob NOT NULL,
 	reported_post_text mediumblob NOT NULL,
-	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	reported_post_uid varbinary(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
+	reported_post_enable_magic_url tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	reported_post_enable_smilies tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	reported_post_enable_bbcode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 04aef2844a..372b63d83c 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -649,8 +649,11 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumtext NOT NULL,
 	reported_post_text mediumtext NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
+	reported_post_enable_magic_url tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	reported_post_enable_smilies tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	reported_post_enable_bbcode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 91f906bc8b..671347ebe1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1216,8 +1216,11 @@ CREATE TABLE phpbb_reports (
 	report_time number(11) DEFAULT '0' NOT NULL,
 	report_text clob DEFAULT '' ,
 	reported_post_text clob DEFAULT '' ,
-	reported_post_bitfield varchar2(255) DEFAULT '' ,
 	reported_post_uid varchar2(8) DEFAULT '' ,
+	reported_post_bitfield varchar2(255) DEFAULT '' ,
+	reported_post_enable_magic_url number(1) DEFAULT '1' NOT NULL,
+	reported_post_enable_smilies number(1) DEFAULT '1' NOT NULL,
+	reported_post_enable_bbcode number(1) DEFAULT '1' NOT NULL,
 	CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 619985e0d6..4c13bf0ba9 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -855,8 +855,11 @@ CREATE TABLE phpbb_reports (
 	report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
 	report_text TEXT DEFAULT '' NOT NULL,
 	reported_post_text TEXT DEFAULT '' NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
+	reported_post_enable_magic_url INT2 DEFAULT '1' NOT NULL CHECK (reported_post_enable_magic_url >= 0),
+	reported_post_enable_smilies INT2 DEFAULT '1' NOT NULL CHECK (reported_post_enable_smilies >= 0),
+	reported_post_enable_bbcode INT2 DEFAULT '1' NOT NULL CHECK (reported_post_enable_bbcode >= 0),
 	PRIMARY KEY (report_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 1690a7dcab..46a96a1edd 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -630,8 +630,11 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_text mediumtext(16777215) NOT NULL DEFAULT '',
 	reported_post_text mediumtext(16777215) NOT NULL DEFAULT '',
+	reported_post_uid varchar(8) NOT NULL DEFAULT '',
 	reported_post_bitfield varchar(255) NOT NULL DEFAULT '',
-	reported_post_uid varchar(8) NOT NULL DEFAULT ''
+	reported_post_enable_magic_url INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	reported_post_enable_smilies INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	reported_post_enable_bbcode INTEGER UNSIGNED NOT NULL DEFAULT '1'
 );
 
 CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
-- 
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/adm/style/acp_groups_position.html | 2 +-
 phpBB/includes/acp/acp_groups.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 99864f75ce..eb4c3d8819 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -108,7 +108,7 @@
 
 	<p>{L_TEAMPAGE_EXPLAIN}</p>
 
-	<!-- IF S_TEAMPAGE_CATEGORY and CUR_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CUR_CATEGORY_NAME}</strong></p><!-- ENDIF -->
+	<!-- IF S_TEAMPAGE_CATEGORY and CURRENT_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CURRENT_CATEGORY_NAME}</strong></p><!-- ENDIF -->
 
 	<table cellspacing="1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
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 25780c17a4e9c1e96e8f1648bd9bd16ff06afb7f Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sun, 2 Dec 2012 22:59:11 +0000
Subject: [ticket/11171] DB changes for the update

These are the changes to database_update.php required for
this ticket.

PHPBB3-11171
---
 phpBB/install/database_update.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e966756337..060d749b92 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2792,6 +2792,23 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
+			// PHPBB3-11171: Copy bbcode fields, etc. for reported posts. Add 5 columns to the reports table
+			
+			// Add the columns used by these changes
+			$changes['add_columns'] = array(
+				REPORTS_TABLE => array(
+					'reported_post_enable_bbcode'		=> array('BOOL', 1),
+					'reported_post_enable_smilies'		=> array('BOOL', 1),
+					'reported_post_enable_magic_url'	=> array('BOOL', 1)
+				)
+			);
+			$statements = $db_tools->perform_schema_changes($changes);
+
+			foreach ($statements as $sql)
+			{
+				_sql($sql, $errored, $error_ary);
+			}
+
 		break;
 	}
 }
-- 
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')

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 91246c20fa8b9218fe0ddc8b52236d4b878346dd Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sun, 2 Dec 2012 23:07:40 +0000
Subject: [ticket/11171] Adapted the code in report.php

Added the variable aliases needed (to look and feel the same as
it was before)
Added the variables into  the table insert.

PHPBB3-11171
---
 phpBB/report.php | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/report.php b/phpBB/report.php
index d792b8df6a..be38bad2f3 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -71,11 +71,14 @@ if ($post_id)
 		trigger_error('POST_NOT_EXIST');
 	}
 
-	$forum_id 				= (int) $report_data['forum_id'];
-	$topic_id 				= (int) $report_data['topic_id'];
-	$reported_post_text		= $report_data['post_text'];
-	$reported_post_bitfield	= $report_data['bbcode_bitfield'];
-	$reported_post_uid		= $report_data['bbcode_uid'];
+	$forum_id 							= (int) $report_data['forum_id'];
+	$topic_id 							= (int) $report_data['topic_id'];
+	$reported_post_text					= $report_data['post_text'];
+	$reported_post_bitfield				= $report_data['bbcode_bitfield'];
+	$reported_post_uid					= $report_data['bbcode_uid'];
+	$reported_post_enable_bbcode		= $report_data['enable_bbcode'];
+	$reported_post_enable_smilies		= $report_data['enable_smilies'];
+	$reported_post_enable_magic_url		= $report_data['enable_magic_url'];
 
 	$sql = 'SELECT *
 		FROM ' . FORUMS_TABLE . '
@@ -134,9 +137,11 @@ else
 		trigger_error($message);
 	}
 	
-	$reported_post_text 	= $report_data['message_text'];
-	$reported_post_bitfield	= $report_data['bbcode_bitfield'];
-	$reported_post_uid		= $report_data['bbcode_uid'];
+	$reported_post_text 				= $report_data['message_text'];
+	$reported_post_bitfield				= $report_data['bbcode_bitfield'];
+	$reported_post_enable_bbcode		= $report_data['reported_post_enable_bbcode'];
+	$reported_post_enable_smilies		= $report_data['reported_post_enable_smilies'];
+	$reported_post_enable_magic_url		= $report_data['reported_post_enable_magic_url'];
 }
 
 // Submit report?
@@ -155,17 +160,20 @@ if ($submit && $reason_id)
 	}
 
 	$sql_ary = array(
-		'reason_id'				=> (int) $reason_id,
-		'post_id'				=> $post_id,
-		'pm_id'					=> $pm_id,
-		'user_id'				=> (int) $user->data['user_id'],
-		'user_notify'			=> (int) $user_notify,
-		'report_closed'			=> 0,
-		'report_time'			=> (int) time(),
-		'report_text'			=> (string) $report_text,
-		'reported_post_text'	=> $reported_post_text,
-		'reported_post_uid'		=> $reported_post_uid,
-		'reported_post_bitfield'=> $reported_post_bitfield,
+		'reason_id'							=> (int) $reason_id,
+		'post_id'							=> $post_id,
+		'pm_id'								=> $pm_id,
+		'user_id'							=> (int) $user->data['user_id'],
+		'user_notify'						=> (int) $user_notify,
+		'report_closed'						=> 0,
+		'report_time'						=> (int) time(),
+		'report_text'						=> (string) $report_text,
+		'reported_post_text'				=> $reported_post_text,
+		'reported_post_uid'					=> $reported_post_uid,
+		'reported_post_bitfield'			=> $reported_post_bitfield,
+		'reported_post_enable_bbcode'		=> $reported_post_enable_bbcode,
+		'reported_post_enable_smilies'		=> $reported_post_enable_smilies,
+		'reported_post_enable_magic_url'	=> $reported_post_enable_magic_url,
 	);
 
 	$sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-- 
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')

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')

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')

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 9eecaa21e3fe23c0c1afc7f8d057754fca68e9a6 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 6 Dec 2012 11:22:56 +0000
Subject: [ticket/11171] Moved the DB schema changes to its place

Moved the db changes schema to the place where all the other
schema changes are.

PHPBB3-11171
---
 phpBB/install/database_update.php | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 060d749b92..91365d4a72 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1123,9 +1123,12 @@ function database_update_info()
 					'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', ''),
+					'reported_post_text'				=> array('MTEXT_UNI', ''),
+					'reported_post_uid'					=> array('VCHAR:8', ''),
+					'reported_post_bitfield'			=> array('VCHAR:255', ''),
+					'reported_post_enable_bbcode'		=> array('BOOL', 1),
+					'reported_post_enable_smilies'		=> array('BOOL', 1),
+					'reported_post_enable_magic_url'	=> array('BOOL', 1),
 				),
 			),
 			'change_columns'	=> array(
@@ -2791,23 +2794,7 @@ function change_database_data(&$no_updates, $version)
 				_sql($sql, $errored, $error_ary);		
 			}
 			$db->sql_freeresult($result);
-
-			// PHPBB3-11171: Copy bbcode fields, etc. for reported posts. Add 5 columns to the reports table
 			
-			// Add the columns used by these changes
-			$changes['add_columns'] = array(
-				REPORTS_TABLE => array(
-					'reported_post_enable_bbcode'		=> array('BOOL', 1),
-					'reported_post_enable_smilies'		=> array('BOOL', 1),
-					'reported_post_enable_magic_url'	=> array('BOOL', 1)
-				)
-			);
-			$statements = $db_tools->perform_schema_changes($changes);
-
-			foreach ($statements as $sql)
-			{
-				_sql($sql, $errored, $error_ary);
-			}
 
 		break;
 	}
-- 
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')

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/docs/sphinx.sample.conf |   90 +-
 phpBB/includes/sphinxapi.php  | 3424 ++++++++++++++++++++---------------------
 2 files changed, 1772 insertions(+), 1742 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf
index aa0e8d905d..fcaba6dcf3 100644
--- a/phpBB/docs/sphinx.sample.conf
+++ b/phpBB/docs/sphinx.sample.conf
@@ -10,21 +10,36 @@ source source_phpbb_{SPHINX_ID}_main
 	sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = MAX(post_id) WHERE counter_id = 1
 	sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts
 	sql_range_step = 5000
-	sql_query = SELECT
\
-							p.post_id AS id,
\
-							p.forum_id,
\
-							p.topic_id,
\
-							p.poster_id,
\
-							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 phpbb_posts p, phpbb_topics t
\
-						WHERE
\
-							p.topic_id = t.topic_id
\
+	sql_query = SELECT
+\
+							p.post_id AS id,
+\
+							p.forum_id,
+\
+							p.topic_id,
+\
+							p.poster_id,
+\
+							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 phpbb_posts p, phpbb_topics t
+\
+						WHERE
+\
+							p.topic_id = t.topic_id
+\
 							AND p.post_id >= $start AND p.post_id <= $end 
 	sql_query_post =
 	sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1
@@ -42,21 +57,36 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
 {
 	sql_query_range =
 	sql_range_step =
-	sql_query = SELECT
\
-							p.post_id AS id,
\
-							p.forum_id,
\
-							p.topic_id,
\
-							p.poster_id,
\
-							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 phpbb_posts p, phpbb_topics t
\
-						WHERE
\
-							p.topic_id = t.topic_id
\
+	sql_query = SELECT
+\
+							p.post_id AS id,
+\
+							p.forum_id,
+\
+							p.topic_id,
+\
+							p.poster_id,
+\
+							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 phpbb_posts p, phpbb_topics t
+\
+						WHERE
+\
+							p.topic_id = t.topic_id
+\
 							AND p.post_id >=  ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) 
 	sql_query_pre =
 }
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 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/config/notifications.yml                      | 2 +-
 phpBB/includes/user_loader.php                      | 2 +-
 phpBB/language/en/email/newtopic_notify.txt         | 2 +-
 phpBB/language/en/email/post_disapproved.txt        | 2 +-
 phpBB/language/en/email/privmsg_notify.txt          | 2 +-
 phpBB/language/en/email/short/newtopic_notify.txt   | 2 +-
 phpBB/language/en/email/short/post_disapproved.txt  | 2 +-
 phpBB/language/en/email/short/privmsg_notify.txt    | 2 +-
 phpBB/language/en/email/short/topic_approved.txt    | 2 +-
 phpBB/language/en/email/short/topic_disapproved.txt | 2 +-
 phpBB/language/en/email/short/topic_notify.txt      | 2 +-
 phpBB/language/en/email/topic_approved.txt          | 2 +-
 phpBB/language/en/email/topic_disapproved.txt       | 2 +-
 phpBB/language/en/email/topic_notify.txt            | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index f8a5b5f9fa..5a593c44d6 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -279,4 +279,4 @@ services:
             - %core.root_path%
             - %core.php_ext%
         tags:
-            - { name: notification.method }
\ No newline at end of file
+            - { name: notification.method }
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
+}
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index d4f5cae620..bf6799e5be 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -10,4 +10,4 @@ If you no longer wish to watch this forum you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_FORUM}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt
index 3bc64bb611..2f8a8381cb 100644
--- a/phpBB/language/en/email/post_disapproved.txt
+++ b/phpBB/language/en/email/post_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
index d3a86cc73c..41fdbb782c 100644
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ b/phpBB/language/en/email/privmsg_notify.txt
@@ -12,4 +12,4 @@ You can view your new message by clicking on the following link:
 
 You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
index d4f5cae620..bf6799e5be 100644
--- a/phpBB/language/en/email/short/newtopic_notify.txt
+++ b/phpBB/language/en/email/short/newtopic_notify.txt
@@ -10,4 +10,4 @@ If you no longer wish to watch this forum you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_FORUM}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt
index 3bc64bb611..2f8a8381cb 100644
--- a/phpBB/language/en/email/short/post_disapproved.txt
+++ b/phpBB/language/en/email/short/post_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt
index d3a86cc73c..41fdbb782c 100644
--- a/phpBB/language/en/email/short/privmsg_notify.txt
+++ b/phpBB/language/en/email/short/privmsg_notify.txt
@@ -12,4 +12,4 @@ You can view your new message by clicking on the following link:
 
 You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt
index ffda378d30..0b09918b89 100644
--- a/phpBB/language/en/email/short/topic_approved.txt
+++ b/phpBB/language/en/email/short/topic_approved.txt
@@ -8,4 +8,4 @@ If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt
index 49ef58bf39..a4bd9c151e 100644
--- a/phpBB/language/en/email/short/topic_disapproved.txt
+++ b/phpBB/language/en/email/short/topic_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
index fa2481dd9a..472375fb22 100644
--- a/phpBB/language/en/email/short/topic_notify.txt
+++ b/phpBB/language/en/email/short/topic_notify.txt
@@ -17,4 +17,4 @@ If you no longer wish to watch this topic you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_TOPIC}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt
index ffda378d30..0b09918b89 100644
--- a/phpBB/language/en/email/topic_approved.txt
+++ b/phpBB/language/en/email/topic_approved.txt
@@ -8,4 +8,4 @@ If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt
index 49ef58bf39..a4bd9c151e 100644
--- a/phpBB/language/en/email/topic_disapproved.txt
+++ b/phpBB/language/en/email/topic_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index fa2481dd9a..472375fb22 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -17,4 +17,4 @@ If you no longer wish to watch this topic you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_TOPIC}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
-- 
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 ++++----
 phpBB/index.php                          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB')

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))
 					{
diff --git a/phpBB/index.php b/phpBB/index.php
index 94b2b17084..5e76d653eb 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -25,7 +25,7 @@ $auth->acl($user->data);
 $user->setup('viewforum');
 
 // Mark notifications read
-if (($mark_notification = request_var('mark_notification', 0)))
+if (($mark_notification = $request->variable('mark_notification', 0)))
 {
 	$notification = $phpbb_notifications->load_notifications(array(
 		'notification_id'	=> $mark_notification
@@ -37,7 +37,7 @@ if (($mark_notification = request_var('mark_notification', 0)))
 
 		$notification->mark_read();
 
-		if (($redirect = request_var('redirect', '')))
+		if (($redirect = $request->variable('redirect', '')))
 		{
 			redirect(append_sid($phpbb_root_path . $redirect));
 		}
-- 
cgit v1.2.1


From 0d6c8f46ffa1206e9d8d71fd30ef04e52f7cb2a8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 14:12:25 -0600
Subject: [ticket/11103] Update indexes on notifications/user notifications
 tables

PHPBB3-11103
---
 phpBB/develop/create_schema_files.php     | 14 ++------------
 phpBB/install/database_update.php         | 14 ++------------
 phpBB/install/schemas/firebird_schema.sql |  9 ++-------
 phpBB/install/schemas/mssql_schema.sql    | 19 ++-----------------
 phpBB/install/schemas/mysql_40_schema.sql |  9 ++-------
 phpBB/install/schemas/mysql_41_schema.sql |  9 ++-------
 phpBB/install/schemas/oracle_schema.sql   | 14 ++------------
 phpBB/install/schemas/postgres_schema.sql |  9 ++-------
 phpBB/install/schemas/sqlite_schema.sql   |  9 ++-------
 9 files changed, 18 insertions(+), 88 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 3548bc5f05..87204f9e26 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1309,13 +1309,8 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'		=> 'notification_id',
 		'KEYS'				=> array(
-			'item_type'			=> array('INDEX', 'item_type'),
-			'item_id'			=> array('INDEX', 'item_id'),
-			'item_pid'			=> array('INDEX', 'item_parent_id'),
-			'user_id'			=> array('INDEX', 'user_id'),
-			'time'				=> array('INDEX', 'time'),
-			'unread'			=> array('INDEX', 'unread'),
-			'is_enabled'		=> array('INDEX', 'is_enabled'),
+			'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
+			'user'				=> array('INDEX', array('user_id', 'unread')),
 		),
 	);
 
@@ -1791,11 +1786,6 @@ function get_schema_struct()
 			'user_id',
 			'method',
 		),
-		'KEYS'				=> array(
-			'it'				=> array('INDEX', 'item_type'),
-			'uid'				=> array('INDEX', 'user_id'),
-			'no'				=> array('INDEX', 'notify'),
-		),
 	);
 
 	$schema_data['phpbb_user_group'] = array(
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 33e8795327..a4739b7212 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1122,13 +1122,8 @@ function database_update_info()
 					),
 					'PRIMARY_KEY'		=> 'notification_id',
 					'KEYS'				=> array(
-						'item_type'			=> array('INDEX', 'item_type'),
-						'item_id'			=> array('INDEX', 'item_id'),
-						'item_pid'			=> array('INDEX', 'item_parent_id'),
-						'user_id'			=> array('INDEX', 'user_id'),
-						'time'				=> array('INDEX', 'time'),
-						'unread'			=> array('INDEX', 'unread'),
-						'is_enabled'		=> array('INDEX', 'is_enabled'),
+						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
+						'user'				=> array('INDEX', array('user_id', 'unread')),
 					),
 				),
 				$table_prefix . 'user_notifications'	=> array(
@@ -1145,11 +1140,6 @@ function database_update_info()
 						'user_id',
 						'method',
 					),
-					'KEYS'				=> array(
-						'it'				=> array('INDEX', 'item_type'),
-						'uid'				=> array('INDEX', 'user_id'),
-						'no'				=> array('INDEX', 'notify'),
-					),
 				),
 			),
 			'add_columns'		=> array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 8456958800..d3058fb0dd 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -633,13 +633,8 @@ CREATE TABLE phpbb_notifications (
 
 ALTER TABLE phpbb_notifications ADD PRIMARY KEY (notification_id);;
 
-CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications(item_type);;
-CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications(item_id);;
-CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications(item_parent_id);;
-CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications(user_id);;
-CREATE INDEX phpbb_notifications_time ON phpbb_notifications(time);;
-CREATE INDEX phpbb_notifications_unread ON phpbb_notifications(unread);;
-CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications(is_enabled);;
+CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications(item_type, item_id);;
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications(user_id, unread);;
 
 CREATE GENERATOR phpbb_notifications_gen;;
 SET GENERATOR phpbb_notifications_gen TO 0;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index d0023aa411..377ff92620 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -774,25 +774,10 @@ ALTER TABLE [phpbb_notifications] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [item_type] ON [phpbb_notifications]([item_type]) ON [PRIMARY]
+CREATE  INDEX [item_ident] ON [phpbb_notifications]([item_type], [item_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [item_id] ON [phpbb_notifications]([item_id]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [item_pid] ON [phpbb_notifications]([item_parent_id]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [user_id] ON [phpbb_notifications]([user_id]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [time] ON [phpbb_notifications]([time]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [unread] ON [phpbb_notifications]([unread]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [is_enabled] ON [phpbb_notifications]([is_enabled]) ON [PRIMARY]
+CREATE  INDEX [user] ON [phpbb_notifications]([user_id], [unread]) ON [PRIMARY]
 GO
 
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 07e529e833..4ceb664cd3 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -442,13 +442,8 @@ CREATE TABLE phpbb_notifications (
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data blob NOT NULL,
 	PRIMARY KEY (notification_id),
-	KEY item_type (item_type),
-	KEY item_id (item_id),
-	KEY item_pid (item_parent_id),
-	KEY user_id (user_id),
-	KEY time (time),
-	KEY unread (unread),
-	KEY is_enabled (is_enabled)
+	KEY item_ident (item_type, item_id),
+	KEY user (user_id, unread)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 361f53c313..423b97567a 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -442,13 +442,8 @@ CREATE TABLE phpbb_notifications (
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data text NOT NULL,
 	PRIMARY KEY (notification_id),
-	KEY item_type (item_type),
-	KEY item_id (item_id),
-	KEY item_pid (item_parent_id),
-	KEY user_id (user_id),
-	KEY time (time),
-	KEY unread (unread),
-	KEY is_enabled (is_enabled)
+	KEY item_ident (item_type, item_id),
+	KEY user (user_id, unread)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index a2bb016dae..b3ea3c7d5e 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -857,19 +857,9 @@ CREATE TABLE phpbb_notifications (
 )
 /
 
-CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications (item_type)
+CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id)
 /
-CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications (item_id)
-/
-CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id)
-/
-CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id)
-/
-CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time)
-/
-CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread)
-/
-CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled)
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, unread)
 /
 
 CREATE SEQUENCE phpbb_notifications_seq
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 94926d0b7a..e43b64468d 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -614,13 +614,8 @@ CREATE TABLE phpbb_notifications (
 	PRIMARY KEY (notification_id)
 );
 
-CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications (item_type);
-CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications (item_id);
-CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id);
-CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
-CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
-CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
-CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled);
+CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id);
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, unread);
 
 /*
 	Table: 'phpbb_poll_options'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 43611ef70b..e3b556668d 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -430,13 +430,8 @@ CREATE TABLE phpbb_notifications (
 	data text(65535) NOT NULL DEFAULT ''
 );
 
-CREATE INDEX phpbb_notifications_item_type ON phpbb_notifications (item_type);
-CREATE INDEX phpbb_notifications_item_id ON phpbb_notifications (item_id);
-CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id);
-CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
-CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
-CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
-CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled);
+CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id);
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, unread);
 
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
-- 
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')

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')

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 26bde05a30c7111b57621a37d86425aa69d74263 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 9 Dec 2012 19:42:50 +0100
Subject: [feature/avatars] Call set_name() method in avatars.yml

This is needed after 8a28271d was merged.

PHPBB3-10018
---
 phpBB/config/avatars.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
index cc9ed05836..e6106038f5 100644
--- a/phpBB/config/avatars.yml
+++ b/phpBB/config/avatars.yml
@@ -7,6 +7,8 @@ services:
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.gravatar]]
         tags:
             - { name: avatar.driver }
 
@@ -18,6 +20,8 @@ services:
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.local]]
         tags:
             - { name: avatar.driver }
 
@@ -29,6 +33,8 @@ services:
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.remote]]
         tags:
             - { name: avatar.driver }
 
@@ -40,5 +46,7 @@ services:
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.upload]]
         tags:
             - { name: avatar.driver }
-- 
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/config/notifications.yml          | 17 +++++++++++++++++
 phpBB/includes/notification/manager.php | 20 +-------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index 5a593c44d6..550fbdfd0c 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -15,6 +15,7 @@ services:
 
     notification.type.approve_post:
         class: phpbb_notification_type_approve_post
+        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -31,6 +32,7 @@ services:
 
     notification.type.approve_topic:
         class: phpbb_notification_type_approve_topic
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -47,6 +49,7 @@ services:
 
     notification.type.bookmark:
         class: phpbb_notification_type_bookmark
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -63,6 +66,7 @@ services:
 
     notification.type.disapprove_post:
         class: phpbb_notification_type_disapprove_post
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -79,6 +83,7 @@ services:
 
     notification.type.disapprove_topic:
         class: phpbb_notification_type_disapprove_topic
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -95,6 +100,7 @@ services:
 
     notification.type.pm:
         class: phpbb_notification_type_pm
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -111,6 +117,7 @@ services:
 
     notification.type.post:
         class: phpbb_notification_type_post
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -127,6 +134,7 @@ services:
 
     notification.type.post_in_queue:
         class: phpbb_notification_type_post_in_queue
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -143,6 +151,7 @@ services:
 
     notification.type.quote:
         class: phpbb_notification_type_quote
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -159,6 +168,7 @@ services:
 
     notification.type.report_pm:
         class: phpbb_notification_type_report_pm
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -175,6 +185,7 @@ services:
 
     notification.type.report_pm_closed:
         class: phpbb_notification_type_report_pm_closed
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -191,6 +202,7 @@ services:
 
     notification.type.report_post:
         class: phpbb_notification_type_report_post
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -207,6 +219,7 @@ services:
 
     notification.type.report_post_closed:
         class: phpbb_notification_type_report_post
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -223,6 +236,7 @@ services:
 
     notification.type.topic:
         class: phpbb_notification_type_topic
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -239,6 +253,7 @@ services:
 
     notification.type.topic_in_queue:
         class: phpbb_notification_type_topic_in_queue
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -255,6 +270,7 @@ services:
 
     notification.method.email:
         class: phpbb_notification_method_email
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
@@ -269,6 +285,7 @@ services:
 
     notification.method.jabber:
         class: phpbb_notification_method_jabber
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
             - @dbal.conn
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/config/services.yml  |  11 ++++
 phpBB/config/tables.yml    |   1 +
 phpBB/includes/log/log.php | 161 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 128 insertions(+), 45 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 37e6c0b5df..73d8680803 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -154,6 +154,17 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
+    log:
+        class: phpbb_log
+        arguments:
+            - @dbal.conn
+            - @user
+            - @auth
+            - @dispatcher
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.log%
+
     request:
         class: phpbb_request
 
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index cfc6dbcfed..b506e6c6b3 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -1,3 +1,4 @@
 parameters:
     tables.config: %core.table_prefix%config
     tables.ext: %core.table_prefix%ext
+    tables.log: %core.table_prefix%log
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/adm/index.php                      |  1 -
 phpBB/adm/style/install_header.html      |  6 +++---
 phpBB/adm/style/install_update_diff.html |  2 +-
 phpBB/adm/swatch.php                     |  2 --
 phpBB/common.php                         |  4 ++++
 phpBB/includes/db/dbal.php               |  4 ++--
 phpBB/includes/functions.php             |  4 ++--
 phpBB/includes/functions_install.php     |  3 +++
 phpBB/includes/ucp/ucp_groups.php        |  6 +++---
 phpBB/install/database_update.php        |  8 ++++++--
 phpBB/install/index.php                  | 16 ++++++++++------
 phpBB/install/install_install.php        |  4 ++--
 phpBB/install/install_update.php         | 11 ++++++-----
 phpBB/language/en/install.php            |  2 +-
 phpBB/memberlist.php                     |  2 +-
 phpBB/viewonline.php                     |  2 +-
 16 files changed, 45 insertions(+), 32 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index e20bbe4bec..2591fa9d24 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -42,7 +42,6 @@ if (!$auth->acl_get('a_'))
 
 // We define the admin variables now, because the user is now able to use the admin related features...
 define('IN_ADMIN', true);
-$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';
 
 // Some oft used variables
 $safe_mode		= (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 6826654ded..5631b83e17 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -5,7 +5,7 @@
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
 // <![CDATA[
@@ -49,7 +49,7 @@ function dE(n, s, type)
 		</form>
 		<!-- ENDIF -->
 	</div>
-	
+
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -73,5 +73,5 @@ function dE(n, s, type)
 						<!-- END l_block2 -->
 						</ul>
 					</div>
-	
+
 					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index ecdc40e157..1f30fe4d13 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -5,7 +5,7 @@
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
 // <![CDATA[
diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php
index 86498a255f..5e8984db70 100644
--- a/phpBB/adm/swatch.php
+++ b/phpBB/adm/swatch.php
@@ -21,8 +21,6 @@ $user->session_begin(false);
 $auth->acl($user->data);
 $user->setup();
 
-$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';
-
 // Set custom template for admin area
 $phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 
diff --git a/phpBB/common.php b/phpBB/common.php
index e99b9edee5..ff128553ab 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -63,6 +63,10 @@ if (!defined('PHPBB_INSTALLED'))
 	exit;
 }
 
+// In case $adm_relative_path is not set (in case of an update), use the default.
+$adm_relative_path = (isset($adm_relative_path)) ? ((substr($adm_relative_path, -1) == '/') ? $adm_relative_path : $adm_relative_path . '/') : 'adm/';
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $adm_relative_path;
+
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
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(),
 						));
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 30592b995d..38bfe978e5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -73,6 +73,10 @@ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
 	die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update.");
 }
 
+// In case $adm_relative_path is not set (in case of an update), use the default.
+$adm_relative_path = (isset($adm_relative_path)) ? ((substr($adm_relative_path, -1) == '/') ? $adm_relative_path : $adm_relative_path . '/') : 'adm/';
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $adm_relative_path;
+
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
@@ -232,7 +236,7 @@ if ($has_global && !$ga_forum_id)
 
 	<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
-	<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="<?php echo $phpbb_admin_path; ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 	</head>
 
@@ -282,7 +286,7 @@ header('Content-type: text/html; charset=UTF-8');
 
 <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="<?php echo $phpbb_admin_path; ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 </head>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 09560946a6..22dc12fe99 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -73,6 +73,10 @@ else
 }
 @ini_set('memory_limit', $mem_limit);
 
+// In case $adm_relative_path is not set (in case of an update), use the default.
+$adm_relative_path = (isset($adm_relative_path)) ? ((substr($adm_relative_path, -1) == '/') ? $adm_relative_path : $adm_relative_path . '/') : 'adm/';
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $adm_relative_path;
+
 // Include essential scripts
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
@@ -215,9 +219,9 @@ $phpbb_style_path_provider = new phpbb_style_path_provider();
 $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, new phpbb_template_context());
 $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 $phpbb_style->set_ext_dir_prefix('adm/');
-$phpbb_style->set_custom_style('admin', '../adm/style', '');
+$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 $template->assign_var('T_ASSETS_PATH', '../assets');
-$template->assign_var('T_TEMPLATE_PATH', '../adm/style');
+$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
 $install = new module();
 
@@ -361,7 +365,7 @@ class module
 		}
 
 		define('HEADER_INC', true);
-		global $template, $lang, $stage, $phpbb_root_path;
+		global $template, $lang, $stage, $phpbb_root_path, $phpbb_admin_path;
 
 		$template->assign_vars(array(
 			'L_CHANGE'				=> $lang['CHANGE'],
@@ -370,7 +374,7 @@ class module
 			'L_SELECT_LANG'			=> $lang['SELECT_LANG'],
 			'L_SKIP'				=> $lang['SKIP'],
 			'PAGE_TITLE'			=> $this->get_page_title(),
-			'T_IMAGE_PATH'			=> $phpbb_root_path . 'adm/images/',
+			'T_IMAGE_PATH'			=> $phpbb_admin_path . 'images/',
 
 			'S_CONTENT_DIRECTION' 	=> $lang['DIRECTION'],
 			'S_CONTENT_FLOW_BEGIN'	=> ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
@@ -551,7 +555,7 @@ class module
 	*/
 	function error($error, $line, $file, $skip = false)
 	{
-		global $lang, $db, $template;
+		global $lang, $db, $template, $phpbb_admin_path;
 
 		if ($skip)
 		{
@@ -573,7 +577,7 @@ class module
 		echo '<head>';
 		echo '<meta charset="utf-8">';
 		echo '<title>' . $lang['INST_ERR_FATAL'] . '</title>';
-		echo '<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
+		echo '<link href="' . $phpbb_admin_path . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
 		echo '</head>';
 		echo '<body id="errorpage">';
 		echo '<div id="wrap">';
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 4b2fa046bc..197554d20f 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1813,7 +1813,7 @@ class install_install extends module
 	*/
 	function email_admin($mode, $sub)
 	{
-		global $auth, $config, $db, $lang, $template, $user, $phpbb_root_path, $phpEx;
+		global $auth, $config, $db, $lang, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$this->page_title = $lang['STAGE_FINAL'];
 
@@ -1860,7 +1860,7 @@ class install_install extends module
 			'TITLE'		=> $lang['INSTALL_CONGRATS'],
 			'BODY'		=> sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=convert&amp;language=' . $data['language']), '../docs/README.html'),
 			'L_SUBMIT'	=> $lang['INSTALL_LOGIN'],
-			'U_ACTION'	=> append_sid($phpbb_root_path . 'adm/index.' . $phpEx, 'i=send_statistics&amp;mode=send_statistics'),
+			'U_ACTION'	=> append_sid($phpbb_admin_path . 'index.' . $phpEx, 'i=send_statistics&amp;mode=send_statistics'),
 		));
 	}
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 7f40015002..679850db31 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -72,7 +72,7 @@ class install_update extends module
 	function main($mode, $sub)
 	{
 		global $phpbb_style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
-		global $request;
+		global $request, $phpbb_admin_path, $adm_relative_path;
 
 		$this->tpl_name = 'install_update';
 		$this->page_title = 'UPDATE_INSTALLATION';
@@ -131,7 +131,7 @@ class install_update extends module
 		}
 
 		// Set custom template again. ;)
-		$phpbb_style->set_custom_style('admin', '../adm/style', '');
+		$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 
 		$template->assign_vars(array(
 			'S_USER_LANG'			=> $user->lang['USER_LANG'],
@@ -216,7 +216,7 @@ class install_update extends module
 		if ($this->test_update === false)
 		{
 			// Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present
-			if (in_array('adm/style/install_update.html', $this->update_info['files']))
+			if (in_array($adm_relative_path . 'style/install_update.html', $this->update_info['files']))
 			{
 				$this->tpl_name = '../../install/update/new/adm/style/install_update';
 			}
@@ -493,6 +493,7 @@ class install_update extends module
 				$template->assign_vars(array(
 					'S_FILE_CHECK'			=> true,
 					'S_ALL_UP_TO_DATE'		=> $all_up_to_date,
+					'L_ALL_FILES_UP_TO_DATE'	=> $user->lang('ALL_FILES_UP_TO_DATE', append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login&amp;redirect=' . $adm_relative_path . 'index.php%3Fi=send_statistics%26mode=send_statistics')),
 					'S_VERSION_UP_TO_DATE'	=> $up_to_date,
 					'U_ACTION'				=> append_sid($this->p_master->module_url, "language=$language&amp;mode=$mode&amp;sub=file_check"),
 					'U_UPDATE_ACTION'		=> append_sid($this->p_master->module_url, "language=$language&amp;mode=$mode&amp;sub=update_files"),
@@ -1077,12 +1078,12 @@ class install_update extends module
 	*/
 	function show_diff(&$update_list)
 	{
-		global $phpbb_root_path, $template, $user;
+		global $phpbb_root_path, $template, $user, $adm_relative_path;
 
 		$this->tpl_name = 'install_update_diff';
 
 		// Got the diff template itself updated? If so, we are able to directly use it
-		if (in_array('adm/style/install_update_diff.html', $this->update_info['files']))
+		if (in_array($adm_relative_path . 'style/install_update_diff.html', $this->update_info['files']))
 		{
 			$this->tpl_name = '../../install/update/new/adm/style/install_update_diff';
 		}
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 1c45deae11..f7820714e1 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -374,7 +374,7 @@ $lang = array_merge($lang, array(
 
 // Updater
 $lang = array_merge($lang, array(
-	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
+	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="%1$s">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="%2$s">Send statistics</a> module in your ACP.',
 	'ARCHIVE_FILE'				=> 'Source file within archive',
 
 	'BACK'				=> 'Back',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index d9ba147c70..79be9ca432 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -649,7 +649,7 @@ switch ($mode)
 			'S_GROUP_OPTIONS'	=> $group_options,
 			'S_CUSTOM_FIELDS'	=> (isset($profile_fields['row']) && sizeof($profile_fields['row'])) ? true : false,
 
-			'U_USER_ADMIN'			=> ($auth->acl_get('a_user')) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", 'i=users&amp;mode=overview&amp;u=' . $user_id, true, $user->session_id) : '',
+			'U_USER_ADMIN'			=> ($auth->acl_get('a_user')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview&amp;u=' . $user_id, true, $user->session_id) : '',
 			'U_USER_BAN'			=> ($auth->acl_get('m_ban') && $user_id != $user->data['user_id']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=ban&amp;mode=user&amp;u=' . $user_id, true, $user->session_id) : '',
 			'U_MCP_QUEUE'			=> ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '',
 
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 687fef4c6c..e483915bd5 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -216,7 +216,7 @@ while ($row = $db->sql_fetchrow($result))
 			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
 		break;
 
-		case 'adm/index':
+		case $adm_relative_path . 'index':
 			$location = $user->lang['ACP'];
 			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
 		break;
-- 
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')

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/common.php                       |  6 +++---
 phpBB/includes/di/extension/config.php |  2 +-
 phpBB/install/database_update.php      |  6 +++---
 phpBB/install/index.php                |  6 +++---
 phpBB/install/install_update.php       | 10 +++++-----
 phpBB/viewonline.php                   |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index ff128553ab..f974c9ba2f 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -63,9 +63,9 @@ if (!defined('PHPBB_INSTALLED'))
 	exit;
 }
 
-// In case $adm_relative_path is not set (in case of an update), use the default.
-$adm_relative_path = (isset($adm_relative_path)) ? ((substr($adm_relative_path, -1) == '/') ? $adm_relative_path : $adm_relative_path . '/') : 'adm/';
-$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $adm_relative_path;
+// In case $phpbb_adm_relative_path is not set (in case of an update), use the default.
+$phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relative_path : 'adm/';
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
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);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 38bfe978e5..1600b7bd10 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -73,9 +73,9 @@ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
 	die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update.");
 }
 
-// In case $adm_relative_path is not set (in case of an update), use the default.
-$adm_relative_path = (isset($adm_relative_path)) ? ((substr($adm_relative_path, -1) == '/') ? $adm_relative_path : $adm_relative_path . '/') : 'adm/';
-$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $adm_relative_path;
+// In case $phpbb_adm_relative_path is not set (in case of an update), use the default.
+$phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relative_path : 'adm/';
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 22dc12fe99..69e9e7de42 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -73,9 +73,9 @@ else
 }
 @ini_set('memory_limit', $mem_limit);
 
-// In case $adm_relative_path is not set (in case of an update), use the default.
-$adm_relative_path = (isset($adm_relative_path)) ? ((substr($adm_relative_path, -1) == '/') ? $adm_relative_path : $adm_relative_path . '/') : 'adm/';
-$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $adm_relative_path;
+// In case $phpbb_adm_relative_path is not set (in case of an update), use the default.
+$phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relative_path : 'adm/';
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
 
 // Include essential scripts
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 679850db31..55dba9a935 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -72,7 +72,7 @@ class install_update extends module
 	function main($mode, $sub)
 	{
 		global $phpbb_style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
-		global $request, $phpbb_admin_path, $adm_relative_path;
+		global $request, $phpbb_admin_path, $phpbb_adm_relative_path;
 
 		$this->tpl_name = 'install_update';
 		$this->page_title = 'UPDATE_INSTALLATION';
@@ -216,7 +216,7 @@ class install_update extends module
 		if ($this->test_update === false)
 		{
 			// Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present
-			if (in_array($adm_relative_path . 'style/install_update.html', $this->update_info['files']))
+			if (in_array($phpbb_adm_relative_path . 'style/install_update.html', $this->update_info['files']))
 			{
 				$this->tpl_name = '../../install/update/new/adm/style/install_update';
 			}
@@ -493,7 +493,7 @@ class install_update extends module
 				$template->assign_vars(array(
 					'S_FILE_CHECK'			=> true,
 					'S_ALL_UP_TO_DATE'		=> $all_up_to_date,
-					'L_ALL_FILES_UP_TO_DATE'	=> $user->lang('ALL_FILES_UP_TO_DATE', append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login&amp;redirect=' . $adm_relative_path . 'index.php%3Fi=send_statistics%26mode=send_statistics')),
+					'L_ALL_FILES_UP_TO_DATE'	=> $user->lang('ALL_FILES_UP_TO_DATE', append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login&amp;redirect=' . $phpbb_adm_relative_path . 'index.php%3Fi=send_statistics%26mode=send_statistics')),
 					'S_VERSION_UP_TO_DATE'	=> $up_to_date,
 					'U_ACTION'				=> append_sid($this->p_master->module_url, "language=$language&amp;mode=$mode&amp;sub=file_check"),
 					'U_UPDATE_ACTION'		=> append_sid($this->p_master->module_url, "language=$language&amp;mode=$mode&amp;sub=update_files"),
@@ -1078,12 +1078,12 @@ class install_update extends module
 	*/
 	function show_diff(&$update_list)
 	{
-		global $phpbb_root_path, $template, $user, $adm_relative_path;
+		global $phpbb_root_path, $template, $user, $phpbb_adm_relative_path;
 
 		$this->tpl_name = 'install_update_diff';
 
 		// Got the diff template itself updated? If so, we are able to directly use it
-		if (in_array($adm_relative_path . 'style/install_update_diff.html', $this->update_info['files']))
+		if (in_array($phpbb_adm_relative_path . 'style/install_update_diff.html', $this->update_info['files']))
 		{
 			$this->tpl_name = '../../install/update/new/adm/style/install_update_diff';
 		}
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index e483915bd5..6b26a3f5d6 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -216,7 +216,7 @@ while ($row = $db->sql_fetchrow($result))
 			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
 		break;
 
-		case $adm_relative_path . 'index':
+		case $phpbb_adm_relative_path . 'index':
 			$location = $user->lang['ACP'];
 			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
 		break;
-- 
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 ++++++++++----------
 phpBB/install/database_update.php |  4 ++--
 phpBB/install/index.php           |  4 ++--
 5 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'phpBB')

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'],
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1600b7bd10..7795f8d7f7 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -236,7 +236,7 @@ if ($has_global && !$ga_forum_id)
 
 	<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
-	<link href="<?php echo $phpbb_admin_path; ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 	</head>
 
@@ -286,7 +286,7 @@ header('Content-type: text/html; charset=UTF-8');
 
 <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
-<link href="<?php echo $phpbb_admin_path; ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 </head>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 69e9e7de42..643695ee2b 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -374,7 +374,7 @@ class module
 			'L_SELECT_LANG'			=> $lang['SELECT_LANG'],
 			'L_SKIP'				=> $lang['SKIP'],
 			'PAGE_TITLE'			=> $this->get_page_title(),
-			'T_IMAGE_PATH'			=> $phpbb_admin_path . 'images/',
+			'T_IMAGE_PATH'			=> htmlspecialchars($phpbb_admin_path) . 'images/',
 
 			'S_CONTENT_DIRECTION' 	=> $lang['DIRECTION'],
 			'S_CONTENT_FLOW_BEGIN'	=> ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
@@ -577,7 +577,7 @@ class module
 		echo '<head>';
 		echo '<meta charset="utf-8">';
 		echo '<title>' . $lang['INST_ERR_FATAL'] . '</title>';
-		echo '<link href="' . $phpbb_admin_path . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
+		echo '<link href="' . htmlspecialchars($phpbb_admin_path) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
 		echo '</head>';
 		echo '<body id="errorpage">';
 		echo '<div id="wrap">';
-- 
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')

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 bd334d318fb61992cedfdb7ca1306ad670f392a4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 11 Dec 2012 13:59:21 +0100
Subject: [ticket/10714] Forgot most important, use container to create
 $phpbb_log

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

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 344b83403f..88ab9b6b5a 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -118,7 +118,7 @@ $config = $phpbb_container->get('config');
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
-$phpbb_log = new phpbb_log(LOG_TABLE);
+$phpbb_log = $phpbb_container->get('log');
 
 // load extensions
 $phpbb_extension_manager = $phpbb_container->get('ext.manager');
-- 
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/adm/style/acp_avatar_options_gravatar.html |  4 ++--
 phpBB/adm/style/acp_avatar_options_remote.html   |  4 ++--
 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 ++--
 7 files changed, 31 insertions(+), 21 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index 04fd5c459d..47422a6ecd 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index ab91e90c27..1dc4b05992 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
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 +++++++++++++++++++---
 phpBB/styles/prosilver/template/ajax.js            | 16 ++++++++++
 phpBB/styles/prosilver/template/index_body.html    |  2 +-
 .../styles/prosilver/template/viewforum_body.html  |  2 +-
 4 files changed, 49 insertions(+), 7 deletions(-)

(limited to 'phpBB')

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
 		{
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index fa31d3268f..4ae4f91d8d 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -2,6 +2,22 @@
 
 "use strict";
 
+// This callback will mark all forum icons read
+phpbb.add_ajax_callback('mark_forums_read', function(res) {
+	var read_title = res.NO_UNREAD_POSTS;
+	var unread_title = res.UNREAD_POSTS;
+
+	$('li.row dl.forum_unread').each(function(e) {
+		$(this).removeClass('forum_unread').addClass('forum_read');
+		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
+
+	$('li.row dl.forum_unread_subforum').each(function(e) {
+		$(this).removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
+});
+
 // This callback finds the post from the delete link, and removes it.
 phpbb.add_ajax_callback('post_delete', function() {
 	var el = $(this),
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 6babbf5997..0682abffed 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -8,7 +8,7 @@
 	<!-- IF S_DISPLAY_SEARCH -->
 		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_LOAD_UNREADS --> &bull; <a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a><!-- ENDIF --><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
 	<!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="true">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
+	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="mark_forums_read" data-overlay="false">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
 </ul>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index a3239602ae..0f2c1a30ec 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -28,7 +28,7 @@
 <!-- IF S_HAS_SUBFORUM -->
 <!-- IF not S_IS_BOT and U_MARK_FORUMS -->
 <ul class="linklist">
-	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li>
+	<li class="rightside"><a href="{U_MARK_FORUMS}" data-ajax="mark_forums_read" data-overlay="false">{L_MARK_SUBFORUMS_READ}</a></li>
 </ul>
 <!-- ENDIF -->
 	<!-- INCLUDE forumlist_body.html -->
-- 
cgit v1.2.1


From a57c81481d21433bdb185accfd7f2b82858ba461 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Dec 2012 18:38:17 +0100
Subject: [ticket/10954] Mark topics read without popup

Also added missing handling of locked forums.

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js            | 37 ++++++++++++++++++++++
 .../styles/prosilver/template/viewforum_body.html  |  4 +--
 phpBB/viewforum.php                                | 15 ++++++++-
 3 files changed, 53 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 4ae4f91d8d..7752c00367 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -16,6 +16,43 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 		$(this).removeClass('forum_unread_subforum').addClass('forum_read_subforum');
 		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
+
+	$('li.row dl.forum_unread_locked').each(function(e) {
+		$(this).removeClass('forum_unread_locked').addClass('forum_read_locked');
+		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
+});
+
+// This callback will mark all topic icons read
+phpbb.add_ajax_callback('mark_topics_read', function(res) {
+	var i,j;
+	var read_title = res.NO_UNREAD_POSTS;
+	var unread_title = res.UNREAD_POSTS;
+	var icons_array = [
+		['global_unread', 'global_read'],
+		['announce_unread', 'announce_read'],
+		['sticky_unread', 'sticky_read'],
+		['topic_unread', 'topic_read']
+	];
+
+	var icons_state = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+
+	// Make sure all icons are marked as read
+	for (i = 0; i < icons_array.length; i++)
+	{
+		for (j = 0; j < icons_state.length; j++)
+		{
+			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
+				$(this).removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
+				$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+			});
+		}
+	}
+
+	// Remove link to first unread post
+	$('span.icon_topic_newest').each(function(e) {
+		$(this).remove();
+	});
 });
 
 // This callback finds the post from the delete link, and removes it.
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 0f2c1a30ec..b47c13d573 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -57,7 +57,7 @@
 
 	<!-- IF .pagination or TOTAL_POSTS or TOTAL_TOPICS -->
 		<div class="pagination">
-			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="true">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
+			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
 			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS} &bull; <!-- ENDIF -->
 			<!-- IF .pagination -->
 				<!-- INCLUDE pagination.html -->
@@ -211,7 +211,7 @@
 
 		<!-- IF PAGE_NUMBER or TOTAL_POSTS or TOTAL_TOPICS -->
 		<div class="pagination">
-			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> &bull;  <!-- ENDIF -->
+			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> &bull;  <!-- ENDIF -->
 			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS} &bull; <!-- ENDIF -->
 			<!-- IF TOTAL_USERS -->{TOTAL_USERS} &bull; <!-- ENDIF -->
 			<!-- IF .pagination -->
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 83e5d4caa5..1b84c5f52f 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -181,7 +181,20 @@ if ($mark_read == 'topics')
 	$redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
 	meta_refresh(3, $redirect_url);
 
-	trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>'));
+	if (!$request->is_ajax())
+	{
+		trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</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);
+	}
 }
 
 // Is a forum specific topic count required?
-- 
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 +++++++++-------------
 phpBB/viewforum.php                  |  8 +++-----
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'phpBB')

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
 		{
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 1b84c5f52f..d514cf2d61 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -181,11 +181,7 @@ if ($mark_read == 'topics')
 	$redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
 	meta_refresh(3, $redirect_url);
 
-	if (!$request->is_ajax())
-	{
-		trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>'));
-	}
-	else
+	if ($request->is_ajax())
 	{
 		// Tell the ajax script what language vars need to be replaced
 		$data = array(
@@ -195,6 +191,8 @@ if ($mark_read == 'topics')
 		$json_response = new phpbb_json_response();
 		$json_response->send($data);
 	}
+
+	trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>'));
 }
 
 // Is a forum specific topic count required?
-- 
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')

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 a3f18caacc5f7c0392097099fff5189a7dfe63ce Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 13 Dec 2012 17:46:48 +0100
Subject: [ticket/10954] Only call $(this) once and reduce number of DOM
 traversals

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 7752c00367..97b77f6217 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -6,26 +6,30 @@
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
+	var current_object;
 
 	$('li.row dl.forum_unread').each(function(e) {
-		$(this).removeClass('forum_unread').addClass('forum_read');
-		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+		current_object = $(this);
+		current_object.removeClass('forum_unread').addClass('forum_read');
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_subforum').each(function(e) {
-		$(this).removeClass('forum_unread_subforum').addClass('forum_read_subforum');
-		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+		current_object = $(this);
+		current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_locked').each(function(e) {
-		$(this).removeClass('forum_unread_locked').addClass('forum_read_locked');
-		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+		current_object = $(this);
+		current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 });
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var i,j;
+	var i,j, current_object;
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
 	var icons_array = [
@@ -42,9 +46,16 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	{
 		for (j = 0; j < icons_state.length; j++)
 		{
+			// Only topics can be hot
+			if ((icons_state[j] == '_hot' || icons_state[j] == '_hot_mine') && icons_array[i][0] != 'topic_unread')
+			{
+				continue;
+			}
+
 			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
-				$(this).removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
-				$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+				current_object = $(this);
+				current_object.removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
+				current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 			});
 		}
 	}
-- 
cgit v1.2.1


From 5919407a1d183412ce02f6ceee62435f6effd499 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 13 Dec 2012 20:43:38 +0100
Subject: [ticket/10954] Fix scope of current_object

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 97b77f6217..b406d7518d 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -6,22 +6,21 @@
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
-	var current_object;
 
 	$('li.row dl.forum_unread').each(function(e) {
-		current_object = $(this);
+		var current_object = $(this);
 		current_object.removeClass('forum_unread').addClass('forum_read');
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_subforum').each(function(e) {
-		current_object = $(this);
+		var current_object = $(this);
 		current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_locked').each(function(e) {
-		current_object = $(this);
+		var current_object = $(this);
 		current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
@@ -29,7 +28,7 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var i,j, current_object;
+	var i,j;
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
 	var icons_array = [
@@ -53,7 +52,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			}
 
 			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
-				current_object = $(this);
+				var current_object = $(this);
 				current_object.removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
 				current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 			});
-- 
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/common.php                         |  2 --
 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 +++-
 phpBB/index.php                          |  2 ++
 phpBB/report.php                         |  2 ++
 11 files changed, 65 insertions(+), 32 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 88e758a004..e99b9edee5 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -125,8 +125,6 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 $template = $phpbb_container->get('template');
 $phpbb_style = $phpbb_container->get('style');
 
-$phpbb_notifications = $phpbb_container->get('notification_manager');
-
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
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':
diff --git a/phpBB/index.php b/phpBB/index.php
index 5e76d653eb..74fc1b9bda 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -27,6 +27,8 @@ $user->setup('viewforum');
 // Mark notifications read
 if (($mark_notification = $request->variable('mark_notification', 0)))
 {
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	$notification = $phpbb_notifications->load_notifications(array(
 		'notification_id'	=> $mark_notification
 	));
diff --git a/phpBB/report.php b/phpBB/report.php
index 07cec7afbc..f9f6b572ef 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -172,6 +172,8 @@ if ($submit && $reason_id)
 	$db->sql_query($sql);
 	$report_id = $db->sql_nextid();
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	if ($post_id)
 	{
 		$sql = 'UPDATE ' . POSTS_TABLE . '
-- 
cgit v1.2.1


From 1cdb0ecbf205b10a8297f1ec24fcebaea5bee9b2 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 19:32:11 -0600
Subject: [ticket/11103] Add global $table_prefix

I have no idea how this worked previously...

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

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 19d704511a..4adce77c33 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -886,6 +886,8 @@ function _add_permission(auth_admin $auth_admin, phpbb_db_driver $db, $permissio
 *****************************************************************************/
 function database_update_info()
 {
+	global $table_prefix;
+
 	return array(
 		// Changes from 3.0.0 to the next version
 		'3.0.0'			=> array(
-- 
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')

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 ++
 phpBB/install/database_update.php | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'phpBB')

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');
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4adce77c33..c605e0b0e9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -93,6 +93,14 @@ if (!defined('LOGIN_ATTEMPT_TABLE'))
 {
 	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
 }
+if (!defined('NOTIFICATIONS_TABLE'))
+{
+	define('NOTIFICATIONS_TABLE', $table_prefix . 'notifications');
+}
+if (!defined('USER_NOTIFICATIONS_TABLE'))
+{
+	define('USER_NOTIFICATIONS_TABLE', $table_prefix . 'user_notifications');
+}
 if (!defined('EXT_TABLE'))
 {
 	define('EXT_TABLE', $table_prefix . 'ext');
@@ -886,8 +894,6 @@ function _add_permission(auth_admin $auth_admin, phpbb_db_driver $db, $permissio
 *****************************************************************************/
 function database_update_info()
 {
-	global $table_prefix;
-
 	return array(
 		// Changes from 3.0.0 to the next version
 		'3.0.0'			=> array(
@@ -1173,7 +1179,7 @@ function database_update_info()
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
 					),
 				),
-				$table_prefix . 'notifications'		=> array(
+				NOTIFICATIONS_TABLE		=> array(
 					'COLUMNS'			=> array(
 						'notification_id'	=> array('UINT', NULL, 'auto_increment'),
 						'item_type'			=> array('VCHAR:255', ''),
@@ -1191,7 +1197,7 @@ function database_update_info()
 						'user'				=> array('INDEX', array('user_id', 'unread')),
 					),
 				),
-				$table_prefix . 'user_notifications'	=> array(
+				USER_NOTIFICATIONS_TABLE	=> array(
 					'COLUMNS'			=> array(
 						'item_type'			=> array('VCHAR:255', ''),
 						'item_id'			=> array('UINT', 0),
-- 
cgit v1.2.1


From 25895bd5c3dc0749c8f7e5f7560752e936e66df7 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 23:19:10 -0600
Subject: [ticket/11103] Fix missing ), in database_update.php

PHPBB3-11103
---
 phpBB/install/database_update.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c605e0b0e9..0250b53a19 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2619,6 +2619,7 @@ function change_database_data(&$no_updates, $version)
 					'title'		=> 'UCP_NOTIFICATION_LIST',
 					'auth'		=> '',
 					'cat'		=> 'UCP_MAIN',
+				),
 				// To add a category, the mode and basename must be empty
 				// The mode is taken from the array key
 				'' => array(
-- 
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 +++--
 phpBB/styles/prosilver/template/ajax.js | 98 +++++++++++++++++++++------------
 phpBB/viewforum.php                     |  7 ++-
 3 files changed, 79 insertions(+), 40 deletions(-)

(limited to 'phpBB')

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);
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index b406d7518d..6d700f1b91 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -7,62 +7,92 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
 
-	$('li.row dl.forum_unread').each(function(e) {
+	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
 		var current_object = $(this);
-		current_object.removeClass('forum_unread').addClass('forum_read');
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
-	});
 
-	$('li.row dl.forum_unread_subforum').each(function(e) {
-		var current_object = $(this);
-		current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		if (current_object.hasClass('forum_unread'))
+		{
+			current_object.removeClass('forum_unread').addClass('forum_read');
+		}
+		else if (current_object.hasClass('forum_unread_subforum'))
+		{
+			current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		}
+		else
+		{
+			current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
+		}
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
-	$('li.row dl.forum_unread_locked').each(function(e) {
-		var current_object = $(this);
-		current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+	// Update mark forums read links
+	$('[data-ajax=mark_forums_read]').each(function() {
+		$(this).attr('href', res.U_MARK_FORUMS);
 	});
+
+	// Hide alert after 3 seconds
+	setTimeout(function () {
+		$('#darkenwrapper').trigger('click');
+	}, 3000);
 });
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var i,j;
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
-	var icons_array = [
-		['global_unread', 'global_read'],
-		['announce_unread', 'announce_read'],
-		['sticky_unread', 'sticky_read'],
-		['topic_unread', 'topic_read']
-	];
-
+	var icons_array = {
+		'global_unread': 'global_read',
+		'announce_unread': 'announce_read',
+		'sticky_unread': 'sticky_read',
+		'topic_unread': 'topic_read'
+	};
 	var icons_state = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+	var unread_class_selectors = '';
+	var class_array = {};
 
-	// Make sure all icons are marked as read
-	for (i = 0; i < icons_array.length; i++)
-	{
-		for (j = 0; j < icons_state.length; j++)
-		{
+	$.each(icons_array, function(unread_class, read_class) {
+		$.each(icons_state, function(key, value) {
 			// Only topics can be hot
-			if ((icons_state[j] == '_hot' || icons_state[j] == '_hot_mine') && icons_array[i][0] != 'topic_unread')
+			if ((value == '_hot' || value == '_hot_mine') && unread_class != 'topic_unread')
 			{
-				continue;
+				return true;
 			}
+			var current_class = {};
+			current_class[unread_class + value] = read_class + value;
+			$.extend(class_array, current_class);
 
-			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
-				var current_object = $(this);
-				current_object.removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
-				current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
-			});
-		}
-	}
+			unread_class_selectors += '.' + unread_class + value + ',';
+		});
+	});
+
+	// Remove trailing comma
+	unread_class_selectors = unread_class_selectors.substring(0, unread_class_selectors.length - 1);
+
+	$('li.row').find(unread_class_selectors).each(function() {
+		var current_object = $(this);
+		$.each(class_array, function(unread_class, read_class) {
+			if (current_object.hasClass(unread_class))
+			{
+				current_object.removeClass(unread_class).addClass(read_class);
+			}
+		});
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
 
 	// Remove link to first unread post
-	$('span.icon_topic_newest').each(function(e) {
+	$('span.icon_topic_newest').each(function() {
 		$(this).remove();
 	});
+
+	// Update mark topics read links
+	$('[data-ajax=mark_topics_read]').each(function() {
+		$(this).attr('href', res.U_MARK_TOPICS);
+	});
+
+	// Hide alert after 3 seconds
+	setTimeout(function () {
+		$('#darkenwrapper').trigger('click');
+	}, 3000);
 });
 
 // This callback finds the post from the delete link, and removes it.
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index d514cf2d61..5fed514a12 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -183,10 +183,13 @@ if ($mark_read == 'topics')
 
 	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_TOPICS'		=> ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics&mark_time=" . time()) : '',
+			'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+			'MESSAGE_TEXT'		=> $user->lang['TOPICS_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')

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')

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 61ef870fd50171c9234e3621e3bfae53834ae85b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 15 Dec 2012 21:12:52 +0100
Subject: [ticket/10954] Fix coding guidelines infractions

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 67 +++++++++++++++------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 6d700f1b91..f1859484f3 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -4,25 +4,22 @@
 
 // This callback will mark all forum icons read
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
-	var read_title = res.NO_UNREAD_POSTS;
-	var unread_title = res.UNREAD_POSTS;
+	var readTitle = res.NO_UNREAD_POSTS;
+	var unreadTitle = res.UNREAD_POSTS;
 
 	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
-		var current_object = $(this);
+		var currentObject = $(this);
 
-		if (current_object.hasClass('forum_unread'))
-		{
-			current_object.removeClass('forum_unread').addClass('forum_read');
+		if (currentObject.hasClass('forum_unread')) {
+			currentObject.removeClass('forum_unread').addClass('forum_read');
 		}
-		else if (current_object.hasClass('forum_unread_subforum'))
-		{
-			current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		else if (currentObject.hasClass('forum_unread_subforum')) {
+			currentObject.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
 		}
-		else
-		{
-			current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
+		else {
+			currentObject.removeClass('forum_unread_locked').addClass('forum_read_locked');
 		}
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Update mark forums read links
@@ -38,45 +35,43 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var read_title = res.NO_UNREAD_POSTS;
-	var unread_title = res.UNREAD_POSTS;
-	var icons_array = {
+	var readTitle = res.NO_UNREAD_POSTS;
+	var unreadTitle = res.UNREAD_POSTS;
+	var iconsArray = {
 		'global_unread': 'global_read',
 		'announce_unread': 'announce_read',
 		'sticky_unread': 'sticky_read',
 		'topic_unread': 'topic_read'
 	};
-	var icons_state = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
-	var unread_class_selectors = '';
-	var class_array = {};
+	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+	var unreadClassSelectors = '';
+	var classArray = {};
 
-	$.each(icons_array, function(unread_class, read_class) {
-		$.each(icons_state, function(key, value) {
+	$.each(iconsArray, function(unreadClass, readClass) {
+		$.each(iconsState, function(key, value) {
 			// Only topics can be hot
-			if ((value == '_hot' || value == '_hot_mine') && unread_class != 'topic_unread')
-			{
+			if ((value == '_hot' || value == '_hot_mine') && unreadClass != 'topic_unread') {
 				return true;
 			}
-			var current_class = {};
-			current_class[unread_class + value] = read_class + value;
-			$.extend(class_array, current_class);
+			var currentClass = {};
+			currentClass[unreadClass + value] = readClass + value;
+			$.extend(classArray, currentClass);
 
-			unread_class_selectors += '.' + unread_class + value + ',';
+			unreadClassSelectors += '.' + unreadClass + value + ',';
 		});
 	});
 
 	// Remove trailing comma
-	unread_class_selectors = unread_class_selectors.substring(0, unread_class_selectors.length - 1);
-
-	$('li.row').find(unread_class_selectors).each(function() {
-		var current_object = $(this);
-		$.each(class_array, function(unread_class, read_class) {
-			if (current_object.hasClass(unread_class))
-			{
-				current_object.removeClass(unread_class).addClass(read_class);
+	unreadClassSelectors = unreadClassSelectors.substring(0, unreadClassSelectors.length - 1);
+
+	$('li.row').find(unreadClassSelectors).each(function() {
+		var currentObject = $(this);
+		$.each(classArray, function(unreadClass, readClass) {
+			if (currentObject.hasClass(unreadClass)) {
+				currentObject.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Remove link to first unread post
-- 
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 ++++++------
 phpBB/install/install_convert.php      |  3 ++-
 7 files changed, 40 insertions(+), 33 deletions(-)

(limited to 'phpBB')

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)
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 9afe341ffa..15202768b8 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -1538,6 +1538,7 @@ class install_convert extends module
 	function finish_conversion()
 	{
 		global $db, $phpbb_root_path, $phpEx, $convert, $config, $language, $user, $template;
+		global $cache, $auth;
 
 		$db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
 			WHERE config_name = 'convert_progress'
@@ -1547,7 +1548,7 @@ class install_convert extends module
 		$db->sql_query('DELETE FROM ' . SESSIONS_TABLE);
 
 		@unlink($phpbb_root_path . 'cache/data_global.' . $phpEx);
-		cache_moderators();
+		phpbb_cache_moderators($db, $cache, $auth);
 
 		// And finally, add a note to the log
 		add_log('admin', 'LOG_INSTALL_CONVERTED', $convert->convertor_data['forum_name'], $config['version']);
-- 
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')

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')

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 b90a56a4093fd2a13c486fa92fc808c020a35a52 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 15 Dec 2012 23:23:32 +0100
Subject: [ticket/10954] Join array of class names instead of creating a string

Previously the string for selecting the correct classes was created
directly. Due to that a subsequent comma had to be removed. By joining the
array of class names with a separator this can be omitted.

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index f1859484f3..78e82f6f4e 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -46,6 +46,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
 	var unreadClassSelectors = '';
 	var classArray = {};
+	var classNames = [];
 
 	$.each(iconsArray, function(unreadClass, readClass) {
 		$.each(iconsState, function(key, value) {
@@ -57,12 +58,11 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			currentClass[unreadClass + value] = readClass + value;
 			$.extend(classArray, currentClass);
 
-			unreadClassSelectors += '.' + unreadClass + value + ',';
+			classNames[classNames.length] = unreadClass;
 		});
 	});
 
-	// Remove trailing comma
-	unreadClassSelectors = unreadClassSelectors.substring(0, unreadClassSelectors.length - 1);
+	unreadClassSelectors = '.' + classNames.join(',.');
 
 	$('li.row').find(unreadClassSelectors).each(function() {
 		var currentObject = $(this);
-- 
cgit v1.2.1


From f4ff33536901d6019bfa4fc5e21b4bdafa66ac42 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 15 Dec 2012 23:48:33 +0100
Subject: [ticket/10954] Simplify marking forums read and fix topic marking

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 78e82f6f4e..bbdb327e21 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -6,19 +6,20 @@
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
+	var iconsArray = {
+		'forum_unread': 'forum_read',
+		'forum_unread_subforum': 'forum_read_subforum',
+		'forum_unread_locked': 'forum_read_locked'
+	};
 
 	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
 		var currentObject = $(this);
 
-		if (currentObject.hasClass('forum_unread')) {
-			currentObject.removeClass('forum_unread').addClass('forum_read');
-		}
-		else if (currentObject.hasClass('forum_unread_subforum')) {
-			currentObject.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
-		}
-		else {
-			currentObject.removeClass('forum_unread_locked').addClass('forum_read_locked');
-		}
+		$.each(iconsArray, function(unreadClass, readClass) {
+			if (currentObject.hasClass(unreadClass)) {
+				currentObject.removeClass(unreadClass).addClass(readClass);
+			}
+		});
 		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
@@ -58,7 +59,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			currentClass[unreadClass + value] = readClass + value;
 			$.extend(classArray, currentClass);
 
-			classNames[classNames.length] = unreadClass;
+			classNames[classNames.length] = unreadClass + value;
 		});
 	});
 
-- 
cgit v1.2.1


From 46cc20452350a6ec8c02459216ff67e80be193d6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 16 Dec 2012 00:57:53 +0100
Subject: [ticket/10954] Use function for closing alert popup

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index bbdb327e21..faf3e59998 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -2,6 +2,15 @@
 
 "use strict";
 
+/**
+* Close popup alert after a small delay
+*/
+phpbb.closeDarkenWrapper = function() {
+	setTimeout(function() {
+		$('#darkenwrapper').trigger('click');
+	}, 3000);
+}
+
 // This callback will mark all forum icons read
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
@@ -28,10 +37,7 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 		$(this).attr('href', res.U_MARK_FORUMS);
 	});
 
-	// Hide alert after 3 seconds
-	setTimeout(function () {
-		$('#darkenwrapper').trigger('click');
-	}, 3000);
+	phpbb.closeDarkenWrapper();
 });
 
 // This callback will mark all topic icons read
@@ -85,10 +91,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 		$(this).attr('href', res.U_MARK_TOPICS);
 	});
 
-	// Hide alert after 3 seconds
-	setTimeout(function () {
-		$('#darkenwrapper').trigger('click');
-	}, 3000);
+	phpbb.closeDarkenWrapper();
 });
 
 // This callback finds the post from the delete link, and removes it.
-- 
cgit v1.2.1


From ec0241d2ef178115a2ffdea7fedebbea0a9cf610 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 16 Dec 2012 00:59:12 +0100
Subject: [ticket/10954] Change currentObject to $this for consistency

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index faf3e59998..4e52884a29 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -22,14 +22,14 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	};
 
 	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
-		var currentObject = $(this);
+		var $this = $(this);
 
 		$.each(iconsArray, function(unreadClass, readClass) {
-			if (currentObject.hasClass(unreadClass)) {
-				currentObject.removeClass(unreadClass).addClass(readClass);
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Update mark forums read links
@@ -72,13 +72,13 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	unreadClassSelectors = '.' + classNames.join(',.');
 
 	$('li.row').find(unreadClassSelectors).each(function() {
-		var currentObject = $(this);
+		var $this = $(this);
 		$.each(classArray, function(unreadClass, readClass) {
-			if (currentObject.hasClass(unreadClass)) {
-				currentObject.removeClass(unreadClass).addClass(readClass);
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Remove link to first unread post
-- 
cgit v1.2.1


From 703b77cb77fa5a99b91cf95220d779bba9ac96d6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 16 Dec 2012 01:06:32 +0100
Subject: [ticket/10954] Use quotes in attribute selectors and reduce use of
 each

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 4e52884a29..41764d5d72 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -29,13 +29,11 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
 	});
 
 	// Update mark forums read links
-	$('[data-ajax=mark_forums_read]').each(function() {
-		$(this).attr('href', res.U_MARK_FORUMS);
-	});
+	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
 
 	phpbb.closeDarkenWrapper();
 });
@@ -78,18 +76,14 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
 	});
 
 	// Remove link to first unread post
-	$('span.icon_topic_newest').each(function() {
-		$(this).remove();
-	});
+	$('span.icon_topic_newest').remove();
 
 	// Update mark topics read links
-	$('[data-ajax=mark_topics_read]').each(function() {
-		$(this).attr('href', res.U_MARK_TOPICS);
-	});
+	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
 
 	phpbb.closeDarkenWrapper();
 });
-- 
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')

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')

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/config/services.yml                     |  1 +
 phpBB/config/tables.yml                       |  1 +
 phpBB/develop/create_schema_files.php         |  9 ++-
 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 ++++---
 phpBB/install/database_update.php             | 11 +++
 phpBB/install/schemas/firebird_schema.sql     | 13 ++--
 phpBB/install/schemas/mssql_schema.sql        | 28 +++++---
 phpBB/install/schemas/mysql_40_schema.sql     | 14 ++--
 phpBB/install/schemas/mysql_41_schema.sql     | 14 ++--
 phpBB/install/schemas/oracle_schema.sql       | 18 +++--
 phpBB/install/schemas/postgres_schema.sql     | 14 ++--
 phpBB/install/schemas/sqlite_schema.sql       | 12 ++--
 17 files changed, 187 insertions(+), 101 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index c3e4ee2128..8a8b26ab6b 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -157,6 +157,7 @@ services:
             - @user
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
 
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index 528470d6ca..f5685a7cd9 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -1,6 +1,7 @@
 parameters:
     tables.config: %core.table_prefix%config
     tables.ext: %core.table_prefix%ext
+    tables.notification_types: %core.table_prefix%notification_types
     tables.notifications: %core.table_prefix%notifications
     tables.user_notifications: %core.table_prefix%user_notifications
     tables.users: %core.table_prefix%users
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 87204f9e26..10306c9124 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1295,6 +1295,14 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_notification_types'] = array(
+		'COLUMNS'			=> array(
+			'notification_type'			=> array('VCHAR:255', ''),
+			'notification_type_enabled'	=> array('BOOL', 1),
+		),
+		'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
+	);
+
 	$schema_data['phpbb_notifications'] = array(
 		'COLUMNS'			=> array(
 			'notification_id'	=> array('UINT', NULL, 'auto_increment'),
@@ -1303,7 +1311,6 @@ function get_schema_struct()
 			'item_parent_id'	=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
 			'unread'			=> array('BOOL', 1),
-			'is_enabled'		=> array('BOOL', 1),
 			'time'				=> array('TIMESTAMP', 1),
 			'data'				=> array('TEXT_UNI', ''),
 		),
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))
 		{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0250b53a19..ae810e1022 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -93,6 +93,10 @@ if (!defined('LOGIN_ATTEMPT_TABLE'))
 {
 	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
 }
+if (!defined('NOTIFICATION_TYPES_TABLE'))
+{
+	define('NOTIFICATION_TYPES_TABLE', $table_prefix . 'notification_types');
+}
 if (!defined('NOTIFICATIONS_TABLE'))
 {
 	define('NOTIFICATIONS_TABLE', $table_prefix . 'notifications');
@@ -1179,6 +1183,13 @@ function database_update_info()
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
 					),
 				),
+				NOTIFICATION_TYPES_TABLE	=> array(
+					'COLUMNS'			=> array(
+						'notification_type'			=> array('VCHAR:255', ''),
+						'notification_type_enabled'	=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
+				),
 				NOTIFICATIONS_TABLE		=> array(
 					'COLUMNS'			=> array(
 						'notification_id'	=> array('UINT', NULL, 'auto_increment'),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index d3058fb0dd..5f7d23e411 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -618,6 +618,15 @@ BEGIN
 END;;
 
 
+# Table: 'phpbb_notification_types'
+CREATE TABLE phpbb_notification_types (
+	notification_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	notification_type_enabled INTEGER DEFAULT 1 NOT NULL
+);;
+
+ALTER TABLE phpbb_notification_types ADD PRIMARY KEY (notification_type, notification_type_enabled);;
+
+
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id INTEGER NOT NULL,
@@ -626,7 +635,6 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
 	unread INTEGER DEFAULT 1 NOT NULL,
-	is_enabled INTEGER DEFAULT 1 NOT NULL,
 	time INTEGER DEFAULT 1 NOT NULL,
 	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
@@ -1243,9 +1251,6 @@ CREATE TABLE phpbb_user_notifications (
 
 ALTER TABLE phpbb_user_notifications ADD PRIMARY KEY (item_type, item_id, user_id, method);;
 
-CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications(item_type);;
-CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications(user_id);;
-CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications(notify);;
 
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 377ff92620..15529cde38 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -751,6 +751,24 @@ CREATE  INDEX [class_left_id] ON [phpbb_modules]([module_class], [left_id]) ON [
 GO
 
 
+/*
+	Table: 'phpbb_notification_types'
+*/
+CREATE TABLE [phpbb_notification_types] (
+	[notification_type] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[notification_type_enabled] [int] DEFAULT (1) NOT NULL 
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [phpbb_notification_types] WITH NOCHECK ADD 
+	CONSTRAINT [PK_phpbb_notification_types] PRIMARY KEY  CLUSTERED 
+	(
+		[notification_type],
+		[notification_type_enabled]
+	)  ON [PRIMARY] 
+GO
+
+
 /*
 	Table: 'phpbb_notifications'
 */
@@ -761,7 +779,6 @@ CREATE TABLE [phpbb_notifications] (
 	[item_parent_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[unread] [int] DEFAULT (1) NOT NULL ,
-	[is_enabled] [int] DEFAULT (1) NOT NULL ,
 	[time] [int] DEFAULT (1) NOT NULL ,
 	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
@@ -1528,15 +1545,6 @@ ALTER TABLE [phpbb_user_notifications] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [it] ON [phpbb_user_notifications]([item_type]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [uid] ON [phpbb_user_notifications]([user_id]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [no] ON [phpbb_user_notifications]([notify]) ON [PRIMARY]
-GO
-
 
 /*
 	Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 4ceb664cd3..f295664c64 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -430,6 +430,14 @@ CREATE TABLE phpbb_modules (
 );
 
 
+# Table: 'phpbb_notification_types'
+CREATE TABLE phpbb_notification_types (
+	notification_type varbinary(255) DEFAULT '' NOT NULL,
+	notification_type_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	PRIMARY KEY (notification_type, notification_type_enabled)
+);
+
+
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
@@ -438,7 +446,6 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	is_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data blob NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -875,10 +882,7 @@ CREATE TABLE phpbb_user_notifications (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	method varbinary(255) DEFAULT '' NOT NULL,
 	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (item_type, item_id, user_id, method),
-	KEY it (item_type),
-	KEY uid (user_id),
-	KEY no (notify)
+	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 423b97567a..bfba8e5f64 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -430,6 +430,14 @@ CREATE TABLE phpbb_modules (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_notification_types'
+CREATE TABLE phpbb_notification_types (
+	notification_type varchar(255) DEFAULT '' NOT NULL,
+	notification_type_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	PRIMARY KEY (notification_type, notification_type_enabled)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
@@ -438,7 +446,6 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	is_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data text NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -875,10 +882,7 @@ CREATE TABLE phpbb_user_notifications (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	method varchar(255) DEFAULT '' NOT NULL,
 	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (item_type, item_id, user_id, method),
-	KEY it (item_type),
-	KEY uid (user_id),
-	KEY no (notify)
+	PRIMARY KEY (item_type, item_id, user_id, method)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index b3ea3c7d5e..aae49afd70 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -840,6 +840,17 @@ END;
 /
 
 
+/*
+	Table: 'phpbb_notification_types'
+*/
+CREATE TABLE phpbb_notification_types (
+	notification_type varchar2(255) DEFAULT '' ,
+	notification_type_enabled number(1) DEFAULT '1' NOT NULL,
+	CONSTRAINT pk_phpbb_notification_types PRIMARY KEY (notification_type, notification_type_enabled)
+)
+/
+
+
 /*
 	Table: 'phpbb_notifications'
 */
@@ -850,7 +861,6 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	unread number(1) DEFAULT '1' NOT NULL,
-	is_enabled number(1) DEFAULT '1' NOT NULL,
 	time number(11) DEFAULT '1' NOT NULL,
 	data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
@@ -1642,12 +1652,6 @@ CREATE TABLE phpbb_user_notifications (
 )
 /
 
-CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type)
-/
-CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id)
-/
-CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications (notify)
-/
 
 /*
 	Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index e43b64468d..05533fc731 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -596,6 +596,16 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
 CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);
 CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);
 
+/*
+	Table: 'phpbb_notification_types'
+*/
+CREATE TABLE phpbb_notification_types (
+	notification_type varchar(255) DEFAULT '' NOT NULL,
+	notification_type_enabled INT2 DEFAULT '1' NOT NULL CHECK (notification_type_enabled >= 0),
+	PRIMARY KEY (notification_type, notification_type_enabled)
+);
+
+
 /*
 	Table: 'phpbb_notifications'
 */
@@ -608,7 +618,6 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	unread INT2 DEFAULT '1' NOT NULL CHECK (unread >= 0),
-	is_enabled INT2 DEFAULT '1' NOT NULL CHECK (is_enabled >= 0),
 	time INT4 DEFAULT '1' NOT NULL CHECK (time >= 0),
 	data varchar(4000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (notification_id)
@@ -1128,9 +1137,6 @@ CREATE TABLE phpbb_user_notifications (
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
-CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type);
-CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id);
-CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications (notify);
 
 /*
 	Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index e3b556668d..fa61e4104f 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -417,6 +417,14 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
 CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);
 CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);
 
+# Table: 'phpbb_notification_types'
+CREATE TABLE phpbb_notification_types (
+	notification_type varchar(255) NOT NULL DEFAULT '',
+	notification_type_enabled INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	PRIMARY KEY (notification_type, notification_type_enabled)
+);
+
+
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id INTEGER PRIMARY KEY NOT NULL ,
@@ -425,7 +433,6 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	is_enabled INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	time INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	data text(65535) NOT NULL DEFAULT ''
 );
@@ -851,9 +858,6 @@ CREATE TABLE phpbb_user_notifications (
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
-CREATE INDEX phpbb_user_notifications_it ON phpbb_user_notifications (item_type);
-CREATE INDEX phpbb_user_notifications_uid ON phpbb_user_notifications (user_id);
-CREATE INDEX phpbb_user_notifications_no ON phpbb_user_notifications (notify);
 
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
-- 
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/develop/create_schema_files.php                  | 16 ++++++++--------
 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 +-
 .../includes/notification/type/report_post_closed.php  |  2 +-
 phpBB/includes/notification/type/topic.php             |  4 ++--
 phpBB/includes/notification/type/topic_in_queue.php    |  2 +-
 phpBB/install/database_update.php                      | 18 +++++++++---------
 phpBB/install/schemas/firebird_schema.sql              |  2 +-
 phpBB/install/schemas/mssql_schema.sql                 |  2 +-
 phpBB/install/schemas/mysql_40_schema.sql              |  2 +-
 phpBB/install/schemas/mysql_41_schema.sql              |  2 +-
 phpBB/install/schemas/oracle_schema.sql                |  2 +-
 phpBB/install/schemas/postgres_schema.sql              |  2 +-
 phpBB/install/schemas/sqlite_schema.sql                |  2 +-
 21 files changed, 45 insertions(+), 46 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 10306c9124..999ace57d7 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1305,14 +1305,14 @@ function get_schema_struct()
 
 	$schema_data['phpbb_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),
-			'unread'			=> array('BOOL', 1),
-			'time'				=> array('TIMESTAMP', 1),
-			'data'				=> array('TEXT_UNI', ''),
+			'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),
+			'unread'						=> array('BOOL', 1),
+			'notification_time'				=> array('TIMESTAMP', 1),
+			'data'							=> array('TEXT_UNI', ''),
 		),
 		'PRIMARY_KEY'		=> 'notification_id',
 		'KEYS'				=> array(
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;
 	}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ae810e1022..614f41f139 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1192,15 +1192,15 @@ function database_update_info()
 				),
 				NOTIFICATIONS_TABLE		=> 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),
-						'unread'			=> array('BOOL', 1),
-						'is_enabled'		=> array('BOOL', 1),
-						'time'				=> array('TIMESTAMP', 1),
-						'data'				=> array('TEXT_UNI', ''),
+						'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),
+						'unread'						=> array('BOOL', 1),
+						'is_enabled'					=> array('BOOL', 1),
+						'notification_time'				=> array('TIMESTAMP', 1),
+						'data'			   				=> array('TEXT_UNI', ''),
 					),
 					'PRIMARY_KEY'		=> 'notification_id',
 					'KEYS'				=> array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 5f7d23e411..8f45265c17 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -635,7 +635,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
 	unread INTEGER DEFAULT 1 NOT NULL,
-	time INTEGER DEFAULT 1 NOT NULL,
+	notification_time INTEGER DEFAULT 1 NOT NULL,
 	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
 
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 15529cde38..18f3dd3a04 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -779,7 +779,7 @@ CREATE TABLE [phpbb_notifications] (
 	[item_parent_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[unread] [int] DEFAULT (1) NOT NULL ,
-	[time] [int] DEFAULT (1) NOT NULL ,
+	[notification_time] [int] DEFAULT (1) NOT NULL ,
 	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index f295664c64..140cb354a7 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -446,7 +446,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
+	notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data blob NOT NULL,
 	PRIMARY KEY (notification_id),
 	KEY item_ident (item_type, item_id),
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index bfba8e5f64..913968c174 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -446,7 +446,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
+	notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data text NOT NULL,
 	PRIMARY KEY (notification_id),
 	KEY item_ident (item_type, item_id),
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index aae49afd70..8a6e9fffc6 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -861,7 +861,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	unread number(1) DEFAULT '1' NOT NULL,
-	time number(11) DEFAULT '1' NOT NULL,
+	notification_time number(11) DEFAULT '1' NOT NULL,
 	data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
 )
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 05533fc731..6d9a910912 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -618,7 +618,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	unread INT2 DEFAULT '1' NOT NULL CHECK (unread >= 0),
-	time INT4 DEFAULT '1' NOT NULL CHECK (time >= 0),
+	notification_time INT4 DEFAULT '1' NOT NULL CHECK (notification_time >= 0),
 	data varchar(4000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (notification_id)
 );
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index fa61e4104f..7f93aaf0c7 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -433,7 +433,7 @@ CREATE TABLE phpbb_notifications (
 	item_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	time INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	notification_time INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	data text(65535) NOT NULL DEFAULT ''
 );
 
-- 
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/develop/create_schema_files.php         |  4 ++--
 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 +-
 phpBB/install/database_update.php             |  4 ++--
 phpBB/install/schemas/firebird_schema.sql     |  4 ++--
 phpBB/install/schemas/mssql_schema.sql        |  4 ++--
 phpBB/install/schemas/mysql_40_schema.sql     |  4 ++--
 phpBB/install/schemas/mysql_41_schema.sql     |  4 ++--
 phpBB/install/schemas/oracle_schema.sql       |  4 ++--
 phpBB/install/schemas/postgres_schema.sql     |  4 ++--
 phpBB/install/schemas/sqlite_schema.sql       |  4 ++--
 15 files changed, 41 insertions(+), 34 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 999ace57d7..b3c10b1cfa 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1310,14 +1310,14 @@ function get_schema_struct()
 			'item_id'						=> array('UINT', 0),
 			'item_parent_id'				=> array('UINT', 0),
 			'user_id'						=> array('UINT', 0),
-			'unread'						=> array('BOOL', 1),
+			'notification_read'				=> array('BOOL', 0),
 			'notification_time'				=> array('TIMESTAMP', 1),
 			'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', 'unread')),
+			'user'				=> array('INDEX', array('user_id', 'notification_read')),
 		),
 	);
 
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);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 614f41f139..364eca9267 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1197,7 +1197,7 @@ function database_update_info()
 						'item_id'		  				=> array('UINT', 0),
 						'item_parent_id'   				=> array('UINT', 0),
 						'user_id'						=> array('UINT', 0),
-						'unread'						=> array('BOOL', 1),
+						'notification_read'				=> array('BOOL', 0),
 						'is_enabled'					=> array('BOOL', 1),
 						'notification_time'				=> array('TIMESTAMP', 1),
 						'data'			   				=> array('TEXT_UNI', ''),
@@ -1205,7 +1205,7 @@ function database_update_info()
 					'PRIMARY_KEY'		=> 'notification_id',
 					'KEYS'				=> array(
 						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
-						'user'				=> array('INDEX', array('user_id', 'unread')),
+						'user'				=> array('INDEX', array('user_id', 'notification_read')),
 					),
 				),
 				USER_NOTIFICATIONS_TABLE	=> array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 8f45265c17..bb4e413ba1 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -634,7 +634,7 @@ CREATE TABLE phpbb_notifications (
 	item_id INTEGER DEFAULT 0 NOT NULL,
 	item_parent_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
-	unread INTEGER DEFAULT 1 NOT NULL,
+	notification_read INTEGER DEFAULT 0 NOT NULL,
 	notification_time INTEGER DEFAULT 1 NOT NULL,
 	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
@@ -642,7 +642,7 @@ CREATE TABLE phpbb_notifications (
 ALTER TABLE phpbb_notifications ADD PRIMARY KEY (notification_id);;
 
 CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications(item_type, item_id);;
-CREATE INDEX phpbb_notifications_user ON phpbb_notifications(user_id, unread);;
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications(user_id, notification_read);;
 
 CREATE GENERATOR phpbb_notifications_gen;;
 SET GENERATOR phpbb_notifications_gen TO 0;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 18f3dd3a04..1fa3616857 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -778,7 +778,7 @@ CREATE TABLE [phpbb_notifications] (
 	[item_id] [int] DEFAULT (0) NOT NULL ,
 	[item_parent_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[unread] [int] DEFAULT (1) NOT NULL ,
+	[notification_read] [int] DEFAULT (0) NOT NULL ,
 	[notification_time] [int] DEFAULT (1) NOT NULL ,
 	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
@@ -794,7 +794,7 @@ GO
 CREATE  INDEX [item_ident] ON [phpbb_notifications]([item_type], [item_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [user] ON [phpbb_notifications]([user_id], [unread]) ON [PRIMARY]
+CREATE  INDEX [user] ON [phpbb_notifications]([user_id], [notification_read]) ON [PRIMARY]
 GO
 
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 140cb354a7..8163b7a051 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -445,12 +445,12 @@ CREATE TABLE phpbb_notifications (
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	notification_read tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data blob NOT NULL,
 	PRIMARY KEY (notification_id),
 	KEY item_ident (item_type, item_id),
-	KEY user (user_id, unread)
+	KEY user (user_id, notification_read)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 913968c174..6654734ab8 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -445,12 +445,12 @@ CREATE TABLE phpbb_notifications (
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	notification_read tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data text NOT NULL,
 	PRIMARY KEY (notification_id),
 	KEY item_ident (item_type, item_id),
-	KEY user (user_id, unread)
+	KEY user (user_id, notification_read)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8a6e9fffc6..a65fe63167 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -860,7 +860,7 @@ CREATE TABLE phpbb_notifications (
 	item_id number(8) DEFAULT '0' NOT NULL,
 	item_parent_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	unread number(1) DEFAULT '1' NOT NULL,
+	notification_read number(1) DEFAULT '0' NOT NULL,
 	notification_time number(11) DEFAULT '1' NOT NULL,
 	data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
@@ -869,7 +869,7 @@ CREATE TABLE phpbb_notifications (
 
 CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id)
 /
-CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, unread)
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, notification_read)
 /
 
 CREATE SEQUENCE phpbb_notifications_seq
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 6d9a910912..504ffe8282 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -617,14 +617,14 @@ CREATE TABLE phpbb_notifications (
 	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
 	item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
-	unread INT2 DEFAULT '1' NOT NULL CHECK (unread >= 0),
+	notification_read INT2 DEFAULT '0' NOT NULL CHECK (notification_read >= 0),
 	notification_time INT4 DEFAULT '1' NOT NULL CHECK (notification_time >= 0),
 	data varchar(4000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (notification_id)
 );
 
 CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id);
-CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, unread);
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, notification_read);
 
 /*
 	Table: 'phpbb_poll_options'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 7f93aaf0c7..836d0a0bd0 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -432,13 +432,13 @@ CREATE TABLE phpbb_notifications (
 	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	item_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	notification_read INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	notification_time INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	data text(65535) NOT NULL DEFAULT ''
 );
 
 CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id);
-CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, unread);
+CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, notification_read);
 
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
-- 
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/develop/create_schema_files.php     |  2 +-
 phpBB/includes/notification/type/base.php | 10 +++++-----
 phpBB/includes/notification/type/post.php |  6 +++---
 phpBB/install/database_update.php         |  2 +-
 phpBB/install/schemas/firebird_schema.sql |  2 +-
 phpBB/install/schemas/mssql_schema.sql    |  2 +-
 phpBB/install/schemas/mysql_40_schema.sql |  2 +-
 phpBB/install/schemas/mysql_41_schema.sql |  2 +-
 phpBB/install/schemas/oracle_schema.sql   |  2 +-
 phpBB/install/schemas/postgres_schema.sql |  2 +-
 phpBB/install/schemas/sqlite_schema.sql   |  2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index b3c10b1cfa..9ffd989597 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1312,7 +1312,7 @@ function get_schema_struct()
 			'user_id'						=> array('UINT', 0),
 			'notification_read'				=> array('BOOL', 0),
 			'notification_time'				=> array('TIMESTAMP', 1),
-			'data'							=> array('TEXT_UNI', ''),
+			'notification_data'				=> array('TEXT_UNI', ''),
 		),
 		'PRIMARY_KEY'		=> 'notification_id',
 		'KEYS'				=> array(
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)));
 	}
 }
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 364eca9267..ed1c6ee847 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1200,7 +1200,7 @@ function database_update_info()
 						'notification_read'				=> array('BOOL', 0),
 						'is_enabled'					=> array('BOOL', 1),
 						'notification_time'				=> array('TIMESTAMP', 1),
-						'data'			   				=> array('TEXT_UNI', ''),
+						'notification_data'			   	=> array('TEXT_UNI', ''),
 					),
 					'PRIMARY_KEY'		=> 'notification_id',
 					'KEYS'				=> array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index bb4e413ba1..260b75947a 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -636,7 +636,7 @@ CREATE TABLE phpbb_notifications (
 	user_id INTEGER DEFAULT 0 NOT NULL,
 	notification_read INTEGER DEFAULT 0 NOT NULL,
 	notification_time INTEGER DEFAULT 1 NOT NULL,
-	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
+	notification_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_notifications ADD PRIMARY KEY (notification_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 1fa3616857..aa9766f91f 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -780,7 +780,7 @@ CREATE TABLE [phpbb_notifications] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[notification_read] [int] DEFAULT (0) NOT NULL ,
 	[notification_time] [int] DEFAULT (1) NOT NULL ,
-	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
+	[notification_data] [varchar] (4000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 8163b7a051..ebadc93f05 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -447,7 +447,7 @@ CREATE TABLE phpbb_notifications (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	notification_read tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL,
-	data blob NOT NULL,
+	notification_data blob NOT NULL,
 	PRIMARY KEY (notification_id),
 	KEY item_ident (item_type, item_id),
 	KEY user (user_id, notification_read)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 6654734ab8..ff46c13fef 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -447,7 +447,7 @@ CREATE TABLE phpbb_notifications (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	notification_read tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL,
-	data text NOT NULL,
+	notification_data text NOT NULL,
 	PRIMARY KEY (notification_id),
 	KEY item_ident (item_type, item_id),
 	KEY user (user_id, notification_read)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index a65fe63167..7a285c6d55 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -862,7 +862,7 @@ CREATE TABLE phpbb_notifications (
 	user_id number(8) DEFAULT '0' NOT NULL,
 	notification_read number(1) DEFAULT '0' NOT NULL,
 	notification_time number(11) DEFAULT '1' NOT NULL,
-	data clob DEFAULT '' ,
+	notification_data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 504ffe8282..1035dd1ce8 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -619,7 +619,7 @@ CREATE TABLE phpbb_notifications (
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	notification_read INT2 DEFAULT '0' NOT NULL CHECK (notification_read >= 0),
 	notification_time INT4 DEFAULT '1' NOT NULL CHECK (notification_time >= 0),
-	data varchar(4000) DEFAULT '' NOT NULL,
+	notification_data varchar(4000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (notification_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 836d0a0bd0..3586a9040d 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -434,7 +434,7 @@ CREATE TABLE phpbb_notifications (
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	notification_read INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	notification_time INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	data text(65535) NOT NULL DEFAULT ''
+	notification_data text(65535) NOT NULL DEFAULT ''
 );
 
 CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id);
-- 
cgit v1.2.1


From 8dc2f69e8a1900b4560c3a982fc9df60511055d8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 21:17:37 -0600
Subject: [ticket/11103] remove is_enabled

PHPBB3-11103
---
 phpBB/install/database_update.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ed1c6ee847..6a90c51109 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1198,7 +1198,6 @@ function database_update_info()
 						'item_parent_id'   				=> array('UINT', 0),
 						'user_id'						=> array('UINT', 0),
 						'notification_read'				=> array('BOOL', 0),
-						'is_enabled'					=> array('BOOL', 1),
 						'notification_time'				=> array('TIMESTAMP', 1),
 						'notification_data'			   	=> array('TEXT_UNI', ''),
 					),
-- 
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')

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')

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 38e146c8bd3d3822a8c3e6c25bbf808ba4b6545b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 23 Apr 2011 19:27:07 -0400
Subject: [feature/events] Added overall_header_head ledge.

This will be used by the trivial-css mod.

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 ++
 phpBB/styles/subsilver2/template/overall_header.html | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3e00827235..c7aac764a5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,6 +84,8 @@
 	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
 <![endif]-->
 
+<!-- RUNHOOKS overall_header_head -->
+
 </head>
 
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 4ed69c56aa..a19e2c95bc 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -129,6 +129,9 @@ function marklist(id, name, state)
 
 // ]]>
 </script>
+
+<!-- RUNHOOKS overall_header_head -->
+
 </head>
 <body class="{S_CONTENT_DIRECTION}">
 
-- 
cgit v1.2.1


From c83c5c7f473b8b7211560a826b84800831167f0b Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 13 Mar 2012 13:22:58 +0000
Subject: [feature/events] Add overall_header_nav template ledge

Adds a ledge next to the FAQ button for extensions to put links on the navigation bar

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index c7aac764a5..aa931293d6 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -147,6 +147,7 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
+				<!-- RUNHOOKS overall_header_nav -->
 				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
-- 
cgit v1.2.1


From fc2ebc34dfb940bece3c89b8c3ffb5f0d81bca39 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 13 Mar 2012 13:26:24 +0000
Subject: [feature/events] Adds overall_footer_copyright template ledge

This allows people to add copyright information to the footer

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html  | 3 ++-
 phpBB/styles/subsilver2/template/overall_footer.html | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 7e43ff2d0a..6deb19ed9a 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -19,7 +19,8 @@
 		</div>
 	</div>
 
-	<div class="copyright">{CREDIT_LINE}
+	<div class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 24c6f8105c..7a23596cab 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,8 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright">{CREDIT_LINE}
+	<span class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+		{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
-- 
cgit v1.2.1


From f2ee104291641302434d6e2ce142ec14bb025932 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 13 Mar 2012 13:41:49 +0000
Subject: [feature/events] Add posting_editor_options template ledge

This is needed for options for posts and is used by topic as link MOD

PHPBB3-9550
---
 phpBB/styles/prosilver/template/posting_editor.html | 1 +
 phpBB/styles/subsilver2/template/posting_body.html  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index be45993cef..776997eb91 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -213,6 +213,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
+			<!-- RUNHOOKS posting_editor_options -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 4c9df6f060..88d001946f 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -257,6 +257,7 @@
 	</td>
 	<td class="row2">
 		<table cellpadding="1">
+		<!-- RUNHOOKS posting_editor_options -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
-- 
cgit v1.2.1


From bdd3e692fb48a8b951f9c82e410c0ef494cd89ec Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 14 Mar 2012 17:58:16 +0000
Subject: [feature/events] Adding overall_header_index_link template ledge

Used by board3portal

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index aa931293d6..ff32338a98 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -123,7 +123,9 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
+					<!-- RUNHOOKS overall_header_index_link -->
+					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
-- 
cgit v1.2.1


From 8534cbcc8470f5d9b916a58dcdcfcf408c3e516e Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 14 Mar 2012 17:58:57 +0000
Subject: [feature/events] Adding overall_footer_index_link template ledge

Used by board3portal

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 6deb19ed9a..56dd7ae27a 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -6,7 +6,8 @@
 		<div class="inner">
 
 		<ul class="linklist">
-			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
+			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
+				<!-- RUNHOOKS overall_footer_index_link --></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF U_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="<!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF -->
-- 
cgit v1.2.1


From 9e4043ff640cabd3ad187022bb6b8a1e92a3efae Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 14 Mar 2012 18:10:10 +0000
Subject: [feature/events] Adding forumlist_body_last_post template ledge

Used by NV Advanced Last Topic Titles

PHPBB3-9550
---
 phpBB/styles/prosilver/template/forumlist_body.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 8762cb0c2e..3315aad718 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -49,7 +49,9 @@
 					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
+						<!-- IF forumrow.LAST_POST_TIME --><dfn>
+						<!-- RUNHOOKS forumlist_body_last_post -->
+						{L_LAST_POST}</dfn>
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
-- 
cgit v1.2.1


From 18af6dd664ebb272e4c68b3a9d70359eb0eaa00e Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 11:34:36 +0000
Subject: [feature/events] Adding index_body_info_blocks template ledge

PHPBB3-9550
---
 phpBB/styles/prosilver/template/index_body.html  | 2 ++
 phpBB/styles/subsilver2/template/index_body.html | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 6babbf5997..adfdfdaf56 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -29,6 +29,8 @@
 	</form>
 <!-- ENDIF -->
 
+<!-- RUNHOOKS index_body_info_blocks -->
+
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
 	<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index af2cefef7a..6861ae799a 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -18,6 +18,8 @@
 
 <!-- INCLUDE breadcrumbs.html -->
 
+<!-- RUNHOOKS index_body_info_blocks -->
+
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
 
-- 
cgit v1.2.1


From 244978cdb4d089fe431341b898eb45590035f2c0 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 11:54:34 +0000
Subject: [feature/events] Adding overall_footer_end template ledge

Helpful for JS scripts that need to work with the DOM.

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html  | 1 +
 phpBB/styles/subsilver2/template/overall_footer.html | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 56dd7ae27a..c78094ec79 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -57,5 +57,6 @@
 <!-- INCLUDEJS template/ajax.js -->
 {SCRIPTS}
 
+<!-- RUNHOOKS overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 7a23596cab..781cdd6b0b 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -13,5 +13,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
+<!-- RUNHOOKS overall_footer_end -->
 </body>
 </html>
-- 
cgit v1.2.1


From bc2f777b2719e0054350768ca958581f53f1d0c8 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 11:57:16 +0000
Subject: [feature/events] Adding simple_footer_end template ledge

PHPBB3-9550
---
 phpBB/styles/prosilver/template/simple_footer.html  | 1 +
 phpBB/styles/subsilver2/template/simple_footer.html | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 897e50ced7..e86db12d54 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,5 +10,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
+<!-- RUNHOOKS simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 38a86c5001..3ef060fad7 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -9,5 +9,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
+<!-- RUNHOOKS simple_footer_end -->
 </body>
 </html>
-- 
cgit v1.2.1


From e865ee1bef70ecc711ba4b7b4b9a818befbf0e23 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 18:44:50 +0000
Subject: [feature/events] Adding overall_head_head_body template ledge

Required by ReIMG Resizer

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index ff32338a98..fc0c391d9d 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -87,7 +87,7 @@
 <!-- RUNHOOKS overall_header_head -->
 
 </head>
-
+<!-- RUNHOOKS overall_head_head_body -->
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
 <div id="wrap">
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index a19e2c95bc..7f60d7012d 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -133,6 +133,7 @@ function marklist(id, name, state)
 <!-- RUNHOOKS overall_header_head -->
 
 </head>
+<!-- RUNHOOKS overall_head_head_body -->
 <body class="{S_CONTENT_DIRECTION}">
 
 <a name="top"></a>
-- 
cgit v1.2.1


From 9b4ea946300815d4cb63181213a5e29cf7714b9d Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 18:48:16 +0000
Subject: [feature/events] Adding ucp_pm_viewmessage_head_body template ledge

Needed by ReIMG Resizer

PHPBB3-9550
---
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index a024a170a7..a70e33b619 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-
+<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index fd0244a79d..0ecf36709d 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -55,6 +55,7 @@ hr.sep {
 </style>
 
 </head>
+<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From 47c183438223d5cb85a3e4edc6e57da63b788093 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 18:48:46 +0000
Subject: [feature/events] Adding viewtopic_print_head_body template ledge

Needed by ReIMG Resizer

PHPBB3-9550
---
 phpBB/styles/prosilver/template/viewtopic_print.html  | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 54676279d2..ff65f6f91e 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-
+<!-- RUNHOOKS viewtopic_print_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 78fab17d02..100157e704 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -67,6 +67,7 @@ hr.sep {
 </style>
 
 </head>
+<!-- RUNHOOKS viewtopic_print_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From 6ca65226e3e3b0ccdac1cf2f82aa5aa468e1e0e2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 16 Mar 2012 10:10:05 +0100
Subject: [feature/events] Fix forumlist_body_last_post in prosilver

Used by NV Advanced Last Topic Titles

PHPBB3-9550
---
 phpBB/styles/prosilver/template/forumlist_body.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 3315aad718..8963da8d1e 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -49,9 +49,8 @@
 					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>
-						<!-- RUNHOOKS forumlist_body_last_post -->
-						{L_LAST_POST}</dfn>
+						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
+						<!-- LEDGE forumlist_body_last_post -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
-- 
cgit v1.2.1


From c0f900f69565583ff871e4cdefa30083147d2bc9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 16 Mar 2012 10:13:43 +0100
Subject: [feature/events] Add forumlist_body_last_post in subsilver2

Used by NV Advanced Last Topic Titles

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index ad505885f6..972ddeb513 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -63,6 +63,7 @@
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
+					<!-- LEDGE forumlist_body_last_post -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From 8dcc2cded68efea064ac0ae7dd2a75db2b48651e Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 20 Mar 2012 07:08:59 +0000
Subject: [feature/events] Rename RUNHOOKS to EVENT

Apply change to existing ledges

PHPBB3-9550
---
 phpBB/styles/prosilver/template/index_body.html                | 2 +-
 phpBB/styles/prosilver/template/overall_footer.html            | 6 +++---
 phpBB/styles/prosilver/template/overall_header.html            | 8 ++++----
 phpBB/styles/prosilver/template/posting_editor.html            | 2 +-
 phpBB/styles/prosilver/template/simple_footer.html             | 2 +-
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html  | 2 +-
 phpBB/styles/prosilver/template/viewtopic_print.html           | 2 +-
 phpBB/styles/subsilver2/template/index_body.html               | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html           | 4 ++--
 phpBB/styles/subsilver2/template/overall_header.html           | 4 ++--
 phpBB/styles/subsilver2/template/posting_body.html             | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html            | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 2 +-
 14 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index adfdfdaf56..b44c033a25 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -29,7 +29,7 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- RUNHOOKS index_body_info_blocks -->
+<!-- EVENT index_body_info_blocks -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index c78094ec79..6861b90381 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -7,7 +7,7 @@
 
 		<ul class="linklist">
 			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
-				<!-- RUNHOOKS overall_footer_index_link --></li>
+				<!-- EVENT overall_footer_index_link --></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF U_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="<!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF -->
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+	<div class="copyright"><!-- EVENT overall_footer_copyright -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
@@ -57,6 +57,6 @@
 <!-- INCLUDEJS template/ajax.js -->
 {SCRIPTS}
 
-<!-- RUNHOOKS overall_footer_end -->
+<!-- EVENT overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index fc0c391d9d..2440e7a4e3 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,10 +84,10 @@
 	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
 <![endif]-->
 
-<!-- RUNHOOKS overall_header_head -->
+<!-- EVENT overall_header_head -->
 
 </head>
-<!-- RUNHOOKS overall_head_head_body -->
+<!-- EVENT overall_head_head_body -->
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
 <div id="wrap">
@@ -124,7 +124,7 @@
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
 				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
-					<!-- RUNHOOKS overall_header_index_link -->
+					<!-- EVENT overall_header_index_link -->
 					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
@@ -149,7 +149,7 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
-				<!-- RUNHOOKS overall_header_nav -->
+				<!-- EVENT overall_header_nav -->
 				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 776997eb91..0f3522bb15 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -213,7 +213,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
-			<!-- RUNHOOKS posting_editor_options -->
+			<!-- EVENT posting_editor_options -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index e86db12d54..b7767a3a98 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,6 +10,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS simple_footer_end -->
+<!-- EVENT simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index a70e33b619..a53c0d6e8f 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
+<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index ff65f6f91e..7cf0124626 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-<!-- RUNHOOKS viewtopic_print_head_body -->
+<!-- EVENT viewtopic_print_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index 6861ae799a..8ceb2921eb 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -18,7 +18,7 @@
 
 <!-- INCLUDE breadcrumbs.html -->
 
-<!-- RUNHOOKS index_body_info_blocks -->
+<!-- EVENT index_body_info_blocks -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 781cdd6b0b..9dd9681b80 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,7 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+	<span class="copyright"><!-- EVENT overall_footer_copyright -->
 		{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
@@ -13,6 +13,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS overall_footer_end -->
+<!-- EVENT overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 7f60d7012d..b64bd773f9 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -130,10 +130,10 @@ function marklist(id, name, state)
 // ]]>
 </script>
 
-<!-- RUNHOOKS overall_header_head -->
+<!-- EVENT overall_header_head -->
 
 </head>
-<!-- RUNHOOKS overall_head_head_body -->
+<!-- EVENT overall_head_head_body -->
 <body class="{S_CONTENT_DIRECTION}">
 
 <a name="top"></a>
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 88d001946f..0352baca87 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -257,7 +257,7 @@
 	</td>
 	<td class="row2">
 		<table cellpadding="1">
-		<!-- RUNHOOKS posting_editor_options -->
+		<!-- EVENT posting_editor_options -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 3ef060fad7..bbbc0aaff8 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -9,6 +9,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS simple_footer_end -->
+<!-- EVENT simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 0ecf36709d..fe64b4e402 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -55,7 +55,7 @@ hr.sep {
 </style>
 
 </head>
-<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
+<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 100157e704..8fe7d97524 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -67,7 +67,7 @@ hr.sep {
 </style>
 
 </head>
-<!-- RUNHOOKS viewtopic_print_head_body -->
+<!-- EVENT viewtopic_print_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From 99cd766de0d49f7736d019dd1ccc2ccda7886b16 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 20 Mar 2012 11:40:04 +0000
Subject: [feature/events] Remove overall_head_head_body template ledge

PHPBB3-9550

Conflicts:

	phpBB/styles/prosilver/template/overall_header.html
---
 phpBB/styles/prosilver/template/overall_header.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2440e7a4e3..3a727b71e4 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -87,7 +87,6 @@
 <!-- EVENT overall_header_head -->
 
 </head>
-<!-- EVENT overall_head_head_body -->
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
 <div id="wrap">
-- 
cgit v1.2.1


From 8012cd1d1178724ea4b0b4633156e87420de8b30 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 20 Mar 2012 11:41:42 +0000
Subject: [feature/events] Move template ledges above </head> tag

PHPBB3-9550

Conflicts:

	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
	phpBB/styles/prosilver/template/viewtopic_print.html
---
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/prosilver/template/viewtopic_print.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index a53c0d6e8f..ea9bbc9741 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -9,8 +9,8 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
+<!-- EVENT ucp_pm_viewmessage_head -->
 </head>
-<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 7cf0124626..6fd54e3b27 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -9,8 +9,8 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
+<!-- EVENT viewtopic_print_head -->
 </head>
-<!-- EVENT viewtopic_print_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
-- 
cgit v1.2.1


From bc99e69f776061bc98b398e824293ed0cc8dc7e6 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:12:17 +0100
Subject: [feature/events] Add main_notice ACP template event

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 8b591294d4..ced4cd9b90 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -76,6 +76,8 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- EVENT main_notice -->
+
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-- 
cgit v1.2.1


From e6d1b07e2b842226a025241b19ede77eb1b3ef24 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:14:25 +0100
Subject: [feature/events] Add main_actions acp template event

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index ced4cd9b90..83731c6b26 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -204,6 +204,8 @@
 					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
+
+			<!-- EVENT main_actions -->
   		</fieldset>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From 44afff6b746d4070c2100cc186f5347ab7b80a70 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:16:30 +0100
Subject: [feature/events] Adding overall_header_head acp template event

PHPBB3-9550
---
 phpBB/adm/style/overall_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f7902e6d2e..fce560e62e 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -155,6 +155,7 @@ function switch_menu()
 
 // ]]>
 </script>
+<!-- EVENT overall_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 9ba18a21f007fd5a625ac0c2dec60185e8c86994 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:18:20 +0100
Subject: [feature/events] Add overall_footer_end acp template event

PHPBB3-9550
---
 phpBB/adm/style/overall_footer.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 2bc9ee52d7..a2bebb3d85 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -42,5 +42,7 @@
 <!-- INCLUDEJS ajax.js -->
 {SCRIPTS}
 
+<!-- EVENT overall_footer_end -->
+
 </body>
 </html>
-- 
cgit v1.2.1


From c7b2665160ef5e160ed03b9fb45b01f774e19193 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:21:13 +0100
Subject: [feature/events] Add users_overview_options acp template event

PHPBB3-9550
---
 phpBB/adm/style/acp_users_overview.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index b7e3a9822e..f6ad8f3313 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -53,6 +53,7 @@
 	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
+<!-- EVENT users_overview_options -->
 
 <p class="quick">
 	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-- 
cgit v1.2.1


From 6a29de3f1ba39c6080088198bb63c39b9470fe65 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:23:48 +0100
Subject: [feature/events] Adding simple_header_head acp template event

PHPBB3-9550
---
 phpBB/adm/style/simple_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 0ba445ca2a..9c2e11e718 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -101,6 +101,7 @@ function find_username(url)
 
 // ]]>
 </script>
+<!-- EVENT simple_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 1f9b6629643840ae99ba13b06c2d44368c1d0810 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:24:50 +0100
Subject: [feature/events] Adding simple_footer_end acp template event

PHPBB3-9550
---
 phpBB/adm/style/simple_footer.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 1d5c62b0a3..8c6ace203e 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,6 +18,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- EVENT simple_footer_end -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From d913a508a29ee642b13054748dd630de506184a0 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 20:09:56 +0100
Subject: [feature/events] Adding forums_normal_settings acp template ledge

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9a3706c2f0..1df3839467 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,6 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
+		<!-- EVENT forums_normal_settings  -->
 		</fieldset>
 
 		<fieldset>
-- 
cgit v1.2.1


From 243c984908a40b684322fe0c22f35fdb71cfcc5f Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 10 May 2012 18:58:17 +0100
Subject: [feature/events] Add overall_header_index_link_left event

As a portal is of higher presdence than the board, unlike most extensions
it has a link before the board index link. This event satifies that.

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3a727b71e4..47bce7cc36 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -122,7 +122,8 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_left -->
+					<a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
 					<!-- EVENT overall_header_index_link -->
 					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
-- 
cgit v1.2.1


From 2a37f8b50fc967ad1998d539311b01dfbaae02f1 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 19 May 2012 20:09:22 +0100
Subject: [feature/events] Fix index_link_prepend template event

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 47bce7cc36..a6a6c59b60 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -122,7 +122,7 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_left -->
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_prepend -->
 					<a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
 					<!-- EVENT overall_header_index_link -->
 					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
-- 
cgit v1.2.1


From ce7d440a6e81735811ac2f2bdb40c4f17e5d1451 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 19 May 2012 20:12:21 +0100
Subject: [feature/events] Adding viewtopic_topic_title_prepend template event

PHPBB3-9550
---
 phpBB/styles/prosilver/template/viewtopic_body.html  | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_body.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 1b7d78e063..7688898f5c 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 <!-- IF U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
-<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
+<h2><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
 <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index e2834ffa0b..9e6377022a 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -15,7 +15,7 @@
 <!-- ENDIF -->
 
 <div id="pageheader">
-	<h2><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
+	<h2><!-- EVENT viewtopic_topic_title_prepend --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 
 <!-- IF MODERATORS -->
 	<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>
-- 
cgit v1.2.1


From b95549a7a7c9bcac72764f03ab453749b9ba3ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 6 Jun 2012 12:46:50 +0200
Subject: [feature/events] Correct template calls

There where two `<!-- LEDGE ... -->` calls in the templates left.
Replace those two calls with the proper `<!-- EVENT ... -->`
call

PHPBB3-9550
---
 phpBB/styles/prosilver/template/forumlist_body.html  | 2 +-
 phpBB/styles/subsilver2/template/forumlist_body.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 8963da8d1e..7e893e012b 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -50,7 +50,7 @@
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
-						<!-- LEDGE forumlist_body_last_post -->
+						<!-- EVENT forumlist_body_last_post -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 972ddeb513..b44b307f64 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -63,7 +63,7 @@
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
-					<!-- LEDGE forumlist_body_last_post -->
+					<!-- EVENT forumlist_body_last_post -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From 3c8fb03785d14785ab2ddeb2da0aeae48ced1e16 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 22 Jul 2012 21:25:57 +0100
Subject: [feature/events] Adding acp prefix to acp event names

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html         | 2 +-
 phpBB/adm/style/acp_main.html           | 4 ++--
 phpBB/adm/style/acp_users_overview.html | 2 +-
 phpBB/adm/style/overall_footer.html     | 2 +-
 phpBB/adm/style/overall_header.html     | 2 +-
 phpBB/adm/style/simple_footer.html      | 2 +-
 phpBB/adm/style/simple_header.html      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 1df3839467..9b29ba0afc 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,7 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
-		<!-- EVENT forums_normal_settings  -->
+		<!-- EVENT acp_forums_normal_settings  -->
 		</fieldset>
 
 		<fieldset>
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 83731c6b26..d4a4444fef 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -76,7 +76,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- EVENT main_notice -->
+	<!-- EVENT acp_main_notice -->
 
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
@@ -205,7 +205,7 @@
 				</dl>
 			</form>
 
-			<!-- EVENT main_actions -->
+			<!-- EVENT event_main_actions -->
   		</fieldset>
 	<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index f6ad8f3313..9c06ac3c76 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -53,7 +53,7 @@
 	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
-<!-- EVENT users_overview_options -->
+<!-- EVENT acp_users_overview_options -->
 
 <p class="quick">
 	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index a2bebb3d85..f76ad698d3 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -42,7 +42,7 @@
 <!-- INCLUDEJS ajax.js -->
 {SCRIPTS}
 
-<!-- EVENT overall_footer_end -->
+<!-- EVENT acp_overall_footer_end -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index fce560e62e..74b8fe5fb8 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -155,7 +155,7 @@ function switch_menu()
 
 // ]]>
 </script>
-<!-- EVENT overall_header_head -->
+<!-- EVENT acp_overall_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 8c6ace203e..a7d006d15d 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,7 +18,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<!-- EVENT simple_footer_end -->
+<!-- EVENT acp_simple_footer_end -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 9c2e11e718..21532f1425 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -101,7 +101,7 @@ function find_username(url)
 
 // ]]>
 </script>
-<!-- EVENT simple_header_head -->
+<!-- EVENT acp_simple_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From c81d49c9692ac9d53fceaaf6851b172d91cfc073 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:08:54 +0100
Subject: [feature/events] Add append to event name

PHPBB3-9550
---
 phpBB/styles/prosilver/template/forumlist_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 7e893e012b..6d9bb00fa2 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -50,7 +50,7 @@
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
-						<!-- EVENT forumlist_body_last_post -->
+						<!-- EVENT forumlist_body_last_post_append -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
-- 
cgit v1.2.1


From 336f0c5641c3db0524c5a8ec45e1fbde12bd7654 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:10:28 +0100
Subject: [feature/events] Rename event to show location around copyright

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 6861b90381..40c7f11c67 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- EVENT overall_footer_copyright -->
+	<div class="copyright"><!-- EVENT overall_footer_copyright_before -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
-- 
cgit v1.2.1


From 0b351368941e8c23a289263ce7f28446b44bee29 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:13:31 +0100
Subject: [feature/events] Add overall_footer_copyright_after template event

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 40c7f11c67..998910033f 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -23,6 +23,7 @@
 	<div class="copyright"><!-- EVENT overall_footer_copyright_before -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+		<!-- EVENT overall_footer_copyright_after -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 	</div>
-- 
cgit v1.2.1


From a6122228ebae0042e8960349cdeb7b9679517bb0 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:15:34 +0100
Subject: [feature/events] Adjust to use prepend, not before

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 998910033f..cc2f1cbfd6 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- EVENT overall_footer_copyright_before -->
+	<div class="copyright"><!-- EVENT overall_footer_copyright_prepend -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- EVENT overall_footer_copyright_after -->
-- 
cgit v1.2.1


From c527403ef7464d3c322d0ecab57c63311b6a6293 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:16:40 +0100
Subject: [feature/events] Add location (prepend) to event name

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index a6a6c59b60..9ea654b043 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -149,7 +149,7 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
-				<!-- EVENT overall_header_nav -->
+				<!-- EVENT overall_header_nav_prepend -->
 				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
-- 
cgit v1.2.1


From b20e91b87722107f268bca76471d589048e6a524 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 31 Jul 2012 21:29:54 +0200
Subject: [feature/events] Rename event_main_actions to acp_main_actions

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index d4a4444fef..619908242c 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -205,7 +205,7 @@
 				</dl>
 			</form>
 
-			<!-- EVENT event_main_actions -->
+			<!-- EVENT acp_main_actions -->
   		</fieldset>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From de54bccc58dc34366ea52ada1c58914b882c8be0 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 10 Dec 2012 16:00:13 -0500
Subject: [feature/events] There is nothing between head and body.

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/overall_header.html           | 1 -
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 -
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 1 -
 3 files changed, 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index b64bd773f9..c637908c26 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -133,7 +133,6 @@ function marklist(id, name, state)
 <!-- EVENT overall_header_head -->
 
 </head>
-<!-- EVENT overall_head_head_body -->
 <body class="{S_CONTENT_DIRECTION}">
 
 <a name="top"></a>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index fe64b4e402..fd0244a79d 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -55,7 +55,6 @@ hr.sep {
 </style>
 
 </head>
-<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 8fe7d97524..78fab17d02 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -67,7 +67,6 @@ hr.sep {
 </style>
 
 </head>
-<!-- EVENT viewtopic_print_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From ae93bd4e80d918a6db33110f075ad9f1bda0b7bd Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:17:11 -0500
Subject: [feature/events] Append "_append" to acp_forums_normal_settings

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9b29ba0afc..4b21cde418 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,7 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
-		<!-- EVENT acp_forums_normal_settings  -->
+		<!-- EVENT acp_forums_normal_settings_append  -->
 		</fieldset>
 
 		<fieldset>
-- 
cgit v1.2.1


From 530be9106c8133f0cd326e240cd7d88757ce88ab Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:18:36 -0500
Subject: [feature/events] Fix names of events in adm/style/acp_main.html

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 619908242c..b644862ce1 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -76,7 +76,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- EVENT acp_main_notice -->
+	<!-- EVENT acp_main_notice_after -->
 
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
@@ -205,7 +205,7 @@
 				</dl>
 			</form>
 
-			<!-- EVENT acp_main_actions -->
+			<!-- EVENT acp_main_actions_append -->
   		</fieldset>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From cdfac59944bc312cfb64bbe1a39090f57851ff8f Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:19:27 -0500
Subject: [feature/events] Append "_append" to acp_users_overview_options

PHPBB3-9550
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 9c06ac3c76..a8e862c141 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -53,7 +53,7 @@
 	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
-<!-- EVENT acp_users_overview_options -->
+<!-- EVENT acp_users_overview_options_append -->
 
 <p class="quick">
 	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-- 
cgit v1.2.1


From c0652a72361a21289125f1c5e894d35d1c19e835 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:21:49 -0500
Subject: [feature/events] Change _end suffix to _after in
 acp_overall_footer_end

PHPBB3-9550
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index f76ad698d3..2a8b46d458 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -42,7 +42,7 @@
 <!-- INCLUDEJS ajax.js -->
 {SCRIPTS}
 
-<!-- EVENT acp_overall_footer_end -->
+<!-- EVENT acp_overall_footer_after -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From 79ea26409b638d858ca1f75282cc8b741261c80a Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:22:41 -0500
Subject: [feature/events] Append "_append" to acp_overall_header_head

PHPBB3-9550
---
 phpBB/adm/style/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 74b8fe5fb8..8170931221 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -155,7 +155,7 @@ function switch_menu()
 
 // ]]>
 </script>
-<!-- EVENT acp_overall_header_head -->
+<!-- EVENT acp_overall_header_head_append -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 4e8ee1e6b9c6cd254457a45333920607dd488436 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:23:22 -0500
Subject: [feature/events] acp_simple_footer_end -> acp_simple_footer_after

PHPBB3-9550
---
 phpBB/adm/style/simple_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index a7d006d15d..906a9bebed 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,7 +18,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<!-- EVENT acp_simple_footer_end -->
+<!-- EVENT acp_simple_footer_after -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From 11035eb4c4fa778bffda277a3a6b10fff4b99e17 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:23:58 -0500
Subject: [feature/events] Append "_append" to acp_simple_header_head

 PHPBB3-9550
---
 phpBB/adm/style/simple_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 21532f1425..6e0c360600 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -101,7 +101,7 @@ function find_username(url)
 
 // ]]>
 </script>
-<!-- EVENT acp_simple_header_head -->
+<!-- EVENT acp_simple_header_head_append -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 37ac2c9aaedaa3786457192d3397db7bc3cb2543 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:28:04 -0500
Subject: [feature/events] Rename index_body_info_blocks:
 index_body_stat_blocks_before

---
 phpBB/styles/prosilver/template/index_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index b44c033a25..502975ebb6 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -29,7 +29,7 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- EVENT index_body_info_blocks -->
+<!-- EVENT index_body_stat_blocks_before -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
-- 
cgit v1.2.1


From 9015a76cf6fd7148534817550c873ff912b67f42 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:31:49 -0500
Subject: [feature/events] Fix events in prosilver overall_footer.html

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index cc2f1cbfd6..322d745501 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -7,7 +7,7 @@
 
 		<ul class="linklist">
 			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
-				<!-- EVENT overall_footer_index_link --></li>
+				<!-- EVENT overall_footer_breadcrumb_append --></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF U_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="<!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF -->
@@ -20,10 +20,11 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- EVENT overall_footer_copyright_prepend -->
+	<div class="copyright">
+		<!-- EVENT overall_footer_copyright_prepend -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- EVENT overall_footer_copyright_after -->
+		<!-- EVENT overall_footer_copyright_append -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 	</div>
@@ -58,6 +59,6 @@
 <!-- INCLUDEJS template/ajax.js -->
 {SCRIPTS}
 
-<!-- EVENT overall_footer_end -->
+<!-- EVENT overall_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From c6f9e4522bb53f4a6dc943f249fd6a543ad6a6c5 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:34:31 -0500
Subject: [feature/events] Fix events in prosilver overall_header.html

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 9ea654b043..97dbc76e43 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,7 +84,7 @@
 	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
 <![endif]-->
 
-<!-- EVENT overall_header_head -->
+<!-- EVENT overall_header_head_append -->
 
 </head>
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
@@ -122,10 +122,11 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_prepend -->
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF -->
 					<a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
-					<!-- EVENT overall_header_index_link -->
-					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
+					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks -->
+					<!-- EVENT overall_header_breadcrumb_append -->
+				</li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
@@ -149,13 +150,14 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
-				<!-- EVENT overall_header_nav_prepend -->
+				<!-- EVENT overall_header_navigation_prepend -->
 				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
 					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
 					<li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
 				<!-- ENDIF -->
+				<!-- EVENT overall_header_navigation_append -->
 			</ul>
 
 			</div>
-- 
cgit v1.2.1


From d22f171ad0af20bbc02c44a674509371398798b7 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:36:07 -0500
Subject: [feature/events] Append "_prepend" to posting_editor_options

PHPBB3-9550
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 0f3522bb15..8156968098 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -213,7 +213,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
-			<!-- EVENT posting_editor_options -->
+			<!-- EVENT posting_editor_options_prepend -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
-- 
cgit v1.2.1


From d3db491e09028904dbdad95552a52c1266d0c271 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:40:42 -0500
Subject: [feature/events] simple_footer_end -> simple_footer_after

PHPBB3-9550
---
 phpBB/styles/prosilver/template/simple_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index b7767a3a98..ec189304fc 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,6 +10,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- EVENT simple_footer_end -->
+<!-- EVENT simple_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From cb3db020f007e77d5a0bf01dd8cc279cf3634586 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:51:07 -0500
Subject: [feature/events] ucp_pm_viewmessage_print_head_append

PHPBB3-9550
---
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index ea9bbc9741..4a8d3da08a 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -9,7 +9,7 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
-<!-- EVENT ucp_pm_viewmessage_head -->
+<!-- EVENT ucp_pm_viewmessage_print_head_append -->
 </head>
 <body id="phpbb">
 <div id="wrap">
-- 
cgit v1.2.1


From 8526dc14f0e734d9cbf6f0b1f652064caee710f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:52:37 -0500
Subject: [feature/events] Append "_append" to viewtopic_print_head

PHPBB3-9550
---
 phpBB/styles/prosilver/template/viewtopic_print.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 6fd54e3b27..fd0b2dc3e6 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -9,7 +9,7 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
-<!-- EVENT viewtopic_print_head -->
+<!-- EVENT viewtopic_print_head_append -->
 </head>
 <body id="phpbb">
 <div id="wrap">
-- 
cgit v1.2.1


From d25dffbb2def5da74bf41cf8c67fe69eae3bd9df Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:57:18 -0500
Subject: [feature/events] Fix some subsilver2 events

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/breadcrumbs.html    | 3 ++-
 phpBB/styles/subsilver2/template/forumlist_body.html | 2 +-
 phpBB/styles/subsilver2/template/index_body.html     | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html | 6 ++++--
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 49e31c0749..09ee9a8606 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -2,7 +2,8 @@
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
-			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA}>{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA}>{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks -->
+			<!-- EVENT overall_header_breadcrumb_append --></p>
 			<p class="datetime">{S_TIMEZONE}</p>
 		</td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index b44b307f64..36c4b47381 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -63,7 +63,7 @@
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
-					<!-- EVENT forumlist_body_last_post -->
+					<!-- EVENT forumlist_body_last_post_title_after -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index 8ceb2921eb..e07cfda8b3 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -18,7 +18,7 @@
 
 <!-- INCLUDE breadcrumbs.html -->
 
-<!-- EVENT index_body_info_blocks -->
+<!-- EVENT index_body_stat_blocks_before -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 9dd9681b80..1108d69467 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,9 +3,11 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright"><!-- EVENT overall_footer_copyright -->
-		{CREDIT_LINE}
+	<span class="copyright">
+	<!-- EVENT overall_footer_copyright_prepend -->
+	{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+	<!-- EVENT overall_footer_copyright_append -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
 
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index c637908c26..d5fd20f0fe 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -130,7 +130,7 @@ function marklist(id, name, state)
 // ]]>
 </script>
 
-<!-- EVENT overall_header_head -->
+<!-- EVENT overall_header_head_append -->
 
 </head>
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 4ad2747ccf9f7ebbafcb406c19a28592c2efc26c Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:59:23 -0500
Subject: [feature/events] Fix more subsilver2 events

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/posting_body.html  | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 0352baca87..39f8f876ba 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -257,7 +257,7 @@
 	</td>
 	<td class="row2">
 		<table cellpadding="1">
-		<!-- EVENT posting_editor_options -->
+		<!-- EVENT posting_editor_options_prepend -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index bbbc0aaff8..c847bfedcc 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -9,6 +9,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- EVENT simple_footer_end -->
+<!-- EVENT simple_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From 3667ba7a09e725072fd884ae7e85b41962e4dc74 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 17:38:13 -0500
Subject: [feature/events] Fix typo in event name

PHPBB3-9550
---
 phpBB/styles/prosilver/template/forumlist_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 6d9bb00fa2..539ed047c9 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -50,8 +50,8 @@
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
-						<!-- EVENT forumlist_body_last_post_append -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
+							<!-- EVENT forumlist_body_last_post_title_prepend -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
 						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
-- 
cgit v1.2.1


From 8d6a4559bacd8458e241993a195385f83cb7b3c1 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 17:48:15 -0500
Subject: [feature/events] Fix overall_footer_end -> overall_footer_after
 (subsilver2)

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 1108d69467..64e7587023 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -15,6 +15,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- EVENT overall_footer_end -->
+<!-- EVENT overall_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From 636227491d6f6c8e2c2bfef22773de80ac9f71c3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 17:59:41 -0500
Subject: [feature/events] forumlist_body_last_post_title_after -> _prepend
 (subsilver2)

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 36c4b47381..3e30561f3a 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -61,9 +61,9 @@
 			<td class="row2" align="center" nowrap="nowrap">
 				<!-- IF forumrow.LAST_POST_TIME -->
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
+						<!-- EVENT forumlist_body_last_post_title_prepend -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
-					<!-- EVENT forumlist_body_last_post_title_after -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From 52cd0b8a6d2d03dacf81c1ff18e82eab706e85fb Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 18:00:47 -0500
Subject: [feature/events] Add markdown template event documentation file

PHPBB3-9550
---
 phpBB/docs/EVENTS.md | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 phpBB/docs/EVENTS.md

(limited to 'phpBB')

diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md
new file mode 100644
index 0000000000..10073a98dc
--- /dev/null
+++ b/phpBB/docs/EVENTS.md
@@ -0,0 +1,130 @@
+acp_forums_normal_settings_append
+===
+* Location: adm/style/acp_forums.html
+* Purpose: Add settings to forums
+
+acp_main_notice_after
+===
+* Location: adm/style/acp_main.html
+* Purpose: Add notices or other blocks in the ACP below other configuration notices
+
+acp_main_actions_append
+===
+* Location: adm/style/acp_main.html
+* Purpose: Add actions to the ACP main page below the cache purge action
+
+acp_overall_footer_after
+===
+* Location: adm/style/overall_footer.html
+* Purpose: Add content below the footer in the ACP
+
+acp_overall_header_head_append
+===
+* Location: adm/style/overall_header.html
+* Add assets within the <head> tags in the ACP
+
+acp_simple_footer_after
+===
+* Location: adm/style/simple_footer.html
+* Purpose: Add content below the simple footer in the ACP
+
+acp_simple_header_head_append
+===
+* Location: adm/style/overall_header.html
+* Add assets within the <head> tags in the simple header of the ACP
+
+acp_users_overview_options_append
+===
+* Location: adm/style/acp_users.html
+* Purpose: Add options and settings on user overview page
+
+forumlist_body_last_post_prepend
+====
+* Location: styles/prosilver/template/forumlist_body.html
+* Purpose: Add content before the post title of the latest post in a forum on the forum list.
+
+index_body_stat_blocks_before
+===
+* Locations:
+    + styles/prosilver/template/index_body.html
+    + styles/subsilver2/template/index_body.html
+* Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks
+
+overall_footer_breadcrumb_append
+===
+* Location: styles/prosilver/template/overall_footer.html
+* Purpose: Add links to the list of breadcrumbs in the footer
+
+overall_footer_copyright_prepend
+===
+* Locations:
+    + styles/prosilver/template/overall_footer.html
+    + styles/subsilver2/template/overall_footer.html
+* Purpose: Add content before the copyright line
+
+overall_footer_copyright_append
+===
+* Locations:
+    + styles/prosilver/template/overall_footer.html
+    + styles/subsilver2/template/overall_footer.html
+* Purpose: Add content after the copyright line (no new line by default), before the ACP link
+
+overall_footer_after
+===
+* Locations:
+    + styles/prosilver/template/overall_footer.html
+    + styles/subsilver2/template/overall_footer.html
+* Purpose: Add content at the end of the file, directly prior to the </body> tag
+
+overall_header_head_append
+===
+* Locations:
+    + styles/prosilver/template/overall_header.html
+    + styles/subsilver2/template/overall_header.html
+* Purpose: Add asset calls directly before the </head> tag
+
+overall_header_breadcrumb_append
+===
+* Locations:
+    + styles/prosilver/template/overall_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Purpose: Add links to the list of breadcrumbs in the header
+
+overall_header_navigation_prepend
+===
+* Location: styles/prosilver/template/overall_header.html
+* Purpose: Add links before the navigation links in the header
+
+overall_header_navigation_append
+===
+* Location: styles/prosilver/template/overall_header.html
+* Purpose: Add links after the navigation links in the header
+
+posting_editor_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/posting_editor.html
+    + styles/prosilver/template/posting_body.html
+* Purpose: Add posting options on the posting screen
+
+simple_footer_after
+===
+* Location: styles/prosilver/template/simple_footer.html
+* Purpose: Add content directly prior to the </body> tag of the simple footer
+
+ucp_pm_viewmessage_print_head_append
+===
+* Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
+* Purpose: Add asset calls directly before the </head> tag of the Print PM screen
+
+viewtopic_topic_title_prepend
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Purpose: Add content directly before the topic title link on the View topic screen
+
+viewtopic_print_head_append
+===
+* Location: styles/prosilver/template/viewtopic_print.html
+* Purpose: Add asset calls directly before the </head> tag of the Print Topic screen
-- 
cgit v1.2.1


From a686e66c85836c192887a625e6e337cab4b35c3b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 18:16:39 -0500
Subject: [feature/events] Remove extraneous space

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 4b21cde418..d6c06bf6d8 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,7 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
-		<!-- EVENT acp_forums_normal_settings_append  -->
+		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
 
 		<fieldset>
-- 
cgit v1.2.1


From fb60f603ba5ac26004747e976a194ea9d15bcf4b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 18 Dec 2012 00:48:50 +0100
Subject: [ticket/10954] Miscellaneous coding fixes

Remove obsolete or unneeded code. Also fix the behavior of removing
icon_topic_newest by actually removing the link to the first unread post
instead of just removing the icon.

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 41764d5d72..0357b7c59e 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -50,7 +50,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	};
 	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
 	var unreadClassSelectors = '';
-	var classArray = {};
+	var classMap = {};
 	var classNames = [];
 
 	$.each(iconsArray, function(unreadClass, readClass) {
@@ -59,11 +59,8 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			if ((value == '_hot' || value == '_hot_mine') && unreadClass != 'topic_unread') {
 				return true;
 			}
-			var currentClass = {};
-			currentClass[unreadClass + value] = readClass + value;
-			$.extend(classArray, currentClass);
-
-			classNames[classNames.length] = unreadClass + value;
+			classMap[unreadClass + value] = readClass + value;
+			classNames.push(unreadClass + value);
 		});
 	});
 
@@ -71,7 +68,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 
 	$('li.row').find(unreadClassSelectors).each(function() {
 		var $this = $(this);
-		$.each(classArray, function(unreadClass, readClass) {
+		$.each(classMap, function(unreadClass, readClass) {
 			if ($this.hasClass(unreadClass)) {
 				$this.removeClass(unreadClass).addClass(readClass);
 			}
@@ -80,7 +77,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	});
 
 	// Remove link to first unread post
-	$('span.icon_topic_newest').remove();
+	$('a').has('span.icon_topic_newest').remove();
 
 	// Update mark topics read links
 	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
-- 
cgit v1.2.1


From 736b8e44568f98d737c745dd870ff09275c7d106 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 19:16:10 -0500
Subject: [feature/events] Remove HTML tags from markdown so they don't get
 parsed

PHPBB3-9550
---
 phpBB/docs/EVENTS.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md
index 10073a98dc..5072782198 100644
--- a/phpBB/docs/EVENTS.md
+++ b/phpBB/docs/EVENTS.md
@@ -21,7 +21,7 @@ acp_overall_footer_after
 acp_overall_header_head_append
 ===
 * Location: adm/style/overall_header.html
-* Add assets within the <head> tags in the ACP
+* Add assets within the head tags in the ACP
 
 acp_simple_footer_after
 ===
@@ -31,7 +31,7 @@ acp_simple_footer_after
 acp_simple_header_head_append
 ===
 * Location: adm/style/overall_header.html
-* Add assets within the <head> tags in the simple header of the ACP
+* Add assets within the head tags in the simple header of the ACP
 
 acp_users_overview_options_append
 ===
@@ -74,14 +74,14 @@ overall_footer_after
 * Locations:
     + styles/prosilver/template/overall_footer.html
     + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content at the end of the file, directly prior to the </body> tag
+* Purpose: Add content at the end of the file, directly prior to the closing body tag
 
 overall_header_head_append
 ===
 * Locations:
     + styles/prosilver/template/overall_header.html
     + styles/subsilver2/template/overall_header.html
-* Purpose: Add asset calls directly before the </head> tag
+* Purpose: Add asset calls directly before the closing head tag
 
 overall_header_breadcrumb_append
 ===
@@ -110,12 +110,12 @@ posting_editor_options_prepend
 simple_footer_after
 ===
 * Location: styles/prosilver/template/simple_footer.html
-* Purpose: Add content directly prior to the </body> tag of the simple footer
+* Purpose: Add content directly prior to the closing body tag of the simple footer
 
 ucp_pm_viewmessage_print_head_append
 ===
 * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
-* Purpose: Add asset calls directly before the </head> tag of the Print PM screen
+* Purpose: Add asset calls directly before the closing head tag of the Print PM screen
 
 viewtopic_topic_title_prepend
 ===
@@ -127,4 +127,4 @@ viewtopic_topic_title_prepend
 viewtopic_print_head_append
 ===
 * Location: styles/prosilver/template/viewtopic_print.html
-* Purpose: Add asset calls directly before the </head> tag of the Print Topic screen
+* Purpose: Add asset calls directly before the closing head tag of the Print Topic screen
-- 
cgit v1.2.1


From a740ae9c22193d9781a7771cfd633aaeb5fa6f82 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 19:44:30 -0500
Subject: [feature/events] Use ` to escape HTML tags in markdown

PHPBB3-9550
---
 phpBB/docs/EVENTS.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md
index 5072782198..cc03688d0d 100644
--- a/phpBB/docs/EVENTS.md
+++ b/phpBB/docs/EVENTS.md
@@ -21,7 +21,7 @@ acp_overall_footer_after
 acp_overall_header_head_append
 ===
 * Location: adm/style/overall_header.html
-* Add assets within the head tags in the ACP
+* Add assets within the `<head>` tags in the ACP
 
 acp_simple_footer_after
 ===
@@ -31,7 +31,7 @@ acp_simple_footer_after
 acp_simple_header_head_append
 ===
 * Location: adm/style/overall_header.html
-* Add assets within the head tags in the simple header of the ACP
+* Add assets within the `<head>` tags in the simple header of the ACP
 
 acp_users_overview_options_append
 ===
@@ -74,14 +74,14 @@ overall_footer_after
 * Locations:
     + styles/prosilver/template/overall_footer.html
     + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content at the end of the file, directly prior to the closing body tag
+* Purpose: Add content at the end of the file, directly prior to the `</body>` tag
 
 overall_header_head_append
 ===
 * Locations:
     + styles/prosilver/template/overall_header.html
     + styles/subsilver2/template/overall_header.html
-* Purpose: Add asset calls directly before the closing head tag
+* Purpose: Add asset calls directly before the `</head>` tag
 
 overall_header_breadcrumb_append
 ===
@@ -110,12 +110,12 @@ posting_editor_options_prepend
 simple_footer_after
 ===
 * Location: styles/prosilver/template/simple_footer.html
-* Purpose: Add content directly prior to the closing body tag of the simple footer
+* Purpose: Add content directly prior to the `</body>` tag of the simple footer
 
 ucp_pm_viewmessage_print_head_append
 ===
 * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
-* Purpose: Add asset calls directly before the closing head tag of the Print PM screen
+* Purpose: Add asset calls directly before the `</head>` tag of the Print PM screen
 
 viewtopic_topic_title_prepend
 ===
@@ -127,4 +127,4 @@ viewtopic_topic_title_prepend
 viewtopic_print_head_append
 ===
 * Location: styles/prosilver/template/viewtopic_print.html
-* Purpose: Add asset calls directly before the closing head tag of the Print Topic screen
+* Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
-- 
cgit v1.2.1


From 55b5336b022e4bd8f46d7cb2fc56bdc5e4e16974 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 18 Dec 2012 09:55:22 +0100
Subject: [ticket/10954] Make sure to mark subforums unread and add small fixes

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 0357b7c59e..bde7fc2c8f 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -3,12 +3,14 @@
 "use strict";
 
 /**
-* Close popup alert after a small delay
+* Close popup alert after a specified delay
+*
+* @param int Delay in ms until darkenwrapper's click event is triggered
 */
-phpbb.closeDarkenWrapper = function() {
+phpbb.closeDarkenWrapper = function(delay) {
 	setTimeout(function() {
 		$('#darkenwrapper').trigger('click');
-	}, 3000);
+	}, delay);
 }
 
 // This callback will mark all forum icons read
@@ -18,10 +20,10 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var iconsArray = {
 		'forum_unread': 'forum_read',
 		'forum_unread_subforum': 'forum_read_subforum',
-		'forum_unread_locked': 'forum_read_locked'
+		'forum_unread_locked': 'forum_read_locked',
 	};
 
-	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
+	$('li.row').find('dl[class*="forum_unread"]').each(function() {
 		var $this = $(this);
 
 		$.each(iconsArray, function(unreadClass, readClass) {
@@ -32,10 +34,13 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
 	});
 
+	// Mark subforums read
+	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
+
 	// Update mark forums read links
 	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
 
-	phpbb.closeDarkenWrapper();
+	phpbb.closeDarkenWrapper(3000);
 });
 
 // This callback will mark all topic icons read
@@ -82,7 +87,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	// Update mark topics read links
 	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
 
-	phpbb.closeDarkenWrapper();
+	phpbb.closeDarkenWrapper(3000);
 });
 
 // This callback finds the post from the delete link, and removes it.
-- 
cgit v1.2.1


From daf9de689a41dddae97152a21cc9bc894b48666f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 18 Dec 2012 16:24:58 +0100
Subject: [ticket/10954] Add missing semi-colon

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

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index bde7fc2c8f..6637df4c3d 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -11,7 +11,7 @@ phpbb.closeDarkenWrapper = function(delay) {
 	setTimeout(function() {
 		$('#darkenwrapper').trigger('click');
 	}, delay);
-}
+};
 
 // This callback will mark all forum icons read
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
-- 
cgit v1.2.1


From 693778fa0737229d294ee03945ac23d063ad0ba4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 18 Dec 2012 23:37:00 +0100
Subject: [ticket/10803] Show failure message until user dismisses it

PHPBB3-10803
---
 phpBB/assets/javascript/core.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index f7d6688f68..c18bec7035 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -342,12 +342,6 @@ phpbb.ajaxify = function(options) {
 			var alert;
 
 			alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text'));
-
-			setTimeout(function () {
-				dark.fadeOut(phpbb.alert_time, function() {
-					alert.hide();
-				});
-			}, 5000);
 		}
 
 		// If the element is a form, POST must be used and some extra data must
-- 
cgit v1.2.1


From f0c780a45359ceb3eb3fe8ab6b0e5f8c0f07e26f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 19 Dec 2012 13:35:48 +0100
Subject: [ticket/11278] Fix not running queries from db tools in database
 update

The db_tools class is running in return mode, which means that the queries
are not run, but just returned. Therefor the broken tables were not
removed from the database.

PHPBB3-11278
---
 phpBB/install/database_update.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 983b1b46c4..0281aea0b3 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1017,7 +1017,7 @@ function database_update_info()
 *****************************************************************************/
 function change_database_data(&$no_updates, $version)
 {
-	global $db, $errored, $error_ary, $config, $phpbb_root_path, $phpEx;
+	global $db, $db_tools, $errored, $error_ary, $config, $phpbb_root_path, $phpEx;
 
 	switch ($version)
 	{
@@ -1332,8 +1332,6 @@ function change_database_data(&$no_updates, $version)
 				),
 			);
 
-			global $db_tools;
-
 			$statements = $db_tools->perform_schema_changes($changes);
 
 			foreach ($statements as $sql)
@@ -1975,24 +1973,25 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
-			global $db_tools, $table_prefix;
+			global $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',
+				$changes = array(
+					'drop_tables'	=> array(
+						$table_prefix . 'captcha_questions',
+						$table_prefix . 'captcha_answers',
+						$table_prefix . 'qa_confirm',
+					),
 				);
-				foreach ($tables as $table)
+				$statements = $db_tools->perform_schema_changes($changes);
+
+				foreach ($statements as $sql)
 				{
-					if ($db_tools->sql_table_exists($table))
-					{
-						$db_tools->sql_table_drop($table);
-					}
+					_sql($sql, $errored, $error_ary);
 				}
 			}
 
-- 
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')

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 +++--
 phpBB/posting.php                    | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB')

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;
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 76c8100c78..e57f5420f5 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1018,7 +1018,7 @@ if ($submit || $preview || $refresh)
 					$forum_type = (int) $db->sql_fetchfield('forum_type');
 					$db->sql_freeresult($result);
 
-					if ($forum_type != FORUM_POST || !$auth->acl_get('f_post', $to_forum_id) || (!$auth->acl_get('m_approve', $to_forum_id) && !$auth->acl_get('f_noapprove', $to_forum_id)))
+					if ($forum_type != FORUM_POST || !$auth->acl_get('f_post', $to_forum_id) || !$auth->acl_get('f_noapprove', $to_forum_id))
 					{
 						$to_forum_id = 0;
 					}
@@ -1138,8 +1138,9 @@ if ($submit || $preview || $refresh)
 				$captcha->reset();
 			}
 
-			// 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']) && empty($data['force_approved_state'])) || (isset($data['force_approved_state']) && !$data['force_approved_state']))
+			// Check the permissions for post approval.
+			// Moderators must go through post approval like ordinary users.
+			if ((!$auth->acl_get('f_noapprove', $data['forum_id']) && empty($data['force_approved_state'])) || (isset($data['force_approved_state']) && !$data['force_approved_state']))
 			{
 				meta_refresh(10, $redirect_url);
 				$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
-- 
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')

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')

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')

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 7fa3405cd106da529170c34c889ab6f1511e3e6d Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 20 Dec 2012 14:39:07 -0500
Subject: [feature/events] Make EVENTS.md lowercase

PHPBB3-9550
---
 phpBB/docs/EVENTS.md | 130 ---------------------------------------------------
 phpBB/docs/events.md | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 130 deletions(-)
 delete mode 100644 phpBB/docs/EVENTS.md
 create mode 100644 phpBB/docs/events.md

(limited to 'phpBB')

diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md
deleted file mode 100644
index cc03688d0d..0000000000
--- a/phpBB/docs/EVENTS.md
+++ /dev/null
@@ -1,130 +0,0 @@
-acp_forums_normal_settings_append
-===
-* Location: adm/style/acp_forums.html
-* Purpose: Add settings to forums
-
-acp_main_notice_after
-===
-* Location: adm/style/acp_main.html
-* Purpose: Add notices or other blocks in the ACP below other configuration notices
-
-acp_main_actions_append
-===
-* Location: adm/style/acp_main.html
-* Purpose: Add actions to the ACP main page below the cache purge action
-
-acp_overall_footer_after
-===
-* Location: adm/style/overall_footer.html
-* Purpose: Add content below the footer in the ACP
-
-acp_overall_header_head_append
-===
-* Location: adm/style/overall_header.html
-* Add assets within the `<head>` tags in the ACP
-
-acp_simple_footer_after
-===
-* Location: adm/style/simple_footer.html
-* Purpose: Add content below the simple footer in the ACP
-
-acp_simple_header_head_append
-===
-* Location: adm/style/overall_header.html
-* Add assets within the `<head>` tags in the simple header of the ACP
-
-acp_users_overview_options_append
-===
-* Location: adm/style/acp_users.html
-* Purpose: Add options and settings on user overview page
-
-forumlist_body_last_post_prepend
-====
-* Location: styles/prosilver/template/forumlist_body.html
-* Purpose: Add content before the post title of the latest post in a forum on the forum list.
-
-index_body_stat_blocks_before
-===
-* Locations:
-    + styles/prosilver/template/index_body.html
-    + styles/subsilver2/template/index_body.html
-* Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks
-
-overall_footer_breadcrumb_append
-===
-* Location: styles/prosilver/template/overall_footer.html
-* Purpose: Add links to the list of breadcrumbs in the footer
-
-overall_footer_copyright_prepend
-===
-* Locations:
-    + styles/prosilver/template/overall_footer.html
-    + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content before the copyright line
-
-overall_footer_copyright_append
-===
-* Locations:
-    + styles/prosilver/template/overall_footer.html
-    + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content after the copyright line (no new line by default), before the ACP link
-
-overall_footer_after
-===
-* Locations:
-    + styles/prosilver/template/overall_footer.html
-    + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content at the end of the file, directly prior to the `</body>` tag
-
-overall_header_head_append
-===
-* Locations:
-    + styles/prosilver/template/overall_header.html
-    + styles/subsilver2/template/overall_header.html
-* Purpose: Add asset calls directly before the `</head>` tag
-
-overall_header_breadcrumb_append
-===
-* Locations:
-    + styles/prosilver/template/overall_header.html
-    + styles/subsilver2/template/breadcrumbs.html
-* Purpose: Add links to the list of breadcrumbs in the header
-
-overall_header_navigation_prepend
-===
-* Location: styles/prosilver/template/overall_header.html
-* Purpose: Add links before the navigation links in the header
-
-overall_header_navigation_append
-===
-* Location: styles/prosilver/template/overall_header.html
-* Purpose: Add links after the navigation links in the header
-
-posting_editor_options_prepend
-===
-* Locations:
-    + styles/prosilver/template/posting_editor.html
-    + styles/prosilver/template/posting_body.html
-* Purpose: Add posting options on the posting screen
-
-simple_footer_after
-===
-* Location: styles/prosilver/template/simple_footer.html
-* Purpose: Add content directly prior to the `</body>` tag of the simple footer
-
-ucp_pm_viewmessage_print_head_append
-===
-* Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
-* Purpose: Add asset calls directly before the `</head>` tag of the Print PM screen
-
-viewtopic_topic_title_prepend
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-    + styles/subsilver2/template/viewtopic_body.html
-* Purpose: Add content directly before the topic title link on the View topic screen
-
-viewtopic_print_head_append
-===
-* Location: styles/prosilver/template/viewtopic_print.html
-* Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
new file mode 100644
index 0000000000..cc03688d0d
--- /dev/null
+++ b/phpBB/docs/events.md
@@ -0,0 +1,130 @@
+acp_forums_normal_settings_append
+===
+* Location: adm/style/acp_forums.html
+* Purpose: Add settings to forums
+
+acp_main_notice_after
+===
+* Location: adm/style/acp_main.html
+* Purpose: Add notices or other blocks in the ACP below other configuration notices
+
+acp_main_actions_append
+===
+* Location: adm/style/acp_main.html
+* Purpose: Add actions to the ACP main page below the cache purge action
+
+acp_overall_footer_after
+===
+* Location: adm/style/overall_footer.html
+* Purpose: Add content below the footer in the ACP
+
+acp_overall_header_head_append
+===
+* Location: adm/style/overall_header.html
+* Add assets within the `<head>` tags in the ACP
+
+acp_simple_footer_after
+===
+* Location: adm/style/simple_footer.html
+* Purpose: Add content below the simple footer in the ACP
+
+acp_simple_header_head_append
+===
+* Location: adm/style/overall_header.html
+* Add assets within the `<head>` tags in the simple header of the ACP
+
+acp_users_overview_options_append
+===
+* Location: adm/style/acp_users.html
+* Purpose: Add options and settings on user overview page
+
+forumlist_body_last_post_prepend
+====
+* Location: styles/prosilver/template/forumlist_body.html
+* Purpose: Add content before the post title of the latest post in a forum on the forum list.
+
+index_body_stat_blocks_before
+===
+* Locations:
+    + styles/prosilver/template/index_body.html
+    + styles/subsilver2/template/index_body.html
+* Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks
+
+overall_footer_breadcrumb_append
+===
+* Location: styles/prosilver/template/overall_footer.html
+* Purpose: Add links to the list of breadcrumbs in the footer
+
+overall_footer_copyright_prepend
+===
+* Locations:
+    + styles/prosilver/template/overall_footer.html
+    + styles/subsilver2/template/overall_footer.html
+* Purpose: Add content before the copyright line
+
+overall_footer_copyright_append
+===
+* Locations:
+    + styles/prosilver/template/overall_footer.html
+    + styles/subsilver2/template/overall_footer.html
+* Purpose: Add content after the copyright line (no new line by default), before the ACP link
+
+overall_footer_after
+===
+* Locations:
+    + styles/prosilver/template/overall_footer.html
+    + styles/subsilver2/template/overall_footer.html
+* Purpose: Add content at the end of the file, directly prior to the `</body>` tag
+
+overall_header_head_append
+===
+* Locations:
+    + styles/prosilver/template/overall_header.html
+    + styles/subsilver2/template/overall_header.html
+* Purpose: Add asset calls directly before the `</head>` tag
+
+overall_header_breadcrumb_append
+===
+* Locations:
+    + styles/prosilver/template/overall_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Purpose: Add links to the list of breadcrumbs in the header
+
+overall_header_navigation_prepend
+===
+* Location: styles/prosilver/template/overall_header.html
+* Purpose: Add links before the navigation links in the header
+
+overall_header_navigation_append
+===
+* Location: styles/prosilver/template/overall_header.html
+* Purpose: Add links after the navigation links in the header
+
+posting_editor_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/posting_editor.html
+    + styles/prosilver/template/posting_body.html
+* Purpose: Add posting options on the posting screen
+
+simple_footer_after
+===
+* Location: styles/prosilver/template/simple_footer.html
+* Purpose: Add content directly prior to the `</body>` tag of the simple footer
+
+ucp_pm_viewmessage_print_head_append
+===
+* Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
+* Purpose: Add asset calls directly before the `</head>` tag of the Print PM screen
+
+viewtopic_topic_title_prepend
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Purpose: Add content directly before the topic title link on the View topic screen
+
+viewtopic_print_head_append
+===
+* Location: styles/prosilver/template/viewtopic_print.html
+* Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
-- 
cgit v1.2.1


From 3504e761a3840d9f5281fede517220c22c573e15 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 20 Dec 2012 14:41:55 -0500
Subject: [feature/events] Put events in alphabetical order

PHPBB3-9550
---
 phpBB/docs/events.md | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index cc03688d0d..cf967fe191 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -50,31 +50,38 @@ index_body_stat_blocks_before
     + styles/subsilver2/template/index_body.html
 * Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks
 
+overall_footer_after
+===
+* Locations:
+    + styles/prosilver/template/overall_footer.html
+    + styles/subsilver2/template/overall_footer.html
+* Purpose: Add content at the end of the file, directly prior to the `</body>` tag
+
 overall_footer_breadcrumb_append
 ===
 * Location: styles/prosilver/template/overall_footer.html
 * Purpose: Add links to the list of breadcrumbs in the footer
 
-overall_footer_copyright_prepend
+overall_footer_copyright_append
 ===
 * Locations:
     + styles/prosilver/template/overall_footer.html
     + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content before the copyright line
+* Purpose: Add content after the copyright line (no new line by default), before the ACP link
 
-overall_footer_copyright_append
+overall_footer_copyright_prepend
 ===
 * Locations:
     + styles/prosilver/template/overall_footer.html
     + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content after the copyright line (no new line by default), before the ACP link
+* Purpose: Add content before the copyright line
 
-overall_footer_after
+overall_header_breadcrumb_append
 ===
 * Locations:
-    + styles/prosilver/template/overall_footer.html
-    + styles/subsilver2/template/overall_footer.html
-* Purpose: Add content at the end of the file, directly prior to the `</body>` tag
+    + styles/prosilver/template/overall_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Purpose: Add links to the list of breadcrumbs in the header
 
 overall_header_head_append
 ===
@@ -83,23 +90,16 @@ overall_header_head_append
     + styles/subsilver2/template/overall_header.html
 * Purpose: Add asset calls directly before the `</head>` tag
 
-overall_header_breadcrumb_append
+overall_header_navigation_append
 ===
-* Locations:
-    + styles/prosilver/template/overall_header.html
-    + styles/subsilver2/template/breadcrumbs.html
-* Purpose: Add links to the list of breadcrumbs in the header
+* Location: styles/prosilver/template/overall_header.html
+* Purpose: Add links after the navigation links in the header
 
 overall_header_navigation_prepend
 ===
 * Location: styles/prosilver/template/overall_header.html
 * Purpose: Add links before the navigation links in the header
 
-overall_header_navigation_append
-===
-* Location: styles/prosilver/template/overall_header.html
-* Purpose: Add links after the navigation links in the header
-
 posting_editor_options_prepend
 ===
 * Locations:
@@ -117,14 +117,14 @@ ucp_pm_viewmessage_print_head_append
 * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
 * Purpose: Add asset calls directly before the `</head>` tag of the Print PM screen
 
+viewtopic_print_head_append
+===
+* Location: styles/prosilver/template/viewtopic_print.html
+* Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
+
 viewtopic_topic_title_prepend
 ===
 * Locations:
     + styles/prosilver/template/viewtopic_body.html
     + styles/subsilver2/template/viewtopic_body.html
 * Purpose: Add content directly before the topic title link on the View topic screen
-
-viewtopic_print_head_append
-===
-* Location: styles/prosilver/template/viewtopic_print.html
-* Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
-- 
cgit v1.2.1


From c7618ff669f31945948358ff8fb6277b6b950c27 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 20 Dec 2012 14:46:00 -0500
Subject: [feature/events] Fix alphabetization of events

PHPBB3-9550
---
 phpBB/docs/events.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index cf967fe191..2e757d9aca 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -3,15 +3,15 @@ acp_forums_normal_settings_append
 * Location: adm/style/acp_forums.html
 * Purpose: Add settings to forums
 
-acp_main_notice_after
+acp_main_actions_append
 ===
 * Location: adm/style/acp_main.html
-* Purpose: Add notices or other blocks in the ACP below other configuration notices
+* Purpose: Add actions to the ACP main page below the cache purge action
 
-acp_main_actions_append
+acp_main_notice_after
 ===
 * Location: adm/style/acp_main.html
-* Purpose: Add actions to the ACP main page below the cache purge action
+* Purpose: Add notices or other blocks in the ACP below other configuration notices
 
 acp_overall_footer_after
 ===
-- 
cgit v1.2.1


From 00c61f9060de5665a9ef09b88701ad21b94ce51c Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 20 Dec 2012 15:03:45 -0500
Subject: [feature/events] Fix improperly named event in documentation

PHPBB3-9550
---
 phpBB/docs/events.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 2e757d9aca..f0b3b81822 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -38,9 +38,11 @@ acp_users_overview_options_append
 * Location: adm/style/acp_users.html
 * Purpose: Add options and settings on user overview page
 
-forumlist_body_last_post_prepend
+forumlist_body_last_post_title_prepend
 ====
-* Location: styles/prosilver/template/forumlist_body.html
+* Locations:
+    + styles/prosilver/template/forumlist_body.html
+    + styles/subsilver2/template/forumlist_body.html
 * Purpose: Add content before the post title of the latest post in a forum on the forum list.
 
 index_body_stat_blocks_before
-- 
cgit v1.2.1


From a89ed49cbf797ecc82a70f6a36a06e9c0c396ce1 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 20 Dec 2012 16:40:53 -0500
Subject: [ticket/11287] Add template event naming to
 docs/coding-guidelines.html

PHPBB3-11287
---
 phpBB/docs/coding-guidelines.html | 52 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index eb569d12d5..14c2281323 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -72,6 +72,7 @@
 	<ol style="list-style-type: lower-roman;">
 		<li><a href="#templates">General Templating</a></li>
 		<li><a href="#stylestree">Styles Tree</a></li>
+		<li><a href="#template-events">Template Events</a></li>
 	</ol></li>
 	<li><a href="#charsets">Character Sets and Encodings</a></li>
 	<li><a href="#translation">Translation (<abbr title="Internationalisation">i18n</abbr>/<abbr title="Localisation">L10n</abbr>) Guidelines</a>
@@ -1678,6 +1679,57 @@ version = 3.1.0
 parent = prosilver
 		</pre></div>
 
+		<a name="template-events"></a><h3>4.iii. Template Events</h3>
+		<p>Template events must follow this format: <code>&lt;!-- EVENT event_name --&gt;</code></p>
+		<p>Using the above example, files named <code>event_name.html</code> located within extensions will be injected into the location of the event.</p>
+
+		<h4>Template event naming guidelines:</h4>
+		<ul>
+			<li>An event name must be all lowercase, with each word separated by an underscore.</li>
+			<li>An event name must briefly describe the location and purpose of the event.</li>
+			<li>An event name must end with one of the following suffixes:</li>
+			<ul>
+				<li><code>_prepend</code> - This event adds an item to the beginning of a block of related items, or adds to the beginning of individual items in a block.</li>
+				<li><code>_append</code> - This event adds an item to the end of a block of related items, or adds to the end of individual items in a block.</li>
+				<li><code>_before</code> - This event adds content directly before the specified block</li>
+				<li><code>_after</code> - This event adds content directly after the specified block</li>
+			</ul>
+		</ul>
+
+		<h4>Template event documentation</h4>
+		<p>Events must be documented in <code>phpBB/docs/events.md</code> in alphabetical order based on the event name. The format is as follows:</p>
+
+		<ul><li>An event found in only one template file:
+		<div class="codebox"><pre>event_name
+===
+* Location: styles/&lt;style_name&gt;/template/filename.html
+* Purpose: A brief description of what this event should be used for.
+This may span multiple lines.
+</pre></div></li>
+		<li>An event found in multiple template files:
+		<div class="codebox"><pre>event_name
+===
+* Locations:
+    + first/file/path.html
+    + second/file/path.html
+* Purpose: Same as above.
+</pre></div>
+		<li>An event that is found multiple times in a file should have the number of instances in parenthesis next to the filename.
+		<div class="codebox"><pre>event_name
+===
+* Locations:
+    + first/file/path.html (2)
+    + second/file/path.html
+* Purpose: Same as above.
+</pre></div></li>
+		<li>An actual example event documentation:
+		<div class="codebox"><pre>forumlist_body_last_post_title_prepend
+====
+* Locations:
+    + styles/prosilver/template/forumlist_body.html
+    + styles/subsilver2/template/forumlist_body.html
+* Purpose: Add content before the post title of the latest post in a forum on the forum list.</pre></div></ul><br />
+
 		</div>
 
 		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-- 
cgit v1.2.1


From 5f56804a9620bd537f85757707327a1017325053 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 21 Dec 2012 15:29:54 +0100
Subject: [ticket/11277] Correctly remove user_dst column on database update

The db_tools is running in "return statement" mode, so the queries to
modify the data are not executed, but just returned.

PHPBB3-11277
---
 phpBB/install/database_update.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 19d0d35fc0..1698e7777a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2885,7 +2885,11 @@ function change_database_data(&$no_updates, $version)
 				set_config('board_timezone', $update_helpers->convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
 
 				// After we have calculated the timezones we can delete user_dst column from user table.
-				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
+				$statements = $db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
+				foreach ($statements as $sql)
+				{
+					_sql($sql, $errored, $error_ary);
+				}
 			}
 
 			if (!isset($config['site_home_url']))
-- 
cgit v1.2.1


From 68ffb106fb2f9b246f52cf94f09c187531059f3e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 21 Dec 2012 16:05:05 +0100
Subject: [ticket/11278] Comment out the code for dropping the Q&A tables

Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on
firebird. It was possible for board administrators to adjust the code to
work. If code was manually adjusted by board administrators, index names
would not be the same as what 3.0.9 and newer expect. This code fragment
drops captcha tables, destroying all entered Q&A captcha configuration,
such that when Q&A is configured next the respective tables will be
created with corrent index names.

If you wish to preserve your Q&A captcha configuration, you can manually
rename indexes to the currently expected name:
 phpbb_captcha_questions_lang_iso  => phpbb_captcha_question_lang
 phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid

Again, this needs to be done only if a board was manually modified to fix
broken captcha code.

PHPBB3-11278
---
 phpBB/install/database_update.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0281aea0b3..8aa62af7e1 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1017,7 +1017,7 @@ function database_update_info()
 *****************************************************************************/
 function change_database_data(&$no_updates, $version)
 {
-	global $db, $db_tools, $errored, $error_ary, $config, $phpbb_root_path, $phpEx;
+	global $db, $db_tools, $errored, $error_ary, $config, $table_prefix, $phpbb_root_path, $phpEx;
 
 	switch ($version)
 	{
@@ -1973,11 +1973,24 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
-			global $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
+			/*
+			* Due to a bug, vanilla phpbb could not create captcha tables
+			* in 3.0.8 on firebird. It was possible for board administrators
+			* to adjust the code to work. If code was manually adjusted by
+			* board administrators, index names would not be the same as
+			* what 3.0.9 and newer expect. This code fragment drops captcha
+			* tables, destroying all entered Q&A captcha configuration, such
+			* that when Q&A is configured next the respective tables will be
+			* created with correct index names.
+			*
+			* If you wish to preserve your Q&A captcha configuration, you can
+			* manually rename indexes to the currently expected name:
+			* 	phpbb_captcha_questions_lang_iso	=> phpbb_captcha_questions_lang
+			* 	phpbb_captcha_answers_question_id	=> phpbb_captcha_answers_qid
+			*
+			* Again, this needs to be done only if a board was manually modified
+			* to fix broken captcha code.
+			*
 			if ($db_tools->sql_layer == 'firebird')
 			{
 				$changes = array(
@@ -1994,6 +2007,7 @@ function change_database_data(&$no_updates, $version)
 					_sql($sql, $errored, $error_ary);
 				}
 			}
+			*/
 
 			$no_updates = false;
 		break;
-- 
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')

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')

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')

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')

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')

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')

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')

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 e3b11c4ecf2eab5e9e1f077fda71e0facc2a063b Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 25 Dec 2012 09:49:05 -0800
Subject: [ticket/11103-VSE] Updated notification AJAX styling

PHPBB3-11103
---
 .../styles/prosilver/template/overall_header.html  |  1 +
 phpBB/styles/prosilver/theme/colours.css           | 29 +++++++++++++-
 phpBB/styles/prosilver/theme/common.css            | 46 ++++++++++++++++------
 3 files changed, 61 insertions(+), 15 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 9c2c1fc6a6..3f5bec9b8a 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -135,6 +135,7 @@
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
+						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
 							{L_NOTIFICATIONS}
 						</div>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 0043e7f5bc..a71d6ee557 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1046,7 +1046,11 @@ input.disabled {
 
 #notification_list {
 	background-color: #FFFFFF;
-	border-color: #00608F;
+	border-color: #B9B9B9;
+}
+
+#notification_list ul li {
+	border-bottom-color: #B9B9B9;
 }
 
 #notification_list ul li:hover {
@@ -1055,5 +1059,26 @@ input.disabled {
 }
 
 #notification_list > .header, .notification_list > .footer {
-	border-color: #00608F;
+	border-color: #B9B9B9;
+	border-bottom-color: #B9B9B9;
+	color: #000000;
+}
+
+#notification_list > .header {
+	background: #F1F8FF;
+	background: -moz-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F1F8FF), color-stop(100%, #CADCEB));
+	background: -webkit-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: -o-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: -ms-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%);
 }
+
+.notification_list .pointer {	
+	border-bottom-color: #ADADAD;
+}
+
+.notification_list .pointer_inner {
+	border-bottom-color: #F1F8FF;
+}
+
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 570f709ddd..0f44b5f861 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -679,8 +679,8 @@ p.rules a {
 	width: 330px;
 	z-index: 1;
 	border: 1px solid;
-	border-radius: 4px;
-	box-shadow: 4px 4px 5px;
+	box-shadow: 3px 3px 5px darkgray;
+	margin-top: 8px;
 }
 
 #notification_list ul {
@@ -690,7 +690,7 @@ p.rules a {
 }
 
 #notification_list ul li {
-	width: ;
+	width: 310px;
 	padding: 10px;
 	margin: 0;
 	float: left;
@@ -700,24 +700,20 @@ p.rules a {
 	clear: both;
 }
 
-#notification_list ul li {
-	width: 310px;
-}
-
-#notification_list ul li:last-child {
-	border-bottom: 0px;
-}
-
 #notification_list > .header {
-	padding: 0 5px;
+	padding: 0 10px;
+	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 11px;
 	font-weight: bold;
+	text-shadow: 1px 1px 1px white;
+	text-transform: uppercase;	
+	line-height: 30px;
 	border-bottom: 1px solid;
 }
 
 #notification_list > .footer {
 	text-align: center;
 	font-size: 1.2em;
-	border-top: 1px solid;
 }
 
 #notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
@@ -744,3 +740,27 @@ p.rules a {
 .notification_list ul.topiclist dt {
 	width: 88%;
 }
+
+.notification_list .pointer, .notification_list .pointer_inner {
+	position: absolute; 
+	width: 0; 
+	height: 0; 
+	border-top-width: 0;
+	border-bottom: 10px solid;
+	border-left: 10px dashed transparent;
+	border-right: 10px dashed transparent;
+	display: block;
+	background: transparent;
+}
+
+.notification_list .pointer {	
+	right: auto;
+	left: 10px;
+	top: -11px;
+}
+
+.notification_list .pointer_inner {
+	top: auto;
+	bottom: -11px;
+	left: -10px;
+}
-- 
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')

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')

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 58aa593e392778f21f507a62e412079ce5049b47 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 26 Dec 2012 17:57:05 -0500
Subject: [ticket/11037] Update services.yml.

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

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index febdc5acb8..991f6d1214 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -10,6 +10,10 @@ services:
         class: phpbb_cache_service
         arguments:
              - @cache.driver
+             - @config
+             - @dbal.conn
+             - %core.root_path%
+             - %core.php_ext%
 
     cache.driver:
         class: %cache.driver.class%
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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 5d07ddffaf1f5a173ce3b4fede45e80ff8f7d1af Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 19 Dec 2012 16:41:25 +0100
Subject: [ticket/10805] Clear loading alert timeout after ajax request
 finished

The timeout for the "request timed out" popup should be cleared if it
finished. Since it is currently not cleared, the timeout alert appears as
an extra overlay if another ajaxified function is ran within 5 seconds of
the initial function call. This patch will take care of clearing the
timeout if either the success (function return_handler()) or error
(function error_handler()) functions are called.

PHPBB3-10805
---
 phpBB/assets/javascript/core.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index c18bec7035..36e547b056 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -13,6 +13,7 @@ var keymap = {
 
 var dark = $('#darkenwrapper');
 var loading_alert = $('#loadingalert');
+var phpbbAlertTimer = 0;
 
 
 /**
@@ -30,7 +31,7 @@ phpbb.loading_alert = function() {
 		loading_alert.show();
 		dark.fadeIn(phpbb.alert_time, function() {
 			// Wait five seconds and display an error if nothing has been returned by then.
-			setTimeout(function() {
+			phpbbAlertTimer = setTimeout(function() {
 				if (loading_alert.is(':visible'))
 				{
 					phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
@@ -42,6 +43,16 @@ phpbb.loading_alert = function() {
 	return loading_alert;
 }
 
+/**
+ * Clear loading alert timeout
+*/
+phpbb.clearLoadingTimeout = function() {
+	if (phpbbAlertTimer != 0) {
+		clearTimeout(phpbbAlertTimer);
+		phpbbAlertTimer = 0;
+	}
+}
+
 /**
  * Display a simple alert similar to JSs native alert().
  *
@@ -271,6 +282,8 @@ phpbb.ajaxify = function(options) {
 		{
 			var alert;
 
+			phpbb.clearLoadingTimeout();
+
 			// Is a confirmation required?
 			if (typeof res.S_CONFIRM_ACTION === 'undefined')
 			{
@@ -341,6 +354,7 @@ phpbb.ajaxify = function(options) {
 		{
 			var alert;
 
+			phpbb.clearLoadingTimeout();
 			alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text'));
 		}
 
-- 
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/common.php                       | 13 +------------
 phpBB/download/file.php                | 13 +------------
 phpBB/includes/functions_container.php | 16 ++++++++++++++++
 phpBB/install/database_update.php      | 13 +------------
 4 files changed, 19 insertions(+), 36 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 3e0b8e324b..2ed55dfa95 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -87,18 +87,7 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_pat
 $phpbb_class_loader_ext->register();
 
 // Set up container
-$phpbb_container = phpbb_create_dumped_container_unless_debug(
-	array(
-		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-		new phpbb_di_extension_core($phpbb_root_path),
-	),
-	array(
-		new phpbb_di_pass_collection_pass(),
-		new phpbb_di_pass_kernel_pass(),
-	),
-	$phpbb_root_path,
-	$phpEx
-);
+$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 8c282e36d7..4a392b002d 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -56,18 +56,7 @@ if (isset($_GET['avatar']))
 	$phpbb_class_loader_ext->register();
 
 	// Set up container
-	$phpbb_container = phpbb_create_dumped_container_unless_debug(
-		array(
-			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-			new phpbb_di_extension_core($phpbb_root_path),
-		),
-		array(
-			new phpbb_di_pass_collection_pass(),
-			new phpbb_di_pass_kernel_pass(),
-		),
-		$phpbb_root_path,
-		$phpEx
-	);
+	$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
 	$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 	$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
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);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bbb40d3976..87b1188c65 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -109,18 +109,7 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_pat
 $phpbb_class_loader_ext->register();
 
 // Set up container
-$phpbb_container = phpbb_create_dumped_container_unless_debug(
-	array(
-		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-		new phpbb_di_extension_core($phpbb_root_path),
-	),
-	array(
-		new phpbb_di_pass_collection_pass(),
-		new phpbb_di_pass_kernel_pass(),
-	),
-	$phpbb_root_path,
-	$phpEx
-);
+$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
-- 
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')

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/common.php                  |  3 +-
 phpBB/includes/cache/service.php  | 30 --------------
 phpBB/includes/hook/finder.php    | 84 +++++++++++++++++++++++++++++++++++++++
 phpBB/install/database_update.php |  3 +-
 phpBB/install/index.php           |  3 +-
 5 files changed, 90 insertions(+), 33 deletions(-)
 create mode 100644 phpBB/includes/hook/finder.php

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 2ed55dfa95..8a8e8fd2f5 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -120,8 +120,9 @@ $phpbb_style = $phpbb_container->get('style');
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
+$phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver'));
 
-foreach ($cache->obtain_hooks() as $hook)
+foreach ($phpbb_hook_finder->find() as $hook)
 {
 	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 }
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;
+	}
+}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 87b1188c65..aeb5ae3859 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -133,7 +133,8 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
 	require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 	$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
 
-	foreach ($cache->obtain_hooks() as $hook)
+	$phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver'));
+	foreach ($phpbb_hook_finder->find() as $hook)
 	{
 		@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 	}
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 8514f34e09..0b3af3bdce 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -199,7 +199,8 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
 	require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 	$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
 
-	foreach ($cache->obtain_hooks() as $hook)
+	$phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver'));
+	foreach ($phpbb_hook_finder->find() as $hook)
 	{
 		@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 	}
-- 
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 ++--
 phpBB/install/database_update.php  | 4 ++--
 phpBB/install/install_install.php  | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'phpBB')

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);
 }
 
 /**
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index aeb5ae3859..f31682c784 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -187,7 +187,7 @@ include($phpbb_root_path . 'language/' . $language . '/install.' . $phpEx);
 $inline_update = (request_var('type', 0)) ? true : false;
 
 // To let set_config() calls succeed, we need to make the config array available globally
-$config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
+$config = new phpbb_config_db($db, $phpbb_container->get('cache.driver'), CONFIG_TABLE);
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
@@ -574,7 +574,7 @@ else
 add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version);
 
 // Now we purge the session table as well as all cache files
-$cache->purge();
+$phpbb_container->get('cache.driver')->purge();
 
 _print_footer();
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index dfd9cd6c22..c68cc27fb6 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -52,12 +52,13 @@ class install_install extends module
 
 	function main($mode, $sub)
 	{
-		global $lang, $template, $language, $phpbb_root_path, $cache;
+		global $lang, $template, $language, $phpbb_root_path;
+		global $phpbb_container;
 
 		switch ($sub)
 		{
 			case 'intro':
-				$cache->purge();
+				$phpbb_container->get('cache.driver')->purge();
 
 				$this->page_title = $lang['SUB_INTRO'];
 
-- 
cgit v1.2.1


From 8d3edd412870640f7b906f3da67de3c5303dcb7a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Jan 2013 21:07:03 -0500
Subject: [ticket/11305] Create a normal container during final installation
 step.

The final step calls a bunch of code which expects a full phpBB
runtime environment. Also, by this step everything should be configured
and database schema set up.

Therefore, in the final step replace installer container with a normal
phpBB container.

PHPBB3-11305
---
 phpBB/install/index.php           |  3 ---
 phpBB/install/install_install.php | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 0b3af3bdce..64c9ef9155 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -101,9 +101,6 @@ $phpbb_container = phpbb_create_install_container($phpbb_root_path, $phpEx);
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
 
-// set up caching
-$cache = $phpbb_container->get('cache');
-
 $phpbb_dispatcher = $phpbb_container->get('dispatcher');
 $request	= $phpbb_container->get('request');
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index c68cc27fb6..06fc2d2176 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -52,8 +52,8 @@ class install_install extends module
 
 	function main($mode, $sub)
 	{
-		global $lang, $template, $language, $phpbb_root_path;
-		global $phpbb_container;
+		global $lang, $template, $language, $phpbb_root_path, $phpEx;
+		global $phpbb_container, $cache;
 
 		switch ($sub)
 		{
@@ -102,6 +102,23 @@ class install_install extends module
 			break;
 
 			case 'final':
+				// Create a normal container now
+				$phpbb_container = phpbb_create_dumped_container_unless_debug(
+					array(
+						new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+						new phpbb_di_extension_core($phpbb_root_path),
+					),
+					array(
+						new phpbb_di_pass_collection_pass(),
+						new phpbb_di_pass_kernel_pass(),
+					),
+					$phpbb_root_path,
+					$phpEx
+				);
+
+				// Writes into global $cache
+				$cache = $phpbb_container->get('cache');
+
 				$this->build_search_index($mode, $sub);
 				$this->add_modules($mode, $sub);
 				$this->add_language($mode, $sub);
-- 
cgit v1.2.1


From 210f627f6791a57aaa3555d12173bc569e76172c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 2 Jan 2013 01:31:06 -0500
Subject: [ticket/11305] Use phpbb_create_default_container.

PHPBB3-11305
---
 phpBB/install/install_install.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 06fc2d2176..1f3ba5da00 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -103,18 +103,7 @@ class install_install extends module
 
 			case 'final':
 				// Create a normal container now
-				$phpbb_container = phpbb_create_dumped_container_unless_debug(
-					array(
-						new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-						new phpbb_di_extension_core($phpbb_root_path),
-					),
-					array(
-						new phpbb_di_pass_collection_pass(),
-						new phpbb_di_pass_kernel_pass(),
-					),
-					$phpbb_root_path,
-					$phpEx
-				);
+				$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
 				// Writes into global $cache
 				$cache = $phpbb_container->get('cache');
-- 
cgit v1.2.1


From 3360d4cfce97c19a45dfcf6354b2ba9225125359 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 2 Jan 2013 01:32:22 -0500
Subject: [ticket/11305] Adjust comment.

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

(limited to 'phpBB')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1f3ba5da00..1ab9caee0a 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -105,7 +105,7 @@ class install_install extends module
 				// Create a normal container now
 				$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
-				// Writes into global $cache
+				// Sets the global $cache variable
 				$cache = $phpbb_container->get('cache');
 
 				$this->build_search_index($mode, $sub);
-- 
cgit v1.2.1


From bc317c49a73bb6e271ac084b0b696b44e20babe8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 2 Jan 2013 01:36:50 -0500
Subject: [ticket/11305] Define hook finder as a service on the container.

PHPBB3-11305
---
 phpBB/common.php                  | 2 +-
 phpBB/config/services.yml         | 7 +++++++
 phpBB/install/database_update.php | 2 +-
 phpBB/install/index.php           | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index 8a8e8fd2f5..f502d37c8f 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -120,7 +120,7 @@ $phpbb_style = $phpbb_container->get('style');
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
-$phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver'));
+$phpbb_hook_finder = $phpbb_container->get('hook_finder');
 
 foreach ($phpbb_hook_finder->find() as $hook)
 {
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 991f6d1214..5c450a5cf6 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -127,6 +127,13 @@ services:
             - @dispatcher
             - @controller.resolver
 
+    hook_finder:
+        class: phpbb_hook_finder
+        arguments:
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+
     kernel_request_subscriber:
         class: phpbb_event_kernel_request_subscriber
         arguments:
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index f31682c784..8950d677ae 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -133,7 +133,7 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
 	require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 	$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
 
-	$phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver'));
+	$phpbb_hook_finder = $phpbb_container->get('hook_finder');
 	foreach ($phpbb_hook_finder->find() as $hook)
 	{
 		@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 64c9ef9155..a03fda6395 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -196,7 +196,7 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
 	require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 	$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
 
-	$phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver'));
+	$phpbb_hook_finder = $phpbb_container->get('hook_finder');
 	foreach ($phpbb_hook_finder->find() as $hook)
 	{
 		@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
-- 
cgit v1.2.1


From 48b6e45f7cee93dcbcc3b9b3ca857a4ed8f07437 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 2 Jan 2013 16:44:05 +0100
Subject: [ticket/10805] Compare phpbbAlertTimer against null

PHPBB3-10805
---
 phpBB/assets/javascript/core.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 36e547b056..29b1ec7872 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -13,7 +13,7 @@ var keymap = {
 
 var dark = $('#darkenwrapper');
 var loading_alert = $('#loadingalert');
-var phpbbAlertTimer = 0;
+var phpbbAlertTimer = null;
 
 
 /**
@@ -47,9 +47,9 @@ phpbb.loading_alert = function() {
  * Clear loading alert timeout
 */
 phpbb.clearLoadingTimeout = function() {
-	if (phpbbAlertTimer != 0) {
+	if (phpbbAlertTimer != null) {
 		clearTimeout(phpbbAlertTimer);
-		phpbbAlertTimer = 0;
+		phpbbAlertTimer = null;
 	}
 }
 
-- 
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')

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 e211009eb7f2c595fcc0b64a4f60e2bd08f13303 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 2 Jan 2013 22:05:14 +0100
Subject: [ticket/11302] Correctly select first timezone or selected timezone

While registering, we should default to a given timezone. By selecting the
first timezone by default, this is fulfilled. This doesn't happen
currently, as only the "Select a timezone" selection appears.
If a user selects a timezone during the registration process we should
also make sure that the selected element is still selected; even if we
have to return to the registration page, i.e. if there was an error while
submitting the form. This is currently not the case.
With this patch the javascript code will behave correctly.
Additionally, a duplicate inclusion of timezone.js has been removed as it
was not needed.

PHPBB3-11302
---
 phpBB/assets/javascript/core.js                   | 5 ++++-
 phpBB/styles/prosilver/template/ucp_register.html | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index c18bec7035..a4f7455b01 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -438,7 +438,10 @@ phpbb.timezone_switch_date = function(keep_selection) {
 	}
 
 	if (typeof keep_selection !== 'undefined' && !keep_selection) {
-		$('#timezone > option:first').attr('selected', true);
+		var timezoneOptions = $('#timezone > optgroup option');
+		if (timezoneOptions.filter(':selected').length <= 0) {
+			timezoneOptions.filter(':first').attr('selected', true);
+		}
 	}
 }
 
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index 47537e9d8b..db95e5ba13 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -104,7 +104,4 @@
 </div>
 </form>
 
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/timezone.js"></script>
-<script type="text/javascript">phpbb_preselect_tz_select();</script>
-
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 10:25:08 +0100
Subject: [feature/avatars] Inform user of no available local avatars

Rather than showing the user an empty drop-down list for the local avatar
categories, inform him/her that there are currently no (local) avatars
available.

PHPBB3-10018
---
 phpBB/language/en/common.php                                   | 1 +
 phpBB/styles/prosilver/template/ucp_avatar_options_local.html  | 4 ++++
 phpBB/styles/subsilver2/template/ucp_avatar_options_local.html | 6 ++++++
 3 files changed, 11 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6277457af7..02b4443a56 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -396,6 +396,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_ADMIN'				=> 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.',
 	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
 	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
+	'NO_AVATARS'				=> 'No avatars currently available',
 	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
 	'NO_BIRTHDAYS'				=> 'No birthdays today',
 	'NO_EMAIL_MESSAGE'			=> 'Email message was blank.',
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index d885abcd5b..3946b9d269 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -1,3 +1,4 @@
+<!-- IF .avatar_local_cats -->
 <label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category">
 <option value="">{L_NO_AVATAR_CATEGORY}</option>
 <!-- BEGIN avatar_local_cats -->
@@ -14,3 +15,6 @@
 <!-- END avatar_local_col -->
 <!-- END avatar_local_row -->
 </div>
+<!-- ELSE -->
+<p><strong>{L_NO_AVATARS}</strong></p>
+<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
index f4273192ad..87e5608fec 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
@@ -1,4 +1,5 @@
 <table class="tablebg" width="100%" cellspacing="1">
+	<!-- IF .avatar_local_cats -->
 	<tr> 
 		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="avatar_local_cat" id="category">
 			<option value="">{L_NO_AVATAR_CATEGORY}</option>
@@ -30,4 +31,9 @@
 			</table>
 		</td>
 	</tr>
+	<!-- ELSE -->
+	<tr>
+		<td class="row1" colspan="2"><strong>{L_NO_AVATARS}</strong></td>
+	</tr>
+	<!-- ENDIF -->
 </table>
-- 
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 ++--
 phpBB/memberlist.php                      |  6 +++---
 phpBB/viewtopic.php                       |  4 ++--
 10 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'phpBB')

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) : '',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index e389d38fcc..bb2300eb6d 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -549,7 +549,7 @@ switch ($mode)
 			$member['user_sig'] = smiley_text($member['user_sig']);
 		}
 
-		$poster_avatar = get_user_avatar($member);
+		$poster_avatar = phpbb_get_user_avatar($member);
 
 		// We need to check if the modules 'zebra' ('friends' & 'foes' mode),  'notes' ('user_notes' mode) and  'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links
 		$zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false;
@@ -1234,7 +1234,7 @@ switch ($mode)
 				break;
 			}
 
-			$avatar_img = get_group_avatar($group_row);
+			$avatar_img = phpbb_get_group_avatar($group_row);
 
 			// ... same for group rank
 			$rank_title = $rank_img = $rank_img_src = '';
@@ -1727,7 +1727,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 
 		'A_USERNAME'		=> addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])),
 
-		'AVATAR_IMG'		=> get_user_avatar($data),
+		'AVATAR_IMG'		=> phpbb_get_user_avatar($data),
 		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
 		'S_ONLINE'			=> ($config['load_onlinetrack'] && $online) ? true : false,
 		'RANK_IMG'			=> $rank_img,
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 594ef5f1c5..59ef7bbc80 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1083,7 +1083,7 @@ while ($row = $db->sql_fetchrow($result))
 				'sig_bbcode_bitfield'	=> '',
 
 				'online'			=> false,
-				'avatar'			=> ($user->optionget('viewavatars')) ? get_user_avatar($row) : '',
+				'avatar'			=> ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
 				'rank_title'		=> '',
 				'rank_image'		=> '',
 				'rank_image_src'	=> '',
@@ -1149,7 +1149,7 @@ while ($row = $db->sql_fetchrow($result))
 				'viewonline'	=> $row['user_allow_viewonline'],
 				'allow_pm'		=> $row['user_allow_pm'],
 
-				'avatar'		=> ($user->optionget('viewavatars')) ? get_user_avatar($row) : '',
+				'avatar'		=> ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
 				'age'			=> '',
 
 				'rank_title'		=> '',
-- 
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 ++++++-
 phpBB/language/en/common.php            | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'phpBB')

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']);
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 02b4443a56..f064dd43ac 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,6 +397,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
 	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
 	'NO_AVATARS'				=> 'No avatars currently available',
+	'NO_AVATAR_SELECTED'		=> 'You have not selected any avatar.',
 	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
 	'NO_BIRTHDAYS'				=> 'No birthdays today',
 	'NO_EMAIL_MESSAGE'			=> 'Email message was blank.',
-- 
cgit v1.2.1


From a342e47038dc62cc824efe688e574a1a7dbb0ac8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 18:13:49 +0100
Subject: [feature/avatars] Change avatar javascript to conform to new coding
 guidelines

PHPBB3-10018
---
 phpBB/adm/style/avatars.js                  | 6 +++---
 phpBB/styles/prosilver/template/avatars.js  | 6 +++---
 phpBB/styles/subsilver2/template/avatars.js | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index a53814c15f..26ea24c0db 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_hide() {
+function avatarHide() {
     $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#avatar_option_' + selected).show();
 }
 
-avatar_hide();
-$('#avatar_driver').bind('change', avatar_hide);
+avatarHide();
+$('#avatar_driver').bind('change', avatarHide);
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
index a53814c15f..26ea24c0db 100644
--- a/phpBB/styles/prosilver/template/avatars.js
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_hide() {
+function avatarHide() {
     $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#avatar_option_' + selected).show();
 }
 
-avatar_hide();
-$('#avatar_driver').bind('change', avatar_hide);
+avatarHide();
+$('#avatar_driver').bind('change', avatarHide);
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js
index 733056a32d..146aca94d3 100644
--- a/phpBB/styles/subsilver2/template/avatars.js
+++ b/phpBB/styles/subsilver2/template/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_hide() {
+function avatarHide() {
     $('.[class^="avatar_option_"]').hide();
 
     var selected = $('#avatar_driver').val();
     $('.avatar_option_' + selected).show();
 }
 
-avatar_hide();
-$('#avatar_driver').bind('change', avatar_hide);
+avatarHide();
+$('#avatar_driver').bind('change', avatarHide);
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From b5cc1ed683c1e8ca2e189e75e0e3302cc37c5fbf Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 22:46:12 +0100
Subject: [ticket/10949] Converted missing code to new JS coding guidelines

A few missing semi-colons were also added where needed.

PHPBB3-10949
---
 phpBB/adm/style/ajax.js                      | 80 +++++++++++++---------------
 phpBB/adm/style/timezone.js                  |  4 +-
 phpBB/assets/javascript/core.js              | 74 ++++++++++++-------------
 phpBB/styles/prosilver/template/ajax.js      | 12 ++---
 phpBB/styles/prosilver/template/timezone.js  |  8 +--
 phpBB/styles/subsilver2/template/timezone.js |  8 +--
 6 files changed, 89 insertions(+), 97 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 3ccb368665..294a35b615 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -2,11 +2,11 @@
 
 "use strict";
 
-var img_templates = {
+var imgTemplates = {
 	up: $('.template-up-img'),
-	up_disabled: $('.template-up-img-disabled'),
+	upDisabled: $('.template-up-img-disabled'),
 	down: $('.template-down-img'),
-	down_disabled: $('.template-down-img-disabled')
+	downDisabled: $('.template-down-img-disabled')
 };
 
 /**
@@ -15,20 +15,19 @@ var img_templates = {
  * an item is moved up. It moves the row up or down, and deactivates /
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
-phpbb.add_ajax_callback('row_down', function() {
+phpbb.addAjaxCallback('row_down', function() {
 	var el = $(this),
 		tr = el.parents('tr'),
-		tr_swap = tr.next();
+		trSwap = tr.next();
 
 	/*
 	* If the element was the first one, we have to:
 	* - Add the up-link to the row we moved
 	* - Remove the up-link on the next row
 	*/
-	if (tr.is(':first-child'))
-	{
-		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
-		tr.find('.up').html(up_img);
+	if (tr.is(':first-child')) {
+		var upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up'));
+		tr.find('.up').html(upImg);
 
 		phpbb.ajaxify({
 			selector: tr.find('.up').children('a'),
@@ -36,45 +35,43 @@ phpbb.add_ajax_callback('row_down', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.up').html(img_templates.up_disabled.clone());
+		trSwap.find('.up').html(imgTemplates.upDisabled.clone());
 	}
 
-	tr.insertAfter(tr_swap);
+	tr.insertAfter(trSwap);
 
 	/*
 	* As well as:
 	* - Remove the down-link on the moved row, if it is now the last row
 	* - Add the down-link to the next row, if it was the last row
 	*/
-	if (tr.is(':last-child'))
-	{
-		tr.find('.down').html(img_templates.down_disabled.clone());
+	if (tr.is(':last-child')) {
+		tr.find('.down').html(imgTemplates.downDisabled.clone());
 
-		var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
-		tr_swap.find('.down').html(down_img);
+		var downImg = imgTemplates.down.clone().attr('href', trSwap.attr('data-down'));
+		trSwap.find('.down').html(downImg);
 
 		phpbb.ajaxify({
-			selector: tr_swap.find('.down').children('a'),
+			selector: trSwap.find('.down').children('a'),
 			callback: 'row_down',
 			overlay: false
 		});
 	}
 });
 
-phpbb.add_ajax_callback('row_up', function() {
+phpbb.addAjaxCallback('row_up', function() {
 	var el = $(this),
 		tr = el.parents('tr'),
-		tr_swap = tr.prev();
+		trSwap = tr.prev();
 
 	/*
 	* If the element was the last one, we have to:
 	* - Add the down-link to the row we moved
 	* - Remove the down-link on the next row
 	*/
-	if (tr.is(':last-child'))
-	{
-		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
-		tr.find('.down').html(down_img);
+	if (tr.is(':last-child')) {
+		var downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down'));
+		tr.find('.down').html(downImg);
 
 		phpbb.ajaxify({
 			selector: tr.find('.down').children('a'),
@@ -82,25 +79,24 @@ phpbb.add_ajax_callback('row_up', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.down').html(img_templates.down_disabled.clone());
+		trSwap.find('.down').html(imgTemplates.downDisabled.clone());
 	}
 
-	tr.insertBefore(tr_swap);
+	tr.insertBefore(trSwap);
 
 	/*
 	* As well as:
 	* - Remove the up-link on the moved row, if it is now the first row
 	* - Add the up-link to the previous row, if it was the first row
 	*/
-	if (tr.is(':first-child'))
-	{
-		tr.find('.up').html(img_templates.up_disabled.clone());
+	if (tr.is(':first-child')) {
+		tr.find('.up').html(imgTemplates.upDisabled.clone());
 
-		var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
-		tr_swap.find('.up').html(up_img);
+		var upImg = imgTemplates.up.clone().attr('href', trSwap.attr('data-up'));
+		trSwap.find('.up').html(upImg);
 
 		phpbb.ajaxify({
-			selector: tr_swap.find('.up').children('a'),
+			selector: trSwap.find('.up').children('a'),
 			callback: 'row_up',
 			overlay: false
 		});
@@ -112,29 +108,26 @@ phpbb.add_ajax_callback('row_up', function() {
  * It does this by replacing the text, and replacing all instances of "activate"
  * in the href with "deactivate", and vice versa.
  */
-phpbb.add_ajax_callback('activate_deactivate', function(res) {
+phpbb.addAjaxCallback('activate_deactivate', function(res) {
 	var el = $(this),
-		new_href = el.attr('href');
+		newHref = el.attr('href');
 
 	el.text(res.text);
 
-	if (new_href.indexOf('deactivate') !== -1)
-	{
-		new_href = new_href.replace('deactivate', 'activate')
-	}
-	else
-	{
-		new_href = new_href.replace('activate', 'deactivate')
+	if (newHref.indexOf('deactivate') !== -1) {
+		newHref = newHref.replace('deactivate', 'activate')
+	} else {
+		newHref = newHref.replace('activate', 'deactivate')
 	}
 
-	el.attr('href', new_href);
+	el.attr('href', newHref);
 });
 
 /**
  * The removes the parent row of the link or form that triggered the callback,
  * and is good for stuff like the removal of forums.
  */
-phpbb.add_ajax_callback('row_delete', function() {
+phpbb.addAjaxCallback('row_delete', function() {
 	$(this).parents('tr').remove();
 });
 
@@ -145,8 +138,7 @@ $('[data-ajax]').each(function() {
 		ajax = $this.attr('data-ajax'),
 		fn;
 
-	if (ajax !== 'false')
-	{
+	if (ajax !== 'false') {
 		fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({
 			selector: this,
diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
index 4556ea5f94..419d37c34f 100644
--- a/phpBB/adm/style/timezone.js
+++ b/phpBB/adm/style/timezone.js
@@ -1,11 +1,11 @@
 (function($) { // Avoid conflicts with other libraries
 
 $('#tz_date').change(function() {
-	phpbb.timezone_switch_date(false);
+	phpbb.timezoneSwitchDate(false);
 });
 
 $(document).ready(
-	phpbb.timezone_enable_date_selection
+	phpbb.timezoneEnableDateSelection
 );
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 421d6a12dc..d4b98d3ee0 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -43,11 +43,11 @@ phpbb.loadingAlert = function() {
  * Clear loading alert timeout
 */
 phpbb.clearLoadingTimeout = function() {
-	if (phpbbAlertTimer != null) {
+	if (phpbbAlertTimer !== null) {
 		clearTimeout(phpbbAlertTimer);
 		phpbbAlertTimer = null;
 	}
-}
+};
 
 /**
  * Display a simple alert similar to JSs native alert().
@@ -135,13 +135,13 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		e.stopPropagation();
 	});
 
-	var click_handler = function(e) {
+	var clickHandler = function(e) {
 		var res = this.className === 'button1';
 		var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
 		fade.fadeOut(phpbb.alertTime, function() {
 			div.hide();
 		});
-		div.find('input[type="button"]').unbind('click', click_handler);
+		div.find('input[type="button"]').unbind('click', clickHandler);
 		callback(res);
 
 		if (e) {
@@ -149,7 +149,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
 			e.stopPropagation();
 		}
 	};
-	div.find('input[type="button"]').one('click', click_handler);
+	div.find('input[type="button"]').one('click', clickHandler);
 
 	dark.one('click', function(e) {
 		div.find('.alert_close').unbind('click');
@@ -207,7 +207,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
  * @argument string string The querystring to parse.
  * @returns object The object created.
  */
-phpbb.parse_querystring = function(string) {
+phpbb.parseQuerystring = function(string) {
 	var params = {}, i, split;
 
 	string = string.split('&');
@@ -386,9 +386,9 @@ phpbb.ajaxify = function(options) {
 /**
 * Hide the optgroups that are not the selected timezone
 *
-* @param	bool	keep_selection		Shall we keep the value selected, or shall the user be forced to repick one.
+* @param	bool	keepSelection		Shall we keep the value selected, or shall the user be forced to repick one.
 */
-phpbb.timezone_switch_date = function(keep_selection) {
+phpbb.timezoneSwitchDate = function(keepSelection) {
 	if ($('#timezone_copy').length == 0) {
 		// We make a backup of the original dropdown, so we can remove optgroups
 		// instead of setting display to none, because IE and chrome will not
@@ -412,30 +412,30 @@ phpbb.timezone_switch_date = function(keep_selection) {
 	if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1) {
 		// If there is only one timezone for the selected date, we just select that automatically.
 		$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr('selected', true);
-		keep_selection = true;
+		keepSelection = true;
 	}
 
-	if (typeof keep_selection !== 'undefined' && !keep_selection) {
+	if (typeof keepSelection !== 'undefined' && !keepSelection) {
 		var timezoneOptions = $('#timezone > optgroup option');
 		if (timezoneOptions.filter(':selected').length <= 0) {
 			timezoneOptions.filter(':first').attr('selected', true);
 		}
 	}
-}
+};
 
 /**
 * Display the date/time select
 */
-phpbb.timezone_enable_date_selection = function() {
+phpbb.timezoneEnableDateSelection = function() {
 	$('#tz_select_date').css('display', 'block');
-}
+};
 
 /**
 * Preselect a date/time or suggest one, if it is not picked.
 *
-* @param	bool	force_selector		Shall we select the suggestion?
+* @param	bool	forceSelector		Shall we select the suggestion?
 */
-phpbb.timezone_preselect_select = function(force_selector) {
+phpbb.timezonePreselectSelect = function(forceSelector) {
 
 	// The offset returned here is in minutes and negated.
 	// http://www.w3schools.com/jsref/jsref_getTimezoneOffset.asp
@@ -464,21 +464,21 @@ phpbb.timezone_preselect_select = function(force_selector) {
 	}
 
 	var prefix = 'GMT' + sign + hours + ':' + minutes;
-	var prefix_length = prefix.length;
-	var selector_options = $('#tz_date > option');
+	var prefixLength = prefix.length;
+	var selectorOptions = $('#tz_date > option');
 
-	for (var i = 0; i < selector_options.length; ++i) {
-		var option = selector_options[i];
+	for (var i = 0; i < selectorOptions.length; ++i) {
+		var option = selectorOptions[i];
 
-		if (option.value.substring(0, prefix_length) == prefix) {
-			if ($('#tz_date').val() != option.value && !force_selector) {
+		if (option.value.substring(0, prefixLength) == prefix) {
+			if ($('#tz_date').val() != option.value && !forceSelector) {
 				// We do not select the option for the user, but notify him,
 				// that we would suggest a different setting.
-				phpbb.timezone_switch_date(true);
+				phpbb.timezoneSwitchDate(true);
 				$('#tz_select_date_suggest').css('display', 'inline');
 			} else {
 				option.selected = true;
-				phpbb.timezone_switch_date(!force_selector);
+				phpbb.timezoneSwitchDate(!forceSelector);
 				$('#tz_select_date_suggest').css('display', 'none');
 			}
 
@@ -490,7 +490,7 @@ phpbb.timezone_preselect_select = function(force_selector) {
 			return;
 		}
 	}
-}
+};
 
 phpbb.ajaxCallbacks = {};
 
@@ -502,7 +502,7 @@ phpbb.ajaxCallbacks = {};
  * @param string id The name of the callback.
  * @param function callback The callback to be called.
  */
-phpbb.add_ajax_callback = function(id, callback) {
+phpbb.addAjaxCallback = function(id, callback) {
 	if (typeof callback === 'function') {
 		phpbb.ajaxCallbacks[id] = callback;
 	}
@@ -515,7 +515,7 @@ phpbb.add_ajax_callback = function(id, callback) {
  * the alt-text data attribute, and replaces the text in the attribute with the
  * current text so that the process can be repeated.
  */
-phpbb.add_ajax_callback('alt_text', function() {
+phpbb.addAjaxCallback('alt_text', function() {
 	var el = $(this),
 		altText;
 
@@ -534,28 +534,28 @@ phpbb.add_ajax_callback('alt_text', function() {
  * Additionally it replaces the class of the link's parent
  * and changes the link itself.
  */
-phpbb.add_ajax_callback('toggle_link', function() {
+phpbb.addAjaxCallback('toggle_link', function() {
 	var el = $(this),
-		toggle_text,
-		toggle_url,
-		toggle_class;
+		toggleText,
+		toggleUrl,
+		toggleClass;
 
 	// Toggle link text
 
-	toggle_text = el.attr('data-toggle-text');
+	toggleText = el.attr('data-toggle-text');
 	el.attr('data-toggle-text', el.text());
-	el.attr('title', toggle_text);
-	el.text(toggle_text);
+	el.attr('title', toggleText);
+	el.text(toggleText);
 
 	// Toggle link url
-	toggle_url = el.attr('data-toggle-url');
+	toggleUrl = el.attr('data-toggle-url');
 	el.attr('data-toggle-url', el.attr('href'));
-	el.attr('href', toggle_url);
+	el.attr('href', toggleUrl);
 
 	// Toggle class of link parent
-	toggle_class = el.attr('data-toggle-class');
+	toggleClass = el.attr('data-toggle-class');
 	el.attr('data-toggle-class', el.parent().attr('class'));
-	el.parent().attr('class', toggle_class);
+	el.parent().attr('class', toggleClass);
 });
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index abe6152db1..7f5ab17f99 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -14,7 +14,7 @@ phpbb.closeDarkenWrapper = function(delay) {
 };
 
 // This callback will mark all forum icons read
-phpbb.add_ajax_callback('mark_forums_read', function(res) {
+phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
@@ -44,7 +44,7 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 });
 
 // This callback will mark all topic icons read
-phpbb.add_ajax_callback('mark_topics_read', function(res) {
+phpbb.addAjaxCallback('mark_topics_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
@@ -91,7 +91,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 });
 
 // This callback finds the post from the delete link, and removes it.
-phpbb.add_ajax_callback('post_delete', function() {
+phpbb.addAjaxCallback('post_delete', function() {
 	var el = $(this),
 		postId;
 
@@ -110,7 +110,7 @@ phpbb.add_ajax_callback('post_delete', function() {
 });
 
 // This callback removes the approve / disapprove div or link.
-phpbb.add_ajax_callback('post_approve', function(res) {
+phpbb.addAjaxCallback('post_approve', function(res) {
 	var remove = (res.approved) ? $(this) : $(this).parents('.post');
 	$(remove).css('pointer-events', 'none').fadeOut(function() {
 		$(this).remove();
@@ -118,12 +118,12 @@ phpbb.add_ajax_callback('post_approve', function(res) {
 });
 
 // This removes the parent row of the link or form that fired the callback.
-phpbb.add_ajax_callback('row_delete', function() {
+phpbb.addAjaxCallback('row_delete', function() {
 	$(this).parents('tr').remove();
 });
 
 // This handles friend / foe additions removals.
-phpbb.add_ajax_callback('zebra', function(res) {
+phpbb.addAjaxCallback('zebra', function(res) {
 	var zebra;
 
 	if (res.success) {
diff --git a/phpBB/styles/prosilver/template/timezone.js b/phpBB/styles/prosilver/template/timezone.js
index da0a2b0bfd..af8206d12d 100644
--- a/phpBB/styles/prosilver/template/timezone.js
+++ b/phpBB/styles/prosilver/template/timezone.js
@@ -1,19 +1,19 @@
 (function($) { // Avoid conflicts with other libraries
 
 $('#tz_date').change(function() {
-	phpbb.timezone_switch_date(false);
+	phpbb.timezoneSwitchDate(false);
 });
 
 $('#tz_select_date_suggest').click(function(){
-	phpbb.timezone_preselect_select(true);
+	phpbb.timezonePreselectSelect(true);
 });
 
 $(document).ready(
-	phpbb.timezone_enable_date_selection
+	phpbb.timezoneEnableDateSelection
 );
 
 $(document).ready(
-	phpbb.timezone_preselect_select($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
+	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
 );
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
index da0a2b0bfd..af8206d12d 100644
--- a/phpBB/styles/subsilver2/template/timezone.js
+++ b/phpBB/styles/subsilver2/template/timezone.js
@@ -1,19 +1,19 @@
 (function($) { // Avoid conflicts with other libraries
 
 $('#tz_date').change(function() {
-	phpbb.timezone_switch_date(false);
+	phpbb.timezoneSwitchDate(false);
 });
 
 $('#tz_select_date_suggest').click(function(){
-	phpbb.timezone_preselect_select(true);
+	phpbb.timezonePreselectSelect(true);
 });
 
 $(document).ready(
-	phpbb.timezone_enable_date_selection
+	phpbb.timezoneEnableDateSelection
 );
 
 $(document).ready(
-	phpbb.timezone_preselect_select($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
+	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
 );
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
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')

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 be7719443587d85402813211d78d7c562a93518b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 5 Jan 2013 11:40:41 +0100
Subject: [ticket/10949] Remove not needed comma

This comma might actually cause issues in browser. Therefore remove it.

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

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 7f5ab17f99..8583fb565c 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -20,7 +20,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	var iconsArray = {
 		'forum_unread': 'forum_read',
 		'forum_unread_subforum': 'forum_read_subforum',
-		'forum_unread_locked': 'forum_read_locked',
+		'forum_unread_locked': 'forum_read_locked'
 	};
 
 	$('li.row').find('dl[class*="forum_unread"]').each(function() {
-- 
cgit v1.2.1


From 4773eb35836381fe4d81b6190ba1f98b11fb7dd5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 5 Jan 2013 11:42:58 +0100
Subject: [ticket/11311] Include asset core.js in subsilver2
 overall_footer.html

Without the inclusion of core.js the timezone functions will not properly
work. They refer to phpbb which is defined in core.js.

PHPBB3-11311
---
 phpBB/styles/subsilver2/template/overall_footer.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 64e7587023..3a29a0d752 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -13,6 +13,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 {SCRIPTS}
 
 <!-- EVENT overall_footer_after -->
-- 
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')

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')

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')

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')

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')

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')

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')

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 7ea0376958f917c3c62dff7814daaa2fcf330dca Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Jan 2013 22:47:05 +0100
Subject: [feature/avatars] Remove not needed inline style

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 927c4821f7..148efd051b 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -8,7 +8,7 @@
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
 </dl>
 	<!-- IF AVATAR_LOCAL_SHOW -->
-	<table style="border-spacing: 1px;">
+	<table>
 	<!-- BEGIN avatar_local_row -->
 	<tr>
 		<!-- BEGIN avatar_local_col -->
-- 
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')

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')

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 fbdd3170c9a74d1352f242cc184d576765c95f88 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Jan 2013 23:35:39 +0100
Subject: [ticket/11313] Use correct object el instead of eel in alt_text
 callback

This typo was added by the PRs #860 and #1178. Only the object el exists
and is correct. Due to this the text of links using the alt_text callback
were not modified while executing the callback.

PHPBB3-11313
---
 phpBB/assets/javascript/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index d4b98d3ee0..16ed04746d 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -522,7 +522,7 @@ phpbb.addAjaxCallback('alt_text', function() {
 	altText = el.attr('data-alt-text');
 	el.attr('data-alt-text', el.text());
 	el.attr('title', altText);
-	eel.text(altText);
+	el.text(altText);
 });
 
 /**
-- 
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')

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/develop/create_schema_files.php     |  14 ++
 phpBB/includes/constants.php              |   1 +
 phpBB/includes/db/migration.php           |  79 +++++++++++
 phpBB/includes/db/migrator.php            | 227 ++++++++++++++++++++++++++++++
 phpBB/install/schemas/firebird_schema.sql |  12 ++
 phpBB/install/schemas/mssql_schema.sql    |  17 +++
 phpBB/install/schemas/mysql_40_schema.sql |  12 ++
 phpBB/install/schemas/mysql_41_schema.sql |  12 ++
 phpBB/install/schemas/oracle_schema.sql   |  15 ++
 phpBB/install/schemas/postgres_schema.sql |  14 ++
 phpBB/install/schemas/sqlite_schema.sql   |  12 ++
 11 files changed, 415 insertions(+)
 create mode 100644 phpBB/includes/db/migration.php
 create mode 100644 phpBB/includes/db/migrator.php

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 3d3e478032..82fbb183c1 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1258,6 +1258,20 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_migrations'] = array(
+		'COLUMNS'		=> array(
+			'migration_name'		=> array('VCHAR', ''),
+			'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),
+		),
+		'KEYS'			=> array(
+			'migration_name'		=> array('UNIQUE', 'migration_name'),
+		),
+	);
+
 	$schema_data['phpbb_moderator_cache'] = array(
 		'COLUMNS'		=> array(
 			'forum_id'				=> array('UINT', 0),
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;
+	}
+}
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 767ce68b4a..43099fc33b 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -573,6 +573,18 @@ CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwar
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);;
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	migration_schema_done INTEGER DEFAULT 0 NOT NULL,
+	migration_data_done INTEGER DEFAULT 0 NOT NULL,
+	migration_data_state BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL,
+	migration_start_time INTEGER DEFAULT 0 NOT NULL,
+	migration_end_time INTEGER DEFAULT 0 NOT NULL
+);;
+
+CREATE UNIQUE INDEX phpbb_migrations_migration_name ON phpbb_migrations(migration_name);;
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 84c975942f..1174cdfa3d 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -696,6 +696,23 @@ CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]
 GO
 
 
+/*
+	Table: 'phpbb_migrations'
+*/
+CREATE TABLE [phpbb_migrations] (
+	[migration_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[migration_schema_done] [int] DEFAULT (0) NOT NULL ,
+	[migration_data_done] [int] DEFAULT (0) NOT NULL ,
+	[migration_data_state] [varchar] (8000) DEFAULT ('') NOT NULL ,
+	[migration_start_time] [int] DEFAULT (0) NOT NULL ,
+	[migration_end_time] [int] DEFAULT (0) NOT NULL 
+) ON [PRIMARY]
+GO
+
+CREATE  UNIQUE  INDEX [migration_name] ON [phpbb_migrations]([migration_name]) ON [PRIMARY]
+GO
+
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 8aab949103..d645c3384d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -397,6 +397,18 @@ CREATE TABLE phpbb_login_attempts (
 );
 
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name varbinary(255) DEFAULT '' NOT NULL,
+	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_state blob NOT NULL,
+	migration_start_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_end_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	UNIQUE migration_name (migration_name)
+);
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 04aef2844a..d10f2dc55a 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -397,6 +397,18 @@ CREATE TABLE phpbb_login_attempts (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name varchar(255) DEFAULT '' NOT NULL,
+	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_state text NOT NULL,
+	migration_start_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_end_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	UNIQUE migration_name (migration_name)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 91f906bc8b..9993caeb7a 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -780,6 +780,21 @@ CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
 /
 
+/*
+	Table: 'phpbb_migrations'
+*/
+CREATE TABLE phpbb_migrations (
+	migration_name varchar2(255) DEFAULT '' ,
+	migration_schema_done number(1) DEFAULT '0' NOT NULL,
+	migration_data_done number(1) DEFAULT '0' NOT NULL,
+	migration_data_state clob DEFAULT '' ,
+	migration_start_time number(11) DEFAULT '0' NOT NULL,
+	migration_end_time number(11) DEFAULT '0' NOT NULL,
+	CONSTRAINT u_phpbb_migration_name UNIQUE (migration_name)
+)
+/
+
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 619985e0d6..ef138dac0f 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -557,6 +557,20 @@ CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwa
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
+/*
+	Table: 'phpbb_migrations'
+*/
+CREATE TABLE phpbb_migrations (
+	migration_name varchar(255) DEFAULT '' NOT NULL,
+	migration_schema_done INT2 DEFAULT '0' NOT NULL CHECK (migration_schema_done >= 0),
+	migration_data_done INT2 DEFAULT '0' NOT NULL CHECK (migration_data_done >= 0),
+	migration_data_state varchar(8000) DEFAULT '' NOT NULL,
+	migration_start_time INT4 DEFAULT '0' NOT NULL CHECK (migration_start_time >= 0),
+	migration_end_time INT4 DEFAULT '0' NOT NULL CHECK (migration_end_time >= 0)
+);
+
+CREATE UNIQUE INDEX phpbb_migrations_migration_name ON phpbb_migrations (migration_name);
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 1690a7dcab..309297779e 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -385,6 +385,18 @@ CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwa
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name varchar(255) NOT NULL DEFAULT '',
+	migration_schema_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	migration_data_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	migration_data_state text(65535) NOT NULL DEFAULT '',
+	migration_start_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	migration_end_time INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
+
+CREATE UNIQUE INDEX phpbb_migrations_migration_name ON phpbb_migrations (migration_name);
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
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')

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')

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')

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/develop/create_schema_files.php    |   14 -
 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 +
 phpBB/install/database_update.php        | 1457 ------------------------------
 38 files changed, 1998 insertions(+), 1472 deletions(-)
 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')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 82fbb183c1..3d3e478032 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1258,20 +1258,6 @@ function get_schema_struct()
 		),
 	);
 
-	$schema_data['phpbb_migrations'] = array(
-		'COLUMNS'		=> array(
-			'migration_name'		=> array('VCHAR', ''),
-			'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),
-		),
-		'KEYS'			=> array(
-			'migration_name'		=> array('UNIQUE', 'migration_name'),
-		),
-	);
-
 	$schema_data['phpbb_moderator_cache'] = array(
 		'COLUMNS'		=> array(
 			'forum_id'				=> array('UINT', 0),
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()
+	{
+	}
+}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8950d677ae..1f89035b43 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -881,277 +881,6 @@ function _add_permission(auth_admin $auth_admin, phpbb_db_driver $db, $permissio
 function database_update_info()
 {
 	return array(
-		// Changes from 3.0.0 to the next version
-		'3.0.0'			=> array(
-			// Add the following columns
-			'add_columns'		=> array(
-				FORUMS_TABLE			=> array(
-					'display_subforum_list'		=> array('BOOL', 1),
-				),
-				SESSIONS_TABLE			=> array(
-					'session_forum_id'		=> array('UINT', 0),
-				),
-			),
-			'drop_keys'		=> array(
-				GROUPS_TABLE			=> array('group_legend'),
-			),
-			'add_index'		=> array(
-				SESSIONS_TABLE			=> array(
-					'session_forum_id'		=> array('session_forum_id'),
-				),
-				GROUPS_TABLE			=> array(
-					'group_legend_name'		=> array('group_legend', 'group_name'),
-				),
-			),
-		),
-		// No changes from 3.0.1-RC1 to 3.0.1
-		'3.0.1-RC1'		=> array(),
-		// No changes from 3.0.1 to 3.0.2-RC1
-		'3.0.1'			=> array(),
-		// Changes from 3.0.2-RC1 to 3.0.2-RC2
-		'3.0.2-RC1'		=> array(
-			'change_columns'	=> array(
-				DRAFTS_TABLE			=> array(
-					'draft_subject'		=> array('STEXT_UNI', ''),
-				),
-				FORUMS_TABLE	=> array(
-					'forum_last_post_subject' => array('STEXT_UNI', ''),
-				),
-				POSTS_TABLE		=> array(
-					'post_subject'			=> array('STEXT_UNI', '', 'true_sort'),
-				),
-				PRIVMSGS_TABLE	=> array(
-					'message_subject'		=> array('STEXT_UNI', ''),
-				),
-				TOPICS_TABLE	=> array(
-					'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
-					'topic_last_post_subject'	=> array('STEXT_UNI', ''),
-				),
-			),
-			'drop_keys'		=> array(
-				SESSIONS_TABLE			=> array('session_forum_id'),
-			),
-			'add_index'		=> array(
-				SESSIONS_TABLE			=> array(
-					'session_fid'		=> array('session_forum_id'),
-				),
-			),
-		),
-		// No changes from 3.0.2-RC2 to 3.0.2
-		'3.0.2-RC2'		=> array(),
-
-		// Changes from 3.0.2 to 3.0.3-RC1
-		'3.0.2'			=> array(
-			// Add the following columns
-			'add_columns'		=> array(
-				STYLES_TEMPLATE_TABLE			=> array(
-					'template_inherits_id'		=> array('UINT:4', 0),
-					'template_inherit_path'		=> array('VCHAR', ''),
-				),
-				GROUPS_TABLE					=> array(
-					'group_max_recipients'		=> array('UINT', 0),
-				),
-			),
-		),
-
-		// No changes from 3.0.3-RC1 to 3.0.3
-		'3.0.3-RC1'		=> array(),
-
-		// Changes from 3.0.3 to 3.0.4-RC1
-		'3.0.3'			=> array(
-			'add_columns'		=> array(
-				PROFILE_FIELDS_TABLE			=> array(
-					'field_show_profile'		=> array('BOOL', 0),
-				),
-			),
-			'change_columns'	=> array(
-				STYLES_TABLE				=> array(
-					'style_id'				=> array('UINT', NULL, 'auto_increment'),
-					'template_id'			=> array('UINT', 0),
-					'theme_id'				=> array('UINT', 0),
-					'imageset_id'			=> array('UINT', 0),
-				),
-				STYLES_IMAGESET_TABLE		=> array(
-					'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
-				),
-				STYLES_IMAGESET_DATA_TABLE	=> array(
-					'image_id'				=> array('UINT', NULL, 'auto_increment'),
-					'imageset_id'			=> array('UINT', 0),
-				),
-				STYLES_THEME_TABLE			=> array(
-					'theme_id'				=> array('UINT', NULL, 'auto_increment'),
-				),
-				STYLES_TEMPLATE_TABLE		=> array(
-					'template_id'			=> array('UINT', NULL, 'auto_increment'),
-				),
-				STYLES_TEMPLATE_DATA_TABLE	=> array(
-					'template_id'			=> array('UINT', 0),
-				),
-				FORUMS_TABLE				=> array(
-					'forum_style'			=> array('UINT', 0),
-				),
-				USERS_TABLE					=> array(
-					'user_style'			=> array('UINT', 0),
-				),
-			),
-		),
-
-		// Changes from 3.0.4-RC1 to 3.0.4
-		'3.0.4-RC1'		=> array(),
-
-		// Changes from 3.0.4 to 3.0.5-RC1
-		'3.0.4'			=> array(
-			'change_columns'	=> array(
-				FORUMS_TABLE				=> array(
-					'forum_style'			=> array('UINT', 0),
-				),
-			),
-		),
-
-		// No changes from 3.0.5-RC1 to 3.0.5
-		'3.0.5-RC1'		=> array(),
-
-		// Changes from 3.0.5 to 3.0.6-RC1
-		'3.0.5'		=> array(
-			'add_columns'		=> array(
-				CONFIRM_TABLE			=> array(
-					'attempts'		=> array('UINT', 0),
-				),
-				USERS_TABLE			=> array(
-					'user_new'			=> array('BOOL', 1),
-					'user_reminded'		=> array('TINT:4', 0),
-					'user_reminded_time'=> array('TIMESTAMP', 0),
-				),
-				GROUPS_TABLE			=> array(
-					'group_skip_auth'		=> array('BOOL', 0, 'after' => 'group_founder_manage'),
-				),
-				PRIVMSGS_TABLE		=> array(
-					'message_reported'	=> array('BOOL', 0),
-				),
-				REPORTS_TABLE		=> array(
-					'pm_id'				=> array('UINT', 0),
-				),
-				PROFILE_FIELDS_TABLE			=> array(
-					'field_show_on_vt'		=> array('BOOL', 0),
-				),
-				FORUMS_TABLE		=> array(
-					'forum_options'			=> array('UINT:20', 0),
-				),
-			),
-			'change_columns'		=> array(
-				USERS_TABLE				=> array(
-					'user_options'		=> array('UINT:11', 230271),
-				),
-			),
-			'add_index'		=> array(
-				REPORTS_TABLE		=> array(
-					'post_id'		=> array('post_id'),
-					'pm_id'			=> array('pm_id'),
-				),
-				POSTS_TABLE			=> array(
-					'post_username'		=> array('post_username:255'),
-				),
-			),
-		),
-
-		// No changes from 3.0.6-RC1 to 3.0.6-RC2
-		'3.0.6-RC1'		=> array(),
-		// No changes from 3.0.6-RC2 to 3.0.6-RC3
-		'3.0.6-RC2'		=> array(),
-		// No changes from 3.0.6-RC3 to 3.0.6-RC4
-		'3.0.6-RC3'		=> array(),
-		// No changes from 3.0.6-RC4 to 3.0.6
-		'3.0.6-RC4'		=> array(),
-
-		// Changes from 3.0.6 to 3.0.7-RC1
-		'3.0.6'		=> array(
-			'drop_keys'		=> array(
-				LOG_TABLE			=> array('log_time'),
-			),
-			'add_index'		=> array(
-				TOPICS_TRACK_TABLE	=> array(
-					'topic_id'		=> array('topic_id'),
-				),
-			),
-		),
-
-		// No changes from 3.0.7-RC1 to 3.0.7-RC2
-		'3.0.7-RC1'		=> array(),
-		// No changes from 3.0.7-RC2 to 3.0.7
-		'3.0.7-RC2'		=> array(),
-		// No changes from 3.0.7 to 3.0.7-PL1
-		'3.0.7'		=> array(),
-		// No changes from 3.0.7-PL1 to 3.0.8-RC1
-		'3.0.7-PL1'		=> array(),
-		// No changes from 3.0.8-RC1 to 3.0.8
-		'3.0.8-RC1'		=> array(),
-		// Changes from 3.0.8 to 3.0.9-RC1
-		'3.0.8'			=> array(
-			'add_tables'		=> array(
-				LOGIN_ATTEMPT_TABLE	=> 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(
-				BBCODES_TABLE	=> array(
-					'bbcode_id'	=> array('USINT', 0),
-				),
-			),
-		),
-		// No changes from 3.0.9-RC1 to 3.0.9-RC2
-		'3.0.9-RC1'		=> array(),
-		// No changes from 3.0.9-RC2 to 3.0.9-RC3
-		'3.0.9-RC2'		=> array(),
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
-		'3.0.9-RC3'     => array(),
-		// No changes from 3.0.9-RC4 to 3.0.9
-		'3.0.9-RC4'     => array(),
-		// No changes from 3.0.9 to 3.0.10-RC1
-		'3.0.9'			=> array(),
-		// No changes from 3.0.10-RC1 to 3.0.10-RC2
-		'3.0.10-RC1'	=> array(),
-		// No changes from 3.0.10-RC2 to 3.0.10-RC3
-		'3.0.10-RC2'	=> array(),
-		// No changes from 3.0.10-RC3 to 3.0.10
-		'3.0.10-RC3'	=> array(),
-		// No changes from 3.0.10 to 3.0.11-RC1
-		'3.0.10'		=> array(),
-		// Changes from 3.0.11-RC1 to 3.0.11-RC2
-		'3.0.11-RC1'	=> array(
-			'add_columns'		=> array(
-				PROFILE_FIELDS_TABLE			=> array(
-					'field_show_novalue'		=> array('BOOL', 0),
-				),
-			),
-		),
-		// No changes from 3.0.11-RC2 to 3.0.11
-		'3.0.11-RC2'	=> array(),
-		// No changes from 3.0.11 to 3.0.12-RC1
-		'3.0.11'		=> array(),
-
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
-
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		'3.1.0-dev'		=> array(
 			'add_tables'		=> array(
@@ -1210,1192 +939,6 @@ function change_database_data(&$no_updates, $version)
 
 	switch ($version)
 	{
-		case '3.0.0':
-
-			$sql = 'UPDATE ' . TOPICS_TABLE . "
-				SET topic_last_view_time = topic_last_post_time
-				WHERE topic_last_view_time = 0";
-			_sql($sql, $errored, $error_ary);
-
-			// 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($phpbb_root_path . 'images/smilies/' . $smiley))
-				{
-					list($width, $height) = getimagesize($phpbb_root_path . 'images/smilies/' . $smiley);
-
-					$sql = 'UPDATE ' . SMILIES_TABLE . '
-						SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
-						WHERE smiley_url = '" . $db->sql_escape($smiley) . "'";
-
-					_sql($sql, $errored, $error_ary);
-				}
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.1-RC1 to 3.0.1
-		case '3.0.1-RC1':
-		break;
-
-		// changes from 3.0.1 to 3.0.2-RC1
-		case '3.0.1':
-
-			set_config('referer_validation', '1');
-			set_config('check_attachment_content', '1');
-			set_config('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title');
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.2-RC1 to 3.0.2-RC2
-		case '3.0.2-RC1':
-		break;
-
-		// No changes from 3.0.2-RC2 to 3.0.2
-		case '3.0.2-RC2':
-		break;
-
-		// Changes from 3.0.2 to 3.0.3-RC1
-		case '3.0.2':
-			set_config('enable_queue_trigger', '0');
-			set_config('queue_trigger_posts', '3');
-
-			set_config('pm_max_recipients', '0');
-
-			// Set maximum number of recipients for the registered users, bots, guests group
-			$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
-				WHERE ' . $db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
-			_sql($sql, $errored, $error_ary);
-
-			// 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);
-
-			$no_updates = false;
-		break;
-
-		// Changes from 3.0.3-RC1 to 3.0.3
-		case '3.0.3-RC1':
-			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);
-			}
-
-			$no_updates = false;
-		break;
-
-		// Changes from 3.0.3 to 3.0.4-RC1
-		case '3.0.3':
-			// 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);
-			}
-			$no_updates = false;
-
-		break;
-
-		// Changes from 3.0.4-RC1 to 3.0.4
-		case '3.0.4-RC1':
-		break;
-
-		// Changes from 3.0.4 to 3.0.5-RC1
-		case '3.0.4':
-
-			// 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'),
-				),
-			);
-
-			$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);
-			}
-
-			$no_updates = false;
-
-		break;
-
-		// No changes from 3.0.5-RC1 to 3.0.5
-		case '3.0.5-RC1':
-		break;
-
-		// Changes from 3.0.5 to 3.0.6-RC1
-		case '3.0.5':
-			// 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']);
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.6-RC1 to 3.0.6-RC2
-		case '3.0.6-RC1':
-		break;
-
-		// Changes from 3.0.6-RC2 to 3.0.6-RC3
-		case '3.0.6-RC2':
-
-			// 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);
-			$no_updates = false;
-
-		break;
-
-		// No changes from 3.0.6-RC3 to 3.0.6-RC4
-		case '3.0.6-RC3':
-		break;
-
-		// No changes from 3.0.6-RC4 to 3.0.6
-		case '3.0.6-RC4':
-		break;
-
-		// Changes from 3.0.6 to 3.0.7-RC1
-		case '3.0.6':
-
-			// 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);
-
-			$no_updates = false;
-		break;
-
-		// Changes from 3.0.7-RC1 to 3.0.7-RC2
-		case '3.0.7-RC1':
-
-			$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);
-
-			$no_updates = false;
-
-		break;
-
-		// No changes from 3.0.7-RC2 to 3.0.7
-		case '3.0.7-RC2':
-		break;
-
-		// No changes from 3.0.7 to 3.0.7-PL1
-		case '3.0.7':
-		break;
-
-		// Changes from 3.0.7-PL1 to 3.0.8-RC1
-		case '3.0.7-PL1':
-			// 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'			=> 'UTC',
-					'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');
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.8-RC1 to 3.0.8
-		case '3.0.8-RC1':
-		break;
-
-		// Changes from 3.0.8 to 3.0.9-RC1
-		case '3.0.8':
-			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);
-
-			/*
-			* Due to a bug, vanilla phpbb could not create captcha tables
-			* in 3.0.8 on firebird. It was possible for board administrators
-			* to adjust the code to work. If code was manually adjusted by
-			* board administrators, index names would not be the same as
-			* what 3.0.9 and newer expect. This code fragment drops captcha
-			* tables, destroying all entered Q&A captcha configuration, such
-			* that when Q&A is configured next the respective tables will be
-			* created with correct index names.
-			*
-			* If you wish to preserve your Q&A captcha configuration, you can
-			* manually rename indexes to the currently expected name:
-			* 	phpbb_captcha_questions_lang_iso	=> phpbb_captcha_questions_lang
-			* 	phpbb_captcha_answers_question_id	=> phpbb_captcha_answers_qid
-			*
-			* Again, this needs to be done only if a board was manually modified
-			* to fix broken captcha code.
-			*
-			if ($db_tools->sql_layer == 'firebird')
-			{
-				$changes = array(
-					'drop_tables'	=> array(
-						$table_prefix . 'captcha_questions',
-						$table_prefix . 'captcha_answers',
-						$table_prefix . 'qa_confirm',
-					),
-				);
-				$statements = $db_tools->perform_schema_changes($changes);
-
-				foreach ($statements as $sql)
-				{
-					_sql($sql, $errored, $error_ary);
-				}
-			}
-			*/
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.9-RC1 to 3.0.9-RC2
-		case '3.0.9-RC1':
-		break;
-
-		// No changes from 3.0.9-RC2 to 3.0.9-RC3
-		case '3.0.9-RC2':
-		break;
-
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
-		case '3.0.9-RC3':
-		break;
-
-		// No changes from 3.0.9-RC4 to 3.0.9
-		case '3.0.9-RC4':
-		break;
-
-		// Changes from 3.0.9 to 3.0.10-RC1
-		case '3.0.9':
-			if (!isset($config['email_max_chunk_size']))
-			{
-				set_config('email_max_chunk_size', '50');
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.10-RC1 to 3.0.10-RC2
-		case '3.0.10-RC1':
-		break;
-
-		// No changes from 3.0.10-RC2 to 3.0.10-RC3
-		case '3.0.10-RC2':
-		break;
-
-		// No changes from 3.0.10-RC3 to 3.0.10
-		case '3.0.10-RC3':
-		break;
-
-		// Changes from 3.0.10 to 3.0.11-RC1
-		case '3.0.10':
-			// 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);
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.11-RC1 to 3.0.11-RC2
-		case '3.0.11-RC1':
-		break;
-
-		// No changes from 3.0.11-RC2 to 3.0.11
-		case '3.0.11-RC2':
-		break;
-
-		// Changes from 3.0.11 to 3.0.12-RC1
-		case '3.0.11':
-			$sql = 'UPDATE ' . MODULES_TABLE . '
-				SET module_auth = \'acl_u_sig\'
-				WHERE module_class = \'ucp\'
-					AND module_basename = \'profile\'
-					AND module_mode = \'signature\'';
-			_sql($sql, $errored, $error_ary);
-
-			// Update bots
-			if (!function_exists('user_delete'))
-			{
-				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-			}
-
-			$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 = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
-				$result = $db->sql_query($sql);
-				$bot_user_id = (int) $db->sql_fetchfield('user_id');
-				$db->sql_freeresult($result);
-
-				if ($bot_user_id)
-				{
-					if ($bot_agent === false)
-					{
-						$sql = 'DELETE FROM ' . BOTS_TABLE . "
-							WHERE user_id = $bot_user_id";
-						_sql($sql, $errored, $error_ary);
-
-						user_delete('remove', $bot_user_id);
-					}
-					else
-					{
-						$sql = 'UPDATE ' . BOTS_TABLE . "
-							SET bot_agent = '" .  $db->sql_escape($bot_agent) . "'
-							WHERE user_id = $bot_user_id";
-						_sql($sql, $errored, $error_ary);
-					}
-				}
-			}
-
-			// Disable receiving pms for bots
-			$sql = 'SELECT user_id
-				FROM ' . BOTS_TABLE;
-			$result = $db->sql_query($sql);
-
-			$bot_user_ids = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$bot_user_ids[] = (int) $row['user_id'];
-			}
-			$db->sql_freeresult($result);
-
-			if (!empty($bot_user_ids))
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_allow_pm = 0
-					WHERE ' . $db->sql_in_set('user_id', $bot_user_ids);
-				_sql($sql, $errored, $error_ary);
-			}
-
-			$no_updates = false;
-		break;
-
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
 
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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/config/services.yml                          |   45 +
 phpBB/config/tables.yml                            |    1 +
 phpBB/develop/create_schema_files.php              |   14 +-
 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 --
 phpBB/install/database_update.php                  | 1424 ++++++++++++++++++++
 53 files changed, 2389 insertions(+), 243 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')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 5c450a5cf6..4125491dd0 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -94,6 +94,12 @@ services:
         calls:
             - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
 
+    dbal.tools:
+        file: %core.root_path%includes/db/db_tools.%core.php_ext%
+        class: phpbb_db_tools
+        arguments:
+            - @dbal.conn
+
     event.subscriber_loader:
         class: phpbb_event_extension_subscriber_loader
         arguments:
@@ -156,6 +162,45 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
+    migrator:
+        class: phpbb_db_migrator
+        arguments:
+            - @service_container
+
+    migrator.tools_collection
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+
+    migrator.tools.config:
+        class: phpbb_db_migration_tools_config
+        arguments:
+            - @config
+        tags:
+            - { name: migrator:tool }
+
+    migrator.tools.module:
+        class: phpbb_db_migration_tools_module
+        arguments:
+            - @db
+            - @cache
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: migrator:tool }
+
+    migrator.tools.permission:
+        class: phpbb_db_migration_tools_permission
+        arguments:
+            - @db
+            - @cache
+            - @auth
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: migrator:tool }
+
     request:
         class: phpbb_request
 
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index cfc6dbcfed..a9414cf66c 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -1,3 +1,4 @@
 parameters:
     tables.config: %core.table_prefix%config
     tables.ext: %core.table_prefix%ext
+    tables.migrations: %core.table_prefix%migrations
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 3d3e478032..1abafb3b6d 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1258,7 +1258,7 @@ function get_schema_struct()
 		),
 	);
 
-	$schema_data['phpbb_moderator_cache'] = array(
+	$schema_data['phpbb_migrations'] = array(
 		'COLUMNS'		=> array(
 			'forum_id'				=> array('UINT', 0),
 			'user_id'				=> array('UINT', 0),
@@ -1273,6 +1273,18 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_moderator_cache'] = array(
+		'COLUMNS'		=> array(
+			'migration_name'			=> array('VCHAR', ''),
+			'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'),
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';
-		}
-	}
-}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1f89035b43..207ad716de 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -881,6 +881,277 @@ function _add_permission(auth_admin $auth_admin, phpbb_db_driver $db, $permissio
 function database_update_info()
 {
 	return array(
+		// Changes from 3.0.0 to the next version
+		'3.0.0'			=> array(
+			// Add the following columns
+			'add_columns'		=> array(
+				FORUMS_TABLE			=> array(
+					'display_subforum_list'		=> array('BOOL', 1),
+				),
+				SESSIONS_TABLE			=> array(
+					'session_forum_id'		=> array('UINT', 0),
+				),
+			),
+			'drop_keys'		=> array(
+				GROUPS_TABLE			=> array('group_legend'),
+			),
+			'add_index'		=> array(
+				SESSIONS_TABLE			=> array(
+					'session_forum_id'		=> array('session_forum_id'),
+				),
+				GROUPS_TABLE			=> array(
+					'group_legend_name'		=> array('group_legend', 'group_name'),
+				),
+			),
+		),
+		// No changes from 3.0.1-RC1 to 3.0.1
+		'3.0.1-RC1'		=> array(),
+		// No changes from 3.0.1 to 3.0.2-RC1
+		'3.0.1'			=> array(),
+		// Changes from 3.0.2-RC1 to 3.0.2-RC2
+		'3.0.2-RC1'		=> array(
+			'change_columns'	=> array(
+				DRAFTS_TABLE			=> array(
+					'draft_subject'		=> array('STEXT_UNI', ''),
+				),
+				FORUMS_TABLE	=> array(
+					'forum_last_post_subject' => array('STEXT_UNI', ''),
+				),
+				POSTS_TABLE		=> array(
+					'post_subject'			=> array('STEXT_UNI', '', 'true_sort'),
+				),
+				PRIVMSGS_TABLE	=> array(
+					'message_subject'		=> array('STEXT_UNI', ''),
+				),
+				TOPICS_TABLE	=> array(
+					'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
+					'topic_last_post_subject'	=> array('STEXT_UNI', ''),
+				),
+			),
+			'drop_keys'		=> array(
+				SESSIONS_TABLE			=> array('session_forum_id'),
+			),
+			'add_index'		=> array(
+				SESSIONS_TABLE			=> array(
+					'session_fid'		=> array('session_forum_id'),
+				),
+			),
+		),
+		// No changes from 3.0.2-RC2 to 3.0.2
+		'3.0.2-RC2'		=> array(),
+
+		// Changes from 3.0.2 to 3.0.3-RC1
+		'3.0.2'			=> array(
+			// Add the following columns
+			'add_columns'		=> array(
+				STYLES_TEMPLATE_TABLE			=> array(
+					'template_inherits_id'		=> array('UINT:4', 0),
+					'template_inherit_path'		=> array('VCHAR', ''),
+				),
+				GROUPS_TABLE					=> array(
+					'group_max_recipients'		=> array('UINT', 0),
+				),
+			),
+		),
+
+		// No changes from 3.0.3-RC1 to 3.0.3
+		'3.0.3-RC1'		=> array(),
+
+		// Changes from 3.0.3 to 3.0.4-RC1
+		'3.0.3'			=> array(
+			'add_columns'		=> array(
+				PROFILE_FIELDS_TABLE			=> array(
+					'field_show_profile'		=> array('BOOL', 0),
+				),
+			),
+			'change_columns'	=> array(
+				STYLES_TABLE				=> array(
+					'style_id'				=> array('UINT', NULL, 'auto_increment'),
+					'template_id'			=> array('UINT', 0),
+					'theme_id'				=> array('UINT', 0),
+					'imageset_id'			=> array('UINT', 0),
+				),
+				STYLES_IMAGESET_TABLE		=> array(
+					'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+				),
+				STYLES_IMAGESET_DATA_TABLE	=> array(
+					'image_id'				=> array('UINT', NULL, 'auto_increment'),
+					'imageset_id'			=> array('UINT', 0),
+				),
+				STYLES_THEME_TABLE			=> array(
+					'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+				),
+				STYLES_TEMPLATE_TABLE		=> array(
+					'template_id'			=> array('UINT', NULL, 'auto_increment'),
+				),
+				STYLES_TEMPLATE_DATA_TABLE	=> array(
+					'template_id'			=> array('UINT', 0),
+				),
+				FORUMS_TABLE				=> array(
+					'forum_style'			=> array('UINT', 0),
+				),
+				USERS_TABLE					=> array(
+					'user_style'			=> array('UINT', 0),
+				),
+			),
+		),
+
+		// Changes from 3.0.4-RC1 to 3.0.4
+		'3.0.4-RC1'		=> array(),
+
+		// Changes from 3.0.4 to 3.0.5-RC1
+		'3.0.4'			=> array(
+			'change_columns'	=> array(
+				FORUMS_TABLE				=> array(
+					'forum_style'			=> array('UINT', 0),
+				),
+			),
+		),
+
+		// No changes from 3.0.5-RC1 to 3.0.5
+		'3.0.5-RC1'		=> array(),
+
+		// Changes from 3.0.5 to 3.0.6-RC1
+		'3.0.5'		=> array(
+			'add_columns'		=> array(
+				CONFIRM_TABLE			=> array(
+					'attempts'		=> array('UINT', 0),
+				),
+				USERS_TABLE			=> array(
+					'user_new'			=> array('BOOL', 1),
+					'user_reminded'		=> array('TINT:4', 0),
+					'user_reminded_time'=> array('TIMESTAMP', 0),
+				),
+				GROUPS_TABLE			=> array(
+					'group_skip_auth'		=> array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+				PRIVMSGS_TABLE		=> array(
+					'message_reported'	=> array('BOOL', 0),
+				),
+				REPORTS_TABLE		=> array(
+					'pm_id'				=> array('UINT', 0),
+				),
+				PROFILE_FIELDS_TABLE			=> array(
+					'field_show_on_vt'		=> array('BOOL', 0),
+				),
+				FORUMS_TABLE		=> array(
+					'forum_options'			=> array('UINT:20', 0),
+				),
+			),
+			'change_columns'		=> array(
+				USERS_TABLE				=> array(
+					'user_options'		=> array('UINT:11', 230271),
+				),
+			),
+			'add_index'		=> array(
+				REPORTS_TABLE		=> array(
+					'post_id'		=> array('post_id'),
+					'pm_id'			=> array('pm_id'),
+				),
+				POSTS_TABLE			=> array(
+					'post_username'		=> array('post_username:255'),
+				),
+			),
+		),
+
+		// No changes from 3.0.6-RC1 to 3.0.6-RC2
+		'3.0.6-RC1'		=> array(),
+		// No changes from 3.0.6-RC2 to 3.0.6-RC3
+		'3.0.6-RC2'		=> array(),
+		// No changes from 3.0.6-RC3 to 3.0.6-RC4
+		'3.0.6-RC3'		=> array(),
+		// No changes from 3.0.6-RC4 to 3.0.6
+		'3.0.6-RC4'		=> array(),
+
+		// Changes from 3.0.6 to 3.0.7-RC1
+		'3.0.6'		=> array(
+			'drop_keys'		=> array(
+				LOG_TABLE			=> array('log_time'),
+			),
+			'add_index'		=> array(
+				TOPICS_TRACK_TABLE	=> array(
+					'topic_id'		=> array('topic_id'),
+				),
+			),
+		),
+
+		// No changes from 3.0.7-RC1 to 3.0.7-RC2
+		'3.0.7-RC1'		=> array(),
+		// No changes from 3.0.7-RC2 to 3.0.7
+		'3.0.7-RC2'		=> array(),
+		// No changes from 3.0.7 to 3.0.7-PL1
+		'3.0.7'		=> array(),
+		// No changes from 3.0.7-PL1 to 3.0.8-RC1
+		'3.0.7-PL1'		=> array(),
+		// No changes from 3.0.8-RC1 to 3.0.8
+		'3.0.8-RC1'		=> array(),
+		// Changes from 3.0.8 to 3.0.9-RC1
+		'3.0.8'			=> array(
+			'add_tables'		=> array(
+				LOGIN_ATTEMPT_TABLE	=> 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(
+				BBCODES_TABLE	=> array(
+					'bbcode_id'	=> array('USINT', 0),
+				),
+			),
+		),
+		// No changes from 3.0.9-RC1 to 3.0.9-RC2
+		'3.0.9-RC1'		=> array(),
+		// No changes from 3.0.9-RC2 to 3.0.9-RC3
+		'3.0.9-RC2'		=> array(),
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		'3.0.9-RC3'     => array(),
+		// No changes from 3.0.9-RC4 to 3.0.9
+		'3.0.9-RC4'     => array(),
+		// No changes from 3.0.9 to 3.0.10-RC1
+		'3.0.9'			=> array(),
+		// No changes from 3.0.10-RC1 to 3.0.10-RC2
+		'3.0.10-RC1'	=> array(),
+		// No changes from 3.0.10-RC2 to 3.0.10-RC3
+		'3.0.10-RC2'	=> array(),
+		// No changes from 3.0.10-RC3 to 3.0.10
+		'3.0.10-RC3'	=> array(),
+		// No changes from 3.0.10 to 3.0.11-RC1
+		'3.0.10'		=> array(),
+		// Changes from 3.0.11-RC1 to 3.0.11-RC2
+		'3.0.11-RC1'	=> array(
+			'add_columns'		=> array(
+				PROFILE_FIELDS_TABLE			=> array(
+					'field_show_novalue'		=> array('BOOL', 0),
+				),
+			),
+		),
+		// No changes from 3.0.11-RC2 to 3.0.11
+		'3.0.11-RC2'	=> array(),
+		// No changes from 3.0.11 to 3.0.12-RC1
+		'3.0.11'		=> array(),
+
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
+
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		'3.1.0-dev'		=> array(
 			'add_tables'		=> array(
@@ -939,6 +1210,1159 @@ function change_database_data(&$no_updates, $version)
 
 	switch ($version)
 	{
+		case '3.0.0':
+
+			$sql = 'UPDATE ' . TOPICS_TABLE . "
+				SET topic_last_view_time = topic_last_post_time
+				WHERE topic_last_view_time = 0";
+			_sql($sql, $errored, $error_ary);
+
+			// 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($phpbb_root_path . 'images/smilies/' . $smiley))
+				{
+					list($width, $height) = getimagesize($phpbb_root_path . 'images/smilies/' . $smiley);
+
+					$sql = 'UPDATE ' . SMILIES_TABLE . '
+						SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+						WHERE smiley_url = '" . $db->sql_escape($smiley) . "'";
+
+					_sql($sql, $errored, $error_ary);
+				}
+			}
+
+			$no_updates = false;
+		break;
+
+		// No changes from 3.0.1-RC1 to 3.0.1
+		case '3.0.1-RC1':
+		break;
+
+		// changes from 3.0.1 to 3.0.2-RC1
+		case '3.0.1':
+
+			set_config('referer_validation', '1');
+			set_config('check_attachment_content', '1');
+			set_config('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title');
+
+			$no_updates = false;
+		break;
+
+		// No changes from 3.0.2-RC1 to 3.0.2-RC2
+		case '3.0.2-RC1':
+		break;
+
+		// No changes from 3.0.2-RC2 to 3.0.2
+		case '3.0.2-RC2':
+		break;
+
+		// Changes from 3.0.2 to 3.0.3-RC1
+		case '3.0.2':
+			set_config('enable_queue_trigger', '0');
+			set_config('queue_trigger_posts', '3');
+
+			set_config('pm_max_recipients', '0');
+
+			// Set maximum number of recipients for the registered users, bots, guests group
+			$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
+				WHERE ' . $db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
+			_sql($sql, $errored, $error_ary);
+
+			// 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);
+
+			$no_updates = false;
+		break;
+
+		// Changes from 3.0.3-RC1 to 3.0.3
+		case '3.0.3-RC1':
+			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);
+			}
+
+			$no_updates = false;
+		break;
+
+		// Changes from 3.0.3 to 3.0.4-RC1
+		case '3.0.3':
+			// 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);
+			}
+			$no_updates = false;
+
+		break;
+
+		// Changes from 3.0.4-RC1 to 3.0.4
+		case '3.0.4-RC1':
+		break;
+
+		// Changes from 3.0.4 to 3.0.5-RC1
+		case '3.0.4':
+
+			// 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);
+			}
+
+			$no_updates = false;
+
+		break;
+
+		// No changes from 3.0.5-RC1 to 3.0.5
+		case '3.0.5-RC1':
+		break;
+
+		// Changes from 3.0.5 to 3.0.6-RC1
+		case '3.0.5':
+			// 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']);
+			}
+
+			$no_updates = false;
+		break;
+
+		// No changes from 3.0.6-RC1 to 3.0.6-RC2
+		case '3.0.6-RC1':
+		break;
+
+		// Changes from 3.0.6-RC2 to 3.0.6-RC3
+		case '3.0.6-RC2':
+
+			// 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);
+			$no_updates = false;
+
+		break;
+
+		// No changes from 3.0.6-RC3 to 3.0.6-RC4
+		case '3.0.6-RC3':
+		break;
+
+		// No changes from 3.0.6-RC4 to 3.0.6
+		case '3.0.6-RC4':
+		break;
+
+		// Changes from 3.0.6 to 3.0.7-RC1
+		case '3.0.6':
+
+			// 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);
+
+			$no_updates = false;
+		break;
+
+		// Changes from 3.0.7-RC1 to 3.0.7-RC2
+		case '3.0.7-RC1':
+
+			$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);
+
+			$no_updates = false;
+
+		break;
+
+		// No changes from 3.0.7-RC2 to 3.0.7
+		case '3.0.7-RC2':
+		break;
+
+		// No changes from 3.0.7 to 3.0.7-PL1
+		case '3.0.7':
+		break;
+
+		// Changes from 3.0.7-PL1 to 3.0.8-RC1
+		case '3.0.7-PL1':
+			// 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'			=> 'UTC',
+					'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');
+			}
+
+			$no_updates = false;
+		break;
+
+		// No changes from 3.0.8-RC1 to 3.0.8
+		case '3.0.8-RC1':
+		break;
+
+		// Changes from 3.0.8 to 3.0.9-RC1
+		case '3.0.8':
+			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);
+					}
+				}
+			}
+
+			$no_updates = false;
+		break;
+
+		// No changes from 3.0.9-RC1 to 3.0.9-RC2
+		case '3.0.9-RC1':
+		break;
+
+		// No changes from 3.0.9-RC2 to 3.0.9-RC3
+		case '3.0.9-RC2':
+		break;
+
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		case '3.0.9-RC3':
+		break;
+
+		// No changes from 3.0.9-RC4 to 3.0.9
+		case '3.0.9-RC4':
+		break;
+
+		// Changes from 3.0.9 to 3.0.10-RC1
+		case '3.0.9':
+			if (!isset($config['email_max_chunk_size']))
+			{
+				set_config('email_max_chunk_size', '50');
+			}
+
+			$no_updates = false;
+		break;
+
+		// No changes from 3.0.10-RC1 to 3.0.10-RC2
+		case '3.0.10-RC1':
+		break;
+
+		// No changes from 3.0.10-RC2 to 3.0.10-RC3
+		case '3.0.10-RC2':
+		break;
+
+		// No changes from 3.0.10-RC3 to 3.0.10
+		case '3.0.10-RC3':
+		break;
+
+		// Changes from 3.0.10 to 3.0.11-RC1
+		case '3.0.10':
+			// 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);
+
+			$no_updates = false;
+		break;
+
+		// No changes from 3.0.11-RC1 to 3.0.11-RC2
+		case '3.0.11-RC1':
+		break;
+
+		// No changes from 3.0.11-RC2 to 3.0.11
+		case '3.0.11-RC2':
+		break;
+
+		// Changes from 3.0.11 to 3.0.12-RC1
+		case '3.0.11':
+			$sql = 'UPDATE ' . MODULES_TABLE . '
+				SET module_auth = \'acl_u_sig\'
+				WHERE module_class = \'ucp\'
+					AND module_basename = \'profile\'
+					AND module_mode = \'signature\'';
+			_sql($sql, $errored, $error_ary);
+
+			// Update bots
+			if (!function_exists('user_delete'))
+			{
+				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			}
+
+			$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 = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
+				$result = $db->sql_query($sql);
+				$bot_user_id = (int) $db->sql_fetchfield('user_id');
+				$db->sql_freeresult($result);
+
+				if ($bot_user_id)
+				{
+					if ($bot_agent === false)
+					{
+						$sql = 'DELETE FROM ' . BOTS_TABLE . "
+							WHERE user_id = $bot_user_id";
+						_sql($sql, $errored, $error_ary);
+
+						user_delete('remove', $bot_user_id);
+					}
+					else
+					{
+						$sql = 'UPDATE ' . BOTS_TABLE . "
+							SET bot_agent = '" .  $db->sql_escape($bot_agent) . "'
+							WHERE user_id = $bot_user_id";
+						_sql($sql, $errored, $error_ary);
+					}
+				}
+			}
+
+			$no_updates = false;
+		break;
+
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
 
-- 
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')

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')

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')

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/config/migrator.yml                          |   49 +
 phpBB/config/services.yml                          |   40 +-
 phpBB/config/tables.yml                            |    1 +
 phpBB/develop/create_schema_files.php              |    4 +-
 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 +-
 phpBB/install/database_update.php                  |   65 +-
 phpBB/install/schemas/firebird_schema.sql          |   29 +-
 phpBB/install/schemas/mssql_schema.sql             |   42 +-
 phpBB/install/schemas/mysql_40_schema.sql          |   26 +-
 phpBB/install/schemas/mysql_41_schema.sql          |   26 +-
 phpBB/install/schemas/oracle_schema.sql            |   32 +-
 phpBB/install/schemas/postgres_schema.sql          |   30 +-
 phpBB/install/schemas/sqlite_schema.sql            |   28 +-
 phpBB/test.php                                     |  121 +
 42 files changed, 2037 insertions(+), 4521 deletions(-)
 create mode 100644 phpBB/config/migrator.yml
 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
 create mode 100644 phpBB/test.php

(limited to 'phpBB')

diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml
new file mode 100644
index 0000000000..999a2d41a3
--- /dev/null
+++ b/phpBB/config/migrator.yml
@@ -0,0 +1,49 @@
+services:
+    migrator:
+        class: phpbb_db_migrator
+        arguments:
+            - @config
+            - @dbal.conn
+            - @dbal.tools
+            - %tables.migrations%
+            - %core.root_path%
+            - %core.php_ext%
+            - %core.table_prefix%
+            - @migrator.tool_collection
+
+    migrator.tool_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: migrator.tool }
+
+    migrator.tool.config:
+        class: phpbb_db_migration_tool_config
+        arguments:
+            - @config
+        tags:
+            - { name: migrator.tool }
+
+    migrator.tool.module:
+        class: phpbb_db_migration_tool_module
+        arguments:
+            - @dbal.conn
+            - @cache
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.modules%
+        tags:
+            - { name: migrator.tool }
+
+    migrator.tool.permission:
+        class: phpbb_db_migration_tool_permission
+        arguments:
+            - @dbal.conn
+            - @cache
+            - @auth
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: migrator.tool }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 4125491dd0..ee52ca2800 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -1,6 +1,7 @@
 imports:
     - { resource: tables.yml }
     - { resource: cron_tasks.yml }
+    - { resource: migrator.yml }
 
 services:
     auth:
@@ -162,45 +163,6 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
-    migrator:
-        class: phpbb_db_migrator
-        arguments:
-            - @service_container
-
-    migrator.tools_collection
-        class: phpbb_di_service_collection
-        arguments:
-            - @service_container
-
-    migrator.tools.config:
-        class: phpbb_db_migration_tools_config
-        arguments:
-            - @config
-        tags:
-            - { name: migrator:tool }
-
-    migrator.tools.module:
-        class: phpbb_db_migration_tools_module
-        arguments:
-            - @db
-            - @cache
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
-        tags:
-            - { name: migrator:tool }
-
-    migrator.tools.permission:
-        class: phpbb_db_migration_tools_permission
-        arguments:
-            - @db
-            - @cache
-            - @auth
-            - %core.root_path%
-            - %core.php_ext%
-        tags:
-            - { name: migrator:tool }
-
     request:
         class: phpbb_request
 
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index a9414cf66c..dd53417b1c 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -2,3 +2,4 @@ parameters:
     tables.config: %core.table_prefix%config
     tables.ext: %core.table_prefix%ext
     tables.migrations: %core.table_prefix%migrations
+    tables.modules: %core.table_prefix%modules
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 1abafb3b6d..b37dcc246f 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1258,7 +1258,7 @@ function get_schema_struct()
 		),
 	);
 
-	$schema_data['phpbb_migrations'] = array(
+	$schema_data['phpbb_moderator_cache'] = array(
 		'COLUMNS'		=> array(
 			'forum_id'				=> array('UINT', 0),
 			'user_id'				=> array('UINT', 0),
@@ -1273,7 +1273,7 @@ function get_schema_struct()
 		),
 	);
 
-	$schema_data['phpbb_moderator_cache'] = array(
+	$schema_data['phpbb_migrations'] = array(
 		'COLUMNS'		=> array(
 			'migration_name'			=> array('VCHAR', ''),
 			'migration_schema_done'		=> array('BOOL', 0),
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;
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 207ad716de..8950d677ae 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1521,8 +1521,6 @@ function change_database_data(&$no_updates, $version)
 				),
 			);
 
-			global $db_tools;
-
 			$statements = $db_tools->perform_schema_changes($changes);
 
 			foreach ($statements as $sql)
@@ -2164,26 +2162,41 @@ function change_database_data(&$no_updates, $version)
 			}
 			$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
+			/*
+			* Due to a bug, vanilla phpbb could not create captcha tables
+			* in 3.0.8 on firebird. It was possible for board administrators
+			* to adjust the code to work. If code was manually adjusted by
+			* board administrators, index names would not be the same as
+			* what 3.0.9 and newer expect. This code fragment drops captcha
+			* tables, destroying all entered Q&A captcha configuration, such
+			* that when Q&A is configured next the respective tables will be
+			* created with correct index names.
+			*
+			* If you wish to preserve your Q&A captcha configuration, you can
+			* manually rename indexes to the currently expected name:
+			* 	phpbb_captcha_questions_lang_iso	=> phpbb_captcha_questions_lang
+			* 	phpbb_captcha_answers_question_id	=> phpbb_captcha_answers_qid
+			*
+			* Again, this needs to be done only if a board was manually modified
+			* to fix broken captcha code.
+			*
 			if ($db_tools->sql_layer == 'firebird')
 			{
-				$tables = array(
-					$table_prefix . 'captcha_questions',
-					$table_prefix . 'captcha_answers',
-					$table_prefix . 'qa_confirm',
+				$changes = array(
+					'drop_tables'	=> array(
+						$table_prefix . 'captcha_questions',
+						$table_prefix . 'captcha_answers',
+						$table_prefix . 'qa_confirm',
+					),
 				);
-				foreach ($tables as $table)
+				$statements = $db_tools->perform_schema_changes($changes);
+
+				foreach ($statements as $sql)
 				{
-					if ($db_tools->sql_table_exists($table))
-					{
-						$db_tools->sql_table_drop($table);
-					}
+					_sql($sql, $errored, $error_ary);
 				}
 			}
+			*/
 
 			$no_updates = false;
 		break;
@@ -2360,6 +2373,26 @@ function change_database_data(&$no_updates, $version)
 				}
 			}
 
+			// Disable receiving pms for bots
+			$sql = 'SELECT user_id
+				FROM ' . BOTS_TABLE;
+			$result = $db->sql_query($sql);
+
+			$bot_user_ids = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$bot_user_ids[] = (int) $row['user_id'];
+			}
+			$db->sql_freeresult($result);
+
+			if (!empty($bot_user_ids))
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_allow_pm = 0
+					WHERE ' . $db->sql_in_set('user_id', $bot_user_ids);
+				_sql($sql, $errored, $error_ary);
+			}
+
 			$no_updates = false;
 		break;
 
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 43099fc33b..535cbb0df4 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -573,18 +573,6 @@ CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwar
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);;
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
 
-# Table: 'phpbb_migrations'
-CREATE TABLE phpbb_migrations (
-	migration_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	migration_schema_done INTEGER DEFAULT 0 NOT NULL,
-	migration_data_done INTEGER DEFAULT 0 NOT NULL,
-	migration_data_state BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL,
-	migration_start_time INTEGER DEFAULT 0 NOT NULL,
-	migration_end_time INTEGER DEFAULT 0 NOT NULL
-);;
-
-CREATE UNIQUE INDEX phpbb_migrations_migration_name ON phpbb_migrations(migration_name);;
-
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER DEFAULT 0 NOT NULL,
@@ -598,6 +586,19 @@ CREATE TABLE phpbb_moderator_cache (
 CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache(display_on_index);;
 CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache(forum_id);;
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	migration_schema_done INTEGER DEFAULT 0 NOT NULL,
+	migration_data_done INTEGER DEFAULT 0 NOT NULL,
+	migration_data_state BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL,
+	migration_start_time INTEGER DEFAULT 0 NOT NULL,
+	migration_end_time INTEGER DEFAULT 0 NOT NULL
+);;
+
+ALTER TABLE phpbb_migrations ADD PRIMARY KEY (migration_name);;
+
+
 # Table: 'phpbb_modules'
 CREATE TABLE phpbb_modules (
 	module_id INTEGER NOT NULL,
@@ -924,8 +925,8 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER DEFAULT 0 NOT NULL,
 	report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
-	reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL
+	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 1174cdfa3d..43b8f3e556 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -696,23 +696,6 @@ CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]
 GO
 
 
-/*
-	Table: 'phpbb_migrations'
-*/
-CREATE TABLE [phpbb_migrations] (
-	[migration_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[migration_schema_done] [int] DEFAULT (0) NOT NULL ,
-	[migration_data_done] [int] DEFAULT (0) NOT NULL ,
-	[migration_data_state] [varchar] (8000) DEFAULT ('') NOT NULL ,
-	[migration_start_time] [int] DEFAULT (0) NOT NULL ,
-	[migration_end_time] [int] DEFAULT (0) NOT NULL 
-) ON [PRIMARY]
-GO
-
-CREATE  UNIQUE  INDEX [migration_name] ON [phpbb_migrations]([migration_name]) ON [PRIMARY]
-GO
-
-
 /*
 	Table: 'phpbb_moderator_cache'
 */
@@ -733,6 +716,27 @@ CREATE  INDEX [forum_id] ON [phpbb_moderator_cache]([forum_id]) ON [PRIMARY]
 GO
 
 
+/*
+	Table: 'phpbb_migrations'
+*/
+CREATE TABLE [phpbb_migrations] (
+	[migration_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[migration_schema_done] [int] DEFAULT (0) NOT NULL ,
+	[migration_data_done] [int] DEFAULT (0) NOT NULL ,
+	[migration_data_state] [varchar] (8000) DEFAULT ('') NOT NULL ,
+	[migration_start_time] [int] DEFAULT (0) NOT NULL ,
+	[migration_end_time] [int] DEFAULT (0) NOT NULL 
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [phpbb_migrations] WITH NOCHECK ADD 
+	CONSTRAINT [PK_phpbb_migrations] PRIMARY KEY  CLUSTERED 
+	(
+		[migration_name]
+	)  ON [PRIMARY] 
+GO
+
+
 /*
 	Table: 'phpbb_modules'
 */
@@ -1128,8 +1132,8 @@ CREATE TABLE [phpbb_reports] (
 	[report_time] [int] DEFAULT (0) NOT NULL ,
 	[report_text] [text] DEFAULT ('') NOT NULL ,
 	[reported_post_text] [text] DEFAULT ('') NOT NULL ,
-	[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL 
+	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
+	[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index d645c3384d..c46230744a 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -397,18 +397,6 @@ CREATE TABLE phpbb_login_attempts (
 );
 
 
-# Table: 'phpbb_migrations'
-CREATE TABLE phpbb_migrations (
-	migration_name varbinary(255) DEFAULT '' NOT NULL,
-	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	migration_data_state blob NOT NULL,
-	migration_start_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	migration_end_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	UNIQUE migration_name (migration_name)
-);
-
-
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -422,6 +410,18 @@ CREATE TABLE phpbb_moderator_cache (
 );
 
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name varbinary(255) DEFAULT '' NOT NULL,
+	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_state blob NOT NULL,
+	migration_start_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_end_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	PRIMARY KEY (migration_name)
+);
+
+
 # Table: 'phpbb_modules'
 CREATE TABLE phpbb_modules (
 	module_id mediumint(8) UNSIGNED NOT NULL auto_increment,
@@ -661,8 +661,8 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumblob NOT NULL,
 	reported_post_text mediumblob NOT NULL,
-	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	reported_post_uid varbinary(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index d10f2dc55a..fa94598e9c 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -397,18 +397,6 @@ CREATE TABLE phpbb_login_attempts (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
-# Table: 'phpbb_migrations'
-CREATE TABLE phpbb_migrations (
-	migration_name varchar(255) DEFAULT '' NOT NULL,
-	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	migration_data_state text NOT NULL,
-	migration_start_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	migration_end_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	UNIQUE migration_name (migration_name)
-) CHARACTER SET `utf8` COLLATE `utf8_bin`;
-
-
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -422,6 +410,18 @@ CREATE TABLE phpbb_moderator_cache (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name varchar(255) DEFAULT '' NOT NULL,
+	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_data_state text NOT NULL,
+	migration_start_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	migration_end_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	PRIMARY KEY (migration_name)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_modules'
 CREATE TABLE phpbb_modules (
 	module_id mediumint(8) UNSIGNED NOT NULL auto_increment,
@@ -661,8 +661,8 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumtext NOT NULL,
 	reported_post_text mediumtext NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 9993caeb7a..f8a9d5e1a6 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -780,21 +780,6 @@ CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
 /
 
-/*
-	Table: 'phpbb_migrations'
-*/
-CREATE TABLE phpbb_migrations (
-	migration_name varchar2(255) DEFAULT '' ,
-	migration_schema_done number(1) DEFAULT '0' NOT NULL,
-	migration_data_done number(1) DEFAULT '0' NOT NULL,
-	migration_data_state clob DEFAULT '' ,
-	migration_start_time number(11) DEFAULT '0' NOT NULL,
-	migration_end_time number(11) DEFAULT '0' NOT NULL,
-	CONSTRAINT u_phpbb_migration_name UNIQUE (migration_name)
-)
-/
-
-
 /*
 	Table: 'phpbb_moderator_cache'
 */
@@ -813,6 +798,21 @@ CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on
 CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id)
 /
 
+/*
+	Table: 'phpbb_migrations'
+*/
+CREATE TABLE phpbb_migrations (
+	migration_name varchar2(255) DEFAULT '' ,
+	migration_schema_done number(1) DEFAULT '0' NOT NULL,
+	migration_data_done number(1) DEFAULT '0' NOT NULL,
+	migration_data_state clob DEFAULT '' ,
+	migration_start_time number(11) DEFAULT '0' NOT NULL,
+	migration_end_time number(11) DEFAULT '0' NOT NULL,
+	CONSTRAINT pk_phpbb_migrations PRIMARY KEY (migration_name)
+)
+/
+
+
 /*
 	Table: 'phpbb_modules'
 */
@@ -1231,8 +1231,8 @@ CREATE TABLE phpbb_reports (
 	report_time number(11) DEFAULT '0' NOT NULL,
 	report_text clob DEFAULT '' ,
 	reported_post_text clob DEFAULT '' ,
-	reported_post_bitfield varchar2(255) DEFAULT '' ,
 	reported_post_uid varchar2(8) DEFAULT '' ,
+	reported_post_bitfield varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index ef138dac0f..c976659f05 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -557,20 +557,6 @@ CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwa
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
-/*
-	Table: 'phpbb_migrations'
-*/
-CREATE TABLE phpbb_migrations (
-	migration_name varchar(255) DEFAULT '' NOT NULL,
-	migration_schema_done INT2 DEFAULT '0' NOT NULL CHECK (migration_schema_done >= 0),
-	migration_data_done INT2 DEFAULT '0' NOT NULL CHECK (migration_data_done >= 0),
-	migration_data_state varchar(8000) DEFAULT '' NOT NULL,
-	migration_start_time INT4 DEFAULT '0' NOT NULL CHECK (migration_start_time >= 0),
-	migration_end_time INT4 DEFAULT '0' NOT NULL CHECK (migration_end_time >= 0)
-);
-
-CREATE UNIQUE INDEX phpbb_migrations_migration_name ON phpbb_migrations (migration_name);
-
 /*
 	Table: 'phpbb_moderator_cache'
 */
@@ -586,6 +572,20 @@ CREATE TABLE phpbb_moderator_cache (
 CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on_index);
 CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);
 
+/*
+	Table: 'phpbb_migrations'
+*/
+CREATE TABLE phpbb_migrations (
+	migration_name varchar(255) DEFAULT '' NOT NULL,
+	migration_schema_done INT2 DEFAULT '0' NOT NULL CHECK (migration_schema_done >= 0),
+	migration_data_done INT2 DEFAULT '0' NOT NULL CHECK (migration_data_done >= 0),
+	migration_data_state varchar(8000) DEFAULT '' NOT NULL,
+	migration_start_time INT4 DEFAULT '0' NOT NULL CHECK (migration_start_time >= 0),
+	migration_end_time INT4 DEFAULT '0' NOT NULL CHECK (migration_end_time >= 0),
+	PRIMARY KEY (migration_name)
+);
+
+
 /*
 	Table: 'phpbb_modules'
 */
@@ -869,8 +869,8 @@ CREATE TABLE phpbb_reports (
 	report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
 	report_text TEXT DEFAULT '' NOT NULL,
 	reported_post_text TEXT DEFAULT '' NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 309297779e..31a6f715a0 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -385,18 +385,6 @@ CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwa
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
-# Table: 'phpbb_migrations'
-CREATE TABLE phpbb_migrations (
-	migration_name varchar(255) NOT NULL DEFAULT '',
-	migration_schema_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	migration_data_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	migration_data_state text(65535) NOT NULL DEFAULT '',
-	migration_start_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	migration_end_time INTEGER UNSIGNED NOT NULL DEFAULT '0'
-);
-
-CREATE UNIQUE INDEX phpbb_migrations_migration_name ON phpbb_migrations (migration_name);
-
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
@@ -410,6 +398,18 @@ CREATE TABLE phpbb_moderator_cache (
 CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on_index);
 CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);
 
+# Table: 'phpbb_migrations'
+CREATE TABLE phpbb_migrations (
+	migration_name varchar(255) NOT NULL DEFAULT '',
+	migration_schema_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	migration_data_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	migration_data_state text(65535) NOT NULL DEFAULT '',
+	migration_start_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	migration_end_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	PRIMARY KEY (migration_name)
+);
+
+
 # Table: 'phpbb_modules'
 CREATE TABLE phpbb_modules (
 	module_id INTEGER PRIMARY KEY NOT NULL ,
@@ -642,8 +642,8 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_text mediumtext(16777215) NOT NULL DEFAULT '',
 	reported_post_text mediumtext(16777215) NOT NULL DEFAULT '',
-	reported_post_bitfield varchar(255) NOT NULL DEFAULT '',
-	reported_post_uid varchar(8) NOT NULL DEFAULT ''
+	reported_post_uid varchar(8) NOT NULL DEFAULT '',
+	reported_post_bitfield varchar(255) NOT NULL DEFAULT ''
 );
 
 CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
diff --git a/phpBB/test.php b/phpBB/test.php
new file mode 100644
index 0000000000..5887c08d2f
--- /dev/null
+++ b/phpBB/test.php
@@ -0,0 +1,121 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+/**
+* @ignore
+*/
+define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
+
+if (file_exists($phpbb_root_path . 'config.' . $phpEx))
+{
+	require($phpbb_root_path . 'config.' . $phpEx);
+}
+
+// Include files
+require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+
+require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
+
+require($phpbb_root_path . 'includes/constants.' . $phpEx);
+require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
+
+// Set PHP error handler to ours
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
+
+// Setup class loader first
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
+$phpbb_class_loader->register();
+
+/*$phpbb_container = phpbb_create_container(
+	array(
+		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+		new phpbb_di_extension_core($phpbb_root_path),
+	),
+	array(
+		new phpbb_di_pass_collection_pass(),
+		new phpbb_di_pass_kernel_pass(),
+	),
+	$phpbb_root_path, $phpEx);
+$phpbb_container->compile();*/
+
+// Set up container
+$container_extensions = array(
+	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+	new phpbb_di_extension_core($phpbb_root_path),
+);
+$container_passes = array(
+	new phpbb_di_pass_collection_pass(),
+	//new phpbb_di_pass_kernel_pass(),
+);
+$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
+
+// Compile the container
+foreach ($container_passes as $pass)
+{
+	$phpbb_container->addCompilerPass($pass);
+}
+$phpbb_container->compile();
+
+// set up caching
+$cache = $phpbb_container->get('cache');
+
+// Instantiate some basic classes
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
+$user		= $phpbb_container->get('user');
+$auth		= $phpbb_container->get('auth');
+$db			= $phpbb_container->get('dbal.conn');
+
+// make sure request_var uses this request instance
+request_var('', 0, false, false, $request); // "dependency injection" for a function
+
+// Grab global variables, re-cache if necessary
+$config = $phpbb_container->get('config');
+set_config(null, null, null, $config);
+set_config_count(null, null, null, $config);
+
+// End startup code
+
+$db_tools = $phpbb_container->get('dbal.tools');
+if (!$db_tools->sql_table_exists(MIGRATIONS_TABLE))
+{
+	$db_tools->sql_create_table(MIGRATIONS_TABLE, array(
+		'COLUMNS'		=> array(
+			'migration_name'			=> array('VCHAR', ''),
+			'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',
+	));
+}
+
+$migrator = $phpbb_container->get('migrator');
+$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
+
+while (!$migrator->finished())
+{
+	$migrator->update();
+
+	echo $migrator->last_run_migration['name'] . '<br />';
+}
+
+echo 'Finished';
-- 
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')

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')

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')

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')

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')

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')

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')

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 79818c2139c305147d53ffb7217bec7568ff8b9c Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 17:20:12 -0600
Subject: [feature/migrations] Stop the update process if we are approaching
 time limit

PHPBB3-9737
---
 phpBB/test.php | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/test.php b/phpBB/test.php
index 5887c08d2f..ed4c1928ee 100644
--- a/phpBB/test.php
+++ b/phpBB/test.php
@@ -7,6 +7,8 @@
 *
 */
 
+$update_start_time = time();
+
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
@@ -42,18 +44,6 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle
 $phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
 $phpbb_class_loader->register();
 
-/*$phpbb_container = phpbb_create_container(
-	array(
-		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-		new phpbb_di_extension_core($phpbb_root_path),
-	),
-	array(
-		new phpbb_di_pass_collection_pass(),
-		new phpbb_di_pass_kernel_pass(),
-	),
-	$phpbb_root_path, $phpEx);
-$phpbb_container->compile();*/
-
 // Set up container
 $container_extensions = array(
 	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
@@ -111,11 +101,27 @@ if (!$db_tools->sql_table_exists(MIGRATIONS_TABLE))
 $migrator = $phpbb_container->get('migrator');
 $migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
 
+$safe_time_limit = (ini_get('max_execution_time') / 2);
+
 while (!$migrator->finished())
 {
 	$migrator->update();
 
 	echo $migrator->last_run_migration['name'] . '<br />';
+
+	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+	if ((time() - $update_start_time) >= $safe_time_limit)
+	{
+		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
+		echo 'Update not yet completed.<br />';
+		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
+
+		garbage_collection();
+		exit_handler();
+	}
 }
 
 echo 'Finished';
+
+garbage_collection();
+exit_handler();
-- 
cgit v1.2.1


From 28cd253d19f49a6450bce90a5b81df939d0be2c9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 17:22:05 -0600
Subject: [feature/migrations] Comment

PHPBB3-9737
---
 phpBB/test.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/test.php b/phpBB/test.php
index ed4c1928ee..7a2dafb7ef 100644
--- a/phpBB/test.php
+++ b/phpBB/test.php
@@ -101,6 +101,7 @@ if (!$db_tools->sql_table_exists(MIGRATIONS_TABLE))
 $migrator = $phpbb_container->get('migrator');
 $migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
 
+// 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);
 
 while (!$migrator->finished())
-- 
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')

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')

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')

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')

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/develop/create_schema_files.php     |  1 +
 phpBB/includes/db/migrator.php            | 79 ++++++++++++++++++-------------
 phpBB/install/schemas/firebird_schema.sql |  1 +
 phpBB/install/schemas/mssql_schema.sql    |  1 +
 phpBB/install/schemas/mysql_40_schema.sql |  1 +
 phpBB/install/schemas/mysql_41_schema.sql |  1 +
 phpBB/install/schemas/oracle_schema.sql   |  1 +
 phpBB/install/schemas/postgres_schema.sql |  1 +
 phpBB/install/schemas/sqlite_schema.sql   |  1 +
 phpBB/test.php                            | 13 ++++-
 10 files changed, 66 insertions(+), 34 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index b37dcc246f..d0864b975d 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1276,6 +1276,7 @@ function get_schema_struct()
 	$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', ''),
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];
 	}
 
 	/**
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 535cbb0df4..45024c4049 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -589,6 +589,7 @@ CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache(forum_id);;
 # Table: 'phpbb_migrations'
 CREATE TABLE phpbb_migrations (
 	migration_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	migration_depends_on BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL,
 	migration_schema_done INTEGER DEFAULT 0 NOT NULL,
 	migration_data_done INTEGER DEFAULT 0 NOT NULL,
 	migration_data_state BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 43b8f3e556..e261e73d73 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -721,6 +721,7 @@ GO
 */
 CREATE TABLE [phpbb_migrations] (
 	[migration_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[migration_depends_on] [varchar] (8000) DEFAULT ('') NOT NULL ,
 	[migration_schema_done] [int] DEFAULT (0) NOT NULL ,
 	[migration_data_done] [int] DEFAULT (0) NOT NULL ,
 	[migration_data_state] [varchar] (8000) DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index c46230744a..0f184d4d05 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -413,6 +413,7 @@ CREATE TABLE phpbb_moderator_cache (
 # Table: 'phpbb_migrations'
 CREATE TABLE phpbb_migrations (
 	migration_name varbinary(255) DEFAULT '' NOT NULL,
+	migration_depends_on blob NOT NULL,
 	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	migration_data_state blob NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index fa94598e9c..b7564ceb7c 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -413,6 +413,7 @@ CREATE TABLE phpbb_moderator_cache (
 # Table: 'phpbb_migrations'
 CREATE TABLE phpbb_migrations (
 	migration_name varchar(255) DEFAULT '' NOT NULL,
+	migration_depends_on text NOT NULL,
 	migration_schema_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	migration_data_done tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	migration_data_state text NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f8a9d5e1a6..7796c3a729 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -803,6 +803,7 @@ CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id)
 */
 CREATE TABLE phpbb_migrations (
 	migration_name varchar2(255) DEFAULT '' ,
+	migration_depends_on clob DEFAULT '' ,
 	migration_schema_done number(1) DEFAULT '0' NOT NULL,
 	migration_data_done number(1) DEFAULT '0' NOT NULL,
 	migration_data_state clob DEFAULT '' ,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index c976659f05..9fd81ec06a 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -577,6 +577,7 @@ CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);
 */
 CREATE TABLE phpbb_migrations (
 	migration_name varchar(255) DEFAULT '' NOT NULL,
+	migration_depends_on varchar(8000) DEFAULT '' NOT NULL,
 	migration_schema_done INT2 DEFAULT '0' NOT NULL CHECK (migration_schema_done >= 0),
 	migration_data_done INT2 DEFAULT '0' NOT NULL CHECK (migration_data_done >= 0),
 	migration_data_state varchar(8000) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 31a6f715a0..9d6d648c00 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -401,6 +401,7 @@ CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);
 # Table: 'phpbb_migrations'
 CREATE TABLE phpbb_migrations (
 	migration_name varchar(255) NOT NULL DEFAULT '',
+	migration_depends_on text(65535) NOT NULL DEFAULT '',
 	migration_schema_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	migration_data_done INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	migration_data_state text(65535) NOT NULL DEFAULT '',
diff --git a/phpBB/test.php b/phpBB/test.php
index 7a2dafb7ef..6602aa8dcc 100644
--- a/phpBB/test.php
+++ b/phpBB/test.php
@@ -88,6 +88,7 @@ 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', ''),
@@ -106,7 +107,17 @@ $safe_time_limit = (ini_get('max_execution_time') / 2);
 
 while (!$migrator->finished())
 {
-	$migrator->update();
+	try
+	{
+		$migrator->update();
+	}
+	catch (phpbb_db_migration_exception $e)
+	{
+		echo $e;
+
+		garbage_collection();
+		exit_handler();
+	}
 
 	echo $migrator->last_run_migration['name'] . '<br />';
 
-- 
cgit v1.2.1


From 63780bda8d6e6e968b934b200853de2776e53596 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 15:14:16 -0600
Subject: [feature/migrations] Move test.php ->
 install/database_update_migrations.php

This should be used as a basis for the database updater using migrations.

PHPBB3-9737
---
 phpBB/install/database_update_migrations.php | 139 +++++++++++++++++++++++++++
 phpBB/test.php                               | 139 ---------------------------
 2 files changed, 139 insertions(+), 139 deletions(-)
 create mode 100644 phpBB/install/database_update_migrations.php
 delete mode 100644 phpBB/test.php

(limited to 'phpBB')

diff --git a/phpBB/install/database_update_migrations.php b/phpBB/install/database_update_migrations.php
new file mode 100644
index 0000000000..52682dc489
--- /dev/null
+++ b/phpBB/install/database_update_migrations.php
@@ -0,0 +1,139 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+$update_start_time = time();
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+/**
+* @ignore
+*/
+define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
+
+if (file_exists($phpbb_root_path . 'config.' . $phpEx))
+{
+	require($phpbb_root_path . 'config.' . $phpEx);
+}
+
+// Include files
+require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+
+require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
+
+require($phpbb_root_path . 'includes/constants.' . $phpEx);
+require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
+
+// Set PHP error handler to ours
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
+
+// Setup class loader first
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
+$phpbb_class_loader->register();
+
+// Set up container
+$container_extensions = array(
+	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+	new phpbb_di_extension_core($phpbb_root_path),
+);
+$container_passes = array(
+	new phpbb_di_pass_collection_pass(),
+	//new phpbb_di_pass_kernel_pass(),
+);
+$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
+
+// Compile the container
+foreach ($container_passes as $pass)
+{
+	$phpbb_container->addCompilerPass($pass);
+}
+$phpbb_container->compile();
+
+// set up caching
+$cache = $phpbb_container->get('cache');
+
+// Instantiate some basic classes
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
+$user		= $phpbb_container->get('user');
+$auth		= $phpbb_container->get('auth');
+$db			= $phpbb_container->get('dbal.conn');
+
+// make sure request_var uses this request instance
+request_var('', 0, false, false, $request); // "dependency injection" for a function
+
+// Grab global variables, re-cache if necessary
+$config = $phpbb_container->get('config');
+set_config(null, null, null, $config);
+set_config_count(null, null, null, $config);
+
+// End startup code
+
+$db_tools = $phpbb_container->get('dbal.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',
+	));
+}
+
+$migrator = $phpbb_container->get('migrator');
+$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
+
+// 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);
+
+while (!$migrator->finished())
+{
+	try
+	{
+		$migrator->update();
+	}
+	catch (phpbb_db_migration_exception $e)
+	{
+		echo $e;
+
+		garbage_collection();
+		exit_handler();
+	}
+
+	echo $migrator->last_run_migration['name'] . '<br />';
+
+	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+	if ((time() - $update_start_time) >= $safe_time_limit)
+	{
+		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
+		echo 'Update not yet completed.<br />';
+		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
+
+		garbage_collection();
+		exit_handler();
+	}
+}
+
+echo 'Finished';
+
+garbage_collection();
+exit_handler();
diff --git a/phpBB/test.php b/phpBB/test.php
deleted file mode 100644
index 6602aa8dcc..0000000000
--- a/phpBB/test.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-$update_start_time = time();
-
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-
-require($phpbb_root_path . 'includes/startup.' . $phpEx);
-
-if (file_exists($phpbb_root_path . 'config.' . $phpEx))
-{
-	require($phpbb_root_path . 'config.' . $phpEx);
-}
-
-// Include files
-require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-
-require($phpbb_root_path . 'includes/functions.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
-
-require($phpbb_root_path . 'includes/constants.' . $phpEx);
-require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
-
-// Set PHP error handler to ours
-set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-
-// Setup class loader first
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
-$phpbb_class_loader->register();
-
-// Set up container
-$container_extensions = array(
-	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-	new phpbb_di_extension_core($phpbb_root_path),
-);
-$container_passes = array(
-	new phpbb_di_pass_collection_pass(),
-	//new phpbb_di_pass_kernel_pass(),
-);
-$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
-
-// Compile the container
-foreach ($container_passes as $pass)
-{
-	$phpbb_container->addCompilerPass($pass);
-}
-$phpbb_container->compile();
-
-// set up caching
-$cache = $phpbb_container->get('cache');
-
-// Instantiate some basic classes
-$phpbb_dispatcher = $phpbb_container->get('dispatcher');
-$request	= $phpbb_container->get('request');
-$user		= $phpbb_container->get('user');
-$auth		= $phpbb_container->get('auth');
-$db			= $phpbb_container->get('dbal.conn');
-
-// make sure request_var uses this request instance
-request_var('', 0, false, false, $request); // "dependency injection" for a function
-
-// Grab global variables, re-cache if necessary
-$config = $phpbb_container->get('config');
-set_config(null, null, null, $config);
-set_config_count(null, null, null, $config);
-
-// End startup code
-
-$db_tools = $phpbb_container->get('dbal.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',
-	));
-}
-
-$migrator = $phpbb_container->get('migrator');
-$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
-
-// 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);
-
-while (!$migrator->finished())
-{
-	try
-	{
-		$migrator->update();
-	}
-	catch (phpbb_db_migration_exception $e)
-	{
-		echo $e;
-
-		garbage_collection();
-		exit_handler();
-	}
-
-	echo $migrator->last_run_migration['name'] . '<br />';
-
-	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
-	if ((time() - $update_start_time) >= $safe_time_limit)
-	{
-		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
-		echo 'Update not yet completed.<br />';
-		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
-
-		garbage_collection();
-		exit_handler();
-	}
-}
-
-echo 'Finished';
-
-garbage_collection();
-exit_handler();
-- 
cgit v1.2.1


From ebfa42455a19376a7996980301a81ad5665a1414 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 15:17:36 -0600
Subject: [feature/migrations] install/database_update_migrations.php

Actually, this does not belong in the main PR, moving to the data PR.

PHPBB3-9737
---
 phpBB/install/database_update_migrations.php | 139 ---------------------------
 1 file changed, 139 deletions(-)
 delete mode 100644 phpBB/install/database_update_migrations.php

(limited to 'phpBB')

diff --git a/phpBB/install/database_update_migrations.php b/phpBB/install/database_update_migrations.php
deleted file mode 100644
index 52682dc489..0000000000
--- a/phpBB/install/database_update_migrations.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-$update_start_time = time();
-
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-
-require($phpbb_root_path . 'includes/startup.' . $phpEx);
-
-if (file_exists($phpbb_root_path . 'config.' . $phpEx))
-{
-	require($phpbb_root_path . 'config.' . $phpEx);
-}
-
-// Include files
-require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-
-require($phpbb_root_path . 'includes/functions.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
-
-require($phpbb_root_path . 'includes/constants.' . $phpEx);
-require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
-
-// Set PHP error handler to ours
-set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-
-// Setup class loader first
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
-$phpbb_class_loader->register();
-
-// Set up container
-$container_extensions = array(
-	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-	new phpbb_di_extension_core($phpbb_root_path),
-);
-$container_passes = array(
-	new phpbb_di_pass_collection_pass(),
-	//new phpbb_di_pass_kernel_pass(),
-);
-$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
-
-// Compile the container
-foreach ($container_passes as $pass)
-{
-	$phpbb_container->addCompilerPass($pass);
-}
-$phpbb_container->compile();
-
-// set up caching
-$cache = $phpbb_container->get('cache');
-
-// Instantiate some basic classes
-$phpbb_dispatcher = $phpbb_container->get('dispatcher');
-$request	= $phpbb_container->get('request');
-$user		= $phpbb_container->get('user');
-$auth		= $phpbb_container->get('auth');
-$db			= $phpbb_container->get('dbal.conn');
-
-// make sure request_var uses this request instance
-request_var('', 0, false, false, $request); // "dependency injection" for a function
-
-// Grab global variables, re-cache if necessary
-$config = $phpbb_container->get('config');
-set_config(null, null, null, $config);
-set_config_count(null, null, null, $config);
-
-// End startup code
-
-$db_tools = $phpbb_container->get('dbal.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',
-	));
-}
-
-$migrator = $phpbb_container->get('migrator');
-$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
-
-// 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);
-
-while (!$migrator->finished())
-{
-	try
-	{
-		$migrator->update();
-	}
-	catch (phpbb_db_migration_exception $e)
-	{
-		echo $e;
-
-		garbage_collection();
-		exit_handler();
-	}
-
-	echo $migrator->last_run_migration['name'] . '<br />';
-
-	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
-	if ((time() - $update_start_time) >= $safe_time_limit)
-	{
-		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
-		echo 'Update not yet completed.<br />';
-		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
-
-		garbage_collection();
-		exit_handler();
-	}
-}
-
-echo 'Finished';
-
-garbage_collection();
-exit_handler();
-- 
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')

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 032f172a073b028f5d1585f997859f7a07c00c98 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 11 Jan 2013 14:27:05 +0100
Subject: [ticket/11321] Recreate schema files with
 develop/create_schema_files.php

PHPBB3-11321
---
 phpBB/install/schemas/firebird_schema.sql | 4 ++--
 phpBB/install/schemas/mssql_schema.sql    | 4 ++--
 phpBB/install/schemas/mysql_40_schema.sql | 2 +-
 phpBB/install/schemas/mysql_41_schema.sql | 2 +-
 phpBB/install/schemas/oracle_schema.sql   | 2 +-
 phpBB/install/schemas/postgres_schema.sql | 2 +-
 phpBB/install/schemas/sqlite_schema.sql   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 767ce68b4a..ef57df29a0 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -912,8 +912,8 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER DEFAULT 0 NOT NULL,
 	report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
-	reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL
+	reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 84c975942f..a37fd2b14e 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1111,8 +1111,8 @@ CREATE TABLE [phpbb_reports] (
 	[report_time] [int] DEFAULT (0) NOT NULL ,
 	[report_text] [text] DEFAULT ('') NOT NULL ,
 	[reported_post_text] [text] DEFAULT ('') NOT NULL ,
-	[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL 
+	[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
+	[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 8aab949103..517e51d3c5 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -649,8 +649,8 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumblob NOT NULL,
 	reported_post_text mediumblob NOT NULL,
-	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	reported_post_uid varbinary(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 04aef2844a..f05322b28f 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -649,8 +649,8 @@ CREATE TABLE phpbb_reports (
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumtext NOT NULL,
 	reported_post_text mediumtext NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 91f906bc8b..993df9e82a 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1216,8 +1216,8 @@ CREATE TABLE phpbb_reports (
 	report_time number(11) DEFAULT '0' NOT NULL,
 	report_text clob DEFAULT '' ,
 	reported_post_text clob DEFAULT '' ,
-	reported_post_bitfield varchar2(255) DEFAULT '' ,
 	reported_post_uid varchar2(8) DEFAULT '' ,
+	reported_post_bitfield varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 619985e0d6..2acdeb7f45 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -855,8 +855,8 @@ CREATE TABLE phpbb_reports (
 	report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
 	report_text TEXT DEFAULT '' NOT NULL,
 	reported_post_text TEXT DEFAULT '' NOT NULL,
-	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	reported_post_uid varchar(8) DEFAULT '' NOT NULL,
+	reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 1690a7dcab..775f67c5c3 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -630,8 +630,8 @@ CREATE TABLE phpbb_reports (
 	report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_text mediumtext(16777215) NOT NULL DEFAULT '',
 	reported_post_text mediumtext(16777215) NOT NULL DEFAULT '',
-	reported_post_bitfield varchar(255) NOT NULL DEFAULT '',
-	reported_post_uid varchar(8) NOT NULL DEFAULT ''
+	reported_post_uid varchar(8) NOT NULL DEFAULT '',
+	reported_post_bitfield varchar(255) NOT NULL DEFAULT ''
 );
 
 CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
-- 
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/adm/style/acp_users_profile.html             |  4 --
 phpBB/develop/benchmark.php                        |  5 +-
 phpBB/develop/create_schema_files.php              |  1 -
 phpBB/develop/mysql_upgrader.php                   |  1 -
 phpBB/includes/acp/acp_users.php                   |  4 --
 phpBB/includes/ucp/ucp_pm_viewmessage.php          |  1 -
 phpBB/includes/ucp/ucp_profile.php                 |  4 --
 phpBB/install/convertors/convert_phpbb20.php       |  1 -
 phpBB/install/schemas/firebird_schema.sql          |  1 -
 phpBB/install/schemas/mssql_schema.sql             |  1 -
 phpBB/install/schemas/mysql_40_schema.sql          |  1 -
 phpBB/install/schemas/mysql_41_schema.sql          |  1 -
 phpBB/install/schemas/oracle_schema.sql            |  1 -
 phpBB/install/schemas/postgres_schema.sql          |  1 -
 phpBB/install/schemas/schema_data.sql              |  4 +-
 phpBB/install/schemas/sqlite_schema.sql            |  1 -
 phpBB/language/en/acp/styles.php                   |  1 -
 phpBB/language/en/common.php                       |  3 -
 phpBB/language/en/memberlist.php                   |  4 --
 phpBB/language/en/ucp.php                          |  1 -
 phpBB/memberlist.php                               | 22 +-----
 phpBB/styles/prosilver/template/memberlist_im.html | 82 +--------------------
 .../prosilver/template/memberlist_search.html      |  4 --
 .../styles/prosilver/template/memberlist_view.html |  1 -
 .../prosilver/template/ucp_pm_viewmessage.html     |  3 +-
 .../template/ucp_profile_profile_info.html         |  4 --
 .../styles/prosilver/template/viewtopic_body.html  |  3 +-
 phpBB/styles/prosilver/theme/bidi.css              |  2 +-
 phpBB/styles/prosilver/theme/buttons.css           |  2 -
 phpBB/styles/prosilver/theme/colours.css           |  1 -
 phpBB/styles/prosilver/theme/imageset.css          |  5 --
 .../styles/subsilver2/template/memberlist_im.html  | 83 +---------------------
 .../subsilver2/template/memberlist_search.html     |  8 +--
 .../subsilver2/template/memberlist_view.html       |  4 --
 .../template/ucp_profile_profile_info.html         |  4 --
 phpBB/styles/subsilver2/theme/en/stylesheet.css    |  5 --
 phpBB/styles/subsilver2/theme/stylesheet.css       |  5 --
 phpBB/viewtopic.php                                |  4 --
 38 files changed, 16 insertions(+), 267 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 3232e8d1f5..36e9f340d4 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -10,10 +10,6 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php
index c867b9262e..6517954dfe 100644
--- a/phpBB/develop/benchmark.php
+++ b/phpBB/develop/benchmark.php
@@ -377,7 +377,6 @@ function make_user($username)
 	$viewemail = 0;
 	$aim = 0;
 	$yim = 0;
-	$msn = 0;
 	$attachsig = 1;
 	$allowsmilies = 1;
 	$allowhtml = 1;
@@ -422,8 +421,8 @@ function make_user($username)
 	}
 
 
-	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
-		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
+	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
+		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
 
 	
 	$sql .= "1, '')";
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 3d3e478032..38d7a2df33 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1833,7 +1833,6 @@ function get_schema_struct()
 			'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', ''),
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 7f82ebfeab..ca738aabf6 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -1265,7 +1265,6 @@ function get_schema_struct()
 			'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', ''),
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'],
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 5f30625980..6792f4ff9c 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -896,7 +896,6 @@ if (!$get_info)
 				array('user_occ',				'users.user_occ',					array('function1' => 'phpbb_set_encoding')),
 				array('user_website',			'users.user_website',				'validate_website'),
 				array('user_jabber',			'',									''),
-				array('user_msnm',				'users.user_msnm',					array('function1' => 'phpbb_set_encoding')),
 				array('user_yim',				'users.user_yim',					array('function1' => 'phpbb_set_encoding')),
 				array('user_aim',				'users.user_aim',					array('function1' => 'phpbb_set_encoding')),
 				array('user_icq',				'users.user_icq',					array('function1' => 'phpbb_set_encoding')),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index ef57df29a0..9016d8b318 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1281,7 +1281,6 @@ CREATE TABLE phpbb_users (
 	user_icq VARCHAR(15) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	user_aim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_yim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	user_msnm VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_jabber VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_website VARCHAR(200) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index a37fd2b14e..81bd0cbb0f 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1565,7 +1565,6 @@ CREATE TABLE [phpbb_users] (
 	[user_icq] [varchar] (15) DEFAULT ('') NOT NULL ,
 	[user_aim] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_yim] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[user_msnm] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_jabber] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_website] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[user_occ] [varchar] (4000) DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 517e51d3c5..0797b6ac6b 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -929,7 +929,6 @@ CREATE TABLE phpbb_users (
 	user_icq varbinary(15) DEFAULT '' NOT NULL,
 	user_aim blob NOT NULL,
 	user_yim blob NOT NULL,
-	user_msnm blob NOT NULL,
 	user_jabber blob NOT NULL,
 	user_website blob NOT NULL,
 	user_occ blob NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index f05322b28f..414f9f0f2a 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -929,7 +929,6 @@ CREATE TABLE phpbb_users (
 	user_icq varchar(15) DEFAULT '' NOT NULL,
 	user_aim varchar(255) DEFAULT '' NOT NULL,
 	user_yim varchar(255) DEFAULT '' NOT NULL,
-	user_msnm varchar(255) DEFAULT '' NOT NULL,
 	user_jabber varchar(255) DEFAULT '' NOT NULL,
 	user_website varchar(200) DEFAULT '' NOT NULL,
 	user_occ text NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 993df9e82a..03c9f9fd4c 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1677,7 +1677,6 @@ CREATE TABLE phpbb_users (
 	user_icq varchar2(15) DEFAULT '' ,
 	user_aim varchar2(765) DEFAULT '' ,
 	user_yim varchar2(765) DEFAULT '' ,
-	user_msnm varchar2(765) DEFAULT '' ,
 	user_jabber varchar2(765) DEFAULT '' ,
 	user_website varchar2(600) DEFAULT '' ,
 	user_occ clob DEFAULT '' ,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 2acdeb7f45..a6c989fe62 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1179,7 +1179,6 @@ CREATE TABLE phpbb_users (
 	user_icq varchar(15) DEFAULT '' NOT NULL,
 	user_aim varchar(255) DEFAULT '' NOT NULL,
 	user_yim varchar(255) DEFAULT '' NOT NULL,
-	user_msnm varchar(255) DEFAULT '' NOT NULL,
 	user_jabber varchar(255) DEFAULT '' NOT NULL,
 	user_website varchar(200) DEFAULT '' NOT NULL,
 	user_occ varchar(4000) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 7c1a7d40f5..19c00ef9fb 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -454,10 +454,10 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id,
 INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents, forum_flags) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 0, 0, '', 48);
 
 # -- Users / Anonymous user
-INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0);
+INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', 0);
 
 # -- username: Admin    password: admin (change this or remove it once everything is working!)
-INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
+INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '');
 
 # -- Groups
 INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, 0, '', '', '', 5);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 775f67c5c3..feec31d727 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -903,7 +903,6 @@ CREATE TABLE phpbb_users (
 	user_icq varchar(15) NOT NULL DEFAULT '',
 	user_aim varchar(255) NOT NULL DEFAULT '',
 	user_yim varchar(255) NOT NULL DEFAULT '',
-	user_msnm varchar(255) NOT NULL DEFAULT '',
 	user_jabber varchar(255) NOT NULL DEFAULT '',
 	user_website varchar(200) NOT NULL DEFAULT '',
 	user_occ text(65535) NOT NULL DEFAULT '',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index e7954ff148..3cb2e741ca 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -186,7 +186,6 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
-	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
 	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
 	'IMG_ICON_CONTACT_WWW'		=> 'Website',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6277457af7..6cad4136a2 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -368,7 +368,6 @@ $lang = array_merge($lang, array(
 	'MODERATORS'			=> 'Moderators',
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
-	'MSNM'					=> 'WLM',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
@@ -627,7 +626,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
-	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
@@ -648,7 +646,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
-	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index ec21e8e904..bc5a0c100b 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -78,9 +78,6 @@ $lang = array_merge($lang, array(
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
-	'IM_MSNM'				=> 'Please note that you need Windows Live Messenger installed to use this.',
-	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
-	'IM_MSNM_CONNECT'		=> 'WLM is not connected.\nYou have to connect to WLM to continue.',
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
@@ -123,7 +120,6 @@ $lang = array_merge($lang, array(
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
 	'SEND_MESSAGE'			=> 'Message',
-	'SEND_MSNM_MESSAGE'		=> 'Send WLM message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
 	'SORT_EMAIL'			=> 'Email',
 	'SORT_LAST_ACTIVE'		=> 'Last active',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 267ae00710..2eb34b3713 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -455,7 +455,6 @@ $lang = array_merge($lang, array(
 	'UCP_MAIN_FRONT'			=> 'Front page',
 	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
 
-	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
 	'UCP_PREFS'					=> 'Board preferences',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 79be9ca432..091379061c 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -287,13 +287,6 @@ switch ($mode)
 				$s_action = '';
 			break;
 
-			case 'msnm':
-				$lang = 'MSNM';
-				$sql_field = 'user_msnm';
-				$s_select = 'S_SEND_MSNM';
-				$s_action = '';
-			break;
-
 			case 'jabber':
 				$lang = 'JABBER';
 				$sql_field = 'user_jabber';
@@ -640,7 +633,6 @@ switch ($mode)
 			'WWW_IMG'		=> $user->img('icon_contact_www', $user->lang['WWW']),
 			'ICQ_IMG'		=> $user->img('icon_contact_icq', $user->lang['ICQ']),
 			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),
-			'MSN_IMG'		=> $user->img('icon_contact_msnm', $user->lang['MSNM']),
 			'YIM_IMG'		=> $user->img('icon_contact_yahoo', $user->lang['YIM']),
 			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
 			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
@@ -984,8 +976,8 @@ switch ($mode)
 		$template_html = 'memberlist_body.html';
 
 		// Sorting
-		$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_LOCATION'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT'], 'f' => $user->lang['WEBSITE'], 'g' => $user->lang['ICQ'], 'h' => $user->lang['AIM'], 'i' => $user->lang['MSNM'], 'j' => $user->lang['YIM'], 'k' => $user->lang['JABBER']);
-		$sort_key_sql = array('a' => 'u.username_clean', 'b' => 'u.user_from', 'c' => 'u.user_regdate', 'd' => 'u.user_posts', 'f' => 'u.user_website', 'g' => 'u.user_icq', 'h' => 'u.user_aim', 'i' => 'u.user_msnm', 'j' => 'u.user_yim', 'k' => 'u.user_jabber');
+		$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_LOCATION'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT'], 'f' => $user->lang['WEBSITE'], 'g' => $user->lang['ICQ'], 'h' => $user->lang['AIM'], 'j' => $user->lang['YIM'], 'k' => $user->lang['JABBER']);
+		$sort_key_sql = array('a' => 'u.username_clean', 'b' => 'u.user_from', 'c' => 'u.user_regdate', 'd' => 'u.user_posts', 'f' => 'u.user_website', 'g' => 'u.user_icq', 'h' => 'u.user_aim', 'j' => 'u.user_yim', 'k' => 'u.user_jabber');
 
 		if ($auth->acl_get('a_user'))
 		{
@@ -1028,7 +1020,7 @@ switch ($mode)
 		$select_single 	= request_var('select_single', false);
 
 		// Search URL parameters, if any of these are in the URL we do a search
-		$search_params = array('username', 'email', 'icq', 'aim', 'yahoo', 'msn', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');
+		$search_params = array('username', 'email', 'icq', 'aim', 'yahoo', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');
 
 		// We validate form and field here, only id/class allowed
 		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
@@ -1040,7 +1032,6 @@ switch ($mode)
 			$icq		= request_var('icq', '');
 			$aim		= request_var('aim', '');
 			$yahoo		= request_var('yahoo', '');
-			$msn		= request_var('msn', '');
 			$jabber		= request_var('jabber', '');
 			$search_group_id	= request_var('search_group_id', 0);
 
@@ -1084,7 +1075,6 @@ switch ($mode)
 			$sql_where .= ($icq) ? ' AND u.user_icq ' . $db->sql_like_expression(str_replace('*', $db->any_char, $icq)) . ' ' : '';
 			$sql_where .= ($aim) ? ' AND u.user_aim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $aim)) . ' ' : '';
 			$sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $yahoo)) . ' ' : '';
-			$sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : '';
 			$sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : '';
 			$sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
 
@@ -1317,7 +1307,6 @@ switch ($mode)
 			'icq'			=> array('icq', ''),
 			'aim'			=> array('aim', ''),
 			'yahoo'			=> array('yahoo', ''),
-			'msn'			=> array('msn', ''),
 			'jabber'		=> array('jabber', ''),
 			'search_group_id'	=> array('search_group_id', 0),
 			'joined_select'	=> array('joined_select', 'lt'),
@@ -1449,7 +1438,6 @@ switch ($mode)
 				'ICQ'		=> $icq,
 				'AIM'		=> $aim,
 				'YAHOO'		=> $yahoo,
-				'MSNM'		=> $msn,
 				'JABBER'	=> $jabber,
 				'JOINED'	=> implode('-', $joined),
 				'ACTIVE'	=> implode('-', $active),
@@ -1605,7 +1593,6 @@ switch ($mode)
 			'WWW_IMG'		=> $user->img('icon_contact_www', $user->lang['WWW']),
 			'ICQ_IMG'		=> $user->img('icon_contact_icq', $user->lang['ICQ']),
 			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),
-			'MSN_IMG'		=> $user->img('icon_contact_msnm', $user->lang['MSNM']),
 			'YIM_IMG'		=> $user->img('icon_contact_yahoo', $user->lang['YIM']),
 			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
 			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
@@ -1621,7 +1608,6 @@ switch ($mode)
 			'U_SORT_LOCATION'		=> $sort_url . '&amp;sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_ICQ'			=> $sort_url . '&amp;sk=g&amp;sd=' . (($sort_key == 'g' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_AIM'			=> $sort_url . '&amp;sk=h&amp;sd=' . (($sort_key == 'h' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_MSN'			=> $sort_url . '&amp;sk=i&amp;sd=' . (($sort_key == 'i' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_YIM'			=> $sort_url . '&amp;sk=j&amp;sd=' . (($sort_key == 'j' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_ACTIVE'			=> ($auth->acl_get('u_viewonline')) ? $sort_url . '&amp;sk=l&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '',
 			'U_SORT_RANK'			=> $sort_url . '&amp;sk=m&amp;sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'),
@@ -1748,14 +1734,12 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 		'U_ICQ'			=> ($data['user_icq']) ? 'http://www.icq.com/people/' . urlencode($data['user_icq']) . '/' : '',
 		'U_AIM'			=> ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $user_id) : '',
 		'U_YIM'			=> ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&amp;.src=pg' : '',
-		'U_MSN'			=> ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $user_id) : '',
 		'U_JABBER'		=> ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '',
 		'LOCATION'		=> ($data['user_from']) ? $data['user_from'] : '',
 
 		'USER_ICQ'			=> $data['user_icq'],
 		'USER_AIM'			=> $data['user_aim'],
 		'USER_YIM'			=> $data['user_yim'],
-		'USER_MSN'			=> $data['user_msnm'],
 		'USER_JABBER'		=> $data['user_jabber'],
 		'USER_JABBER_IMG'	=> ($data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '',
 
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 68aed0b3dd..61b4a1469b 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -1,6 +1,5 @@
 <!-- INCLUDE simple_header.html -->
 
-<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
 <h2 class="solo">{L_SEND_IM}</h2>
 
 <form method="post" action="{S_IM_ACTION}">
@@ -13,7 +12,7 @@
 	<fieldset>
 	<dl class="fields2">
 		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>
-		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
+		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
 	</dl>
 
 	<!-- IF S_SEND_ICQ -->
@@ -43,15 +42,6 @@
 		</dl>
 	<!-- ENDIF -->
 
-	<!-- IF S_SEND_MSNM -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
-			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd>
-		</dl>
-	<!-- ENDIF -->
-
 	<!-- IF S_SEND_JABBER -->
 		<dl class="fields2">
 			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt>
@@ -85,74 +75,4 @@
 
 <a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
 
-<script type="text/javascript">
-// <![CDATA[
-
-	/** The following will not work with Windows Vista **/
-
-	var app = document.getElementById('objMessengerApp');
-
-	/**
-	* Check whether the browser supports this and whether MSNM is connected
-	*/
-	function msn_supported()
-	{
-		// Does the browser support the MSNM object?
-		if (app.MyStatus)
-		{
-			// Is MSNM connected?
-			if (app.MyStatus == 1)
-			{
-				alert('{LA_IM_MSNM_CONNECT}');
-				return false;
-			}
-		}
-		else
-		{
-			alert('{LA_IM_MSNM_BROWSER}');
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Add to your contact list
-	*/
-	function add_contact(address) 
-	{
-		if (msn_supported()) 
-		{
-			// Could return an error while MSNM is connecting, don't want that
-			try
-			{
-				app.AddContact(0, address);
-			}
-			catch (e)
-			{
-				return;
-			}
-	}
-}
-
-/**
-* Write IM to contact
-*/
-function im_contact(address)
-{
-	if (msn_supported())
-	{
-		// Could return an error while MSNM is connecting, don't want that
-		try
-		{
-			app.InstantMessage(address);
-		}
-		catch (e)
-		{
-			return;
-		}
-	}
-}
-// ]]>
-</script>
-
 <!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 6fed528cea..1ef8710817 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -71,10 +71,6 @@ function insert_single(user)
 		<dt><label for="yahoo">{L_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="msn">{L_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>
-	</dl>
 	</fieldset>
 
 	<fieldset class="fields1 column2">
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 57cfcb86d9..7f33e70e8f 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -62,7 +62,6 @@
 		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
 		<!-- IF U_WWW --><dt>{L_WEBSITE}{L_COLON}</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
 		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
-		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}{L_COLON}</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}{L_COLON}</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}{L_COLON}</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}{L_COLON}</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 22149c8b80..23665aa252 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -90,13 +90,12 @@
 		<!-- END custom_fields -->
 
 
-		<!-- IF U_PM or U_EMAIL or U_WWW or U_MSN or U_ICQ or U_YIM or U_AIM or U_JABBER -->
+		<!-- IF U_PM or U_EMAIL or U_WWW or U_ICQ or U_YIM or U_AIM or U_JABBER -->
 		<dd>
 			<ul class="profile-icons">
 			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
 			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF -->
 			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_MSN --><li class="msnm-icon"><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
 			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index 03d89e8590..e8c6715de8 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -18,10 +18,6 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 7688898f5c..9910be34b0 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -216,13 +216,12 @@
 		<!-- END custom_fields -->
 
 		<!-- IF not S_IS_BOT -->
-		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_MSN or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER -->
+		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER -->
 			<dd>
 				<ul class="profile-icons">
 					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 5cff0a811b..a43323d879 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -786,7 +786,7 @@
 	padding-right: 11px;
 	padding-left: 0;
 }
-.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
+.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
 	padding-right: 20px;
 	padding-left: 0;
 }
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index e817380f8e..f74e82a123 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -122,7 +122,6 @@ ul.profile-icons li a:hover { background: none; }
 .aim-icon, .aim-icon a			{ background: none top left no-repeat; }
 .yahoo-icon, .yahoo-icon a		{ background: none top left no-repeat; }
 .web-icon, .web-icon a			{ background: none top left no-repeat; }
-.msnm-icon, .msnm-icon a			{ background: none top left no-repeat; }
 .icq-icon, .icq-icon a			{ background: none top left no-repeat; }
 .jabber-icon, .jabber-icon a		{ background: none top left no-repeat; }
 .pm-icon, .pm-icon a				{ background: none top left no-repeat; }
@@ -140,7 +139,6 @@ ul.profile-icons li.email-icon		{ width: 20px; height: 20px; }
 ul.profile-icons li.aim-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.yahoo-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.web-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.msnm-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.icq-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.jabber-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.pm-icon		{ width: 28px; height: 20px; }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index a5a18dc6a1..199d7b3059 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -686,7 +686,6 @@ a.sendemail {
 .aim-icon, .aim-icon a			{ background-image: url("./images/icon_contact_aim.gif"); }
 .yahoo-icon, .yahoo-icon a		{ background-image: url("./images/icon_contact_yahoo.gif"); }
 .web-icon, .web-icon a			{ background-image: url("./images/icon_contact_www.gif"); }
-.msnm-icon, .msnm-icon a			{ background-image: url("./images/icon_contact_msnm.gif"); }
 .icq-icon, .icq-icon a			{ background-image: url("./images/icon_contact_icq.gif"); }
 .jabber-icon, .jabber-icon a		{ background-image: url("./images/icon_contact_jabber.gif"); }
 .pm-icon, .pm-icon a				{ background-image: url("./en/icon_contact_pm.gif"); }
diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css
index cb99e9e715..a85e320f98 100644
--- a/phpBB/styles/prosilver/theme/imageset.css
+++ b/phpBB/styles/prosilver/theme/imageset.css
@@ -280,11 +280,6 @@ span.imageset {
 	padding-left: 20px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_msnm {
-	background-image: url("./images/icon_contact_msnm.gif");
-	padding-left: 20px;
-	padding-top: 20px;
-}
 .imageset.icon_contact_www {
 	background-image: url("./images/icon_contact_www.gif");
 	padding-left: 20px;
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index da1ad661c3..e91a1caf11 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -2,8 +2,6 @@
 
 <br clear="all" />
 
-<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
-
 <form method="post" action="{S_IM_ACTION}">
 	<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
 	<tr>
@@ -14,7 +12,7 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td>
-		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
+		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
 	</tr>
 
 	<!-- IF S_SEND_AIM -->
@@ -26,85 +24,6 @@
 		</tr>
 	<!-- ENDIF -->
 
-	<!-- IF S_SEND_MSNM -->
-		<tr>
-			<td class="row1" colspan="2" align="center">
-				<object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object>
-				<script type="text/javascript">
-				// <![CDATA[
-					var app = document.getElementById('objMessengerApp');
-					
-					/**
-					* Check whether the browser supports this and whether MSNM is connected
-					*/
-					function msn_supported()
-					{
-						// Does the browser support the MSNM object?
-						if (app.MyStatus) 
-						{
-							// Is MSNM connected?
-							if (app.MyStatus == 1)
-							{
-								alert('{LA_IM_MSNM_CONNECT}');
-								return false;
-							}
-						}
-						else
-						{
-							alert('{LA_IM_MSNM_BROWSER}');
-							return false;
-						}
-						return true;
-					}
-
-					/**
-					* Add to your contact list
-					*/
-					function add_contact(address)
-					{
-						if (msn_supported())
-						{
-							// Could return an error while MSNM is connecting, don't want that
-							try
-							{
-								app.AddContact(0, address);
-							}
-							catch (e)
-							{
-								return;
-							}
-						}
-					}
-
-					/**
-					* Write IM to contact
-					*/
-					function im_contact(address)
-					{
-						if (msn_supported())
-						{
-							// Could return an error while MSNM is connecting, don't want that
-							try
-							{
-								app.InstantMessage(address);
-							}
-							catch (e)
-							{
-								return;
-							}
-						}
-					}
-				// ]]>
-				</script>
-	
-				<a class="gen" href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="cat" colspan="2" align="center">&nbsp;</td>
-		</tr>
-	<!-- ENDIF -->
-
 	<!-- IF S_SEND_JABBER -->
 		<tr>
 			<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index c0434d8110..fb76cacc79 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -102,14 +102,14 @@
 <!-- ELSE -->
 	<td colspan="2" class="row1">&nbsp;</td>
 <!-- ENDIF -->
-	<td class="row1"><b class="genmed">{L_MSNM}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>
+	<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
+	<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
 	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td>
-	<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
+	<td class="row1">&nbsp;</td>
+	<td class="row2">&nbsp;</td>
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_SORT_BY}{L_COLON}</b></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 464369a7a8..ff22dcc0f7 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -116,10 +116,6 @@
 					<td><a href="{U_PM}" class="imageset">{PM_IMG}</a></td>
 				</tr>
 			<!-- ENDIF -->
-			<tr>
-				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}{L_COLON} </td>
-				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false" class="imageset">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
-			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}{L_COLON} </td>
 				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false" class="imageset">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
index 19259aebc8..69da5f6172 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
@@ -20,10 +20,6 @@
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>
 </tr>
-<tr> 
-	<td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></td>
-</tr>
 <tr> 
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td>
diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css
index 563492d4fc..6ddecf963b 100644
--- a/phpBB/styles/subsilver2/theme/en/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css
@@ -19,11 +19,6 @@
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_msnm {
-	background-image: url("./icon_contact_msnm.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
 .imageset.icon_contact_pm {
 	background-image: url("./icon_contact_pm.gif");
 	padding-left: 72px;
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 977e5c20c6..e7e64eff32 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1008,11 +1008,6 @@ a.imageset {
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_msnm {
-	background-image: url("./en/icon_contact_msnm.gif");
-	padding-left: 72px;
-	padding-top: 20px;
-}
 .imageset.icon_contact_pm {
 	background-image: url("./en/icon_contact_pm.gif");
 	padding-left: 72px;
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index bd2c7bea77..fcf34a139a 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -617,7 +617,6 @@ $template->assign_vars(array(
 	'WWW_IMG' 			=> $user->img('icon_contact_www', 'VISIT_WEBSITE'),
 	'ICQ_IMG' 			=> $user->img('icon_contact_icq', 'ICQ'),
 	'AIM_IMG' 			=> $user->img('icon_contact_aim', 'AIM'),
-	'MSN_IMG' 			=> $user->img('icon_contact_msnm', 'MSNM'),
 	'YIM_IMG' 			=> $user->img('icon_contact_yahoo', 'YIM'),
 	'JABBER_IMG'		=> $user->img('icon_contact_jabber', 'JABBER') ,
 	'REPORT_IMG'		=> $user->img('icon_post_report', 'REPORT_POST'),
@@ -1095,7 +1094,6 @@ while ($row = $db->sql_fetchrow($result))
 				'icq_status_img'	=> '',
 				'icq'				=> '',
 				'aim'				=> '',
-				'msn'				=> '',
 				'yim'				=> '',
 				'jabber'			=> '',
 				'search'			=> '',
@@ -1163,7 +1161,6 @@ while ($row = $db->sql_fetchrow($result))
 				'profile'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&amp;u=$poster_id"),
 				'www'			=> $row['user_website'],
 				'aim'			=> ($row['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=aim&amp;u=$poster_id") : '',
-				'msn'			=> ($row['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=msnm&amp;u=$poster_id") : '',
 				'yim'			=> ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&amp;.src=pg' : '',
 				'jabber'		=> ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
 				'search'		=> ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&amp;sr=posts") : '',
@@ -1585,7 +1582,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'U_WWW'			=> $user_cache[$poster_id]['www'],
 		'U_ICQ'			=> $user_cache[$poster_id]['icq'],
 		'U_AIM'			=> $user_cache[$poster_id]['aim'],
-		'U_MSN'			=> $user_cache[$poster_id]['msn'],
 		'U_YIM'			=> $user_cache[$poster_id]['yim'],
 		'U_JABBER'		=> $user_cache[$poster_id]['jabber'],
 
-- 
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')

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')

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')

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')

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 918053e4781425f368261db3b55efbb6abad160d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Dec 2012 22:35:55 -0800
Subject: [ticket/11103] Fix notifications link to handle non-JS fallback

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3f5bec9b8a..830b9544a5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -133,7 +133,7 @@
 			<ul class="linklist leftside">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
-					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index e516a78e45..c8ddf2bcd3 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -150,7 +150,7 @@ function marklist(id, name, state)
 		<tr>
 			<td class="genmed">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
-					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
-- 
cgit v1.2.1


From ce1fca2332679def5884d82164037bedc7dc86ee Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Dec 2012 22:36:44 -0800
Subject: [ticket/11103] Clean up some notifications CSS

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/colours.css | 5 ++---
 phpBB/styles/prosilver/theme/common.css  | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index a71d6ee557..bf4c7ba22a 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1060,7 +1060,6 @@ input.disabled {
 
 #notification_list > .header, .notification_list > .footer {
 	border-color: #B9B9B9;
-	border-bottom-color: #B9B9B9;
 	color: #000000;
 }
 
@@ -1074,8 +1073,8 @@ input.disabled {
 	background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%);
 }
 
-.notification_list .pointer {	
-	border-bottom-color: #ADADAD;
+.notification_list .pointer {
+	border-bottom-color: #B9B9B9;
 }
 
 .notification_list .pointer_inner {
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 0f44b5f861..7f9431770a 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -742,9 +742,9 @@ p.rules a {
 }
 
 .notification_list .pointer, .notification_list .pointer_inner {
-	position: absolute; 
-	width: 0; 
-	height: 0; 
+	position: absolute;
+	width: 0;
+	height: 0;
 	border-top-width: 0;
 	border-bottom: 10px solid;
 	border-left: 10px dashed transparent;
@@ -753,7 +753,7 @@ p.rules a {
 	background: transparent;
 }
 
-.notification_list .pointer {	
+.notification_list .pointer {
 	right: auto;
 	left: 10px;
 	top: -11px;
-- 
cgit v1.2.1


From 44fcec520f785d18d3cd3b19e26db977f23b844c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Dec 2012 22:37:39 -0800
Subject: [ticket/11103] CSS fixes to address text inside notifications drop
 down.

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css      | 5 -----
 phpBB/styles/subsilver2/theme/stylesheet.css | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 7f9431770a..aa1a64455f 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -727,11 +727,6 @@ p.rules a {
 	margin-right: 5px;
 }
 
-#notification_list ul li div {
-	width: 240px;
-	float: left;
-}
-
 .notification_list ul li p {
 	margin: 0;
 	word-wrap: break-word;
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index c411edd367..0f8f9f0367 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1156,7 +1156,7 @@ a.imageset {
 }
 
 #notification_list .notification_title {
-	width: 240px;
+	padding: 5px;
 }
 
 #notification_list .header {
-- 
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')

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/config/notifications.yml              | 49 +++++++++++++++
 phpBB/includes/notification/manager.php     | 40 +++++++++----
 phpBB/includes/notification/method/base.php | 40 +++++++++----
 phpBB/includes/notification/type/base.php   | 92 +++++++++++++++++++++++------
 phpBB/install/database_update.php           |  4 ++
 5 files changed, 183 insertions(+), 42 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index 550fbdfd0c..c8414cb031 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -25,8 +25,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -42,8 +45,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -59,8 +65,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -76,8 +85,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -93,8 +105,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -110,8 +125,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -127,8 +145,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -144,8 +165,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -161,8 +185,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -178,8 +205,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -195,8 +225,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -212,8 +245,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -229,8 +265,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -246,8 +285,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -263,8 +305,11 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -280,6 +325,8 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.method }
 
@@ -295,5 +342,7 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+        calls:
+            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.method }
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)
 	{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 59274f29ae..57a027cf2a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -101,6 +101,10 @@ if (!defined('NOTIFICATION_TYPES_TABLE'))
 {
 	define('NOTIFICATION_TYPES_TABLE', $table_prefix . 'notification_types');
 }
+if (!defined('NOTIFICATIONS_TYPES_TABLE'))
+{
+	define('NOTIFICATIONS_TYPES_TABLE', $table_prefix . 'notifications_types');
+}
 if (!defined('NOTIFICATIONS_TABLE'))
 {
 	define('NOTIFICATIONS_TABLE', $table_prefix . 'notifications');
-- 
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/config/notifications.yml          | 34 ---------------------------------
 phpBB/includes/notification/manager.php |  9 ++++++++-
 2 files changed, 8 insertions(+), 35 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index c8414cb031..60aa63a854 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -28,8 +28,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -48,8 +46,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -68,8 +64,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -88,8 +82,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -108,8 +100,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -128,8 +118,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -148,8 +136,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -168,8 +154,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -188,8 +172,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -208,8 +190,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -228,8 +208,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -248,8 +226,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -268,8 +244,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -288,8 +262,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -308,8 +280,6 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.type }
 
@@ -325,8 +295,6 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.method }
 
@@ -342,7 +310,5 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
-        calls:
-            - [set_notification_manager, [@notification_manager]]
         tags:
             - { name: notification.method }
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 623b9af38bd56e1bfc234675f7d2e2404298fbf7 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 15 Jan 2013 12:30:26 -0600
Subject: [ticket/11103] Only lookup $(target) once

PHPBB3-11103
---
 phpBB/assets/javascript/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index a5a10e7377..9909359c2c 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -498,9 +498,9 @@ $('#notification_list_button').click(function(e) {
 	e.preventDefault();
 });
 $('#phpbb').click(function(e) {
-    var target = e.target;
+    var target = $(e.target);
 
-    if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) {
+    if (!target.is('#notification_list') && !target.is('#notification_list_button') && !target.parents().is('#notification_list')) {
         $('#notification_list').hide();
     }
 });
-- 
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')

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 aeeb85e1cfb9c6a54fc74942e42bc602d2a108a1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 15 Jan 2013 22:07:01 +0100
Subject: [feature/avatars] Remove the obsolete request argument for avatar
 drivers

This should have been removed earlier when the phpbb_request object was
dropped from the arguments to the avatar drivers.

PHPBB3-10018
---
 phpBB/config/avatars.yml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
index e6106038f5..8eef0f837f 100644
--- a/phpBB/config/avatars.yml
+++ b/phpBB/config/avatars.yml
@@ -3,7 +3,6 @@ services:
         class: phpbb_avatar_driver_gravatar
         arguments:
             - @config
-            - @request
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
@@ -16,7 +15,6 @@ services:
         class: phpbb_avatar_driver_local
         arguments:
             - @config
-            - @request
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
@@ -29,7 +27,6 @@ services:
         class: phpbb_avatar_driver_remote
         arguments:
             - @config
-            - @request
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
@@ -42,7 +39,6 @@ services:
         class: phpbb_avatar_driver_upload
         arguments:
             - @config
-            - @request
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
-- 
cgit v1.2.1


From 63b037b4bd1d1d3650235081b8d834a27719d2e1 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 15 Jan 2013 23:12:44 +0200
Subject: [ticket/10431] Adjustments for large buttons

Changing CSS for large buttons to display better on Mac browsers.
Fixing tabs.

PHPBB3-10431
---
 phpBB/styles/prosilver/theme/buttons.css | 67 ++++++++++++++++----------------
 1 file changed, 34 insertions(+), 33 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 02f973d0ff..543d9d8183 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -18,56 +18,57 @@
 
 /* Rolloff state */
 .buttons div a {
-    display: inline-block;
-    line-height: 16px;
-    font-size: 13px;
+	display: inline-block;
+	line-height: 17.5px;
+	height: 18px;
+	font-size: 13px;
 	white-space: nowrap;
-    border: 1px solid #c7c3bf;
-    border-radius: 4px;
+	border: 1px solid #c7c3bf;
+	border-radius: 4px;
 	background: #fff none 0 0 repeat-x;
-    background-image: -moz-linear-gradient(top, #fff, #e9e9e9);
-    background-image: -webkit-linear-gradient(top, #fff, #e9e9e9);
-    background-image: -o-linear-gradient(top, #fff, #e9e9e9);
-    background-image: linear-gradient(to bottom, #fff, #e9e9e9);
+	background-image: -moz-linear-gradient(top, #fff, #e9e9e9);
+	background-image: -webkit-linear-gradient(top, #fff, #e9e9e9);
+	background-image: -o-linear-gradient(top, #fff, #e9e9e9);
+	background-image: linear-gradient(to bottom, #fff, #e9e9e9);
 	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#e9e9e9')";
-    box-shadow: 0 0 0 1px #fff inset;
-    -webkit-box-shadow: 0 0 0 1px #fff inset;
-    text-shadow: 1px 1px 0 #fff, -1px -1px 1px rgba(188, 42, 77, 0.25);
-    padding: 3px 22px 3px 8px;
-	font-family: "Futura-Medium", Verdana, Arial, Helvetica;
-    color: #bc2a4d !important;
-    position: relative;
-    text-decoration: none !important;
-    outline-style: none !important;
+	box-shadow: 0 0 0 1px #fff inset;
+	-webkit-box-shadow: 0 0 0 1px #fff inset;
+	padding: 2px 22px 2px 8px;
+	font-family: Verdana, Arial, Helvetica;
+	color: #bc2a4d !important;
+	position: relative;
+	text-decoration: none !important;
+	outline-style: none !important;
+	vertical-align: bottom;
 	*padding-right: 8px;
 }
 
 .buttons div span { display: none; }
 
 .buttons div a:hover {
-    border-color: #0a8ed0;
-    background-image: -moz-linear-gradient(top, #e9e9e9, #fff);
-    background-image: -webkit-linear-gradient(top, #e9e9e9, #fff);
-    background-image: -o-linear-gradient(top, #e9e9e9, #fff);
-    background-image: linear-gradient(to bottom, #e9e9e9, #fff);
+	border-color: #0a8ed0;
+	background-image: -moz-linear-gradient(top, #e9e9e9, #fff);
+	background-image: -webkit-linear-gradient(top, #e9e9e9, #fff);
+	background-image: -o-linear-gradient(top, #e9e9e9, #fff);
+	background-image: linear-gradient(to bottom, #e9e9e9, #fff);
 	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#e9e9e9', EndColorStr='#ffffff')";
-    text-shadow: 1px 1px 0 #fff, -1px -1px 0 #fff, -1px -1px 0 rgba(188, 42, 77, 0.2);
+	text-shadow: 1px 1px 0 #fff, -1px -1px 0 #fff, -1px -1px 0 rgba(188, 42, 77, 0.2);
 }
 
 .buttons div a:after {
-    content: '';
-    display: block;
-    position: absolute;
-    top: 50%;
-    right: 6px;
-    width: 12px;
-    height: 12px;
+	content: '';
+	display: block;
+	position: absolute;
+	top: 50%;
+	right: 6px;
+	width: 12px;
+	height: 12px;
 	margin-top: -6px;
-    background: url("images/buttons.png") 0px 0 no-repeat;
+	background: url("images/buttons.png") 0px 0 no-repeat;
 }
 
 .buttons div a:hover:after {
-    background-position: 0 -20px;
+	background-position: 0 -20px;
 }
 /* Big button images */
 .buttons div.reply-icon a:after, .buttons div.pmreply-icon a:after { background-position: -20px 0; }
-- 
cgit v1.2.1


From 84272b1028eb0a30abffa898005c99c4f271888b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 15 Jan 2013 22:13:23 +0100
Subject: [feature/avatars] Move definition of driver_collection to avatars.yml

PHPBB3-10018
---
 phpBB/config/avatars.yml  | 7 +++++++
 phpBB/config/services.yml | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
index 8eef0f837f..fa0f07372a 100644
--- a/phpBB/config/avatars.yml
+++ b/phpBB/config/avatars.yml
@@ -46,3 +46,10 @@ services:
             - [set_name, [avatar.driver.upload]]
         tags:
             - { name: avatar.driver }
+
+    avatar.driver_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: avatar.driver }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 5107c5597e..6bde65ec49 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -7,13 +7,6 @@ services:
     auth:
         class: phpbb_auth
 
-    avatar.driver_collection:
-        class: phpbb_di_service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: avatar.driver }
-
     avatar.manager:
         class: phpbb_avatar_manager
         arguments:
-- 
cgit v1.2.1


From 74b09c01ffce189c73053f2d3749740254287aa7 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 16 Jan 2013 00:03:17 +0200
Subject: [ticket/10431] Remove reply-all custom css

Remove CSS for reply-all button that is no longer used

PHPBB3-10431
---
 phpBB/styles/prosilver/theme/cp.css | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index da3ec1736e..e32ff8fcb8 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -287,20 +287,6 @@ dl.mini dd {
 	line-height: 2.5em;
 }
 
-/* PM panel adjustments */
-.reply-all a.left {
-	background-position: 3px 60%;
-}
-
-.reply-all a.left:hover {
-	background-position: 0px 60%;
-}
-
-.reply-all {
-	font-size: 11px;
-	padding-top: 5px;
-}
-
 /* Defined rules list for PM options */
 ol.def-rules {
 	padding-left: 0;
-- 
cgit v1.2.1


From 107a9016f1d4677f059cd0e10ccfdd8bd79cfce2 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 16 Jan 2013 00:09:10 +0200
Subject: [ticket/10431] Remove .left class from reply-all

Remove .left class from .reply-all button

PHPBB3-10431
---
 phpBB/styles/prosilver/template/ucp_pm_message_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index 29e6a5a46b..f03b7c2c86 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -11,7 +11,7 @@
 			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
 			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
 			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
-			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From 460470229d972b93ef5a98b0d1d97a2a970d684f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 Jan 2013 01:08:34 +0100
Subject: [ticket/11201] Remove database column on update

PHPBB3-11201
---
 phpBB/install/database_update.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8950d677ae..3de9ce2717 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1193,6 +1193,11 @@ function database_update_info()
 					'user_timezone'		=> array('VCHAR:100', ''),
 				),
 			),
+			'drop_columns'		=> array(
+				USERS_TABLE			=> array(
+					'user_msnm',
+				),
+			),
 		),
 	);
 }
-- 
cgit v1.2.1


From de541ac13b44d1f52e1ba4bb626b9ec4e124557f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Col=C3=B3n?= <david@davidiq.com>
Date: Fri, 20 Apr 2012 00:19:50 -0400
Subject: [ticket/10786] Javascript toggle member search panel in
 memberlist.php

PHPBB3-10786
---
 phpBB/memberlist.php                               |  8 ++---
 phpBB/styles/prosilver/template/forum_fn.js        | 37 +++++++++++++++++++
 .../styles/prosilver/template/memberlist_body.html | 11 +++---
 .../prosilver/template/memberlist_search.html      |  3 +-
 .../subsilver2/template/memberlist_body.html       |  8 ++---
 .../subsilver2/template/memberlist_search.html     | 41 ++++++++++++++++++++--
 6 files changed, 89 insertions(+), 19 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 091379061c..681e51e3fd 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1025,7 +1025,7 @@ switch ($mode)
 		// We validate form and field here, only id/class allowed
 		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
 		$field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field;
-		if (($mode == 'searchuser' || sizeof(array_intersect($request->variable_names(phpbb_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_')))
+		if ((in_array($mode, array('', 'searchuser')) || sizeof(array_intersect($request->variable_names(phpbb_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_')))
 		{
 			$username	= request_var('username', '', true);
 			$email		= strtolower(request_var('email', ''));
@@ -1377,7 +1377,7 @@ switch ($mode)
 		}
 
 		// Some search user specific data
-		if ($mode == 'searchuser' && ($config['load_search'] || $auth->acl_get('a_')))
+		if (in_array($mode, array('', 'searchuser')) && ($config['load_search'] || $auth->acl_get('a_')))
 		{
 			$group_selected = request_var('search_group_id', 0);
 			$s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '>&nbsp;</option>';
@@ -1447,7 +1447,7 @@ switch ($mode)
 				'S_IP_SEARCH_ALLOWED'	=> ($auth->acl_getf_global('m_info')) ? true : false,
 				'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false,
 				'S_IN_SEARCH_POPUP'		=> ($form && $field) ? true : false,
-				'S_SEARCH_USER'			=> true,
+				'S_SEARCH_USER'			=> ($mode == 'searchuser' || ($mode == '' && $submit)) ? true : false,
 				'S_FORM_NAME'			=> $form,
 				'S_FIELD_NAME'			=> $field,
 				'S_SELECT_SINGLE'		=> $select_single,
@@ -1598,7 +1598,7 @@ switch ($mode)
 			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
 
 			'U_FIND_MEMBER'			=> ($config['load_search'] || $auth->acl_get('a_')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser' . (($start) ? "&amp;start=$start" : '') . (!empty($params) ? '&amp;' . implode('&amp;', $params) : '')) : '',
-			'U_HIDE_FIND_MEMBER'	=> ($mode == 'searchuser') ? $u_hide_find_member : '',
+			'U_HIDE_FIND_MEMBER'	=> ($mode == 'searchuser' || ($mode == '' && $submit)) ? $u_hide_find_member : '',
 			'U_SORT_USERNAME'		=> $sort_url . '&amp;sk=a&amp;sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_FROM'			=> $sort_url . '&amp;sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_JOINED'			=> $sort_url . '&amp;sk=c&amp;sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a'),
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 995b4b0ab7..527a064fa9 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -433,6 +433,43 @@ function apply_onkeypress_event()
 	}
 }
 
+/**
+* Toggle a section's visibility status
+*/
+function toggle_section(link, panel_id, expand_text, collapse_text)
+{
+	if (jquery_present)
+	{
+		var panel = jQuery('#' + panel_id);
+		if (panel.is(':visible'))
+		{
+			jQuery(link).text(expand_text);
+			panel.slideUp('fast');
+		}
+		else
+		{
+			jQuery(link).text(collapse_text);
+			panel.slideDown('fast');
+		}
+	}
+	else
+	{
+		var panel = document.getElementById(panel_id);
+		if (panel.style.display == 'none')
+		{
+			link.innerHTML = collapse_text;
+			panel.style.display = '';
+		}
+		else
+		{
+			link.innerHTML = expand_text;
+			panel.style.display = 'none';
+		}
+	}
+
+	return false;
+}
+
 /**
 * Detect JQuery existance. We currently do not deliver it, but some styles do, so why not benefit from it. ;)
 */
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 4ba0c5cb2a..023c0e1e4e 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -3,13 +3,11 @@
 	<!-- INCLUDE memberlist_search.html -->
 	<form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user); return false">
 
-<!-- ELSEIF S_SEARCH_USER -->
-	<!-- INCLUDE overall_header.html -->
-	<!-- INCLUDE memberlist_search.html -->
-	<form method="post" action="{S_MODE_ACTION}">
-
 <!-- ELSE -->
 	<!-- INCLUDE overall_header.html -->
+	<div class="panel" id="memberlist_search"<!-- IF not S_SEARCH_USER --> style="display: none;"<!-- ENDIF -->>
+	<!-- INCLUDE memberlist_search.html -->
+	</div>
 	<form method="post" action="{S_MODE_ACTION}">
 
 <!-- ENDIF -->
@@ -32,8 +30,7 @@
 
 			<ul class="linklist">
 				<li>
-
-				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
+				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
 				<strong style="font-size: 0.95em;">
 				<!-- BEGIN first_char -->
 					<a href="{first_char.U_SORT}">{first_char.DESC}</a>&nbsp;
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 1ef8710817..ad8fb83fe4 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -37,9 +37,8 @@ function insert_single(user)
 }
 // ]]>
 </script>
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
 <!-- ENDIF -->
-
+<!-- INCLUDEJS template/forum_fn.js -->
 <h2 class="solo">{L_FIND_USERNAME}</h2>
 
 <form method="post" action="{S_MODE_ACTION}" id="search_memberlist">
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index 09336fb8a3..c2846dd18a 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -4,9 +4,9 @@
 	<!-- INCLUDE overall_header.html -->
 <!-- ENDIF -->
 
-<!-- IF S_SEARCH_USER -->	
+<div class="panel" id="memberlist_search"<!-- IF not S_SEARCH_USER --> style="display: none;"<!-- ENDIF -->>
 	<!-- INCLUDE memberlist_search.html -->	
-<!-- ENDIF -->
+</div>
 
 <!-- IF S_SHOW_GROUP --><!-- INCLUDE memberlist_group.html --><!-- ENDIF -->
 
@@ -21,9 +21,9 @@
 					<!-- END first_char -->
 				</select>&nbsp;<input type="submit" name="char" value="{L_DISPLAY}" class="btnlite" /></td>
 	<!-- IF U_FIND_MEMBER and not S_SEARCH_USER -->
-			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a></td>
+			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_FIND_USERNAME}</a></td>
 	<!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP -->
-			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a></td>
+			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_HIDE_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_HIDE_MEMBER_SEARCH}</a></td>
 	<!-- ENDIF -->
 		</tr>
 		</table>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index fb76cacc79..f1f96e1ecd 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -1,8 +1,8 @@
 <!-- You should retain this javascript in your own template! -->
 
-<!-- IF S_IN_SEARCH_POPUP -->
 	<script type="text/javascript">
 	// <![CDATA[
+<!-- IF S_IN_SEARCH_POPUP -->
 		function insert_user(user)
 		{
 			opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
@@ -60,9 +60,46 @@
 				}
 			}
 		}
+<!-- ENDIF -->
+
+		/**
+		* Toggle a section's visibility status
+		*/
+		function toggle_section(link, panel_id, expand_text, collapse_text)
+		{
+			if (window.jQuery)
+			{
+				var panel = jQuery('#' + panel_id);
+				if (panel.is(':visible'))
+				{
+					jQuery(link).text(expand_text);
+					panel.slideUp('fast');
+				}
+				else
+				{
+					jQuery(link).text(collapse_text);
+					panel.slideDown('fast');
+				}
+			}
+			else
+			{
+				var panel = document.getElementById(panel_id);
+				if (panel.style.display == 'none')
+				{
+					link.innerHTML = collapse_text;
+					panel.style.display = '';
+				}
+				else
+				{
+					link.innerHTML = expand_text;
+					panel.style.display = 'none';
+				}
+			}
+
+			return false;
+		}
 	// ]]>
 	</script>
-<!-- ENDIF -->
 
 <form method="post" action="{S_MODE_ACTION}" name="search">
 
-- 
cgit v1.2.1


From babe07caefe8a035f711fd76c38b4dbeb0a8e804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Col=C3=B3n?= <david@davidiq.com>
Date: Tue, 26 Jun 2012 00:37:48 -0400
Subject: [ticket/10786] Javascript toggle member search panel in
 memberlist.php

Search functions on the memberlist.php page are now rendered by default and displayed via javascript.  If javascript is disabled the page still works as it previously did.

PHPBB3-10786
---
 phpBB/memberlist.php                               |  6 ++--
 phpBB/styles/prosilver/template/ajax.js            | 13 ++++++-
 phpBB/styles/prosilver/template/forum_fn.js        | 37 -------------------
 .../styles/prosilver/template/memberlist_body.html |  2 +-
 .../subsilver2/template/memberlist_body.html       |  8 ++---
 .../subsilver2/template/memberlist_search.html     | 41 ++--------------------
 6 files changed, 22 insertions(+), 85 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 681e51e3fd..ebc1757810 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1025,7 +1025,7 @@ switch ($mode)
 		// We validate form and field here, only id/class allowed
 		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
 		$field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field;
-		if ((in_array($mode, array('', 'searchuser')) || sizeof(array_intersect($request->variable_names(phpbb_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_')))
+		if ((($mode == '' || $mode == 'searchuser') || sizeof(array_intersect($request->variable_names(phpbb_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_')))
 		{
 			$username	= request_var('username', '', true);
 			$email		= strtolower(request_var('email', ''));
@@ -1377,7 +1377,7 @@ switch ($mode)
 		}
 
 		// Some search user specific data
-		if (in_array($mode, array('', 'searchuser')) && ($config['load_search'] || $auth->acl_get('a_')))
+		if (($mode == '' || $mode == 'searchuser') && ($config['load_search'] || $auth->acl_get('a_')))
 		{
 			$group_selected = request_var('search_group_id', 0);
 			$s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '>&nbsp;</option>';
@@ -1447,7 +1447,7 @@ switch ($mode)
 				'S_IP_SEARCH_ALLOWED'	=> ($auth->acl_getf_global('m_info')) ? true : false,
 				'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false,
 				'S_IN_SEARCH_POPUP'		=> ($form && $field) ? true : false,
-				'S_SEARCH_USER'			=> ($mode == 'searchuser' || ($mode == '' && $submit)) ? true : false,
+				'S_SEARCH_USER'			=> ($mode == 'searchuser' || ($mode == '' && $submit)),
 				'S_FORM_NAME'			=> $form,
 				'S_FIELD_NAME'			=> $field,
 				'S_SELECT_SINGLE'		=> $select_single,
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 8583fb565c..968f57bba2 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -192,6 +192,17 @@ $('#quick-mod-select').change(function () {
 	$('#quickmodform').submit();
 });
 
-
+/**
+* Toggle the member search panel in memberlist.php.
+*/
+$('#member_search').click(function () {
+	$('#memberlist_search').slideToggle('fast');
+	phpbb.ajax_callbacks['alt_text'].call(this);
+	//Focus on the username textbox if it's available and displayed
+	if ($('#username').length > 0 && $('#memberlist_search').is(':visible')) {
+		$('#username').focus();
+	}
+	return false;
+});
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 527a064fa9..995b4b0ab7 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -433,43 +433,6 @@ function apply_onkeypress_event()
 	}
 }
 
-/**
-* Toggle a section's visibility status
-*/
-function toggle_section(link, panel_id, expand_text, collapse_text)
-{
-	if (jquery_present)
-	{
-		var panel = jQuery('#' + panel_id);
-		if (panel.is(':visible'))
-		{
-			jQuery(link).text(expand_text);
-			panel.slideUp('fast');
-		}
-		else
-		{
-			jQuery(link).text(collapse_text);
-			panel.slideDown('fast');
-		}
-	}
-	else
-	{
-		var panel = document.getElementById(panel_id);
-		if (panel.style.display == 'none')
-		{
-			link.innerHTML = collapse_text;
-			panel.style.display = '';
-		}
-		else
-		{
-			link.innerHTML = expand_text;
-			panel.style.display = 'none';
-		}
-	}
-
-	return false;
-}
-
 /**
 * Detect JQuery existance. We currently do not deliver it, but some styles do, so why not benefit from it. ;)
 */
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 023c0e1e4e..17dc2c33c0 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -30,7 +30,7 @@
 
 			<ul class="linklist">
 				<li>
-				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
+				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{LA_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{LA_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
 				<strong style="font-size: 0.95em;">
 				<!-- BEGIN first_char -->
 					<a href="{first_char.U_SORT}">{first_char.DESC}</a>&nbsp;
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index c2846dd18a..c7ba116d34 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -4,9 +4,9 @@
 	<!-- INCLUDE overall_header.html -->
 <!-- ENDIF -->
 
-<div class="panel" id="memberlist_search"<!-- IF not S_SEARCH_USER --> style="display: none;"<!-- ENDIF -->>
+<!-- IF S_SEARCH_USER -->
 	<!-- INCLUDE memberlist_search.html -->	
-</div>
+<!-- ENDIF -->
 
 <!-- IF S_SHOW_GROUP --><!-- INCLUDE memberlist_group.html --><!-- ENDIF -->
 
@@ -21,9 +21,9 @@
 					<!-- END first_char -->
 				</select>&nbsp;<input type="submit" name="char" value="{L_DISPLAY}" class="btnlite" /></td>
 	<!-- IF U_FIND_MEMBER and not S_SEARCH_USER -->
-			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_FIND_USERNAME}</a></td>
+			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a></td>
 	<!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP -->
-			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_HIDE_FIND_MEMBER}" onclick="return toggle_section(this, 'memberlist_search', '{LA_FIND_USERNAME}', '{LA_HIDE_MEMBER_SEARCH}')">{L_HIDE_MEMBER_SEARCH}</a></td>
+			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a></td>
 	<!-- ENDIF -->
 		</tr>
 		</table>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index f1f96e1ecd..fb76cacc79 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -1,8 +1,8 @@
 <!-- You should retain this javascript in your own template! -->
 
+<!-- IF S_IN_SEARCH_POPUP -->
 	<script type="text/javascript">
 	// <![CDATA[
-<!-- IF S_IN_SEARCH_POPUP -->
 		function insert_user(user)
 		{
 			opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
@@ -60,46 +60,9 @@
 				}
 			}
 		}
-<!-- ENDIF -->
-
-		/**
-		* Toggle a section's visibility status
-		*/
-		function toggle_section(link, panel_id, expand_text, collapse_text)
-		{
-			if (window.jQuery)
-			{
-				var panel = jQuery('#' + panel_id);
-				if (panel.is(':visible'))
-				{
-					jQuery(link).text(expand_text);
-					panel.slideUp('fast');
-				}
-				else
-				{
-					jQuery(link).text(collapse_text);
-					panel.slideDown('fast');
-				}
-			}
-			else
-			{
-				var panel = document.getElementById(panel_id);
-				if (panel.style.display == 'none')
-				{
-					link.innerHTML = collapse_text;
-					panel.style.display = '';
-				}
-				else
-				{
-					link.innerHTML = expand_text;
-					panel.style.display = 'none';
-				}
-			}
-
-			return false;
-		}
 	// ]]>
 	</script>
+<!-- ENDIF -->
 
 <form method="post" action="{S_MODE_ACTION}" name="search">
 
-- 
cgit v1.2.1


From 4306a7641f92dd34e8c3a132017a146607b3e2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Col=C3=B3n?= <david@davidiq.com>
Date: Tue, 26 Jun 2012 21:29:27 -0400
Subject: [ticket/10786] Javascript toggle member search panel in
 memberlist.php

Search functions on the memberlist.php page are now rendered by default and displayed via javascript.  If javascript is disabled the page still works as it previously did.

PHPBB3-10786
---
 phpBB/styles/prosilver/template/ajax.js               | 8 ++++++--
 phpBB/styles/subsilver2/template/memberlist_body.html | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 968f57bba2..6ce3b38981 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -194,12 +194,16 @@ $('#quick-mod-select').change(function () {
 
 /**
 * Toggle the member search panel in memberlist.php.
+*
+* If user returns to search page after viewing results the search panel is automatically displayed.
+* In any case the link will toggle the display status of the search panel and link text will be
+* appropriately changed based on the status of the search panel.
 */
 $('#member_search').click(function () {
 	$('#memberlist_search').slideToggle('fast');
 	phpbb.ajax_callbacks['alt_text'].call(this);
-	//Focus on the username textbox if it's available and displayed
-	if ($('#username').length > 0 && $('#memberlist_search').is(':visible')) {
+	// Focus on the username textbox if it's available and displayed
+	if ($('#memberlist_search').is(':visible')) {
 		$('#username').focus();
 	}
 	return false;
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index c7ba116d34..09336fb8a3 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -4,7 +4,7 @@
 	<!-- INCLUDE overall_header.html -->
 <!-- ENDIF -->
 
-<!-- IF S_SEARCH_USER -->
+<!-- IF S_SEARCH_USER -->	
 	<!-- INCLUDE memberlist_search.html -->	
 <!-- ENDIF -->
 
-- 
cgit v1.2.1


From 1d5f8a2bbf13305f9ba651c7ed131911dbcfa016 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 16 Jan 2013 11:37:13 +0200
Subject: [ticket/11328] Add language variables for buttons

New language variables for buttons

PHPBB3-11328
---
 phpBB/language/en/common.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6cad4136a2..63241b71b5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -119,6 +119,17 @@ $lang = array_merge($lang, array(
 		1	=> 'Users browsing this forum: %2$s and %1$d guest',
 		2	=> 'Users browsing this forum: %2$s and %1$d guests',
 	),
+	'BUTTON_EDIT'			=> 'Edit',
+	'BUTTON_FORUM_LOCKED'	=> 'Locked',
+	'BUTTON_NEW_TOPIC'		=> 'New Topic',
+	'BUTTON_PM'				=> 'PM',
+	'BUTTON_PM_FORWARD'		=> 'Forward',
+	'BUTTON_PM_NEW'			=> 'New PM',
+	'BUTTON_PM_REPLY'		=> 'Send Reply',
+	'BUTTON_PM_REPLY_ALL'	=> 'Reply All',
+	'BUTTON_POST_REPLY'		=> 'Post Reply',
+	'BUTTON_QUOTE'			=> 'Quote',
+	'BUTTON_TOPIC_LOCKED'	=> 'Locked',
 	'BYTES'					=> 'Bytes',
 
 	'CANCEL'				=> 'Cancel',
-- 
cgit v1.2.1


From d68c4697be5847a7fd3f7e92f56e24d366da83b1 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 16 Jan 2013 11:37:50 +0200
Subject: [ticket/11328] Replace long buttons text with short text

Replace long buttons text with short text, like it was on images

PHPBB3-11328
---
 phpBB/styles/prosilver/template/ucp_pm_message_header.html | 8 ++++----
 phpBB/styles/prosilver/template/viewforum_body.html        | 4 ++--
 phpBB/styles/prosilver/template/viewtopic_body.html        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index 4d48782c10..7a80f72348 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -8,10 +8,10 @@
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
-			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
-			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
-			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
-			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_BUTTON_PM_REPLY}</a></div>
+			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_BUTTON_PM_NEW}</a></div><!-- ENDIF -->
+			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_BUTTON_PM_FORWARD}</a></div><!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_BUTTON_PM_REPLY_ALL}</a></div><!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index b47c13d573..e0aef4f290 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -39,7 +39,7 @@
 
 	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
+			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --></a></div>
 		</div>
 	<!-- ENDIF -->
 
@@ -205,7 +205,7 @@
 	<div class="topic-actions">
 		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
+			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --></a></div>
 		</div>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 9910be34b0..e7bd3d5059 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -29,7 +29,7 @@
 
 	<div class="buttons">
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div>
+		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --></a></div>
 	<!-- ENDIF -->
 	</div>
 
@@ -263,7 +263,7 @@
 <div class="topic-actions">
 	<div class="buttons">
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div>
+		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --></a></div>
 	<!-- ENDIF -->
 	</div>
 
-- 
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')

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/config/services.yml  |  1 +
 phpBB/includes/log/log.php | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 7fd13d4eea..129cd4a4f9 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -164,6 +164,7 @@ services:
             - @auth
             - @dispatcher
             - %core.root_path%
+            - %core.adm_relative_path%
             - %core.php_ext%
             - %tables.log%
 
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')

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')

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')

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')

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')

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 95c9095a1c7149c3ad0b98e59bc8e951e12e6a7a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Jan 2013 12:34:28 +0200
Subject: [ticket/11329] Moving colors to colours.css

Moving color values from buttons.css to colours.css

PHPBB3-11329
---
 phpBB/styles/prosilver/theme/buttons.css | 25 ++++---------------------
 phpBB/styles/prosilver/theme/colours.css | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 21 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 543d9d8183..c3210887b6 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -23,19 +23,11 @@
 	height: 18px;
 	font-size: 13px;
 	white-space: nowrap;
-	border: 1px solid #c7c3bf;
+	border: 1px solid transparent;
 	border-radius: 4px;
-	background: #fff none 0 0 repeat-x;
-	background-image: -moz-linear-gradient(top, #fff, #e9e9e9);
-	background-image: -webkit-linear-gradient(top, #fff, #e9e9e9);
-	background-image: -o-linear-gradient(top, #fff, #e9e9e9);
-	background-image: linear-gradient(to bottom, #fff, #e9e9e9);
-	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#e9e9e9')";
-	box-shadow: 0 0 0 1px #fff inset;
-	-webkit-box-shadow: 0 0 0 1px #fff inset;
+	background: transparent none 0 0 repeat-x;
 	padding: 2px 22px 2px 8px;
 	font-family: Verdana, Arial, Helvetica;
-	color: #bc2a4d !important;
 	position: relative;
 	text-decoration: none !important;
 	outline-style: none !important;
@@ -45,16 +37,6 @@
 
 .buttons div span { display: none; }
 
-.buttons div a:hover {
-	border-color: #0a8ed0;
-	background-image: -moz-linear-gradient(top, #e9e9e9, #fff);
-	background-image: -webkit-linear-gradient(top, #e9e9e9, #fff);
-	background-image: -o-linear-gradient(top, #e9e9e9, #fff);
-	background-image: linear-gradient(to bottom, #e9e9e9, #fff);
-	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#e9e9e9', EndColorStr='#ffffff')";
-	text-shadow: 1px 1px 0 #fff, -1px -1px 0 #fff, -1px -1px 0 rgba(188, 42, 77, 0.2);
-}
-
 .buttons div a:after {
 	content: '';
 	display: block;
@@ -64,12 +46,13 @@
 	width: 12px;
 	height: 12px;
 	margin-top: -6px;
-	background: url("images/buttons.png") 0px 0 no-repeat;
+	background: transparent 0 0 no-repeat;
 }
 
 .buttons div a:hover:after {
 	background-position: 0 -20px;
 }
+
 /* Big button images */
 .buttons div.reply-icon a:after, .buttons div.pmreply-icon a:after { background-position: -20px 0; }
 .buttons div.reply-icon a:hover:after, .buttons div.pmreply-icon a:hover:after	{ background-position: -20px -20px; }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 0a8e011171..65d27ed58d 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -657,6 +657,33 @@ a.sendemail {
 	background-image: url("./images/icon_sendemail.gif");
 }
 
+.buttons div a {
+	border-color: #C7C3BF;
+	background-color: #FFFFFF;
+	background-image: -moz-linear-gradient(top, #FFFFFF, #E9E9E9);
+	background-image: -webkit-linear-gradient(top, #FFFFFF, #E9E9E9);
+	background-image: -o-linear-gradient(top, #FFFFFF, #E9E9E9);
+	background-image: linear-gradient(to bottom, #FFFFFF, #E9E9E9);
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#FFFFFF', EndColorStr='#E9E9E9')";
+	box-shadow: 0 0 0 1px #FFFFFF inset;
+	-webkit-box-shadow: 0 0 0 1px #FFFFFF inset;
+	color: #BC2A4D !important;
+}
+
+.buttons div a:hover {
+	border-color: #0a8ed0;
+	background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF);
+	background-image: -webkit-linear-gradient(top, #E9E9E9, #FFFFFF);
+	background-image: -o-linear-gradient(top, #E9E9E9, #FFFFFF);
+	background-image: linear-gradient(to bottom, #E9E9E9, #FFFFFF);
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#E9E9E9', EndColorStr='#FFFFFF')";
+	text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2);
+}
+
+.buttons div a:after {
+	background-image: url("images/buttons.png");
+}
+
 /* Icon images
 ---------------------------------------- */
 .sitehome						{ background-image: url("./images/icon_home.gif"); }
-- 
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')

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')

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')

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')

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/common.php                           |  1 +
 phpBB/includes/functions_compatibility.php | 41 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 phpBB/includes/functions_compatibility.php

(limited to 'phpBB')

diff --git a/phpBB/common.php b/phpBB/common.php
index f502d37c8f..5c0feb87db 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -73,6 +73,7 @@ require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
+include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
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')

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 317964174e9a70972d4c783feb318cb138e2bd57 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Sat, 19 Jan 2013 12:31:53 +0100
Subject: [ticket/10050] adding .topicrow to template condition

PHPBB3-10050
---
 phpBB/styles/prosilver/template/viewforum_body.html  | 2 +-
 phpBB/styles/subsilver2/template/viewforum_body.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 02f42fa097..4b9c514932 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -57,7 +57,7 @@
 
 	<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
 		<div class="pagination">
-			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
+			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
 			<!-- IF PAGE_NUMBER -->
 				<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
 			<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index 6511fa5349..ee6ec26ab2 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -155,7 +155,7 @@
 				<table width="100%" cellspacing="0">
 				<tr class="nav">
 					<td valign="middle">&nbsp;<!-- IF S_WATCH_FORUM_LINK and not S_IS_BOT --><a href="{S_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td>
-					<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF -->&nbsp;</td>
+					<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF -->&nbsp;</td>
 				</tr>
 				</table>
 			</td>
-- 
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')

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')

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')

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')

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')

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 80283646e26661c32dbac14c059a453c7285deb4 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Thu, 24 Jan 2013 22:54:12 +0100
Subject: [ticket/10050] removing prosilver edits

PHPBB3-10050
---
 phpBB/styles/prosilver/template/viewforum_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 4b9c514932..02f42fa097 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -57,7 +57,7 @@
 
 	<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
 		<div class="pagination">
-			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
+			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
 			<!-- IF PAGE_NUMBER -->
 				<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
 			<!-- ENDIF -->
-- 
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')

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')

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')

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')

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')

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')

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 b567e0963099b911e0d1d7b262c777a6969aad1f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 31 Jan 2013 10:14:42 -0600
Subject: [ticket/11103] Remove Primary Key on user_notifications table

PHPBB3-11103
---
 phpBB/develop/create_schema_files.php     |  6 ------
 phpBB/install/database_update.php         |  6 ------
 phpBB/install/schemas/firebird_schema.sql |  2 --
 phpBB/install/schemas/mssql_schema.sql    | 10 ----------
 phpBB/install/schemas/mysql_40_schema.sql |  3 +--
 phpBB/install/schemas/mysql_41_schema.sql |  3 +--
 phpBB/install/schemas/oracle_schema.sql   |  3 +--
 phpBB/install/schemas/postgres_schema.sql |  3 +--
 phpBB/install/schemas/sqlite_schema.sql   |  3 +--
 9 files changed, 5 insertions(+), 34 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index a280d3880a..6389ce7e7c 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1790,12 +1790,6 @@ function get_schema_struct()
 			'method'			=> array('VCHAR:255', ''),
 			'notify'			=> array('BOOL', 1),
 		),
-		'PRIMARY_KEY'		=> array(
-			'item_type',
-			'item_id',
-			'user_id',
-			'method',
-		),
 	);
 
 	$schema_data['phpbb_user_group'] = array(
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 57a027cf2a..45632a0c3a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1213,12 +1213,6 @@ function database_update_info()
 						'method'			=> array('VCHAR:255', ''),
 						'notify'			=> array('BOOL', 1),
 					),
-					'PRIMARY_KEY'		=> array(
-						'item_type',
-						'item_id',
-						'user_id',
-						'method',
-					),
 				),
 			),
 			'add_columns'		=> array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index d654193d7b..a1b4c4e0ee 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1252,8 +1252,6 @@ CREATE TABLE phpbb_user_notifications (
 	notify INTEGER DEFAULT 1 NOT NULL
 );;
 
-ALTER TABLE phpbb_user_notifications ADD PRIMARY KEY (item_type, item_id, user_id, method);;
-
 
 # Table: 'phpbb_user_group'
 CREATE TABLE phpbb_user_group (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 30016e43b1..38e01504cb 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1538,16 +1538,6 @@ CREATE TABLE [phpbb_user_notifications] (
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_user_notifications] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_user_notifications] PRIMARY KEY  CLUSTERED 
-	(
-		[item_type],
-		[item_id],
-		[user_id],
-		[method]
-	)  ON [PRIMARY] 
-GO
-
 
 /*
 	Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index fef5357d2a..19df59f6f2 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -884,8 +884,7 @@ CREATE TABLE phpbb_user_notifications (
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	method varbinary(255) DEFAULT '' NOT NULL,
-	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (item_type, item_id, user_id, method)
+	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index a797c36c20..3fde7030a6 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -884,8 +884,7 @@ CREATE TABLE phpbb_user_notifications (
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	method varchar(255) DEFAULT '' NOT NULL,
-	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (item_type, item_id, user_id, method)
+	notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8932f04820..0852524691 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1650,8 +1650,7 @@ CREATE TABLE phpbb_user_notifications (
 	item_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	method varchar2(255) DEFAULT '' ,
-	notify number(1) DEFAULT '1' NOT NULL,
-	CONSTRAINT pk_phpbb_user_notifications PRIMARY KEY (item_type, item_id, user_id, method)
+	notify number(1) DEFAULT '1' NOT NULL
 )
 /
 
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 426f2decbf..8892357805 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1136,8 +1136,7 @@ CREATE TABLE phpbb_user_notifications (
 	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	method varchar(255) DEFAULT '' NOT NULL,
-	notify INT2 DEFAULT '1' NOT NULL CHECK (notify >= 0),
-	PRIMARY KEY (item_type, item_id, user_id, method)
+	notify INT2 DEFAULT '1' NOT NULL CHECK (notify >= 0)
 );
 
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index fb6797deb6..6b3f4ac60b 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -857,8 +857,7 @@ CREATE TABLE phpbb_user_notifications (
 	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	method varchar(255) NOT NULL DEFAULT '',
-	notify INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	PRIMARY KEY (item_type, item_id, user_id, method)
+	notify INTEGER UNSIGNED NOT NULL DEFAULT '1'
 );
 
 
-- 
cgit v1.2.1


From 006662a03fc159998093fa4d2c3e615d4980ebd3 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 31 Jan 2013 10:34:39 -0800
Subject: [ticket/11103] Rounded Corners and antialiased pointer

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

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index aa1a64455f..6c78195457 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -680,6 +680,7 @@ p.rules a {
 	z-index: 1;
 	border: 1px solid;
 	box-shadow: 3px 3px 5px darkgray;
+	border-radius: 5px;
 	margin-top: 8px;
 }
 
@@ -709,6 +710,7 @@ p.rules a {
 	text-transform: uppercase;	
 	line-height: 30px;
 	border-bottom: 1px solid;
+	border-radius: 5px 5px 0 0;
 }
 
 #notification_list > .footer {
@@ -744,8 +746,8 @@ p.rules a {
 	border-bottom: 10px solid;
 	border-left: 10px dashed transparent;
 	border-right: 10px dashed transparent;
+	-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */
 	display: block;
-	background: transparent;
 }
 
 .notification_list .pointer {
-- 
cgit v1.2.1


From cf3edb2c6e7f18e143e6627a8f9a5848df74f6ec Mon Sep 17 00:00:00 2001
From: Crizz0 <mail@crizzo.de>
Date: Sun, 27 Jan 2013 21:13:49 +0100
Subject: [ticket/11220] Improvement to the info pop-up from "list="

A improvement to the info popup which is displayed when the cursor
is over the bbcode-button [list=] in the posting-editor

PHPBB3-11220
---
 phpBB/language/en/posting.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 24f3204c57..dfc5065a05 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -54,9 +54,9 @@ $lang = array_merge($lang, array(
 	'BBCODE_IS_OFF'				=> '%sBBCode%s is <em>OFF</em>',
 	'BBCODE_IS_ON'				=> '%sBBCode%s is <em>ON</em>',
 	'BBCODE_I_HELP'				=> 'Italic text: [i]text[/i]',
-	'BBCODE_L_HELP'				=> 'List: [list]text[/list]',
-	'BBCODE_LISTITEM_HELP'		=> 'List item: [*]text[/*]',
-	'BBCODE_O_HELP'				=> 'Ordered list: [list=]text[/list]',
+	'BBCODE_L_HELP'				=> 'List: [list][*]text[/list]', 
+	'BBCODE_LISTITEM_HELP'		=> 'List item: [*]text',
+	'BBCODE_O_HELP'				=> 'Ordered list: e.g. [list=1][*]First point[/list] or [list=a][*]Point a[/list]',
 	'BBCODE_P_HELP'				=> 'Insert image: [img]http://image_url[/img]',
 	'BBCODE_Q_HELP'				=> 'Quote text: [quote]text[/quote]',
 	'BBCODE_S_HELP'				=> 'Font colour: [color=red]text[/color]  Tip: you can also use color=#FF0000',
-- 
cgit v1.2.1


From a54128b3bc146fa6f46bd10c712253e568352ec8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 3 Feb 2013 15:51:29 +0100
Subject: [ticket/11342] Mark active topics read when marking forums read

Marking forums read while viewing a category will also mark the active
topics inside that category read. Therefore, the active topics should also
be marked read. With this patch the ajax callback "mark_forums_read" will
check if the active topics id ("active_topics") exists and also mark
topics read if it does. As the active topics will only be displayed in
categories, which can't have any other topics, this is a proper approach.

PHPBB3-11342
---
 phpBB/styles/prosilver/template/ajax.js             | 18 +++++++++++++++---
 phpBB/styles/prosilver/template/viewforum_body.html |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 6ce3b38981..b2a27089f7 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -37,14 +37,24 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	// Mark subforums read
 	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
 
+	// Mark topics read if we are watching a category and showing active topics
+	if ($('#active_topics').length) {
+		phpbb.ajaxCallbacks['mark_topics_read'].call(this, res, false);
+	}
+
 	// Update mark forums read links
 	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
 
 	phpbb.closeDarkenWrapper(3000);
 });
 
-// This callback will mark all topic icons read
-phpbb.addAjaxCallback('mark_topics_read', function(res) {
+/** 
+* This callback will mark all topic icons read
+*
+* @param update_topic_links bool Wether "Mark topics read" links should be
+*     updated. Defaults to true.
+*/
+phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links = true) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
@@ -85,7 +95,9 @@ phpbb.addAjaxCallback('mark_topics_read', function(res) {
 	$('a').has('span.icon_topic_newest').remove();
 
 	// Update mark topics read links
-	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
+	if (update_topic_links) {
+		$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
+	}
 
 	phpbb.closeDarkenWrapper(3000);
 });
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index e0aef4f290..38566dece0 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -130,7 +130,7 @@
 		<ul class="topiclist">
 			<li class="header">
 				<dl class="icon">
-					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
+					<dt<!-- IF S_DISPLAY_ACTIVE --> id="active_topics"<!-- ENDIF -->><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-- 
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')

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')

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/adm/style/acp_users_profile.html             |  4 ++
 phpBB/develop/benchmark.php                        |  5 +-
 phpBB/develop/create_schema_files.php              |  1 +
 phpBB/develop/mysql_upgrader.php                   |  1 +
 phpBB/includes/acp/acp_users.php                   |  4 ++
 phpBB/includes/ucp/ucp_pm_viewmessage.php          |  1 +
 phpBB/includes/ucp/ucp_profile.php                 |  4 ++
 phpBB/install/convertors/convert_phpbb20.php       |  1 +
 phpBB/install/database_update.php                  |  5 --
 phpBB/install/schemas/firebird_schema.sql          |  1 +
 phpBB/install/schemas/mssql_schema.sql             |  1 +
 phpBB/install/schemas/mysql_40_schema.sql          |  1 +
 phpBB/install/schemas/mysql_41_schema.sql          |  1 +
 phpBB/install/schemas/oracle_schema.sql            |  1 +
 phpBB/install/schemas/postgres_schema.sql          |  1 +
 phpBB/install/schemas/schema_data.sql              |  4 +-
 phpBB/install/schemas/sqlite_schema.sql            |  1 +
 phpBB/language/en/acp/styles.php                   |  1 +
 phpBB/language/en/common.php                       |  3 +
 phpBB/language/en/memberlist.php                   |  4 ++
 phpBB/language/en/ucp.php                          |  1 +
 phpBB/memberlist.php                               | 22 +++++-
 phpBB/styles/prosilver/template/memberlist_im.html | 82 ++++++++++++++++++++-
 .../prosilver/template/memberlist_search.html      |  4 ++
 .../styles/prosilver/template/memberlist_view.html |  1 +
 .../prosilver/template/ucp_pm_viewmessage.html     |  3 +-
 .../template/ucp_profile_profile_info.html         |  4 ++
 .../styles/prosilver/template/viewtopic_body.html  |  3 +-
 phpBB/styles/prosilver/theme/bidi.css              |  2 +-
 phpBB/styles/prosilver/theme/buttons.css           |  2 +
 phpBB/styles/prosilver/theme/colours.css           |  1 +
 phpBB/styles/prosilver/theme/imageset.css          |  5 ++
 .../styles/subsilver2/template/memberlist_im.html  | 83 +++++++++++++++++++++-
 .../subsilver2/template/memberlist_search.html     |  8 +--
 .../subsilver2/template/memberlist_view.html       |  4 ++
 .../template/ucp_profile_profile_info.html         |  4 ++
 phpBB/styles/subsilver2/theme/en/stylesheet.css    |  5 ++
 phpBB/styles/subsilver2/theme/stylesheet.css       |  5 ++
 phpBB/viewtopic.php                                |  4 ++
 39 files changed, 267 insertions(+), 21 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 36e9f340d4..3232e8d1f5 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -10,6 +10,10 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
+		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php
index 6517954dfe..c867b9262e 100644
--- a/phpBB/develop/benchmark.php
+++ b/phpBB/develop/benchmark.php
@@ -377,6 +377,7 @@ function make_user($username)
 	$viewemail = 0;
 	$aim = 0;
 	$yim = 0;
+	$msn = 0;
 	$attachsig = 1;
 	$allowsmilies = 1;
 	$allowhtml = 1;
@@ -421,8 +422,8 @@ function make_user($username)
 	}
 
 
-	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
-		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
+	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
+		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
 
 	
 	$sql .= "1, '')";
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index c6012a633f..0ae75c2681 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1836,6 +1836,7 @@ function get_schema_struct()
 			'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', ''),
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index ca738aabf6..7f82ebfeab 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -1265,6 +1265,7 @@ function get_schema_struct()
 			'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', ''),
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'],
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 6792f4ff9c..5f30625980 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -896,6 +896,7 @@ if (!$get_info)
 				array('user_occ',				'users.user_occ',					array('function1' => 'phpbb_set_encoding')),
 				array('user_website',			'users.user_website',				'validate_website'),
 				array('user_jabber',			'',									''),
+				array('user_msnm',				'users.user_msnm',					array('function1' => 'phpbb_set_encoding')),
 				array('user_yim',				'users.user_yim',					array('function1' => 'phpbb_set_encoding')),
 				array('user_aim',				'users.user_aim',					array('function1' => 'phpbb_set_encoding')),
 				array('user_icq',				'users.user_icq',					array('function1' => 'phpbb_set_encoding')),
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4a61d189a3..4e17a1429c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1196,11 +1196,6 @@ function database_update_info()
 					'user_timezone'		=> array('VCHAR:100', ''),
 				),
 			),
-			'drop_columns'		=> array(
-				USERS_TABLE			=> array(
-					'user_msnm',
-				),
-			),
 		),
 	);
 }
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index b475303fde..bd97fefb36 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1284,6 +1284,7 @@ CREATE TABLE phpbb_users (
 	user_icq VARCHAR(15) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	user_aim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_yim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
+	user_msnm VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_jabber VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_website VARCHAR(200) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 0420738828..bb0890e439 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1568,6 +1568,7 @@ CREATE TABLE [phpbb_users] (
 	[user_icq] [varchar] (15) DEFAULT ('') NOT NULL ,
 	[user_aim] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_yim] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[user_msnm] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_jabber] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_website] [varchar] (200) DEFAULT ('') NOT NULL ,
 	[user_occ] [varchar] (4000) DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 18f8560e87..bf3d7fecfa 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -932,6 +932,7 @@ CREATE TABLE phpbb_users (
 	user_icq varbinary(15) DEFAULT '' NOT NULL,
 	user_aim blob NOT NULL,
 	user_yim blob NOT NULL,
+	user_msnm blob NOT NULL,
 	user_jabber blob NOT NULL,
 	user_website blob NOT NULL,
 	user_occ blob NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index bc3cfb4249..372b63d83c 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -932,6 +932,7 @@ CREATE TABLE phpbb_users (
 	user_icq varchar(15) DEFAULT '' NOT NULL,
 	user_aim varchar(255) DEFAULT '' NOT NULL,
 	user_yim varchar(255) DEFAULT '' NOT NULL,
+	user_msnm varchar(255) DEFAULT '' NOT NULL,
 	user_jabber varchar(255) DEFAULT '' NOT NULL,
 	user_website varchar(200) DEFAULT '' NOT NULL,
 	user_occ text NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f20b96cd38..671347ebe1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1680,6 +1680,7 @@ CREATE TABLE phpbb_users (
 	user_icq varchar2(15) DEFAULT '' ,
 	user_aim varchar2(765) DEFAULT '' ,
 	user_yim varchar2(765) DEFAULT '' ,
+	user_msnm varchar2(765) DEFAULT '' ,
 	user_jabber varchar2(765) DEFAULT '' ,
 	user_website varchar2(600) DEFAULT '' ,
 	user_occ clob DEFAULT '' ,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 301654bf25..4c13bf0ba9 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1182,6 +1182,7 @@ CREATE TABLE phpbb_users (
 	user_icq varchar(15) DEFAULT '' NOT NULL,
 	user_aim varchar(255) DEFAULT '' NOT NULL,
 	user_yim varchar(255) DEFAULT '' NOT NULL,
+	user_msnm varchar(255) DEFAULT '' NOT NULL,
 	user_jabber varchar(255) DEFAULT '' NOT NULL,
 	user_website varchar(200) DEFAULT '' NOT NULL,
 	user_occ varchar(4000) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 19c00ef9fb..7c1a7d40f5 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -454,10 +454,10 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id,
 INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents, forum_flags) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 0, 0, '', 48);
 
 # -- Users / Anonymous user
-INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', 0);
+INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0);
 
 # -- username: Admin    password: admin (change this or remove it once everything is working!)
-INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '');
+INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
 
 # -- Groups
 INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, 0, '', '', '', 5);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 397cfc139a..46a96a1edd 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -906,6 +906,7 @@ CREATE TABLE phpbb_users (
 	user_icq varchar(15) NOT NULL DEFAULT '',
 	user_aim varchar(255) NOT NULL DEFAULT '',
 	user_yim varchar(255) NOT NULL DEFAULT '',
+	user_msnm varchar(255) NOT NULL DEFAULT '',
 	user_jabber varchar(255) NOT NULL DEFAULT '',
 	user_website varchar(200) NOT NULL DEFAULT '',
 	user_occ text(65535) NOT NULL DEFAULT '',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 3cb2e741ca..e7954ff148 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -186,6 +186,7 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
+	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
 	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
 	'IMG_ICON_CONTACT_WWW'		=> 'Website',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 63241b71b5..8158209a68 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -379,6 +379,7 @@ $lang = array_merge($lang, array(
 	'MODERATORS'			=> 'Moderators',
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
+	'MSNM'					=> 'WLM',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
@@ -637,6 +638,7 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
+	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
@@ -657,6 +659,7 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
+	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index bc5a0c100b..ec21e8e904 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -78,6 +78,9 @@ $lang = array_merge($lang, array(
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
+	'IM_MSNM'				=> 'Please note that you need Windows Live Messenger installed to use this.',
+	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
+	'IM_MSNM_CONNECT'		=> 'WLM is not connected.\nYou have to connect to WLM to continue.',
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
@@ -120,6 +123,7 @@ $lang = array_merge($lang, array(
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
 	'SEND_MESSAGE'			=> 'Message',
+	'SEND_MSNM_MESSAGE'		=> 'Send WLM message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
 	'SORT_EMAIL'			=> 'Email',
 	'SORT_LAST_ACTIVE'		=> 'Last active',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 2eb34b3713..267ae00710 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -455,6 +455,7 @@ $lang = array_merge($lang, array(
 	'UCP_MAIN_FRONT'			=> 'Front page',
 	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
 
+	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
 	'UCP_PREFS'					=> 'Board preferences',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index ebc1757810..e222d4478d 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -287,6 +287,13 @@ switch ($mode)
 				$s_action = '';
 			break;
 
+			case 'msnm':
+				$lang = 'MSNM';
+				$sql_field = 'user_msnm';
+				$s_select = 'S_SEND_MSNM';
+				$s_action = '';
+			break;
+
 			case 'jabber':
 				$lang = 'JABBER';
 				$sql_field = 'user_jabber';
@@ -633,6 +640,7 @@ switch ($mode)
 			'WWW_IMG'		=> $user->img('icon_contact_www', $user->lang['WWW']),
 			'ICQ_IMG'		=> $user->img('icon_contact_icq', $user->lang['ICQ']),
 			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),
+			'MSN_IMG'		=> $user->img('icon_contact_msnm', $user->lang['MSNM']),
 			'YIM_IMG'		=> $user->img('icon_contact_yahoo', $user->lang['YIM']),
 			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
 			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
@@ -976,8 +984,8 @@ switch ($mode)
 		$template_html = 'memberlist_body.html';
 
 		// Sorting
-		$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_LOCATION'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT'], 'f' => $user->lang['WEBSITE'], 'g' => $user->lang['ICQ'], 'h' => $user->lang['AIM'], 'j' => $user->lang['YIM'], 'k' => $user->lang['JABBER']);
-		$sort_key_sql = array('a' => 'u.username_clean', 'b' => 'u.user_from', 'c' => 'u.user_regdate', 'd' => 'u.user_posts', 'f' => 'u.user_website', 'g' => 'u.user_icq', 'h' => 'u.user_aim', 'j' => 'u.user_yim', 'k' => 'u.user_jabber');
+		$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_LOCATION'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT'], 'f' => $user->lang['WEBSITE'], 'g' => $user->lang['ICQ'], 'h' => $user->lang['AIM'], 'i' => $user->lang['MSNM'], 'j' => $user->lang['YIM'], 'k' => $user->lang['JABBER']);
+		$sort_key_sql = array('a' => 'u.username_clean', 'b' => 'u.user_from', 'c' => 'u.user_regdate', 'd' => 'u.user_posts', 'f' => 'u.user_website', 'g' => 'u.user_icq', 'h' => 'u.user_aim', 'i' => 'u.user_msnm', 'j' => 'u.user_yim', 'k' => 'u.user_jabber');
 
 		if ($auth->acl_get('a_user'))
 		{
@@ -1020,7 +1028,7 @@ switch ($mode)
 		$select_single 	= request_var('select_single', false);
 
 		// Search URL parameters, if any of these are in the URL we do a search
-		$search_params = array('username', 'email', 'icq', 'aim', 'yahoo', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');
+		$search_params = array('username', 'email', 'icq', 'aim', 'yahoo', 'msn', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');
 
 		// We validate form and field here, only id/class allowed
 		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
@@ -1032,6 +1040,7 @@ switch ($mode)
 			$icq		= request_var('icq', '');
 			$aim		= request_var('aim', '');
 			$yahoo		= request_var('yahoo', '');
+			$msn		= request_var('msn', '');
 			$jabber		= request_var('jabber', '');
 			$search_group_id	= request_var('search_group_id', 0);
 
@@ -1075,6 +1084,7 @@ switch ($mode)
 			$sql_where .= ($icq) ? ' AND u.user_icq ' . $db->sql_like_expression(str_replace('*', $db->any_char, $icq)) . ' ' : '';
 			$sql_where .= ($aim) ? ' AND u.user_aim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $aim)) . ' ' : '';
 			$sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $yahoo)) . ' ' : '';
+			$sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : '';
 			$sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : '';
 			$sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
 
@@ -1307,6 +1317,7 @@ switch ($mode)
 			'icq'			=> array('icq', ''),
 			'aim'			=> array('aim', ''),
 			'yahoo'			=> array('yahoo', ''),
+			'msn'			=> array('msn', ''),
 			'jabber'		=> array('jabber', ''),
 			'search_group_id'	=> array('search_group_id', 0),
 			'joined_select'	=> array('joined_select', 'lt'),
@@ -1438,6 +1449,7 @@ switch ($mode)
 				'ICQ'		=> $icq,
 				'AIM'		=> $aim,
 				'YAHOO'		=> $yahoo,
+				'MSNM'		=> $msn,
 				'JABBER'	=> $jabber,
 				'JOINED'	=> implode('-', $joined),
 				'ACTIVE'	=> implode('-', $active),
@@ -1593,6 +1605,7 @@ switch ($mode)
 			'WWW_IMG'		=> $user->img('icon_contact_www', $user->lang['WWW']),
 			'ICQ_IMG'		=> $user->img('icon_contact_icq', $user->lang['ICQ']),
 			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),
+			'MSN_IMG'		=> $user->img('icon_contact_msnm', $user->lang['MSNM']),
 			'YIM_IMG'		=> $user->img('icon_contact_yahoo', $user->lang['YIM']),
 			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
 			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
@@ -1608,6 +1621,7 @@ switch ($mode)
 			'U_SORT_LOCATION'		=> $sort_url . '&amp;sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_ICQ'			=> $sort_url . '&amp;sk=g&amp;sd=' . (($sort_key == 'g' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_AIM'			=> $sort_url . '&amp;sk=h&amp;sd=' . (($sort_key == 'h' && $sort_dir == 'a') ? 'd' : 'a'),
+			'U_SORT_MSN'			=> $sort_url . '&amp;sk=i&amp;sd=' . (($sort_key == 'i' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_YIM'			=> $sort_url . '&amp;sk=j&amp;sd=' . (($sort_key == 'j' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_ACTIVE'			=> ($auth->acl_get('u_viewonline')) ? $sort_url . '&amp;sk=l&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '',
 			'U_SORT_RANK'			=> $sort_url . '&amp;sk=m&amp;sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'),
@@ -1734,12 +1748,14 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 		'U_ICQ'			=> ($data['user_icq']) ? 'http://www.icq.com/people/' . urlencode($data['user_icq']) . '/' : '',
 		'U_AIM'			=> ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $user_id) : '',
 		'U_YIM'			=> ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&amp;.src=pg' : '',
+		'U_MSN'			=> ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $user_id) : '',
 		'U_JABBER'		=> ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '',
 		'LOCATION'		=> ($data['user_from']) ? $data['user_from'] : '',
 
 		'USER_ICQ'			=> $data['user_icq'],
 		'USER_AIM'			=> $data['user_aim'],
 		'USER_YIM'			=> $data['user_yim'],
+		'USER_MSN'			=> $data['user_msnm'],
 		'USER_JABBER'		=> $data['user_jabber'],
 		'USER_JABBER_IMG'	=> ($data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '',
 
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 61b4a1469b..68aed0b3dd 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -1,5 +1,6 @@
 <!-- INCLUDE simple_header.html -->
 
+<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
 <h2 class="solo">{L_SEND_IM}</h2>
 
 <form method="post" action="{S_IM_ACTION}">
@@ -12,7 +13,7 @@
 	<fieldset>
 	<dl class="fields2">
 		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>
-		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
+		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
 	</dl>
 
 	<!-- IF S_SEND_ICQ -->
@@ -42,6 +43,15 @@
 		</dl>
 	<!-- ENDIF -->
 
+	<!-- IF S_SEND_MSNM -->
+		<dl class="fields2">
+			<dt>&nbsp;</dt>
+			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
+			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
+			<dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd>
+		</dl>
+	<!-- ENDIF -->
+
 	<!-- IF S_SEND_JABBER -->
 		<dl class="fields2">
 			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt>
@@ -75,4 +85,74 @@
 
 <a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
 
+<script type="text/javascript">
+// <![CDATA[
+
+	/** The following will not work with Windows Vista **/
+
+	var app = document.getElementById('objMessengerApp');
+
+	/**
+	* Check whether the browser supports this and whether MSNM is connected
+	*/
+	function msn_supported()
+	{
+		// Does the browser support the MSNM object?
+		if (app.MyStatus)
+		{
+			// Is MSNM connected?
+			if (app.MyStatus == 1)
+			{
+				alert('{LA_IM_MSNM_CONNECT}');
+				return false;
+			}
+		}
+		else
+		{
+			alert('{LA_IM_MSNM_BROWSER}');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	* Add to your contact list
+	*/
+	function add_contact(address) 
+	{
+		if (msn_supported()) 
+		{
+			// Could return an error while MSNM is connecting, don't want that
+			try
+			{
+				app.AddContact(0, address);
+			}
+			catch (e)
+			{
+				return;
+			}
+	}
+}
+
+/**
+* Write IM to contact
+*/
+function im_contact(address)
+{
+	if (msn_supported())
+	{
+		// Could return an error while MSNM is connecting, don't want that
+		try
+		{
+			app.InstantMessage(address);
+		}
+		catch (e)
+		{
+			return;
+		}
+	}
+}
+// ]]>
+</script>
+
 <!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index ad8fb83fe4..9de3ccf41b 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -70,6 +70,10 @@ function insert_single(user)
 		<dt><label for="yahoo">{L_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="msn">{L_MSNM}{L_COLON}</label></dt>
+		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset class="fields1 column2">
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 7f33e70e8f..57cfcb86d9 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -62,6 +62,7 @@
 		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
 		<!-- IF U_WWW --><dt>{L_WEBSITE}{L_COLON}</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
 		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
+		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}{L_COLON}</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}{L_COLON}</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}{L_COLON}</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}{L_COLON}</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 23665aa252..22149c8b80 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -90,12 +90,13 @@
 		<!-- END custom_fields -->
 
 
-		<!-- IF U_PM or U_EMAIL or U_WWW or U_ICQ or U_YIM or U_AIM or U_JABBER -->
+		<!-- IF U_PM or U_EMAIL or U_WWW or U_MSN or U_ICQ or U_YIM or U_AIM or U_JABBER -->
 		<dd>
 			<ul class="profile-icons">
 			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
 			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF -->
 			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
+			<!-- IF U_MSN --><li class="msnm-icon"><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
 			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index e8c6715de8..03d89e8590 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -18,6 +18,10 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
+		<dd><input type="text" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd>
+	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index e7bd3d5059..c9a6882b6f 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -216,12 +216,13 @@
 		<!-- END custom_fields -->
 
 		<!-- IF not S_IS_BOT -->
-		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER -->
+		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_MSN or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER -->
 			<dd>
 				<ul class="profile-icons">
 					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
+					<!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index a43323d879..5cff0a811b 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -786,7 +786,7 @@
 	padding-right: 11px;
 	padding-left: 0;
 }
-.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
+.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
 	padding-right: 20px;
 	padding-left: 0;
 }
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 7739d511fa..c3210887b6 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -139,6 +139,7 @@ ul.profile-icons li a:hover { background: none; }
 .aim-icon, .aim-icon a			{ background: none top left no-repeat; }
 .yahoo-icon, .yahoo-icon a		{ background: none top left no-repeat; }
 .web-icon, .web-icon a			{ background: none top left no-repeat; }
+.msnm-icon, .msnm-icon a			{ background: none top left no-repeat; }
 .icq-icon, .icq-icon a			{ background: none top left no-repeat; }
 .jabber-icon, .jabber-icon a		{ background: none top left no-repeat; }
 .pm-icon, .pm-icon a				{ background: none top left no-repeat; }
@@ -156,6 +157,7 @@ ul.profile-icons li.email-icon		{ width: 20px; height: 20px; }
 ul.profile-icons li.aim-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.yahoo-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.web-icon	{ width: 20px; height: 20px; }
+ul.profile-icons li.msnm-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.icq-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.jabber-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.pm-icon		{ width: 28px; height: 20px; }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index a68692444a..364bca0cf0 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -705,6 +705,7 @@ a.sendemail {
 .aim-icon, .aim-icon a			{ background-image: url("./images/icon_contact_aim.gif"); }
 .yahoo-icon, .yahoo-icon a		{ background-image: url("./images/icon_contact_yahoo.gif"); }
 .web-icon, .web-icon a			{ background-image: url("./images/icon_contact_www.gif"); }
+.msnm-icon, .msnm-icon a			{ background-image: url("./images/icon_contact_msnm.gif"); }
 .icq-icon, .icq-icon a			{ background-image: url("./images/icon_contact_icq.gif"); }
 .jabber-icon, .jabber-icon a		{ background-image: url("./images/icon_contact_jabber.gif"); }
 .pm-icon, .pm-icon a				{ background-image: url("./en/icon_contact_pm.gif"); }
diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css
index a85e320f98..cb99e9e715 100644
--- a/phpBB/styles/prosilver/theme/imageset.css
+++ b/phpBB/styles/prosilver/theme/imageset.css
@@ -280,6 +280,11 @@ span.imageset {
 	padding-left: 20px;
 	padding-top: 20px;
 }
+.imageset.icon_contact_msnm {
+	background-image: url("./images/icon_contact_msnm.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
 .imageset.icon_contact_www {
 	background-image: url("./images/icon_contact_www.gif");
 	padding-left: 20px;
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index e91a1caf11..da1ad661c3 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -2,6 +2,8 @@
 
 <br clear="all" />
 
+<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
+
 <form method="post" action="{S_IM_ACTION}">
 	<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
 	<tr>
@@ -12,7 +14,7 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td>
-		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
+		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
 	</tr>
 
 	<!-- IF S_SEND_AIM -->
@@ -24,6 +26,85 @@
 		</tr>
 	<!-- ENDIF -->
 
+	<!-- IF S_SEND_MSNM -->
+		<tr>
+			<td class="row1" colspan="2" align="center">
+				<object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object>
+				<script type="text/javascript">
+				// <![CDATA[
+					var app = document.getElementById('objMessengerApp');
+					
+					/**
+					* Check whether the browser supports this and whether MSNM is connected
+					*/
+					function msn_supported()
+					{
+						// Does the browser support the MSNM object?
+						if (app.MyStatus) 
+						{
+							// Is MSNM connected?
+							if (app.MyStatus == 1)
+							{
+								alert('{LA_IM_MSNM_CONNECT}');
+								return false;
+							}
+						}
+						else
+						{
+							alert('{LA_IM_MSNM_BROWSER}');
+							return false;
+						}
+						return true;
+					}
+
+					/**
+					* Add to your contact list
+					*/
+					function add_contact(address)
+					{
+						if (msn_supported())
+						{
+							// Could return an error while MSNM is connecting, don't want that
+							try
+							{
+								app.AddContact(0, address);
+							}
+							catch (e)
+							{
+								return;
+							}
+						}
+					}
+
+					/**
+					* Write IM to contact
+					*/
+					function im_contact(address)
+					{
+						if (msn_supported())
+						{
+							// Could return an error while MSNM is connecting, don't want that
+							try
+							{
+								app.InstantMessage(address);
+							}
+							catch (e)
+							{
+								return;
+							}
+						}
+					}
+				// ]]>
+				</script>
+	
+				<a class="gen" href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="cat" colspan="2" align="center">&nbsp;</td>
+		</tr>
+	<!-- ENDIF -->
+
 	<!-- IF S_SEND_JABBER -->
 		<tr>
 			<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index fb76cacc79..c0434d8110 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -102,14 +102,14 @@
 <!-- ELSE -->
 	<td colspan="2" class="row1">&nbsp;</td>
 <!-- ENDIF -->
-	<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
+	<td class="row1"><b class="genmed">{L_MSNM}{L_COLON}</b></td>
+	<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
 	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td>
-	<td class="row1">&nbsp;</td>
-	<td class="row2">&nbsp;</td>
+	<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
+	<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_SORT_BY}{L_COLON}</b></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index ff22dcc0f7..464369a7a8 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -116,6 +116,10 @@
 					<td><a href="{U_PM}" class="imageset">{PM_IMG}</a></td>
 				</tr>
 			<!-- ENDIF -->
+			<tr>
+				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}{L_COLON} </td>
+				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false" class="imageset">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
+			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}{L_COLON} </td>
 				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false" class="imageset">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
index 69da5f6172..19259aebc8 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
@@ -20,6 +20,10 @@
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>
 </tr>
+<tr> 
+	<td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}{L_COLON} </b></td>
+	<td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></td>
+</tr>
 <tr> 
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td>
diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css
index 6ddecf963b..563492d4fc 100644
--- a/phpBB/styles/subsilver2/theme/en/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css
@@ -19,6 +19,11 @@
 	padding-left: 72px;
 	padding-top: 20px;
 }
+.imageset.icon_contact_msnm {
+	background-image: url("./icon_contact_msnm.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
 .imageset.icon_contact_pm {
 	background-image: url("./icon_contact_pm.gif");
 	padding-left: 72px;
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index e7e64eff32..977e5c20c6 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1008,6 +1008,11 @@ a.imageset {
 	padding-left: 72px;
 	padding-top: 20px;
 }
+.imageset.icon_contact_msnm {
+	background-image: url("./en/icon_contact_msnm.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
 .imageset.icon_contact_pm {
 	background-image: url("./en/icon_contact_pm.gif");
 	padding-left: 72px;
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index fcf34a139a..bd2c7bea77 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -617,6 +617,7 @@ $template->assign_vars(array(
 	'WWW_IMG' 			=> $user->img('icon_contact_www', 'VISIT_WEBSITE'),
 	'ICQ_IMG' 			=> $user->img('icon_contact_icq', 'ICQ'),
 	'AIM_IMG' 			=> $user->img('icon_contact_aim', 'AIM'),
+	'MSN_IMG' 			=> $user->img('icon_contact_msnm', 'MSNM'),
 	'YIM_IMG' 			=> $user->img('icon_contact_yahoo', 'YIM'),
 	'JABBER_IMG'		=> $user->img('icon_contact_jabber', 'JABBER') ,
 	'REPORT_IMG'		=> $user->img('icon_post_report', 'REPORT_POST'),
@@ -1094,6 +1095,7 @@ while ($row = $db->sql_fetchrow($result))
 				'icq_status_img'	=> '',
 				'icq'				=> '',
 				'aim'				=> '',
+				'msn'				=> '',
 				'yim'				=> '',
 				'jabber'			=> '',
 				'search'			=> '',
@@ -1161,6 +1163,7 @@ while ($row = $db->sql_fetchrow($result))
 				'profile'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&amp;u=$poster_id"),
 				'www'			=> $row['user_website'],
 				'aim'			=> ($row['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=aim&amp;u=$poster_id") : '',
+				'msn'			=> ($row['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=msnm&amp;u=$poster_id") : '',
 				'yim'			=> ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&amp;.src=pg' : '',
 				'jabber'		=> ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
 				'search'		=> ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&amp;sr=posts") : '',
@@ -1582,6 +1585,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'U_WWW'			=> $user_cache[$poster_id]['www'],
 		'U_ICQ'			=> $user_cache[$poster_id]['icq'],
 		'U_AIM'			=> $user_cache[$poster_id]['aim'],
+		'U_MSN'			=> $user_cache[$poster_id]['msn'],
 		'U_YIM'			=> $user_cache[$poster_id]['yim'],
 		'U_JABBER'		=> $user_cache[$poster_id]['jabber'],
 
-- 
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')

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/adm/index.php              | 7 +++++++
 phpBB/includes/acp/acp_board.php | 4 ++--
 phpBB/language/en/common.php     | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 2e4089c02e..2da8a130cc 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -449,6 +449,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'];
+				}
+			break;
+
 			// Absolute path
 			case 'script_path':
 				if (!$cfg_array[$config_name])
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),
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 844d5ef3ef..9f8799b6d6 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -160,6 +160,7 @@ $lang = array_merge($lang, array(
 	'EDIT_POST'							=> 'Edit post',
 	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
 	'EMAIL_ADDRESS'						=> 'E-mail address',
+	'EMAIL_INVALID'						=> 'The email address you entered is invalid.',
 	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
 	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
 	'EMPTY_MESSAGE_SUBJECT'				=> 'You must specify a subject when composing a new message.',
-- 
cgit v1.2.1


From 5aec7600a68adb9466fb7ce034ba22070ac8a244 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 4 Feb 2013 23:13:47 -0600
Subject: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace
 EMAIL_INVALID

PHPBB3-10896
---
 phpBB/adm/index.php          | 2 +-
 phpBB/language/en/common.php | 2 +-
 phpBB/language/en/ucp.php    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 2da8a130cc..85908476a1 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -452,7 +452,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 			case 'email':
 				if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name]))
 				{
-					$error[] = $user->lang['EMAIL_INVALID'];
+					$error[] = $user->lang['EMAIL_INVALID_EMAIL'];
 				}
 			break;
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9f8799b6d6..6dd390ed24 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -160,7 +160,7 @@ $lang = array_merge($lang, array(
 	'EDIT_POST'							=> 'Edit post',
 	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
 	'EMAIL_ADDRESS'						=> 'E-mail address',
-	'EMAIL_INVALID'						=> 'The email address you entered is invalid.',
+	'EMAIL_INVALID_EMAIL'				=> 'The e-mail address you entered is invalid.',
 	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
 	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
 	'EMPTY_MESSAGE_SUBJECT'				=> 'You must specify a subject when composing a new message.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 5152c4b50b..0dce2961e5 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -176,7 +176,6 @@ $lang = array_merge($lang, array(
 
 	'EDIT_DRAFT_EXPLAIN'		=> 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
 	'EMAIL_BANNED_EMAIL'		=> 'The e-mail address you entered is not allowed to be used.',
-	'EMAIL_INVALID_EMAIL'		=> 'The e-mail address you entered is invalid.',
 	'EMAIL_REMIND'				=> 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.',
 	'EMAIL_TAKEN_EMAIL'			=> 'The entered e-mail address is already in use.',
 	'EMPTY_DRAFT'				=> 'You must enter a message to submit your changes.',
-- 
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/config/services.yml            |  1 +
 phpBB/includes/extension/base.php    | 15 +++++++++++++++
 phpBB/includes/extension/manager.php | 13 ++++++++++---
 phpBB/install/database_update.php    |  4 ++--
 phpBB/install/install_install.php    |  4 ++--
 5 files changed, 30 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index ee52ca2800..028ab88229 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -112,6 +112,7 @@ services:
     ext.manager:
         class: phpbb_extension_manager
         arguments:
+            - @service_container
             - @dbal.conn
             - @config
             - %tables.ext%
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);
 		}
 	}
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4e17a1429c..0a065573bf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -685,12 +685,12 @@ function _write_result($no_updates, $errored, $error_ary)
 
 function _add_modules($modules_to_install)
 {
-	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config;
+	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config, $phpbb_container;
 
 	// modules require an extension manager
 	if (empty($phpbb_extension_manager))
 	{
-		$phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx");
+		$phpbb_extension_manager = $phpbb_container->get('ext.manager');
 	}
 
 	include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1ab9caee0a..dd90335480 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1456,12 +1456,12 @@ class install_install extends module
 	*/
 	function add_modules($mode, $sub)
 	{
-		global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config;
+		global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config, $phpbb_container;
 
 		// modules require an extension manager
 		if (empty($phpbb_extension_manager))
 		{
-			$phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx");
+			$phpbb_extension_manager = $phpbb_container->get('ext.manager');
 		}
 
 		include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-- 
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')

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 ------
 phpBB/install/database_update_migrations.php       | 139 ++++++++
 43 files changed, 3053 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
 create mode 100644 phpBB/install/database_update_migrations.php

(limited to 'phpBB')

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';
-		}
-	}
-}
diff --git a/phpBB/install/database_update_migrations.php b/phpBB/install/database_update_migrations.php
new file mode 100644
index 0000000000..52682dc489
--- /dev/null
+++ b/phpBB/install/database_update_migrations.php
@@ -0,0 +1,139 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+$update_start_time = time();
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+/**
+* @ignore
+*/
+define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
+
+if (file_exists($phpbb_root_path . 'config.' . $phpEx))
+{
+	require($phpbb_root_path . 'config.' . $phpEx);
+}
+
+// Include files
+require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+
+require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
+
+require($phpbb_root_path . 'includes/constants.' . $phpEx);
+require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
+
+// Set PHP error handler to ours
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
+
+// Setup class loader first
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
+$phpbb_class_loader->register();
+
+// Set up container
+$container_extensions = array(
+	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+	new phpbb_di_extension_core($phpbb_root_path),
+);
+$container_passes = array(
+	new phpbb_di_pass_collection_pass(),
+	//new phpbb_di_pass_kernel_pass(),
+);
+$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
+
+// Compile the container
+foreach ($container_passes as $pass)
+{
+	$phpbb_container->addCompilerPass($pass);
+}
+$phpbb_container->compile();
+
+// set up caching
+$cache = $phpbb_container->get('cache');
+
+// Instantiate some basic classes
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
+$user		= $phpbb_container->get('user');
+$auth		= $phpbb_container->get('auth');
+$db			= $phpbb_container->get('dbal.conn');
+
+// make sure request_var uses this request instance
+request_var('', 0, false, false, $request); // "dependency injection" for a function
+
+// Grab global variables, re-cache if necessary
+$config = $phpbb_container->get('config');
+set_config(null, null, null, $config);
+set_config_count(null, null, null, $config);
+
+// End startup code
+
+$db_tools = $phpbb_container->get('dbal.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',
+	));
+}
+
+$migrator = $phpbb_container->get('migrator');
+$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
+
+// 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);
+
+while (!$migrator->finished())
+{
+	try
+	{
+		$migrator->update();
+	}
+	catch (phpbb_db_migration_exception $e)
+	{
+		echo $e;
+
+		garbage_collection();
+		exit_handler();
+	}
+
+	echo $migrator->last_run_migration['name'] . '<br />';
+
+	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+	if ((time() - $update_start_time) >= $safe_time_limit)
+	{
+		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
+		echo 'Update not yet completed.<br />';
+		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
+
+		garbage_collection();
+		exit_handler();
+	}
+}
+
+echo 'Finished';
+
+garbage_collection();
+exit_handler();
-- 
cgit v1.2.1


From bb99a2609d9fcdd3c20ea9c910ae6e05d9da56cd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 16:00:58 -0600
Subject: [feature/migrations] Replace database_update.php with migrations
 updater

PHPBB3-9737
---
 phpBB/install/database_update.php            | 2899 +-------------------------
 phpBB/install/database_update_migrations.php |  139 --
 2 files changed, 99 insertions(+), 2939 deletions(-)
 delete mode 100644 phpBB/install/database_update_migrations.php

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4e17a1429c..7431c96231 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1,39 +1,23 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2006 phpBB Group
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
+$update_start_time = time();
+
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-define('UPDATES_TO_VERSION', '3.1.0-dev');
-
-// Enter any version to update from to test updates. The version within the db will not be updated.
-define('DEBUG_FROM_VERSION', false);
-
-// Which oldest version does this updater support?
-define('OLDEST_FROM_VERSION', '3.0.0');
-
-// Return if we "just include it" to find out for which version the database update is responsible for
-if (defined('IN_PHPBB') && defined('IN_INSTALL'))
-{
-	$updates_to_version = UPDATES_TO_VERSION;
-	$debug_from_version = DEBUG_FROM_VERSION;
-	$oldest_from_version = OLDEST_FROM_VERSION;
-
-	return;
-}
-
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 define('IN_INSTALL', true);
-
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
@@ -59,15 +43,7 @@ if (!function_exists('phpbb_require_updated'))
 
 phpbb_require_updated('includes/startup.' . $phpEx);
 
-$updates_to_version = UPDATES_TO_VERSION;
-$debug_from_version = DEBUG_FROM_VERSION;
-$oldest_from_version = OLDEST_FROM_VERSION;
-
-@set_time_limit(0);
-
-// Include essential scripts
 include($phpbb_root_path . 'config.' . $phpEx);
-
 if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
 {
 	die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update.");
@@ -81,38 +57,36 @@ $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_ro
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
 
-phpbb_require_updated('includes/functions_content.' . $phpEx, true);
-
-require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
-phpbb_require_updated('includes/db/db_tools.' . $phpEx);
-
-// new table constants are separately defined here in case the updater is run
-// before the files are updated
-if (!defined('LOGIN_ATTEMPT_TABLE'))
-{
-	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
-}
-if (!defined('EXT_TABLE'))
-{
-	define('EXT_TABLE', $table_prefix . 'ext');
-}
+// Set PHP error handler to ours
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Setup class loader first
 $phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
 $phpbb_class_loader->register();
-$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", ".$phpEx");
-$phpbb_class_loader_ext->register();
 
-// Set up container
-$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
+// Set up container (must be done here because extensions table may not exist)
+$container_extensions = array(
+	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+	new phpbb_di_extension_core($phpbb_root_path),
+);
+$container_passes = array(
+	new phpbb_di_pass_collection_pass(),
+	//new phpbb_di_pass_kernel_pass(),
+);
+$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
 
-$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
-$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
+// Compile the container
+foreach ($container_passes as $pass)
+{
+	$phpbb_container->addCompilerPass($pass);
+}
+$phpbb_container->compile();
 
 // set up caching
 $cache = $phpbb_container->get('cache');
@@ -127,6 +101,16 @@ $db			= $phpbb_container->get('dbal.conn');
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
 
+// Grab global variables, re-cache if necessary
+$config = $phpbb_container->get('config');
+set_config(null, null, null, $config);
+set_config_count(null, null, null, $config);
+$orig_version = $config['version'];
+
+include($phpbb_root_path . 'language/' . $config['default_lang'] . '/common.' . $phpEx);
+include($phpbb_root_path . 'language/' . $config['default_lang'] . '/acp/common.' . $phpEx);
+include($phpbb_root_path . 'language/' . $config['default_lang'] . '/install.' . $phpEx);
+
 // Add own hook handler, if present. :o
 if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
 {
@@ -144,129 +128,7 @@ else
 	$phpbb_hook = false;
 }
 
-// Connect to DB
-$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false);
-
-// We do not need this any longer, unset for safety purposes
-unset($dbpasswd);
-
-$user->ip = '';
-if ($request->server('REMOTE_ADDR'))
-{
-	$user->ip = (function_exists('phpbb_ip_normalise')) ? phpbb_ip_normalise($request->server('REMOTE_ADDR')) : $request->server('REMOTE_ADDR');
-}
-
-$sql = "SELECT config_value
-	FROM " . CONFIG_TABLE . "
-	WHERE config_name = 'default_lang'";
-$result = $db->sql_query($sql);
-$row = $db->sql_fetchrow($result);
-$db->sql_freeresult($result);
-
-$language = basename(request_var('language', ''));
-
-if (!$language)
-{
-	$language = $row['config_value'];
-}
-
-if (!file_exists($phpbb_root_path . 'language/' . $language))
-{
-	die('No language found!');
-}
-
-// And finally, load the relevant language files
-include($phpbb_root_path . 'language/' . $language . '/common.' . $phpEx);
-include($phpbb_root_path . 'language/' . $language . '/acp/common.' . $phpEx);
-include($phpbb_root_path . 'language/' . $language . '/install.' . $phpEx);
-
-// Set PHP error handler to ours
-//set_error_handler('msg_handler');
-
-// Define some variables for the database update
-$inline_update = (request_var('type', 0)) ? true : false;
-
-// To let set_config() calls succeed, we need to make the config array available globally
-$config = new phpbb_config_db($db, $phpbb_container->get('cache.driver'), CONFIG_TABLE);
-set_config(null, null, null, $config);
-set_config_count(null, null, null, $config);
-
-// Update asset_version
-if (isset($config['assets_version']))
-{
-	set_config('assets_version', $config['assets_version'] + 1);
-}
-
-// phpbb_db_tools will be taken from new files (under install/update/new)
-// if possible, falling back to the board's copy.
-$db_tools = new phpbb_db_tools($db, true);
-
-$database_update_info = database_update_info();
-
-$error_ary = array();
-$errored = false;
-
-$sql = 'SELECT topic_id
-	FROM ' . TOPICS_TABLE . '
-	WHERE forum_id = 0
-		AND topic_type = ' . POST_GLOBAL;
-$result = $db->sql_query_limit($sql, 1);
-$has_global = (int) $db->sql_fetchfield('topic_id');
-$db->sql_freeresult($result);
-$ga_forum_id = request_var('ga_forum_id', 0);
-
-if ($has_global && !$ga_forum_id)
-{
-	?>
-	<!DOCTYPE html>
-	<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
-	<head>
-	<meta charset="utf-8">
-
-	<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
-
-	<link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-	</head>
-
-	<body>
-	<div id="wrap">
-		<div id="page-header">&nbsp;</div>
-
-		<div id="page-body">
-			<div id="acp">
-			<div class="panel">
-				<span class="corners-top"><span></span></span>
-					<div id="content">
-						<div id="main" class="install-body">
-
-		<h1><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
-
-		<br />
-
-		<form action="" method="post" id="select_ga_forum_id">
-			<?php
-				if (isset($lang['SELECT_FORUM_GA']))
-				{
-					// Language string is available:
-					echo $lang['SELECT_FORUM_GA'];
-				}
-				else
-				{
-					echo 'In phpBB 3.1 the global announcements are linked to forums. Select a forum for your current global announcements (can be moved later):';
-				}
-			?>
-			<select id="ga_forum_id" name="ga_forum_id"><?php echo make_forum_select(false, false, true, true) ?></select>
-
-			<input type="submit" name="post" value="<?php echo $lang['SUBMIT']; ?>" class="button1" />
-		</form>
-	<?php
-	_print_footer();
-	exit_handler();
-}
-
 header('Content-type: text/html; charset=UTF-8');
-
 ?>
 <!DOCTYPE html>
 <html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
@@ -280,2674 +142,111 @@ header('Content-type: text/html; charset=UTF-8');
 </head>
 
 <body>
-<div id="wrap">
-	<div id="page-header">&nbsp;</div>
-
-	<div id="page-body">
-		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
-				<div id="content">
-					<div id="main" class="install-body">
-
-	<h1><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
-
-	<br />
-
-	<p><?php echo $lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br />
-<?php
-
-if ($debug_from_version !== false)
-{
-	$config['version'] = $debug_from_version;
-}
-
-echo $lang['PREVIOUS_VERSION'] . ' :: <strong>' . $config['version'] . '</strong><br />';
-echo $lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong></p>';
-
-$current_version = str_replace('rc', 'RC', strtolower($config['version']));
-$latest_version = str_replace('rc', 'RC', strtolower($updates_to_version));
-$orig_version = $config['version'];
-
-// Fill DB version
-if (empty($config['dbms_version']))
-{
-	set_config('dbms_version', $db->sql_server_info(true));
-}
+	<div id="wrap">
+		<div id="page-header">&nbsp;</div>
 
-// Firebird update from Firebird 2.0 to 2.1+ required?
-if ($db->sql_layer == 'firebird')
-{
-	// We do not trust any PHP5 function enabled, we will simply test for a function new in 2.1
-	$db->sql_return_on_error(true);
+		<div id="page-body">
+			<div id="acp">
+				<div class="panel">
+					<span class="corners-top"><span></span></span>
+						<div id="content">
+							<div id="main" class="install-body">
 
-	$sql = 'SELECT 1 FROM RDB$DATABASE
-		WHERE BIN_AND(10, 1) = 0';
-	$result = $db->sql_query($sql);
+								<h1><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
 
-	if (!$result || $db->sql_error_triggered)
-	{
-		echo '<br /><br />';
-		echo '<h1>' . $lang['ERROR'] . '</h1><br />';
+								<br />
 
-		echo '<p>' . $lang['FIREBIRD_DBMS_UPDATE_REQUIRED'] . '</p>';
+								<p><?php echo $lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br />
+								<?php echo $lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br />
 
-		_print_footer();
+<?php
 
-		exit_handler();
-		exit;
-	}
+/**
+* @todo firebird/mysql update?
+*/
 
-	$db->sql_freeresult($result);
-	$db->sql_return_on_error(false);
-}
+// End startup code
 
-// MySQL update from MySQL 3.x/4.x to > 4.1.x required?
-if ($db->sql_layer == 'mysql' || $db->sql_layer == 'mysql4' || $db->sql_layer == 'mysqli')
+$db_tools = $phpbb_container->get('dbal.tools');
+if (!$db_tools->sql_table_exists(MIGRATIONS_TABLE))
 {
-	// Verify by fetching column... if the column type matches the new type we update dbms_version...
-	$sql = "SHOW COLUMNS FROM " . CONFIG_TABLE;
-	$result = $db->sql_query($sql);
-
-	$column_type = '';
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$field = strtolower($row['Field']);
-
-		if ($field == 'config_value')
-		{
-			$column_type = strtolower($row['Type']);
-			break;
-		}
-	}
-	$db->sql_freeresult($result);
-
-	// If column type is blob, but mysql version says we are on > 4.1.3, then the schema needs an update
-	if (strpos($column_type, 'blob') !== false && version_compare($db->sql_server_info(true), '4.1.3', '>='))
-	{
-		echo '<br /><br />';
-		echo '<h1>' . $lang['ERROR'] . '</h1><br />';
-
-		echo '<p>' . sprintf($lang['MYSQL_SCHEMA_UPDATE_REQUIRED'], $config['dbms_version'], $db->sql_server_info(true)) . '</p>';
-
-		_print_footer();
-
-		exit_handler();
-		exit;
-	}
+	$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',
+	));
 }
 
-// Now check if the user wants to update from a version we no longer support updates from
-if (version_compare($current_version, $oldest_from_version, '<'))
-{
-	echo '<br /><br /><h1>' . $lang['ERROR'] . '</h1><br />';
-	echo '<p>' . sprintf($lang['DB_UPDATE_NOT_SUPPORTED'], $oldest_from_version, $current_version) . '</p>';
+$migrator = $phpbb_container->get('migrator');
+$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
 
-	_print_footer();
-	exit_handler();
-	exit;
-}
+// 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);
 
-// If the latest version and the current version are 'unequal', we will update the version_update_from, else we do not update anything.
-if ($inline_update)
+while (!$migrator->finished())
 {
-	if ($current_version !== $latest_version)
+	try
 	{
-		set_config('version_update_from', $orig_version);
+		$migrator->update();
 	}
-}
-else
-{
-	// If not called from the update script, we will actually remove the traces
-	$db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'");
-}
-
-// Schema updates
-?>
-	<br /><br />
-
-	<h1><?php echo $lang['UPDATE_DATABASE_SCHEMA']; ?></h1>
-
-	<br />
-	<p><?php echo $lang['PROGRESS']; ?> :: <strong>
-
-<?php
-
-flush();
-
-// We go through the schema changes from the lowest to the highest version
-// We try to also include versions 'in-between'...
-$no_updates = true;
-$versions = array_keys($database_update_info);
-for ($i = 0; $i < sizeof($versions); $i++)
-{
-	$version = $versions[$i];
-	$schema_changes = $database_update_info[$version];
-
-	$next_version = (isset($versions[$i + 1])) ? $versions[$i + 1] : $updates_to_version;
-
-	// If the installed version to be updated to is < than the current version, and if the current version is >= as the version to be updated to next, we will skip the process
-	if (version_compare($version, $current_version, '<') && version_compare($current_version, $next_version, '>='))
+	catch (phpbb_db_migration_exception $e)
 	{
-		continue;
-	}
+		echo $e;
 
-	if (!sizeof($schema_changes))
-	{
-		continue;
+		end_update($cache);
 	}
 
-	$no_updates = false;
+	echo $migrator->last_run_migration['name'] . '<br />';
 
-	// We run one index after the other... to be consistent with schema changes...
-	foreach ($schema_changes as $key => $changes)
+	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+	if ((time() - $update_start_time) >= $safe_time_limit)
 	{
-		$statements = $db_tools->perform_schema_changes(array($key => $changes));
-
-		foreach ($statements as $sql)
-		{
-			_sql($sql, $errored, $error_ary);
-		}
-	}
-}
-
-_write_result($no_updates, $errored, $error_ary);
-
-// Data updates
-$error_ary = array();
-$errored = $no_updates = false;
-
-?>
-
-<br /><br />
-<h1><?php echo $lang['UPDATING_DATA']; ?></h1>
-<br />
-<p><?php echo $lang['PROGRESS']; ?> :: <strong>
-
-<?php
-
-flush();
-
-$no_updates = true;
-$versions = array_keys($database_update_info);
+		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
+		echo 'Update not yet completed.<br />';
+		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
 
-// some code magic
-for ($i = 0; $i < sizeof($versions); $i++)
-{
-	$version = $versions[$i];
-	$next_version = (isset($versions[$i + 1])) ? $versions[$i + 1] : $updates_to_version;
-
-	// If the installed version to be updated to is < than the current version, and if the current version is >= as the version to be updated to next, we will skip the process
-	if (version_compare($version, $current_version, '<') && version_compare($current_version, $next_version, '>='))
-	{
-		continue;
+		end_update($cache);
 	}
-
-	change_database_data($no_updates, $version);
-}
-
-_write_result($no_updates, $errored, $error_ary);
-
-$error_ary = array();
-$errored = $no_updates = false;
-
-?>
-
-<br /><br />
-<h1><?php echo $lang['UPDATE_VERSION_OPTIMIZE']; ?></h1>
-<br />
-<p><?php echo $lang['PROGRESS']; ?> :: <strong>
-
-<?php
-
-flush();
-
-if ($debug_from_version === false)
-{
-	// update the version
-	$sql = "UPDATE " . CONFIG_TABLE . "
-		SET config_value = '$updates_to_version'
-		WHERE config_name = 'version'";
-	_sql($sql, $errored, $error_ary);
 }
 
-// Reset permissions
-$sql = 'UPDATE ' . USERS_TABLE . "
-	SET user_permissions = '',
-		user_perm_from = 0";
-_sql($sql, $errored, $error_ary);
-
-// Update the dbms version if everything is ok...
-set_config('dbms_version', $db->sql_server_info(true));
-
-/* Optimize/vacuum analyze the tables where appropriate
-// this should be done for each version in future along with
-// the version number update
-switch ($db->sql_layer)
+if ($orig_version != $config['version'])
 {
-	case 'mysql':
-	case 'mysqli':
-	case 'mysql4':
-		$sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'sessions_keys' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words';
-		_sql($sql, $errored, $error_ary);
-	break;
-
-	case 'postgresql':
-		_sql("VACUUM ANALYZE", $errored, $error_ary);
-	break;
+	add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']);
 }
-*/
-
-_write_result($no_updates, $errored, $error_ary);
 
-?>
-
-<br />
-<h1><?php echo $lang['UPDATE_COMPLETED']; ?></h1>
+echo 'Finished';
 
-<br />
-
-<?php
+end_update($cache);
 
-if (!$inline_update)
+function end_update($cache)
 {
-?>
-
-	<p style="color:red"><?php echo $lang['UPDATE_FILES_NOTICE']; ?></p>
+	$cache->purge();
 
-	<p><?php echo $lang['COMPLETE_LOGIN_TO_BOARD']; ?></p>
-
-<?php
-}
-else
-{
 ?>
-
-	<p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
-
-	<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&amp;sub=file_check&amp;language=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
-
-<?php
-}
-
-// Add database update to log
-add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version);
-
-// Now we purge the session table as well as all cache files
-$phpbb_container->get('cache.driver')->purge();
-
-_print_footer();
-
-garbage_collection();
-
-if (function_exists('exit_handler'))
-{
-	exit_handler();
-}
-
-/**
-* Print out footer
-*/
-function _print_footer()
-{
-	echo <<<EOF
-					</div>
+								</p>
+							</div>
+						</div>
+					<span class="corners-bottom"><span></span></span>
 				</div>
-			<span class="corners-bottom"><span></span></span>
+			</div>
 		</div>
-		</div>
-	</div>
 
-	<div id="page-footer">
-		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		<div id="page-footer">
+			Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		</div>
 	</div>
-</div>
-
 </body>
 </html>
-EOF;
-}
-
-/**
-* Function for triggering an sql statement
-*/
-function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
-{
-	global $db;
-
-	if (defined('DEBUG'))
-	{
-		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)
-		{
-			$errored = true;
-			$error_ary['sql'][] = $db->sql_error_sql;
-			$error_ary['error_code'][] = $db->sql_error_returned;
-		}
-	}
-
-	$db->sql_return_on_error(false);
-
-	if ($echo_dot)
-	{
-		echo ". \n";
-		flush();
-	}
-
-	return $result;
-}
-
-function _write_result($no_updates, $errored, $error_ary)
-{
-	global $lang;
-
-	if ($no_updates)
-	{
-		echo ' ' . $lang['NO_UPDATES_REQUIRED'] . '</strong></p>';
-	}
-	else
-	{
-		echo ' <span class="success">' . $lang['DONE'] . '</span></strong><br />' . $lang['RESULT'] . ' :: ';
-
-		if ($errored)
-		{
-			echo ' <strong>' . $lang['SOME_QUERIES_FAILED'] . '</strong> <ul>';
-
-			for ($i = 0; $i < sizeof($error_ary['sql']); $i++)
-			{
-				echo '<li>' . $lang['ERROR'] . ' :: <strong>' . htmlspecialchars($error_ary['error_code'][$i]['message']) . '</strong><br />';
-				echo $lang['SQL'] . ' :: <strong>' . htmlspecialchars($error_ary['sql'][$i]) . '</strong><br /><br /></li>';
-			}
-
-			echo '</ul> <br /><br />' . $lang['SQL_FAILURE_EXPLAIN'] . '</p>';
-		}
-		else
-		{
-			echo '<strong>' . $lang['NO_ERRORS'] . '</strong></p>';
-		}
-	}
-}
-
-function _add_modules($modules_to_install)
-{
-	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config;
-
-	// modules require an extension manager
-	if (empty($phpbb_extension_manager))
-	{
-		$phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx");
-	}
 
-	include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-
-	$_module = new acp_modules();
-
-	foreach ($modules_to_install as $module_mode => $module_data)
-	{
-		$_module->module_class = $module_data['class'];
-
-		// Determine parent id first
-		$sql = 'SELECT module_id
-			FROM ' . MODULES_TABLE . "
-			WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
-				AND module_langname = '" . $db->sql_escape($module_data['cat']) . "'
-				AND module_mode = ''
-				AND module_basename = ''";
-		$result = $db->sql_query($sql);
-
-		// There may be more than one categories with the same name
-		$categories = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$categories[] = (int) $row['module_id'];
-		}
-		$db->sql_freeresult($result);
-
-		if (!sizeof($categories))
-		{
-			continue;
-		}
-
-		// Add the module to all categories found
-		foreach ($categories as $parent_id)
-		{
-			// Check if the module already exists
-			$sql = 'SELECT *
-				FROM ' . MODULES_TABLE . "
-				WHERE module_basename = '" . $db->sql_escape($module_data['base']) . "'
-					AND module_class = '" . $db->sql_escape($module_data['class']) . "'
-					AND module_langname = '" . $db->sql_escape($module_data['title']) . "'
-					AND module_mode = '" . $db->sql_escape($module_mode) . "'
-					AND module_auth = '" . $db->sql_escape($module_data['auth']) . "'
-					AND parent_id = {$parent_id}";
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			// If it exists, we simply continue with the next category
-			if ($row)
-			{
-				continue;
-			}
-
-			// Build the module sql row
-			$module_row = array(
-				'module_basename'	=> $module_data['base'],
-				'module_enabled'	=> (isset($module_data['enabled'])) ? (int) $module_data['enabled'] : 1,
-				'module_display'	=> (isset($module_data['display'])) ? (int) $module_data['display'] : 1,
-				'parent_id'			=> $parent_id,
-				'module_class'		=> $module_data['class'],
-				'module_langname'	=> $module_data['title'],
-				'module_mode'		=> $module_mode,
-				'module_auth'		=> $module_data['auth'],
-			);
-
-			$_module->update_module_data($module_row, true);
+<?php
 
-			// Ok, do we need to re-order the module, move it up or down?
-			if (!isset($module_data['after']))
-			{
-				continue;
-			}
-
-			$after_mode = $module_data['after'][0];
-			$after_langname = $module_data['after'][1];
-
-			// First of all, get the module id for the module this one has to be placed after
-			$sql = 'SELECT left_id
-				FROM ' . MODULES_TABLE . "
-				WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
-					AND module_basename = '" . $db->sql_escape($module_data['base']) . "'
-					AND module_langname = '" . $db->sql_escape($after_langname) . "'
-					AND module_mode = '" . $db->sql_escape($after_mode) . "'
-					AND parent_id = '{$parent_id}'";
-			$result = $db->sql_query($sql);
-			$first_left_id = (int) $db->sql_fetchfield('left_id');
-			$db->sql_freeresult($result);
-
-			if (!$first_left_id)
-			{
-				continue;
-			}
-
-			// Ok, count the number of modules between $after_mode and the added module
-			$sql = 'SELECT COUNT(module_id) as num_modules
-				FROM ' . MODULES_TABLE . "
-				WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
-					AND parent_id = {$parent_id}
-					AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']}";
-			$result = $db->sql_query($sql);
-			$steps = (int) $db->sql_fetchfield('num_modules');
-			$db->sql_freeresult($result);
-
-			// We need to substract 2
-			$steps -= 2;
-
-			if ($steps <= 0)
-			{
-				continue;
-			}
-
-			// Ok, move module up $num_modules times. ;)
-			$_module->move_module_by($module_row, 'move_up', $steps);
-		}
-	}
-
-	$_module->remove_cache_file();
-}
-
-/**
-* Add a new permission, optionally copy permission setting from another
-*
-* @param auth_admin $auth_admin auth_admin object
-* @param phpbb_db_driver $db Database object
-* @param string $permission_name Name of the permission to add
-* @param bool $is_global True is global, false is local
-* @param string $copy_from Optional permission name from which to copy
-* @return bool true on success, false on failure
-*/
-function _add_permission(auth_admin $auth_admin, phpbb_db_driver $db, $permission_name, $is_global = true, $copy_from = '')
-{
-	// Only add a permission that don't already exist
-	if (!empty($auth_admin->acl_options['id'][$permission_name]))
-	{
-		return true;
-	}
-
-	$permission_scope = $is_global ? 'global' : 'local';
-
-	$result = $auth_admin->acl_add_option(array(
-		$permission_scope => array($permission_name),
-	));
-
-	if (!$result)
-	{
-		return $result;
-	}
-
-	// 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'][$permission_name];
-
-		$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);
-			}
-		}
-
-		$auth_admin->acl_clear_prefetch();
-	}
-
-	return true;
-}
-
-/****************************************************************************
-* ADD YOUR DATABASE SCHEMA CHANGES HERE										*
-*****************************************************************************/
-function database_update_info()
-{
-	return array(
-		// Changes from 3.0.0 to the next version
-		'3.0.0'			=> array(
-			// Add the following columns
-			'add_columns'		=> array(
-				FORUMS_TABLE			=> array(
-					'display_subforum_list'		=> array('BOOL', 1),
-				),
-				SESSIONS_TABLE			=> array(
-					'session_forum_id'		=> array('UINT', 0),
-				),
-			),
-			'drop_keys'		=> array(
-				GROUPS_TABLE			=> array('group_legend'),
-			),
-			'add_index'		=> array(
-				SESSIONS_TABLE			=> array(
-					'session_forum_id'		=> array('session_forum_id'),
-				),
-				GROUPS_TABLE			=> array(
-					'group_legend_name'		=> array('group_legend', 'group_name'),
-				),
-			),
-		),
-		// No changes from 3.0.1-RC1 to 3.0.1
-		'3.0.1-RC1'		=> array(),
-		// No changes from 3.0.1 to 3.0.2-RC1
-		'3.0.1'			=> array(),
-		// Changes from 3.0.2-RC1 to 3.0.2-RC2
-		'3.0.2-RC1'		=> array(
-			'change_columns'	=> array(
-				DRAFTS_TABLE			=> array(
-					'draft_subject'		=> array('STEXT_UNI', ''),
-				),
-				FORUMS_TABLE	=> array(
-					'forum_last_post_subject' => array('STEXT_UNI', ''),
-				),
-				POSTS_TABLE		=> array(
-					'post_subject'			=> array('STEXT_UNI', '', 'true_sort'),
-				),
-				PRIVMSGS_TABLE	=> array(
-					'message_subject'		=> array('STEXT_UNI', ''),
-				),
-				TOPICS_TABLE	=> array(
-					'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
-					'topic_last_post_subject'	=> array('STEXT_UNI', ''),
-				),
-			),
-			'drop_keys'		=> array(
-				SESSIONS_TABLE			=> array('session_forum_id'),
-			),
-			'add_index'		=> array(
-				SESSIONS_TABLE			=> array(
-					'session_fid'		=> array('session_forum_id'),
-				),
-			),
-		),
-		// No changes from 3.0.2-RC2 to 3.0.2
-		'3.0.2-RC2'		=> array(),
-
-		// Changes from 3.0.2 to 3.0.3-RC1
-		'3.0.2'			=> array(
-			// Add the following columns
-			'add_columns'		=> array(
-				STYLES_TEMPLATE_TABLE			=> array(
-					'template_inherits_id'		=> array('UINT:4', 0),
-					'template_inherit_path'		=> array('VCHAR', ''),
-				),
-				GROUPS_TABLE					=> array(
-					'group_max_recipients'		=> array('UINT', 0),
-				),
-			),
-		),
-
-		// No changes from 3.0.3-RC1 to 3.0.3
-		'3.0.3-RC1'		=> array(),
-
-		// Changes from 3.0.3 to 3.0.4-RC1
-		'3.0.3'			=> array(
-			'add_columns'		=> array(
-				PROFILE_FIELDS_TABLE			=> array(
-					'field_show_profile'		=> array('BOOL', 0),
-				),
-			),
-			'change_columns'	=> array(
-				STYLES_TABLE				=> array(
-					'style_id'				=> array('UINT', NULL, 'auto_increment'),
-					'template_id'			=> array('UINT', 0),
-					'theme_id'				=> array('UINT', 0),
-					'imageset_id'			=> array('UINT', 0),
-				),
-				STYLES_IMAGESET_TABLE		=> array(
-					'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
-				),
-				STYLES_IMAGESET_DATA_TABLE	=> array(
-					'image_id'				=> array('UINT', NULL, 'auto_increment'),
-					'imageset_id'			=> array('UINT', 0),
-				),
-				STYLES_THEME_TABLE			=> array(
-					'theme_id'				=> array('UINT', NULL, 'auto_increment'),
-				),
-				STYLES_TEMPLATE_TABLE		=> array(
-					'template_id'			=> array('UINT', NULL, 'auto_increment'),
-				),
-				STYLES_TEMPLATE_DATA_TABLE	=> array(
-					'template_id'			=> array('UINT', 0),
-				),
-				FORUMS_TABLE				=> array(
-					'forum_style'			=> array('UINT', 0),
-				),
-				USERS_TABLE					=> array(
-					'user_style'			=> array('UINT', 0),
-				),
-			),
-		),
-
-		// Changes from 3.0.4-RC1 to 3.0.4
-		'3.0.4-RC1'		=> array(),
-
-		// Changes from 3.0.4 to 3.0.5-RC1
-		'3.0.4'			=> array(
-			'change_columns'	=> array(
-				FORUMS_TABLE				=> array(
-					'forum_style'			=> array('UINT', 0),
-				),
-			),
-		),
-
-		// No changes from 3.0.5-RC1 to 3.0.5
-		'3.0.5-RC1'		=> array(),
-
-		// Changes from 3.0.5 to 3.0.6-RC1
-		'3.0.5'		=> array(
-			'add_columns'		=> array(
-				CONFIRM_TABLE			=> array(
-					'attempts'		=> array('UINT', 0),
-				),
-				USERS_TABLE			=> array(
-					'user_new'			=> array('BOOL', 1),
-					'user_reminded'		=> array('TINT:4', 0),
-					'user_reminded_time'=> array('TIMESTAMP', 0),
-				),
-				GROUPS_TABLE			=> array(
-					'group_skip_auth'		=> array('BOOL', 0, 'after' => 'group_founder_manage'),
-				),
-				PRIVMSGS_TABLE		=> array(
-					'message_reported'	=> array('BOOL', 0),
-				),
-				REPORTS_TABLE		=> array(
-					'pm_id'				=> array('UINT', 0),
-				),
-				PROFILE_FIELDS_TABLE			=> array(
-					'field_show_on_vt'		=> array('BOOL', 0),
-				),
-				FORUMS_TABLE		=> array(
-					'forum_options'			=> array('UINT:20', 0),
-				),
-			),
-			'change_columns'		=> array(
-				USERS_TABLE				=> array(
-					'user_options'		=> array('UINT:11', 230271),
-				),
-			),
-			'add_index'		=> array(
-				REPORTS_TABLE		=> array(
-					'post_id'		=> array('post_id'),
-					'pm_id'			=> array('pm_id'),
-				),
-				POSTS_TABLE			=> array(
-					'post_username'		=> array('post_username:255'),
-				),
-			),
-		),
-
-		// No changes from 3.0.6-RC1 to 3.0.6-RC2
-		'3.0.6-RC1'		=> array(),
-		// No changes from 3.0.6-RC2 to 3.0.6-RC3
-		'3.0.6-RC2'		=> array(),
-		// No changes from 3.0.6-RC3 to 3.0.6-RC4
-		'3.0.6-RC3'		=> array(),
-		// No changes from 3.0.6-RC4 to 3.0.6
-		'3.0.6-RC4'		=> array(),
-
-		// Changes from 3.0.6 to 3.0.7-RC1
-		'3.0.6'		=> array(
-			'drop_keys'		=> array(
-				LOG_TABLE			=> array('log_time'),
-			),
-			'add_index'		=> array(
-				TOPICS_TRACK_TABLE	=> array(
-					'topic_id'		=> array('topic_id'),
-				),
-			),
-		),
-
-		// No changes from 3.0.7-RC1 to 3.0.7-RC2
-		'3.0.7-RC1'		=> array(),
-		// No changes from 3.0.7-RC2 to 3.0.7
-		'3.0.7-RC2'		=> array(),
-		// No changes from 3.0.7 to 3.0.7-PL1
-		'3.0.7'		=> array(),
-		// No changes from 3.0.7-PL1 to 3.0.8-RC1
-		'3.0.7-PL1'		=> array(),
-		// No changes from 3.0.8-RC1 to 3.0.8
-		'3.0.8-RC1'		=> array(),
-		// Changes from 3.0.8 to 3.0.9-RC1
-		'3.0.8'			=> array(
-			'add_tables'		=> array(
-				LOGIN_ATTEMPT_TABLE	=> 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(
-				BBCODES_TABLE	=> array(
-					'bbcode_id'	=> array('USINT', 0),
-				),
-			),
-		),
-		// No changes from 3.0.9-RC1 to 3.0.9-RC2
-		'3.0.9-RC1'		=> array(),
-		// No changes from 3.0.9-RC2 to 3.0.9-RC3
-		'3.0.9-RC2'		=> array(),
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
-		'3.0.9-RC3'     => array(),
-		// No changes from 3.0.9-RC4 to 3.0.9
-		'3.0.9-RC4'     => array(),
-		// No changes from 3.0.9 to 3.0.10-RC1
-		'3.0.9'			=> array(),
-		// No changes from 3.0.10-RC1 to 3.0.10-RC2
-		'3.0.10-RC1'	=> array(),
-		// No changes from 3.0.10-RC2 to 3.0.10-RC3
-		'3.0.10-RC2'	=> array(),
-		// No changes from 3.0.10-RC3 to 3.0.10
-		'3.0.10-RC3'	=> array(),
-		// No changes from 3.0.10 to 3.0.11-RC1
-		'3.0.10'		=> array(),
-		// Changes from 3.0.11-RC1 to 3.0.11-RC2
-		'3.0.11-RC1'	=> array(
-			'add_columns'		=> array(
-				PROFILE_FIELDS_TABLE			=> array(
-					'field_show_novalue'		=> array('BOOL', 0),
-				),
-			),
-		),
-		// No changes from 3.0.11-RC2 to 3.0.11
-		'3.0.11-RC2'	=> array(),
-		// No changes from 3.0.11 to 3.0.12-RC1
-		'3.0.11'		=> array(),
-
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
-
-		// Changes from 3.1.0-dev to 3.1.0-A1
-		'3.1.0-dev'		=> 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'),
-					),
-				),
-			),
-			'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', ''),
-					'reported_post_enable_bbcode'		=> array('BOOL', 1),
-					'reported_post_enable_smilies'		=> array('BOOL', 1),
-					'reported_post_enable_magic_url'	=> array('BOOL', 1),
-				),
-			),
-			'change_columns'	=> array(
-				GROUPS_TABLE		=> array(
-					'group_legend'		=> array('UINT', 0),
-				),
-				USERS_TABLE			=> array(
-					'user_timezone'		=> array('VCHAR:100', ''),
-				),
-			),
-		),
-	);
-}
-
-/****************************************************************************
-* ADD YOUR DATABASE DATA CHANGES HERE										*
-* REMEMBER: You NEED to enter a schema array above and a data array here,	*
-* even if both or one of them are empty.									*
-*****************************************************************************/
-function change_database_data(&$no_updates, $version)
-{
-	global $db, $db_tools, $errored, $error_ary, $config, $table_prefix, $phpbb_root_path, $phpEx;
-
-	$update_helpers = new phpbb_update_helpers();
-
-	switch ($version)
-	{
-		case '3.0.0':
-
-			$sql = 'UPDATE ' . TOPICS_TABLE . "
-				SET topic_last_view_time = topic_last_post_time
-				WHERE topic_last_view_time = 0";
-			_sql($sql, $errored, $error_ary);
-
-			// 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($phpbb_root_path . 'images/smilies/' . $smiley))
-				{
-					list($width, $height) = getimagesize($phpbb_root_path . 'images/smilies/' . $smiley);
-
-					$sql = 'UPDATE ' . SMILIES_TABLE . '
-						SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
-						WHERE smiley_url = '" . $db->sql_escape($smiley) . "'";
-
-					_sql($sql, $errored, $error_ary);
-				}
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.1-RC1 to 3.0.1
-		case '3.0.1-RC1':
-		break;
-
-		// changes from 3.0.1 to 3.0.2-RC1
-		case '3.0.1':
-
-			set_config('referer_validation', '1');
-			set_config('check_attachment_content', '1');
-			set_config('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title');
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.2-RC1 to 3.0.2-RC2
-		case '3.0.2-RC1':
-		break;
-
-		// No changes from 3.0.2-RC2 to 3.0.2
-		case '3.0.2-RC2':
-		break;
-
-		// Changes from 3.0.2 to 3.0.3-RC1
-		case '3.0.2':
-			set_config('enable_queue_trigger', '0');
-			set_config('queue_trigger_posts', '3');
-
-			set_config('pm_max_recipients', '0');
-
-			// Set maximum number of recipients for the registered users, bots, guests group
-			$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
-				WHERE ' . $db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
-			_sql($sql, $errored, $error_ary);
-
-			// 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);
-
-			$no_updates = false;
-		break;
-
-		// Changes from 3.0.3-RC1 to 3.0.3
-		case '3.0.3-RC1':
-			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);
-			}
-
-			$no_updates = false;
-		break;
-
-		// Changes from 3.0.3 to 3.0.4-RC1
-		case '3.0.3':
-			// 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);
-			}
-			$no_updates = false;
-
-		break;
-
-		// Changes from 3.0.4-RC1 to 3.0.4
-		case '3.0.4-RC1':
-		break;
-
-		// Changes from 3.0.4 to 3.0.5-RC1
-		case '3.0.4':
-
-			// 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'),
-				),
-			);
-
-			$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);
-			}
-
-			$no_updates = false;
-
-		break;
-
-		// No changes from 3.0.5-RC1 to 3.0.5
-		case '3.0.5-RC1':
-		break;
-
-		// Changes from 3.0.5 to 3.0.6-RC1
-		case '3.0.5':
-			// 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']);
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.6-RC1 to 3.0.6-RC2
-		case '3.0.6-RC1':
-		break;
-
-		// Changes from 3.0.6-RC2 to 3.0.6-RC3
-		case '3.0.6-RC2':
-
-			// 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);
-			$no_updates = false;
-
-		break;
-
-		// No changes from 3.0.6-RC3 to 3.0.6-RC4
-		case '3.0.6-RC3':
-		break;
-
-		// No changes from 3.0.6-RC4 to 3.0.6
-		case '3.0.6-RC4':
-		break;
-
-		// Changes from 3.0.6 to 3.0.7-RC1
-		case '3.0.6':
-
-			// 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);
-
-			$no_updates = false;
-		break;
-
-		// Changes from 3.0.7-RC1 to 3.0.7-RC2
-		case '3.0.7-RC1':
-
-			$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);
-
-			$no_updates = false;
-
-		break;
-
-		// No changes from 3.0.7-RC2 to 3.0.7
-		case '3.0.7-RC2':
-		break;
-
-		// No changes from 3.0.7 to 3.0.7-PL1
-		case '3.0.7':
-		break;
-
-		// Changes from 3.0.7-PL1 to 3.0.8-RC1
-		case '3.0.7-PL1':
-			// 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'			=> 'UTC',
-					'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');
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.8-RC1 to 3.0.8
-		case '3.0.8-RC1':
-		break;
-
-		// Changes from 3.0.8 to 3.0.9-RC1
-		case '3.0.8':
-			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);
-
-			/*
-			* Due to a bug, vanilla phpbb could not create captcha tables
-			* in 3.0.8 on firebird. It was possible for board administrators
-			* to adjust the code to work. If code was manually adjusted by
-			* board administrators, index names would not be the same as
-			* what 3.0.9 and newer expect. This code fragment drops captcha
-			* tables, destroying all entered Q&A captcha configuration, such
-			* that when Q&A is configured next the respective tables will be
-			* created with correct index names.
-			*
-			* If you wish to preserve your Q&A captcha configuration, you can
-			* manually rename indexes to the currently expected name:
-			* 	phpbb_captcha_questions_lang_iso	=> phpbb_captcha_questions_lang
-			* 	phpbb_captcha_answers_question_id	=> phpbb_captcha_answers_qid
-			*
-			* Again, this needs to be done only if a board was manually modified
-			* to fix broken captcha code.
-			*
-			if ($db_tools->sql_layer == 'firebird')
-			{
-				$changes = array(
-					'drop_tables'	=> array(
-						$table_prefix . 'captcha_questions',
-						$table_prefix . 'captcha_answers',
-						$table_prefix . 'qa_confirm',
-					),
-				);
-				$statements = $db_tools->perform_schema_changes($changes);
-
-				foreach ($statements as $sql)
-				{
-					_sql($sql, $errored, $error_ary);
-				}
-			}
-			*/
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.9-RC1 to 3.0.9-RC2
-		case '3.0.9-RC1':
-		break;
-
-		// No changes from 3.0.9-RC2 to 3.0.9-RC3
-		case '3.0.9-RC2':
-		break;
-
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
-		case '3.0.9-RC3':
-		break;
-
-		// No changes from 3.0.9-RC4 to 3.0.9
-		case '3.0.9-RC4':
-		break;
-
-		// Changes from 3.0.9 to 3.0.10-RC1
-		case '3.0.9':
-			if (!isset($config['email_max_chunk_size']))
-			{
-				set_config('email_max_chunk_size', '50');
-			}
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.10-RC1 to 3.0.10-RC2
-		case '3.0.10-RC1':
-		break;
-
-		// No changes from 3.0.10-RC2 to 3.0.10-RC3
-		case '3.0.10-RC2':
-		break;
-
-		// No changes from 3.0.10-RC3 to 3.0.10
-		case '3.0.10-RC3':
-		break;
-
-		// Changes from 3.0.10 to 3.0.11-RC1
-		case '3.0.10':
-			// 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);
-
-			$no_updates = false;
-		break;
-
-		// No changes from 3.0.11-RC1 to 3.0.11-RC2
-		case '3.0.11-RC1':
-		break;
-
-		// No changes from 3.0.11-RC2 to 3.0.11
-		case '3.0.11-RC2':
-		break;
-
-		// Changes from 3.0.11 to 3.0.12-RC1
-		case '3.0.11':
-			$sql = 'UPDATE ' . MODULES_TABLE . '
-				SET module_auth = \'acl_u_sig\'
-				WHERE module_class = \'ucp\'
-					AND module_basename = \'profile\'
-					AND module_mode = \'signature\'';
-			_sql($sql, $errored, $error_ary);
-
-			// Update bots
-			if (!function_exists('user_delete'))
-			{
-				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-			}
-
-			$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 = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
-				$result = $db->sql_query($sql);
-				$bot_user_id = (int) $db->sql_fetchfield('user_id');
-				$db->sql_freeresult($result);
-
-				if ($bot_user_id)
-				{
-					if ($bot_agent === false)
-					{
-						$sql = 'DELETE FROM ' . BOTS_TABLE . "
-							WHERE user_id = $bot_user_id";
-						_sql($sql, $errored, $error_ary);
-
-						user_delete('remove', $bot_user_id);
-					}
-					else
-					{
-						$sql = 'UPDATE ' . BOTS_TABLE . "
-							SET bot_agent = '" .  $db->sql_escape($bot_agent) . "'
-							WHERE user_id = $bot_user_id";
-						_sql($sql, $errored, $error_ary);
-					}
-				}
-			}
-
-			// Disable receiving pms for bots
-			$sql = 'SELECT user_id
-				FROM ' . BOTS_TABLE;
-			$result = $db->sql_query($sql);
-
-			$bot_user_ids = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$bot_user_ids[] = (int) $row['user_id'];
-			}
-			$db->sql_freeresult($result);
-
-			if (!empty($bot_user_ids))
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_allow_pm = 0
-					WHERE ' . $db->sql_in_set('user_id', $bot_user_ids);
-				_sql($sql, $errored, $error_ary);
-			}
-
-			$no_updates = false;
-		break;
-
-		// Changes from 3.1.0-dev to 3.1.0-A1
-		case '3.1.0-dev':
-
-			// rename all module basenames to full classname
-			$sql = 'SELECT module_id, module_basename, module_class
-				FROM ' . MODULES_TABLE;
-			$result = $db->sql_query($sql);
-
-			while ($row = $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 = $db->sql_build_array('UPDATE', $row);
-
-						$sql = 'UPDATE ' . MODULES_TABLE . '
-							SET ' . $sql_update . '
-							WHERE module_id = ' . $module_id;
-						_sql($sql, $errored, $error_ary);
-					}
-				}
-			}
-
-			$db->sql_freeresult($result);
-
-			if (substr($config['search_type'], 0, 6) !== 'phpbb_')
-			{
-				// try to guess the new auto loaded search class name
-				// works for native and mysql fulltext
-				set_config('search_type', 'phpbb_search_' . $config['search_type']);
-			}
-
-			if (!isset($config['fulltext_postgres_ts_name']))
-			{
-				set_config('fulltext_postgres_ts_name', 'simple');
-			}
-
-			if (!isset($config['fulltext_postgres_min_word_len']))
-			{
-				set_config('fulltext_postgres_min_word_len', 4);
-			}
-
-			if (!isset($config['fulltext_postgres_max_word_len']))
-			{
-				set_config('fulltext_postgres_max_word_len', 254);
-			}
-
-			if (!isset($config['fulltext_sphinx_stopwords']))
-			{
-				set_config('fulltext_sphinx_stopwords', 0);
-			}
-
-			if (!isset($config['fulltext_sphinx_indexer_mem_limit']))
-			{
-				set_config('fulltext_sphinx_indexer_mem_limit', 512);
-			}
-
-			if (!isset($config['load_jquery_cdn']))
-			{
-				set_config('load_jquery_cdn', 0);
-				set_config('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js');
-			}
-
-			if (!isset($config['use_system_cron']))
-			{
-				set_config('use_system_cron', 0);
-			}
-
-			$sql = 'SELECT group_teampage
-				FROM ' . GROUPS_TABLE . '
-				WHERE group_teampage > 0';
-			$result = $db->sql_query_limit($sql, 1);
-			$added_groups_teampage = (bool) $db->sql_fetchfield('group_teampage');
-			$db->sql_freeresult($result);
-
-			if (!$added_groups_teampage)
-			{
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_teampage = 1
-					WHERE group_type = ' . GROUP_SPECIAL . "
-						AND group_name = 'ADMINISTRATORS'";
-				_sql($sql, $errored, $error_ary);
-
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_teampage = 2
-					WHERE group_type = ' . GROUP_SPECIAL . "
-						AND group_name = 'GLOBAL_MODERATORS'";
-				_sql($sql, $errored, $error_ary);
-			}
-
-			if (!isset($config['legend_sort_groupname']))
-			{
-				set_config('legend_sort_groupname', '0');
-				set_config('teampage_forums', '1');
-			}
-
-			$sql = 'SELECT group_legend
-				FROM ' . GROUPS_TABLE . '
-				WHERE group_teampage > 1';
-			$result = $db->sql_query_limit($sql, 1);
-			$updated_group_legend = (bool) $db->sql_fetchfield('group_teampage');
-			$db->sql_freeresult($result);
-
-			if (!$updated_group_legend)
-			{
-				$sql = 'SELECT group_id
-					FROM ' . GROUPS_TABLE . '
-					WHERE group_legend = 1
-					ORDER BY group_name ASC';
-				$result = $db->sql_query($sql);
-
-				$next_legend = 1;
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$sql = 'UPDATE ' . GROUPS_TABLE . '
-						SET group_legend = ' . $next_legend . '
-						WHERE group_id = ' . (int) $row['group_id'];
-					_sql($sql, $errored, $error_ary);
-
-					$next_legend++;
-				}
-				$db->sql_freeresult($result);
-				unset($next_legend);
-			}
-
-			// Rename styles module to Customise
-			$sql = 'UPDATE ' . MODULES_TABLE . "
-				SET module_langname = 'ACP_CAT_CUSTOMISE'
-				WHERE module_langname = 'ACP_CAT_STYLES'";
-			_sql($sql, $errored, $error_ary);
-
-			// Install modules
-			$modules_to_install = array(
-				'position'	=> array(
-					'base'		=> 'acp_groups',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_GROUPS_POSITION',
-					'auth'		=> 'acl_a_group',
-					'cat'		=> 'ACP_GROUPS',
-				),
-				'manage'	=> array(
-					'base'		=> 'acp_attachments',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_MANAGE_ATTACHMENTS',
-					'auth'		=> 'acl_a_attach',
-					'cat'		=> 'ACP_ATTACHMENTS',
-				),
-				'install'	=> array(
-					'base'		=> 'acp_styles',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_STYLES_INSTALL',
-					'auth'		=> 'acl_a_styles',
-					'cat'		=> 'ACP_STYLE_MANAGEMENT',
-				),
-				'cache'	=> array(
-					'base'		=> 'acp_styles',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_STYLES_CACHE',
-					'auth'		=> 'acl_a_styles',
-					'cat'		=> 'ACP_STYLE_MANAGEMENT',
-				),
-				'autologin_keys'	=> array(
-					'base'		=> 'ucp_profile',
-					'class'		=> 'ucp',
-					'title'		=> 'UCP_PROFILE_AUTOLOGIN_KEYS',
-					'auth'		=> '',
-					'cat'		=> 'UCP_PROFILE',
-				),
-				// To add a category, the mode and basename must be empty
-				// The mode is taken from the array key
-				'' => array(
-					'base'		=> '',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_EXTENSION_MANAGEMENT',
-					'auth'		=> 'acl_a_extensions',
-					'cat'		=> 'ACP_CAT_CUSTOMISE',
-				),
-				'extensions'    => array(
-					'base'		=> 'acp_extensions',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_EXTENSIONS',
-					'auth'		=> 'acl_a_extensions',
-					'cat'		=> 'ACP_EXTENSION_MANAGEMENT',
-				),
-			);
-
-			_add_modules($modules_to_install);
-
-			// We need a separate array for the new language sub heading
-			// because it requires another empty key
-			$modules_to_install = array(
-				'' => array(
-					'base'	=> '',
-					'class'	=> 'acp',
-					'title'	=> 'ACP_LANGUAGE',
-					'auth'	=> 'acl_a_language',
-					'cat'	=> 'ACP_CAT_CUSTOMISE',
-				),
-			);
-
-			_add_modules($modules_to_install);
-
-			// 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 = $db->sql_query($sql);
-			$language_module_id = $db->sql_fetchfield('module_id');
-			$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 = $db->sql_query($sql);
-			$language_management_module_id = $db->sql_fetchfield('module_id');
-			$db->sql_freeresult($result);
-
-			if (!class_exists('acp_modules'))
-			{
-				include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-			}
-			// acp_modules calls adm_back_link, which is undefined at this point
-			if (!function_exists('adm_back_link'))
-			{
-				include($phpbb_root_path . 'includes/functions_acp.' . $phpEx);
-			}
-			$module_manager = new acp_modules();
-			$module_manager->module_class = 'acp';
-			$module_manager->move_module($language_module_id, $language_management_module_id);
-
-			$sql = 'DELETE FROM ' . MODULES_TABLE . "
-				WHERE (module_basename = 'styles' OR module_basename = 'acp_styles') AND (module_mode = 'imageset' OR module_mode = 'theme' OR module_mode = 'template')";
-			_sql($sql, $errored, $error_ary);
-
-			// 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 = $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 = $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'],
-					);
-				}
-			}
-			$db->sql_freeresult($result);
-
-			if (!empty($global_announcements))
-			{
-				// Update the post/topic-count for the forum and the last-post if needed
-				$ga_forum_id = request_var('ga_forum_id', 0);
-
-				$sql = 'SELECT forum_last_post_time
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_id = ' . $ga_forum_id;
-				$result = $db->sql_query($sql);
-				$lastpost = (int) $db->sql_fetchfield('forum_last_post_time');
-				$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 .= ', ' . $db->sql_build_array('UPDATE', $update_lastpost_data);
-				}
-
-				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET ' . $sql_update . '
-					WHERE forum_id = ' . $ga_forum_id;
-				_sql($sql, $errored, $error_ary);
-
-				// 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 " . $db->sql_in_set('topic_id', $global_announcements);
-					_sql($sql, $errored, $error_ary);
-				}
-				unset($table_ary);
-			}
-
-			// Allow custom profile fields in pm templates
-			if (!isset($config['load_cpf_pm']))
-			{
-				set_config('load_cpf_pm', '0');
-			}
-
-			if (!isset($config['teampage_memberships']))
-			{
-				set_config('teampage_memberships', '1');
-			}
-
-			// Check if styles table was already updated
-			if ($db_tools->sql_table_exists(STYLES_THEME_TABLE))
-			{
-				// 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 ($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 = $db->sql_query($sql);
-
-				$styles = array();
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$styles[] = $row;
-				}
-				$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'	=> '',
-						);
-						_sql('UPDATE ' . STYLES_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE style_id = ' . $style_row['style_id'], $errored, $error_ary);
-						$valid_styles[] = (int) $style_row['style_id'];
-					}
-				}
-
-				// Remove old styles tables
-				$changes = 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,
-					)
-				);
-				$statements = $db_tools->perform_schema_changes($changes);
-
-				foreach ($statements as $sql)
-				{
-					_sql($sql, $errored, $error_ary);
-				}
-
-				// Remove old entries from styles table
-				if (!sizeof($valid_styles))
-				{
-					// No valid styles: remove everything and add prosilver
-					_sql('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, '')";
-					_sql($sql, $errored, $error_ary);
-
-					$sql = 'SELECT style_id
-						FROM ' . $table . "
-						WHERE style_name = 'prosilver'";
-					$result = _sql($sql, $errored, $error_ary);
-					$default_style = $db->sql_fetchfield($result);
-					$db->sql_freeresult($result);
-
-					set_config('default_style', $default_style);
-
-					$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
-					_sql($sql, $errored, $error_ary);
-				}
-				else
-				{
-					// There are valid styles in styles table. Remove styles that are outdated
-					_sql('DELETE FROM ' . STYLES_TABLE . ' WHERE ' . $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
-					_sql('UPDATE ' . USERS_TABLE . ' SET user_style = 0 WHERE ' . $db->sql_in_set('user_style', $valid_styles, true), $errored, $error_ary);
-				}
-			}
-
-			// Create config value for displaying last subject on forum list
-			if (!isset($config['display_last_subject']))
-			{
-				$config->set('display_last_subject', '1');
-			}
-
-			if (!isset($config['assets_version']))
-			{
-				$config->set('assets_version', '1');
-			}
-
-			// If the column exists, we did not yet update the users timezone
-			if ($db_tools->sql_column_exists(USERS_TABLE, 'user_dst'))
-			{
-				// Update user timezones
-				$sql = 'SELECT user_dst, user_timezone
-					FROM ' . USERS_TABLE . '
-					GROUP BY user_timezone, user_dst';
-				$result = $db->sql_query($sql);
-
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$sql = 'UPDATE ' . USERS_TABLE . "
-						SET user_timezone = '" . $db->sql_escape($update_helpers->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
-						WHERE user_timezone = '" . $db->sql_escape($row['user_timezone']) . "'
-							AND user_dst = " . (int) $row['user_dst'];
-					_sql($sql, $errored, $error_ary);
-				}
-				$db->sql_freeresult($result);
-
-				// Update board default timezone
-				set_config('board_timezone', $update_helpers->convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
-
-				// After we have calculated the timezones we can delete user_dst column from user table.
-				$statements = $db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
-				foreach ($statements as $sql)
-				{
-					_sql($sql, $errored, $error_ary);
-				}
-			}
-
-			if (!isset($config['site_home_url']))
-			{
-				$config->set('site_home_url', '');
-				$config->set('site_home_text', '');
-			}
-
-			// PHPBB3-10601: Make inbox default. Add basename to ucp's pm category
-
-			// Get the category wanted while checking, at the same time, if this has already been applied
-			$sql = 'SELECT module_id, module_basename
-					FROM ' . MODULES_TABLE . "
-					WHERE module_basename <> 'ucp_pm' AND
-						module_langname='UCP_PM'
-						";
-			$result = $db->sql_query_limit($sql, 1);
-
-			if ($row = $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'];
-
-				_sql($sql, $errored, $error_ary);
-			}
-			$db->sql_freeresult($result);
-			
-
-			// Add new permissions
-			include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
-			$auth_admin = new auth_admin();
-
-			_add_permission($auth_admin, $db, 'u_chgprofileinfo', true, 'u_sig');
-			_add_permission($auth_admin, $db, 'a_extensions', true, 'a_styles');
-
-			// 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'";
-			_sql($sql, $errored, $error_ary);
-
-			$no_updates = false;
-
-		break;
-	}
+	garbage_collection();
+	exit_handler();
 }
diff --git a/phpBB/install/database_update_migrations.php b/phpBB/install/database_update_migrations.php
deleted file mode 100644
index 52682dc489..0000000000
--- a/phpBB/install/database_update_migrations.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-$update_start_time = time();
-
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-
-require($phpbb_root_path . 'includes/startup.' . $phpEx);
-
-if (file_exists($phpbb_root_path . 'config.' . $phpEx))
-{
-	require($phpbb_root_path . 'config.' . $phpEx);
-}
-
-// Include files
-require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-
-require($phpbb_root_path . 'includes/functions.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
-
-require($phpbb_root_path . 'includes/constants.' . $phpEx);
-require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
-
-// Set PHP error handler to ours
-set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-
-// Setup class loader first
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
-$phpbb_class_loader->register();
-
-// Set up container
-$container_extensions = array(
-	new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
-	new phpbb_di_extension_core($phpbb_root_path),
-);
-$container_passes = array(
-	new phpbb_di_pass_collection_pass(),
-	//new phpbb_di_pass_kernel_pass(),
-);
-$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
-
-// Compile the container
-foreach ($container_passes as $pass)
-{
-	$phpbb_container->addCompilerPass($pass);
-}
-$phpbb_container->compile();
-
-// set up caching
-$cache = $phpbb_container->get('cache');
-
-// Instantiate some basic classes
-$phpbb_dispatcher = $phpbb_container->get('dispatcher');
-$request	= $phpbb_container->get('request');
-$user		= $phpbb_container->get('user');
-$auth		= $phpbb_container->get('auth');
-$db			= $phpbb_container->get('dbal.conn');
-
-// make sure request_var uses this request instance
-request_var('', 0, false, false, $request); // "dependency injection" for a function
-
-// Grab global variables, re-cache if necessary
-$config = $phpbb_container->get('config');
-set_config(null, null, null, $config);
-set_config_count(null, null, null, $config);
-
-// End startup code
-
-$db_tools = $phpbb_container->get('dbal.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',
-	));
-}
-
-$migrator = $phpbb_container->get('migrator');
-$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
-
-// 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);
-
-while (!$migrator->finished())
-{
-	try
-	{
-		$migrator->update();
-	}
-	catch (phpbb_db_migration_exception $e)
-	{
-		echo $e;
-
-		garbage_collection();
-		exit_handler();
-	}
-
-	echo $migrator->last_run_migration['name'] . '<br />';
-
-	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
-	if ((time() - $update_start_time) >= $safe_time_limit)
-	{
-		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
-		echo 'Update not yet completed.<br />';
-		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
-
-		garbage_collection();
-		exit_handler();
-	}
-}
-
-echo 'Finished';
-
-garbage_collection();
-exit_handler();
-- 
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')

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 babdb92aa998728b58eec1e3f2c036b5f2342492 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 17:25:53 -0600
Subject: [feature/migrations] Remove hardcoded language, use lang instead.

PHPBB3-9737
---
 phpBB/install/database_update.php | 54 +++++++++++++++++++--------------------
 phpBB/language/en/install.php     |  3 +++
 2 files changed, 30 insertions(+), 27 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7431c96231..cd43f6065b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -21,26 +21,6 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-if (!function_exists('phpbb_require_updated'))
-{
-	function phpbb_require_updated($path, $optional = false)
-	{
-		global $phpbb_root_path;
-
-		$new_path = $phpbb_root_path . 'install/update/new/' . $path;
-		$old_path = $phpbb_root_path . $path;
-
-		if (file_exists($new_path))
-		{
-			require($new_path);
-		}
-		else if (!$optional || file_exists($old_path))
-		{
-			require($old_path);
-		}
-	}
-}
-
 phpbb_require_updated('includes/startup.' . $phpEx);
 
 include($phpbb_root_path . 'config.' . $phpEx);
@@ -200,7 +180,7 @@ while (!$migrator->finished())
 	{
 		echo $e;
 
-		end_update($cache);
+		phpbb_end_update($cache);
 	}
 
 	echo $migrator->last_run_migration['name'] . '<br />';
@@ -209,10 +189,10 @@ while (!$migrator->finished())
 	if ((time() - $update_start_time) >= $safe_time_limit)
 	{
 		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
-		echo 'Update not yet completed.<br />';
-		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>';
+		echo $lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
+		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
 
-		end_update($cache);
+		phpbb_end_update($cache);
 	}
 }
 
@@ -221,11 +201,31 @@ if ($orig_version != $config['version'])
 	add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']);
 }
 
-echo 'Finished';
+echo $lang['DATABASE_UPDATE_COMPLETE'];
 
-end_update($cache);
+phpbb_end_update($cache);
+
+if (!function_exists('phpbb_require_updated'))
+{
+	function phpbb_require_updated($path, $optional = false)
+	{
+		global $phpbb_root_path;
+
+		$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+		$old_path = $phpbb_root_path . $path;
+
+		if (file_exists($new_path))
+		{
+			require($new_path);
+		}
+		else if (!$optional || file_exists($old_path))
+		{
+			require($old_path);
+		}
+	}
+}
 
-function end_update($cache)
+function phpbb_end_update($cache)
 {
 	$cache->purge();
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f7820714e1..7607512eab 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -397,7 +397,10 @@ $lang = array_merge($lang, array(
 	'CURRENT_VERSION'				=> 'Current version',
 
 	'DATABASE_TYPE'						=> 'Database type',
+	'DATABASE_UPDATE_COMPLETE'			=> 'Database updater has completed!',
+	'DATABASE_UPDATE_CONTINUE'			=> 'Continue database update.',
 	'DATABASE_UPDATE_INFO_OLD'			=> 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
+	'DATABASE_UPDATE_NOT_COMPLETED'		=> 'The database update has not yet completed.',
 	'DELETE_USER_REMOVE'				=> 'Delete user and remove posts',
 	'DELETE_USER_RETAIN'				=> 'Delete user but keep posts',
 	'DESTINATION'						=> 'Destination file',
-- 
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 +++++++++++++++++++++
 phpBB/install/database_update.php                  |  16 +--
 44 files changed, 249 insertions(+), 133 deletions(-)
 create mode 100644 phpBB/includes/db/migration/install.php

(limited to 'phpBB')

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);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index cd43f6065b..74aa072d22 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -147,21 +147,13 @@ header('Content-type: text/html; charset=UTF-8');
 
 // End startup code
 
+// Make sure migrations have been installed. If not, install migrations and guess what migrations have been installed
 $db_tools = $phpbb_container->get('dbal.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',
-	));
+	$migrations_installer = new phpbb_db_migration_install();
+	$migrations_installer->install($db, $db_tools, $table_prefix, $config['version']);
+	unset($migrations_installer);
 }
 
 $migrator = $phpbb_container->get('migrator');
-- 
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 +++++++++------
 phpBB/install/database_update.php       | 94 ++++++++++++++++-----------------
 phpBB/install/schemas/schema_data.sql   | 43 +++++++++++++++
 3 files changed, 116 insertions(+), 64 deletions(-)

(limited to 'phpBB')

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);
+					}
 				}
 			}
 		}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 74aa072d22..f220a1f684 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -21,6 +21,52 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
+if (!function_exists('phpbb_require_updated'))
+{
+	function phpbb_require_updated($path, $optional = false)
+	{
+		global $phpbb_root_path;
+
+		$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+		$old_path = $phpbb_root_path . $path;
+
+		if (file_exists($new_path))
+		{
+			require($new_path);
+		}
+		else if (!$optional || file_exists($old_path))
+		{
+			require($old_path);
+		}
+	}
+}
+
+function phpbb_end_update($cache)
+{
+	$cache->purge();
+
+?>
+								</p>
+							</div>
+						</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>
+
+<?php
+
+	garbage_collection();
+	exit_handler();
+}
+
 phpbb_require_updated('includes/startup.' . $phpEx);
 
 include($phpbb_root_path . 'config.' . $phpEx);
@@ -149,7 +195,7 @@ header('Content-type: text/html; charset=UTF-8');
 
 // Make sure migrations have been installed. If not, install migrations and guess what migrations have been installed
 $db_tools = $phpbb_container->get('dbal.tools');
-if (!$db_tools->sql_table_exists(MIGRATIONS_TABLE))
+if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
 {
 	$migrations_installer = new phpbb_db_migration_install();
 	$migrations_installer->install($db, $db_tools, $table_prefix, $config['version']);
@@ -196,49 +242,3 @@ if ($orig_version != $config['version'])
 echo $lang['DATABASE_UPDATE_COMPLETE'];
 
 phpbb_end_update($cache);
-
-if (!function_exists('phpbb_require_updated'))
-{
-	function phpbb_require_updated($path, $optional = false)
-	{
-		global $phpbb_root_path;
-
-		$new_path = $phpbb_root_path . 'install/update/new/' . $path;
-		$old_path = $phpbb_root_path . $path;
-
-		if (file_exists($new_path))
-		{
-			require($new_path);
-		}
-		else if (!$optional || file_exists($old_path))
-		{
-			require($old_path);
-		}
-	}
-}
-
-function phpbb_end_update($cache)
-{
-	$cache->purge();
-
-?>
-								</p>
-							</div>
-						</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>
-
-<?php
-
-	garbage_collection();
-	exit_handler();
-}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 7c1a7d40f5..d9e5c46e55 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -611,6 +611,49 @@ INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id,
 # NEW MEMBERS on the queue
 INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 24, 0);
 
+# Migrations
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_1', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_1_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc3";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_9";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc3', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_10";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_12_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_1_rc1', 'a:0:{}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_2_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_2_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_3', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_3_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_3_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_4', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_4_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_4_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_3";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_5', 'a:1:{i:0;s:38:"phpbb_db_migration_data_3_0_5_rc1part2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_5_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_4";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_5_rc1part2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_5_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc4";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_5";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc3', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc4', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc3";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_7_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7_pl1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_7";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_6";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_7_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_8', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_8_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_8_rc1', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_7_pl1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc4";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_8";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc3', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc4', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc3";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_1_0_dev', 'a:4:{i:0;s:30:"phpbb_db_migration_data_3_0_11";i:1;s:34:"phpbb_db_migration_data_extensions";i:2;s:39:"phpbb_db_migration_data_style_update_p2";i:3;s:35:"phpbb_db_migration_data_timezone_p2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_extensions', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_style_update_p1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_style_update_p2', 'a:1:{i:0;s:39:"phpbb_db_migration_data_style_update_p1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_timezone', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_timezone_p2', 'a:1:{i:0;s:32:"phpbb_db_migration_data_timezone";}', 1, 1, '', 0, 0);
 
 # -- Demo Topic
 INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_first_poster_colour, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour, topic_last_post_subject, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('{L_TOPICS_TOPIC_TITLE}', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 'AA0000', 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, 972086460, '');
-- 
cgit v1.2.1


From dd327ac83ead363564d489a5819cb9648dcac2c1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 11 Jan 2013 10:48:46 -0600
Subject: [feature/migrations] Order the migrations schema in schema_data.sql

PHPBB3-11318
---
 phpBB/install/schemas/schema_data.sql | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index d9e5c46e55..53ff90119e 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -613,14 +613,6 @@ INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id,
 
 # Migrations
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_1', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_1_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc3";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_9";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc3', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_10";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_12_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_1_rc1', 'a:0:{}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_2_rc2";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_1";}', 1, 1, '', 0, 0);
@@ -648,12 +640,20 @@ INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_sc
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc1";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc3', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc2";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc4', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc3";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_1_0_dev', 'a:4:{i:0;s:30:"phpbb_db_migration_data_3_0_11";i:1;s:34:"phpbb_db_migration_data_extensions";i:2;s:39:"phpbb_db_migration_data_style_update_p2";i:3;s:35:"phpbb_db_migration_data_timezone_p2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc3";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_9";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc3', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc2";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_10";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc1";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_12_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_extensions', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_style_update_p1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_style_update_p2', 'a:1:{i:0;s:39:"phpbb_db_migration_data_style_update_p1";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_timezone', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
 INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_timezone_p2', 'a:1:{i:0;s:32:"phpbb_db_migration_data_timezone";}', 1, 1, '', 0, 0);
+INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_1_0_dev', 'a:4:{i:0;s:30:"phpbb_db_migration_data_3_0_11";i:1;s:34:"phpbb_db_migration_data_extensions";i:2;s:39:"phpbb_db_migration_data_style_update_p2";i:3;s:35:"phpbb_db_migration_data_timezone_p2";}', 1, 1, '', 0, 0);
 
 # -- Demo Topic
 INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_first_poster_colour, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour, topic_last_post_subject, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('{L_TOPICS_TOPIC_TITLE}', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 'AA0000', 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, 972086460, '');
-- 
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')

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 ---------------------
 phpBB/install/database_update.php                  |  17 ++-
 44 files changed, 223 insertions(+), 142 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/install.php

(limited to 'phpBB')

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);
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index f220a1f684..459839f393 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -193,13 +193,22 @@ header('Content-type: text/html; charset=UTF-8');
 
 // End startup code
 
-// Make sure migrations have been installed. If not, install migrations and guess what migrations have been installed
+// Make sure migrations have been installed.
 $db_tools = $phpbb_container->get('dbal.tools');
 if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
 {
-	$migrations_installer = new phpbb_db_migration_install();
-	$migrations_installer->install($db, $db_tools, $table_prefix, $config['version']);
-	unset($migrations_installer);
+	$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',
+	));
 }
 
 $migrator = $phpbb_container->get('migrator');
-- 
cgit v1.2.1


From d30a9cb4971f261e33a4814cc94c8fd218afda91 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 13 Jan 2013 13:23:42 -0600
Subject: [feature/migrations] Automatically populate migrations table on
 install

PHPBB3-9737
---
 phpBB/install/install_install.php     |  7 ++++++
 phpBB/install/schemas/schema_data.sql | 44 -----------------------------------
 2 files changed, 7 insertions(+), 44 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1ab9caee0a..e0eb9e4472 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -114,6 +114,7 @@ class install_install extends module
 				$this->add_bots($mode, $sub);
 				$this->email_admin($mode, $sub);
 				$this->disable_avatars_if_unwritable();
+				$this->populate_migrations($phpbb_container, $phpbb_root_path);
 
 				// Remove the lock file
 				@unlink($phpbb_root_path . 'cache/install_lock');
@@ -1880,6 +1881,12 @@ class install_install extends module
 		}
 	}
 
+	function populate_migrations($container, $phpbb_root_path)
+	{
+		$migrator = $container->get('migrator');
+		$migrator->populate_migrations_from_directory($phpbb_root_path . 'includes/db/migration/data/');
+	}
+
 	/**
 	* Generate a list of available mail server authentication methods
 	*/
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 53ff90119e..4e4d70ced3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -611,50 +611,6 @@ INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id,
 # NEW MEMBERS on the queue
 INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 24, 0);
 
-# Migrations
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_1', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_1_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_1_rc1', 'a:0:{}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_2_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_2_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_2_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_3', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_3_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_3_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_4', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_4_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_4_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_3";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_5', 'a:1:{i:0;s:38:"phpbb_db_migration_data_3_0_5_rc1part2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_5_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_4";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_5_rc1part2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_5_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc4";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_5";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc3', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_6_rc4', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_6_rc3";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_7_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7_pl1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_7";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_6";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_7_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_7_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_8', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_8_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_8_rc1', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_7_pl1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc4";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_8";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc2', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc3', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_9_rc4', 'a:1:{i:0;s:33:"phpbb_db_migration_data_3_0_9_rc3";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc3";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc1', 'a:1:{i:0;s:29:"phpbb_db_migration_data_3_0_9";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_10_rc3', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_10_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc2";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_10";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_11_rc2', 'a:1:{i:0;s:34:"phpbb_db_migration_data_3_0_11_rc1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_0_12_rc1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_extensions', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_style_update_p1', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_style_update_p2', 'a:1:{i:0;s:39:"phpbb_db_migration_data_style_update_p1";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_timezone', 'a:1:{i:0;s:30:"phpbb_db_migration_data_3_0_11";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_timezone_p2', 'a:1:{i:0;s:32:"phpbb_db_migration_data_timezone";}', 1, 1, '', 0, 0);
-INSERT INTO phpbb_migrations (migration_name, migration_depends_on, migration_schema_done, migration_data_done, migration_data_state, migration_start_time, migration_end_time) VALUES('phpbb_db_migration_data_3_1_0_dev', 'a:4:{i:0;s:30:"phpbb_db_migration_data_3_0_11";i:1;s:34:"phpbb_db_migration_data_extensions";i:2;s:39:"phpbb_db_migration_data_style_update_p2";i:3;s:35:"phpbb_db_migration_data_timezone_p2";}', 1, 1, '', 0, 0);
-
 # -- Demo Topic
 INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_first_poster_colour, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour, topic_last_post_subject, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('{L_TOPICS_TOPIC_TITLE}', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 'AA0000', 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, 972086460, '');
 
-- 
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')

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')

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')

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')

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')

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')

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')

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 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/config/services.yml            |  1 +
 phpBB/includes/extension/manager.php | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 028ab88229..ef5359129f 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -115,6 +115,7 @@ services:
             - @service_container
             - @dbal.conn
             - @config
+            - @migrator
             - %tables.ext%
             - %core.root_path%
             - .%core.php_ext%
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')

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 +++----
 phpBB/language/en/migrator.php                  | 55 +++++++++++++++++++++++++
 5 files changed, 71 insertions(+), 14 deletions(-)
 create mode 100644 phpBB/language/en/migrator.php

(limited to 'phpBB')

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;
 				}
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
new file mode 100644
index 0000000000..bc9fbc57af
--- /dev/null
+++ b/phpBB/language/en/migrator.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* migrator [English]
+*
+* @package language
+* @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;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+$lang = array_merge($lang, array(
+	'CONFIG_ALREADY_EXIST'				=> 'The config setting "%s" unexpectedly already exists.',
+	'CONFIG_NOT_EXIST'					=> 'The config setting "%s" unexpectedly does not exist.',
+
+	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
+
+	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
+
+	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
+	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
+	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
+	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
+	'MODULE_NOT_REMOVABLE'				=> 'Module %1$s was unable to be removed: %2$s',
+
+	'PERMISSION_ALREADY_EXIST'			=> 'The permission setting "%s" unexpectedly already exists.',
+	'PERMISSION_NOT_EXIST'				=> 'The permission setting "%s" unexpectedly does not exist.',
+
+	'ROLE_NOT_EXIST'					=> 'The permission role "%s" unexpectedly does not exist.',
+));
-- 
cgit v1.2.1


From f409697137b0b1d01b663bb81d12f6179c3922e3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 21:06:08 -0600
Subject: [feature/migrations] Add explanatory language string for migration
 errors

This should be used if an exception is thrown to inform the user of
what occurred.

PHPBB3-11351
---
 phpBB/language/en/migrator.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index bc9fbc57af..84074c391c 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -40,6 +40,7 @@ $lang = array_merge($lang, array(
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
 
+	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
 
 	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
-- 
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/adm/style/acp_ext_enable.html   |  8 +++++++-
 phpBB/adm/style/acp_ext_purge.html    |  8 +++++++-
 phpBB/includes/acp/acp_extensions.php | 28 +++++++++++++++++++++-------
 3 files changed, 35 insertions(+), 9 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 3f7be2c847..35585207eb 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -7,7 +7,13 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 	<p>{L_ENABLE_EXPLAIN}</p>
 
-	<!-- IF PRE -->
+	<!-- IF MIGRATOR_ERROR -->
+	<div class="errorbox">
+		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
+		<p>{MIGRATOR_ERROR}</p>
+		<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+	</div>
+	<!-- ELSEIF PRE -->
 	<div class="errorbox">
 		<p>{L_ENABLE_CONFIRM}</p>
 	</div>
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index 00a58721cb..94bef82ca5 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -7,7 +7,13 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 	<p>{L_PURGE_EXPLAIN}</p>
 
-	<!-- IF PRE -->
+	<!-- IF MIGRATOR_ERROR -->
+	<div class="errorbox">
+		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
+		<p>{MIGRATOR_ERROR}</p>
+		<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+	</div>
+	<!-- ELSEIF PRE -->
 	<div class="errorbox">
 		<p>{L_PURGE_CONFIRM}</p>
 	</div>
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')

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')

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 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')

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')

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 dc9cfcd613a722e65ac8645cf8e2d0b60d5fa21f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 13 Feb 2013 13:30:05 -0600
Subject: [ticket/11103] Make the number of notifications strong if > 0

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

(limited to 'phpBB')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5954ec0501..b747310e5e 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -403,8 +403,9 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
 	'NOTIFICATIONS_COUNT'		=> array(
-		1	=> '%d Notification',
-		2	=> '%d Notifications',
+		0	=> '%d Notifications',
+		1	=> '<strong>%d</strong> Notification',
+		2	=> '<strong>%d</strong> Notifications',
 	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
-- 
cgit v1.2.1


From 283ef6eed4076a4466cc3dccd4b694e141efb8dd Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 13 Feb 2013 17:20:25 -0600
Subject: [ticket/11103] Mark/Unmark All buttons

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_notifications.html  | 10 ++++++----
 phpBB/styles/subsilver2/template/ucp_notifications.html |  7 +++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 85edf4629b..558bff7349 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -118,13 +118,15 @@
 	</div>
 </div>
 
-
-<fieldset class="submit-buttons">
+<!-- IF .notifications -->
+<fieldset class="display-actions">
 	<input type="hidden" name="form_time" value="{FORM_TIME}" />
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}
+	<input type="submit" name="submit" value="{L_MARK_READ}" class="button1" />
+	<div><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></div>
 	{S_FORM_TOKEN}
 </fieldset>
+<!-- ENDIF -->
 
 </form>
 
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index a2dc90c9f3..c1ca795234 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -111,8 +111,7 @@
 							<td class="cat" colspan="3" align="center">
 								<input type="hidden" name="form_time" value="{FORM_TIME}" />
 								{S_HIDDEN_FIELDS}
-								<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;
-								<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
+								<input class="btnmain" type="submit" name="submit" value="{L_MARK_READ}" />
 								{S_FORM_TOKEN}
 							</td>
 						</tr>
@@ -141,6 +140,10 @@
 	<!-- ENDIF -->
 </table>
 
+<!-- IF .notifications -->
+<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></b></div>
+<!-- ENDIF -->
+
 </form>
 
 <!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 216dc824867df3d680fbad994796454999e3b100 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 10:55:30 -0800
Subject: [ticket/11103] Remove title attribute from notification link

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 506ff823ce..27156dbf15 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -138,7 +138,7 @@
 			<ul class="linklist leftside">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
-					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index c7ae77ff9f..4e8ba99358 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -153,7 +153,7 @@ function marklist(id, name, state)
 		<tr>
 			<td class="genmed">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
-					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
-- 
cgit v1.2.1


From 3ba25289aaa938498a05c201d59ae02311dbfbd1 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 10:59:39 -0800
Subject: [ticket/11103] Update styling of prosilver notification modal

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 phpBB/styles/prosilver/theme/common.css             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 27156dbf15..aff346cac5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -157,7 +157,7 @@
 										{notifications.AVATAR}
 										<div>
 											<p>{notifications.FORMATTED_TITLE}</p>
-											<p>{notifications.TIME}</p>
+											<p class="notification_time">» {notifications.TIME}</p>
 
 											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
 												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6c78195457..970c1bffba 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -734,6 +734,10 @@ p.rules a {
 	word-wrap: break-word;
 }
 
+.notification_list ul li p.notification_time {
+	padding-top: 8px;
+}
+
 .notification_list ul.topiclist dt {
 	width: 88%;
 }
-- 
cgit v1.2.1


From 93619c0a4b523878b57055f3574bd59fc789b390 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 11:00:11 -0800
Subject: [ticket/11103] Update styling of subsilver2 notification modal

PHPBB3-11103
---
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 phpBB/styles/subsilver2/theme/stylesheet.css         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 4e8ba99358..c3039257aa 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -175,7 +175,7 @@ function marklist(id, name, state)
 												<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 													{notifications.FORMATTED_TITLE}
 												<!-- IF notifications.URL --></a><!-- ENDIF -->
-													<br />{notifications.TIME}
+													<br />» {notifications.TIME}
 												<!-- IF not notifications.URL and notifications.UNREAD -->
 													<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
 												<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 0f8f9f0367..36389c53ac 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1147,6 +1147,7 @@ a.imageset {
 	position: absolute;
 	width: 310px;
 	z-index: 1;
+	box-shadow: 3px 3px 5px darkgray;
 }
 
 #notification_list .notification_scroll {
-- 
cgit v1.2.1


From fd4e197bde8ae653afd1fb2431f49bfb8ff5053c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 11:00:59 -0800
Subject: [ticket/11103] Update styling of UCP Notifications in prosilver

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_notifications.html |  6 +++---
 phpBB/styles/prosilver/theme/common.css                | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 558bff7349..95e026ae0e 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -83,9 +83,9 @@
 								<dt>
 									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 										{notification_list.AVATAR}
-										<div>
-											<p>{notification_list.FORMATTED_TITLE}</p>
-											<p>{notification_list.TIME}</p>
+										<div class="notifications">
+											<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
+											<p class="notifications_time">» {notification_list.TIME}</p>
 
 											<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
 												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 970c1bffba..0685322b7f 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -765,3 +765,15 @@ p.rules a {
 	bottom: -11px;
 	left: -10px;
 }
+
+.notification_list div.notifications {
+	padding: 5px;
+}
+
+.notification_list p.notifications_title {
+	font-weight: bold;
+}
+
+.notification_list p.notifications_time {
+	font-size: 11px;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From fdc9ad76ce592e4675c103f4aa34f72010b5d9ae Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 11:01:15 -0800
Subject: [ticket/11103] Update styling of UCP Notifications in subsilver2

PHPBB3-11103
---
 phpBB/styles/subsilver2/template/ucp_notifications.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index c1ca795234..5b98a9d815 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -97,10 +97,12 @@
 								<!-- ELSE -->
 									<td colspan="2" valign="top" height="50px">
 								<!-- ENDIF -->
+									<span class="gen">
 									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
-										{notification_list.FORMATTED_TITLE}
+										<strong>{notification_list.FORMATTED_TITLE}</strong>
 									<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
 									{notification_list.TIME}
+									</span>
 								</td>
 								<td align="center">
 									<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
-- 
cgit v1.2.1


From cdc766c90f800af01e7d21b3d7bf3d017479cf73 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 15:41:34 -0600
Subject: [ticket/11103] Restore new/unread messages info/link in header

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 506ff823ce..2bf15754d5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -176,7 +176,7 @@
 				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-					<!-- IF not S_NOTIFICATIONS_DISPLAY and S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
+					<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index c7ae77ff9f..071b588fe5 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -196,7 +196,7 @@ function marklist(id, name, state)
 				<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> &nbsp;<span style="color: red;">{L_BOARD_DISABLED}</span><!-- ENDIF -->
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_USER_LOGGED_IN-->
-						<!-- IF not S_NOTIFICATIONS_DISPLAY and S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" alt="*" /> {PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a><!-- ENDIF -->
+						<!-- IF S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" alt="*" /> {PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a><!-- ENDIF -->
 					<!-- ELSEIF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --> &nbsp;<a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" alt="*" /> {L_REGISTER}</a>
 					<!-- ENDIF -->
 				<!-- ENDIF -->
-- 
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 +
 phpBB/styles/prosilver/template/overall_header.html  | 1 +
 phpBB/styles/prosilver/theme/common.css              | 6 ++++++
 phpBB/styles/subsilver2/template/overall_header.html | 1 +
 phpBB/styles/subsilver2/theme/stylesheet.css         | 6 ++++++
 5 files changed, 15 insertions(+)

(limited to 'phpBB')

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'],
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2bf15754d5..e911007aa6 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -143,6 +143,7 @@
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
 							{L_NOTIFICATIONS}
+							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
 						</div>
 
 						<ul>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6c78195457..3eb09492d5 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -713,6 +713,12 @@ p.rules a {
 	border-radius: 5px 5px 0 0;
 }
 
+#notification_list > .header > .header_settings {
+	float: right;
+	font-weight: normal;
+	text-transform: none;
+}
+
 #notification_list > .footer {
 	text-align: center;
 	font-size: 1.2em;
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 071b588fe5..0a2c5aed96 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -157,6 +157,7 @@ function marklist(id, name, state)
 					<div id="notification_list" class="notification_list">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
+							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
 						</div>
 
 						<div class="notification_scroll">
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 0f8f9f0367..a78a84ab63 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1167,6 +1167,12 @@ a.imageset {
 	border-bottom: 0;
 }
 
+#notification_list > .header > .header_settings {
+	float: right;
+	font-weight: normal;
+	text-transform: none;
+}
+
 #notification_list .footer {
 	width: 300px;
 	text-align: center;
-- 
cgit v1.2.1


From b05da5ec0e95ddb5bc645e661987ba0a7bb49573 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 15 Feb 2013 14:38:36 -0800
Subject: [ticket/11103] HTML encode double arrow character

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html     | 2 +-
 phpBB/styles/prosilver/template/ucp_notifications.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html    | 2 +-
 phpBB/styles/subsilver2/template/ucp_notifications.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index aff346cac5..b94eef7aad 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -157,7 +157,7 @@
 										{notifications.AVATAR}
 										<div>
 											<p>{notifications.FORMATTED_TITLE}</p>
-											<p class="notification_time">» {notifications.TIME}</p>
+											<p class="notification_time">&raquo; {notifications.TIME}</p>
 
 											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
 												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 95e026ae0e..a2d558d0ca 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -85,7 +85,7 @@
 										{notification_list.AVATAR}
 										<div class="notifications">
 											<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
-											<p class="notifications_time">» {notification_list.TIME}</p>
+											<p class="notifications_time">&raquo; {notification_list.TIME}</p>
 
 											<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
 												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index c3039257aa..8c167c959f 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -175,7 +175,7 @@ function marklist(id, name, state)
 												<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 													{notifications.FORMATTED_TITLE}
 												<!-- IF notifications.URL --></a><!-- ENDIF -->
-													<br />» {notifications.TIME}
+													<br />&raquo; {notifications.TIME}
 												<!-- IF not notifications.URL and notifications.UNREAD -->
 													<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
 												<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index 5b98a9d815..1a1fda4c17 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -101,7 +101,7 @@
 									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 										<strong>{notification_list.FORMATTED_TITLE}</strong>
 									<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
-									{notification_list.TIME}
+									&raquo; {notification_list.TIME}
 									</span>
 								</td>
 								<td align="center">
-- 
cgit v1.2.1


From 337b958171c756033a42f88a183b87e893fc2940 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 15 Feb 2013 14:39:06 -0800
Subject: [ticket/11103] Add newlines to bottom of css file

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 0685322b7f..4f75a8b85b 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -776,4 +776,5 @@ p.rules a {
 
 .notification_list p.notifications_time {
 	font-size: 11px;
-}
\ No newline at end of file
+}
+
-- 
cgit v1.2.1


From d2295b3d1f191710916b12980e13c97419ecf0ae Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 19:27:09 -0600
Subject: [ticket/11103] Restore new/unread messages info/link in header
 (properly)

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e911007aa6..85bce8a313 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -177,7 +177,7 @@
 				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-					<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
+						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 0a2c5aed96..6ea9ba1442 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -196,7 +196,7 @@ function marklist(id, name, state)
 				<!-- IF U_RESTORE_PERMISSIONS --> &nbsp;<a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
 				<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> &nbsp;<span style="color: red;">{L_BOARD_DISABLED}</span><!-- ENDIF -->
 				<!-- IF not S_IS_BOT -->
-					<!-- IF S_USER_LOGGED_IN-->
+					<!-- IF S_USER_LOGGED_IN -->
 						<!-- IF S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" alt="*" /> {PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a><!-- ENDIF -->
 					<!-- ELSEIF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --> &nbsp;<a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" alt="*" /> {L_REGISTER}</a>
 					<!-- ENDIF -->
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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 ++++++++------
 phpBB/language/en/common.php           |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'phpBB')

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],
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6c723a5060..7758d0af16 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -358,6 +358,7 @@ $lang = array_merge($lang, array(
 	'LOGOUT_USER'						=> 'Logout [ %s ]',
 	'LOG_ME_IN'							=> 'Remember me',
 
+	'MAIN'					=> 'Main',
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
-- 
cgit v1.2.1


From 37093b6aa522dd15d05659eaf6c541e25e163289 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 Feb 2013 13:04:06 +0100
Subject: [ticket/11342] Fix "unexpected token" syntax error

PHPBB-11342
---
 phpBB/styles/prosilver/template/ajax.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index b2a27089f7..0b587ac561 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -54,7 +54,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 * @param update_topic_links bool Wether "Mark topics read" links should be
 *     updated. Defaults to true.
 */
-phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links = true) {
+phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
@@ -68,6 +68,10 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links = tru
 	var classMap = {};
 	var classNames = [];
 
+	if (typeof update_topic_links === 'undefined') {
+		update_topic_links = true;
+	}
+
 	$.each(iconsArray, function(unreadClass, readClass) {
 		$.each(iconsState, function(key, value) {
 			// Only topics can be hot
-- 
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')

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 ++--
 phpBB/install/install_install.php          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

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')),
 			),
 		);
 	}
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index dd90335480..16a527b252 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2098,7 +2098,7 @@ class install_install extends module
 			),
 			'ACP_CAT_CUSTOMISE'		=> array(
 				'ACP_STYLE_MANAGEMENT',
-				'ACP_EXTENSIONS_MANAGEMENT',
+				'ACP_EXTENSION_MANAGEMENT',
 				'ACP_LANGUAGE',
 			),
 			'ACP_CAT_MAINTENANCE'	=> array(
-- 
cgit v1.2.1


From c31935abda37b1d8f4f7ebbce33012a95e7b4b69 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 23 Feb 2013 15:08:28 -0600
Subject: [feature/migrations] Revert unrelated change to schema_data.sql

PHBB3-9737
---
 phpBB/install/schemas/schema_data.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 4e4d70ced3..7c1a7d40f5 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -611,6 +611,7 @@ INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id,
 # NEW MEMBERS on the queue
 INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 24, 0);
 
+
 # -- Demo Topic
 INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_first_poster_colour, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour, topic_last_post_subject, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('{L_TOPICS_TOPIC_TITLE}', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 'AA0000', 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, 972086460, '');
 
-- 
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')

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 f6a894f07700627b675c2b16aab4714df5819a23 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 23 Feb 2013 16:12:24 -0600
Subject: [feature/migrations] Use the user class for language handling

Also localise error messages from the migrator

PHBB3-9737
---
 phpBB/install/database_update.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 459839f393..4938ef0f87 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -133,9 +133,7 @@ set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 $orig_version = $config['version'];
 
-include($phpbb_root_path . 'language/' . $config['default_lang'] . '/common.' . $phpEx);
-include($phpbb_root_path . 'language/' . $config['default_lang'] . '/acp/common.' . $phpEx);
-include($phpbb_root_path . 'language/' . $config['default_lang'] . '/install.' . $phpEx);
+$user->add_lang(array('common', 'acp/common', 'install', 'migrator'));
 
 // Add own hook handler, if present. :o
 if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
@@ -157,11 +155,11 @@ else
 header('Content-type: text/html; charset=UTF-8');
 ?>
 <!DOCTYPE html>
-<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
+<html dir="<?php echo $user->lang['DIRECTION']; ?>" lang="<?php echo $user->lang['USER_LANG']; ?>">
 <head>
 <meta charset="utf-8">
 
-<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
+<title><?php echo $user->lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
 <link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
@@ -178,12 +176,12 @@ header('Content-type: text/html; charset=UTF-8');
 						<div id="content">
 							<div id="main" class="install-body">
 
-								<h1><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
+								<h1><?php echo $user->lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
 
 								<br />
 
-								<p><?php echo $lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br />
-								<?php echo $lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br />
+								<p><?php echo $user->lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br />
+								<?php echo $user->lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br />
 
 <?php
 
@@ -225,7 +223,7 @@ while (!$migrator->finished())
 	}
 	catch (phpbb_db_migration_exception $e)
 	{
-		echo $e;
+		echo $e->getLocalisedMessage($user);
 
 		phpbb_end_update($cache);
 	}
@@ -236,8 +234,8 @@ while (!$migrator->finished())
 	if ((time() - $update_start_time) >= $safe_time_limit)
 	{
 		//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
-		echo $lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
-		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
+		echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
+		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
 
 		phpbb_end_update($cache);
 	}
@@ -248,6 +246,6 @@ if ($orig_version != $config['version'])
 	add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']);
 }
 
-echo $lang['DATABASE_UPDATE_COMPLETE'];
+echo $user->lang['DATABASE_UPDATE_COMPLETE'];
 
 phpbb_end_update($cache);
-- 
cgit v1.2.1


From c4f8c64a2334957757683aa2f65f51d25f359292 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 24 Feb 2013 12:37:02 +0100
Subject: [ticket/11122] Add EXreaction to docs/AUTHORS.

PHPBB3-11122
---
 phpBB/docs/AUTHORS | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB')

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index c623bbb988..28d3548d0b 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -23,6 +23,7 @@ involved in phpBB.
 phpBB Lead Developer:  naderman (Nils Adermann)
 
 phpBB Developers:      bantu (Andreas Fischer)
+                       EXreaction (Nathan Guse)
                        igorw (Igor Wiedler)
                        imkingdavid (David King)
                        nickvergessen (Joas Schilling)
-- 
cgit v1.2.1


From c69b1c2ef24faa74a6b44ccdc19495419bc15131 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 24 Feb 2013 12:43:31 +0100
Subject: [ticket/11122] Move rxu to 'Former Contributors' section.

PHPBB3-11122
---
 phpBB/docs/AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 28d3548d0b..fcef26daa1 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -28,7 +28,6 @@ phpBB Developers:      bantu (Andreas Fischer)
                        imkingdavid (David King)
                        nickvergessen (Joas Schilling)
                        Oleg (Oleg Pudeyev)
-                       rxu (Ruslan Uzdenov)
 
 Contributions by:      leviatan21 (Gabriel Vazquez)
                        Raimon (Raimon Meuldijk)
@@ -54,6 +53,7 @@ phpBB Developers:      A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
                        dhn (Dominik Dröscher)        [05/2007 - 01/2011]
                        GrahamJE (Graham Eames)       [09/2005 - 11/2006]
                        kellanved (Henry Sudhof)      [04/2007 - 03/2011]
+                       rxu (Ruslan Uzdenov)          [04/2010 - 12/2012]
                        TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
                        ToonArmy (Chris Smith)        [06/2008 - 11/2011]
                        Vic D'Elfant (Vic D'Elfant)   [04/2007 - 04/2009]
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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 7a8ae493009eac3d4f5c97279f0be6e10c588002 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 25 Feb 2013 13:12:32 -0600
Subject: [feature/migrations] Inject migrator rather than the container.

Some docblocks

PHBB3-9737
---
 phpBB/install/install_install.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index e0eb9e4472..a99de9bec9 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -114,7 +114,7 @@ class install_install extends module
 				$this->add_bots($mode, $sub);
 				$this->email_admin($mode, $sub);
 				$this->disable_avatars_if_unwritable();
-				$this->populate_migrations($phpbb_container, $phpbb_root_path);
+				$this->populate_migrations($phpbb_container->get('migrator'), $phpbb_root_path);
 
 				// Remove the lock file
 				@unlink($phpbb_root_path . 'cache/install_lock');
@@ -1881,9 +1881,18 @@ class install_install extends module
 		}
 	}
 
-	function populate_migrations($container, $phpbb_root_path)
+	/**
+	* Populate migrations for the installation
+	*
+	* This "installs" all migrations from (root path)/includes/db/migrations/data.
+	* "installs" means it adds all migrations to the migrations table, but does not
+	* perform any of the actions in the migrations.
+	*
+	* @param phpbb_db_migrator $migrator
+	* @param string $phpbb_root_path
+	*/
+	function populate_migrations($migrator, $phpbb_root_path)
 	{
-		$migrator = $container->get('migrator');
 		$migrator->populate_migrations_from_directory($phpbb_root_path . 'includes/db/migration/data/');
 	}
 
-- 
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/adm/style/acp_groups_position.html | 22 ++++++++++++++++------
 phpBB/includes/acp/acp_groups.php        | 18 ++++++++++++------
 phpBB/language/en/acp/groups.php         |  4 ++--
 3 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index eb4c3d8819..55bc1b2323 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -39,7 +39,7 @@
 	<tbody>
 	<!-- BEGIN legend -->
 		<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}">
-			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td>
+			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
@@ -68,7 +68,12 @@
 
 	<form id="legend_add_group" method="post" action="{U_ACTION_LEGEND}">
 		<fieldset class="quick">
-			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select>
+			<select name="g">
+				<option value="0">{L_SELECT_GROUP}</option>
+				<!-- BEGIN add_legend -->
+					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
+				<!-- END add_legend -->
+			</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
 			{S_FORM_TOKEN}
@@ -126,7 +131,7 @@
 				<!-- IF teampage.U_CATEGORY -->
 					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
 				<!-- ELSE -->
-					<strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong>
+					<strong<!-- IF teampage.GROUP_COLOUR --> style="color: {teampage.GROUP_COLOUR}"<!-- ENDIF -->>{teampage.GROUP_NAME}</strong>
 				<!-- ENDIF -->
 			</td>
 			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
@@ -159,8 +164,8 @@
 	<!-- IF not S_TEAMPAGE_CATEGORY -->
 	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
-			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_CATEGORY_NAME}" />
-			<input class="button2" type="submit" name="submit" value="{L_ADD_CATEGORY}" />
+			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
+			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}" />
 			<input type="hidden" name="action" value="add_category" />
 			{S_FORM_TOKEN}
 		</fieldset>
@@ -169,7 +174,12 @@
 
 	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
-			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
+			<select name="g">
+				<option value="0">{L_SELECT_GROUP}</option>
+				<!-- BEGIN add_teampage -->
+					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
+				<!-- END add_teampage -->
+			</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
 			{S_FORM_TOKEN}
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'],
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 18e5cbaa1d..58101e5f60 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -36,14 +36,13 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
-	'ADD_CATEGORY'					=> 'Add category',
+	'ADD_GROUP_CATEGORY'			=> 'Add category',
 	'ADD_USERS'						=> 'Add users',
 	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
 
 	'COPY_PERMISSIONS'				=> 'Copy permissions from',
 	'COPY_PERMISSIONS_EXPLAIN'		=> 'Once created, the group will have the same permissions as the one you select here.',
 	'CREATE_GROUP'					=> 'Create new group',
-	'CATEGORY_NAME'					=> 'Category name',
 
 	'GROUPS_NO_MEMBERS'				=> 'This group has no members',
 	'GROUPS_NO_MODS'				=> 'No group leaders defined',
@@ -52,6 +51,7 @@ $lang = array_merge($lang, array(
 	'GROUP_APPROVED'				=> 'Approved members',
 	'GROUP_AVATAR'					=> 'Group avatar',
 	'GROUP_AVATAR_EXPLAIN'			=> 'This image will be displayed in the Group Control Panel.',
+	'GROUP_CATEGORY_NAME'			=> 'Category name',
 	'GROUP_CLOSED'					=> 'Closed',
 	'GROUP_COLOR'					=> 'Group colour',
 	'GROUP_COLOR_EXPLAIN'			=> 'Defines the colour members’ usernames will appear in, leave blank for user default.',
-- 
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')

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')

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')

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')

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')

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')

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 ba97303a60342bdb54979223cc6d18e815a70d90 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 26 Feb 2013 17:17:31 +0100
Subject: [ticket/10411] Add maxlength to category name input field

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 55bc1b2323..47ff792b54 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -164,7 +164,7 @@
 	<!-- IF not S_TEAMPAGE_CATEGORY -->
 	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
-			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
+			<input class="inputbox autowidth" type="text" maxlength="255" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
 			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}" />
 			<input type="hidden" name="action" value="add_category" />
 			{S_FORM_TOKEN}
-- 
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')

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 5b2d272137ee485307c79e3fd0a10e5ebac4ecdf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 26 Feb 2013 22:17:24 +0100
Subject: [ticket/11368] Fix background color for PM report rows by using
 accessing var.

PHPBB3-11368
---
 phpBB/styles/prosilver/template/mcp_front.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index b71d120ed6..89ab753f12 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -119,7 +119,7 @@
 			<ul class="topiclist cplist">
 
 			<!-- BEGIN pm_report -->
-			<li class="row<!-- IF report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+			<li class="row<!-- IF pm_report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl>
 					<dt>
 						<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br />
-- 
cgit v1.2.1


From d61eb95b4868377cfc2a7a98b03a7d908418b1af Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Feb 2013 00:12:18 +0100
Subject: [ticket/10411] Revert database_update.php changes from for easier
 update

Revert the changes from 8fc022033a16b50aa07d06af8dc2a2508f0d94a6
* [ticket/10411] Update schema and fix database update

The database changes will be added as a migration in the next step

PHPBB3-10411
---
 phpBB/install/database_update.php | 52 ++++++++++++---------------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8592b03be7..0a065573bf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1165,18 +1165,11 @@ function database_update_info()
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
 					),
 				),
-				TEAMPAGE_TABLE				=> 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',
-				),
 			),
 			'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),
 				),
@@ -2482,39 +2475,26 @@ function change_database_data(&$no_updates, $version)
 				set_config('use_system_cron', 0);
 			}
 
-			$sql = 'SELECT teampage_id
-				FROM ' . TEAMPAGE_TABLE;
+			$sql = 'SELECT group_teampage
+				FROM ' . GROUPS_TABLE . '
+				WHERE group_teampage > 0';
 			$result = $db->sql_query_limit($sql, 1);
-			$added_groups_teampage = (bool) $db->sql_fetchfield('teampage_id');
+			$added_groups_teampage = (bool) $db->sql_fetchfield('group_teampage');
 			$db->sql_freeresult($result);
 
 			if (!$added_groups_teampage)
 			{
-				$sql = 'SELECT *
-					FROM ' . GROUPS_TABLE . '
+				$sql = 'UPDATE ' . GROUPS_TABLE . '
+					SET group_teampage = 1
 					WHERE group_type = ' . GROUP_SPECIAL . "
-						AND (group_name = 'ADMINISTRATORS'
-							OR group_name = 'GLOBAL_MODERATORS')
-					ORDER BY group_name ASC";
-				$result = $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);
+						AND group_name = 'ADMINISTRATORS'";
+				_sql($sql, $errored, $error_ary);
 
-				if (sizeof($teampage_entries))
-				{
-					$db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_entries);
-				}
-				unset($teampage_entries);
+				$sql = 'UPDATE ' . GROUPS_TABLE . '
+					SET group_teampage = 2
+					WHERE group_type = ' . GROUP_SPECIAL . "
+						AND group_name = 'GLOBAL_MODERATORS'";
+				_sql($sql, $errored, $error_ary);
 			}
 
 			if (!isset($config['legend_sort_groupname']))
-- 
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')

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')

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')

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')

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')

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')

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')

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 97a446f5b97005f71a7ec3e015aadecaf5bffa36 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Feb 2013 22:00:15 +0100
Subject: [ticket/10411] Update schema file with new table and remove the
 column

PHPBB3-10411
---
 phpBB/install/schemas/schema_data.sql | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 7c1a7d40f5..346a19f24b 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -460,13 +460,17 @@ INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_reg
 INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
 
 # -- Groups
-INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, 0, '', '', '', 5);
-INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('REGISTERED', 3, 0, '', 0, 0, '', '', '', 5);
-INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('REGISTERED_COPPA', 3, 0, '', 0, 0, '', '', '', 5);
-INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GLOBAL_MODERATORS', 3, 0, '00AA00', 2, 2, '', '', '', 0);
-INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('ADMINISTRATORS', 3, 1, 'AA0000', 1, 1, '', '', '', 0);
-INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('BOTS', 3, 0, '9E8DA7', 0, 0, '', '', '', 5);
-INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_teampage, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, 0, '', '', '', 5);
+INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, '', '', '', 5);
+INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('REGISTERED', 3, 0, '', 0, '', '', '', 5);
+INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('REGISTERED_COPPA', 3, 0, '', 0, '', '', '', 5);
+INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GLOBAL_MODERATORS', 3, 0, '00AA00', 2, '', '', '', 0);
+INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('ADMINISTRATORS', 3, 1, 'AA0000', 1, '', '', '', 0);
+INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('BOTS', 3, 0, '9E8DA7', 0, '', '', '', 5);
+INSERT INTO phpbb_groups (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);
+
+# -- Teampage
+INSERT INTO phpbb_teampage (group_id, teampage_name, teampage_position, teampage_parent) VALUES (5, '', 1, 0);
+INSERT INTO phpbb_teampage (group_id, teampage_name, teampage_position, teampage_parent) VALUES (4, '', 2, 0);
 
 # -- User -> Group
 INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (1, 1, 0, 0);
-- 
cgit v1.2.1


From 18d85bfc118dc5a38867b2132ae9c78f7d18bbbf Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 27 Feb 2013 20:18:41 -0800
Subject: [ticket/11103] Remove padding from notifications for now.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 phpBB/styles/prosilver/theme/common.css             | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index b94eef7aad..f238858b8b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -157,7 +157,7 @@
 										{notifications.AVATAR}
 										<div>
 											<p>{notifications.FORMATTED_TITLE}</p>
-											<p class="notification_time">&raquo; {notifications.TIME}</p>
+											<p>&raquo; {notifications.TIME}</p>
 
 											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
 												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 4f75a8b85b..1684f0f7fc 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -734,10 +734,6 @@ p.rules a {
 	word-wrap: break-word;
 }
 
-.notification_list ul li p.notification_time {
-	padding-top: 8px;
-}
-
 .notification_list ul.topiclist dt {
 	width: 88%;
 }
-- 
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')

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')

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 8a9e1ca3f176946bc7b8ddb9be30ca8607685b80 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 28 Feb 2013 22:56:01 +0100
Subject: [feature/avatars] Auto-clear avatar dimensions when first changing
 avatars

In the remote avatar and gravatar the dimension input boxes will now be
cleared when changing the avatar. This will only happen once per
page-load. Any input after the first change will not trigger this.

PHPBB3-10018
---
 .../prosilver/template/ucp_avatar_options_gravatar.html    | 14 ++++++++++++++
 .../prosilver/template/ucp_avatar_options_remote.html      | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
index 04fd5c459d..692f50cb9a 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
@@ -1,3 +1,17 @@
+<script type="text/javascript">
+// <![CDATA[
+
+onload_functions.push(function() {
+	$('#avatar_gravatar_email').bind('keyup', function () {
+		$('#avatar_gravatar_width').val('');
+		$('#avatar_gravatar_height').val('');
+		$('#avatar_gravatar_email').unbind('keyup');
+	});
+});
+
+// ]]>
+</script>
+
 <dl>
 	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
 	<dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index ab91e90c27..39a8483dc4 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -1,3 +1,17 @@
+<script type="text/javascript">
+// <![CDATA[
+
+onload_functions.push(function() {
+	$('#avatar_remote_url').bind('keyup', function () {
+		$('#avatar_remote_width').val('');
+		$('#avatar_remote_height').val('');
+		$('#avatar_remote_url').unbind('keyup');
+	});
+});
+
+// ]]>
+</script>
+
 <dl>
 	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 	<dd><input type="text" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
-- 
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')

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 db5a05418d251c65ee6cdc1571d4a23c5dd7a7fe Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 28 Feb 2013 17:48:46 -0600
Subject: [ticket/11103] Few more minor language things

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 65a8711733..c8b0686a5b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -290,7 +290,7 @@ $lang = array_merge($lang, array(
 
 	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
 	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
-	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
+	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read.',
 	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
 	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
@@ -301,10 +301,10 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
 	'NOTIFICATION_TYPE_MODERATION_QUEUE'   				=> 'Your topics/posts are approved or disapproved by a moderator',
 	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
-	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic you are subscribed to',
+	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic to which you are subscribed',
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
 	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
-	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum you are subscribed to',
+	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum to which you are subscribed',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
-- 
cgit v1.2.1


From ecb9f44bf11756e1072354bfd658edfd4c01f74a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 28 Feb 2013 17:50:24 -0600
Subject: [ticket/11103] Revert whitespace changes

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index d304c710b3..0b587ac561 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -177,6 +177,8 @@ $('#qr_full_editor').click(function() {
 	});
 });
 
+
+
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
  * callback / data attribute is that it requires filtering - some of the options
-- 
cgit v1.2.1


From b8b2ede35db3d562ca6ed3087ad99933e05c4b67 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 1 Mar 2013 12:45:49 +0100
Subject: [ticket/10411] Remove ajax delete, so the page is refreshed

Otherwise if you delete a group, you can not readd it to the page.

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 47ff792b54..cf1a7be427 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -55,7 +55,7 @@
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{legend.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
+				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -150,7 +150,7 @@
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{teampage.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
+				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
-- 
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')

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')

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')

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/config/migrator.yml            |  1 +
 phpBB/config/services.yml            |  3 +-
 phpBB/includes/db/migrator.php       | 53 ++++++---------------
 phpBB/includes/extension/finder.php  | 91 +++++++++++++++++++++++++++++-------
 phpBB/includes/extension/manager.php | 11 ++++-
 5 files changed, 100 insertions(+), 59 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml
index 999a2d41a3..fc534227f5 100644
--- a/phpBB/config/migrator.yml
+++ b/phpBB/config/migrator.yml
@@ -5,6 +5,7 @@ services:
             - @config
             - @dbal.conn
             - @dbal.tools
+            - @ext.manager
             - %tables.migrations%
             - %core.root_path%
             - %core.php_ext%
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 3e4ae8d129..250e4a782b 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -116,11 +116,12 @@ services:
             - @service_container
             - @dbal.conn
             - @config
-            - @migrator
             - %tables.ext%
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
+        calls:
+            - [set_migrator, [@migrator]]
 
     ext.finder:
         class: phpbb_extension_finder
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')

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/config/migrator.yml           |  3 ++-
 phpBB/includes/db/migrator.php      | 13 +++++++++++--
 phpBB/includes/extension/finder.php |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml
index fc534227f5..42445ef9bf 100644
--- a/phpBB/config/migrator.yml
+++ b/phpBB/config/migrator.yml
@@ -5,12 +5,13 @@ services:
             - @config
             - @dbal.conn
             - @dbal.tools
-            - @ext.manager
             - %tables.migrations%
             - %core.root_path%
             - %core.php_ext%
             - %core.table_prefix%
             - @migrator.tool_collection
+        calls:
+            - [set_extension_manager, [@ext.manager]]
 
     migrator.tool_collection:
         class: phpbb_di_service_collection
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 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')

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 acabe6f5ca5dd1ec467d099b834454e14dd02ac7 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 3 Mar 2013 00:32:31 +0100
Subject: [ticket/6723] Show info that message has been deleted before delivery

If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.

PHPBB3-6723
---
 phpBB/styles/prosilver/template/ucp_pm_history.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_history.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index 9051eb2ee0..0767920c1b 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -24,7 +24,7 @@
 			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
 			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br />
 				{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>
-			<div class="content">{history_row.MESSAGE}</div>
+			<div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div>
 			<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div>
 		</div>
 
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html
index 8754acaaa2..bf20108f7b 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_history.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html
@@ -37,7 +37,7 @@
 					<td valign="top">
 						<table width="100%" cellspacing="0" cellpadding="2">
 						<tr>
-							<td><div class="postbody">{history_row.MESSAGE}</div><div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div></td>
+							<td><div class="postbody"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div><div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div></td>
 						</tr>
 						</table>
 					</td>
-- 
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')

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')

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')

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')

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/config/migrator.yml            |   2 -
 phpBB/config/services.yml            |   3 +-
 phpBB/includes/db/migrator.php       | 188 +++++++++++++++--------------------
 phpBB/includes/extension/manager.php |  32 +++---
 phpBB/install/database_update.php    |   8 +-
 phpBB/install/install_install.php    |  13 ++-
 6 files changed, 119 insertions(+), 127 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml
index 42445ef9bf..999a2d41a3 100644
--- a/phpBB/config/migrator.yml
+++ b/phpBB/config/migrator.yml
@@ -10,8 +10,6 @@ services:
             - %core.php_ext%
             - %core.table_prefix%
             - @migrator.tool_collection
-        calls:
-            - [set_extension_manager, [@ext.manager]]
 
     migrator.tool_collection:
         class: phpbb_di_service_collection
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 250e4a782b..3e4ae8d129 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -116,12 +116,11 @@ services:
             - @service_container
             - @dbal.conn
             - @config
+            - @migrator
             - %tables.ext%
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
-        calls:
-            - [set_migrator, [@migrator]]
 
     ext.finder:
         class: phpbb_extension_finder
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);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4938ef0f87..b84f00659c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -210,7 +210,13 @@ if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
 }
 
 $migrator = $phpbb_container->get('migrator');
-$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
+$extension_manager = $phpbb_container->get('ext.manager');
+$finder = $extension_manager->get_finder();
+
+$migrations = $finder
+	->core_path('includes/db/migration/data/')
+	->get_classes();
+$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);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f0280acc40..4cc154509c 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -114,7 +114,7 @@ class install_install extends module
 				$this->add_bots($mode, $sub);
 				$this->email_admin($mode, $sub);
 				$this->disable_avatars_if_unwritable();
-				$this->populate_migrations($phpbb_container->get('migrator'), $phpbb_root_path);
+				$this->populate_migrations($phpbb_container->get('ext.manager'), $phpbb_container->get('migrator'));
 
 				// Remove the lock file
 				@unlink($phpbb_root_path . 'cache/install_lock');
@@ -1888,12 +1888,17 @@ class install_install extends module
 	* "installs" means it adds all migrations to the migrations table, but does not
 	* perform any of the actions in the migrations.
 	*
+	* @param phpbb_extension_manager $extension_manager
 	* @param phpbb_db_migrator $migrator
-	* @param string $phpbb_root_path
 	*/
-	function populate_migrations($migrator, $phpbb_root_path)
+	function populate_migrations($extension_manager, $migrator)
 	{
-		$migrator->populate_migrations_from_directory($phpbb_root_path . 'includes/db/migration/data/');
+		$finder = $extension_manager->get_finder();
+
+		$migrations = $finder
+			->core_path('includes/db/migration/data/')
+			->get_classes();
+		$migrator->populate_migrations($migrations);
 	}
 
 	/**
-- 
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 ++++++++-
 phpBB/install/database_update.php | 23 ++++++++++++++++++++++-
 phpBB/language/en/migrator.php    |  3 +++
 3 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'phpBB')

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;
 	}
 
 	/**
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4938ef0f87..6c8a95a413 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -228,7 +228,28 @@ while (!$migrator->finished())
 		phpbb_end_update($cache);
 	}
 
-	echo $migrator->last_run_migration['name'] . '<br />';
+	$state = array_merge(array(
+			'migration_schema_done' => false,
+			'migration_data_done'	=> false,
+		),
+		$migrator->last_run_migration['state']
+	);
+
+	if (isset($migrator->last_run_migration['effectively_installed']) && $migrator->last_run_migration['effectively_installed'])
+	{
+		echo $user->lang('MIGRATION_EFFECTIVELY_INSTALLED', $migrator->last_run_migration['name']) . '<br />';
+	}
+	else
+	{
+		if ($state['migration_data_done'])
+		{
+			echo $user->lang('MIGRATION_DATA_DONE', $migrator->last_run_migration['name']) . '<br />';
+		}
+		else if ($state['migration_schema_done'])
+		{
+			echo $user->lang('MIGRATION_SCHEMA_DONE', $migrator->last_run_migration['name']) . '<br />';
+		}
+	}
 
 	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
 	if ((time() - $update_start_time) >= $safe_time_limit)
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 84074c391c..a62da483cf 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -40,8 +40,11 @@ $lang = array_merge($lang, array(
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
 
+	'MIGRATION_DATA_DONE'				=> 'Installed Data: %s',
+	'MIGRATION_EFFECTIVELY_INSTALLED'	=> 'Migration already effectively installed (skipped): %s',
 	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
+	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %s',
 
 	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
 	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
-- 
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')

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')

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')

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 7423d48757bec0a81c8d439e911ed32d5af3a775 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 4 Mar 2013 11:25:27 +0100
Subject: [ticket/10714] Get log from container in install, update and
 download/file

PHPBB3-10714
---
 phpBB/download/file.php           | 1 +
 phpBB/install/database_update.php | 1 +
 phpBB/install/install_install.php | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 4a392b002d..855813d0d2 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -67,6 +67,7 @@ if (isset($_GET['avatar']))
 	$phpbb_dispatcher = $phpbb_container->get('dispatcher');
 	$request	= $phpbb_container->get('request');
 	$db			= $phpbb_container->get('dbal.conn');
+	$phpbb_log	= $phpbb_container->get('log');
 
 	// Connect to DB
 	if (!@$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false))
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4938ef0f87..23048df9fa 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -123,6 +123,7 @@ $request	= $phpbb_container->get('request');
 $user		= $phpbb_container->get('user');
 $auth		= $phpbb_container->get('auth');
 $db			= $phpbb_container->get('dbal.conn');
+$phpbb_log	= $phpbb_container->get('log');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f0280acc40..d95a500929 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -53,7 +53,7 @@ class install_install extends module
 	function main($mode, $sub)
 	{
 		global $lang, $template, $language, $phpbb_root_path, $phpEx;
-		global $phpbb_container, $cache;
+		global $phpbb_container, $cache, $phpbb_log;
 
 		switch ($sub)
 		{
@@ -105,8 +105,9 @@ class install_install extends module
 				// Create a normal container now
 				$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
-				// Sets the global $cache variable
+				// Sets the global variables
 				$cache = $phpbb_container->get('cache');
+				$phpbb_log = $phpbb_container->get('log');
 
 				$this->build_search_index($mode, $sub);
 				$this->add_modules($mode, $sub);
-- 
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')

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 +++---
 phpBB/language/en/migrator.php                  | 4 ----
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'phpBB')

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 . '
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 84074c391c..59e6f06884 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -35,7 +35,6 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
-	'CONFIG_ALREADY_EXIST'				=> 'The config setting "%s" unexpectedly already exists.',
 	'CONFIG_NOT_EXIST'					=> 'The config setting "%s" unexpectedly does not exist.',
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
@@ -43,13 +42,10 @@ $lang = array_merge($lang, array(
 	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
 
-	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
 	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
 	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
-	'MODULE_NOT_REMOVABLE'				=> 'Module %1$s was unable to be removed: %2$s',
 
-	'PERMISSION_ALREADY_EXIST'			=> 'The permission setting "%s" unexpectedly already exists.',
 	'PERMISSION_NOT_EXIST'				=> 'The permission setting "%s" unexpectedly does not exist.',
 
 	'ROLE_NOT_EXIST'					=> 'The permission role "%s" unexpectedly does not exist.',
-- 
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')

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 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')

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 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')

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