Menu
▾
▴
[mxbb-commits] core/modules/mx_textblocks mx_textblock_bbcode.php, 1.13, 1.14 mx_textblock_html.php, 1.12, 1.13 mx_textblock_multi.php, 1.15, 1.16
|
From: Jon O. <jon...@us...> - 2006-06-25 21:52:51
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25772/modules/mx_textblocks Modified Files: mx_textblock_bbcode.php mx_textblock_html.php mx_textblock_multi.php Log Message: Implementing a new mx_post class, to handle all kind of html, bbcode, smilies, links, images etc Index: mx_textblock_html.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_html.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_textblock_html.php 5 Apr 2006 21:07:17 -0000 1.12 --- mx_textblock_html.php 25 Jun 2006 21:52:42 -0000 1.13 *************** *** 4,8 **** * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 4,8 ---- * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 21,24 **** --- 21,37 ---- // + // Instantiate the mx_text class + // + include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); + $mx_text = new mx_text(); + $mx_text->init(true, false, false); + + // + // Decode for display + // + $title = $mx_text->display($title); + $message = $mx_text->display($message); + + // // Start output of page // Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_textblock_multi.php 5 Apr 2006 21:07:17 -0000 1.15 --- mx_textblock_multi.php 25 Jun 2006 21:52:42 -0000 1.16 *************** *** 4,8 **** * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 4,8 ---- * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 30,48 **** $board_config['allow_html_tags'] = $mx_block->get_parameters( 'html_tags' ); - // ********************************************************************** - // Read language definition - // ********************************************************************** - if( !file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) - { - include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); - } - else - { - include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); - } - // // Block Pages/toc // if( isset($HTTP_POST_VARS['page_num']) || isset($HTTP_GET_VARS['page_num']) ) { --- 30,37 ---- $board_config['allow_html_tags'] = $mx_block->get_parameters( 'html_tags' ); // // Block Pages/toc // + /* if( isset($HTTP_POST_VARS['page_num']) || isset($HTTP_GET_VARS['page_num']) ) { *************** *** 54,75 **** $page_num = 0; } $art_pages = explode('[page]', $message); $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 = $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS ); ! $message = mx_decode($message, $bbcode_uid, $allow_smilies, $allow_bbcode); ! } // --- 43,65 ---- $page_num = 0; } + */ + $page_num = $mx_request_vars->request('page_num', MX_TYPE_INT, 1) - 1; $art_pages = explode('[page]', $message); $message = trim($art_pages[$page_num]); $message = str_replace('[toc]', '', $message); + // ! // Instantiate the mx_text class // + include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); + $mx_text = new mx_text(); + $mx_text->init($allow_html, $allow_bbcode, $allow_smilies); // Note: allowed_html_tags is altered above ! // ! // Decode for display ! // ! $title = $mx_text->display_simple($title); ! $message = $mx_text->display($message, $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS )); // *************** *** 125,133 **** $art_split = explode('[toc]', $art_pages[$i]); $article_toc = $art_split[0]; - // $article_body = $art_split[1]; // // Fix up the toc title // if( !$allow_html ) { --- 115,123 ---- $art_split = explode('[toc]', $art_pages[$i]); $article_toc = $art_split[0]; // // Fix up the toc title // + if( !$allow_html ) { *************** *** 224,227 **** $template->pparse('body_block'); - ?> \ No newline at end of file --- 214,216 ---- Index: mx_textblock_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_bbcode.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mx_textblock_bbcode.php 5 Apr 2006 21:07:17 -0000 1.13 --- mx_textblock_bbcode.php 25 Jun 2006 21:52:42 -0000 1.14 *************** *** 4,12 **** * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { --- 4,12 ---- * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { *************** *** 23,27 **** $html_on = $board_config['allow_html'] ? true : false; $smilies_on = $board_config['allow_smilies'] ? true : false; ! if( !$html_on ) { --- 23,41 ---- $html_on = $board_config['allow_html'] ? true : false; $smilies_on = $board_config['allow_smilies'] ? true : false; ! ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Decode for display ! // ! $title = $mx_text->display($title); ! $message = $mx_text->display($message, $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS )); ! ! /* if( !$html_on ) { *************** *** 34,37 **** --- 48,52 ---- $message = mx_decode($message, $bbcode_uid, $smilies_on, $bbcode_on); } + */ // |
