mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core common.php,1.67.2.13,1.67.2.14

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31147

Modified Files:
      Tag: core28x
	common.php 
Log Message:
Oopps

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.67.2.13
retrieving revision 1.67.2.14
diff -C2 -d -r1.67.2.13 -r1.67.2.14
*** common.php	15 Jul 2008 22:09:25 -0000	1.67.2.13
--- common.php	15 Jul 2008 22:13:12 -0000	1.67.2.14
***************
*** 312,315 ****
--- 312,320 ----
  
  //
+ // Instatiate the mx_bbcode class
+ //
+ $mx_bbcode = new mx_bbcode();
+ 
+ //
  // Get mxBB config settings
  //

[mxbb-commits] core common.php,1.67.2.12,1.67.2.13

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28267

Modified Files:
      Tag: core28x
	common.php 
Log Message:
Updating, to work with latest modules

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.67.2.12
retrieving revision 1.67.2.13
diff -C2 -d -r1.67.2.12 -r1.67.2.13
*** common.php	21 Mar 2008 20:05:15 -0000	1.67.2.12
--- common.php	15 Jul 2008 22:09:25 -0000	1.67.2.13
***************
*** 300,303 ****
--- 300,304 ----
  include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions
  include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); // phpBB associated functions
+ include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBcodes
  include_once($mx_root_path . 'includes/mx_functions_core.' . $phpEx); // CORE class
  

[mxbb-commits] core/admin pagestart.php,1.23.2.1,1.23.2.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28267/admin

Modified Files:
      Tag: core28x
	pagestart.php 
Log Message:
Updating, to work with latest modules

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -d -r1.23.2.1 -r1.23.2.2
*** pagestart.php	3 Feb 2008 19:22:08 -0000	1.23.2.1
--- pagestart.php	15 Jul 2008 22:09:24 -0000	1.23.2.2
***************
*** 23,27 ****
  include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx);
  include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
! include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
  
  //
--- 23,36 ----
  include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx);
  include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
! 
! if( !function_exists('prepare_message') )
! {
! 	mx_cache::load_file('functions_post');
! }
! 
! if( !function_exists('add_search_words') )
! {
! 	mx_cache::load_file('functions_search');
! }
  
  //

[mxbb-commits] core/includes mx_functions_bbcode.php, NONE, 1.12.2.2 mx_functions_tools.php, 1.15.2.12, 1.15.2.13

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28267/includes

Modified Files:
      Tag: core28x
	mx_functions_tools.php 
Added Files:
      Tag: core28x
	mx_functions_bbcode.php 
Log Message:
Updating, to work with latest modules

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.15.2.12
retrieving revision 1.15.2.13
diff -C2 -d -r1.15.2.12 -r1.15.2.13
*** mx_functions_tools.php	10 Jul 2008 23:47:21 -0000	1.15.2.12
--- mx_functions_tools.php	15 Jul 2008 22:09:26 -0000	1.15.2.13
***************
*** 15,23 ****
  }
  
- //
- // This 'include' is needed for the mx_text class
- //
- @include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx);
- 
  /**
   * Class: mx_text.
--- 15,18 ----
***************
*** 106,110 ****
  
  			$this->highlight = urlencode($_GET['highlight']);
! 			$this->highlight_match = phpbb_rtrim($this->highlight_match, "\\");
  		}
  
--- 101,105 ----
  
  			$this->highlight = urlencode($_GET['highlight']);
! 			$this->highlight_match = phpBB2::phpbb_rtrim($this->highlight_match, "\\");
  		}
  
***************
*** 124,127 ****
--- 119,124 ----
  	function display($text, $bbcode_uid = '')
  	{
+ 		global $mx_bbcode;
+ 
  		//
  		// strip html if reqd
***************
*** 140,149 ****
  		if ($text != '' && $bbcode_uid != '')
  		{
! 			$text = ($this->bbcode_on) ? bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text);
  		}
  
  		if ( $text != '' )
  		{
! 			$text = make_clickable($text);
  		}
  
--- 137,146 ----
  		if ($text != '' && $bbcode_uid != '')
  		{
! 			$text = ($this->bbcode_on) ? $mx_bbcode->bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text);
  		}
  
  		if ( $text != '' )
  		{
! 			$text = $mx_bbcode->make_clickable($text);
  		}
  
***************
*** 155,159 ****
  			if ( $text != '' )
  			{
! 				$text = mx_smilies_pass($text);
  			}
  		}
--- 152,156 ----
  			if ( $text != '' )
  			{
! 				$text = $mx_bbcode->smilies_pass($text);
  			}
  		}
***************
*** 280,284 ****
  	function encode($text)
  	{
! 		global $board_config, $userdata, $lang, $phpEx, $phpbb_root_path;
  
  		$this->bbcode_uid = '';
--- 277,281 ----
  	function encode($text)
  	{
! 		global $board_config, $userdata, $lang, $phpEx, $phpbb_root_path, $mx_bbcode;
  
  		$this->bbcode_uid = '';
***************
*** 289,293 ****
  		if (!empty($text))
  		{
! 			$this->bbcode_uid = ($this->bbcode_on) ? make_bbcode_uid() : '';
  			$text = $this->prepare_message(trim($text), $this->html_on, $this->bbcode_on, $this->smilies_on, $this->bbcode_uid);
  		}
--- 286,290 ----
  		if (!empty($text))
  		{
! 			$this->bbcode_uid = ($this->bbcode_on) ? $mx_bbcode->make_bbcode_uid() : '';
  			$text = $this->prepare_message(trim($text), $this->html_on, $this->bbcode_on, $this->smilies_on, $this->bbcode_uid);
  		}
***************
*** 334,338 ****
  		if (!empty($username))
  		{
! 			$username = phpbb_clean_username($username);
  
  			if (!$userdata['session_logged_in'] || ($userdata['session_logged_in'] && $username != $userdata['username']))
--- 331,335 ----
  		if (!empty($username))
  		{
! 			$username = phpBB2::phpbb_clean_username($username);
  
  			if (!$userdata['session_logged_in'] || ($userdata['session_logged_in'] && $username != $userdata['username']))
***************
*** 364,368 ****
  	function encode_preview($text)
  	{
! 		global $html_entities_match, $html_entities_replace, $board_config;
  
  		if ($this->allow_all_html_tags)
--- 361,365 ----
  	function encode_preview($text)
  	{
! 		global $html_entities_match, $html_entities_replace, $board_config, $mx_bbcode;
  
  		if ($this->allow_all_html_tags)
***************
*** 375,384 ****
  		$text = ( !empty($text) ) ? htmlspecialchars(trim(stripslashes($text))) : '';
  
! 		$bbcode_uid = ( $this->bbcode_on ) ? make_bbcode_uid() : '';
  		$text = stripslashes($this->prepare_message(addslashes($this->unprepare_message($text)), $this->html_on, $this->bbcode_on, $this->smilies_on, $bbcode_uid));
  
  		if( $this->bbcode_on )
  		{
! 			$text = bbencode_second_pass($text, $bbcode_uid);
  		}
  
--- 372,381 ----
  		$text = ( !empty($text) ) ? htmlspecialchars(trim(stripslashes($text))) : '';
  
! 		$bbcode_uid = ( $this->bbcode_on ) ? $mx_bbcode->make_bbcode_uid() : '';
  		$text = stripslashes($this->prepare_message(addslashes($this->unprepare_message($text)), $this->html_on, $this->bbcode_on, $this->smilies_on, $bbcode_uid));
  
  		if( $this->bbcode_on )
  		{
! 			$text = $mx_bbcode->bbencode_second_pass($text, $bbcode_uid);
  		}
  
***************
*** 388,396 ****
  		}
  
! 		$text = make_clickable($text);
  
  		if( $this->smilies_on )
  		{
! 			$text = mx_smilies_pass($text);
  		}
  
--- 385,393 ----
  		}
  
! 		$text = $mx_bbcode->make_clickable($text);
  
  		if( $this->smilies_on )
  		{
! 			$text = $mx_bbcode->smilies_pass($text);
  		}
  
***************
*** 439,443 ****
  	function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid = 0)
  	{
! 		global $board_config, $html_entities_match, $html_entities_replace;
  
  		//
--- 436,440 ----
  	function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid = 0)
  	{
! 		global $board_config, $html_entities_match, $html_entities_replace, $mx_bbcode;
  
  		//
***************
*** 479,483 ****
  		if($bbcode_on && $bbcode_uid != '')
  		{
! 			$message = bbencode_first_pass($message, $bbcode_uid);
  		}
  
--- 476,480 ----
  		if($bbcode_on && $bbcode_uid != '')
  		{
! 			$message = $mx_bbcode->bbencode_first_pass($message, $bbcode_uid);
  		}
  
***************
*** 1623,1627 ****
  // Includes
  //
! @include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
  
  /**
--- 1620,1632 ----
  // Includes
  //
! if( !function_exists('prepare_message') )
! {
! 	mx_cache::load_file('functions_post');
! }
! 
! if( !function_exists('add_search_words') )
! {
! 	mx_cache::load_file('functions_search');
! }
  
  /**
***************
*** 1789,1793 ****
  	function _insert_pm()
  	{
! 	   global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $phpEx;
  
  	   //
--- 1794,1798 ----
  	function _insert_pm()
  	{
! 	   global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $phpEx, $mx_bbcode;
  
  	   //
***************
*** 1826,1830 ****
  	         if ( $this->bbcode_on )
  	         {
! 	            $bbcode_uid = make_bbcode_uid();
  	         }
  
--- 1831,1835 ----
  	         if ( $this->bbcode_on )
  	         {
! 	            $bbcode_uid = $mx_bbcode->make_bbcode_uid();
  	         }
  
***************
*** 1959,1963 ****
  	   return;
  
! 	   $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  	   mx_message_die(GENERAL_MESSAGE, $msg);
--- 1964,1968 ----
  	   return;
  
! 	   $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . mx_append_sid("privmsg.$phpEx?folder=inbox") . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>');
  
  	   mx_message_die(GENERAL_MESSAGE, $msg);
***************
*** 1971,1975 ****
  	function _mailer()
  	{
! 	   global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $phpEx;
  
  	   //
--- 1976,1980 ----
  	function _mailer()
  	{
! 	   global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $phpEx, $mx_bbcode;
  
  	   //
***************
*** 2009,2013 ****
  	         if ( $this->bbcode_on )
  	         {
! 	            $bbcode_uid = make_bbcode_uid();
  	         }
  
--- 2014,2018 ----
  	         if ( $this->bbcode_on )
  	         {
! 	            $bbcode_uid = $mx_bbcode->make_bbcode_uid();
  	         }
  
***************
*** 2059,2063 ****
  		global $lang, $phpEx;
  
! 			$new_line_char = $this->allow_comment_wysiwyg  ? '<br />' : "\n";
  
  			//
--- 2064,2068 ----
  		global $lang, $phpEx;
  
! 			$new_line_char = $this->allow_comment_wysiwyg  ? '<br /> ' : "\n ";
  
  			//
***************
*** 3120,3128 ****
  
  		//
- 		// Includes
- 		//
- 		include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx);
- 
- 		//
  		// initialise some variables
  		//
--- 3125,3128 ----
***************
*** 3397,3402 ****
  		global $userdata, $user_ip;
  
- 		include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
- 
  		$forum_update_sql = "forum_posts = forum_posts - 1";
  		$topic_update_sql = '';
--- 3397,3400 ----
***************
*** 4169,4172 ****
--- 4167,4171 ----
  					'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['post_id']),
  					'EDIT_IMG' => $this->images['icon_edit'],
+ 					'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['post_id'])),
  				));
  			}
***************
*** 4178,4181 ****
--- 4177,4181 ----
  					'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['post_id']),
  					'DELETE_IMG' => $this->images['icon_delpost'],
+ 					'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['post_id'])),
  				));
  			}
***************
*** 4189,4192 ****
--- 4189,4193 ----
  				'U_COMMENT_POST' => $this->u_post(),
  				'REPLY_IMG' => $this->images['comment_post'],
+ 				'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()),
  			));
  		}

--- NEW FILE: mx_functions_bbcode.php ---
<?php
/**
*
* @package Functions_phpBB
* @version $Id: mx_functions_bbcode.php,v 1.12.2.2 2008/07/15 22:09:28 jonohlsson Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
*
*/

