[mxbb-commits] core/includes/shared/phpbb3/includes functions_posting.php, 1.5, 1.6

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

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21059

Modified Files:
	functions_posting.php 
Log Message:
prefixes

Index: functions_posting.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** functions_posting.php	4 Sep 2008 00:04:27 -0000	1.5
--- functions_posting.php	7 Sep 2008 02:16:48 -0000	1.6
***************
*** 103,107 ****
  		$template->assign_vars(array(
  			'S_SHOW_SMILEY_LINK' 	=> true,
! 			'U_MORE_SMILIES' 		=> append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&amp;f=' . $forum_id))
  		);
  	}
--- 103,107 ----
  		$template->assign_vars(array(
  			'S_SHOW_SMILEY_LINK' 	=> true,
! 			'U_MORE_SMILIES' 		=> mx3_append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&amp;f=' . $forum_id))
  		);
  	}
***************
*** 784,788 ****
  			}

! 			$download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&amp;id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $mx_user->session_id : false);

  			$template->assign_block_vars('attach_row', array(
--- 784,788 ----
  			}

! 			$download_link = mx3_append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&amp;id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $mx_user->session_id : false);

  			$template->assign_block_vars('attach_row', array(
***************
*** 891,906 ****

  			$link_topic = true;
! 			$view_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id']);
  			$title = $topic_rows[$draft['topic_id']]['topic_title'];

! 			$insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id']);
  		}
  		else if ($draft['forum_id'] && $phpbb_auth->acl_get('f_read', $draft['forum_id']))
  		{
  			$link_forum = true;
! 			$view_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $draft['forum_id']);
  			$title = $draft['forum_name'];

! 			$insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $draft['forum_id'] . '&amp;mode=post&amp;d=' . $draft['draft_id']);
  		}
  		else
--- 891,906 ----

  			$link_topic = true;
! 			$view_url = mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id']);
  			$title = $topic_rows[$draft['topic_id']]['topic_title'];

! 			$insert_url = mx3_append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id']);
  		}
  		else if ($draft['forum_id'] && $phpbb_auth->acl_get('f_read', $draft['forum_id']))
  		{
  			$link_forum = true;
! 			$view_url = mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $draft['forum_id']);
  			$title = $draft['forum_name'];

! 			$insert_url = mx3_append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $draft['forum_id'] . '&amp;mode=post&amp;d=' . $draft['draft_id']);
  		}
  		else
***************
*** 908,912 ****
  			// Either display as PM draft if forum_id and topic_id are empty or if access to the forums has been denied afterwards...
  			$link_pm = true;
! 			$insert_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=compose&amp;d={$draft['draft_id']}");
  		}

--- 908,912 ----
  			// Either display as PM draft if forum_id and topic_id are empty or if access to the forums has been denied afterwards...
  			$link_pm = true;
! 			$insert_url = mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=compose&amp;d={$draft['draft_id']}");
  		}

***************
*** 1036,1040 ****
  		{
  			$decoded_message = $message;
! 			decode_message($decoded_message, $row['bbcode_uid']);

  			$decoded_message = phpBB3::censor_text($decoded_message);
--- 1036,1040 ----
  		{
  			$decoded_message = $message;
! 			phpBB3::decode_message($decoded_message, $row['bbcode_uid']);

  			$decoded_message = phpBB3::censor_text($decoded_message);
***************
*** 1049,1053 ****
  		$message = str_replace("\n", '<br />', $message);

! 		$message = smiley_text($message, !$row['enable_smilies']);

  		if (!empty($attachments[$row['post_id']]))
--- 1049,1053 ----
  		$message = str_replace("\n", '<br />', $message);

! 		$message = phpBB3::smiley_text($message, !$row['enable_smilies']);

  		if (!empty($attachments[$row['post_id']]))
***************
*** 1060,1067 ****

  		$template->assign_block_vars($mode . '_row', array(
! 			'POST_AUTHOR_FULL'		=> get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 			'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 			'POST_AUTHOR'			=> get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 			'U_POST_AUTHOR'			=> get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),

  			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
--- 1060,1067 ----

  		$template->assign_block_vars($mode . '_row', array(
! 			'POST_AUTHOR_FULL'		=> phpBB3::get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 			'POST_AUTHOR_COLOUR'	=> phpBB3::get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 			'POST_AUTHOR'			=> phpBB3::get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 			'U_POST_AUTHOR'			=> phpBB3::get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),

  			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
***************
*** 1073,1079 ****
  			'DECODED_MESSAGE'	=> $decoded_message,
  			'POST_ID'			=> $row['post_id'],
! 			'U_MINI_POST'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
! 			'U_MCP_DETAILS'		=> ($phpbb_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, $mx_user->session_id) : '',
! 			'POSTER_QUOTE'		=> ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '')
  		);

--- 1073,1079 ----
  			'DECODED_MESSAGE'	=> $decoded_message,
  			'POST_ID'			=> $row['post_id'],
! 			'U_MINI_POST'		=> mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
! 			'U_MCP_DETAILS'		=> ($phpbb_auth->acl_get('m_info', $forum_id)) ? mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $mx_user->session_id) : '',
! 			'POSTER_QUOTE'		=> ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes(phpBB3::get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '')
  		);

***************
*** 2426,2430 ****

  	$url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx";
! 	$url = append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor;

  	return $url;
--- 2426,2430 ----

  	$url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx";
! 	$url = mx3_append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor;

  	return $url;