1 files changed, 276 insertions, 142 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 8122b87e4b..df25451266 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -20,6 +24,7 @@ if (!defined('IN_PHPBB'))
 * make_jumpbox()
 * bump_topic_allowed()
 * get_context()
+* phpbb_clean_search_string()
 * decode_message()
 * strip_bbcode()
 * generate_text_for_display()
@@ -73,7 +78,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
 	foreach ($sorts as $name => $sort_ary)
 	{
 		$key = $sort_ary['key'];
-		$selected = $$sort_ary['key'];
+		$selected = ${$sort_ary['key']};
 
 		// Check if the key is selectable. If not, we reset to the default or first key found.
 		// This ensures the values are always valid. We also set $sort_dir/sort_key/etc. to the
@@ -82,12 +87,12 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
 		{
 			if ($sort_ary['default'] !== false)
 			{
-				$selected = $$key = $sort_ary['default'];
+				$selected = ${$key} = $sort_ary['default'];
 			}
 			else
 			{
 				@reset($sort_ary['options']);
-				$selected = $$key = key($sort_ary['options']);
+				$selected = ${$key} = key($sort_ary['options']);
 			}
 		}
 
@@ -109,7 +114,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
 */
 function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false)
 {
-	global $config, $auth, $template, $user, $db;
+	global $config, $auth, $template, $user, $db, $phpbb_path_helper;
 
 	// We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality)
 	if (!$config['load_jumpbox'] && $force_display === false)
@@ -169,8 +174,9 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
 			$template->assign_block_vars('jumpbox_forums', array(
 				'FORUM_ID'		=> ($select_all) ? 0 : -1,
 				'FORUM_NAME'	=> ($select_all) ? $user->lang['ALL_FORUMS'] : $user->lang['SELECT_FORUM'],
-				'S_FORUM_COUNT'	=> $iteration)
-			);
+				'S_FORUM_COUNT'	=> $iteration,
+				'LINK'			=> $phpbb_path_helper->append_url_params($action, array('f' => $forum_id)),
+			));
 
 			$iteration++;
 			$display_jumpbox = true;
@@ -183,8 +189,9 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
 			'S_FORUM_COUNT'	=> $iteration,
 			'S_IS_CAT'		=> ($row['forum_type'] == FORUM_CAT) ? true : false,
 			'S_IS_LINK'		=> ($row['forum_type'] == FORUM_LINK) ? true : false,
-			'S_IS_POST'		=> ($row['forum_type'] == FORUM_POST) ? true : false)
-		);
+			'S_IS_POST'		=> ($row['forum_type'] == FORUM_POST) ? true : false,
+			'LINK'			=> $phpbb_path_helper->append_url_params($action, array('f' => $row['forum_id'])),
+		));
 
 		for ($i = 0; $i < $padding; $i++)
 		{
@@ -195,10 +202,13 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
 	$db->sql_freeresult($result);
 	unset($padding_store);
 
+	$url_parts = $phpbb_path_helper->get_url_parts($action);
+
 	$template->assign_vars(array(
-		'S_DISPLAY_JUMPBOX'	=> $display_jumpbox,
-		'S_JUMPBOX_ACTION'	=> $action)
-	);
+		'S_DISPLAY_JUMPBOX'			=> $display_jumpbox,
+		'S_JUMPBOX_ACTION'			=> $action,
+		'HIDDEN_FIELDS_FOR_JUMPBOX'	=> build_hidden_fields($url_parts['params']),
+	));
 
 	return;
 }
