Menu
▾
▴
[mxbb-commits] core/modules/mx_textblocks TextBlocks.pak,1.5,1.6 mx_textblock_bbcode.php,1.6,1.7 mx_textblock_blog.php,1.4,1.5 mx_textblock_html.php,1.5,1.6 mx_textblock_multi.php,1.7,1.8
|
From: Jon O. <jon...@us...> - 2005-04-12 17:39:04
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5654/modules/mx_textblocks Modified Files: TextBlocks.pak mx_textblock_bbcode.php mx_textblock_blog.php mx_textblock_html.php mx_textblock_multi.php Log Message: Index: mx_textblock_html.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_html.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_textblock_html.php 9 Jan 2005 21:53:02 -0000 1.5 --- mx_textblock_html.php 12 Apr 2005 17:38:37 -0000 1.6 *************** *** 24,27 **** --- 24,29 ---- $message = $block_config[$block_id][Html]['parameter_value']; + $message = str_replace("\n", "\n<br />\n", $message); + // Start output of page Index: TextBlocks.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/TextBlocks.pak,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TextBlocks.pak 18 Feb 2005 10:10:46 -0000 1.5 --- TextBlocks.pak 12 Apr 2005 17:38:37 -0000 1.6 *************** *** 1,9 **** module=+:20=+:Text Blocks=+:modules/mx_textblocks/=+:Textblocks module=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:20=+:TextBlock_BBcode=+:TextBlock_BBcode=+:mx_textblock_bbcode.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php parameter=+:20=+:15=+:Text=+:BBText=+:Insert your text here=+: option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock_BBcode=+:Demo block=+:20=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:20=+:80=+:TextBlock_Blog=+:UserBlog Textblock=+:mx_textblock_blog.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php --- 1,9 ---- module=+:20=+:Text Blocks=+:modules/mx_textblocks/=+:Textblocks module=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:20=+:TextBlock (phpBB)=+:BBcodes, html and smilies usage defined by phpBB config=+:mx_textblock_bbcode.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php parameter=+:20=+:15=+:Text=+:BBText=+:Insert your text here=+: option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (phpBB)=+:Demo block=+:20=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:20=+:80=+:TextBlock_Blog=+:UserBlog Textblock=+:mx_textblock_blog.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php *************** *** 13,23 **** block=+:=+:Demo - TextBlock_Blog=+:Demo block=+:80=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:21=+:TextBlock_Html=+:TextBlock_Html=+:mx_textblock_html.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php parameter=+:21=+:16=+:Html=+:Html=+:Entre your Html code here=+: option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock_Html=+:Demo block=+:21=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:22=+:TextBlock_Multi=+:Textblock for bbcode and html with parameters=+:mx_textblock_multi.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php parameter=+:22=+:52=+:block_style=+:Boolean=+:TRUE=+: option=+:0=+:0=+:0=+:endoflist=+: --- 13,31 ---- block=+:=+:Demo - TextBlock_Blog=+:Demo block=+:80=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:21=+:TextBlock (Html/wysiwyg)=+:Plain html textblock, or featuring wysiwyg =+:mx_textblock_html.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php parameter=+:21=+:16=+:Html=+:Html=+:Entre your Html code here=+: option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (Html/wysiwyg)=+:Demo block=+:21=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:22=+:TextBlock (Multi)=+:Textblock, featuring block defined settings=+:mx_textblock_multi.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php ! parameter=+:22=+:327=+:allow_bbcode=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:326=+:allow_html=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:326=+:html_tags=+:Text=+:b,i,u,img=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:328=+:allow_smilies=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:22=+:52=+:block_style=+:Boolean=+:TRUE=+: option=+:0=+:0=+:0=+:endoflist=+: *************** *** 29,32 **** option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock_Multi=+:Demo block=+:22=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 37,40 ---- option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (Multi)=+:Demo block=+:22=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_textblock_multi.php 18 Feb 2005 10:10:46 -0000 1.7 --- mx_textblock_multi.php 12 Apr 2005 17:38:37 -0000 1.8 *************** *** 22,31 **** $title = $block_config[$block_id]['block_title']; ! $message = $block_config[$block_id][Text]['parameter_value']; - $block_style = $block_config[$block_id][block_style]['parameter_value']; - $text_style = $block_config[$block_id][text_style]['parameter_value']; - $title_style = $block_config[$block_id][title_style]['parameter_value']; - $show_title = $block_config[$block_id][show_title]['parameter_value']; // ********************************************************************** // Read language definition --- 22,36 ---- $title = $block_config[$block_id]['block_title']; ! $message = $block_config[$block_id]['Text']['parameter_value']; ! ! $block_style = $block_config[$block_id]['block_style']['parameter_value']; ! $text_style = $block_config[$block_id]['text_style']['parameter_value']; ! $title_style = $block_config[$block_id]['title_style']['parameter_value']; ! $show_title = $block_config[$block_id]['show_title']['parameter_value']; ! ! $allow_bbcode = $block_config[$block_id]['allow_bbcode']['parameter_value'] == 'TRUE'; ! $allow_html = $block_config[$block_id]['allow_html']['parameter_value'] == 'TRUE'; ! $allow_smilies = $block_config[$block_id]['allow_smilies']['parameter_value'] == 'TRUE'; // ********************************************************************** // Read language definition *************** *** 53,60 **** $message = trim( $art_pages[$page_num] ); $message = str_replace( '[toc]', '', $message ); // End Pages/TOC - $bbcode_uid = $block_config[$block_id][Text]['bbcode_uid']; - $message = mx_decode( $message, $bbcode_uid ) ; // Start output of page --- 58,76 ---- $message = trim( $art_pages[$page_num] ); $message = str_replace( '[toc]', '', $message ); + + // End Pages/TOC + if ( !$allow_html ) + { + $message = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $message ); + } + + if ( $allow_bbcode ) + { + $bbcode_uid = $block_config[$block_id]['Text']['bbcode_uid']; + $message = mx_decode( $message, $bbcode_uid, $allow_smilies, $allow_bbcode ) ; + } + // Start output of page *************** *** 97,104 **** ) ); - // article pages table of contents - $xtra_dynamic = isset( $HTTP_GET_VARS['dynamic_block'] ) ? '&dynamic_block=' . $HTTP_GET_VARS['dynamic_block']: ''; ! if ( count( $art_pages ) > 1 ) { --- 113,120 ---- ) ); $xtra_dynamic = isset( $HTTP_GET_VARS['dynamic_block'] ) ? '&dynamic_block=' . $HTTP_GET_VARS['dynamic_block']: ''; ! ! // Formatting the TOC ! if ( count( $art_pages ) > 1 ) { *************** *** 106,109 **** --- 122,126 ---- $i = 0; + while ( $i < count( $art_pages ) ) { *************** *** 113,118 **** $article_toc = $art_split[0]; // $article_body = $art_split[1]; // Fix up the toc title ! if ( !$board_config['allow_html'] ) { $article_toc = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc ); --- 130,136 ---- $article_toc = $art_split[0]; // $article_body = $art_split[1]; + // Fix up the toc title ! if ( !$allow_html ) { $article_toc = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc ); *************** *** 121,133 **** // Parse message - // $bbcode_uid = $row['bbcode_uid']; - // $article_toc = preg_replace('/\:[0-9a-z\:]+\]/si', ']', $article_toc); $article_toc = preg_replace( "/\[(\S+)\]/e", "", $article_toc ); - // $txt = preg_replace("/<a href=\"(.*)\">(.*)<\/a>/i", "\\2 (\\1)", $txt); $article_toc = make_clickable( $article_toc ); // Parse smilies ! if ( $board_config['allow_smilies'] ) { $article_toc = mx_smilies_pass( $article_toc ); --- 139,148 ---- // Parse message $article_toc = preg_replace( "/\[(\S+)\]/e", "", $article_toc ); $article_toc = make_clickable( $article_toc ); // Parse smilies ! if ( $allow_smilies ) { $article_toc = mx_smilies_pass( $article_toc ); *************** *** 140,146 **** --- 155,163 ---- $article_toc = str_replace( '\"', '"', substr( preg_replace( '#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<' ), 1, -1 ) ); } + // Replace newlines (we use this rather than nl2br because // till recently it wasn't XHTML compliant) // $article_toc = str_replace("\n", "\n<br />\n", $article_toc); + $page_toc = $art_pages[$i]; *************** *** 159,169 **** $page_link .= '<br />'; } $template->assign_block_vars( 'switch_toc.pages', array( 'TOC_ITEM' => $page_link ) ); $i++; } } ! // article pages if ( count( $art_pages ) > 1 ) --- 176,188 ---- $page_link .= '<br />'; } + $template->assign_block_vars( 'switch_toc.pages', array( 'TOC_ITEM' => $page_link ) ); + $i++; } } ! // Formatting the TOC navigation/pagination if ( count( $art_pages ) > 1 ) *************** *** 172,178 **** --- 191,199 ---- $i = 0; + while ( $i < count( $art_pages ) ) { $page_number = $i + 1; + if ( $page_num != $i ) { *************** *** 189,194 **** --- 210,217 ---- $page_link .= ', '; } + $template->assign_block_vars( 'switch_pages.pages', array( 'PAGE_LINK' => $page_link ) ); + $i++; } Index: mx_textblock_blog.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_blog.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_textblock_blog.php 18 Feb 2005 10:10:46 -0000 1.4 --- mx_textblock_blog.php 12 Apr 2005 17:38:37 -0000 1.5 *************** *** 41,46 **** $title = $block_config[$block_id]['block_title']; ! $message = $block_config[$block_id][Blog]['parameter_value']; ! $blog_id = $block_config[$block_id][blog_id]['parameter_value']; // $block_style = $block_config[$block_id][block_style]['parameter_value']; --- 41,46 ---- $title = $block_config[$block_id]['block_title']; ! $message = $block_config[$block_id]['Blog']['parameter_value']; ! $blog_id = $block_config[$block_id]['blog_id']['parameter_value']; // $block_style = $block_config[$block_id][block_style]['parameter_value']; *************** *** 74,78 **** $message = str_replace( '[toc]', '', $message ); // End Pages/TOC ! $bbcode_uid = $block_config[$block_id][Blog]['bbcode_uid']; $message = mx_decode( $message, $bbcode_uid ) ; --- 74,78 ---- $message = str_replace( '[toc]', '', $message ); // End Pages/TOC ! $bbcode_uid = $block_config[$block_id]['Blog']['bbcode_uid']; $message = mx_decode( $message, $bbcode_uid ) ; Index: mx_textblock_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_bbcode.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_textblock_bbcode.php 9 Jan 2005 21:53:02 -0000 1.6 --- mx_textblock_bbcode.php 12 Apr 2005 17:38:37 -0000 1.7 *************** *** 26,32 **** $message = $block_config[$block_id][Text]['parameter_value']; ! $bbcode_uid = $block_config[$block_id][Text]['bbcode_uid']; ! $message = mx_decode( $message, $bbcode_uid ) ; // Start output of page --- 26,43 ---- $message = $block_config[$block_id][Text]['parameter_value']; ! $bbcode_on = $board_config['allow_bbcode'] ? true : false; ! $html_on = $board_config['allow_html'] ? true : false; ! $smilies_on = $board_config['allow_smilies'] ? true : false; ! ! if ( !$html_on ) ! { ! $message = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $message ); ! } ! if ( $bbcode_on ) ! { ! $bbcode_uid = $block_config[$block_id][Text]['bbcode_uid']; ! $message = mx_decode( $message, $bbcode_uid, $smilies_on, $bbcode_on ) ; ! } // Start output of page |
