[Phpbb-checkins] CVS: phpBB2/includes post.php,1.10,1.11

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

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

Modified Files:
	post.php 
Log Message:
Moved generate_smilies() into includes/post.php, use smileypath in config table

Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** post.php	2001/11/26 14:07:33	1.10
--- post.php	2001/12/18 20:35:17	1.11
***************
*** 97,99 ****
  }
  
! ?>
\ No newline at end of file
--- 97,206 ----
  }
  
! 
! //
! // Fill smiley templates (or just the variables) with smileys
! // Either in a window or inline
! //
! function generate_smilies($mode)
! {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! 	global $user_ip, $forum_id, $session_length;
! 	global $userdata;
! 
! 	if( $mode == 'window' )
! 	{
! 		$userdata = session_pagestart($user_ip, $forum_id, $session_length);
! 		init_userprefs($userdata);
! 
! 		$gen_simple_header = TRUE;
! 
! 		$page_title = $lang['Review_topic'] ." - $topic_title";
! 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! 
! 		$template->set_filenames(array(
! 			"smiliesbody" => "posting_smilies.tpl")
! 		);
! 	}
! 
! 	$sql = "SELECT emoticon, code, smile_url   
! 		FROM " . SMILIES_TABLE . " 
! 		ORDER BY smilies_id";
! 	if( $result = $db->sql_query($sql) )
! 	{
! 		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;
! 			$row = 0;
! 			$col = 0;
! 
! 			while( list($smile_url, $data) = @each($rowset) )
! 			{
! 				if( !$col )
! 				{
! 					$template->assign_block_vars("smilies_row", array());
! 				}
! 
! 				$template->assign_block_vars("smilies_row.smilies_col", array(
! 					"SMILEY_CODE" => $data['code'],
! 					"SMILEY_IMG" => $board_config['smilies_path'] . "/" . $smile_url,
! 					"SMILEY_DESC" => $data['emoticon'])
! 				);
! 
! 				$s_colspan = max($s_colspan, $col + 1);
! 
! 				if( $col == $smilies_split_row )
! 				{
! 					if( $mode == 'inline' && $row == 4 )
! 					{
! 						break;
! 					}
! 					$col = 0;
! 					$row++;
! 				}
! 				else
! 				{
! 					$col++;
! 				}
! 			}
! 
! 			if( $mode == 'inline' && $num_smilies > 20)
! 			{
! 				$template->assign_block_vars("switch_smilies_extra", array());
! 
! 				$template->assign_vars(array(
! 					"L_MORE_SMILIES" => $lang['More_emoticons'], 
! 					"U_MORE_SMILIES" => append_sid("posting.$phpEx?mode=smilies"))
! 				);
! 			}
! 
! 			$template->assign_vars(array(
! 				"L_EMOTICONS" => $lang['Emoticons'], 
! 				"L_CLOSE_WINDOW" => $lang['Close_window'], 
! 				"S_SMILIES_COLSPAN" => $s_colspan)
! 			);
! 		}
! 	}
! 
! 	if( $mode == 'window' )
! 	{
! 		$template->pparse("smiliesbody");
! 
! 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! 	}
! }
! ?>