if (!defined('IN_PORTAL'))
{
	exit;
}

//
// Here comes a mxp version of original phpbb2 bbcode.php
// Last in file are the mxp wrapper functions
//

define("BBCODE_UID_LEN", 10);

// global that holds loaded-and-prepared bbcode templates, so we only have to do
// that stuff once.

$bbcode_tpl = null;

// Need to initialize the random numbers only ONCE
mt_srand( (double) microtime() * 1000000);


class bbcode_base
{
	/**
	 * Loads bbcode templates from the bbcode.tpl file of the current template set.
	 * Creates an array, keys are bbcode names like "b_open" or "url", values
	 * are the associated template.
	 * Probably pukes all over the place if there's something really screwed
	 * with the bbcode.tpl file.
	 *
	 * Nathan Codding, Sept 26 2001.
	  * This a temporary function
	 */
	function load_bbcode_template()
	{
		global $template;
		$tpl_filename = $template->make_filename('bbcode.tpl');
		$tpl = fread(fopen($tpl_filename, 'r'), filesize($tpl_filename));

		// replace \ with \\ and then ' with \'.
		$tpl = str_replace('\\', '\\\\', $tpl);
		$tpl  = str_replace('\'', '\\\'', $tpl);

		// strip newlines.
		$tpl  = str_replace("\n", '', $tpl);

		// Turn template blocks into PHP assignment statements for the values of $bbcode_tpls..
		$tpl = preg_replace('#<!-- BEGIN (.*?) -->(.*?)<!-- END (.*?) -->#', "\n" . '$bbcode_tpls[\'\\1\'] = \'\\2\';', $tpl);

		$bbcode_tpls = array();

		eval($tpl);

		return $bbcode_tpls;
	}

	/**
	 * Prepares the loaded bbcode templates for insertion into preg_replace()
	 * or str_replace() calls in the bbencode_second_pass functions. This
	 * means replacing template placeholders with the appropriate preg backrefs
	 * or with language vars. NOTE: If you change how the regexps work in
	 * bbencode_second_pass(), you MUST change this function.
	 *
	 * Nathan Codding, Sept 26 2001
	 *
	  * This a temporary function
	 */
	function prepare_bbcode_template($bbcode_tpl)
	{
		global $lang;

		$bbcode_tpl['olist_open'] = str_replace('{LIST_TYPE}', '\\1', $bbcode_tpl['olist_open']);

		$bbcode_tpl['color_open'] = str_replace('{COLOR}', '\\1', $bbcode_tpl['color_open']);

		$bbcode_tpl['size_open'] = str_replace('{SIZE}', '\\1', $bbcode_tpl['size_open']);

		$bbcode_tpl['quote_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_open']);