@@ -360,48 +370,87 @@ function get_context($text, $words, $length = 400)
 }
 
 /**
+* Cleans a search string by removing single wildcards from it and replacing multiple spaces with a single one.
+*
+* @param string $search_string The full search string which should be cleaned.
+*
+* @return string The cleaned search string without any wildcards and multiple spaces.
+*/
+function phpbb_clean_search_string($search_string)
+{
+	// This regular expressions matches every single wildcard.
+	// That means one after a whitespace or the beginning of the string or one before a whitespace or the end of the string.
+	$search_string = preg_replace('#(?<=^|\s)\*+(?=\s|$)#', '', $search_string);
+	$search_string = trim($search_string);
+	$search_string = preg_replace(array('#\s+#u', '#\*+#u'), array(' ', '*'), $search_string);
+	return $search_string;
+}
+
+/**
 * Decode text whereby text is coming from the db and expected to be pre-parsed content
 * We are placing this outside of the message parser because we are often in need of it...
+*
+* NOTE: special chars are kept encoded
+*
+* @param string &$message Original message, passed by reference
+* @param string $bbcode_uid BBCode UID
+* @return null
 */
 function decode_message(&$message, $bbcode_uid = '')
 {
-	global $config;
+	global $phpbb_container;
 
-	if ($bbcode_uid)
+	if (preg_match('#^<[rt][ >]#', $message))
 	{
-		$match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
-		$replace = array("\n", '', '', '', '');
+		$message = htmlspecialchars($phpbb_container->get('text_formatter.utils')->unparse($message), ENT_COMPAT);
 	}
 	else
 	{
-		$match = array('<br />');
-		$replace = array("\n");
-	}
+		if ($bbcode_uid)
+		{
+			$match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
+			$replace = array("\n", '', '', '', '');
+		}
+		else
+		{
+			$match = array('<br />');
+			$replace = array("\n");
+		}
 
-	$message = str_replace($match, $replace, $message);
+		$message = str_replace($match, $replace, $message);
 
-	$match = get_preg_expression('bbcode_htm');
-	$replace = array('\1', '\1', '\2', '\1', '', '');
+		$match = get_preg_expression('bbcode_htm');
+		$replace = array('\1', '\1', '\3', '\1', '', '');
 
-	$message = preg_replace($match, $replace, $message);
+		$message = preg_replace($match, $replace, $message);
+	}
 }
 
 /**
-* Strips all bbcode from a text and returns the plain content
+* Strips all bbcode from a text in place
 */
 function strip_bbcode(&$text, $uid = '')
 {
-	if (!$uid)
+	global $phpbb_container;
+
+	if (preg_match('#^<[rt][ >]#', $text))
 	{
-		$uid = '[0-9a-z]{5,}';
+		$text = $phpbb_container->get('text_formatter.utils')->clean_formatting($text);
 	}
+	else
+	{
+		if (!$uid)
+		{
+			$uid = '[0-9a-z]{5,}';
+		}
 
-	$text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:&quot;.*&quot;|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text);
+		$text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:&quot;.*&quot;|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text);
 
-	$match = get_preg_expression('bbcode_htm');
-	$replace = array('\1', '\1', '\2', '\1', '', '');
+		$match = get_preg_expression('bbcode_htm');
+		$replace = array('\1', '\1', '\2', '\1', '', '');
 
