1 files changed, 56 insertions, 106 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index c6ab5df90f..353f0be04b 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -138,7 +138,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 	*
 	* @event core.display_forums_modify_sql
 	* @var	array	sql_ary		The SQL array to get the data of the forums
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('sql_ary');
 	extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_sql', compact($vars)));
@@ -161,7 +161,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		* @event core.display_forums_modify_row
 		* @var	int		branch_root_id	Last top-level forum
 		* @var	array	row				The data of the forum
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
 		$vars = array('branch_root_id', 'row');
 		extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_row', compact($vars)));
@@ -318,7 +318,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		* @var	int		branch_root_id	Current top-level forum
 		* @var	int		parent_id		Current parent forum
 		* @var	array	row				The data of the forum
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
 		$vars = array('forum_rows', 'subforums', 'branch_root_id', 'parent_id', 'row');
 		extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_forum_rows', compact($vars)));
@@ -441,7 +441,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				}
 			}
 
-			$l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': ';
+			$l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'];
 			$folder_image = ($forum_unread) ? 'forum_unread_subforum' : 'forum_read_subforum';
 		}
 		else
@@ -568,7 +568,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		* @event core.display_forums_modify_template_vars
 		* @var	array	forum_row		Template data of the forum
 		* @var	array	row				The data of the forum
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
 		$vars = array('forum_row', 'row');
 		extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_template_vars', compact($vars)));
@@ -900,7 +900,6 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 			$folder_new .= '_locked';
 		}
 
-
 		$folder_img = ($unread_topic) ? $folder_new : $folder;
 		$folder_alt = ($unread_topic) ? 'UNREAD_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_UNREAD_POSTS');
 