		$bbcode_tpl['quote_username_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_username_open']);
		$bbcode_tpl['quote_username_open'] = str_replace('{L_WROTE}', $lang['wrote'], $bbcode_tpl['quote_username_open']);
		$bbcode_tpl['quote_username_open'] = str_replace('{USERNAME}', '\\1', $bbcode_tpl['quote_username_open']);

		$bbcode_tpl['code_open'] = str_replace('{L_CODE}', $lang['Code'], $bbcode_tpl['code_open']);

		$bbcode_tpl['img'] = str_replace('{URL}', '\\1', $bbcode_tpl['img']);

		// We do URLs in several different ways..
		$bbcode_tpl['url1'] = str_replace('{URL}', '\\1', $bbcode_tpl['url']);
		$bbcode_tpl['url1'] = str_replace('{DESCRIPTION}', '\\1', $bbcode_tpl['url1']);

		$bbcode_tpl['url2'] = str_replace('{URL}', 'http://\\1', $bbcode_tpl['url']);
		$bbcode_tpl['url2'] = str_replace('{DESCRIPTION}', '\\1', $bbcode_tpl['url2']);

		$bbcode_tpl['url3'] = str_replace('{URL}', '\\1', $bbcode_tpl['url']);
		$bbcode_tpl['url3'] = str_replace('{DESCRIPTION}', '\\2', $bbcode_tpl['url3']);

		$bbcode_tpl['url4'] = str_replace('{URL}', 'http://\\1', $bbcode_tpl['url']);
		$bbcode_tpl['url4'] = str_replace('{DESCRIPTION}', '\\3', $bbcode_tpl['url4']);

		$bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']);

		//Start more bbcode
		$bbcode_tpl['stream'] = str_replace('{URL}', '\\1', $bbcode_tpl['stream']);
		$bbcode_tpl['web'] = str_replace('{URL}', '\\1', $bbcode_tpl['web']);
		$bbcode_tpl['flash'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['flash']);
		$bbcode_tpl['flash'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['flash']);
		$bbcode_tpl['flash'] = str_replace('{URL}', '\\3', $bbcode_tpl['flash']);
		$bbcode_tpl['video'] = str_replace('{URL}', '\\3', $bbcode_tpl['video']);
		$bbcode_tpl['video'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['video']);
		$bbcode_tpl['video'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['video']);
		$bbcode_tpl['GVideo'] = str_replace('{GVIDEOID}', '\\1', $bbcode_tpl['GVideo']);
		$bbcode_tpl['GVideo'] = str_replace('{GVIDEOLINK}', $lang['Link'], $bbcode_tpl['GVideo']);
		$bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']);
		$bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['Link'], $bbcode_tpl['youtube']);
		//Stop more bbcode

		define("BBCODE_TPL_READY", true);

		return $bbcode_tpl;
	}

	/**
	 * Does second-pass bbencoding. This should be used before displaying the message in
	 * a thread. Assumes the message is already first-pass encoded, and we are given the
	 * correct UID as used in first-pass encoding.
	 * This a temporary function
	 */
	function bbencode_second_pass($text, $uid)
	{
		global $lang, $bbcode_tpl;

		$text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1&#058;", $text);

		// pad it with a space so we can distinguish between FALSE and matching the 1st char (index 0).
		// This is important; bbencode_quote(), bbencode_list(), and bbencode_code() all depend on it.
		$text = " " . $text;

		// First: If there isn't a "[" and a "]" in the message, don't bother.
		if (! (strpos($text, "[") && strpos($text, "]")) )
		{
			// Remove padding, return.
			$text = substr($text, 1);
			return $text;
		}

		// Only load the templates ONCE..
		if (!defined("BBCODE_TPL_READY"))
		{
			// load templates from file into array.
			$bbcode_tpl = $this->load_bbcode_template();

			// prepare array for use in regexps.
			$bbcode_tpl = $this->prepare_bbcode_template($bbcode_tpl);
		}

		// [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts.
		$text = $this->bbencode_second_pass_code($text, $uid, $bbcode_tpl);

		// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
		$text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text);
		$text = str_replace("[/quote:$uid]", $bbcode_tpl['quote_close'], $text);

		// New one liner to deal with opening quotes with usernames...
		// replaces the two line version that I had here before..
		$text = preg_replace("/\[quote:$uid=\"(.*?)\"\]/si", $bbcode_tpl['quote_username_open'], $text);

		// [list] and [list=x] for (un)ordered lists.
		// unordered lists
		$text = str_replace("[list:$uid]", $bbcode_tpl['ulist_open'], $text);
		// li tags
		$text = str_replace("[*:$uid]", $bbcode_tpl['listitem'], $text);
		// ending tags
		$text = str_replace("[/list:u:$uid]", $bbcode_tpl['ulist_close'], $text);
		$text = str_replace("[/list:o:$uid]", $bbcode_tpl['olist_close'], $text);
		// Ordered lists
		$text = preg_replace("/\[list=([a1]):$uid\]/si", $bbcode_tpl['olist_open'], $text);

		// colours
		$text = preg_replace("/\[color=(\#[0-9A-F]{6}|[a-z]+):$uid\]/si", $bbcode_tpl['color_open'], $text);
		$text = str_replace("[/color:$uid]", $bbcode_tpl['color_close'], $text);

		// size
		$text = preg_replace("/\[size=([1-2]?[0-9]):$uid\]/si", $bbcode_tpl['size_open'], $text);
		$text = str_replace("[/size:$uid]", $bbcode_tpl['size_close'], $text);

		// [b] and [/b] for bolding text.
		$text = str_replace("[b:$uid]", $bbcode_tpl['b_open'], $text);
		$text = str_replace("[/b:$uid]", $bbcode_tpl['b_close'], $text);

		// [u] and [/u] for underlining text.
		$text = str_replace("[u:$uid]", $bbcode_tpl['u_open'], $text);
		$text = str_replace("[/u:$uid]", $bbcode_tpl['u_close'], $text);

		// [i] and [/i] for italicizing text.
		$text = str_replace("[i:$uid]", $bbcode_tpl['i_open'], $text);
		$text = str_replace("[/i:$uid]", $bbcode_tpl['i_close'], $text);

		// Patterns and replacements for URL and email tags..
		$patterns = array();
		$replacements = array();

		// [img]image_url_here[/img] code..
		// This one gets first-passed..
		$patterns[] = "#\[img:$uid\]([^?](?:[^\[]+|\[(?!url))*?)\[/img:$uid\]#i";
		$replacements[] = $bbcode_tpl['img'];

		// matches a [url]xxxx://www.phpbb.com[/url] code..
		$patterns[] = "#\[url\]([\w]+?://([\w\#$%&~/.\-;:=,?@\]+]+|\[(?!url=))*?)\[/url\]#is";
		$replacements[] = $bbcode_tpl['url1'];

		// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
		$patterns[] = "#\[url\]((www|ftp)\.([\w\#$%&~/.\-;:=,?@\]+]+|\[(?!url=))*?)\[/url\]#is";
		$replacements[] = $bbcode_tpl['url2'];

		// [url=xxxx://www.phpbb.com]phpBB[/url] code..
		$patterns[] = "#\[url=([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#is";
		$replacements[] = $bbcode_tpl['url3'];

		// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
		$patterns[] = "#\[url=((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#is";
		$replacements[] = $bbcode_tpl['url4'];

		// [email]us...@do...[/email] code..
		$patterns[] = "#\[email\]([a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+)\[/email\]#si";
		$replacements[] = $bbcode_tpl['email'];

		//Strat more bbcode

		// [stream]Sound URL[/stream] code..
		$patterns[] = "#\[stream:$uid\](.*?)\[/stream:$uid\]#si";
		$replacements[] = $bbcode_tpl['stream'];

		// [flash width=X height=X]Flash URL[/flash] code..
		$patterns[] = "#\[flash width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9]):$uid\](.*?)\[/flash:$uid\]#si";
		$replacements[] = $bbcode_tpl['flash'];

		// [video width=X height=X]Video URL[/video] code..
		$patterns[] = "#\[video width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9]):$uid\](.*?)\[/video:$uid\]#si";
		$replacements[] = $bbcode_tpl['video'];
		$text = preg_replace($patterns, $replacements, $text);

		// [GVideo]GVideo URL[/GVideo] code..
	    $patterns[] = "#\[GVideo\]http://video.google.[A-Za-z0-9.]{2,5}/videoplay\?docid=([0-9A-Za-z-_]*)[^[]*\[/GVideo\]#is";
	    $replacements[] = $bbcode_tpl['GVideo'];

	    // [youtube]YouTube URL[/youtube] code..
	    $patterns[] = "#\[youtube\]http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})[^[]*\[/youtube\]#is";
	    $replacements[] = $bbcode_tpl['youtube'];

		//Stop more bbcode

		$text = preg_replace($patterns, $replacements, $text);

		// Remove our padding from the string..
		$text = substr($text, 1);

		return $text;

	} // bbencode_second_pass()

	function make_bbcode_uid()
	{
		global $mx_backend;
		// Unique ID for this message..

		$uid = $mx_backend->dss_rand();
		$uid = substr($uid, 0, BBCODE_UID_LEN);

		return $uid;
	}

	function bbencode_first_pass($text, $uid)
	{
		// pad it with a space so we can distinguish between FALSE and matching the 1st char (index 0).
		// This is important; bbencode_quote(), bbencode_list(), and bbencode_code() all depend on it.
		$text = " " . $text;

		// [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts.
		$text = $this->bbencode_first_pass_pda($text, $uid, '[code]', '[/code]', '', true, '');

		// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
		$text = $this->bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
		$text = $this->bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\&quot;(.*?)\\\\&quot;\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]");

		// [list] and [list=x] for (un)ordered lists.
		$open_tag = array();
		$open_tag[0] = "[list]";

		// unordered..
		$text = $this->bbencode_first_pass_pda($text, $uid, $open_tag, "[/list]", "[/list:u]", false, 'replace_listitems');

		$open_tag[0] = "[list=1]";
		$open_tag[1] = "[list=a]";

		// ordered.
		$text = $this->bbencode_first_pass_pda($text, $uid, $open_tag, "[/list]", "[/list:o]",  false, 'replace_listitems');

		// [color] and [/color] for setting text color
		$text = preg_replace("#\[color=(\#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]#si", "[color=\\1:$uid]\\2[/color:$uid]", $text);

		// [size] and [/size] for setting text size
		$text = preg_replace("#\[size=([1-2]?[0-9])\](.*?)\[/size\]#si", "[size=\\1:$uid]\\2[/size:$uid]", $text);

		// [b] and [/b] for bolding text.
		$text = preg_replace("#\[b\](.*?)\[/b\]#si", "[b:$uid]\\1[/b:$uid]", $text);

		// [u] and [/u] for underlining text.
		$text = preg_replace("#\[u\](.*?)\[/u\]#si", "[u:$uid]\\1[/u:$uid]", $text);

		// [i] and [/i] for italicizing text.
		$text = preg_replace("#\[i\](.*?)\[/i\]#si", "[i:$uid]\\1[/i:$uid]", $text);

		// [img]image_url_here[/img] code..
		$text = preg_replace("#\[img\]((http|ftp|https|ftps)://)([^ \?&=\#\"\n\r\t<]*?(\.(jpg|jpeg|gif|png)))\[/img\]#sie", "'[img:$uid]\\1' . str_replace(' ', '%20', '\\3') . '[/img:$uid]'", $text);

		//Start more bbcode

		// [stream]Sound URL[/stream] code..
		$text = preg_replace("#\[stream\](.*?)\[/stream\]#si", "[stream:$uid]\\1[/stream:$uid]", $text);

		// [flash width=X height=X]Flash URL[/flash] code..
		$text = preg_replace("#\[flash width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9])\](([a-z]+?)://([^, \n\r]+))\[\/flash\]#si","[flash width=\\1 height=\\2:$uid\]\\3[/flash:$uid]", $text);

		// [video width=X height=X]Video URL[/video] code..
		$text = preg_replace("#\[video width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9])\](([a-z]+?)://([^, \n\r]+))\[\/video\]#si","[video width=\\1 height=\\2:$uid\]\\3[/video:$uid]", $text);

		//Stop more bbcode

		// Remove our padding from the string..
		return substr($text, 1);;

	} // bbencode_first_pass()

	/**
	 * $text - The text to operate on.
	 * $uid - The UID to add to matching tags.
	 * $open_tag - The opening tag to match. Can be an array of opening tags.
	 * $close_tag - The closing tag to match.
	 * $close_tag_new - The closing tag to replace with.
	 * $mark_lowest_level - boolean - should we specially mark the tags that occur
	 * 					at the lowest level of nesting? (useful for [code], because
	 *						we need to match these tags first and transform HTML tags
	 *						in their contents..
	 * $func - This variable should contain a string that is the name of a function.
	 *				That function will be called when a match is found, and passed 2
	 *				parameters: ($text, $uid). The function should return a string.
	 *				This is used when some transformation needs to be applied to the
	 *				text INSIDE a pair of matching tags. If this variable is FALSE or the
	 *				empty string, it will not be executed.
	 * If open_tag is an array, then the pda will try to match pairs consisting of
	 * any element of open_tag followed by close_tag. This allows us to match things
	 * like [list=A]...[/list] and [list=1]...[/list] in one pass of the PDA.
	 *
	 * NOTES:	- this function assumes the first character of $text is a space.
	 *				- every opening tag and closing tag must be of the [...] format.
	 */
	function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_new, $mark_lowest_level, $func, $open_regexp_replace = false)
	{
		$open_tag_count = 0;

		if (!$close_tag_new || ($close_tag_new == ''))
		{
			$close_tag_new = $close_tag;
		}

		$close_tag_length = strlen($close_tag);
		$close_tag_new_length = strlen($close_tag_new);
		$uid_length = strlen($uid);

		$use_function_pointer = ($func && ($func != ''));

		$stack = array();

		if (is_array($open_tag))
		{
			if (0 == count($open_tag))
			{
				// No opening tags to match, so return.
				return $text;
			}
			$open_tag_count = count($open_tag);
		}
		else
		{
			// only one opening tag. make it into a 1-element array.
			$open_tag_temp = $open_tag;
			$open_tag = array();
			$open_tag[0] = $open_tag_temp;
			$open_tag_count = 1;
		}

		$open_is_regexp = false;

		if ($open_regexp_replace)
		{
			$open_is_regexp = true;
			if (!is_array($open_regexp_replace))
			{
				$open_regexp_temp = $open_regexp_replace;
				$open_regexp_replace = array();
				$open_regexp_replace[0] = $open_regexp_temp;
			}
		}

		if ($mark_lowest_level && $open_is_regexp)
		{
			mx_message_die(GENERAL_ERROR, "Unsupported operation for bbcode_first_pass_pda().");
		}

		// Start at the 2nd char of the string, looking for opening tags.
		$curr_pos = 1;
		while ($curr_pos && ($curr_pos < strlen($text)))
		{
			$curr_pos = strpos($text, "[", $curr_pos);

			// If not found, $curr_pos will be 0, and the loop will end.
			if ($curr_pos)
			{
				// We found a [. It starts at $curr_pos.
				// check if it's a starting or ending tag.
				$found_start = false;
				$which_start_tag = "";
				$start_tag_index = -1;

				for ($i = 0; $i < $open_tag_count; $i++)
				{
					// Grab everything until the first "]"...
					$possible_start = substr($text, $curr_pos, strpos($text, ']', $curr_pos + 1) - $curr_pos + 1);

					//
					// We're going to try and catch usernames with "[' characters.
					//
					if( preg_match('#\[quote=\\\&quot;#si', $possible_start, $match) && !preg_match('#\[quote=\\\&quot;(.*?)\\\&quot;\]#si', $possible_start) )
					{
						// OK we are in a quote tag that probably contains a ] bracket.
						// Grab a bit more of the string to hopefully get all of it..
						if ($close_pos = strpos($text, '&quot;]', $curr_pos + 14))
						{
							if (strpos(substr($text, $curr_pos + 14, $close_pos - ($curr_pos + 14)), '[quote') === false)
							{
								$possible_start = substr($text, $curr_pos, $close_pos - $curr_pos + 7);
							}
						}
					}

					// Now compare, either using regexp or not.
					if ($open_is_regexp)
					{
						$match_result = array();
						if (preg_match($open_tag[$i], $possible_start, $match_result))
						{
							$found_start = true;
							$which_start_tag = $match_result[0];
							$start_tag_index = $i;
							break;
						}
					}
					else
					{
						// straightforward string comparison.
						if (0 == strcasecmp($open_tag[$i], $possible_start))
						{
							$found_start = true;
							$which_start_tag = $open_tag[$i];
							$start_tag_index = $i;
							break;
						}
					}
				}

				if ($found_start)
				{
					// We have an opening tag.
					// Push its position, the text we matched, and its index in the open_tag array on to the stack, and then keep going to the right.
					$match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index);
					array_push($stack, $match);
					//
					// Rather than just increment $curr_pos
					// Set it to the ending of the tag we just found
					// Keeps error in nested tag from breaking out
					// of table structure..
					//
					$curr_pos += strlen($possible_start);
				}
				else
				{
					// check for a closing tag..
					$possible_end = substr($text, $curr_pos, $close_tag_length);
					if (0 == strcasecmp($close_tag, $possible_end))
					{
						// We have an ending tag.
						// Check if we've already found a matching starting tag.
						if (sizeof($stack) > 0)
						{
							// There exists a starting tag.
							$curr_nesting_depth = sizeof($stack);
							// We need to do 2 replacements now.
							$match = array_pop($stack);
							$start_index = $match['pos'];
							$start_tag = $match['tag'];
							$start_length = strlen($start_tag);
							$start_tag_index = $match['index'];

							if ($open_is_regexp)
							{
								$start_tag = preg_replace($open_tag[$start_tag_index], $open_regexp_replace[$start_tag_index], $start_tag);
							}

							// everything before the opening tag.
							$before_start_tag = substr($text, 0, $start_index);

							// everything after the opening tag, but before the closing tag.
							$between_tags = substr($text, $start_index + $start_length, $curr_pos - $start_index - $start_length);

							// Run the given function on the text between the tags..
							if ($use_function_pointer)
							{
								$between_tags = $func($between_tags, $uid);
							}

							// everything after the closing tag.
							$after_end_tag = substr($text, $curr_pos + $close_tag_length);

							// Mark the lowest nesting level if needed.
							if ($mark_lowest_level && ($curr_nesting_depth == 1))
							{
								if ($open_tag[0] == '[code]')
								{
									$code_entities_match = array('#<#', '#>#', '#"#', '#:#', '#\[#', '#\]#', '#\(#', '#\)#', '#\{#', '#\}#');
									$code_entities_replace = array('&lt;', '&gt;', '&quot;', '&#58;', '&#91;', '&#93;', '&#40;', '&#41;', '&#123;', '&#125;');
									$between_tags = preg_replace($code_entities_match, $code_entities_replace, $between_tags);
								}
								$text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$curr_nesting_depth:$uid]";
								$text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$curr_nesting_depth:$uid]";
							}
							else
							{
								if ($open_tag[0] == '[code]')
								{
									$text = $before_start_tag . '&#91;code&#93;';
									$text .= $between_tags . '&#91;/code&#93;';
								}
								else
								{
									if ($open_is_regexp)
									{
										$text = $before_start_tag . $start_tag;
									}
									else
									{
										$text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$uid]";
									}
									$text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$uid]";
								}
							}

							$text .= $after_end_tag;

							// Now.. we've screwed up the indices by changing the length of the string.
							// So, if there's anything in the stack, we want to resume searching just after it.
							// otherwise, we go back to the start.
							if (sizeof($stack) > 0)
							{
								$match = array_pop($stack);
								$curr_pos = $match['pos'];
	//							bbcode_array_push($stack, $match);
	//							++$curr_pos;
							}
							else
							{
								$curr_pos = 1;
							}
						}
						else
						{
							// No matching start tag found. Increment pos, keep going.
							++$curr_pos;
						}
					}
					else
					{
						// No starting tag or ending tag.. Increment pos, keep looping.,
						++$curr_pos;
					}
				}
			}
		} // while

		return $text;

	} // bbencode_first_pass_pda()

	/**
	 * Does second-pass bbencoding of the [code] tags. This includes
	 * running htmlspecialchars() over the text contained between
	 * any pair of [code] tags that are at the first level of
	 * nesting. Tags at the first level of nesting are indicated
	 * by this format: [code:1:$uid] ... [/code:1:$uid]
	 * Other tags are in this format: [code:$uid] ... [/code:$uid]
	  * This a temporary function
	 */
	function bbencode_second_pass_code($text, $uid, $bbcode_tpl)
	{
		global $lang;

		$code_start_html = $bbcode_tpl['code_open'];
		$code_end_html =  $bbcode_tpl['code_close'];

		// First, do all the 1st-level matches. These need an htmlspecialchars() run,
		// so they have to be handled differently.
		$match_count = preg_match_all("#\[code:1:$uid\](.*?)\[/code:1:$uid\]#si", $text, $matches);

		for ($i = 0; $i < $match_count; $i++)
		{
			$before_replace = $matches[1][$i];
			$after_replace = $matches[1][$i];

			// Replace 2 spaces with "&nbsp; " so non-tabbed code indents without making huge long lines.
			$after_replace = str_replace("  ", "&nbsp; ", $after_replace);
			// now Replace 2 spaces with " &nbsp;" to catch odd #s of spaces.
			$after_replace = str_replace("  ", " &nbsp;", $after_replace);

			// Replace tabs with "&nbsp; &nbsp;" so tabbed code indents sorta right without making huge long lines.
			$after_replace = str_replace("\t", "&nbsp; &nbsp;", $after_replace);

			// now Replace space occurring at the beginning of a line
			$after_replace = preg_replace("/^ {1}/m", '&nbsp;', $after_replace);

			$str_to_match = "[code:1:$uid]" . $before_replace . "[/code:1:$uid]";

			$replacement = $code_start_html;
			$replacement .= $after_replace;
			$replacement .= $code_end_html;

			$text = str_replace($str_to_match, $replacement, $text);
		}

		// Now, do all the non-first-level matches. These are simple.
		$text = str_replace("[code:$uid]", $code_start_html, $text);
		$text = str_replace("[/code:$uid]", $code_end_html, $text);

		return $text;

	} // bbencode_second_pass_code()

	//phpBB Temporary code ends

	/**
	 * Rewritten by Nathan Codding - Feb 6, 2001.
	 * - Goes through the given string, and replaces xxxx://yyyy with an HTML <a> tag linking
	 * 	to that URL
	 * - Goes through the given string, and replaces www.xxxx.yyyy[zzzz] with an HTML <a> tag linking
	 * 	to http://www.xxxx.yyyy[/zzzz]
	 * - Goes through the given string, and replaces xxxx@yyyy with an HTML mailto: tag linking
	 *		to that email address
	 * - Only matches these 2 patterns either after a space, or at the beginning of a line
	 *
	 * Notes: the email one might get annoying - it's easy to make it more restrictive, though.. maybe
	 * have it require something like xx...@yy... or such. We'll see.
	 * We can add here more phpBB3 stuff in time - Ory
	 */
	function make_clickable($text)
	{
		$text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1&#058;", $text);

		// pad it with a space so we can match things at the start of the 1st line.
		$ret = ' ' . $text;

		// matches an "xxxx://yyyy" URL at the start of a line, or after a space.
		// xxxx can only be alpha characters.
		// yyyy is anything up to the first space, newline, comma, double quote or <
		$ret = preg_replace("#(^|[\n ])([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $ret);

		// matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing
		// Must contain at least 2 dots. xxxx contains either alphanum, or "-"
		// zzzz is optional.. will contain everything up to the first space, newline,
		// comma, double quote or <.
		$ret = preg_replace("#(^|[\n ])((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);

		// matches an email@domain type address at the start of a line, or after a space.
		// Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
		$ret = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);

		// Remove our padding..
		$ret = substr($ret, 1);

		return($ret);
	}

	/**
	 * Nathan Codding - Feb 6, 2001
	 * Reverses the effects of make_clickable(), for use in editpost.
	 * - Does not distinguish between "www.xxxx.yyyy" and "http://aaaa.bbbb" type URLs.
	 *
	 */
	function undo_make_clickable($text)
	{
		$text = preg_replace("#<!-- BBCode auto-link start --><a href=\"(.*?)\" target=\"_blank\">.*?</a><!-- BBCode auto-link end -->#i", "\\1", $text);
		$text = preg_replace("#<!-- BBcode auto-mailto start --><a href=\"mailto:(.*?)\">.*?</a><!-- BBCode auto-mailto end -->#i", "\\1", $text);

		return $text;

	}

	//
	// MXP Wrapper
	//

	/**
	 * bbcode to html.
	 *
	 * Convert the bbcode to html
	 *
	 * @param string $bbtext
	 * @param string $bbcode_uid
	 * @param boolean $smilies_on
	 * @return string
	 */
	function decode($bbtext, $bbcode_uid, $smilies_on = true)
	{
		global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;

		$mytext = stripslashes($bbtext);
		if (!empty($bbcode_uid))
		{
			$mytext = $this->bbencode_second_pass($mytext, $bbcode_uid);
		}
		if ($smilies_on)
		{
			$mytext = $this->smilies_pass($mytext);
		}
		$mytext = str_replace("\n", "\n<br />\n", $mytext);
		return $this->make_clickable($mytext);
	}

	/**
	 * phpBB Smilies pass.
	 *
	 * Hacking smilies_pass from phpbb/includes/bbcode.php
	 *
	 * @param string $message
	 * @return string
	 *
	*/
	function smilies_pass($message)
	{
		static $orig, $repl;
		global $board_config, $mx_root_path, $phpbb_root_path, $phpEx;

		if (!isset($orig))
		{
			global $db;
			$orig = $repl = array();

			$sql = 'SELECT * FROM ' . SMILIES_TABLE;
			if( !$result = $db->sql_query($sql) )
			{
				mx_message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql);
			}

			$smilies = $db->sql_fetchrowset($result);

			if (count($smilies))
			{
				@usort($smilies, 'smiley_sort');
			}

			for ($i = 0; $i < count($smilies); $i++)
			{
				$orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/";
				$repl[] = '<img src="' . $this->smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$this->smiley_url] . '" alt="' . $smilies[$i][$this->emotion] . '" border="0" />';
			}
		}

		if (count($orig))
		{
			$message = preg_replace($orig, $repl, ' ' . $message . ' ');
			$message = substr($message, 1, -1);
		}

		return $message;
	}

	/**
	 * phpBB Smilies pass.
	 *
	 * Hacking smilies_pass from phpbb/includes/bbcode.php
	 *
	 * NOTE: This is only kept for reference - not used.
	 *
	 * @param string $message
	 * @return string
	 */
	function mx_smilies_pass_old($message)
	{
		global $mx_page, $board_config, $phpbb_root_path, $phpEx;

		$smilies_path = $board_config['smilies_path'];
		$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
		$message = smilies_pass($message);
		$board_config['smilies_path'] = $smilies_path;
		return $message;
	}
}

