Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 posting.php,1.127,1.128 privmsg.php,1.65,1.66
|
From: Bart v. B. <ba...@us...> - 2001-12-18 20:35:20
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6788
Modified Files:
posting.php privmsg.php
Log Message:
Moved generate_smilies() into includes/post.php, use smileypath in config table
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -r1.127 -r1.128
*** posting.php 2001/12/17 02:02:55 1.127
--- posting.php 2001/12/18 20:35:17 1.128
***************
*** 573,678 ****
}
- 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" => "images/smiles/" . $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);
- }
- }
//
// End page specific functions
--- 573,576 ----
***************
*** 2989,2991 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 2887,2889 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** privmsg.php 2001/12/17 02:02:55 1.65
--- privmsg.php 2001/12/18 20:35:17 1.66
***************
*** 35,152 ****
}
- // -----------------------
- // Page specific functions
- //
- // This isn't really specific since it's used in posting too,
- // however I'm too lazy to move them both to functions at the
- // moment. Of course in 2.2 all the posting routines should
- // be better 'integrated' so this won't be an issue
- //
- 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" => "images/smiles/" . $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);
- }
- }
- //
- // End page specific functions
- // ---------------------------
-
//
// Var definitions
--- 35,38 ----
|
