12 files changed, 100 insertions, 40 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index dca39df38c..575ac84012 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -108,11 +108,12 @@ class acp_bbcodes
 					'DISPLAY_ON_POSTING'	=> $display_on_posting)
 				);
 
-				foreach ($user->lang['tokens'] as $token => $token_explain)
+				$bbcode_tokens = array('TEXT', 'SIMPLETEXT', 'INTTEXT', 'IDENTIFIER', 'NUMBER', 'EMAIL', 'URL', 'LOCAL_URL', 'RELATIVE_URL', 'COLOR');
+				foreach ($bbcode_tokens as $token)
 				{
 					$template->assign_block_vars('token', array(
 						'TOKEN'		=> '{' . $token . '}',
-						'EXPLAIN'	=> ($token === 'LOCAL_URL') ? sprintf($token_explain, generate_board_url() . '/') : $token_explain,
+						'EXPLAIN'	=> ($token === 'LOCAL_URL') ? $user->lang(array('tokens', $token), generate_board_url() . '/') : $user->lang(array('tokens', $token)),
 					));
 				}
 
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 86879de816..8afc3709b9 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -1607,16 +1607,17 @@ class mssql_extractor extends base_extractor
 			return;
 		}
 
-		$sql = "SELECT * FROM $table_name";
-		$result_fields = $db->sql_query_limit($sql, 1);
-
-		$row = new result_mssqlnative($result_fields);
-		$i_num_fields = $row->num_fields();
+		$sql = "SELECT COLUMN_NAME, DATA_TYPE
+			FROM INFORMATION_SCHEMA.COLUMNS
+			WHERE INFORMATION_SCHEMA.COLUMNS.TABLE_NAME = '" . $db->sql_escape($table_name) . "'";
+		$result_fields = $db->sql_query($sql);
 
-		for ($i = 0; $i < $i_num_fields; $i++)
+		$i_num_fields = 0;
+		while ($row = $db->sql_fetchrow($result_fields))
 		{
-			$ary_type[$i] = $row->field_type($i);
-			$ary_name[$i] = $row->field_name($i);
+			$ary_type[$i_num_fields] = $row['DATA_TYPE'];
+			$ary_name[$i_num_fields] = $row['COLUMN_NAME'];
+			$i_num_fields++;
 		}
 		$db->sql_freeresult($result_fields);
 
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index b41f4d4e81..c21c9f4e9d 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -55,6 +55,11 @@ class acp_extensions
 			$ext_name = '';
 		}
 
+		if (in_array($action, array('enable', 'disable', 'delete_data')) && !check_link_hash($request->variable('hash', ''), $action . '.' . $ext_name))
+		{
+			trigger_error('FORM_INVALID', E_USER_WARNING);
+		}
+
 		// If they've specified an extension, let's load the metadata manager and validate it.
 		if ($ext_name)
 		{
@@ -66,7 +71,7 @@ class acp_extensions
 			}
 			catch(\phpbb\extension\exception $e)
 			{
-				trigger_error($e);
+				trigger_error($e, E_USER_WARNING);
 			}
 		}
 
@@ -96,8 +101,9 @@ class acp_extensions
 				$this->tpl_name = 'acp_ext_enable';
 
 				$template->assign_vars(array(
-					'PRE'		=> true,
-					'U_ENABLE'	=> $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name),
+					'PRE'				=> true,
+					'L_CONFIRM_MESSAGE'	=> $this->user->lang('EXTENSION_ENABLE_CONFIRM', $md_manager->get_metadata('display-name')),
+					'U_ENABLE'			=> $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('enable.' . $ext_name),
 				));
 			break;
 
@@ -116,7 +122,7 @@ class acp_extensions
 						{
 							$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) . '&amp;hash=' . generate_link_hash('enable.' . $ext_name));
 						}
 					}
 				}
@@ -128,7 +134,7 @@ class acp_extensions
 				$this->tpl_name = 'acp_ext_enable';
 
 				$template->assign_vars(array(
-					'U_RETURN'	=> $this->u_action . '&amp;action=list',
+					'U_RETURN'		=> $this->u_action . '&amp;action=list',
 				));
 			break;
 
@@ -141,8 +147,9 @@ class acp_extensions
 				$this->tpl_name = 'acp_ext_disable';
 
 				$template->assign_vars(array(
-					'PRE'		=> true,
-					'U_DISABLE'	=> $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name),
+					'PRE'				=> true,
+					'L_CONFIRM_MESSAGE'	=> $this->user->lang('EXTENSION_DISABLE_CONFIRM', $md_manager->get_metadata('display-name')),
+					'U_DISABLE'			=> $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('disable.' . $ext_name),
 				));
 			break;
 
@@ -154,7 +161,7 @@ class acp_extensions
 					{
 						$template->assign_var('S_NEXT_STEP', true);
 
-						meta_refresh(0, $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name));
+						meta_refresh(0, $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('disable.' . $ext_name));
 					}
 				}
 
@@ -165,16 +172,21 @@ class acp_extensions
 				));
 			break;
 
-			case 'purge_pre':
-				$this->tpl_name = 'acp_ext_purge';
+			case 'delete_data_pre':
+				if ($phpbb_extension_manager->enabled($ext_name))
+				{
+					redirect($this->u_action);
+				}
+				$this->tpl_name = 'acp_ext_delete_data';
 
 				$template->assign_vars(array(
-					'PRE'		=> true,
-					'U_PURGE'	=> $this->u_action . '&amp;action=purge&amp;ext_name=' . urlencode($ext_name),
+					'PRE'				=> true,
+					'L_CONFIRM_MESSAGE'	=> $this->user->lang('EXTENSION_DELETE_DATA_CONFIRM', $md_manager->get_metadata('display-name')),
+					'U_PURGE'			=> $this->u_action . '&amp;action=delete_data&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('delete_data.' . $ext_name),
 				));
 			break;
 
-			case 'purge':
+			case 'delete_data':
 				try
 				{
 					while ($phpbb_extension_manager->purge_step($ext_name))
@@ -184,7 +196,7 @@ class acp_extensions
 						{
 							$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=delete_data&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('delete_data.' . $ext_name));
 						}
 					}
 				}
@@ -193,7 +205,7 @@ class acp_extensions
 					$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));
 				}
 
-				$this->tpl_name = 'acp_ext_purge';
+				$this->tpl_name = 'acp_ext_delete_data';
 
 				$template->assign_vars(array(
 					'U_RETURN'	=> $this->u_action . '&amp;action=list',
@@ -233,7 +245,6 @@ class acp_extensions
 
 				$this->output_actions('enabled', array(
 					'DISABLE'		=> $this->u_action . '&amp;action=disable_pre&amp;ext_name=' . urlencode($name),
-					'PURGE'			=> $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name),
 				));
 			}
 			catch(\phpbb\extension\exception $e)
@@ -267,7 +278,7 @@ class acp_extensions
 
 				$this->output_actions('disabled', array(
 					'ENABLE'		=> $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
-					'PURGE'			=> $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name),
+					'DELETE_DATA'	=> $this->u_action . '&amp;action=delete_data_pre&amp;ext_name=' . urlencode($name),
 				));
 			}
 			catch(\phpbb\extension\exception $e)
@@ -325,8 +336,9 @@ class acp_extensions
 		foreach ($actions as $lang => $url)
 		{
 			$this->template->assign_block_vars($block . '.actions', array(
-				'L_ACTION'		=> $this->user->lang($lang),
-				'U_ACTION'		=> $url,
+				'L_ACTION'			=> $this->user->lang('EXTENSION_' . $lang),
+				'L_ACTION_EXPLAIN'	=> (isset($this->user->lang['EXTENSION_' . $lang . '_EXPLAIN'])) ? $this->user->lang('EXTENSION_' . $lang . '_EXPLAIN') : '',
+				'U_ACTION'			=> $url,
 			));
 		}
 	}
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index ad29a5521b..c170c67d49 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -324,7 +324,7 @@ class acp_groups
 					$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);
+					$avatar_data = \phpbb\avatar\manager::clean_row($group_row, 'group');
 				}
 
 
@@ -657,7 +657,6 @@ class acp_groups
 					'GROUP_HIDDEN'		=> $type_hidden,
 
 					'U_BACK'			=> $u_back,
-					'U_SWATCH'			=> append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=settings&amp;name=group_colour'),
 					'U_ACTION'			=> "{$this->u_action}&amp;action=$action&amp;g=$group_id",
 					'L_AVATAR_EXPLAIN'	=> phpbb_avatar_explanation_string(),
 				));
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c476b06c75..fbc1cc1f14 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1742,7 +1742,7 @@ class acp_users
 					$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);
+					$avatar_data = \phpbb\avatar\manager::clean_row($user_row, 'user');
 
 					if ($submit)
 					{
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index e1da41d106..855b6ff187 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.1.0-a2-dev');
+define('PHPBB_VERSION', '3.1.0-a3-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 041c971a87..3a915de82b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1472,7 +1472,6 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			$sql = 'SELECT forum_id
 				FROM ' . FORUMS_TRACK_TABLE . "
 				WHERE user_id = {$user->data['user_id']}
-					AND mark_time < $post_time
 					AND " . $db->sql_in_set('forum_id', $forum_id);
 			$result = $db->sql_query($sql);
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index c6ab5df90f..f03e4c01d0 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1352,7 +1352,7 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 */
 function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
 {
-	$row = \phpbb\avatar\manager::clean_row($user_row);
+	$row = \phpbb\avatar\manager::clean_row($user_row, 'user');
 	return phpbb_get_avatar($row, $alt, $ignore_config);
 }
 
@@ -1367,7 +1367,7 @@ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config =
 */
 function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
 {
-	$row = \phpbb\avatar\manager::clean_row($user_row);
+	$row = \phpbb\avatar\manager::clean_row($user_row, 'group');
 	return phpbb_get_avatar($row, $alt, $ignore_config);
 }
 
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 1be6e49471..deb304b838 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -533,3 +533,51 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test
 
 	return $config_data;
 }
+
+/**
+* Check whether a file should be ignored on update
+*
+* We ignore new files in some circumstances:
+* 1. The file is a language file, but the language is not installed
+* 2. The file is a style file, but the style is not installed
+* 3. The file is a style language file, but the language is not installed
+*
+* @param	string	$phpbb_root_path	phpBB root path
+* @param	string	$file				File including path from phpbb root
+* @return	bool		Should we ignore the new file or add it to the board?
+*/
+function phpbb_ignore_new_file_on_update($phpbb_root_path, $file)
+{
+	$ignore_new_file = false;
+
+	// We ignore new files in some circumstances:
+	// 1. The file is a language file, but the language is not installed
+	if (!$ignore_new_file && strpos($file, 'language/') === 0)
+	{
+		list($language_dir, $language_iso) = explode('/', $file);
+		$ignore_new_file = !file_exists($phpbb_root_path . $language_dir . '/' . $language_iso);
+	}
+
+	// 2. The file is a style file, but the style is not installed
+	if (!$ignore_new_file && strpos($file, 'styles/') === 0)
+	{
+		list($styles_dir, $style_name) = explode('/', $file);
+		$ignore_new_file = !file_exists($phpbb_root_path . $styles_dir . '/' . $style_name);
+	}
+
+	// 3. The file is a style language file, but the language is not installed
+	if (!$ignore_new_file && strpos($file, 'styles/') === 0)
+	{
+		$dirs = explode('/', $file);
+		if (sizeof($dirs) >= 5)
+		{
+			list($styles_dir, $style_name, $template_component, $language_iso) = explode('/', $file);
+			if ($template_component == 'theme' && $language_iso !== 'images')
+			{
+				$ignore_new_file = !file_exists($phpbb_root_path . 'language/' . $language_iso);
+			}
+		}
+	}
+
+	return $ignore_new_file;
+}
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index a75d2e9bfc..716289eded 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -465,7 +465,7 @@ class ucp_groups
 							$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);
+							$avatar_data = \phpbb\avatar\manager::clean_row($group_row, 'group');
 						}
 
 						// Did we submit?
@@ -699,7 +699,6 @@ class ucp_groups
 							'GROUP_CLOSED'		=> $type_closed,
 							'GROUP_HIDDEN'		=> $type_hidden,
 
-							'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/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 5a896c31b0..63dbe79666 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -27,7 +27,8 @@ class ucp_notifications
 		add_form_key('ucp_notification');
 
 		$start = $request->variable('start', 0);
-		$form_time = min($request->variable('form_time', 0), time());
+		$form_time = $request->variable('form_time', 0);
+		$form_time = ($form_time <= 0 || $form_time > time()) ? time() : $form_time;
 
 		$phpbb_notifications = $phpbb_container->get('notification_manager');
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 3f58ce20b4..f7c6aca9e8 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -567,7 +567,7 @@ class ucp_profile
 					$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);
+					$avatar_data = \phpbb\avatar\manager::clean_row($user->data, 'user');
 
 					if ($submit)
 					{