@@ -919,7 +918,7 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 
 /**
 * Assign/Build custom bbcodes for display in screens supporting using of bbcodes
-* The custom bbcodes buttons will be placed within the template block 'custom_codes'
+* The custom bbcodes buttons will be placed within the template block 'custom_tags'
 */
 function display_custom_bbcodes()
 {
@@ -928,11 +927,26 @@ function display_custom_bbcodes()
 	// Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing)
 	$num_predefined_bbcodes = 22;
 
-	$sql = 'SELECT bbcode_id, bbcode_tag, bbcode_helpline
-		FROM ' . BBCODES_TABLE . '
-		WHERE display_on_posting = 1
-		ORDER BY bbcode_tag';
-	$result = $db->sql_query($sql);
+	$sql_ary = array(
+		'SELECT'	=> 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline',
+		'FROM'		=> array(BBCODES_TABLE => 'b'),
+		'WHERE'		=> 'b.display_on_posting = 1',
+		'ORDER_BY'	=> 'b.bbcode_tag',
+	);
+
+	/**
+	* Event to modify the SQL query before custom bbcode data is queried
+	*
+	* @event core.display_custom_bbcodes_modify_sql
+	* @var	array	sql_ary					The SQL array to get the bbcode data
+	* @var	int		num_predefined_bbcodes	The number of predefined core bbcodes
+	*										(multiplied by factor of 2)
+	* @since 3.1.0-a3
+	*/
+	$vars = array('sql_ary', 'num_predefined_bbcodes');
+	extract($phpbb_dispatcher->trigger_event('core.display_custom_bbcodes_modify_sql', compact($vars)));
+
+	$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
 
 	$i = 0;
 	while ($row = $db->sql_fetchrow($result))
@@ -947,19 +961,20 @@ function display_custom_bbcodes()
 			'BBCODE_NAME'		=> "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
 			'BBCODE_ID'			=> $num_predefined_bbcodes + ($i * 2),
 			'BBCODE_TAG'		=> $row['bbcode_tag'],
+			'BBCODE_TAG_CLEAN'	=> str_replace('=', '-', $row['bbcode_tag']),
 			'BBCODE_HELPLINE'	=> $row['bbcode_helpline'],
 			'A_BBCODE_HELPLINE'	=> str_replace(array('&amp;', '&quot;', "'", '&lt;', '&gt;'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']),
 		);
 
 		/**
-		* Modify the template data block of a bbcode
+		* Event to modify the template data block of a custom bbcode
 		*
 		* This event is triggered once per bbcode
 		*
 		* @event core.display_custom_bbcodes_modify_row
 		* @var	array	custom_tags		Template data of the bbcode
 		* @var	array	row				The data of the bbcode
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
 		$vars = array('custom_tags', 'row');
 		extract($phpbb_dispatcher->trigger_event('core.display_custom_bbcodes_modify_row', compact($vars)));
@@ -974,7 +989,7 @@ function display_custom_bbcodes()
 	* Display custom bbcodes
 	*
 	* @event core.display_custom_bbcodes
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$phpbb_dispatcher->dispatch('core.display_custom_bbcodes');
 }
@@ -1167,7 +1182,12 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 					if ($uid != $user_id || $request->variable('unwatch', '', false, \phpbb\request\request_interface::GET) != $mode)
 					{
 						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
-						$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+						$message = $user->lang['ERR_UNWATCHING'];
+
+						if (!$request->is_ajax())
+						{
+							$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+						}
 						trigger_error($message);
 					}
 
@@ -1177,8 +1197,12 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 					$db->sql_query($sql);
 
 					$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
-					$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />';
-					$message .= sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+					$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)];
+
+					if (!$request->is_ajax())
+					{
+						$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+					}
 					meta_refresh(3, $redirect_url);
 					trigger_error($message);
 				}
@@ -1232,7 +1256,12 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 					if ($uid != $user_id || $request->variable('watch', '', false, \phpbb\request\request_interface::GET) != $mode)
 					{
 						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
-						$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+						$message = $user->lang['ERR_WATCHING'];
+
+						if (!$request->is_ajax())
+						{
+							$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+						}
 						trigger_error($message);
 					}
 
@@ -1243,7 +1272,12 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 					$db->sql_query($sql);
 
 					$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
-					$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+					$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)];
+
+					if (!$request->is_ajax())
+					{
+						$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+					}
 					meta_refresh(3, $redirect_url);
 					trigger_error($message);
 				}
@@ -1342,92 +1376,6 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 }
 
 /**
-* Get user 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 html
-*/
-function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
-{
-	$row = \phpbb\avatar\manager::clean_row($user_row);
-	return phpbb_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 phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
-{
-	$row = \phpbb\avatar\manager::clean_row($user_row);
-	return phpbb_get_avatar($row, $alt, $ignore_config);
-}
-
-/**
-* Get avatar
-*
-* @param array $row Row cleaned by \phpbb\avatar\driver\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 phpbb_get_avatar($row, $alt, $ignore_config = false)
-{
-	global $user, $config, $cache, $phpbb_root_path, $phpEx;
-	global $request;
-	global $phpbb_container;
-
-	if (!$config['allow_avatar'] && !$ignore_config)
-	{
-		return '';
-	}
-
-	$avatar_data = array(
-		'src' => $row['avatar'],
-		'width' => $row['avatar_width'],
-		'height' => $row['avatar_height'],
-	);
-
-	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
-	$html = '';
-
-	if ($driver)
-	{
-		$html = $driver->get_custom_html($user, $row, $alt);
-		if (!empty($html))
-		{
-			return $html;
-		}
-
-		$avatar_data = $driver->get_data($row, $ignore_config);
-	}
-	else
-	{
-		$avatar_data['src'] = '';
-	}
-
-	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) . '" />';
-	}
-
-	return $html;
-}
-
-/**
 * Generate a list of archive types available for compressing attachments
 *
 * @param string $param_key Either topic_id or post_id
@@ -1445,6 +1393,8 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
 	}
 
 	$methods = compress::methods();
+	// Sort by preferred type.
+	$methods = array_intersect(array('.zip', '.tar.bz2', '.tar.gz', '.tar'), $methods);
 	$links = array();
 
 	foreach ($methods as $method)