mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 23:16:13 +02:00
Code Issues Releases Wiki Activity

Some updates on the smiley display code, also fixed :\ smileys (#518428)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@2179 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Bart van Bragt 2002-02-17 17:25:31 +00:00
parent 40e8195045
commit 0e93ac3b0c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/post.php
View File

@ -107,6 +107,11 @@ function generate_smilies($mode, $page_id)
global $user_ip, $session_length, $starttime; global $user_ip, $session_length, $starttime;
global $userdata; global $userdata;
$inline_columns = 4;
$inline_rows = 6;
$window_columns = 8;
if( $mode == "window" ) if( $mode == "window" )
{ {
$userdata = session_pagestart($user_ip, $page_id, $session_length); $userdata = session_pagestart($user_ip, $page_id, $session_length);
@ -129,20 +134,21 @@ function generate_smilies($mode, $page_id)
{ {
if( $db->sql_numrows($result) ) if( $db->sql_numrows($result) )
{ {
$num_smilies = 0;
$rowset = array(); $rowset = array();
while( $row = $db->sql_fetchrow($result) ) while( $row = $db->sql_fetchrow($result) )
{ {
// If this is the first time that we encounter this smiley:
if( empty($rowset[$row['smile_url']]) ) if( empty($rowset[$row['smile_url']]) )
{ {
$rowset[$row['smile_url']]['code'] = $row['code']; $rowset[$row['smile_url']]['code'] = str_replace("\\", "\\\\", str_replace("'", "\\'", $row['code']));
$rowset[$row['smile_url']]['emoticon'] = $row['emoticon']; $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
$num_smilies++;
} }
} }
$num_smilies = count($rowset);
$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies; $smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
$smilies_split_row = ( $mode == "inline" ) ? 3 : 7; $smilies_split_row = ( $mode == "inline" ) ? $inline_columns - 1 : $window_columns - 1;
$s_colspan = 0; $s_colspan = 0;
$row = 0; $row = 0;
@ -165,7 +171,7 @@ function generate_smilies($mode, $page_id)
if( $col == $smilies_split_row ) if( $col == $smilies_split_row )
{ {
if( $mode == "inline" && $row == 4 ) if( $mode == "inline" && $row == $inline_rows - 1 )
{ {
break; break;
} }
@ -178,7 +184,7 @@ function generate_smilies($mode, $page_id)
} }
} }
if( $mode == "inline" && $num_smilies > 20) if( $mode == "inline" && $num_smilies > $inline_columns * $inline_rows)
{ {
$template->assign_block_vars("switch_smilies_extra", array()); $template->assign_block_vars("switch_smilies_extra", array());