mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] mx_music music_flv.php,1.1,1.2

[OryNider <ory...@us...>]

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

Modified Files:
	music_flv.php 
Log Message:
Licensing

The FLV Media Player is licensed under a {Creative Commons License}. It allows you to use, modify and redistribute the script for free for noncommercial purposes. For corporate use, {please apply for a 20 euros commercial license}!

Index: music_flv.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_flv.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** music_flv.php	12 Mar 2008 07:15:31 -0000	1.1
--- music_flv.php	28 May 2008 23:31:50 -0000	1.2
***************
*** 459,463 ****
  		$template->assign_block_vars('flv', array());
  		$url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id"));
! 		$url_video = $music_root_path . 'music_player.swf';
  	}
  	else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) )
--- 459,463 ----
  		$template->assign_block_vars('flv', array());
  		$url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id"));
! 		$url_video = $music_root_path . 'mediaplayer.swf';
  	}
  	else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) )
***************
*** 773,777 ****
  	$template->assign_block_vars('flv', array());
  	$url_download = '';
! 	$url_video = $music_root_path . 'music_player.swf';
  	 
  	if (@file_exists($mx_root_path . $flv_file))
--- 773,777 ----
  	$template->assign_block_vars('flv', array());
  	$url_download = '';
! 	$url_video = $music_root_path . 'mediaplayer.swf';
  	 
  	if (@file_exists($mx_root_path . $flv_file))

[mxbb-commits] core/includes mx_functions_tools.php,1.27,1.28

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

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

Modified Files:
	mx_functions_tools.php 
Log Message:
Update to generic comments class

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mx_functions_tools.php	27 Apr 2008 18:42:57 -0000	1.27
--- mx_functions_tools.php	22 May 2008 21:08:30 -0000	1.28
***************
*** 1605,1608 ****
--- 1605,1639 ----
  		return $mytext;
  	}
+ 
+ 	/**
+ 	 * Enter description here...
+ 	 *
+ 	 * @param unknown_type $mytext
+ 	 * @param unknown_type $length
+ 	 * @param unknown_type $add_dots
+ 	 * @return unknown
+ 	 */
+ 	function split_text( $mytext, $length = 200, $add_dots = true, $key = '<!-- split -->' )
+ 	{
+ 		$do_trunc = false;
+ 		$split_pos = strrpos($mytext, $key) > $length ? strrpos($mytext, $key) : $length;
+ 		if ( strlen( $mytext ) > $split_pos )
+ 		{
+ 			$do_trunc = true;
+ 
+ 		    $shortstring = substr($mytext, 0, $split_pos);
+ 		    $lastdot = strrpos($shortstring, ".");
+ 		    $lastspace = strrpos($shortstring, " ");
+ 		    $shortstring = substr($shortstring, 0, ($lastdot > $lastspace? $lastdot : $lastspace));
+ 			$shortstring = str_replace('<br/>', '<br />', $shortstring);
+ 
+ 			if ( $add_dots )
+ 			{
+ 				$shortstring .= '...';
+ 			}
+ 			return $shortstring;
+ 		}
+ 		return $mytext;
+ 	}
  }
  
***************
*** 3628,3631 ****
--- 3659,3663 ----
  	var $max_comment_subject_chars = '50';
  	var $max_comment_chars = '400';
+ 	var $split_key = '<!-- split -->';
  
  	var $formatting_comment_truncate_links = false;
***************
*** 3638,3641 ****
--- 3670,3674 ----
  	var $u_delete = '';
  	var $u_edit = '';
+ 	var $u_more = '';
  	var $u_pagination = '';
  
***************
*** 3717,3720 ****
--- 3750,3766 ----
  	 * Enter description here...
  	 *
+ 	 * @param unknown_type $cid
+ 	 * @return unknown
+ 	 */
+ 	function u_more($cid)
+ 	{
+ 		global $mx_request_vars;
+ 		$more = $mx_request_vars->is_request('virtual') ? '&virtual=' . $mx_request_vars->request('virtual', MX_TYPE_INT, 0) : '';
+ 		return mx_append_sid($this->u_more . '&cid='.$cid .$more);
+ 	}
+ 
+ 	/**
+ 	 * Enter description here...
+ 	 *
  	 * @param unknown_type $page_num
  	 * @return unknown
***************
*** 3885,3889 ****
  			if ( $this->max_comment_chars > 0 )
  			{
! 				$comments_text = $mx_text_formatting->truncate_text( $comments_text, $this->max_comment_chars, true );
  			}
  
--- 3931,3936 ----
  			if ( $this->max_comment_chars > 0 )
  			{
! 				//$comments_text = $mx_text_formatting->truncate_text( $comments_text, $this->max_comment_chars, true );
! 				$comments_text = $mx_text_formatting->split_text( $comments_text, $this->max_comment_chars, true, $this->split_key );
  			}
  
***************
*** 3929,3932 ****
--- 3976,3987 ----
  			}
  
+ 			if ( !empty($this->u_more) )
+ 			{
+ 				$template->assign_block_vars( 'use_comments.text.more', array(
+ 					'L_COMMENT_MORE' => $lang['Comment_more'],
+ 					'U_COMMENT_MORE' => $this->u_more($this->comments_row['comments_id']),
+ 				));
+ 			}
+ 
  		}
  
***************
*** 3942,3946 ****
  
  		$num_of_replies = intval( $this->total_comments );
! 		$pagination = phpBB2::generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . '&nbsp;';
  		if ($num_of_replies > 0)
  		{
--- 3997,4002 ----
  
  		$num_of_replies = intval( $this->total_comments );
! 		//$pagination = phpBB2::generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . '&nbsp;';
! 		$pagination = mx_generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start, true, true, true, false ) . '&nbsp;';
  		if ($num_of_replies > 0)
  		{

[mxbb-commits] core/includes mx_functions_tools.php, 1.15.2.7, 1.15.2.8

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

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

Modified Files:
      Tag: core28x
	mx_functions_tools.php 
Log Message:
Update to generic comments class

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -C2 -d -r1.15.2.7 -r1.15.2.8
*** mx_functions_tools.php	21 Mar 2008 20:05:17 -0000	1.15.2.7
--- mx_functions_tools.php	22 May 2008 21:08:00 -0000	1.15.2.8
***************
*** 1577,1580 ****
--- 1577,1611 ----
  		return $mytext;
  	}
+ 
+ 	/**
+ 	 * Enter description here...
+ 	 *
+ 	 * @param unknown_type $mytext
+ 	 * @param unknown_type $length
+ 	 * @param unknown_type $add_dots
+ 	 * @return unknown
+ 	 */
+ 	function split_text( $mytext, $length = 200, $add_dots = true, $key = '<!-- split -->' )
+ 	{
+ 		$do_trunc = false;
+ 		$split_pos = strrpos($mytext, $key) > $length ? strrpos($mytext, $key) : $length;
+ 		if ( strlen( $mytext ) > $split_pos )
+ 		{
+ 			$do_trunc = true;
+ 
+ 		    $shortstring = substr($mytext, 0, $split_pos);
+ 		    $lastdot = strrpos($shortstring, ".");
+ 		    $lastspace = strrpos($shortstring, " ");
+ 		    $shortstring = substr($shortstring, 0, ($lastdot > $lastspace? $lastdot : $lastspace));
+ 			$shortstring = str_replace('<br/>', '<br />', $shortstring);
+ 
+ 			if ( $add_dots )
+ 			{
+ 				$shortstring .= '...';
+ 			}
+ 			return $shortstring;
+ 		}
+ 		return $mytext;
+ 	}
  }
  
***************
*** 3597,3600 ****
--- 3628,3632 ----
  	var $max_comment_subject_chars = '50';
  	var $max_comment_chars = '400';
+ 	var $split_key = '<!-- split -->';
  
  	var $formatting_comment_truncate_links = false;
***************
*** 3606,3609 ****
--- 3638,3642 ----
  	var $u_delete = '';
  	var $u_edit = '';
+ 	var $u_more = '';
  	var $u_pagination = '';
  
***************
*** 3679,3682 ****
--- 3712,3728 ----
  	 * Enter description here...
  	 *
+ 	 * @param unknown_type $cid
+ 	 * @return unknown
+ 	 */
+ 	function u_more($cid)
+ 	{
+ 		global $mx_request_vars;
+ 		$more = $mx_request_vars->is_request('virtual') ? '&virtual=' . $mx_request_vars->request('virtual', MX_TYPE_INT, 0) : '';
+ 		return mx_append_sid($this->u_more . '&cid='.$cid .$more);
+ 	}
+ 
+ 	/**
+ 	 * Enter description here...
+ 	 *
  	 * @param unknown_type $page_num
  	 * @return unknown
***************
*** 3844,3848 ****
  			if ( $this->max_comment_chars > 0 )
  			{
! 				$comments_text = $mx_text_formatting->truncate_text( $comments_text, $this->max_comment_chars, true );
  			}
  
--- 3890,3895 ----
  			if ( $this->max_comment_chars > 0 )
  			{
! 				//$comments_text = $mx_text_formatting->truncate_text( $comments_text, $this->max_comment_chars, true );
! 				$comments_text = $mx_text_formatting->split_text( $comments_text, $this->max_comment_chars, true, $this->split_key );
  			}
  
***************
*** 3886,3889 ****
--- 3933,3943 ----
  			}
  
+ 			if ( !empty($this->u_more) )
+ 			{
+ 				$template->assign_block_vars( 'use_comments.text.more', array(
+ 					'L_COMMENT_MORE' => $lang['Comment_more'],
+ 					'U_COMMENT_MORE' => $this->u_more($this->comments_row['comments_id']),
+ 				));
+ 			}
  		}
  
***************
*** 3898,3902 ****
  
  		$num_of_replies = intval( $this->total_comments );
! 		$pagination = phpBB2::generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . '&nbsp;';
  		if ($num_of_replies > 0)
  		{
--- 3952,3957 ----
  
  		$num_of_replies = intval( $this->total_comments );
! 		//$pagination = phpBB2::generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . '&nbsp;';
! 		$pagination = mx_generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start, true, true, true, false ) . '&nbsp;';
  		if ($num_of_replies > 0)
  		{

[mxbb-commits] mx_news/templates/_core mx_news_lists.tpl,NONE,1.1

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

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

Added Files:
	mx_news_lists.tpl 
Log Message:
News Module updated with added block (latest news) - a small truncated list block.

--- NEW FILE: mx_news_lists.tpl ---
<!-- BEGIN use_comments -->
<table width="100%" cellpadding="5" cellspacing="0" class="forumline" style="border-top:none;">
	<!--
  	<tr>
		<th class="thCornerL" colspan="2">{use_comments.L_COMMENTS}</th>
  	</tr>
  	-->
	<!-- BEGIN no_comments -->
  	<tr>
		<td colspan="2" class="row1" align="center"><span class="genmed">{use_comments.no_comments.L_NO_COMMENTS}</span></td>
  	</tr>
	<!-- END no_comments -->

	<!-- BEGIN text -->
 		<tr>
			<td class="row1">
				<span class="discreet">[{use_comments.text.TIME}]</span>
				<br><span class="cattitle">{use_comments.text.TITLE}</span>
				<p><span class="genmed">{use_comments.text.TEXT}</span>

				<!-- BEGIN more -->
				<p><a href="{use_comments.text.more.U_COMMENT_MORE}">[{use_comments.text.more.L_COMMENT_MORE}]</a>
				<!-- END more -->
			</td>
		</tr>
	<!-- END text -->
</table>

<!-- BEGIN comments_pag -->
<br />
<table width="100%" cellspacing="1" cellpadding="0" border="0">
  <tr>
	<td><span class="nav"><!--{use_comments.comments_pag.PAGE_NUMBER}--></span></td>
	<td align="right"><span class="nav">{use_comments.comments_pag.PAGINATION}</span></td>
  </tr>
</table>
<!-- END comments_pag -->

<!-- END use_comments -->

[mxbb-commits] mx_news/mx_news/includes functions_comment.php, 1.3, 1.4 functions_mx_news.php, 1.4, 1.5

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

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

Modified Files:
	functions_comment.php functions_mx_news.php 
Log Message:
News Module updated with added block (latest news) - a small truncated list block.

Index: functions_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news/includes/functions_comment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functions_comment.php	14 Mar 2008 20:42:38 -0000	1.3
--- functions_comment.php	22 May 2008 21:06:40 -0000	1.4
***************
*** 28,32 ****
  	function init( $item_data, $comments_type = 'internal' )
  	{
! 		global $mx_news, $mx_news_config, $db, $images, $mx_block, $board_config;
  
  		if ( !is_object($mx_news) || empty($mx_news_config) )
--- 28,32 ----
  	function init( $item_data, $comments_type = 'internal' )
  	{
! 		global $mx_news, $mx_news_config, $toplist_config, $db, $images, $mx_block, $board_config, $toplist_page_id;
  
  		if ( !is_object($mx_news) || empty($mx_news_config) )
***************
*** 86,89 ****
--- 86,90 ----
  		$this->max_comment_subject_chars = $mx_news_config['max_comment_subject_chars'];
  		$this->max_comment_chars = $mx_news_config['max_comment_chars'];
+ 		$this->split_key = !empty($toplist_config['split_key']) ? $toplist_config['split_key'] : '<!-- split -->';
  
  		$this->formatting_comment_truncate_links = $mx_news_config['formatting_comment_truncate_links'];
***************
*** 100,104 ****
  		$this->u_edit = $mx_news->this_mxurl( 'action=post_news&item_id=' . $this->item_id  . '&modrewrite=no');
  		$this->u_delete = $mx_news->this_mxurl( "action=post_news&delete=do&item_id=".$this->item_id  . '&modrewrite=no');
! 
  	}
  
--- 101,105 ----
  		$this->u_edit = $mx_news->this_mxurl( 'action=post_news&item_id=' . $this->item_id  . '&modrewrite=no');
  		$this->u_delete = $mx_news->this_mxurl( "action=post_news&delete=do&item_id=".$this->item_id  . '&modrewrite=no');
! 		$this->u_more = 'index.php?page=' . $toplist_page_id . "&action=news";
  	}
  

Index: functions_mx_news.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news/includes/functions_mx_news.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** functions_mx_news.php	7 May 2008 20:08:16 -0000	1.4
--- functions_mx_news.php	22 May 2008 21:06:40 -0000	1.5
***************
*** 41,44 ****
--- 41,45 ----
  		global $db, $userdata, $debug, $mx_news_config, $mx_block;
  		global $mx_news_functions;
+ 		global $toplist_config;
  
  		unset( $this->block_id );
***************
*** 47,51 ****
  		unset( $this->notification );
  
! 		$this->block_id = $mx_news_functions->generate_virtualId($mx_block->block_id);
  
  		//
--- 48,53 ----
  		unset( $this->notification );
  
! 		$temp_id = isset($toplist_config['target_block']) ? $toplist_config['target_block'] : $mx_block->block_id;
! 		$this->block_id = $mx_news_functions->generate_virtualId($temp_id);
  
  		//

[mxbb-commits] mx_news/mx_news/modules mx_news_lists.php,NONE,1.1

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

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

Added Files:
	mx_news_lists.php 
Log Message:
News Module updated with added block (latest news) - a small truncated list block.

--- NEW FILE: mx_news_lists.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_news
* @version $Id: mx_news_lists.php,v 1.1 2008/05/22 21:06:41 jonohlsson Exp $
* @copyright (c) 2002-2006 [Jon Ohlsson, Mohd Basri, wGEric, PHP Arena, pafileDB, CRLin] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

if( !defined('IN_PORTAL') )
{
	die("Hacking attempt");
}

/**
 * Enter description here...
 *
 */