-	$text = preg_replace($match, $replace, $text);
+		$text = preg_replace($match, $replace, $text);
+	}
 }
 
 /**
@@ -411,7 +460,7 @@ function strip_bbcode(&$text, $uid = '')
 function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text = true)
 {
 	static $bbcode;
-	global $phpbb_dispatcher;
+	global $phpbb_dispatcher, $phpbb_container;
 
 	if ($text === '')
 	{
@@ -427,39 +476,61 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
 	* @var string	bitfield		The BBCode Bitfield
 	* @var int		flags			The BBCode Flags
 	* @var bool		censor_text		Whether or not to apply word censors
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'bitfield', 'flags', 'censor_text');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_display_before', compact($vars)));
 
-	if ($censor_text)
-	{		
-		$text = censor_text($text);
-	}
-
-	// Parse bbcode if bbcode uid stored and bbcode enabled
-	if ($uid && ($flags & OPTION_FLAG_BBCODE))
+	if (preg_match('#^<[rt][ >]#', $text))
 	{
-		if (!class_exists('bbcode'))
+		$renderer = $phpbb_container->get('text_formatter.renderer');
+
+		// Temporarily switch off viewcensors if applicable
+		$old_censor = $renderer->get_viewcensors();
+		if ($old_censor !== $censor_text)
 		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
+			$renderer->set_viewcensors($censor_text);
 		}
 
-		if (empty($bbcode))
+		$text = $renderer->render($text);
+
+		// Restore the previous value
+		if ($old_censor !== $censor_text)
 		{
-			$bbcode = new bbcode($bitfield);
+			$renderer->set_viewcensors($old_censor);
 		}
-		else
+	}
+	else
+	{
+		if ($censor_text)
 		{
-			$bbcode->bbcode($bitfield);
+			$text = censor_text($text);
 		}
 
-		$bbcode->bbcode_second_pass($text, $uid);
-	}
+		// Parse bbcode if bbcode uid stored and bbcode enabled
+		if ($uid && ($flags & OPTION_FLAG_BBCODE))
+		{
+			if (!class_exists('bbcode'))
+			{
+				global $phpbb_root_path, $phpEx;
+				include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
+			}
 
-	$text = bbcode_nl2br($text);
-	$text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES));
+			if (empty($bbcode))
+			{
+				$bbcode = new bbcode($bitfield);
+			}
+			else
+			{
+				$bbcode->bbcode($bitfield);
+			}
+
+			$bbcode->bbcode_second_pass($text, $uid);
+		}
+
+		$text = bbcode_nl2br($text);
+		$text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES));
+	}
 
 	/**
 	* Use this event to modify the text after it is parsed
@@ -469,7 +540,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
 	* @var string	uid			The BBCode UID
 	* @var string	bitfield	The BBCode Bitfield
 	* @var int		flags		The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'bitfield', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_display_after', compact($vars)));
@@ -480,8 +551,8 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
 /**
 * For parsing custom parsed text to be stored within the database.
 * This function additionally returns the uid and bitfield that needs to be stored.
-* Expects $text to be the value directly from request_var() and in it's non-parsed form
-* 
+* Expects $text to be the value directly from $request->variable() and in it's non-parsed form
+*
 * @param string $text The text to be replaced with the parsed one
 * @param string $uid The BBCode uid for this parse
 * @param string $bitfield The BBCode bitfield for this parse
@@ -489,10 +560,15 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
 * @param bool $allow_bbcode If BBCode is allowed (i.e. if BBCode is parsed)
 * @param bool $allow_urls If urls is allowed
 * @param bool $allow_smilies If smilies are allowed
+* @param bool $allow_img_bbcode
+* @param bool $allow_flash_bbcode
+* @param bool $allow_quote_bbcode
+* @param bool $allow_url_bbcode
+* @param string $mode Mode to parse text as, e.g. post or sig
 *
 * @return array	An array of string with the errors that occurred while parsing
 */
-function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false)
+function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $mode = 'post')
 {
 	global $phpbb_root_path, $phpEx, $phpbb_dispatcher;
 
@@ -507,26 +583,40 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
 	* @var bool		allow_bbcode	Whether or not to parse BBCode
 	* @var bool		allow_urls		Whether or not to parse URLs
 	* @var bool		allow_smilies	Whether or not to parse Smilies
-	* @since 3.1-A1
+	* @var bool		allow_img_bbcode	Whether or not to parse the [img] BBCode
+	* @var bool		allow_flash_bbcode	Whether or not to parse the [flash] BBCode
+	* @var bool		allow_quote_bbcode	Whether or not to parse the [quote] BBCode
+	* @var bool		allow_url_bbcode	Whether or not to parse the [url] BBCode
+	* @var string	mode				Mode to parse text as, e.g. post or sig
+	* @since 3.1.0-a1
+	* @changed 3.2.0-a1
 	*/
-	$vars = array('text', 'uid', 'bitfield', 'flags', 'allow_bbcode', 'allow_urls', 'allow_smilies');
+	$vars = array(
+		'text',
+		'uid',
+		'bitfield',
+		'flags',
+		'allow_bbcode',
+		'allow_urls',
+		'allow_smilies',
+		'allow_img_bbcode',
+		'allow_flash_bbcode',
+		'allow_quote_bbcode',
+		'allow_url_bbcode',
+		'mode',
+	);
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_before', compact($vars)));
 
 	$uid = $bitfield = '';
 	$flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0);
 
-	if ($text === '')
-	{
-		return;
-	}
-
 	if (!class_exists('parse_message'))
 	{
 		include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
 	}
 
 	$message_parser = new parse_message($text);
-	$message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies);
+	$message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies, $allow_img_bbcode, $allow_flash_bbcode, $allow_quote_bbcode, $allow_url_bbcode, true, $mode);
 
 	$text = $message_parser->message;
 	$uid = $message_parser->bbcode_uid;
@@ -547,7 +637,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
 	* @var string	uid				The BBCode UID
 	* @var string	bitfield		The BBCode Bitfield
 	* @var int		flags			The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'bitfield', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_after', compact($vars)));
