[Phpbb-checkins] CVS: phpBB2/includes post.php,1.14,1.15

[Bart v. B. <ba...@us...>]

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

Modified Files:
	post.php 
Log Message:
Some updates on the smiley display code, also fixed :\ smileys (#518428)

Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** post.php	9 Feb 2002 15:54:40 -0000	1.14
--- post.php	17 Feb 2002 17:25:31 -0000	1.15
***************
*** 108,111 ****
--- 108,116 ----
  	global $userdata;
  
+ 	$inline_columns = 4;
+ 	$inline_rows = 6;
+ 
+ 	$window_columns = 8;
+ 
  	if( $mode == "window" )
  	{
***************
*** 130,147 ****
  		if( $db->sql_numrows($result) )
  		{
  			$rowset = array();
  			while( $row = $db->sql_fetchrow($result) )
  			{
  				if( empty($rowset[$row['smile_url']]) )
  				{
! 					$rowset[$row['smile_url']]['code'] = $row['code'];
  					$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
  				}
  			}
  
- 			$num_smilies = count($rowset);
- 
  			$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
! 			$smilies_split_row = ( $mode == "inline" ) ? 3 : 7;
  
  			$s_colspan = 0;
--- 135,153 ----
  		if( $db->sql_numrows($result) )
  		{
+ 			$num_smilies = 0;
  			$rowset = array();
  			while( $row = $db->sql_fetchrow($result) )
  			{
+ 				// If this is the first time that we encounter this smiley:
  				if( empty($rowset[$row['smile_url']]) )
  				{
! 					$rowset[$row['smile_url']]['code'] = str_replace("\\", "\\\\", str_replace("'", "\\'", $row['code']));
  					$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
+ 					$num_smilies++;
  				}
  			}
  
  			$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
! 			$smilies_split_row = ( $mode == "inline" ) ? $inline_columns - 1 : $window_columns - 1;
  
  			$s_colspan = 0;
***************
*** 166,170 ****
  				if( $col == $smilies_split_row )
  				{
! 					if( $mode == "inline" && $row == 4 )
  					{
  						break;
--- 172,176 ----
  				if( $col == $smilies_split_row )
  				{
! 					if( $mode == "inline" && $row == $inline_rows - 1 )
  					{
  						break;
***************
*** 179,183 ****
  			}
  
! 			if( $mode == "inline" && $num_smilies > 20)
  			{
  				$template->assign_block_vars("switch_smilies_extra", array());
--- 185,189 ----
  			}
  
! 			if( $mode == "inline" && $num_smilies > $inline_columns * $inline_rows)
  			{
  				$template->assign_block_vars("switch_smilies_extra", array());