[mxbb-commits] core/includes mx_functions_ch.php, 1.13, 1.14 mx_functions_tools.php, 1.60, 1.61

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30802/includes

Modified Files:
	mx_functions_tools.php 
Added Files:
	mx_functions_ch.php 
Log Message:


--- NEW FILE: mx_functions_ch.php ---
<?php
/**
*
* @package CH
* @version $Id: mx_functions_ch.php,v 1.14 2010/10/11 23:00:00 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @internal
*
*/

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

//
// This code is part of common.php in Categories Hierarchy 2.1.0
//

$starttime = microtime();
$trc_loc_start = $trc_loc_end = 0;


// include basic classes def
include($phpbb_root_path . 'includes/class_config.' . $phpEx);
include($phpbb_root_path . 'includes/class_groups.' . $phpEx);

// get config
$config = new config_class();
if ( !$config->read() )
{
	define('RUN_CH_INSTALL', true);
}
$board_config = $config->data;

// let's run the upgrade script
if ( !defined('IN_LOGIN') && !defined('IN_INSTALL') && (($config->data['mod_cat_hierarchy'] != CH_CURRENT_VERSION) || defined('RUN_CH_INSTALL')) )
{
	header('Location: ' . $phpbb_root_path . 'install_cat/install.' . $phpEx . (empty($SID) ? '' : '?' . $SID));
	exit;
}

// user objects
include($config->url('includes/class_user'));
include($config->url('includes/class_auth'));

// instantiate some objects
$user = new user();
$censored_words = new words();
$icons = new icons();
$navigation = new navigation();
$themes = '';
$smilies = new smilies();

// People never read achievement messages after after having seen "Succesfull !", tss tss :)
if ( file_exists($phpbb_root_path.'install_cat') && !defined('IN_LOGIN') && !defined('IN_INSTALL') )
{
	message_die(GENERAL_MESSAGE, 'Please ensure the install_cat/ directory is deleted');
}

// messages queue
$message_queue = '';
@include($config->url('includes/class_message'));
$message_queue = !defined('CH_message_queue') ? '' : new message_queue();

// include extra language key
$language = $userdata['user_lang'];

if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) )
{
	$language = $board_config['default_lang'];
}

if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) )
{
	$language = 'english';
}

include($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.' . $phpEx);

// include extra language key
$language = $userdata['user_lang'];

if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) )
{
	$language = $board_config['default_lang'];
}

if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) )
{
	$language = 'english';
}

include($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.' . $phpEx);

?>
Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** mx_functions_tools.php	6 Jan 2010 19:40:38 -0000	1.60
--- mx_functions_tools.php	11 Oct 2010 23:00:00 -0000	1.61
***************
*** 5510,5516 ****
  	 *
  	 */
! 	function init()
  	{
! 
  	}
  
--- 5510,5516 ----
  	 *
  	 */
! 	function init($item_data, $comments_type = 'internal')
  	{
! 		return false;
  	}