@@ -561,7 +651,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
 */
 function generate_text_for_edit($text, $uid, $flags)
 {
-	global $phpbb_root_path, $phpEx, $phpbb_dispatcher;
+	global $phpbb_dispatcher;
 
 	/**
 	* Use this event to modify the text before it is decoded for editing
@@ -570,7 +660,7 @@ function generate_text_for_edit($text, $uid, $flags)
 	* @var string	text			The text to parse
 	* @var string	uid				The BBCode UID
 	* @var int		flags			The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_edit_before', compact($vars)));
@@ -583,7 +673,7 @@ function generate_text_for_edit($text, $uid, $flags)
 	* @event core.modify_text_for_edit_after
 	* @var string	text			The text to parse
 	* @var int		flags			The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_edit_after', compact($vars)));
@@ -677,7 +767,7 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class
 		break;
 	}
 
-	$short_url = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
+	$short_url = (utf8_strlen($url) > 55) ? utf8_substr($url, 0, 39) . ' ... ' . utf8_substr($url, -10) : $url;
 
 	switch ($type)
 	{
@@ -740,44 +830,47 @@ function make_clickable($text, $server_url = false, $class = 'postlink')
 	static $static_class;
 	static $magic_url_match_args;
 
-	if (!is_array($magic_url_match_args) || $static_class != $class)
+	if (!isset($magic_url_match_args[$server_url]) || $static_class != $class)
 	{
 		$static_class = $class;
 		$class = ($static_class) ? ' class="' . $static_class . '"' : '';
 		$local_class = ($static_class) ? ' class="' . $static_class . '-local"' : '';
 
-		$magic_url_match_args = array();
+		if (!is_array($magic_url_match_args))
+		{
+			$magic_url_match_args = array();
+		}
 
 		// relative urls for this board
-		$magic_url_match_args[] = array(
-			'#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#i',
+		$magic_url_match_args[$server_url][] = array(
+			'#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#iu',
 			MAGIC_URL_LOCAL,
 			$local_class,
 		);
 
 		// matches a xxxx://aaaaa.bbb.cccc. ...
-		$magic_url_match_args[] = array(
-			'#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#i',
+		$magic_url_match_args[$server_url][] = array(
+			'#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#iu',
 			MAGIC_URL_FULL,
 			$class,
 		);
 
 		// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
-		$magic_url_match_args[] = array(
-			'#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#i',
+		$magic_url_match_args[$server_url][] = array(
+			'#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#iu',
 			MAGIC_URL_WWW,
 			$class,
 		);
 
 		// matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode.
-		$magic_url_match_args[] = array(
-			'/(^|[\n\t (>])(' . get_preg_expression('email') . ')/i',
+		$magic_url_match_args[$server_url][] = array(
+			'/(^|[\n\t (>])(' . get_preg_expression('email') . ')/iu',
 			MAGIC_URL_EMAIL,
 			'',
 		);
 	}
 
-	foreach ($magic_url_match_args as $magic_args)
+	foreach ($magic_url_match_args[$server_url] as $magic_args)
 	{
 		if (preg_match($magic_args[0], $text, $matches))
 		{
@@ -864,17 +957,17 @@ function smiley_text($text, $force_option = false)
 * @param mixed $forum_id The forum id the attachments are displayed in (false if in private message)
 * @param string &$message The post/private message
 * @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing.
-* @param array &$update_count The attachment counts to be updated - will be filled
+* @param array &$update_count_ary The attachment counts to be updated - will be filled
 * @param bool $preview If set to true the attachments are parsed for preview. Within preview mode the comments are fetched from the given $attachments array and not fetched from the database.
 */
-function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $preview = false)
+function parse_attachments($forum_id, &$message, &$attachments, &$update_count_ary, $preview = false)
 {
 	if (!sizeof($attachments))
 	{
 		return;
 	}
 
-	global $template, $cache, $user;
+	global $template, $cache, $user, $phpbb_dispatcher;
 	global $extensions, $config, $phpbb_root_path, $phpEx;
 
 	//
@@ -963,7 +1056,6 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 		// Some basics...
 		$attachment['extension'] = strtolower(trim($attachment['extension']));
 		$filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']);
-		$thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . utf8_basename($attachment['physical_filename']);
 
 		$upload_icon = '';
 
@@ -1005,7 +1097,6 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 
 		if (!$denied)
 		{
-			$l_downloaded_viewed = $download_link = '';
 			$display_cat = $extensions[$attachment['extension']]['display_cat'];
 
 			if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)
@@ -1066,7 +1157,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 						'U_INLINE_LINK'		=> $inline_link,
 					);
 
