[Phpbb-checkins] CVS: phpBB2 posting.php,1.154,1.155 viewtopic.php,1.183,1.184

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv25245

Modified Files:
	posting.php viewtopic.php 
Log Message:
Various bug fixes, polls, Guest vs. Anonymous, quoting guests

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -r1.154 -r1.155
*** posting.php	22 Mar 2002 21:50:05 -0000	1.154
--- posting.php	23 Mar 2002 22:18:04 -0000	1.155
***************
*** 764,768 ****
  			$msg_date =  create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']);
  
! 			$message = '[quote="' . $post_info['username'] . '"]' . $message . '[/quote]';
  
  			if ( !empty($orig_word) )
--- 764,769 ----
  			$msg_date =  create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']);
  
! 			$quote_username = ( !empty($post_info['post_username']) ) ? $post_info['post_username'] : $post_info['username'];
! 			$message = '[quote="' . $quote_username . '"]' . $message . '[/quote]';
  
  			if ( !empty($orig_word) )

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -r1.183 -r1.184
*** viewtopic.php	22 Mar 2002 23:17:06 -0000	1.183
--- viewtopic.php	23 Mar 2002 22:18:04 -0000	1.184
***************
*** 692,695 ****
--- 692,698 ----
  	if ( $vote_info = $db->sql_fetchrowset($result) )
  	{
+ 		$db->sql_freeresult($result);
+ 		$vote_options = count($vote_info);
+ 
  		$vote_id = $vote_info[0]['vote_id'];
  		$vote_title = $vote_info[0]['vote_text'];
***************
*** 704,708 ****
  		}
  
! 		$user_voted = ( $db->sql_numrows($result) ) ? TRUE : 0;
  
  		if ( isset($HTTP_GET_VARS['vote']) || isset($HTTP_POST_VARS['vote']) )
--- 707,712 ----
  		}
  
! 		$user_voted = ( $row = $db->sql_fetchrow($result) ) ? TRUE : 0;
! 		$db->sql_freeresult($result);
  
  		if ( isset($HTTP_GET_VARS['vote']) || isset($HTTP_POST_VARS['vote']) )
***************
*** 719,723 ****
  		if ( $user_voted || $view_result || $poll_expired || !$is_auth['auth_vote'] || $forum_row['topic_status'] == TOPIC_LOCKED )
  		{
- 
  			$template->set_filenames(array(
  				'pollbox' => 'viewtopic_poll_result.tpl')
--- 723,726 ----
***************
*** 827,831 ****
  {
  	$poster_id = $postrow[$i]['user_id'];
! 	$poster = $postrow[$i]['username'];
  
  	$post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']);
--- 830,834 ----
  {
  	$poster_id = $postrow[$i]['user_id'];
! 	$poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username'];
  
  	$post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']);