class mx_news_lists extends mx_news_public
{
	/**
	 * Enter description here...
	 *
	 * @param unknown_type $action
	 */
	function main( $action )
	{
		global $template, $lang, $board_config, $phpEx, $mx_news_config, $images, $user_ip;
		global $phpbb_root_path, $userdata, $db, $mx_news_functions;
		global $mx_root_path, $module_root_path, $is_block, $mx_request_vars;

		// =======================================================
		// Request vars
		// =======================================================
		$start = $mx_request_vars->get('start', MX_TYPE_INT, 0);
		$block_id = $this->block_id;
		$page_num = $mx_request_vars->request('page_num', MX_TYPE_INT, 1) - 1;

		if ( empty( $block_id ) )
		{
			mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] );
		}

		//
		// Comments
		//
			$comments_type = $this->comments[$block_id]['internal_comments'] ? 'internal' : 'phpbb';

			//
			// Instatiate comments
			//
			include_once( $module_root_path . 'mx_news/includes/functions_comment.' . $phpEx );
			$mx_news_comments = new mx_news_comments();
			$mx_news_comments->init( $mx_news_data, $comments_type );
			$mx_news_comments->display_comments();

		//
		// Output all
		//
		$this->display( $lang['Links'], 'mx_news_lists.tpl' );
	}
}
?>

[mxbb-commits] mx_news mx_news_list.php, NONE, 1.1 mx_news.pak, 1.1, 1.2

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

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

Modified Files:
	mx_news.pak 
Added Files:
	mx_news_list.php 
Log Message:
News Module updated with added block (latest news) - a small truncated list block.

--- NEW FILE: mx_news_list.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_news
* @version $Id: mx_news_list.php,v 1.1 2008/05/22 21:06:28 jonohlsson Exp $
* @copyright (c) 2002-2006 [Jon Ohlsson, Mohd Basri, wGEric, PHP Arena, pafileDB, CRLin] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

$phpEx = substr(strrchr(__FILE__, '.'), 1);

if ( !defined('PORTAL_BACKEND') && @file_exists( './viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
{
	define( 'MXBB_MODULE', false );
	define( 'IN_PHPBB', true );
	define( 'IN_PORTAL', true );
	define( 'IN_DOWNLOAD', true );

	// When run as a phpBB mod these paths are identical ;)
	$phpbb_root_path = $module_root_path = $mx_root_path = './';
	$mx_mod_path = $phpbb_root_path . 'mx_mod/';

	//Check for cash mod
	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
	{
		define('IN_CASHMOD', true);
	}

	include( $phpbb_root_path . 'common.' . $phpEx );

	@ini_set( 'display_errors', '1' );
	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables

	include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
	include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx );

	define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)

	//
	// Instatiate the mx_cache class
	//
	$mx_cache = new mx_cache();

	//
	// Get mxBB config settings
	//
	$portal_config = $mx_cache->obtain_mxbb_config();

	//
	// instatiate the mx_request_vars class
	//
	$mx_request_vars = new mx_request_vars();

	$is_block = false;

	if ( file_exists("./modcp.$phpEx") ) // phpBB2
	{
		define('PORTAL_BACKEND', 'phpbb2');
		$tplEx = 'tpl';

		include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx );
		include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );

		// Start session management
		$userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD );
		init_userprefs( $userdata );
		// End session management


	}
	else if ( @file_exists("./mcp.$phpEx") ) // phpBB3
	{
		define('PORTAL_BACKEND', 'phpbb3');
		$tplEx = 'html';

		//include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx );
		//include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx );

		//
		// Start session management
		//
		$user->session_begin();
		$userdata = $user->data;
		$user->setup();
		//
		// End session management
		//

		//
		// Get phpBB config settings
		//
		$board_config = $config;
	}
	else
	{
		die('Copy this file in phpbb_root_path were is your viewtopic.php file!!!');
	}
}
else
{
	define( 'MXBB_MODULE', true );

	if ( !function_exists( 'read_block_config' ) )
	{
		if( isset($_REQUEST['action']) && $_REQUEST['action'] == 'download' )
		{
		   define('MX_GZIP_DISABLED', true);
		}

		define( 'IN_PORTAL', true );
		$mx_root_path = '../../';
		$phpEx = substr(strrchr(__FILE__, '.'), 1);
		include_once( $mx_root_path . 'common.' . $phpEx );

		// Start session management
		$mx_user->init($user_ip, PAGE_INDEX);
		// End session management

		$block_id = ( !empty( $_GET['block_id'] ) ) ? $_GET['block_id'] : $_POST['id'];
		if ( empty( $block_id ) )
		{
			$sql = "SELECT * FROM " . BLOCK_TABLE . "  WHERE block_title = 'mxNews' LIMIT 1";
			if ( !$result = $db->sql_query( $sql ) )
			{
				mx_message_die( GENERAL_ERROR, "Could not query mx_news module information", "", __LINE__, __FILE__, $sql );
			}
			$row = $db->sql_fetchrow( $result );
			$block_id = $row['block_id'];
		}
		$is_block = false;
	}
	else
	{
		if( !defined('IN_PORTAL') || !is_object($mx_block))
		{
			die("Hacking attempt");
		}

		//
		// Read Block Settings
		//
		$title = $mx_block->block_info['block_title'];
		$desc = $mx_block->block_info['block_desc'];
		$block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );

		//Check for cash mod
		if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
		{
			define('IN_CASHMOD', true);
		}

		$is_block = true;
		global $images;
	}
	define( 'MXBB_27x', @file_exists( $mx_root_path . 'mx_login.'.$phpEx ) );
}

// -------------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------
// Start
// -------------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------

// ===================================================
// ?
// ===================================================
list( $trash, $mx_script_name_temp ) = split ( trim( $board_config['server_name'] ), PORTAL_URL );
$mx_script_name = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $mx_script_name_temp ) );

//
// Setup config parameters
//
$config_name = array( 'toplist_pagination', 'toplist_use_pagination', 'target_block', 'split_key', 'max_title_characters' , 'max_characters' );

for( $i = 0; $i < count( $config_name ); $i++ )
{
	$config_value = $mx_block->get_parameters( $config_name[$i] );
	$toplist_config[$config_name[$i]] = $config_value;
}

if ($toplist_config['target_block'] == 0)
{
	echo('You need to set the target News Block for this list!');
	return;
}

$toplist_config['split_key'] = '<!-- ' . $toplist_config['split_key'] . ' -->';

//
// Include the common file
//
include( $module_root_path . 'mx_news/mx_news_common.' . $phpEx );

$mx_news_config['max_comment_subject_chars'] = $toplist_config['max_title_characters'];
$mx_news_config['max_comment_chars'] = $toplist_config['max_characters'];

$toplist_page_id = intval($toplist_config['target_block']) > 0 ? get_page_id( $toplist_config['target_block'] ) : get_page_id( 'mx_news.php', true );

//
// Get action variable other wise set it to the main
//
//$action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, 'list');
$action = 'lists';

// ===================================================
// Is admin?
// ===================================================
switch (PORTAL_BACKEND)
{
	case 'internal':
	case 'phpbb2':
		$is_admin = ( ( $userdata['user_level'] == ADMIN  ) && $userdata['session_logged_in'] ) ? true : 0;
		break;
	case 'phpbb3':
		$is_admin = ( $userdata['user_type'] == USER_FOUNDER ) ? true : 0;
		break;
}

// ===================================================
// if the module is disabled give them a nice message
// ===================================================
if (!($mx_news_config['enable_module'] || $mx_user->is_admin))
{
	mx_message_die( GENERAL_MESSAGE, $lang['mx_news_disable'] );
}

//
// an array of all expected actions
//
$actions = array(
	'lists' => 'lists'
	);

//
// Lets Build the page
//
if ( !$is_block )
{
	include( $mx_root_path . 'includes/page_header.' . $phpEx );
}
$mx_news->module( $actions[$action] );
$mx_news->modules[$actions[$action]]->main( $action );

$mx_news_functions->page_header();

//
// page body for mx_news
//
$template->set_filenames( array( 'body' => $mx_news_tpl_name ) );

$template->pparse( 'body' );

$mx_news_functions->page_footer();