/**
 * MXP BBcodes
 * @package MX-Publisher
 */
class mx_bbcode extends bbcode_base
{
	var $smiley_path_url = '';
	var $smiley_root_path =	'';

	var $smiley_url = 'smile_url';
	var $smiley_id = 'smilies_id';
	var $emotion = 'emoticon';

	function mx_bbcode()
	{
		global $phpbb_root_path;

		$this->smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
		$this->smiley_root_path =	$phpbb_root_path; //same here
	}

	/**
	 * Generate smilies.
	 *
	 * Hacking generate_smilies from phpbb/includes/functions_post(ing).php
	 *
	 * @param string $mode
	 * @param integer $page_id
	*
	* Fill smiley templates (or just the variables) with smilies, either in a window or inline
	*/
	function generate_smilies($mode, $forum_id)
	{
		global $mx_page, $board_config, $template, $mx_root_path, $phpbb_root_path, $phpEx;
		global $db, $lang, $images, $theme;
		global $user_ip, $session_length, $starttime;
		global $userdata, $phpbb_auth, $mx_user;

		$inline_columns = 4;
		$inline_rows = 5;
		$window_columns = 8;

		if ($mode == 'window')
		{
			$mx_user->init($user_ip, PAGE_INDEX);

			$gen_simple_header = TRUE;
			$page_title = $lang['Emoticons'];

			include($mx_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))
		{
			$num_smilies = 0;
			$rowset = array();
			while ($row = $db->sql_fetchrow($result))
			{
				if (empty($rowset[$row['smile_url']]))
				{
					$rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
					$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
					$num_smilies++;
				}
			}

			if ($num_smilies)
			{
				$smilies_count = ($mode == 'inline') ? min(19, $num_smilies) : $num_smilies;
				$smilies_split_row = ($mode == 'inline') ? $inline_columns - 1 : $window_columns - 1;

				$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' => $this->smiley_path_url  . $board_config['smilies_path'] . '/' . $smile_url,
						'SMILEY_DESC' => $data['emoticon'])
					);

					$s_colspan = max($s_colspan, $col + 1);

					if ($col == $smilies_split_row)
					{
						if ($mode == 'inline' && $row == $inline_rows - 1)
						{
							break;
						}
						$col = 0;
						$row++;
					}
					else
					{
						$col++;
					}
				}

