[mxbb-commits] core/includes/sessions/phpbb3 bbcode.php,1.14,1.15

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15752/sessions/phpbb3

Modified Files:
	bbcode.php 
Log Message:


Index: bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** bbcode.php	2 Jun 2013 12:56:25 -0000	1.14
--- bbcode.php	25 Jun 2013 18:15:08 -0000	1.15
***************
*** 1922,1932 ****
  		$window_columns = 8;
  
  		if ($mode == 'window')
  		{
- 			$mx_user->init($user_ip, PAGE_INDEX);
- 
- 			$gen_simple_header = TRUE;
- 			$page_title = $lang['Emoticons'];
- 
  			if ($forum_id)
  			{
--- 1922,1929 ----
  		$window_columns = 8;
  
+ 		$start = phpBB3::request_var('start', 0);
+ 
  		if ($mode == 'window')
  		{
  			if ($forum_id)
  			{
***************
*** 1945,1953 ****
  			}
  
! 			include($mx_root_path . 'includes/page_header.'.$phpEx);
  
  			$template->set_filenames(array(
! 				'smiliesbody' => 'posting_smilies.html')
  			);
  		}
  
--- 1942,1964 ----
  			}
  
! 			//page_header($mx_user->lang['SMILIES']);
  
+ 			$sql = 'SELECT COUNT(smiley_id) AS item_count
+ 				FROM ' . SMILIES_TABLE . '
+ 				GROUP BY smiley_url';
+ 			$result = $db->sql_query($sql, 3600);
+ 
+ 			$smiley_count = 0;
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				++$smiley_count;
+ 			}
+ 			$db->sql_freeresult($result);
+ 			/*
  			$template->set_filenames(array(
! 				'body' => 'posting_smilies.html')
  			);
+ 			generate_pagination(mx3_append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id), $smiley_count, $config['smilies_per_page'], $start);
+ 			*/
  		}
  
***************
*** 1967,1979 ****
  		}
  
! 		$last_url = '';
  
! 		$sql = 'SELECT *
! 			FROM ' . SMILIES_TABLE .
! 			(($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . '
! 			ORDER BY smiley_order';
  
  		//phpBB2 code start
! 		if ($result = $db->sql_query($sql))
  		{
  			$num_smilies = 0;
--- 1978,2002 ----
  		}
  
! 		if ($mode == 'window')
! 		{
! 			$sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height, MIN(smiley_order) AS min_smiley_order
! 				FROM ' . SMILIES_TABLE . '
! 				GROUP BY smiley_url, smiley_width, smiley_height
! 				ORDER BY min_smiley_order';
! 			$result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600);
! 		}
! 		else
! 		{
! 			$sql = 'SELECT *
! 				FROM ' . SMILIES_TABLE . '
! 				WHERE display_on_posting = 1
! 				ORDER BY smiley_order';
! 			$result = $db->sql_query($sql, 3600);
! 		}
  
! 		$smilies = array();
  
  		//phpBB2 code start
! 		if ($result)
  		{
  			$num_smilies = 0;
***************
*** 1981,1991 ****
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				if (empty($rowset[$row['smiley_url']]))
  				{
  					$rowset[$row['smiley_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
! 					$rowset[$row['smiley_url']]['emoticon'] = $row['emoticon'];
! 					$num_smilies++;
  				}
  			}
  
  			if ($num_smilies)
--- 2004,2016 ----
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				if (empty($smilies[$row['smiley_url']]))
  				{
+ 					$smilies[$row['smiley_url']] = $row;
  					$rowset[$row['smiley_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
! 					$rowset[$row['smiley_url']]['emotion'] = $row['emotion'];
! 					$num_smilies++;					
  				}
  			}
+ 			$db->sql_freeresult($result);			
  
  			if ($num_smilies)
***************
*** 2008,2012 ****
  						'SMILEY_CODE' => $data['code'],
  						'SMILEY_IMG' => $this->smiley_path_url  . $board_config['smilies_path'] . '/' . $smile_url,
! 						'SMILEY_DESC' => $data['emoticon'])
  					);
  
--- 2033,2037 ----
  						'SMILEY_CODE' => $data['code'],
  						'SMILEY_IMG' => $this->smiley_path_url  . $board_config['smilies_path'] . '/' . $smile_url,
! 						'SMILEY_DESC' => isset($data['emotion']) ? $data['emotion'] : $row['emotion'])
  					);