-					$update_count[] = $attachment['attach_id'];
+					$update_count_ary[] = $attachment['attach_id'];
 				break;
 
 				// Images, but display Thumbnail
@@ -1079,39 +1170,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 						'THUMB_IMAGE'		=> $thumbnail_link,
 					);
 
-					$update_count[] = $attachment['attach_id'];
-				break;
-
-				// Windows Media Streams
-				case ATTACHMENT_CATEGORY_WM:
-
-					// Giving the filename directly because within the wm object all variables are in local context making it impossible
-					// to validate against a valid session (all params can differ)
-					// $download_link = $filename;
-
-					$block_array += array(
-						'U_FORUM'		=> generate_board_url(),
-						'ATTACH_ID'		=> $attachment['attach_id'],
-						'S_WM_FILE'		=> true,
-					);
-
-					// Viewed/Heared File ... update the download count
-					$update_count[] = $attachment['attach_id'];
-				break;
-
-				// Real Media Streams
-				case ATTACHMENT_CATEGORY_RM:
-				case ATTACHMENT_CATEGORY_QUICKTIME:
-
-					$block_array += array(
-						'S_RM_FILE'			=> ($display_cat == ATTACHMENT_CATEGORY_RM) ? true : false,
-						'S_QUICKTIME_FILE'	=> ($display_cat == ATTACHMENT_CATEGORY_QUICKTIME) ? true : false,
-						'U_FORUM'			=> generate_board_url(),
-						'ATTACH_ID'			=> $attachment['attach_id'],
-					);
-
-					// Viewed/Heared File ... update the download count
-					$update_count[] = $attachment['attach_id'];
+					$update_count_ary[] = $attachment['attach_id'];
 				break;
 
 				// Macromedia Flash Files
@@ -1126,7 +1185,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 					);
 
 					// Viewed/Heared File ... update the download count
-					$update_count[] = $attachment['attach_id'];
+					$update_count_ary[] = $attachment['attach_id'];
 				break;
 
 				default:
@@ -1149,6 +1208,37 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 			);
 		}
 