				if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns)
				{
					$template->assign_block_vars('switch_smilies_extra', array());

					$template->assign_vars(array(
						'L_MORE_SMILIES' => $lang['More_emoticons'],
						'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "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($mx_root_path . 'includes/page_tail.'.$phpEx);
		}
	}
}
?>

[mxbb-commits] mx_slash/includes functions_news_post.php,1.7,1.8

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_slash/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27801

Modified Files:
	functions_news_post.php 
Log Message:
More...of the same

Index: functions_news_post.php
===================================================================
RCS file: /cvsroot/mxbb/mx_slash/includes/functions_news_post.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** functions_news_post.php	8 Feb 2008 23:44:52 -0000	1.7
--- functions_news_post.php	15 Jul 2008 22:08:30 -0000	1.8
***************
*** 3,12 ****
  include_once('news_constants.php');
  
! include_once($phpbb_root_path .'includes/functions_post.php');
! 
! include_once($phpbb_root_path . 'includes/functions_search.php');
! 
! 
! 
  
  
--- 3,8 ----
  include_once('news_constants.php');
  
! mx_cache::load_file('functions_post');
! mx_cache::load_file('functions_search');
  
  

[mxbb-commits] mx_shoutbox mx_shoutbox.php,1.3,1.4

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_shoutbox
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27283

Modified Files:
	mx_shoutbox.php 
Log Message:
More...of the same

Index: mx_shoutbox.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shoutbox/mx_shoutbox.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_shoutbox.php	13 Jul 2008 19:38:25 -0000	1.3
--- mx_shoutbox.php	15 Jul 2008 22:07:59 -0000	1.4
***************
*** 18,24 ****
  	include($module_root_path . 'includes/constants.' . $phpEx);
  	include($module_root_path . 'includes/functions.' . $phpEx);
- 	include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
- 
  
  
  	/****************************
--- 18,23 ----
  	include($module_root_path . 'includes/constants.' . $phpEx);
  	include($module_root_path . 'includes/functions.' . $phpEx);
  
+ 	mx_cache::load_file('functions_post', 'phpbb2');
  
  	/****************************
***************
*** 72,76 ****
  			$bbcode_on = $mx_request_vars->request('bbcode', MX_TYPE_NO_TAGS, '');
  			$time = time();
! 			$bbcode_uid = make_bbcode_uid();
  			$message = prepare_message(trim($message), 0, $bbcode_on, 1, $bbcode_uid);
  			// remove images from bbcode
--- 71,75 ----
  			$bbcode_on = $mx_request_vars->request('bbcode', MX_TYPE_NO_TAGS, '');
  			$time = time();
! 			$bbcode_uid = $mx_bbcode->make_bbcode_uid();
  			$message = prepare_message(trim($message), 0, $bbcode_on, 1, $bbcode_uid);
  			// remove images from bbcode

[mxbb-commits] mx_pafiledb/pafiledb/admin admin_cat_manage.php, 1.8, 1.9 admin_catauth_manage.php, 1.8, 1.9 admin_custom_manage.php, 1.8, 1.9 admin_fchecker_manage.php, 1.6, 1.7 admin_license_manage.php, 1.7, 1.8 admin_settings.php, 1.9, 1.10 admin_ug_auth_manage.php, 1.8, 1.9

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26360/admin

Modified Files:
	admin_cat_manage.php admin_catauth_manage.php 
	admin_custom_manage.php admin_fchecker_manage.php 
	admin_license_manage.php admin_settings.php 
	admin_ug_auth_manage.php 
Log Message:
More...

Index: admin_cat_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_cat_manage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_cat_manage.php	10 Jul 2008 22:23:26 -0000	1.8
--- admin_cat_manage.php	15 Jul 2008 22:07:04 -0000	1.9
***************
*** 20,28 ****
  		global $db, $images, $template, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : '';
  		$cat_id = ( isset( $_REQUEST['cat_id'] ) ) ? intval( $_REQUEST['cat_id'] ) : 0;
--- 20,23 ----

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_settings.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin_settings.php	10 Jul 2008 22:23:27 -0000	1.9
--- admin_settings.php	15 Jul 2008 22:07:06 -0000	1.10
***************
*** 20,28 ****
  		global $db, $images, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$submit = ( isset( $_POST['submit'] ) ) ? true : false;
  		$size = ( isset( $_POST['max_size'] ) ) ? $_POST['max_size'] : '';
--- 20,23 ----

Index: admin_ug_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_ug_auth_manage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_ug_auth_manage.php	10 Jul 2008 22:23:27 -0000	1.8
--- admin_ug_auth_manage.php	15 Jul 2008 22:07:06 -0000	1.9
***************
*** 22,30 ****
  		global $optionlist_mod, $optionlist_acl_adv;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$params = array( 'mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL );
  
--- 22,25 ----

Index: admin_custom_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_custom_manage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_custom_manage.php	10 Jul 2008 22:23:26 -0000	1.8
--- admin_custom_manage.php	15 Jul 2008 22:07:04 -0000	1.9
***************
*** 21,29 ****
  
  		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
- 		//
  		// Init
  		//
--- 21,24 ----

Index: admin_fchecker_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_fchecker_manage.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_fchecker_manage.php	10 Jul 2008 22:23:27 -0000	1.6
--- admin_fchecker_manage.php	15 Jul 2008 22:07:05 -0000	1.7
***************
*** 20,28 ****
  		global $db, $images, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$this_dir = $module_root_path . 'pafiledb/uploads/';
  
--- 20,23 ----

Index: admin_catauth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_catauth_manage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_catauth_manage.php	10 Jul 2008 22:23:26 -0000	1.8
--- admin_catauth_manage.php	15 Jul 2008 22:07:04 -0000	1.9
***************
*** 22,30 ****
  		global $cat_auth_approval_fields, $cat_auth_approval_const, $cat_auth_approval_levels;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$custom_auth_approval = array();
  		$custom_auth = array();
--- 22,25 ----

Index: admin_license_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_license_manage.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_license_manage.php	10 Jul 2008 22:23:27 -0000	1.7
--- admin_license_manage.php	15 Jul 2008 22:07:05 -0000	1.8
***************
*** 20,28 ****
  		global $db, $images, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		if ( isset( $_GET['license'] ) || isset( $_POST['license'] ) )
  		{
--- 20,23 ----

[mxbb-commits] mx_phpbb/includes forum_hack.php,1.60,1.61

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_phpbb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26827

Modified Files:
	forum_hack.php 
Log Message:
More...of the same

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** forum_hack.php	13 Jul 2008 19:36:42 -0000	1.60
--- forum_hack.php	15 Jul 2008 22:07:15 -0000	1.61
***************
*** 1131,1134 ****
--- 1131,1135 ----
  		//
  		global $board_config, $template, $phpEx, $mx_bbcode;
+ 
  		//$smilies_path = $board_config['smilies_path'];
  		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];

[mxbb-commits] mx_pafiledb/pafiledb/modules pa_post_comment.php, 1.27, 1.28 pa_search.php, 1.26, 1.27

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26360/modules

Modified Files:
	pa_post_comment.php pa_search.php 
Log Message:
More...

Index: pa_post_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_post_comment.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** pa_post_comment.php	3 Jun 2008 20:17:10 -0000	1.27
--- pa_post_comment.php	15 Jul 2008 22:07:10 -0000	1.28
***************
*** 30,34 ****
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme;
  
  		//
--- 30,34 ----
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme, $mx_bbcode;
  
  		//
***************
*** 179,183 ****
  			if ($smilies_on)
  			{
! 				$pafiledb_functions->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}
--- 179,183 ----
  			if ($smilies_on)
  			{
! 				$mx_bbcode->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}

Index: pa_search.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_search.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** pa_search.php	10 Jul 2008 22:23:27 -0000	1.26
--- pa_search.php	15 Jul 2008 22:07:11 -0000	1.27
***************
*** 42,46 ****
  		}
  
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		if ( isset( $_REQUEST['search_keywords'] ) )
--- 42,49 ----
  		}
  
! 		if( !function_exists('add_search_words') )
! 		{
! 			mx_cache::load_file('functions_search', 'phpbb2');
! 		}
  
  		if ( isset( $_REQUEST['search_keywords'] ) )

[mxbb-commits] mx_pafiledb/pafiledb/includes functions.php, 1.46, 1.47

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26360/includes

Modified Files:
	functions.php 
Log Message:
More...

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** functions.php	6 Jul 2008 22:18:00 -0000	1.46
--- functions.php	15 Jul 2008 22:07:10 -0000	1.47
***************
*** 92,95 ****
--- 92,96 ----
  	 * @param unknown_type $page_id
  	 */
+ 	/*
  	function generate_smilies( $mode, $page_id )
  	{
***************
*** 204,207 ****
--- 205,209 ----
  		}
  	}
+ 	*/
  
  	/**

[mxbb-commits] mx_pafiledb dload.php,1.31,1.32

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26211

Modified Files:
	dload.php 
Log Message:
More...

Index: dload.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/dload.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** dload.php	10 Jul 2008 22:23:26 -0000	1.31
--- dload.php	15 Jul 2008 22:06:42 -0000	1.32
***************
*** 60,65 ****
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode', 'phpbb2');
! 		mx_cache::load_file('functions_post', 'phpbb2');
  
  		// Start session management
--- 60,65 ----
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode');
! 		mx_cache::load_file('functions_post');
  
  		// Start session management

[mxbb-commits] mx_pafiledb/admin mx_module_defs.php,1.13,1.14

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26211/admin

Modified Files:
	mx_module_defs.php 
Log Message:
More...

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/mx_module_defs.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mx_module_defs.php	3 Jun 2008 20:21:55 -0000	1.13
--- mx_module_defs.php	15 Jul 2008 22:06:42 -0000	1.14
***************
*** 69,92 ****
  		$parameter_opt = '';
  
- 		/*
- 		switch ( $parameter_data['parameter_type'] )
- 		{
- 			case 'pa_quick_cat':
- 				$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( $bbcode_on )
- 				{
- 					$bbcode_uid = make_bbcode_uid();
- 				}
- 
- 				break;
- 		}
- 
- 		$parameter_value = prepare_message(trim($parameter_value), $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
- 		$parameter_opt = $bbcode_uid;
- 		*/
- 
  		return array('parameter_value' => $parameter_value, 'parameter_opt' => $parameter_opt);
  	}
--- 69,72 ----

