diff options
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 288 | 
1 files changed, 199 insertions, 89 deletions
| diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index ee7048638d..cd4c901b58 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -2,9 +2,8 @@  /**  *  * @package phpBB3 -* @version $Id$  * @copyright (c) 2005 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  *  */ @@ -23,6 +22,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  {  	global $db, $auth, $user, $template;  	global $phpbb_root_path, $phpEx, $config; +	global $request, $phpbb_dispatcher;  	$forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array();  	$parent_id = $visible_forums = 0; @@ -54,12 +54,26 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  	// Handle marking everything read  	if ($mark_read == 'all')  	{ -		$redirect = build_url(array('mark', 'hash')); +		$redirect = build_url(array('mark', 'hash', 'mark_time'));  		meta_refresh(3, $redirect);  		if (check_link_hash(request_var('hash', ''), 'global'))  		{ -			markread('all'); +			markread('all', false, false, request_var('mark_time', 0)); + +			if ($request->is_ajax()) +			{ +				// 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'], +					'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); +			}  			trigger_error(  				$user->lang['FORUMS_MARKED'] . '<br /><br />' . @@ -90,7 +104,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  	}  	else if ($config['load_anon_lastread'] || $user->data['is_registered'])  	{ -		$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : ''; +		$tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE);  		$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();  		if (!$user->data['is_registered']) @@ -109,7 +123,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  		$sql_array['SELECT'] .= ', fa.user_id';  	} -	$sql = $db->sql_build_query('SELECT', array( +	$sql_ary = array(  		'SELECT'	=> $sql_array['SELECT'],  		'FROM'		=> $sql_array['FROM'],  		'LEFT_JOIN'	=> $sql_array['LEFT_JOIN'], @@ -117,27 +131,39 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  		'WHERE'		=> $sql_where,  		'ORDER_BY'	=> 'f.left_id', -	)); +	); +	/** +	* Event to modify the SQL query before the forum data is queried +	* +	* @event core.display_forums_modify_sql +	* @var	array	sql_ary		The SQL array to get the data of the forums +	* @since 3.1-A1 +	*/ +	$vars = array('sql_ary'); +	extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_sql', compact($vars))); + +	$sql = $db->sql_build_query('SELECT', $sql_ary);  	$result = $db->sql_query($sql);  	$forum_tracking_info = array();  	$branch_root_id = $root_data['forum_id']; -	// Check for unread global announcements (index page only) -	$ga_unread = false; -	if ($root_data['forum_id'] == 0) -	{ -		$unread_ga_list = get_unread_topics($user->data['user_id'], 'AND t.forum_id = 0', '', 1); - -		if (!empty($unread_ga_list)) -		{ -			$ga_unread = true; -		} -	} -  	while ($row = $db->sql_fetchrow($result))  	{ +		/** +		* Event to modify the data set of a forum +		* +		* This event is triggered once per forum +		* +		* @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 +		*/ +		$vars = array('branch_root_id', 'row'); +		extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_row', compact($vars))); +  		$forum_id = $row['forum_id'];  		// Mark forums read? @@ -271,21 +297,50 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  				$forum_rows[$parent_id]['forum_id_last_post'] = $forum_id;  			}  		} + +		/** +		* Event to modify the forum rows data set +		* +		* This event is triggered once per forum +		* +		* @event core.display_forums_modify_forum_rows +		* @var	array	forum_rows		Data array of all forums we display +		* @var	array	subforums		Data array of all subforums we display +		* @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 +		*/ +		$vars = array('forum_rows', 'subforums', 'branch_root_id', 'parent_id', 'row'); +		extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_forum_rows', compact($vars)));  	}  	$db->sql_freeresult($result);  	// Handle marking posts  	if ($mark_read == 'forums')  	{ -		$redirect = build_url(array('mark', 'hash')); +		$redirect = build_url(array('mark', 'hash', 'mark_time'));  		$token = request_var('hash', '');  		if (check_link_hash($token, 'global'))  		{ -			// Add 0 to forums array to mark global announcements correctly -			$forum_ids[] = 0; -			markread('topics', $forum_ids); +			markread('topics', $forum_ids, false, request_var('mark_time', 0));  			$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');  			meta_refresh(3, $redirect); + +			if ($request->is_ajax()) +			{ +				// 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'], +					'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); +			} +  			trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);  		}  		else @@ -334,12 +389,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  		$forum_unread = (isset($forum_tracking_info[$forum_id]) && $row['orig_forum_last_post_time'] > $forum_tracking_info[$forum_id]) ? true : false; -		// Mark the first visible forum on index as unread if there's any unread global announcement -		if ($ga_unread && !empty($forum_ids_moderator) && $forum_id == $forum_ids_moderator[0]) -		{ -			$forum_unread = true; -		} -  		$folder_image = $folder_alt = $l_subforums = '';  		$subforums_list = array(); @@ -415,12 +464,13 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  		if ($row['forum_last_post_id'])  		{  			$last_post_subject = $row['forum_last_post_subject']; +			$last_post_subject_truncated = truncate_string(censor_text($last_post_subject), 30, 255, false, $user->lang['ELLIPSIS']);  			$last_post_time = $user->format_date($row['forum_last_post_time']);  			$last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];  		}  		else  		{ -			$last_post_subject = $last_post_time = $last_post_url = ''; +			$last_post_subject = $last_post_time = $last_post_url = $last_post_subject_truncated = '';  		}  		// Output moderator listing ... if applicable @@ -428,7 +478,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  		if ($display_moderators && !empty($forum_moderators[$forum_id]))  		{  			$l_moderator = (sizeof($forum_moderators[$forum_id]) == 1) ? $user->lang['MODERATOR'] : $user->lang['MODERATORS']; -			$moderators_list = implode(', ', $forum_moderators[$forum_id]); +			$moderators_list = implode($user->lang['COMMA_SEPARATOR'], $forum_moderators[$forum_id]);  		}  		$l_post_click_count = ($row['forum_type'] == FORUM_LINK) ? 'CLICKS' : 'POSTS'; @@ -439,7 +489,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  		{  			$s_subforums_list[] = '<a href="' . $subforum['link'] . '" class="subforum ' . (($subforum['unread']) ? 'unread' : 'read') . '" title="' . (($subforum['unread']) ? $user->lang['UNREAD_POSTS'] : $user->lang['NO_UNREAD_POSTS']) . '">' . $subforum['name'] . '</a>';  		} -		$s_subforums_list = (string) implode(', ', $s_subforums_list); +		$s_subforums_list = (string) implode($user->lang['COMMA_SEPARATOR'], $s_subforums_list);  		$catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false;  		if ($row['forum_type'] != FORUM_LINK) @@ -460,7 +510,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  			}  		} -		$template->assign_block_vars('forumrow', array( +		$forum_row = array(  			'S_IS_CAT'			=> false,  			'S_NO_CAT'			=> $catless && !$last_catless,  			'S_IS_LINK'			=> ($row['forum_type'] == FORUM_LINK) ? true : false, @@ -469,6 +519,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  			'S_LOCKED_FORUM'	=> ($row['forum_status'] == ITEM_LOCKED) ? true : false,  			'S_LIST_SUBFORUMS'	=> ($row['display_subforum_list']) ? true : false,  			'S_SUBFORUMS'		=> (sizeof($subforums_list)) ? true : false, +			'S_DISPLAY_SUBJECT'	=>	($last_post_subject && $config['display_last_subject'] && !$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? true : false,  			'S_FEED_ENABLED'	=> ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] == FORUM_POST) ? true : false,  			'FORUM_ID'				=> $row['forum_id'], @@ -476,12 +527,13 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  			'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),  			'TOPICS'				=> $row['forum_topics'],  			$l_post_click_count		=> $post_click_count, +			'FORUM_IMG_STYLE'		=> $folder_image,  			'FORUM_FOLDER_IMG'		=> $user->img($folder_image, $folder_alt), -			'FORUM_FOLDER_IMG_SRC'	=> $user->img($folder_image, $folder_alt, false, '', 'src'),  			'FORUM_FOLDER_IMG_ALT'	=> isset($user->lang[$folder_alt]) ? $user->lang[$folder_alt] : '',  			'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : '',  			'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', -			'LAST_POST_SUBJECT'		=> censor_text($last_post_subject), +			'LAST_POST_SUBJECT'		=> (!$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? censor_text($last_post_subject) : "", +			'LAST_POST_SUBJECT_TRUNCATED'	=> (!$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? $last_post_subject_truncated : "",  			'LAST_POST_TIME'		=> $last_post_time,  			'LAST_POSTER'			=> get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),  			'LAST_POSTER_COLOUR'	=> get_username_string('colour', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), @@ -495,9 +547,24 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  			'U_UNAPPROVED_TOPICS'	=> ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id_unapproved_topics']) : '',  			'U_VIEWFORUM'		=> $u_viewforum,  			'U_LAST_POSTER'		=> get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), -			'U_LAST_POST'		=> $last_post_url) +			'U_LAST_POST'		=> $last_post_url,  		); +		/** +		* Modify the template data block of the forum +		* +		* This event is triggered once per forum +		* +		* @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 +		*/ +		$vars = array('forum_row', 'row'); +		extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_template_vars', compact($vars))); + +		$template->assign_block_vars('forumrow', $forum_row); +  		// Assign subforums loop for style authors  		foreach ($subforums_list as $subforum)  		{ @@ -512,7 +579,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod  	}  	$template->assign_vars(array( -		'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') : '', +		'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()) : '',  		'S_HAS_SUBFORUM'	=> ($visible_forums) ? true : false,  		'L_SUBFORUM'		=> ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'],  		'LAST_POST_IMG'		=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), @@ -655,48 +722,6 @@ function get_forum_parents(&$forum_data)  }  /** -* Generate topic pagination -*/ -function topic_generate_pagination($replies, $url) -{ -	global $config, $user; - -	// Make sure $per_page is a valid value -	$per_page = ($config['posts_per_page'] <= 0) ? 1 : $config['posts_per_page']; - -	if (($replies + 1) > $per_page) -	{ -		$total_pages = ceil(($replies + 1) / $per_page); -		$pagination = ''; - -		$times = 1; -		for ($j = 0; $j < $replies + 1; $j += $per_page) -		{ -			$pagination .= '<a href="' . $url . ($j == 0 ? '' : '&start=' . $j) . '">' . $times . '</a>'; -			if ($times == 1 && $total_pages > 5) -			{ -				$pagination .= '<span class="page-dots"> ... </span>'; - -				// Display the last three pages -				$times = $total_pages - 3; -				$j += ($total_pages - 4) * $per_page; -			} -			else if ($times < $total_pages) -			{ -				$pagination .= '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>'; -			} -			$times++; -		} -	} -	else -	{ -		$pagination = ''; -	} - -	return $pagination; -} - -/**  * Obtain list of moderators of each forum  */  function get_moderators(&$forum_moderators, $forum_id = false) @@ -887,7 +912,7 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold  */  function display_custom_bbcodes()  { -	global $db, $template, $user; +	global $db, $template, $user, $phpbb_dispatcher;  	// Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing)  	$num_predefined_bbcodes = 22; @@ -907,17 +932,40 @@ function display_custom_bbcodes()  			$row['bbcode_helpline'] = $user->lang[strtoupper($row['bbcode_helpline'])];  		} -		$template->assign_block_vars('custom_tags', array( +		$custom_tags = array(  			'BBCODE_NAME'		=> "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",  			'BBCODE_ID'			=> $num_predefined_bbcodes + ($i * 2),  			'BBCODE_TAG'		=> $row['bbcode_tag'],  			'BBCODE_HELPLINE'	=> $row['bbcode_helpline'],  			'A_BBCODE_HELPLINE'	=> str_replace(array('&', '"', "'", '<', '>'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']), -		)); +		); + +		/** +		* Modify the template data block of a 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 +		*/ +		$vars = array('custom_tags', 'row'); +		extract($phpbb_dispatcher->trigger_event('core.display_custom_bbcodes_modify_row', compact($vars))); + +		$template->assign_block_vars('custom_tags', $custom_tags);  		$i++;  	}  	$db->sql_freeresult($result); + +	/** +	* Display custom bbcodes +	* +	* @event core.display_custom_bbcodes +	* @since 3.1-A1 +	*/ +	$phpbb_dispatcher->dispatch('core.display_custom_bbcodes');  }  /** @@ -1061,10 +1109,10 @@ function display_user_activity(&$userdata)  	$template->assign_vars(array(  		'ACTIVE_FORUM'			=> $active_f_name, -		'ACTIVE_FORUM_POSTS'	=> ($active_f_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_f_count), +		'ACTIVE_FORUM_POSTS'	=> $user->lang('USER_POSTS', (int) $active_f_count),  		'ACTIVE_FORUM_PCT'		=> sprintf($l_active_pct, $active_f_pct),  		'ACTIVE_TOPIC'			=> censor_text($active_t_name), -		'ACTIVE_TOPIC_POSTS'	=> ($active_t_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_t_count), +		'ACTIVE_TOPIC_POSTS'	=> $user->lang('USER_POSTS', (int) $active_t_count),  		'ACTIVE_TOPIC_PCT'		=> sprintf($l_active_pct, $active_t_pct),  		'U_ACTIVE_FORUM'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $active_f_id),  		'U_ACTIVE_TOPIC'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $active_t_id), @@ -1078,6 +1126,7 @@ function display_user_activity(&$userdata)  function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0, $item_title = '')  {  	global $template, $db, $user, $phpEx, $start, $phpbb_root_path; +	global $request;  	$table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE;  	$where_sql = ($mode == 'forum') ? 'forum_id' : 'topic_id'; @@ -1105,7 +1154,6 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,  		if (!is_null($notify_status) && $notify_status !== '')  		{ -  			if (isset($_GET['unwatch']))  			{  				$uid = request_var('uid', 0); @@ -1113,7 +1161,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,  				if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true))  				{ -					if ($uid != $user_id || $_GET['unwatch'] != $mode) +					if ($uid != $user_id || $request->variable('unwatch', '', false, phpbb_request_interface::GET) != $mode)  					{  						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");  						$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); @@ -1178,7 +1226,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,  				if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true))  				{ -					if ($uid != $user_id || $_GET['watch'] != $mode) +					if ($uid != $user_id || $request->variable('watch', '', false, phpbb_request_interface::GET) != $mode)  					{  						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");  						$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); @@ -1221,7 +1269,8 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,  	}  	else  	{ -		if ((isset($_GET['unwatch']) && $_GET['unwatch'] == $mode) || (isset($_GET['watch']) && $_GET['watch'] == $mode)) +		if ((isset($_GET['unwatch']) && $request->variable('unwatch', '', false, phpbb_request_interface::GET) == $mode) || +			(isset($_GET['watch']) && $request->variable('watch', '', false, phpbb_request_interface::GET) == $mode))  		{  			login_box();  		} @@ -1235,7 +1284,9 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,  	if ($can_watch)  	{  		$s_watching['link'] = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&start=$start&hash=" . generate_link_hash("{$mode}_$match_id")); +		$s_watching['link_toggle'] = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&" . ((!$is_watching) ? 'unwatch' : 'watch') . "=$mode&start=$start&hash=" . generate_link_hash("{$mode}_$match_id"));  		$s_watching['title'] = $user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)]; +		$s_watching['title_toggle'] = $user->lang[((!$is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)];  		$s_watching['is_watching'] = $is_watching;  	} @@ -1302,6 +1353,31 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank  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; + +	$overwrite_avatar = ''; + +	/** +	* Overwrite users avatar +	* +	* @event core.display_custom_bbcodes_modify_row +	* @var	string	avatar			Users assigned avatar name +	* @var	int		avatar_type		Type of avatar +	* @var	string	avatar_width	Width of users avatar +	* @var	string	avatar_height	Height of users avatar +	* @var	string	alt				Language string for alt tag within image +	*								Can be a language key or text +	* @var	bool	ignore_config	Ignores config and force displaying avatar +	* @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'); +	extract($phpbb_dispatcher->trigger_event('core.user_get_avatar', compact($vars))); + +	if ($overwrite_avatar) +	{ +		return $overwrite_avatar; +	}  	if (empty($avatar) || !$avatar_type || (!$config['allow_avatar'] && !$ignore_config))  	{ @@ -1340,4 +1416,38 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $  	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';  } -?>
\ No newline at end of file +/** +* Generate a list of archive types available for compressing attachments +* +* @param string $param_key Either topic_id or post_id +* @param string $param_val The value of the topic or post id +* @param string $phpbb_root_path The root path of the phpBB installation +* @param string $phpEx The PHP extension +* +* @return array Array containing the link and the type of compression +*/ +function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $phpEx) +{ +	if (!class_exists('compress')) +	{ +		require $phpbb_root_path . 'includes/functions_compress.' . $phpEx; +	} + +	$methods = compress::methods(); +	$links = array(); + +	foreach ($methods as $method) +	{ +		$exploded = explode('.', $method); +		$type = array_pop($exploded); +		$params = array('archive' => $method); +		$params[$param_key] = $param_val; + +		$links[] = array( +			'LINK' => append_sid("{$phpbb_root_path}download/file.$phpEx", $params), +			'TYPE' => $type, +		); +	} + +	return $links; +} | 
