[mxbb-commits] core/modules/mx_phpbb3blocks/includes mx_functions_display.php, 1.8, 1.9

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv752/includes

Modified Files:
	mx_functions_display.php 
Log Message:
fix for mod-rewrite

Index: mx_functions_display.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes/mx_functions_display.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mx_functions_display.php	4 Oct 2008 07:04:38 -0000	1.8
--- mx_functions_display.php	5 Oct 2008 05:30:32 -0000	1.9
***************
*** 287,291 ****
  				'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $mx_user->lang['FORUM_CAT'] . '" />' : '',
  				'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
! 				'U_VIEWFORUM'			=> mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']))
  			);

--- 287,291 ----
  				'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $mx_user->lang['FORUM_CAT'] . '" />' : '',
  				'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
! 				'U_VIEWFORUM'			=> mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $row['forum_id']))
  			);

***************
*** 311,315 ****
  				{
  					$subforums_list[] = array(
! 						'link'		=> mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $subforum_id),
  						'name'		=> $subforum_row['name'],
  						'unread'	=> $subforum_unread,
--- 311,315 ----
  				{
  					$subforums_list[] = array(
! 						'link'		=> mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $subforum_id),
  						'name'		=> $subforum_row['name'],
  						'unread'	=> $subforum_unread,
***************
*** 361,365 ****
  			$last_post_subject = $row['forum_last_post_subject'];
  			$last_post_time = $mx_user->format_date($row['forum_last_post_time']);
! 			$last_post_url = mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
  		}
  		else
--- 361,365 ----
  			$last_post_subject = $row['forum_last_post_subject'];
  			$last_post_time = $mx_user->format_date($row['forum_last_post_time']);
! 			$last_post_url = mx3_append_sid(PHPBB_URL . "viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
  		}
  		else
***************
*** 389,393 ****
  		if ($row['forum_type'] != FORUM_LINK)
  		{
! 			$u_viewforum = mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']);
  		}
  		else
--- 389,393 ----
  		if ($row['forum_type'] != FORUM_LINK)
  		{
! 			$u_viewforum = mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $row['forum_id']);
  		}
  		else
***************
*** 397,401 ****
  			if (($row['forum_flags'] & FORUM_FLAG_LINK_TRACK) || $row['forum_password'] || !$phpbb_auth->acl_get('f_read', $forum_id))
  			{
! 				$u_viewforum = mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']);
  			}
  			else
--- 397,401 ----
  			if (($row['forum_flags'] & FORUM_FLAG_LINK_TRACK) || $row['forum_password'] || !$phpbb_auth->acl_get('f_read', $forum_id))
  			{
! 				$u_viewforum = mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $row['forum_id']);
  			}
  			else
***************
*** 459,463 ****

  	$template->assign_vars(array(
! 		'U_MARK_FORUMS'		=> ($mx_user->data['is_registered'] || $board_config['load_anon_lastread']) ? mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $root_data['forum_id'] . '&amp;mark=forums') : '',
  		'S_HAS_SUBFORUM'	=> ($visible_forums) ? true : false,
  		'L_SUBFORUM'		=> ($visible_forums == 1) ? $mx_user->lang['SUBFORUM'] : $mx_user->lang['SUBFORUMS'],
--- 459,463 ----

  	$template->assign_vars(array(
! 		'U_MARK_FORUMS'		=> ($mx_user->data['is_registered'] || $board_config['load_anon_lastread']) ? mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $root_data['forum_id'] . '&amp;mark=forums') : '',
  		'S_HAS_SUBFORUM'	=> ($visible_forums) ? true : false,
  		'L_SUBFORUM'		=> ($visible_forums == 1) ? $mx_user->lang['SUBFORUM'] : $mx_user->lang['SUBFORUMS'],
***************
*** 533,537 ****
  				'FORUM_NAME'	=> $parent_name,
  				'FORUM_ID'		=> $parent_forum_id,
! 				'U_VIEW_FORUM'	=> mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id))
  			);
  		}
--- 533,537 ----
  				'FORUM_NAME'	=> $parent_name,
  				'FORUM_ID'		=> $parent_forum_id,
! 				'U_VIEW_FORUM'	=> mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $parent_forum_id))
  			);
  		}
***************
*** 544,548 ****
  		'FORUM_NAME'	=> $forum_data['forum_name'],
  		'FORUM_ID'		=> $forum_data['forum_id'],