[mxbb-commits] mx_linkdb/linkdb/admin admin_auth_manage.php, 1.10, 1.11 admin_custom_manage.php, 1.6, 1.7

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_linkdb/linkdb/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25385/admin

Modified Files:
	admin_auth_manage.php admin_custom_manage.php 
Log Message:
More...of the same

Index: admin_custom_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_custom_manage.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_custom_manage.php	10 Jul 2008 22:22:29 -0000	1.6
--- admin_custom_manage.php	15 Jul 2008 22:06:06 -0000	1.7
***************
*** 20,28 ****
  		global $db, $images, $template, $lang, $phpEx, $linkdb_functions, $linkdb_cache, $link_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$this_custom_field = new mx_custom_field(LINK_CUSTOM_TABLE, LINK_CUSTOM_DATA_TABLE);
  		$this_custom_field->init();
--- 20,23 ----

Index: admin_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_auth_manage.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** admin_auth_manage.php	10 Jul 2008 22:22:28 -0000	1.10
--- admin_auth_manage.php	15 Jul 2008 22:06:05 -0000	1.11
***************
*** 21,29 ****
  
  		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
- 		//
  		// Start adminCP
  		//
--- 21,24 ----

[mxbb-commits] mx_news/mx_news/modules mx_news_post_comment.php, 1.5, 1.6

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_news/mx_news/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25840/mx_news/modules

Modified Files:
	mx_news_post_comment.php 
Log Message:
More...

Index: mx_news_post_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news/modules/mx_news_post_comment.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mx_news_post_comment.php	3 Jun 2008 20:12:40 -0000	1.5
--- mx_news_post_comment.php	15 Jul 2008 22:06:18 -0000	1.6
***************
*** 30,34 ****
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme;
  
  		//
--- 30,34 ----
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme, $mx_bbcode;
  
  		//
***************
*** 161,165 ****
  			if ($smilies_on)
  			{
! 				$mx_news_functions->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}
--- 161,165 ----
  			if ($smilies_on)
  			{
! 				$mx_bbcode->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}

[mxbb-commits] mx_news/mx_news/includes functions.php,1.7,1.8

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_news/mx_news/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25840/mx_news/includes

Modified Files:
	functions.php 
Log Message:
More...

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news/includes/functions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** functions.php	6 Jul 2008 22:16:27 -0000	1.7
--- functions.php	15 Jul 2008 22:06:18 -0000	1.8
***************
*** 86,89 ****
--- 86,90 ----
  	 * @param unknown_type $page_id
  	 */
+ 	/*
  	function generate_smilies( $mode, $page_id )
  	{
***************
*** 198,201 ****
--- 199,203 ----
  		}
  	}
+ 	*/
  
  	// since that I can't use the original function with new template system

[mxbb-commits] mx_news mx_news.php,1.7,1.8

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_news
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25840

Modified Files:
	mx_news.php 
Log Message:
More...

Index: mx_news.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mx_news.php	10 Jul 2008 22:23:06 -0000	1.7
--- mx_news.php	15 Jul 2008 22:06:17 -0000	1.8
***************
*** 60,65 ****
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode', 'phpbb2');
! 		mx_cache::load_file('functions_post', 'phpbb2');
  
  		// Start session management
--- 60,65 ----
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode');
! 		mx_cache::load_file('functions_post');
  
  		// Start session management

[mxbb-commits] mx_linkdb/linkdb/modules link_post_comment.php, 1.9, 1.10 link_search.php, 1.17, 1.18

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25385/modules

Modified Files:
	link_post_comment.php link_search.php 
Log Message:
More...of the same

Index: link_search.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_search.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** link_search.php	3 Jun 2008 20:10:17 -0000	1.17
--- link_search.php	15 Jul 2008 22:06:09 -0000	1.18
***************
*** 30,35 ****
  		global $phpbb_root_path, $userdata;
  
- 		include( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
- 
  		if ( isset( $_REQUEST['search_keywords'] ) )
  		{
--- 30,33 ----

Index: link_post_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_post_comment.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** link_post_comment.php	3 Jun 2008 20:10:15 -0000	1.9
--- link_post_comment.php	15 Jul 2008 22:06:08 -0000	1.10
***************
*** 30,34 ****
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme;
  
  		//
--- 30,34 ----
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme, $mx_bbcode;
  
  		//
***************
*** 179,183 ****
  			if ($smilies_on)
  			{
! 				$linkdb_functions->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}
--- 179,183 ----
  			if ($smilies_on)
  			{
! 				$mx_bbcode->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}

[mxbb-commits] mx_music music.php,1.16,1.17 music_flv.php,1.3,1.4

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_music
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25527

Modified Files:
	music.php music_flv.php 
Log Message:
More

Index: music.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** music.php	13 Mar 2008 04:57:57 -0000	1.16
--- music.php	15 Jul 2008 22:06:07 -0000	1.17
***************
*** 21,31 ****
  	define('MXBB_MODULE', false);
  	define('IN_PHPBB', true);
! 	
  	$phpbb_root_path = $module_root_path = './';
  	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
  	include($phpbb_root_path . 'common.' . $phpEx);
  	include($mx_mod_path . "includes/functions_required.$phpEx");
! 	
  	//Check if forum_hack is installed
  	if (!isset($mx_root_path))
--- 21,31 ----
  	define('MXBB_MODULE', false);
  	define('IN_PHPBB', true);
! 
  	$phpbb_root_path = $module_root_path = './';
  	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 
  	include($phpbb_root_path . 'common.' . $phpEx);
  	include($mx_mod_path . "includes/functions_required.$phpEx");
! 
  	//Check if forum_hack is installed
  	if (!isset($mx_root_path))
***************
*** 45,52 ****
  		$mx_root_path = $phpbb_root_path;
  	}
! 	
  	require($mx_mod_path . "includes/functions_core.$phpEx");
  	require($mx_mod_path . "includes/functions_styles.$phpEx");
! 	
  	//Check for cash mod
  	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
--- 45,52 ----
  		$mx_root_path = $phpbb_root_path;
  	}
! 
  	require($mx_mod_path . "includes/functions_core.$phpEx");
  	require($mx_mod_path . "includes/functions_styles.$phpEx");
! 
  	//Check for cash mod
  	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
***************
*** 65,69 ****
  	//
  	$mx_cache = new mx_cache();
! 	
  	//
  	// Get mxBB config settings
--- 65,69 ----
  	//
  	$mx_cache = new mx_cache();
! 
  	//
  	// Get mxBB config settings
***************
*** 75,79 ****
  	//
  	$mx_request_vars = new mx_request_vars();
! 	
  	//
  	// Page selector
--- 75,79 ----
  	//
  	$mx_request_vars = new mx_request_vars();
! 
  	//
  	// Page selector
***************
*** 82,86 ****
  
  	$is_block = false;
! 	
  	//
  	// instatiate the mx_user class
--- 82,86 ----
  
  	$is_block = false;
! 
  	//
  	// instatiate the mx_user class
***************
*** 92,96 ****
  		define('PORTAL_BACKEND', 'phpbb2');
  		$tplEx = 'tpl';
! 		
  		//
  		// Start user session
--- 92,96 ----
  		define('PORTAL_BACKEND', 'phpbb2');
  		$tplEx = 'tpl';
! 
  		//
  		// Start user session
***************
*** 108,114 ****
  		}
  		*/
! 		include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
! 		include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
! 		
  	}
  	else if (@file_exists("./mcp.$phpEx")) // phpBB3
--- 108,114 ----
  		}
  		*/
! 
! 		mx_cache::load_file('bbcode');
! 		mx_cache::load_file('functions_post');
  	}
  	else if (@file_exists("./mcp.$phpEx")) // phpBB3
***************
*** 116,120 ****
  		define('PORTAL_BACKEND', 'phpbb3');
  		$tplEx = 'html';
! 		
  		//
  		// Start user session
--- 116,120 ----
  		define('PORTAL_BACKEND', 'phpbb3');
  		$tplEx = 'html';
! 
  		//
  		// Start user session
***************
*** 156,160 ****
  		// Start session management
  		//
! 		$mx_user->init($user_ip, PAGE_INDEX); 
  		//
  		// End session management
--- 156,160 ----
  		// Start session management
  		//
! 		$mx_user->init($user_ip, PAGE_INDEX);
  		//
  		// End session management
***************
*** 185,191 ****
  		if( is_object($mx_block))
  		{
! 			$is_block = TRUE;	
  		}
!   
    		global $images;
  	}
--- 185,191 ----
  		if( is_object($mx_block))
  		{
! 			$is_block = TRUE;
  		}
! 
    		global $images;
  	}
***************
*** 300,304 ****
  	else
  	{
! 	
  /*
  +----------------------------------------------------------
--- 300,304 ----
  	else
  	{
! 
  /*
  +----------------------------------------------------------
***************
*** 320,351 ****
  */
  
! $cat_id = $_POST['c'] ? $_POST['c'] : ( $_GET['c'] ? $_GET['c'] : 0 ); 
! $cat_where = "cat_parent = $cat_id"; 
!   
! if ($cat_id != 0) 
! { 
! 	$sql = "SELECT cat_id,cat_title 
!                 FROM ". MUSIC_CAT_TABLE ." 
!                 WHERE cat_id = $cat_id"; 
! 	if ( $result = $db->sql_query($sql) ) 
  	{
  		$thiscat_parent = array();
! 		$thiscat_parent = $db->sql_fetchrow($result); 
  
! 		$template->assign_vars(array( 
  				'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])),
  				'SUBCAT_NAV' => '&nbsp;' . $lang['Nav_Separator'] . '&nbsp; <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>',
  				'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'],
  				'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss&c=" . $thiscat_parent['cat_id'] . "&sid=" . $userdata['session_id'], true)),
! 				'CAT_PARENT' => $thiscat_parent['cat_id']) 
  		);
!  	} 
  }
  else
! { 
! 	$template->assign_vars(array( 
  				'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss" . "&sid=" . $userdata['session_id'], true))
  	));
!  
  }
  
--- 320,351 ----
  */
  
! $cat_id = $_POST['c'] ? $_POST['c'] : ( $_GET['c'] ? $_GET['c'] : 0 );
! $cat_where = "cat_parent = $cat_id";
! 
! if ($cat_id != 0)
! {
! 	$sql = "SELECT cat_id,cat_title
!                 FROM ". MUSIC_CAT_TABLE ."
!                 WHERE cat_id = $cat_id";
! 	if ( $result = $db->sql_query($sql) )
  	{
  		$thiscat_parent = array();
! 		$thiscat_parent = $db->sql_fetchrow($result);
  
! 		$template->assign_vars(array(
  				'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])),
  				'SUBCAT_NAV' => '&nbsp;' . $lang['Nav_Separator'] . '&nbsp; <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>',
  				'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'],
  				'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss&c=" . $thiscat_parent['cat_id'] . "&sid=" . $userdata['session_id'], true)),
! 				'CAT_PARENT' => $thiscat_parent['cat_id'])
  		);
!  	}
  }
  else
