18 files changed, 139 insertions, 60 deletions
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 986aa24b1b..5141acd9fc 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -21,12 +21,12 @@
 		<!-- IF META_DESCRIPTION -->
 		<dl>
 			<dt><label>{L_DESCRIPTION}{L_COLON}</label></dt>
-			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
+			<dd><span id="meta_description">{META_DESCRIPTION}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_VERSION}{L_COLON}</label></dt>
-			<dd><p id="meta_version">{META_VERSION}</p></dd>
+			<dd><span id="meta_version">{META_VERSION}</span></dd>
 		</dl>
 		<!-- IF META_HOMEPAGE -->
 		<dl>
@@ -37,12 +37,12 @@
 		<!-- IF META_TIME -->
 		<dl>
 			<dt><label>{L_TIME}{L_COLON}</label></dt>
-			<dd><p id="meta_time">{META_TIME}</p></dd>
+			<dd><span id="meta_time">{META_TIME}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_LICENCE}{L_COLON}</label></dt>
-			<dd><p id="meta_license">{META_LICENCE}</p></dd>
+			<dd><span id="meta_license">{META_LICENCE}</span></dd>
 		</dl>
 	</fieldset>
 
@@ -52,13 +52,13 @@
 		<!-- IF META_REQUIRE_PHPBB -->
 		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHPBB_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
+			<dd><span id="require_phpbb">{META_REQUIRE_PHPBB}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_REQUIRE_PHP -->
 		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHP_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
+			<dd><span id="require_php">{META_REQUIRE_PHP}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index c5356e7b9d..822ab76313 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -11,6 +11,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" 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>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 57a47cbf84..97be92933e 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -160,6 +160,14 @@ memberlist_body_username_prepend
 * Purpose: Add information before every username in the memberlist. Works in
 all display modes (leader, group and normal memberlist).
 
+memberlist_view_content_append
+===
+* Locations:
+    + styles/prosilver/template/memberlist_view.html
+    + styles/subsilver2/template/memberlist_view.html
+* Since: 3.1.0-b2
+* Purpose: Add custom content to the user profile view after the main content
+
 memberlist_view_user_statistics_after
 ===
 * Locations:
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c944f5f96f..3e03efd4d7 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -37,7 +37,6 @@ class acp_users
 
 		$user->add_lang(array('posting', 'ucp', 'acp/users'));
 		$this->tpl_name = 'acp_users';
-		$this->page_title = 'ACP_USER_' . strtoupper($mode);
 
 		$error		= array();
 		$username	= utf8_normalize_nfc(request_var('username', '', true));