! 		'U_VIEW_FORUM'	=> mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_data['forum_id']))
  	);

--- 544,548 ----
  		'FORUM_NAME'	=> $forum_data['forum_name'],
  		'FORUM_ID'		=> $forum_data['forum_id'],
! 		'U_VIEW_FORUM'	=> mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $forum_data['forum_id']))
  	);

***************
*** 704,708 ****
  		else
  		{
! 			$forum_moderators[$row['forum_id']][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $mx_user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>';
  		}
  	}
--- 704,708 ----
  		else
  		{
! 			$forum_moderators[$row['forum_id']][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . mx3_append_sid(PHPBB_URL . "memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $mx_user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>';
  		}
  	}
***************
*** 986,991 ****
  		'ACTIVE_TOPIC_POSTS'	=> ($active_t_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_t_count),
  		'ACTIVE_TOPIC_PCT'		=> sprintf($l_active_pct, $active_t_pct),
! 		'U_ACTIVE_FORUM'		=> mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $active_f_id),
! 		'U_ACTIVE_TOPIC'		=> mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $active_t_id),
  		'S_SHOW_ACTIVITY'		=> true)
  	);
--- 986,991 ----
  		'ACTIVE_TOPIC_POSTS'	=> ($active_t_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_t_count),
  		'ACTIVE_TOPIC_PCT'		=> sprintf($l_active_pct, $active_t_pct),
! 		'U_ACTIVE_FORUM'		=> mx3_append_sid(PHPBB_URL . "viewforum.$phpEx", 'f=' . $active_f_id),
! 		'U_ACTIVE_TOPIC'		=> mx3_append_sid(PHPBB_URL . "viewtopic.$phpEx", 't=' . $active_t_id),
  		'S_SHOW_ACTIVITY'		=> true)
  	);
***************
*** 1036,1040 ****
  				}

! 				$redirect_url = mx3_append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");

  				meta_refresh(3, $redirect_url);
--- 1036,1040 ----
  				}

! 				$redirect_url = mx3_append_sid(PHPBB_URL . "view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");

  				meta_refresh(3, $redirect_url);
***************
*** 1070,1074 ****
  				}

! 				$redirect_url = mx3_append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
  				meta_refresh(3, $redirect_url);

--- 1070,1074 ----
  				}

! 				$redirect_url = mx3_append_sid(PHPBB_URL . "view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
  				meta_refresh(3, $redirect_url);

***************
*** 1097,1101 ****
  	if ($can_watch)
  	{
! 		$s_watching['link'] = mx3_append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&amp;start=$start");
  		$s_watching['title'] = $mx_user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)];
  		$s_watching['is_watching'] = $is_watching;
--- 1097,1101 ----
  	if ($can_watch)
  	{
! 		$s_watching['link'] = mx3_append_sid(PHPBB_URL . "view$mode.$phpEx", "$u_url=$match_id&amp;" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&amp;start=$start");
  		$s_watching['title'] = $mx_user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)];
  		$s_watching['is_watching'] = $is_watching;
***************
*** 1149,1153 ****
  				}

! 				$redirect_url = mx3_append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");

  				meta_refresh(3, $redirect_url);
--- 1149,1153 ----
  				}

! 				$redirect_url = mx3_append_sid(PHPBB_URL . "view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");

  				meta_refresh(3, $redirect_url);
***************
*** 1183,1187 ****
  				}

! 				$redirect_url = mx3_append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
  				meta_refresh(3, $redirect_url);

--- 1183,1187 ----
  				}

! 				$redirect_url = mx3_append_sid(PHPBB_URL . "view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
  				meta_refresh(3, $redirect_url);

***************
*** 1210,1214 ****
  	if ($can_watch)
  	{
! 		$s_watching['link'] = mx3_append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&amp;start=$start");
  		$s_watching['title'] = $mx_user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)];
  		$s_watching['is_watching'] = $is_watching;
--- 1210,1214 ----
  	if ($can_watch)
  	{
! 		$s_watching['link'] = mx3_append_sid(PHPBB_URL . "view$mode.$phpEx", "$u_url=$match_id&amp;" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&amp;start=$start");
  		$s_watching['title'] = $mx_user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)];
  		$s_watching['is_watching'] = $is_watching;