! {
! 	$template->assign_vars(array(
  				'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss" . "&sid=" . $userdata['session_id'], true))
  	));
! 
  }
  
***************
*** 431,436 ****
  	// ------------------------------------------
  
! 	if ($catrows[$i]['cat_type'] == 0) 
! 	{ 
  		if ($catrows[$i]['count'] == 0)
  		{
--- 431,436 ----
  	// ------------------------------------------
  
! 	if ($catrows[$i]['cat_type'] == 0)
! 	{
  		if ($catrows[$i]['count'] == 0)
  		{
***************
*** 550,554 ****
  		{
  			mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql);
! 		} 
  
  		$mediarow = array();
--- 550,554 ----
  		{
  			mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql);
! 		}
  
  		$mediarow = array();
***************
*** 563,567 ****
  		if(!empty($template->xs_version))
  		{
! 			if ($total_media > 0) 
  			{
  				$template->assign_block_vars('catrow.virtualmediacat', array());
--- 563,567 ----
  		if(!empty($template->xs_version))
  		{
! 			if ($total_media > 0)
  			{
  				$template->assign_block_vars('catrow.virtualmediacat', array());
***************
*** 579,583 ****
  		{
  			mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql);
! 		} 
  
  		$totalrow = array();
--- 579,583 ----
  		{
  			mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql);
! 		}
  
  		$totalrow = array();
***************
*** 594,641 ****
  		if(!empty($template->xs_version))
  		{
! 			if ($total_images > 0) 
  			{
  				$template->assign_block_vars('catrow.virtualimagecat', array());
  			}
  		}
! 	} 
! 	else 
! 	{ 
!  		// this is a parent category 
!  		$sc_sql = "SELECT * 
!                         FROM ". MUSIC_CAT_TABLE ." 
!                         WHERE cat_parent = " . $catrows[$i]['cat_id'] . " 
!                         GROUP BY cat_id 
!                         ORDER BY cat_order ASC"; 
!   
!  		if ( !($sc_result = $db->sql_query($sc_sql)) ) 
!  		{ 
!                         message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); 
!  		} 
!   
!  		$sql_count = "SELECT count(cat_id) as count 
!                               FROM ". MUSIC_CAT_TABLE ." 
!                               WHERE cat_parent = " . $catrows[$i]['cat_id']; 
!  		if ( ($result_count = $db->sql_query($sql_count)) ) 
!  		{ 
!                         $subcat_count = $db->sql_fetchrow($result_count); 
!                         $subcat_count = $subcat_count['count'] . " sub catagories"; 
!  		} 
!  		else 
!  		{ 
!                         $subcat_count = ""; 
!  		} 
!   
!  		$subcats = '<br /><span class="gensmall"><b>' . $lang['Music_sub_categories'] . ':</b><br />'; 
!  		while ( $subcatrow = $db->sql_fetchrow($sc_result) ) 
!  		{ 
!                         $subcats .= ' - <a class="gensmall" href="' . append_sid(this_mo_mxurl('music_mode=music_cat&cat_id='. $subcatrow['cat_id'])) . '">' . $subcatrow['cat_title'] . '</a><br />'; 
!  		} 
   		$subcats .= '</span><br />';
!  
!  		$template->assign_block_vars('catrow', array( 
! 			'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), 
! 			'CAT_TITLE' => $catrows[$i]['cat_title'], 
! 			'CAT_DESC' => $catrows[$i]['cat_desc'], 
  			'SONGS' => $subcat_count,
  			'CAT_VIEWS' => $catrows[$i]['cat_views'],
--- 594,641 ----
  		if(!empty($template->xs_version))
  		{
! 			if ($total_images > 0)
  			{
  				$template->assign_block_vars('catrow.virtualimagecat', array());
  			}
  		}
! 	}
! 	else
! 	{
!  		// this is a parent category
!  		$sc_sql = "SELECT *
!                         FROM ". MUSIC_CAT_TABLE ."
!                         WHERE cat_parent = " . $catrows[$i]['cat_id'] . "
!                         GROUP BY cat_id
!                         ORDER BY cat_order ASC";
! 
!  		if ( !($sc_result = $db->sql_query($sc_sql)) )
!  		{
!                         message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql);
!  		}
! 
!  		$sql_count = "SELECT count(cat_id) as count
!                               FROM ". MUSIC_CAT_TABLE ."
!                               WHERE cat_parent = " . $catrows[$i]['cat_id'];
!  		if ( ($result_count = $db->sql_query($sql_count)) )
!  		{
!                         $subcat_count = $db->sql_fetchrow($result_count);
!                         $subcat_count = $subcat_count['count'] . " sub catagories";
!  		}
!  		else
!  		{
!                         $subcat_count = "";
!  		}
! 
!  		$subcats = '<br /><span class="gensmall"><b>' . $lang['Music_sub_categories'] . ':</b><br />';
!  		while ( $subcatrow = $db->sql_fetchrow($sc_result) )
!  		{
!                         $subcats .= ' - <a class="gensmall" href="' . append_sid(this_mo_mxurl('music_mode=music_cat&cat_id='. $subcatrow['cat_id'])) . '">' . $subcatrow['cat_title'] . '</a><br />';
!  		}
   		$subcats .= '</span><br />';
! 
!  		$template->assign_block_vars('catrow', array(
! 			'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])),
! 			'CAT_TITLE' => $catrows[$i]['cat_title'],
! 			'CAT_DESC' => $catrows[$i]['cat_desc'],
  			'SONGS' => $subcat_count,
  			'CAT_VIEWS' => $catrows[$i]['cat_views'],
***************
*** 644,648 ****
  			'L_ALL_CAT_SONGS' => $lang['Category_songs'],
  			'MODERATORS' => $moderators_list,
! 			'LAST_SONG_INFO' => $last_song_info)  
  		);
  
--- 644,648 ----
  			'L_ALL_CAT_SONGS' => $lang['Category_songs'],
  			'MODERATORS' => $moderators_list,
! 			'LAST_SONG_INFO' => $last_song_info)
  		);
  
***************
*** 653,663 ****
  				'SUBCATS' => $subcats)
  			);
!  		} 
! 	} 
  	// ------------------------------------------
  	// Parse to template the info of the current Category
  	// ------------------------------------------
  	if ($catrows[$i]['cat_type'] == 0)
! 	{ 
  		//Removed code
  	}
--- 653,663 ----
  				'SUBCATS' => $subcats)
  			);
!  		}
! 	}
  	// ------------------------------------------
  	// Parse to template the info of the current Category
  	// ------------------------------------------
  	if ($catrows[$i]['cat_type'] == 0)
! 	{
  		//Removed code
  	}

Index: music_flv.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_flv.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** music_flv.php	19 Jun 2008 12:01:55 -0000	1.3
--- music_flv.php	15 Jul 2008 22:06:07 -0000	1.4
***************
*** 21,31 ****
  	define('MXBB_MODULE', false);
  	define('IN_PHPBB', true);
! 	
  	$phpbb_root_path = $module_root_path = './';
  	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
  	include($phpbb_root_path . 'common.' . $phpEx);
  	include($mx_mod_path . "includes/functions_required.$phpEx");
! 	
  	//Check if forum_hack is installed
  	if (!isset($mx_root_path))
--- 21,31 ----
  	define('MXBB_MODULE', false);
  	define('IN_PHPBB', true);
! 
  	$phpbb_root_path = $module_root_path = './';
  	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 
  	include($phpbb_root_path . 'common.' . $phpEx);
  	include($mx_mod_path . "includes/functions_required.$phpEx");
! 
  	//Check if forum_hack is installed
  	if (!isset($mx_root_path))
***************
*** 45,52 ****
  		$mx_root_path = $phpbb_root_path;
  	}
! 	
  	require($mx_mod_path . "includes/functions_core.$phpEx");
  	require($mx_mod_path . "includes/functions_styles.$phpEx");
! 	
  	//Check for cash mod
  	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
--- 45,52 ----
  		$mx_root_path = $phpbb_root_path;
  	}
! 
  	require($mx_mod_path . "includes/functions_core.$phpEx");
  	require($mx_mod_path . "includes/functions_styles.$phpEx");
! 
  	//Check for cash mod
  	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
***************
*** 65,69 ****
  	//
  	$mx_cache = new mx_cache();
! 	
  	//
  	// Get mxBB config settings
--- 65,69 ----
  	//
  	$mx_cache = new mx_cache();
! 
  	//
  	// Get mxBB config settings
***************
*** 75,79 ****
  	//
  	$mx_request_vars = new mx_request_vars();
! 	
  	//
  	// Page selector
--- 75,79 ----
  	//
  	$mx_request_vars = new mx_request_vars();
! 
  	//
  	// Page selector
***************
*** 82,86 ****
  
  	$is_block = false;
! 	
  	//
  	// instatiate the mx_user class
--- 82,86 ----
  
  	$is_block = false;
! 
  	//
  	// instatiate the mx_user class
***************
*** 92,96 ****
  		define('PORTAL_BACKEND', 'phpbb2');
  		$tplEx = 'tpl';
! 		
  		//
  		// Start user session
--- 92,96 ----
  		define('PORTAL_BACKEND', 'phpbb2');
  		$tplEx = 'tpl';
! 
  		//
  		// Start user session
***************
*** 108,114 ****
  		}
  		*/
! 		include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
! 		include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
! 		
  	}
  	else if (@file_exists("./mcp.$phpEx")) // phpBB3
--- 108,115 ----
  		}
  		*/
! 
! 		mx_cache::load_file('bbcode');
! 		mx_cache::load_file('functions_post');
! 
  	}
  	else if (@file_exists("./mcp.$phpEx")) // phpBB3
***************
*** 116,120 ****
  		define('PORTAL_BACKEND', 'phpbb3');
  		$tplEx = 'html';
! 		
  		//
  		// Start user session
--- 117,121 ----
  		define('PORTAL_BACKEND', 'phpbb3');
  		$tplEx = 'html';
! 
  		//
  		// Start user session
***************
*** 157,161 ****
  		// Start session management
  		//
! 		$mx_user->init($user_ip, PAGE_INDEX); 
  		//
  		// End session management
--- 158,162 ----
  		// Start session management
  		//
! 		$mx_user->init($user_ip, PAGE_INDEX);
  		//
  		// End session management
***************
*** 187,193 ****
  		if(is_object($mx_block))
  		{
! 			$is_block = TRUE;	
  		}
!   
    		global $images;
  	}
--- 188,194 ----
  		if(is_object($mx_block))
  		{
! 			$is_block = TRUE;
  		}
! 
    		global $images;
  	}
***************
*** 354,358 ****
  		if (!$userdata['session_logged_in'])
  		{
! 			mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_page&song_id=$song_id"), true));		
  		}
  		else
--- 355,359 ----
  		if (!$userdata['session_logged_in'])
  		{
! 			mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_page&song_id=$song_id"), true));
  		}
  		else
***************
*** 561,565 ****
  				$url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] );
  				$lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' );
! 			}	
  		}
  		else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') )
--- 562,566 ----
  				$url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] );
  				$lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' );
! 			}
  		}
  		else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') )
***************
*** 569,573 ****
  			if (empty($videoid['song_url'][1]) )
  	 		{
! 				$videoid['song_url'] = explode("/v/", $thissong['song_url']);	
  			}
  
--- 570,574 ----
  			if (empty($videoid['song_url'][1]) )
  	 		{
! 				$videoid['song_url'] = explode("/v/", $thissong['song_url']);
  			}
  
***************
*** 631,635 ****
  				$url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] );
  				$lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' );
! 				$url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); 
  			}
  		}
--- 632,636 ----
  				$url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] );
  				$lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' );
! 				$url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download );
  			}
  		}
***************
*** 654,658 ****
  					$url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] );
  					$lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' );
! 					$url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); 
  				}
  			}
--- 655,659 ----
  					$url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] );
  					$lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' );
! 					$url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download );
  				}
  			}
***************
*** 663,667 ****
  				$url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] );
  				$lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' );
! 				$url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); 
  			}
  
--- 664,668 ----
  				$url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] );
  				$lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' );
! 				$url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download );
  			}
  
***************
*** 769,775 ****
  		'L_COMMENTS' => $lang['Comments'])
  	);
! 	
  }
! else	
  {
  	$template->assign_block_vars('flv', array());
--- 770,776 ----
  		'L_COMMENTS' => $lang['Comments'])
  	);
! 
  }
! else
  {
  	$template->assign_block_vars('flv', array());
***************
*** 777,781 ****
  	//$url_video = (@file_exists($music_root_path . 'mediaplayer.swf')) ? $music_root_path . 'mediaplayer.swf' : PORTAL_URL . 'modules/mx_music/music_box/mediaplayer.swf';
  	$url_video = PORTAL_URL . 'modules/mx_music/music_box/mediaplayer.swf';
! 	 
  	if (@file_exists($mx_root_path . $flv_file))
  	{
--- 778,782 ----
  	//$url_video = (@file_exists($music_root_path . 'mediaplayer.swf')) ? $music_root_path . 'mediaplayer.swf' : PORTAL_URL . 'modules/mx_music/music_box/mediaplayer.swf';
  	$url_video = PORTAL_URL . 'modules/mx_music/music_box/mediaplayer.swf';
! 
  	if (@file_exists($mx_root_path . $flv_file))
  	{
***************
*** 790,794 ****
  		$url_song = $flv_file;
  	}
! 	
  	if (@file_exists($mx_root_path . $flv_img))
  	{
--- 791,795 ----
  		$url_song = $flv_file;
  	}
! 
  	if (@file_exists($mx_root_path . $flv_img))
  	{
***************
*** 802,806 ****
  	{
  		$img_id = $flv_img;
! 	}	
  
  	$template->assign_vars(array(
--- 803,807 ----
  	{
  		$img_id = $flv_img;
! 	}
  
  	$template->assign_vars(array(
***************
*** 881,885 ****
  		'L_COMMENTS' => $lang['Comments'])
  	);
! 	
  }
  
--- 882,886 ----
  		'L_COMMENTS' => $lang['Comments'])
  	);
! 
  }
  

[mxbb-commits] mx_linkdb/linkdb/includes functions.php,1.26,1.27

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25385/includes

Modified Files:
	functions.php 
Log Message:
More...of the same

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** functions.php	6 Jul 2008 22:13:50 -0000	1.26
--- functions.php	15 Jul 2008 22:06:07 -0000	1.27
***************
*** 87,90 ****
--- 87,91 ----
  	 * @param unknown_type $page_id
  	 */
+ 	/*
  	function generate_smilies( $mode, $page_id )
  	{
***************
*** 199,202 ****
--- 200,204 ----
  		}
  	}
+ 	*/
  
  	// since that I can't use the original function with new template system

[mxbb-commits] mx_linkdb linkdb.php,1.19,1.20

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_linkdb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25275

Modified Files:
	linkdb.php 
Log Message:
More...of the same

Index: linkdb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** linkdb.php	10 Jul 2008 22:22:28 -0000	1.19
--- linkdb.php	15 Jul 2008 22:05:52 -0000	1.20
***************
*** 60,65 ****
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode', 'phpbb2');
! 		mx_cache::load_file('functions_post', 'phpbb2');
  
  		// Start session management
--- 60,65 ----
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode');
! 		mx_cache::load_file('functions_post');
  
  		// Start session management

[mxbb-commits] mx_linkdb/admin mx_module_defs.php,1.5,1.6

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_linkdb/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25275/admin

Modified Files:
	mx_module_defs.php 
Log Message:
More...of the same

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/admin/mx_module_defs.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mx_module_defs.php	3 Jun 2008 20:08:39 -0000	1.5
--- mx_module_defs.php	15 Jul 2008 22:05:52 -0000	1.6
***************
*** 68,91 ****
  		$parameter_opt = '';
  
- 		/*
- 		switch ( $parameter_data['parameter_type'] )
- 		{
- 			case 'pa_quick_cat':
- 				$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( $bbcode_on )
- 				{
- 					$bbcode_uid = make_bbcode_uid();
- 				}
- 
- 				break;
- 		}
- 
- 		$parameter_value = prepare_message(trim($parameter_value), $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
- 		$parameter_opt = $bbcode_uid;
- 		*/
- 
  		return array('parameter_value' => $parameter_value, 'parameter_opt' => $parameter_opt);
  	}
--- 68,71 ----

[mxbb-commits] mx_kb/kb/modules kb_post.php, 1.19, 1.20 kb_post_comment.php, 1.16, 1.17 kb_search.php, 1.14, 1.15

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_kb/kb/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25122/kb/modules

Modified Files:
	kb_post.php kb_post_comment.php kb_search.php 
Log Message:
More...

Index: kb_search.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_search.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** kb_search.php	10 Jul 2008 22:22:19 -0000	1.14
--- kb_search.php	15 Jul 2008 22:05:43 -0000	1.15
***************
*** 30,35 ****
  		global $phpbb_root_path, $userdata, $mx_root_path, $module_root_path, $is_block;
  
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		if ( isset( $_REQUEST['search_keywords'] ) )
  		{
--- 30,33 ----

Index: kb_post.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** kb_post.php	6 Jul 2008 22:12:24 -0000	1.19
--- kb_post.php	15 Jul 2008 22:05:43 -0000	1.20
***************
*** 30,34 ****
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars, $theme;
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
! 		global $mx_block;
  
  		//
--- 30,34 ----
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars, $theme;
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
! 		global $mx_block, $mx_bbcode;
  
  		//
***************
*** 218,222 ****
  			if ($smilies_on)
  			{
! 				$mx_kb_functions->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}
--- 218,222 ----
  			if ($smilies_on)
  			{
! 				$mx_bbcode->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}

Index: kb_post_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post_comment.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** kb_post_comment.php	3 Jun 2008 20:10:35 -0000	1.16
--- kb_post_comment.php	15 Jul 2008 22:05:43 -0000	1.17
***************
*** 30,34 ****
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme;
  
  		//
--- 30,34 ----
  		global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars;
! 		global $mx_block, $theme, $mx_bbcode;
  
  		//
***************
*** 179,183 ****
  			if ($smilies_on)
  			{
! 				$mx_kb_functions->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}
--- 179,183 ----
  			if ($smilies_on)
  			{
! 				$mx_bbcode->generate_smilies( 'inline', PAGE_POSTING );
  			}
  		}

[mxbb-commits] mx_kb/kb/admin admin_auth_manage.php, 1.8, 1.9 admin_cat_manage.php, 1.9, 1.10 admin_custom_manage.php, 1.7, 1.8 admin_settings.php, 1.8, 1.9 admin_types_manage.php, 1.8, 1.9

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_kb/kb/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25122/kb/admin

Modified Files:
	admin_auth_manage.php admin_cat_manage.php 
	admin_custom_manage.php admin_settings.php 
	admin_types_manage.php 
Log Message:
More...

Index: admin_custom_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_custom_manage.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_custom_manage.php	10 Jul 2008 22:22:18 -0000	1.7
--- admin_custom_manage.php	15 Jul 2008 22:05:42 -0000	1.8
***************
*** 20,28 ****
  		global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$this_custom_field = new mx_custom_field(KB_CUSTOM_TABLE, KB_CUSTOM_DATA_TABLE);
  		$this_custom_field->init();
--- 20,23 ----

Index: admin_cat_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_cat_manage.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin_cat_manage.php	10 Jul 2008 22:22:18 -0000	1.9
--- admin_cat_manage.php	15 Jul 2008 22:05:42 -0000	1.10
***************
*** 20,28 ****
  		global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config;
  
- 		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
  		$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, '');
  
--- 20,23 ----

Index: admin_types_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_types_manage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_types_manage.php	10 Jul 2008 22:22:19 -0000	1.8
--- admin_types_manage.php	15 Jul 2008 22:05:42 -0000	1.9
***************
*** 21,29 ****
  
  		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
- 		//
  		// Load mode
  		//
--- 21,24 ----

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_settings.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_settings.php	10 Jul 2008 22:22:19 -0000	1.8
--- admin_settings.php	15 Jul 2008 22:05:42 -0000	1.9
***************
*** 21,29 ****
  
  		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
- 		//
  		// Pull all config data
  		//
--- 21,24 ----

Index: admin_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_auth_manage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_auth_manage.php	10 Jul 2008 22:22:18 -0000	1.8
--- admin_auth_manage.php	15 Jul 2008 22:05:41 -0000	1.9
***************
*** 21,29 ****
  
  		//
- 		// Includes
- 		//
- 		mx_cache::load_file('functions_search', 'phpbb2');
- 
- 		//
  		// Start adminCP
  		//
--- 21,24 ----

[mxbb-commits] mx_kb/kb/includes functions.php,1.24,1.25

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_kb/kb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25122/kb/includes

Modified Files:
	functions.php 
Log Message:
More...

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** functions.php	6 Jul 2008 22:12:24 -0000	1.24
--- functions.php	15 Jul 2008 22:05:43 -0000	1.25
***************
*** 94,97 ****
--- 94,98 ----
  	 * @param unknown_type $page_id
  	 */
+ 	/*
  	function generate_smilies( $mode, $page_id )
  	{
***************
*** 208,211 ****
--- 209,213 ----
  		}
  	}
+ 	*/
  
  	/**

[mxbb-commits] mx_kb kb.php,1.51,1.52

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_kb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25122

Modified Files:
	kb.php 
Log Message:
More...

Index: kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** kb.php	10 Jul 2008 22:22:17 -0000	1.51
--- kb.php	15 Jul 2008 22:05:41 -0000	1.52
***************
*** 59,64 ****
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode', 'phpbb2');
! 		mx_cache::load_file('functions_post', 'phpbb2');
  
  		// Start session management
--- 59,64 ----
  		$tplEx = 'tpl';
  
! 		mx_cache::load_file('bbcode');
! 		mx_cache::load_file('functions_post');
  
  		// Start session management