+		$update_count = $update_count_ary;
+		/**
+		* Use this event to modify the attachment template data.
+		*
+		* This event is triggered once per attachment.
+		*
+		* @event core.parse_attachments_modify_template_data
+		* @var array	attachment		Array with attachment data
+		* @var array	block_array		Template data of the attachment
+		* @var int		display_cat		Attachment category data
+		* @var string	download_link	Attachment download link
+		* @var array	extensions		Array with attachment extensions data
+		* @var mixed 	forum_id 		The forum id the attachments are displayed in (false if in private message)
+		* @var bool		preview			Flag indicating if we are in post preview mode
+		* @var array	update_count	Array with attachment ids to update download count
+		* @since 3.1.0-RC5
+		*/
+		$vars = array(
+			'attachment',
+			'block_array',
+			'display_cat',
+			'download_link',
+			'extensions',
+			'forum_id',
+			'preview',
+			'update_count',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.parse_attachments_modify_template_data', compact($vars)));
+		$update_count_ary = $update_count;
+		unset($update_count);
+
 		$template->assign_block_vars('_file', $block_array);
 
 		$compiled_attachments[] = $template->assign_display('attachment_tpl');
@@ -1224,8 +1314,6 @@ function extension_allowed($forum_id, $extension, &$extensions)
 */
 function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')
 {
-	$chars = array();
-
 	$strip_reply = false;
 	$stripped = false;
 	if ($allow_reply && strpos($string, 'Re: ') === 0)
@@ -1285,7 +1373,6 @@ function truncate_string($string, $max_length = 60, $max_store_length = 255, $al
 * @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}
 *
 * @return string A string consisting of what is wanted based on $mode.
-* @author BartVB, Acyd Burn
 */
 function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
 {
@@ -1298,9 +1385,9 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 		global $phpbb_root_path, $phpEx;
 
 		$_profile_cache['base_url'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u={USER_ID}');
-		$_profile_cache['tpl_noprofile'] = '{USERNAME}';
+		$_profile_cache['tpl_noprofile'] = '<span class="username">{USERNAME}</span>';
 		$_profile_cache['tpl_noprofile_colour'] = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
-		$_profile_cache['tpl_profile'] = '<a href="{PROFILE_URL}">{USERNAME}</a>';
+		$_profile_cache['tpl_profile'] = '<a href="{PROFILE_URL}" class="username">{USERNAME}</a>';
 		$_profile_cache['tpl_profile_colour'] = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
 	}
 
@@ -1319,7 +1406,8 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 			// Return colour
 			if ($mode == 'colour')
 			{
-				return $username_colour;
+				$username_string = $username_colour;
+				break;
 			}
 
 		// no break;
@@ -1339,7 +1427,8 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 			// Return username
 			if ($mode == 'username')
 			{
-				return $username;
+				$username_string = $username;
+				break;
 			}
 
 		// no break;
@@ -1360,21 +1449,25 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 			// Return profile
 			if ($mode == 'profile')
 			{
-				return $profile_url;
+				$username_string = $profile_url;
+				break;
 			}
 
 		// no break;
 	}
 
-	if (($mode == 'full' && !$profile_url) || $mode == 'no_profile')
-	{
-		$username_string = str_replace(array('{USERNAME_COLOUR}', '{USERNAME}'), array($username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_noprofile'] : $_profile_cache['tpl_noprofile_colour']);
-	}
-	else
+	if (!isset($username_string))
 	{
-		$username_string = str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_profile'] : $_profile_cache['tpl_profile_colour']);
+		if (($mode == 'full' && !$profile_url) || $mode == 'no_profile')
+		{
+			$username_string = str_replace(array('{USERNAME_COLOUR}', '{USERNAME}'), array($username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_noprofile'] : $_profile_cache['tpl_noprofile_colour']);
+		}
+		else
+		{
+			$username_string = str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_profile'] : $_profile_cache['tpl_profile_colour']);
+		}
 	}
-	
+
 	/**
 	* Use this event to change the output of get_username_string()
 	*
@@ -1390,9 +1483,18 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 	*								profile url.
 	* @var string username_string	The string that has been generated
 	* @var array _profile_cache		Array of original return templates
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
-	$vars = array('mode', 'user_id', 'username', 'username_colour', 'guest_username', 'custom_profile_url', 'username_string', '_profile_cache');
+	$vars = array(
+		'mode',
+		'user_id',
+		'username',
+		'username_colour',
+		'guest_username',
+		'custom_profile_url',
+		'username_string',
+		'_profile_cache',
+	);
 	extract($phpbb_dispatcher->trigger_event('core.modify_username_string', compact($vars)));
 
 	return $username_string;
@@ -1401,22 +1503,54 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 /**
  * Add an option to the quick-mod tools.
  *
+ * @param string $url The recepting URL for the quickmod actions.
  * @param string $option The language key for the value of the option.
  * @param string $lang_string The language string to use.
  */
-function phpbb_add_quickmod_option($option, $lang_string)
+function phpbb_add_quickmod_option($url, $option, $lang_string)
 {
-	global $template, $user;
+	global $template, $user, $phpbb_path_helper;
+
 	$lang_string = $user->lang($lang_string);
 	$template->assign_block_vars('quickmod', array(
-		'VALUE'  => $option,
-		'TITLE'    => $lang_string,
+		'VALUE'		=> $option,
+		'TITLE'		=> $lang_string,
+		'LINK'		=> $phpbb_path_helper->append_url_params($url, array('action' => $option)),
 	));
 }
 
 /**
-* @package phpBB3
+* Concatenate an array into a string list.
+*
+* @param array $items Array of items to concatenate
+* @param object $user The phpBB $user object.
+*
+* @return string String list. Examples: "A"; "A and B"; "A, B, and C"
 */
+function phpbb_generate_string_list($items, $user)
+{
+	if (empty($items))
+	{
+		return '';
+	}
+
+	$count = sizeof($items);
+	$last_item = array_pop($items);
+	$lang_key = 'STRING_LIST_MULTI';
+
+	if ($count == 1)
+	{
+		return $last_item;
+	}
+	else if ($count == 2)
+	{
+		$lang_key = 'STRING_LIST_SIMPLE';
+	}
+	$list = implode($user->lang['COMMA_SEPARATOR'], $items);
+
+	return $user->lang($lang_key, $list, $last_item);
+}
+
 class bitfield
 {
 	var $data;