if ( !$is_block )
{
	include( $mx_root_path . 'includes/page_tail.' . $phpEx );
}
?>
Index: mx_news.pak
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news.pak,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_news.pak	8 Feb 2008 21:57:46 -0000	1.1
--- mx_news.pak	22 May 2008 21:06:28 -0000	1.2
***************
*** 1,6 ****
! module=+:56=+:Simple news manager=+:modules/mx_news/=+:News Manager module=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:56=+:67=+:News=+:News Manager=+:mx_news.php=+:
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - News=+:Demo block=+:67=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0
--- 1,16 ----
! module=+:55=+:Simple news manager=+:modules/mx_news/=+:News Manager module=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:55=+:67=+:News=+:News Manager=+:mx_news.php=+:
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - News=+:Demo block=+:67=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
+ New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
+ function=+:55=+:73=+:News List=+:Adds a latest news kind of block=+:mx_news_list.php=+:
+ parameter=+:73=+:156=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "mx_news.php")=+:0=+:0
+ parameter=+:73=+:157=+:toplist_pagination=+:Number=+:3=+:=+:0=+:0
+ parameter=+:73=+:158=+:toplist_use_pagination=+:Boolean=+:TRUE=+:=+:1=+:0
+ parameter=+:73=+:159=+:split_key=+:Text=+:split=+:=+:1=+:0
+ parameter=+:73=+:160=+:max_title_characters=+:Number=+:25=+:=+:0=+:0
+ parameter=+:73=+:161=+:max_characters=+:Number=+:200=+:=+:0=+:0
+ parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
+ block=+:=+:Demo - News List=+:Demo block=+:73=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0

[mxbb-commits] mx_news/language/lang_english lang_main.php, 1.2, 1.3

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

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

Modified Files:
	lang_main.php 
Log Message:
News Module updated with added block (latest news) - a small truncated list block.

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/language/lang_english/lang_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_main.php	14 Mar 2008 20:42:13 -0000	1.2
--- lang_main.php	22 May 2008 21:06:28 -0000	1.3
***************
*** 48,51 ****
--- 48,52 ----
  $lang['Comment_edit'] = 'Edit';
  $lang['Comment_delete'] = 'Delete';
+ $lang['Comment_more'] = 'Read more...';
  $lang['Comment_posted'] = 'Your comment has been entered successfully';
  $lang['Comment_deleted'] = 'The comment you selected has been deleted successfully';

[mxbb-commits] mx_news/language/lang_swedish lang_main.php, 1.2, 1.3

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

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

Modified Files:
	lang_main.php 
Log Message:
News Module updated with added block (latest news) - a small truncated list block.

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/language/lang_swedish/lang_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_main.php	14 Mar 2008 20:42:14 -0000	1.2
--- lang_main.php	22 May 2008 21:06:28 -0000	1.3
***************
*** 48,51 ****
--- 48,52 ----
  $lang['Comment_edit'] = 'Redigera';
  $lang['Comment_delete'] = 'Ta bort';
+ $lang['Comment_more'] = 'Läs mer...';
  $lang['Comment_posted'] = 'Kommentaren skickades...';
  $lang['Comment_deleted'] = 'Kommentaren togs bort...';

[mxbb-commits] core/includes mx_functions.php,1.83,1.84

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

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

Modified Files:
	mx_functions.php 
Log Message:
Trimmed the get_page_id() function a bit, to find also default dynamic blocks and making the query a bit more limited

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** mx_functions.php	3 May 2008 19:09:16 -0000	1.83
--- mx_functions.php	21 May 2008 22:08:33 -0000	1.84
***************
*** 802,806 ****
  					" . COLUMN_TABLE . " col,
  					" . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 					" . PARAMETER_TABLE . " par
  				WHERE pag.page_id = col.page_id
  					AND bct.column_id = col.column_id
--- 802,807 ----
  					" . COLUMN_TABLE . " col,
  					" . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 					" . PARAMETER_TABLE . " par,
! 					" . FUNCTION_TABLE . " fcn
  				WHERE pag.page_id = col.page_id
  					AND bct.column_id = col.column_id
***************
*** 808,811 ****
--- 809,814 ----
  					AND sys.parameter_id = par.parameter_id
  					AND par.parameter_name = 'block_ids'
+ 					AND par.function_id = fcn.function_id
+ 					AND fcn.function_file = 'mx_multiple_blocks.php'
  					ORDER BY sys.block_id";
  
***************
*** 821,825 ****
  				foreach($block_ids_array as $key => $block_id)
  				{
! 					if ($block_id = $search_item)
  					{
  						$p_row = $temp_row;
--- 824,875 ----
  				foreach($block_ids_array as $key => $block_id)
  				{
! 					if ($block_id == $search_item)
! 					{
! 						$p_row = $temp_row;
! 						continue;
! 					}
! 				}
! 
! 				if (!empty($p_row['page_id']))
! 				{
! 					continue;
! 				}
! 			}
! 			$db->sql_freeresult($result);
! 		}
! 
! 		if( empty($p_row['page_id']) )
! 		{
! 			//
! 			// Find if block is a default dynamic block (desperate try)
! 			//
! 			$sql = "SELECT pag.page_id, pag.page_name, pag.page_desc, sys.parameter_value
! 				FROM " . COLUMN_BLOCK_TABLE . " bct,
! 			       	" . PAGE_TABLE . " pag,
! 					" . COLUMN_TABLE . " col,
! 					" . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 					" . PARAMETER_TABLE . " par,
! 					" . FUNCTION_TABLE . " fcn
! 				WHERE pag.page_id = col.page_id
! 					AND bct.column_id = col.column_id
! 					AND bct.block_id = sys.block_id
! 					AND sys.parameter_id = par.parameter_id
! 					AND par.parameter_name = 'default_block_id'
! 					AND par.function_id = fcn.function_id
! 					AND fcn.function_file = 'mx_dynamic.php'
! 		   		ORDER BY sys.block_id";
! 
! 			if( !($p_result = $db->sql_query($sql)) )
! 			{
! 				mx_message_die(GENERAL_ERROR, "Could not query column list", '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			while( $temp_row = $db->sql_fetchrow($p_result) )
! 			{
! 				$block_ids_array = explode(',' , $temp_row['parameter_value']);
! 
! 				foreach($block_ids_array as $key => $block_id)
! 				{
! 					if ($block_id == $search_item)
  					{
  						$p_row = $temp_row;

[mxbb-commits] core/includes mx_functions.php,1.72.2.5,1.72.2.6

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

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

Modified Files:
      Tag: core28x
	mx_functions.php 
Log Message:
Trimmed the get_page_id() function a bit, to find also default dynamic blocks and making the query a bit more limited

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.72.2.5
retrieving revision 1.72.2.6
diff -C2 -d -r1.72.2.5 -r1.72.2.6
*** mx_functions.php	3 May 2008 19:11:22 -0000	1.72.2.5
--- mx_functions.php	21 May 2008 22:07:59 -0000	1.72.2.6
***************
*** 791,795 ****
  		}
  
- 
  		if( empty($p_row['page_id']) )
  		{
--- 791,794 ----
***************
*** 821,825 ****
  				foreach($block_ids_array as $key => $block_id)
  				{
! 					if ($block_id = $search_item)
  					{
  						$p_row = $temp_row;
--- 820,868 ----
  				foreach($block_ids_array as $key => $block_id)
  				{
! 					if ($block_id == $search_item)
! 					{
! 						$p_row = $temp_row;
! 						continue;
! 					}
! 				}
! 
! 				if (!empty($p_row['page_id']))
! 				{
! 					continue;
! 				}
! 			}
! 			$db->sql_freeresult($result);
! 		}
! 
! 		if( empty($p_row['page_id']) )
! 		{
! 			//
! 			// Find if block is a default dynamic block (desperate try)
! 			//
! 			$sql = "SELECT pag.page_id, pag.page_name, pag.page_desc, sys.parameter_value
! 				FROM " . COLUMN_BLOCK_TABLE . " bct,
! 			       	" . PAGE_TABLE . " pag,
! 					" . COLUMN_TABLE . " col,
! 					" . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 					" . PARAMETER_TABLE . " par
! 				WHERE pag.page_id = col.page_id
! 					AND bct.column_id = col.column_id
! 					AND bct.block_id = sys.block_id
! 					AND sys.parameter_id = par.parameter_id
! 					AND par.parameter_name = 'default_block_id'
! 		   		ORDER BY sys.block_id";
! 
! 			if( !($p_result = $db->sql_query($sql)) )
! 			{
! 				mx_message_die(GENERAL_ERROR, "Could not query column list", '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			while( $temp_row = $db->sql_fetchrow($p_result) )
! 			{
! 				$block_ids_array = explode(',' , $temp_row['parameter_value']);
! 
! 				foreach($block_ids_array as $key => $block_id)
! 				{
! 					if ($block_id == $search_item)
  					{
  						$p_row = $temp_row;

[mxbb-commits] mx_simpledoc/templates/_core simpledoc_index.tpl, 1.2, 1.3 simpledoc_view.tpl, 1.1, 1.2 simpledoc_view_plain.tpl, 1.2, 1.3

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

Update of /cvsroot/mxbb/mx_simpledoc/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17906

Modified Files:
	simpledoc_index.tpl simpledoc_view.tpl 
	simpledoc_view_plain.tpl 
Log Message:
rewritten, a lot, for tinyMCE

Index: simpledoc_index.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/templates/_core/simpledoc_index.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** simpledoc_index.tpl	27 Feb 2008 21:34:27 -0000	1.2
--- simpledoc_index.tpl	21 May 2008 21:59:24 -0000	1.3
***************
*** 4,8 ****
  <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/shared/DynamicTree/DynamicTree.js"></script>
  <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/shared/XulTabs/XulTabs.js"></script>
! <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/shared/SimpleTextEditor/SimpleTextEditor.js"></script>
  
  <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/includes/js/management.js.php"></script>
--- 4,65 ----
  <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/shared/DynamicTree/DynamicTree.js"></script>
  <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/shared/XulTabs/XulTabs.js"></script>
! <!-- <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/shared/SimpleTextEditor/SimpleTextEditor.js"></script> -->
! <script language="javascript" type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
! 
! <script language="javascript" type="text/javascript">
!    	tinyMCE.init({
! 	mode : "none",
! 	elements : "body",
! 
! 						language : "{LANG}",
!                         docs_language : "{LANG}",
! 
!                         apply_source_formatting : "true",
!                         cleanup : "true",
!                         inline_styles : "true",
!                         convert_fonts_to_spans : "true",
!                         fix_list_elements : "true",
!                         fix_table_elements : "true",
!                         force_p_newlines : "true",
!                         remove_trailing_nbsp : "true",
! 
!                         plugins : "table,advimage,advlink,insertdatetime,preview,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable",
! 
!                         theme : "advanced",
!                         theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6",
! 
!                         theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace",
! 
!                         theme_advanced_buttons1_add_before : "newdocument,separator",
! 						theme_advanced_buttons1_add : "fontselect,fontsizeselect",
! 
! 						theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor",
! 						theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator",
! 
! 						theme_advanced_buttons3_add_before : "tablecontrols,separator",
! 						theme_advanced_buttons3_add : "print,separator,ltr,rtl,separator,fullscreen",
! 
! 						theme_advanced_disable : "",
! 
! 						theme_advanced_toolbar_location : "top",
! 						theme_advanced_toolbar_align : "left",
! 
! 						theme_advanced_path_location : "bottom",
! 						theme_advanced_statusbar_location : "bottom",
! 
! 						content_css : "{TEMPLATE}",
! 						theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote",
! 
! 						table_styles : "Layout=forumline",
! 						table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3",
! 						table_row_styles : "Table row 1=oddrow",
! 						table_default_border : "0",
! 
! 				      	document_base_url : "{PATH}index.php",
! 				      	relative_urls : "true",
! 
! 				      	extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]"
! 	});
! </script>
  
  <script type="text/javascript" src="{MX_ROOT_PATH}{MODULE_ROOT_PATH}simpledoc/includes/js/management.js.php"></script>
***************
*** 15,18 ****
--- 72,76 ----
  <script type="text/javascript">
  /* fix for IE not loading wysiwyg editor images */
+ /*
  var imgs = ["bold.gif", "center.gif", "help.gif", "image.gif", "indent.gif", "italic.gif", "left.gif", "link.gif", "ol.gif", "outdent.gif", "right.gif", "ul.gif", "underline.gif", "viewsource.gif"];
  for (var k = 0; k < imgs.length; ++k) {
***************
*** 21,24 ****
--- 79,83 ----
      imgs[k] = image;
  }
+ */
  </script>
  
***************
*** 32,35 ****
--- 91,96 ----
  </script>
  
+ 
+ 
  <style type="text/css">
  <!--
***************
*** 89,93 ****
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
--- 150,154 ----
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { color: {T_BODY_VLINK}; background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
***************
*** 288,291 ****
--- 349,353 ----
  
  /* SimpleDoc [www.gosu.pl], style for texteditor */
+ /*
  .ste { background-color: #ffffff; }
  .ste .bar {  padding: 3px; border: {T_TH_COLOR1} 1px; border-style: solid solid none solid; }
***************
*** 298,301 ****
--- 360,364 ----
  .ste .separator {background: #ffffff; width: 0px; height: 18px; border-left: {T_TH_COLOR1} 1px solid; border-right: {T_TH_COLOR3} 1px solid; margin: 0 5px; }
  .ste .source {  color: {T_BODY_TEXT}; padding-top: 5px; }
+ */
  -->
  </style>
***************
*** 303,307 ****
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="row2">
  		<table cellspacing="0" cellpadding="0" width="100%">
  			<tr>
--- 366,370 ----
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="rowxx">
  		<table cellspacing="0" cellpadding="0" width="100%">
  			<tr>
***************
*** 354,358 ****
  			        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  			        <tr>
! 			            <td id="left" class="row1">
  			                <div class="DynamicTree">
  							    <table cellspacing="0" cellpadding="0">
--- 417,421 ----
  			        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  			        <tr>
! 			            <td id="left" class="rowxx">
  			                <div class="DynamicTree">
  							    <table cellspacing="0" cellpadding="0">
***************
*** 448,457 ****
  			                        <tr>
  			                            <td class="wrap2">
- 			                                <div id="tabs-loading">{L_LOADING}</div>
- 			                                <div id="tabs-saving">{L_SAVING}</div>
  			                                <div id="tabs-data"></div>
  			                            </td>
  			                        </tr>
  			                        </table>
  			                    </td>
  			                </tr>
--- 511,520 ----
  			                        <tr>
  			                            <td class="wrap2">
  			                                <div id="tabs-data"></div>
  			                            </td>
  			                        </tr>
  			                        </table>
+ 			                        <div id="tabs-loading">{L_LOADING}</div>
+ 			                        <div id="tabs-saving">{L_SAVING}</div>
  			                    </td>
  			                </tr>

Index: simpledoc_view.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/templates/_core/simpledoc_view.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** simpledoc_view.tpl	9 Sep 2007 20:51:28 -0000	1.1
--- simpledoc_view.tpl	21 May 2008 21:59:24 -0000	1.2
***************
*** 43,47 ****
  #tabs-data table {
      font-family: {T_FONTFACE1};
-     font-size: 11px;
      color: {T_BODY_TEXT};
      background: {T_TR_COLOR1};
--- 43,46 ----
***************
*** 51,55 ****
  .t0 { border: {T_TH_COLOR1} 1px solid; }
  .t1 { background: {T_TR_COLOR2}; padding: 3px 8px; }
! .t2 { background: {T_TR_COLOR2}: 3px 8px; }
  
  #saved { color: {T_BODY_TEXT}; }
--- 50,54 ----
  .t0 { border: {T_TH_COLOR1} 1px solid; }
  .t1 { background: {T_TR_COLOR2}; padding: 3px 8px; }
! .t2 { background: {T_TR_COLOR2}: padding: 3px 8px; }
  
  #saved { color: {T_BODY_TEXT}; }
***************
*** 85,89 ****
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
--- 84,88 ----
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { color: {T_BODY_VLINK}; background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
***************
*** 270,279 ****
  -->
  </style>
!     
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="row2">
  		<table cellspacing="0" cellpadding="0" width="100%"><tr>
! 			<td class="row2">
  				<table cellspacing="0" cellpadding="0" width="100%">
  					<tr>
--- 269,278 ----
  -->
  </style>
! 
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="rowxx">
  		<table cellspacing="0" cellpadding="0" width="100%"><tr>
! 			<td class="rowxx">
  				<table cellspacing="0" cellpadding="0" width="100%">
  					<tr>
***************
*** 281,285 ****
  					    <td id="top" class="simpledoc_title">
  					        <span class="nomargin">{L_PROJECT_NAME} {MANAGE}</span>
! 					    </td>			
  					</tr>
  					<tr>
--- 280,284 ----
  					    <td id="top" class="simpledoc_title">
  					        <span class="nomargin">{L_PROJECT_NAME} {MANAGE}</span>
! 					    </td>
  					</tr>
  					<tr>
***************
*** 288,296 ****
  					        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  					        <tr>
! 					            <td id="left" class="row1">
  					                <div class="DynamicTree">
  									    <table cellspacing="0" cellpadding="0">
  									    <tr>
! 									        <td class="row2">			                
  							                    <div class="wrap1">
  							                        <div class="top">{L_TOC}</div>
--- 287,295 ----
  					        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  					        <tr>
! 					            <td id="left" class="rowxx">
  					                <div class="DynamicTree">
  									    <table cellspacing="0" cellpadding="0">
  									    <tr>
! 									        <td class="row2">
  							                    <div class="wrap1">
  							                        <div class="top">{L_TOC}</div>
***************
*** 336,339 ****
  	</tr>
  </table>
- 		
- 		
--- 335,336 ----

Index: simpledoc_view_plain.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/templates/_core/simpledoc_view_plain.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** simpledoc_view_plain.tpl	27 Feb 2008 21:34:27 -0000	1.2
--- simpledoc_view_plain.tpl	21 May 2008 21:59:25 -0000	1.3
***************
*** 60,64 ****
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
--- 60,64 ----
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { color: {T_BODY_VLINK}; background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
***************
*** 248,254 ****
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="row2">
  		<table cellspacing="0" cellpadding="0" width="100%"><tr>
! 			<td class="row2">
  				<table cellspacing="0" cellpadding="0" width="100%">
  					<tr>
--- 248,254 ----
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="rowxx">
  		<table cellspacing="0" cellpadding="0" width="100%"><tr>
! 			<td class="rowxx">
  				<table cellspacing="0" cellpadding="0" width="100%">
  					<tr>
***************
*** 262,266 ****
  					        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  					        <tr>
! 					            <td class="row1">
  									<iframe width="100%" height="500" src="{PUBLISH_DIR}" frameborder="0">
  										If you can see this, your browser doesn't understand IFRAME. However, we'll still <a href="{PUBLISH_DIR}">link</a> you to the file.
--- 262,266 ----
  					        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  					        <tr>
! 					            <td class="rowxx">
  									<iframe width="100%" height="500" src="{PUBLISH_DIR}" frameborder="0">
  										If you can see this, your browser doesn't understand IFRAME. However, we'll still <a href="{PUBLISH_DIR}">link</a> you to the file.

[mxbb-commits] mx_simpledoc/simpledoc/shared/DynamicTree DynamicTree.css.php, 1.1, 1.2

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

Update of /cvsroot/mxbb/mx_simpledoc/simpledoc/shared/DynamicTree
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17190

Modified Files:
	DynamicTree.css.php 
Log Message:
rewritten, a lot, for tinyMCE

Index: DynamicTree.css.php
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/shared/DynamicTree/DynamicTree.css.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DynamicTree.css.php	23 Apr 2006 19:21:28 -0000	1.1
--- DynamicTree.css.php	21 May 2008 21:58:53 -0000	1.2
***************
*** 13,17 ****
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { background: #CEE3FF;  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
--- 13,18 ----
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { color: #999999; padding: 1px; cursor: pointer; }
! 
  
  .DynamicTree div.folder img,

[mxbb-commits] mx_simpledoc/simpledoc/modules simpledoc__tab-edit-content.php, 1.4, 1.5 simpledoc_index.php, 1.4, 1.5

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

Update of /cvsroot/mxbb/mx_simpledoc/simpledoc/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17041

Modified Files:
	simpledoc__tab-edit-content.php simpledoc_index.php 
Log Message:
rewritten, a lot, for tinyMCE

Index: simpledoc_index.php
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/modules/simpledoc_index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** simpledoc_index.php	30 Jun 2006 12:24:38 -0000	1.4
--- simpledoc_index.php	21 May 2008 21:58:37 -0000	1.5
***************
*** 19,23 ****
  	{
  		global $template, $lang, $db, $theme, $board_config, $phpEx, $simpledoc_config, $debug, $mx_root_path, $module_root_path, $CONTENT, $PUBLISH;
! 		global $mx_page, $mx_block, $simpledoc_projectName;
  
  		//
--- 19,23 ----
  	{
  		global $template, $lang, $db, $theme, $board_config, $phpEx, $simpledoc_config, $debug, $mx_root_path, $module_root_path, $CONTENT, $PUBLISH;
! 		global $mx_page, $mx_block, $simpledoc_projectName, $theme, $userdata;
  
  		//
***************
*** 38,41 ****
--- 38,106 ----
  		$tree_html = $this->build_tree_html($tree);
  
+      	$convert = array(
+       		'arabic'               => 'ar',
+       		'bulgarian'               => 'bg',
+       		'catalan'               => 'ca',
+       		'czech'                  => 'cs',
+       		'danish'               => 'da',
+       		'german'               => 'de',
+       		'english'               => 'en',
+       		'estonian'               => 'et',
+       		'finnish'               => 'fi',
+       		'french'               => 'fr',
+       		'greek'                  => 'el',
+       		'spanish_argentina'            => 'es[_-]ar',
+       		'spanish'               => 'es',
+       		'gaelic'               => 'gd',
+       		'galego'               => 'gl',
+       		'gujarati'               => 'gu',
+       		'hebrew'               => 'he',
+       		'hindi'                  => 'hi',
+       		'croatian'               => 'hr',
+      		'hungarian'               => 'hu',
+       		'icelandic'               => 'is',
+       		'indonesian'               => 'id',
+       		'italian'               => 'it',
+       		'japanese'               => 'ja',
+       		'korean'               => 'ko',
+       		'latvian'               => 'lv',
+       		'lithuanian'               => 'lt',
+       		'macedonian'               => 'mk',
+ 	      	'dutch'                  => 'nl',
+       		'norwegian'               => 'no',
+       		'punjabi'               => 'pa',
+       		'polish'               => 'pl',
+       		'portuguese_brazil'            => 'pt[_-]br',
+       		'portuguese'               => 'pt',
+       		'romanian'               => 'ro',
+       		'russian'               => 'ru',
+       		'slovenian'               => 'sl',
+       		'albanian'               => 'sq',
+       		'serbian'               => 'sr',
+       		'slovak'               => 'sv',
+       		'swedish'               => 'sv',
+       		'thai'                  => 'th',
+       		'turkish'               => 'tr',
+       		'ukranian'               => 'uk',
+       		'urdu'                  => 'ur',
+       		'viatnamese'               => 'vi',
+       		'chinese_traditional_taiwan'         => 'zh[_-]tw',
+       		'chinese_simplified'            => 'zh',
+       	);
+ 
+       	$user_lang = $userdata['user_lang'];
+ 
+       	if ( !file_exists( $mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/langs/' . $convert[$user_lang] . '.js' ) )
+       	{
+      		$user_lang = $board_config['default_lang'];
+ 
+      		if ( !file_exists( $mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/langs/' . $convert[$user_lang] . '.js' ) )
+          	{
+             	$user_lang = 'english';
+          	}
+       	}
+ 
+       	$tiny_lang = $convert[$user_lang];
+ 
  		$template->assign_vars( array(
  			'MX_ROOT_PATH' => $mx_root_path,
***************
*** 118,121 ****
--- 183,193 ----
  			'VIEW_DOC' => ' - <a href="'.$this->this_simpledoc_mxurl('mode=view').'" >[' . $lang['sd_Doc_view'] . ']</a>',
  
+ 			//
+ 			// TinyMCE
+ 			//
+ 	        'PATH' => $mx_root_path,
+ 	        'LANG' => $tiny_lang,
+ 	        'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet']
+ 
  		));
  

Index: simpledoc__tab-edit-content.php
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/modules/simpledoc__tab-edit-content.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** simpledoc__tab-edit-content.php	22 Jul 2007 21:08:59 -0000	1.4
--- simpledoc__tab-edit-content.php	21 May 2008 21:58:37 -0000	1.5
***************
*** 103,106 ****
--- 103,107 ----
  $html = IoFile::read($path);
  
+ /*
  // Date in the past
  header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
***************
*** 117,121 ****
--- 118,124 ----
  
  header('Content-type: text/html; charset='.$CONFIG['encoding']);
+ */
  ?>
+ <!--
  <form name="simpleform" action="./modules/mx_simpledoc/simpledoc/modules/simpledoc__tab-save-content.php" method="post" onSubmit="ste.submit(); saveContent(this); this.blur();return false;">
  	<input type="hidden" id="id" name="id" value="<?php echo get('id'); ?>">
***************
*** 126,135 ****
      <input type="hidden" id="body-tmp" name="body-tmp" value="<?php echo htmlspecialchars($html); ?>">
  </form>
! <!--
  <form action="javascript:void(0)" method="post">
!     <textarea id="body" name="body" cols="60" rows="10"><?php echo htmlspecialchars($html); ?></textarea>
!     <p><input id="save-document" type="button" value="Save Document" onclick="ste.submit(); saveContent(); this.blur();"> (ctrl+s)</p>
!     <input type="hidden" id="body-tmp" name="body-tmp" value="<?php echo htmlspecialchars($html); ?>">
  </form>
! -->
  <p id="saved"></p>
\ No newline at end of file
--- 129,138 ----
      <input type="hidden" id="body-tmp" name="body-tmp" value="<?php echo htmlspecialchars($html); ?>">
  </form>
! -->
  <form action="javascript:void(0)" method="post">
!     <textarea id="body" name="body" cols="100" rows="40"><?php echo $html; ?></textarea>
!     <p><input id="save-document" type="button" value="Save Document" onclick="saveContent(); this.blur();"> (ctrl+s)</p>
!     <!--<input type="hidden" id="body-tmp" name="body-tmp" value="<?php echo trim($html); ?>">-->
  </form>
! 
  <p id="saved"></p>
\ No newline at end of file

[mxbb-commits] mx_simpledoc/simpledoc/includes/js management.js.php, 1.6, 1.7

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

Update of /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/js
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16738

Modified Files:
	management.js.php 
Log Message:
rewritten, a lot, for tinyMCE

Index: management.js.php
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/js/management.js.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** management.js.php	2 Jun 2007 21:42:17 -0000	1.6
--- management.js.php	21 May 2008 21:58:12 -0000	1.7
***************
*** 44,48 ****
  var tabsLoading = new Fader("tabs-loading");
  var tabsSaving = new Fader("tabs-saving");
- //var AjaxRequest = new AjaxRequest();
  
  function tabsLoadingOn() { document.getElementById("tabs-loading").style.display = "block"; tabsLoading.start(); }
--- 44,47 ----
***************
*** 77,80 ****
--- 76,80 ----
          return;
      }
+ 
      checkContentSaved();
  
***************
*** 85,89 ****
  	    ,'onLoading':function() { clearTabs(); tabsLoadingOn(); }
  	    ,'onComplete':function() { tabsLoadingOff(); }
! 	  	,'onSuccess':function(req){ el('tabs-data').innerHTML = req.responseText; initSimpleEditor(); el('body-tmp').value = el('body').value; updateTabs('tab2'); dhtmlHistory.add( treeGetId(),  el(tree.active+"-text").innerHTML  );}
  	  	,'onError':function(req){ el('tabs-data').innerHTML = 'Error!\nStatusText='+req.statusText+'\nContents='+req.responseText;}
  	  	,'timeout':5000
--- 85,90 ----
  	    ,'onLoading':function() { clearTabs(); tabsLoadingOn(); }
  	    ,'onComplete':function() { tabsLoadingOff(); }
! 	    ,'onSuccess':function(req){ el('tabs-data').innerHTML = req.responseText; initTinyMCEEditor(); updateTabs('tab2'); dhtmlHistory.add( treeGetId(),  el(tree.active+"-text").innerHTML  );}
! 	    //,'onSuccess':function(req){ el('tabs-data').innerHTML = req.responseText; initTinyMCEEditor(); el('body-tmp').value = el('body').value; updateTabs('tab2'); dhtmlHistory.add( treeGetId(),  el(tree.active+"-text").innerHTML  );}
  	  	,'onError':function(req){ el('tabs-data').innerHTML = 'Error!\nStatusText='+req.statusText+'\nContents='+req.responseText;}
  	  	,'timeout':5000
***************
*** 93,98 ****
  }
  
! var ste = null;
! function initSimpleEditor(){
    ste = new SimpleTextEditor("body", "ste");
    ste.path = "modules/mx_simpledoc/simpledoc/shared/SimpleTextEditor/";
--- 94,100 ----
  }
  
! /*
!  var ste = null;
!  function initSimpleEditor(){
    ste = new SimpleTextEditor("body", "ste");
    ste.path = "modules/mx_simpledoc/simpledoc/shared/SimpleTextEditor/";
***************
*** 105,108 ****
--- 107,117 ----
    }
  }
+ */
+ 
+ function initTinyMCEEditor(){
+ 	tinyMCE.execCommand('mceAddControl', false, 'body');
+ 	// var inst = tinyMCE.getInstanceById('body');
+ 	// MyEditor = inst.editorId;
+ }
  
  function documentPreview() {
***************
*** 112,115 ****
--- 121,126 ----
      }
  
+     checkContentSaved();
+ 
      AjaxRequest.get(
  	  {
***************
*** 136,140 ****
  	  	'url':'modules/mx_simpledoc/simpledoc/modules/simpledoc__tab-view-publish.php'
  	    ,'parameters':{ 'id': escape(treeGetId()), 'block_id':mxBlock.block_id, 'page_id':mxBlock.page_id }
! 	    ,'onLoading':function() { el('tabs-data').innerHTML = ""; tabsLoadingOn(); }
  	    ,'onComplete':function() { tabsLoadingOff(); }
  	  	,'onSuccess':function(req){ el('tabs-data').innerHTML = stripBodyHtml(req.responseText); generateParentTOC('view'); generateTOC('view');}
--- 147,151 ----
  	  	'url':'modules/mx_simpledoc/simpledoc/modules/simpledoc__tab-view-publish.php'
  	    ,'parameters':{ 'id': escape(treeGetId()), 'block_id':mxBlock.block_id, 'page_id':mxBlock.page_id }
! 	    ,'onLoading':function() { clearTabs(); tabsLoadingOn(); }
  	    ,'onComplete':function() { tabsLoadingOff(); }
  	  	,'onSuccess':function(req){ el('tabs-data').innerHTML = stripBodyHtml(req.responseText); generateParentTOC('view'); generateTOC('view');}
***************
*** 146,149 ****
--- 157,183 ----
  }
  
+ function saveContent() {
+ 
+     AjaxRequest.post(
+ 	  {
+ 	  	'url':'modules/mx_simpledoc/simpledoc/modules/simpledoc__tab-save-content.php'
+ 	    ,'parameters':{ 'id':escape(treeGetId()), 'block_id':mxBlock.block_id, 'page_id':mxBlock.page_id, 'body':tinyMCE.getContent() }
+ 	    ,'onLoading':function() { tabsSavingOn(); el('save-document').disabled = true;}
+ 	    ,'onComplete':function() { tabsSavingOff(); }
+ 	  	,'onSuccess':function(req){ el('save-document').disabled = false; }
+ 	  	,'onError':function(req){ el('tabs-data').innerHTML = 'Error!\nStatusText='+req.statusText+'\nContents='+req.responseText;}
+ 	  	,'timeout':5000
+     	,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; }
+ 	  }
+ 	);
+ 
+     el("saved").innerHTML = "Saved successfuly on "+(new Date()+"<br>(this message will disappear in 2 seconds)");
+     if (savedTimerID) clearTimeout(savedTimerID);
+     savedTimerID = setTimeout(function(){ el("saved").innerHTML = "";}, 1000);
+ 
+     tinyMCE.selectedInstance.undoRedo.undoLevels = [];
+ }
+ 
+ /*
  function saveContent(theform) {
  
***************
*** 176,179 ****
--- 210,214 ----
     	return status;
  }
+ */
  
  // this snippet doesn't work if there is a folder named "html"
***************
*** 181,192 ****
  function generateTOC(mode) {
      var contents = "";
!     var link = escape(treeGetId());
  
      contents = '<div><a target="_blank" href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+link+'">Permanent Link to this page</a></div>';
  
!     var all = document.getElementById("tabs-data").childNodes;
      var contents2 = "";
      var text = "";
      var found = false;
      var h3 = false;
  
--- 216,229 ----
  function generateTOC(mode) {
      var contents = "";
!     //var link = escape(treeGetId());
!     var link = treeGetId();
  
      contents = '<div><a target="_blank" href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+link+'">Permanent Link to this page</a></div>';
  
!     var all = document.getElementById("tabs-data").getElementsByTagName('*');
      var contents2 = "";
      var text = "";
      var found = false;
+     var h2 = false;
      var h3 = false;
  
***************
*** 194,203 ****
      for (var i = 0; i < all.length; ++i) {
  
!     	if (all[i].nodeName == "H2" || all[i].nodeName == "H3") {
  
!             if (all[i].nodeName == "H2") {
!                 if (h3) contents2 += '</ul>';
                  h3 = false;
              }
              if (all[i].nodeName == "H3") {
                  if (!h3) contents2 += '<ul>';
--- 231,248 ----
      for (var i = 0; i < all.length; ++i) {
  
!     	if (all[i].nodeName == "H1" || all[i].nodeName == "H2" || all[i].nodeName == "H3") {
  
!             if (all[i].nodeName == "H1") {
!                 if (h3 || h2) contents2 += '</ul>';
!                 h2 = false;
                  h3 = false;
              }
+ 
+             if (all[i].nodeName == "H2") {
+             	if (h3) contents2 += '</ul>';
+                 if (!h2) contents2 += '<ul>';
+                 h2 = true;
+             }
+ 
              if (all[i].nodeName == "H3") {
                  if (!h3) contents2 += '<ul>';
***************
*** 208,216 ****
              text = all[i].innerHTML.replace(/<[^>]+>/g,"");
              all[i].innerHTML = '<a name="'+text+'">'+text+'</a>';
!             contents2 += '<li><a href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+text+'">'+text+'</a></li>';
          }
  
      }
      contents2 += '</ul>';
      if (found) {
          if (contents) contents += '<br>';
--- 253,263 ----
              text = all[i].innerHTML.replace(/<[^>]+>/g,"");
              all[i].innerHTML = '<a name="'+text+'">'+text+'</a>';
!             var str_temp = document.URL.split("#", 1);
!            	contents2 += '<li><a href="'+str_temp+'#'+text+'">'+text+'</a></li>';
          }
  
      }
      contents2 += '</ul>';
+ 
      if (found) {
          if (contents) contents += '<br>';
***************
*** 262,266 ****
  function stripBodyHtml(html) {
  
!     // Remove HTML comments
  	//html = html.replace(/<!--[\w\s\d@{}:.;,'"%!#_=&|?~()[*+\/\-\]]*-->/gi, "" );
      // Remove all HTML tags
--- 309,313 ----
  function stripBodyHtml(html) {
  
! 	// Remove HTML comments
  	//html = html.replace(/<!--[\w\s\d@{}:.;,'"%!#_=&|?~()[*+\/\-\]]*-->/gi, "" );
      // Remove all HTML tags
***************
*** 309,312 ****
--- 356,360 ----
  var savedTimerID = null;
  
+ /*
  function isContentSaved() {
      if (ste && el("body") && el("save-document")) {
***************
*** 318,321 ****
--- 366,380 ----
      return true;
  }
+ */
+ 
+ function isContentSaved() {
+     if (el("save-document")) {
+         if (tinyMCE.selectedInstance.undoRedo.undoLevels.length > 1) {
+             return false;
+         }
+     }
+     return true;
+ }
+ 
  function checkContentSaved() {
      if (!isContentSaved()) {
***************
*** 333,339 ****
  
  function updateTabs(active){
!         el('tab1').className = "tab"+((active=='tab1')?"-active":"");
!         el('tab2').className = "tab"+((active=='tab2')?"-active":"")+" right";
!         el('tab3').className = "tab"+((active=='tab3')?"-active":"")+" view";
  }
  
--- 392,398 ----
  
  function updateTabs(active){
! 	el('tab1').className = "tab"+((active=='tab1')?"-active":"");
!     el('tab2').className = "tab"+((active=='tab2')?"-active":"")+" right";
!     el('tab3').className = "tab"+((active=='tab3')?"-active":"")+" view";
  }
  

[mxbb-commits] mx_pafiledb/templates/_core pa_mini.tpl,1.2,1.3

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

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

Modified Files:
	pa_mini.tpl 
Log Message:
Quick List blocks also refering to pages with mini block present

Index: pa_mini.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_mini.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pa_mini.tpl	27 Apr 2008 18:48:50 -0000	1.2
--- pa_mini.tpl	21 May 2008 21:54:57 -0000	1.3
***************
*** 52,56 ****
  						<a href="{catcol.no_cat_parent.U_CAT}"><img src="{catcol.no_cat_parent.CAT_IMAGE}" alt="{catcol.no_cat_parent.CAT_NAME}" align="absmiddle" border="0" /></a>
  					</td>
! 					<td width="100%" valign="middle" nowrap="nowrap">
  						<a href="{catcol.no_cat_parent.U_CAT}" class="topictitle">{catcol.no_cat_parent.CAT_NAME}</a>&nbsp;<span class="gensmall">({catcol.no_cat_parent.FILECAT})</span>
  					</td>
--- 52,56 ----
  						<a href="{catcol.no_cat_parent.U_CAT}"><img src="{catcol.no_cat_parent.CAT_IMAGE}" alt="{catcol.no_cat_parent.CAT_NAME}" align="absmiddle" border="0" /></a>
  					</td>
! 					<td width="100%" align="left" valign="middle" nowrap="nowrap">
  						<a href="{catcol.no_cat_parent.U_CAT}" class="topictitle">{catcol.no_cat_parent.CAT_NAME}</a>&nbsp;<span class="gensmall">({catcol.no_cat_parent.FILECAT})</span>
  					</td>
***************
*** 70,74 ****
  	<tr>
  		<td rowspan="2" class="{file_rows.COLOR}" valign="middle">&nbsp;<img src="{file_rows.PIN_IMAGE}" border="0" ></td>
! 		<td width="100%" class="{file_rows.COLOR}">
  		<a href="{file_rows.U_FILE_JUMP}" class="topictitle">{file_rows.FILE_NAME}</a>&nbsp;
  		<!-- BEGIN IS_NEW_FILE -->
--- 70,74 ----
  	<tr>
  		<td rowspan="2" class="{file_rows.COLOR}" valign="middle">&nbsp;<img src="{file_rows.PIN_IMAGE}" border="0" ></td>
! 		<td align="left" width="100%" class="{file_rows.COLOR}">
  		<a href="{file_rows.U_FILE_JUMP}" class="topictitle">{file_rows.FILE_NAME}</a>&nbsp;
  		<!-- BEGIN IS_NEW_FILE -->

[mxbb-commits] mx_pafiledb pafiledb.pak,1.17,1.18

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

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

Modified Files:
	pafiledb.pak 
Log Message:
Quick List blocks also refering to pages with mini block present

Index: pafiledb.pak
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb.pak,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** pafiledb.pak	9 Jul 2007 22:39:45 -0000	1.17
--- pafiledb.pak	21 May 2008 21:54:57 -0000	1.18
***************
*** 1,30 ****
! module=+:57=+:Files Manager=+:modules/mx_pafiledb/=+:Files Manager module=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:57=+:70=+:PafileDB - Main=+:File Manager=+:dload.php=+:
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Main=+:Demo block=+:70=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:57=+:71=+:PafileDB - Lists=+:PafileDB download toplists=+:dload_lists.php=+:
! parameter=+:71=+:162=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "dload.php")=+:0=+:10
! parameter=+:71=+:163=+:toplist_cat_id=+:pa_quick_cat=+:0=+:=+:1=+:20
! parameter=+:71=+:164=+:toplist_sort_method=+:Menu_single_select=+:latest=+:a:4:{i:0;s:6:"latest";i:1;s:12:"most_popular";i:2;s:8:"toprated";i:3;s:6:"random";}=+:1=+:30
! parameter=+:71=+:165=+:toplist_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:40
! parameter=+:71=+:166=+:toplist_pagination=+:Number=+:3=+:=+:0=+:50
! parameter=+:71=+:167=+:toplist_use_pagination=+:Boolean=+:TRUE=+:=+:1=+:60
! parameter=+:71=+:168=+:toplist_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}")=+:1=+:70
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Lists=+:Demo block=+:71=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:57=+:72=+:PafileDB - Mini=+:Mini/quick PafileDB block=+:dload_mini.php=+:
! parameter=+:72=+:169=+:mini_default_cat_id=+:pa_quick_cat=+:0=+:=+:1=+:0
! parameter=+:72=+:170=+:mini_pagination=+:Number=+:5=+:=+:1=+:0
! parameter=+:72=+:171=+:mini_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Mini=+:Demo block=+:72=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:57=+:73=+:PafileDB - Quick dl=+:Quick download block - blog=+:dload_quickdl.php=+:
! parameter=+:73=+:172=+:pa_mapping=+:pa_mapping=+:=+:=+:0=+:0
! parameter=+:73=+:173=+:pa_quick_cat=+:pa_quick_cat=+:1=+:=+:0=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Quick dl=+:Demo block=+:73=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0
--- 1,30 ----
! module=+:51=+:Files Manager=+:modules/mx_pafiledb/=+:Files Manager module=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:51=+:53=+:PafileDB - Main=+:File Manager=+:dload.php=+:
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Main=+:Demo block=+:53=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:51=+:54=+:PafileDB - Lists=+:PafileDB download toplists=+:dload_lists.php=+:
! parameter=+:54=+:103=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "dload.php", false, "dload_mini.php")=+:0=+:10
! parameter=+:54=+:104=+:toplist_cat_id=+:pa_quick_cat=+:0=+:=+:1=+:20
! parameter=+:54=+:105=+:toplist_sort_method=+:Menu_single_select=+:latest=+:a:4:{i:0;s:6:"latest";i:1;s:12:"most_popular";i:2;s:8:"toprated";i:3;s:6:"random";}=+:1=+:30
! parameter=+:54=+:106=+:toplist_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:40
! parameter=+:54=+:107=+:toplist_pagination=+:Number=+:3=+:=+:0=+:50
! parameter=+:54=+:108=+:toplist_use_pagination=+:Boolean=+:TRUE=+:=+:1=+:60
! parameter=+:54=+:109=+:toplist_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}")=+:1=+:70
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Lists=+:Demo block=+:54=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:51=+:55=+:PafileDB - Mini=+:Mini/quick PafileDB block=+:dload_mini.php=+:
! parameter=+:55=+:110=+:mini_default_cat_id=+:pa_quick_cat=+:0=+:=+:1=+:0
! parameter=+:55=+:111=+:mini_pagination=+:Number=+:5=+:=+:1=+:0
! parameter=+:55=+:112=+:mini_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Mini=+:Demo block=+:55=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:51=+:56=+:PafileDB - Quick dl=+:Quick download block - blog=+:dload_quickdl.php=+:
! parameter=+:56=+:113=+:pa_mapping=+:pa_mapping=+:=+:=+:0=+:0
! parameter=+:56=+:114=+:pa_quick_cat=+:pa_quick_cat=+:1=+:=+:0=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - PafileDB - Quick dl=+:Demo block=+:56=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0

[mxbb-commits] mx_pafiledb/pafiledb/modules pa_mini.php,1.7,1.8

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

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

Modified Files:
	pa_mini.php 
Log Message:
Quick List blocks also refering to pages with mini block present

Index: pa_mini.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_mini.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pa_mini.php	15 Feb 2008 22:15:15 -0000	1.7
--- pa_mini.php	21 May 2008 21:54:57 -0000	1.8
***************
*** 96,100 ****
  		$pafiledb_config['pagination'] = $mini_config['mini_pagination'];
  
! 		if ($mx_request_vars->is_request('cat_id'))
  		{
  			$total_num_items = $this->display_items( $sort_method, $sort_order, $start, $cat_id, $no_file_message, $sort_options_list );
--- 96,101 ----
  		$pafiledb_config['pagination'] = $mini_config['mini_pagination'];
  
! 		//if ($mx_request_vars->is_request('cat_id'))
! 		if (true)
  		{
  			$total_num_items = $this->display_items( $sort_method, $sort_order, $start, $cat_id, $no_file_message, $sort_options_list );

[mxbb-commits] mx_linkdb/linkdb/modules link_mini.php,1.7,1.8

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

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

Modified Files:
	link_mini.php 
Log Message:
minor fix

Index: link_mini.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_mini.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** link_mini.php	15 Feb 2008 22:28:25 -0000	1.7
--- link_mini.php	21 May 2008 21:53:53 -0000	1.8
***************
*** 100,104 ****
  		$linkdb_config['pagination'] = $mini_config['mini_pagination'];
  
! 		if ($mx_request_vars->is_request('cat_id'))
  		{
  			$total_num_items = $this->display_items( $sort_method, $sort_order, $start, $cat_id, $no_file_message, $sort_options_list );
--- 100,105 ----
  		$linkdb_config['pagination'] = $mini_config['mini_pagination'];
  
! 		//if ($mx_request_vars->is_request('cat_id'))
! 		if (true)
  		{
  			$total_num_items = $this->display_items( $sort_method, $sort_order, $start, $cat_id, $no_file_message, $sort_options_list );

[mxbb-commits] mx_kb/templates/_core kb_app.tpl, 1.1, 1.2 kb_article_app.tpl, 1.1, 1.2 kb_article_body_print.tpl, 1.1, NONE

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

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

Modified Files:
	kb_app.tpl kb_article_app.tpl 
Removed Files:
	kb_article_body_print.tpl 
Log Message:
Mainly bugfixes, revealed during work with new project site
- Quick List blocks compatible with app mode
- The app mode has been rewritten somewhat, related to inline TOCs etc
- Print version link fixed

Index: kb_article_app.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/templates/_core/kb_article_app.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kb_article_app.tpl	9 Sep 2007 20:06:03 -0000	1.1
--- kb_article_app.tpl	21 May 2008 21:52:15 -0000	1.2
***************
*** 15,18 ****
--- 15,27 ----
  </script>
  
+ <!-- BEGIN switch_toc -->
+ <p><span class="maintitle">{L_TOC}</span><br /><br />
+ <span class="nav">
+ <!-- BEGIN pages -->
+ {switch_toc.pages.TOC_ITEM}
+ <!-- END pages -->
+ </span>
+ <!-- END switch_toc -->
+ 
  <span class="maintitle">{ARTICLE_TITLE}</span>
  <p><span class="gensmall"><b>{ARTICLE_DESCRIPTION}</b></span>
***************
*** 43,56 ****
  </div>
  
! <!-- BEGIN switch_toc -->
! <p><span class="maintitle">{L_TOC}</span><br /><br />
! <span class="nav">
! <!-- BEGIN pages -->
! {switch_toc.pages.TOC_ITEM}
! <!-- END pages -->
! </span>
! <!-- END switch_toc -->
  
- <p><span class="postbody">{ARTICLE_TEXT}</span>
  <!-- BEGIN switch_pages -->
  <p><span class="nav">
--- 52,60 ----
  </div>
  
! <div id="articlewrap">
! <div id="toc" class="contents"></div>
! 
! {ARTICLE_TEXT}
  
  <!-- BEGIN switch_pages -->
  <p><span class="nav">
***************
*** 61,64 ****
--- 65,69 ----
  </span>
  <!-- END switch_pages -->
+ </div>
  
  <p><span class="cattitle">&nbsp;{EDIT_IMG}&nbsp;{DELETE_IMG}</span>

--- kb_article_body_print.tpl DELETED ---

Index: kb_app.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/templates/_core/kb_app.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kb_app.tpl	9 Sep 2007 20:06:03 -0000	1.1
--- kb_app.tpl	21 May 2008 21:52:15 -0000	1.2
***************
*** 62,67 ****
  
  pre { background-color: {T_TR_COLOR2}; padding: 0.75em 1.5em; border: 1px solid {T_TH_COLOR1}; }
! .contents { float: right;  background-color: {T_TR_COLOR2}; padding: 0.75em; margin: 0 0 0.75em 0.75em; border: 1px solid {T_TH_COLOR1}; }
! .contents ul { list-style: none; margin-left: 0.5em; margin-right: 0.9em; margin-bottom: 2px; margin-top: 0px; padding: 5px; text-indent: -0.9em; }
  
  .sectioncontents { padding: 0em; margin: 0 0 0 0; }
--- 62,68 ----
  
  pre { background-color: {T_TR_COLOR2}; padding: 0.75em 1.5em; border: 1px solid {T_TH_COLOR1}; }
! #articlewrap { padding:5px;}
! #articlewrap .contents { float: right;  background-color: {T_TR_COLOR2}; padding: 0.75em; margin: 0 0 0.75em 0.75em; border: 1px solid {T_TH_COLOR1}; }
! #articlewrap .contents ul { list-style: none; margin-left: 0.5em; margin-right: 0.1em; margin-bottom: 2px; margin-top: 0px; padding: 5px; text-indent: -0.9em; }
  
  .sectioncontents { padding: 0em; margin: 0 0 0 0; }
***************
*** 85,89 ****
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
--- 86,90 ----
  
  .DynamicTree .text { padding: 1px; cursor: pointer; }
! .DynamicTree .text-active { color: {T_BODY_VLINK}; background: {T_TR_COLOR1};  padding: 1px; cursor: pointer; }
  
  .DynamicTree div.folder img,
***************
*** 283,289 ****
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="row2">
  		<table cellspacing="0" cellpadding="0" width="100%"><tr>
! 			<td class="row2">
  				<table cellspacing="0" cellpadding="0" width="100%">
  
--- 284,290 ----
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="rowxx">
  		<table cellspacing="0" cellpadding="0" width="100%"><tr>
! 			<td class="rowxx">
  				<table cellspacing="0" cellpadding="0" width="100%">
  
***************
*** 293,297 ****
  					        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  					        <tr>
! 					            <td id="left" class="row1">
  					                <div class="DynamicTree">
  									    <table cellspacing="0" cellpadding="0">
--- 294,298 ----
  					        <table cellspacing="0" cellpadding="0" width="100%" height="100%" id="main">
  					        <tr>
! 					            <td id="left" class="rowxx">
  					                <div class="DynamicTree">
  									    <table cellspacing="0" cellpadding="0">

[mxbb-commits] mx_kb/kb/modules kb_article.php, 1.17, 1.18 kb_mini.php, 1.8, 1.9

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

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

Modified Files:
	kb_article.php kb_mini.php 
Log Message:
Mainly bugfixes, revealed during work with new project site
- Quick List blocks compatible with app mode
- The app mode has been rewritten somewhat, related to inline TOCs etc
- Print version link fixed

Index: kb_mini.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_mini.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kb_mini.php	15 Feb 2008 22:25:49 -0000	1.8
--- kb_mini.php	21 May 2008 21:52:15 -0000	1.9
***************
*** 100,104 ****
  		$kb_config['pagination'] = $mini_config['mini_pagination'];
  
! 		if ($mx_request_vars->is_request('cat'))
  		{
  			$total_num_items = $this->display_items( $start, $cat_id, $sort_options_list );
--- 100,105 ----
  		$kb_config['pagination'] = $mini_config['mini_pagination'];
  
! 		//if ($mx_request_vars->is_request('cat'))
! 		if (true)
  		{
  			$total_num_items = $this->display_items( $start, $cat_id, $sort_options_list );

Index: kb_article.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_article.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** kb_article.php	15 Feb 2008 22:25:49 -0000	1.17
--- kb_article.php	21 May 2008 21:52:15 -0000	1.18
***************
*** 222,228 ****
  		// Delete buttons
  		//
! 		if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_delete'] ) || $this->auth_user[$article_category_id]['auth_mod'] )
  		{
  			$temp_url = mx_append_sid( $this->this_mxurl( "mode=edit&do=delete&k=" . $article_id ) );
  			$delete_img = '<a href="javascript:delete_item(\'' . $temp_url . '\')"><img src="' . $images['kb_icon_delpost'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>';
  			$delete = '<a href="javascript:delete_item(\'' . $temp_url . '\')">' . $lang['Edit_delete_post'] . '</a>';
--- 222,229 ----
  		// Delete buttons
  		//
! 		if ( !defined('KB_APP') && (( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_delete'] ) || $this->auth_user[$article_category_id]['auth_mod'] ))
  		{
  			$temp_url = mx_append_sid( $this->this_mxurl( "mode=edit&amp;do=delete&amp;k=" . $article_id ) );
+ 			//$temp_url = str_replace('../', '',$temp_url); // Hack for App
  			$delete_img = '<a href="javascript:delete_item(\'' . $temp_url . '\')"><img src="' . $images['kb_icon_delpost'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>';
  			$delete = '<a href="javascript:delete_item(\'' . $temp_url . '\')">' . $lang['Edit_delete_post'] . '</a>';

[mxbb-commits] mx_kb/kb/modules/tabs kb__tab-view.php,1.3,1.4

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

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

Modified Files:
	kb__tab-view.php 
Log Message:
Mainly bugfixes, revealed during work with new project site
- Quick List blocks compatible with app mode
- The app mode has been rewritten somewhat, related to inline TOCs etc
- Print version link fixed

Index: kb__tab-view.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/tabs/kb__tab-view.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kb__tab-view.php	9 Sep 2007 20:06:02 -0000	1.3
--- kb__tab-view.php	21 May 2008 21:52:15 -0000	1.4
***************
*** 16,19 ****
--- 16,20 ----
  include($mx_root_path . 'common.' . $phpEx);
  
+ define( 'KB_APP', true );
  define( 'MXBB_MODULE', true );
  define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.' . $phpEx ) );

[mxbb-commits] mx_kb/kb/includes functions_kb.php, 1.24, 1.25 kb_constants.php, 1.12, 1.13

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

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

Modified Files:
	functions_kb.php kb_constants.php 
Log Message:
Mainly bugfixes, revealed during work with new project site
- Quick List blocks compatible with app mode
- The app mode has been rewritten somewhat, related to inline TOCs etc
- Print version link fixed

Index: functions_kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** functions_kb.php	7 May 2008 20:07:38 -0000	1.24
--- functions_kb.php	21 May 2008 21:52:14 -0000	1.25
***************
*** 1023,1027 ****
  	function display_items( $start, $cat_id = false, $sort_options_list = false, $sql_xtra = '', $target_page_id = false )
  	{
! 		global $db, $kb_config, $template, $board_config;
  		global $images, $lang, $theme, $phpEx, $mx_kb_functions;
  		global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx;
--- 1023,1027 ----
  	function display_items( $start, $cat_id = false, $sort_options_list = false, $sql_xtra = '', $target_page_id = false )
  	{
! 		global $db, $kb_config, $template, $board_config, $mx_block;
  		global $images, $lang, $theme, $phpEx, $mx_kb_functions;
  		global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx;
***************
*** 1177,1181 ****
  
  			$article_title = $file_rowset[$i]['article_title'];
! 			$article_url = mx_append_sid( $this->this_mxurl( "mode=article&k=$article_id" ) );
  
  			// ===================================================
--- 1177,1185 ----
  
  			$article_title = $file_rowset[$i]['article_title'];
! 
! 			//
! 			// Article Url - Standard or App
! 			//
! 			$article_url = mx_append_sid( $this->this_mxurl( "mode=article&k=$article_id", false, false, $target_page_id ) );
  
  			// ===================================================

Index: kb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/kb_constants.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** kb_constants.php	18 Feb 2008 21:02:57 -0000	1.12
--- kb_constants.php	21 May 2008 21:52:14 -0000	1.13
***************
*** 67,71 ****
  else
  {
! 	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
--- 67,71 ----
  else
  {
! 	if (!$_GET['print']) // Do not "fix" with request wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
***************
*** 81,85 ****
  		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  		// -------------------------------------------------------------------------
! 		$mx_user->extend();
  
  		$mx_page->add_copyright( 'mxBB Knowledge Base Module' );
--- 81,88 ----
  		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  		// -------------------------------------------------------------------------
! 		if (!$_GET['print']) // Do not "fix" with request wrapper!!
! 		{
! 			$mx_user->extend();
! 		}
  
  		$mx_page->add_copyright( 'mxBB Knowledge Base Module' );

[mxbb-commits] mx_kb KnowledgeBase.pak,1.16,1.17 kb.php,1.47,1.48

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

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

Modified Files:
	KnowledgeBase.pak kb.php 
Log Message:
Mainly bugfixes, revealed during work with new project site
- Quick List blocks compatible with app mode
- The app mode has been rewritten somewhat, related to inline TOCs etc
- Print version link fixed

Index: KnowledgeBase.pak
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/KnowledgeBase.pak,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** KnowledgeBase.pak	9 Jul 2007 22:38:11 -0000	1.16
--- KnowledgeBase.pak	21 May 2008 21:52:12 -0000	1.17
***************
*** 1,52 ****
! module=+:55=+:Knowledge Base=+:modules/mx_kb/=+:Knowledge Base Articles module=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:55=+:57=+:KB - Main=+:Knowledge Base Module=+:kb.php=+:
! parameter=+:57=+:114=+:kb_type_select=+:kb_type_select=+:=+:=+:0=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - KB - Main=+:Demo block=+:57=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:55=+:66=+:KB - Application=+:AJAX implementation=+:kb_app.php=+:
! parameter=+:66=+:151=+:kb_type_select=+:kb_type_select=+:=+:=+:1=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Application=+:Demo block=+:66=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:55=+:58=+:KB - Article reader=+:Articles only. No category navigation. To be used with other navigation blocks.=+:kb_article_reader.php=+:
! parameter=+:58=+:115=+:kb_type_select=+:kb_type_select=+:array('init'=>'1')=+:=+:0=+:10
! parameter=+:58=+:116=+:default_article_id=+:Number=+:1=+:=+:0=+:20
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Article reader=+:Demo block=+:58=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:55=+:59=+:KB - Last Articles=+:KB Last Articles=+:kb_last_article.php=+:
! parameter=+:59=+:117=+:Last_Article_Cat=+:kb_type_select=+:array()=+:=+:0=+:10
! parameter=+:59=+:118=+:Last_Article_Number_Title=+:Number=+:15=+:=+:0=+:20
! parameter=+:59=+:119=+:article_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}")=+:0=+:30
! parameter=+:59=+:120=+:Last_Article_Target=+:Values=+:_blank=+:=+:0=+:40
! parameter=+:59=+:121=+:Last_Article_Title_Length=+:Number=+:30=+:=+:0=+:50
! parameter=+:59=+:122=+:Last_Article_Display_Last_Author=+:Boolean=+:TRUE=+:=+:0=+:60
! parameter=+:59=+:123=+:Last_Article_Display_Icon_View=+:Boolean=+:TRUE=+:=+:0=+:70
! parameter=+:59=+:124=+:Last_Article_Align=+:Values=+:left=+:=+:0=+:80
! parameter=+:59=+:125=+:Last_Article_Display_Author=+:Boolean=+:FALSE=+:=+:0=+:90
! parameter=+:59=+:126=+:Last_Article_Display_Date=+:Boolean=+:TRUE=+:=+:0=+:100
! parameter=+:59=+:127=+:Last_Article_Display_Cat=+:Boolean=+:TRUE=+:=+:0=+:110
! parameter=+:59=+:128=+:Last_Article_Mode=+:Menu_single_select=+:KB=+:a:2:{i:0;s:2:"KB";i:1;s:9:"KB_Reader";}=+:0=+:120
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Last Articles=+:Demo block=+:59=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:55=+:60=+:KB - Lists=+:Sorted articles block=+:kb_lists.php=+:
! parameter=+:60=+:129=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "kb.php")=+:0=+:10
! parameter=+:60=+:130=+:toplist_cat_id=+:kb_quick_cat=+:0=+:=+:1=+:20
! parameter=+:60=+:131=+:toplist_sort_method=+:Menu_single_select=+:latest=+:a:4:{i:0;s:6:"latest";i:1;s:12:"most_popular";i:2;s:8:"toprated";i:3;s:6:"random";}=+:1=+:30
! parameter=+:60=+:132=+:toplist_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:40
! parameter=+:60=+:133=+:toplist_pagination=+:Number=+:3=+:=+:0=+:50
! parameter=+:60=+:134=+:toplist_use_pagination=+:Boolean=+:TRUE=+:=+:1=+:60
! parameter=+:60=+:135=+:toplist_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}")=+:1=+:70
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Lists=+:Demo block=+:60=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:55=+:61=+:KB - Mini=+:Mini/quick KB block=+:kb_mini.php=+:
! parameter=+:61=+:136=+:mini_default_cat_id=+:kb_quick_cat=+:0=+:=+:1=+:0
! parameter=+:61=+:137=+:mini_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:0
! parameter=+:61=+:138=+:mini_pagination=+:Number=+:5=+:=+:1=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Mini=+:Demo block=+:61=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0
--- 1,52 ----
! module=+:52=+:Knowledge Base=+:modules/mx_kb/=+:Knowledge Base Articles module=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:52=+:57=+:KB - Main=+:Knowledge Base Module=+:kb.php=+:
! parameter=+:57=+:115=+:kb_type_select=+:kb_type_select=+:=+:=+:0=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - KB - Main=+:Demo block=+:57=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:52=+:58=+:KB - Application=+:AJAX implementation=+:kb_app.php=+:
! parameter=+:58=+:116=+:kb_type_select=+:kb_type_select=+:=+:=+:1=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Application=+:Demo block=+:58=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:52=+:59=+:KB - Article reader=+:Articles only. No category navigation. To be used with other navigation blocks.=+:kb_article_reader.php=+:
! parameter=+:59=+:117=+:kb_type_select=+:kb_type_select=+:array('init'=>'1')=+:=+:0=+:10
! parameter=+:59=+:118=+:default_article_id=+:Number=+:1=+:=+:0=+:20
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Article reader=+:Demo block=+:59=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:52=+:60=+:KB - Last Articles=+:KB Last Articles=+:kb_last_article.php=+:
! parameter=+:60=+:119=+:Last_Article_Cat=+:kb_type_select=+:array()=+:=+:0=+:10
! parameter=+:60=+:120=+:Last_Article_Number_Title=+:Number=+:15=+:=+:0=+:20
! parameter=+:60=+:121=+:article_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}")=+:0=+:30
! parameter=+:60=+:122=+:Last_Article_Target=+:Values=+:_blank=+:=+:0=+:40
! parameter=+:60=+:123=+:Last_Article_Title_Length=+:Number=+:30=+:=+:0=+:50
! parameter=+:60=+:124=+:Last_Article_Display_Last_Author=+:Boolean=+:TRUE=+:=+:0=+:60
! parameter=+:60=+:125=+:Last_Article_Display_Icon_View=+:Boolean=+:TRUE=+:=+:0=+:70
! parameter=+:60=+:126=+:Last_Article_Align=+:Values=+:left=+:=+:0=+:80
! parameter=+:60=+:127=+:Last_Article_Display_Author=+:Boolean=+:FALSE=+:=+:0=+:90
! parameter=+:60=+:128=+:Last_Article_Display_Date=+:Boolean=+:TRUE=+:=+:0=+:100
! parameter=+:60=+:129=+:Last_Article_Display_Cat=+:Boolean=+:TRUE=+:=+:0=+:110
! parameter=+:60=+:130=+:Last_Article_Mode=+:Menu_single_select=+:KB=+:a:2:{i:0;s:2:"KB";i:1;s:9:"KB_Reader";}=+:0=+:120
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Last Articles=+:Demo block=+:60=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:52=+:61=+:KB - Lists=+:Sorted articles block=+:kb_lists.php=+:
! parameter=+:61=+:131=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "kb.php", false, "kb_app.php")=+:0=+:10
! parameter=+:61=+:132=+:toplist_cat_id=+:kb_quick_cat=+:0=+:=+:1=+:20
! parameter=+:61=+:133=+:toplist_sort_method=+:Menu_single_select=+:latest=+:a:4:{i:0;s:6:"latest";i:1;s:12:"most_popular";i:2;s:8:"toprated";i:3;s:6:"random";}=+:1=+:30
! parameter=+:61=+:134=+:toplist_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:40
! parameter=+:61=+:135=+:toplist_pagination=+:Number=+:3=+:=+:0=+:50
! parameter=+:61=+:136=+:toplist_use_pagination=+:Boolean=+:TRUE=+:=+:1=+:60
! parameter=+:61=+:137=+:toplist_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}")=+:1=+:70
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Lists=+:Demo block=+:61=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:52=+:62=+:KB - Mini=+:Mini/quick KB block=+:kb_mini.php=+:
! parameter=+:62=+:138=+:mini_default_cat_id=+:kb_quick_cat=+:0=+:=+:1=+:0
! parameter=+:62=+:139=+:mini_display_options=+:Checkbox_multiple_select=+:a:1:{i:0;s:4:"date";}=+:a:4:{i:0;s:4:"date";i:1;s:8:"username";i:2;s:7:"counter";i:3;s:4:"rate";}=+:1=+:0
! parameter=+:62=+:140=+:mini_pagination=+:Number=+:5=+:=+:1=+:0
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - KB - Mini=+:Demo block=+:62=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0

Index: kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** kb.php	13 Mar 2008 19:13:36 -0000	1.47
--- kb.php	21 May 2008 21:52:13 -0000	1.48
***************
*** 137,141 ****
  		}
  
! 		if ( !empty( $url ) && !$mx_get_page->error )
  		{
  			if ( !empty( $db ) )
--- 137,141 ----
  		}
  
! 		if ( !empty( $url ) && !$mx_get_page->error)
  		{
  			if ( !empty( $db ) )

[mxbb-commits] mx_kb/kb/includes/js management.js.php,1.1,1.2

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

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

Modified Files:
	management.js.php 
Log Message:
Mainly bugfixes, revealed during work with new project site
- Quick List blocks compatible with app mode
- The app mode has been rewritten somewhat, related to inline TOCs etc
- Print version link fixed

Index: management.js.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/js/management.js.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** management.js.php	2 Jun 2007 20:56:04 -0000	1.1
--- management.js.php	21 May 2008 21:52:14 -0000	1.2
***************
*** 186,198 ****
  // Only used when the doc is generated as part of the app - inline (scripts are stripped in plain code)
  function generateTOC(mode) {
      var contents = "";
!     var link = escape(treeGetId());
  
      contents = '<div><a target="_blank" href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+link+'">Permanent Link to this page</a></div>';
  
!     var all = document.getElementById("tabs-data").childNodes;
      var contents2 = "";
      var text = "";
      var found = false;
      var h3 = false;
  
--- 186,206 ----
  // Only used when the doc is generated as part of the app - inline (scripts are stripped in plain code)
  function generateTOC(mode) {
+ 	//
+ 	// Create div
+ 	//
+ 	var tocdiv = document.getElementById("toc");
+ 	tocdiv.innerHTML = '<div id="contents"></div>';
+ 
      var contents = "";
!     //var link = escape(treeGetId());
!     var link = treeGetId();
  
      contents = '<div><a target="_blank" href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+link+'">Permanent Link to this page</a></div>';
  
!     var all = document.getElementById("tabs-data").getElementsByTagName('*');
      var contents2 = "";
      var text = "";
      var found = false;
+     var h2 = false;
      var h3 = false;
  
***************
*** 200,209 ****
      for (var i = 0; i < all.length; ++i) {
  
!     	if (all[i].nodeName == "H2" || all[i].nodeName == "H3") {
  
!             if (all[i].nodeName == "H2") {
!                 if (h3) contents2 += '</ul>';
                  h3 = false;
              }
              if (all[i].nodeName == "H3") {
                  if (!h3) contents2 += '<ul>';
--- 208,225 ----
      for (var i = 0; i < all.length; ++i) {
  
!     	if (all[i].nodeName == "H1" || all[i].nodeName == "H2" || all[i].nodeName == "H3") {
  
!             if (all[i].nodeName == "H1") {
!                 if (h3 || h2) contents2 += '</ul>';
!                 h2 = false;
                  h3 = false;
              }
+ 
+             if (all[i].nodeName == "H2") {
+             	if (h3) contents2 += '</ul>';
+                 if (!h2) contents2 += '<ul>';
+                 h2 = true;
+             }
+ 
              if (all[i].nodeName == "H3") {
                  if (!h3) contents2 += '<ul>';
***************
*** 214,235 ****
              text = all[i].innerHTML.replace(/<[^>]+>/g,"");
              all[i].innerHTML = '<a name="'+text+'">'+text+'</a>';
!             contents2 += '<li><a href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+text+'">'+text+'</a></li>';
          }
  
      }
      contents2 += '</ul>';
      if (found) {
          if (contents) contents += '<br>';
          contents += contents2;
      }
      if (contents) {
!         document.getElementById("contents").className = "contents";
          document.getElementById("contents").innerHTML = contents;
      }
- 
-     //alert(document.getElementById("tabs-data").innerHTML);
  }
  
- // ??
  // this snippet doesn't work if there is a folder named "html"
  // Only used when the doc is generated as part of the app - inline (scripts are stripped in plain code)
--- 230,251 ----
              text = all[i].innerHTML.replace(/<[^>]+>/g,"");
              all[i].innerHTML = '<a name="'+text+'">'+text+'</a>';
!             var str_temp = document.URL.split("#", 1);
!            	contents2 += '<li><a href="'+str_temp+'#'+text+'">'+text+'</a></li>';
          }
  
      }
      contents2 += '</ul>';
+ 
      if (found) {
          if (contents) contents += '<br>';
          contents += contents2;
      }
+ 
      if (contents) {
!         //document.getElementById("contents").className = "contents";
          document.getElementById("contents").innerHTML = contents;
      }
  }
  
  // this snippet doesn't work if there is a folder named "html"
  // Only used when the doc is generated as part of the app - inline (scripts are stripped in plain code)
***************
*** 302,306 ****
  
  function addTocDiv(html) {
! 	html = '<div id="contents"></div>' + '<div id="sectioncontents"></div>' + html;
  	return html;
  }
--- 318,322 ----
  
  function addTocDiv(html) {
! 	html = '<div id="sectioncontents"></div>' + html;
  	return html;
  }