@@ -159,6 +158,8 @@ class acp_users
 			trigger_error($user->lang['NOT_MANAGE_FOUNDER'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
+		$this->page_title = $user_row['username'] . ' :: ' . $user->lang('ACP_USER_' . strtoupper($mode));
+
 		switch ($mode)
 		{
 			case 'overview':
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index deb304b838..476535ae5b 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -581,3 +581,22 @@ function phpbb_ignore_new_file_on_update($phpbb_root_path, $file)
 
 	return $ignore_new_file;
 }
+
+/**
+* Check whether phpBB is installed.
+*
+* @param string $phpbb_root_path	Path to the phpBB board root.
+* @param string $php_ext			PHP file extension.
+*
+* @return bool Returns true if phpBB is installed.
+*/
+function phpbb_check_installation_exists($phpbb_root_path, $php_ext)
+{
+	// Try opening config file
+	if (file_exists($phpbb_root_path . 'config.' . $php_ext))
+	{
+		include($phpbb_root_path . 'config.' . $php_ext);
+	}
+
+	return defined('PHPBB_INSTALLED');
+}
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 2e09e95ea7..b18a9dce1b 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -252,8 +252,10 @@ $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_p
 $paths = array_filter($paths, 'is_dir');
 $template->set_custom_style('adm', $paths);
 
-$template->assign_var('T_ASSETS_PATH', '../assets');
-$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
+$path = array_shift($paths);
+
+$template->assign_var('T_ASSETS_PATH', $path . '/../../assets');
+$template->assign_var('T_TEMPLATE_PATH', $path);
 
 $install = new module();
 
@@ -397,7 +399,7 @@ class module
 		}
 
 		define('HEADER_INC', true);
-		global $template, $lang, $stage, $phpbb_root_path, $phpbb_admin_path;
+		global $template, $lang, $stage, $phpbb_admin_path, $path;
 
 		$template->assign_vars(array(
 			'L_CHANGE'				=> $lang['CHANGE'],
@@ -407,7 +409,7 @@ class module
 			'L_SKIP'				=> $lang['SKIP'],
 			'PAGE_TITLE'			=> $this->get_page_title(),
 			'T_IMAGE_PATH'			=> htmlspecialchars($phpbb_admin_path) . 'images/',
-			'T_JQUERY_LINK'			=> $phpbb_root_path . 'assets/javascript/jquery.js',
+			'T_JQUERY_LINK'			=> $path . '/../../assets/javascript/jquery.js',
 
 			'S_CONTENT_DIRECTION' 	=> $lang['DIRECTION'],
 			'S_CONTENT_FLOW_BEGIN'	=> ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 1c7e2dca76..a837e9d52a 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -79,6 +79,21 @@ class convert
 */
 class install_convert extends module
 {
+	/** @var array */
+	protected $lang;
+
+	/** @var string */
+	protected $language;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $php_ext;
+
 	/**
 	* Variables used while converting, they are accessible from the global variable $convert
 	*/
@@ -94,6 +109,16 @@ class install_convert extends module
 
 		$this->tpl_name = 'install_convert';
 		$this->mode = $mode;
+		$this->lang = $lang;
+		$this->language = $language;
+		$this->template = $template;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
+
+		if (!$this->check_phpbb_installed())
+		{
+			return;
+		}
 
 		$convert = new convert($this->p_master);
 
@@ -108,25 +133,6 @@ class install_convert extends module
 		switch ($sub)
 		{
 			case 'intro':
-				// Try opening config file
-				// @todo If phpBB is not installed, we need to do a cut-down installation here
-				// For now, we redirect to the installation script instead
-				if (@file_exists($phpbb_root_path . 'config.' . $phpEx))
-				{
-					include($phpbb_root_path . 'config.' . $phpEx);
-				}
-
-				if (!defined('PHPBB_INSTALLED'))
-				{
-					$template->assign_vars(array(
-						'S_NOT_INSTALLED'		=> true,
-						'TITLE'					=> $lang['BOARD_NOT_INSTALLED'],
-						'BODY'					=> sprintf($lang['BOARD_NOT_INSTALLED_EXPLAIN'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=install&amp;language=' . $language)),
-					));
-
-					return;
-				}
-
 				require($phpbb_root_path . 'config.' . $phpEx);
 				require($phpbb_root_path . 'includes/constants.' . $phpEx);
 				require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@@ -259,6 +265,30 @@ class install_convert extends module
 	}
 
 	/**
+	* Check whether phpBB is installed.
+	* Assigns error template vars if not installed.
+	*
+	* @return bool Returns true if phpBB is installed.
+	*/
+	public function check_phpbb_installed()
+	{
+		if (phpbb_check_installation_exists($this->phpbb_root_path, $this->php_ext))
+		{
+			return true;
+		}
+
+		$this->page_title = 'BOARD_NOT_INSTALLED';
+		$install_url = append_sid($this->phpbb_root_path . 'install/index.' . $this->php_ext, 'mode=install&amp;language=' . $this->language);
+
+		$this->template->assign_vars(array(
+			'S_NOT_INSTALLED'		=> true,
+			'BODY'					=> sprintf($this->lang['BOARD_NOT_INSTALLED_EXPLAIN'], $install_url),
+		));
+
+		return false;
+	}
+
+	/**
 	* Generate a list of all available conversion modules
 	*/
 	function list_convertors($sub)
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index a2d44f2b6c..72e6f6affa 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -18,14 +18,9 @@ if (!defined('IN_INSTALL'))
 if (!empty($setmodules))
 {
 	// If phpBB is already installed we do not include this module
-	if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock'))
+	if (phpbb_check_installation_exists($phpbb_root_path, $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock'))
 	{
-		include_once($phpbb_root_path . 'config.' . $phpEx);
-
-		if (defined('PHPBB_INSTALLED'))
-		{
-			return;
-		}
+		return;
 	}
 
 	$module[] = array(
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 5891efb375..cdfb7ecb06 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -19,16 +19,7 @@ if (!defined('IN_INSTALL'))
 if (!empty($setmodules))
 {
 	// If phpBB is not installed we do not include this module
-	if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !@file_exists($phpbb_root_path . 'cache/install_lock'))
-	{
-		include_once($phpbb_root_path . 'config.' . $phpEx);
-
-		if (!defined('PHPBB_INSTALLED'))
-		{
-			return;
-		}
-	}
-	else
+	if (!phpbb_check_installation_exists($phpbb_root_path, $phpEx) || file_exists($phpbb_root_path . 'cache/install_lock'))
 	{
 		return;
 	}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 360d6be1e0..fba78d34aa 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -210,8 +210,6 @@ $lang = array_merge($lang, array(
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
-	'ERR_TEMPLATE_EVENT_LOCATION'		=> 'The specified template event location <em>[%s]</em> is improperly formatted.',
-	'ERR_TEMPLATE_COMPILATION'		=> 'The file could not be compiled: %s',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occurred while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occurred while trying to subscribe.',
diff --git a/phpBB/language/en/mods/index.htm b/phpBB/language/en/mods/index.htm
deleted file mode 100644
index e69de29bb2..0000000000
--- a/phpBB/language/en/mods/index.htm
+++ /dev/null
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 24a7bebeba..3fc89ba01b 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -252,6 +252,23 @@ if (!$user_id && $username == '')
 	$module->set_display('warn', 'warn_user', false);
 }
 
+/**
+* This event allows you to set display option for custom MCP modules
+*
+* @event core.modify_mcp_modules_display_option
+* @var	p_master	module			Module system class
+* @var	string		mode			MCP mode
+* @var	int			user_id			User id
+* @var	int			forum_id		Forum id
+* @var	int			topic_id		Topic id
+* @var	int			post_id			Post id
+* @var	string		username		User name
+* @var	int			id				Parent module id
+* @since 3.1.0-b2
+*/
+$vars = array('module', 'mode', 'user_id', 'forum_id', 'topic_id', 'post_id', 'username', 'id');
+extract($phpbb_dispatcher->trigger_event('core.modify_mcp_modules_display_option', compact($vars)));
+
 // Load and execute the relevant module
 $module->load_active();
 
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index 0738cbdafd..78e219a61f 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -65,7 +65,7 @@ abstract class type_string_common extends type_base
 		{
 			return $this->user->lang('FIELD_TOO_SHORT', (int) $field_data['field_minlen'], $this->get_field_name($field_data['lang_name']));
 		}
-		else if ($field_data['field_maxlen'] && utf8_strlen($field_value) > $field_data['field_maxlen'])
+		else if ($field_data['field_maxlen'] && utf8_strlen(html_entity_decode($field_value)) > $field_data['field_maxlen'])
 		{
 			return $this->user->lang('FIELD_TOO_LONG', (int) $field_data['field_maxlen'], $this->get_field_name($field_data['lang_name']));
 		}
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index 2a7cc602da..6c060e21ea 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -204,6 +204,19 @@ class user extends \phpbb\session
 		$this->style = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
 
+		// Fallback to user's standard style
+		if (!$this->style && $style_id != $this->data['user_style'])
+		{
+			$style_id = $this->data['user_style'];
+
+			$sql = 'SELECT *
+				FROM ' . STYLES_TABLE . " s
+				WHERE s.style_id = $style_id";
+			$result = $db->sql_query($sql, 3600);
+			$this->style = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+		}
+
 		// User has wrong style
 		if (!$this->style && $style_id == $this->data['user_style'])
 		{
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 442e1d9782..aee9ba50af 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1213,17 +1213,11 @@ if ($submit || $preview || $refresh)
 				meta_refresh(10, $redirect_url);
 				$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
 				$message .= (($user->data['user_id'] == ANONYMOUS) ? '' : ' '. $user->lang['POST_APPROVAL_NOTIFY']);
+				$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>');
+				trigger_error($message);
 			}
-			else
-			{
-				meta_refresh(3, $redirect_url);
 
-				$message = ($mode == 'edit') ? 'POST_EDITED' : 'POST_STORED';
-				$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $redirect_url . '">', '</a>');
-			}
-
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>');
-			trigger_error($message);
+			redirect($redirect_url);
 		}
 	}
 }
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 6dc8293551..ecbde97b80 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -119,6 +119,8 @@
 
 </form>
 
+<!-- EVENT memberlist_view_content_append -->
+
 <!-- INCLUDE jumpbox.html -->
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 28f4da4fef..d4547d822d 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -178,6 +178,8 @@
 
 	</form>
 
+	<!-- EVENT memberlist_view_content_append -->
+
 </div>
 
 <br clear="all" />
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 596272636a..61a28940b1 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1564,13 +1564,19 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	$edit_allowed = ($user->data['is_registered'] && ($auth->acl_get('m_edit', $forum_id) || (
 		$user->data['user_id'] == $poster_id &&
 		$auth->acl_get('f_edit', $forum_id) &&
+		$topic_data['topic_status'] != ITEM_LOCKED &&
 		!$row['post_edit_locked'] &&
 		($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])
 	)));
 
+	$quote_allowed = $auth->acl_get('m_edit', $forum_id) || ($topic_data['topic_status'] != ITEM_LOCKED &&
+		($user->data['user_id'] == ANONYMOUS || $auth->acl_get('f_reply', $forum_id))
+	);
+
 	$delete_allowed = ($user->data['is_registered'] && (($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('m_softdelete', $forum_id) && $row['post_visibility'] != ITEM_DELETED)) || (
 		$user->data['user_id'] == $poster_id &&
 		($auth->acl_get('f_delete', $forum_id) || ($auth->acl_get('f_softdelete', $forum_id) && $row['post_visibility'] != ITEM_DELETED)) &&
+		$topic_data['topic_status'] != ITEM_LOCKED &&
 		$topic_data['topic_last_post_id'] == $row['post_id'] &&
 		($row['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time']) &&
 		// we do not want to allow removal of the last post if a moderator locked it!
@@ -1611,7 +1617,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'S_ONLINE'				=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
 
 		'U_EDIT'			=> ($edit_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
-		'U_QUOTE'			=> ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
+		'U_QUOTE'			=> ($quote_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
 		'U_INFO'			=> ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=post_details&amp;f=$forum_id&amp;p=" . $row['post_id'], true, $user->session_id) : '',
 		'U_DELETE'			=> ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '',