mxbb-commits Mailing List for MX-Publisher (Page 124)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Removed Files:
	release.txt 
Log Message:
update for new mx_mod 2.8.2

--- release.txt DELETED ---

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

Removed Files:
	subSilver.cfg 
Log Message:
update for new mx_mod 2.8.2

--- subSilver.cfg DELETED ---

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

Modified Files:
	music_constants.php 
Log Message:
update for new mx_mod 2.8.2

Index: music_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_constants.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** music_constants.php	8 Mar 2008 20:54:50 -0000	1.4
--- music_constants.php	13 Mar 2008 04:43:05 -0000	1.5
***************
*** 16,27 ****
  if ( !MXBB_MODULE )
  {
! 	$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';
! 	$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
! 	$server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : '';
! 	$script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path']));
! 	$script_name = ($script_name == '') ? $script_name : '/' . $script_name;
! 
! 	define( 'PORTAL_URL', $server_protocol . $server_name . $server_port . $script_name . '/' );
! 	define( 'PHPBB_URL', PORTAL_URL );

  	$mx_table_prefix = $table_prefix;
--- 16,21 ----
  if ( !MXBB_MODULE )
  {
! 	define('PORTAL_URL', $portal_config['portal_url']);
! 	define('PHPBB_URL', PORTAL_URL);

  	$mx_table_prefix = $table_prefix;
***************
*** 64,72 ****
  // Footer Copyrights
  // -------------------------------------------------------------------------
! if ( !MXBB_MODULE || MXBB_27x )
  {
  	if (!defined( 'IN_ADMIN' ))
  	{	
! 		$mx_user->set_module_cfg_name('music');
  		$mx_user->set_module_lang_path($module_root_path . 'music_box/');
  		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
--- 58,66 ----
  // Footer Copyrights
  // -------------------------------------------------------------------------
! if (!MXBB_MODULE)
  {
  	if (!defined( 'IN_ADMIN' ))
  	{	
! 		$mx_user->set_module_cfg_name('mx_music');
  		$mx_user->set_module_lang_path($module_root_path . 'music_box/');
  		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);

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

Added Files:
	music_db_install.php music_db_uninstall.php 
Log Message:
update for new mx_mod 2.8.2

--- NEW FILE: music_db_install.php ---
<?php
/**
*
* @package phpBB Mod - Media Center
* @version $Id: music_db_install.php,v 1.1 2008/03/13 04:21:40 orynider 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 );

	$phpbb_root_path = $module_root_path = './';
	$mx_mod_path = $phpbb_root_path . 'mx_mod/';

	include($phpbb_root_path . 'common.' . $phpEx);
	include($mx_mod_path . "includes/functions_required.$phpEx");

	//Check if forum_hack is installed
	if (!isset($mx_root_path))
	{
		$mx_root_path = './';
		@define('IN_PORTAL', true);
		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
	}
	else
	{
		@define('IN_PORTAL', true);
		include_once($mx_root_path . "includes/mx_constants.$phpEx");
		include_once($mx_root_path . "includes/shared/phpbb2/includes/functions.$phpEx");
	}

	require($mx_mod_path . "includes/functions_core.$phpEx");
	require($mx_mod_path . "includes/functions_styles.$phpEx");

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

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

	define( 'PAGE_KB', -502 ); // 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();

	//
	// Page selector
	//
	$page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);

	$is_block = false;

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

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

		//
		// Start user session
		// - populate $userdata and $lang
		//
		$mx_user->init($user_ip, $page_id, false);
		init_userprefs($userdata);

		$mx_user->set_module_default_style('prosilver'); // For compatibility with core 2.8.x

		if (!$userdata['user_level'] == ADMIN)
		{
			die('Only admins may run this script!!!');
		}

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

		//
		// Start user session
		// - populate $userdata and $lang
		//
		$mx_user->init($user_ip, $page_id, false);
		$user->setup();
		//
		// End session management
		//

		$mx_user->set_module_default_style('prosilver'); // For compatibility with core 2.8.x

		if ($userdata['user_type'] != USER_FOUNDER)
		{
			die('Only admins may run this script!!!');
		}
	}
	else
	{
		die('Copy this file in phpbb_root_path were is your viewtopic.php file!!!');
	}
}
else // --------------------------------------------------------------------------------- mxBB Module MODE
{
	define( 'MXBB_MODULE', true );

	if ( !function_exists( 'read_block_config' ) )
	{
		define( 'IN_PORTAL', true );
		$mx_root_path 		= './../../';
		$module_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

		define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.' . $phpEx ) );
	}
	else
	{
		if( !defined('IN_PORTAL') || !is_object($mx_block))
		{
			die("Hacking attempt");
		}

		//
		// Read Block Settings (default mode)
		//
		$title = !empty( $mx_block->block_info['block_title'] ) ? $mx_block->block_info['block_title'] : $lang['KB_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 ) );
}

//
// Check if mx_common Mod is prezent
//
if (!file_exists($mx_mod_path . "includes/functions_admincp.$phpEx"))
{
	die('mx mod is not uploaded!!!');
}
else
{
	require($mx_mod_path . "includes/functions_admincp.$phpEx");
}

//
// Check if mx_common Mod is prezent
//
if ( !file_exists( $mx_mod_path . 'includes/' . 'functions_admincp.' . $phpEx ) )
{
	die('mx_mod folder is not uploaded!!!');
}
else
{
	include_once( $mx_mod_path . 'includes/' . 'functions_admincp.' . $phpEx );
	include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
}

$page_title = 'Installing/Upgrading Media Center';
include($phpbb_root_path . 'includes/page_header.'.$phpEx);

$sql = array();

// If fresh install
if ( !$result = $db->sql_query( "SELECT config_name from " . $table_prefix . "music_config" ) )
{
	$message = "<b>This is a fresh install!</b><br/><br/>";

	$sql[] = "DROP TABLE IF EXISTS " . $table_prefix . "music";

	$sql[] = "DROP TABLE IF EXISTS " . $table_prefix . "music_rate";

	$sql[] = "DROP TABLE IF EXISTS " . $table_prefix . "music_comment";

	$sql[] = "DROP TABLE IF EXISTS " . $table_prefix . "music_cat";

	$sql[] = "DROP TABLE IF EXISTS " . $table_prefix . "music_config";

	$sql[] = "CREATE TABLE ". $table_prefix . "music (
		song_id int(11) UNSIGNED NOT NULL auto_increment,
		song_filename varchar(255) NOT NULL,
		song_filetype varchar(255) NOT NULL,
		song_imagename varchar(255) NOT NULL,
		song_title varchar(255) NOT NULL,
		song_url varchar(255) NOT NULL,
		song_desc text,
		song_singer varchar(255) NOT NULL,
		song_user_id mediumint(8) NOT NULL,
		song_username varchar(32),
		song_user_ip char(8) NOT NULL DEFAULT '0',
		song_time int(11) UNSIGNED NOT NULL,
		song_cat_id mediumint(8) UNSIGNED NOT NULL DEFAULT '1',
		song_view_count int(11) UNSIGNED NOT NULL DEFAULT '0',
		song_lock tinyint(3) NOT NULL DEFAULT '0',
		song_approval tinyint(3) NOT NULL DEFAULT '1',
		song_download_count varchar(255) NOT NULL,
		PRIMARY KEY (song_id),
		KEY song_cat_id (song_cat_id),
		KEY song_user_id (song_user_id),
		KEY song_time (song_time)
		) TYPE=MyISAM";

	$sql[] = "CREATE TABLE ". $table_prefix . "music_rate (
		rate_song_id int(11) UNSIGNED NOT NULL,
		rate_user_id mediumint(8) NOT NULL,
		rate_user_ip char(8) NOT NULL,
		rate_point tinyint(3) UNSIGNED NOT NULL,
		KEY rate_song_id (rate_song_id),
		KEY rate_user_id (rate_user_id),
		KEY rate_user_ip (rate_user_ip),
		KEY rate_point (rate_point)
		) TYPE=MyISAM";

	$sql[] = "CREATE TABLE ". $table_prefix . "music_comment (
		comment_id int(11) UNSIGNED NOT NULL auto_increment,
		comment_song_id int(11) UNSIGNED NOT NULL,
		comment_user_id mediumint(8) NOT NULL,
		comment_username varchar(32),
		comment_user_ip char(8) NOT NULL,
		comment_time int(11) UNSIGNED NOT NULL,
		comment_text TEXT,
		comment_edit_time int(11) UNSIGNED,
		comment_edit_count smallint(5) UNSIGNED NOT NULL DEFAULT '0',
		comment_edit_user_id mediumint(8),
		PRIMARY KEY(comment_id),
		KEY comment_song_id (comment_song_id),
		KEY comment_user_id (comment_user_id),
		KEY comment_user_ip (comment_user_ip),
		KEY comment_time (comment_time)
		) TYPE=MyISAM";

	$sql[] = "CREATE TABLE ". $table_prefix . "music_cat (
		cat_id mediumint(8) UNSIGNED NOT NULL auto_increment,
		cat_parent mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
		cat_type tinyint NOT NULL DEFAULT '0',
		cat_title varchar(255) NOT NULL,
		cat_desc text,
		cat_order mediumint(8) NOT NULL,
		cat_views mediumint(8) NOT NULL,
		cat_view_level tinyint(3) NOT NULL DEFAULT '-1',
		cat_upload_level tinyint(3) NOT NULL DEFAULT '0',
		cat_rate_level tinyint(3) NOT NULL DEFAULT '0',
		cat_comment_level tinyint(3) NOT NULL DEFAULT '0',
		cat_edit_level tinyint(3) NOT NULL DEFAULT '0',
		cat_delete_level tinyint(3) NOT NULL DEFAULT '2',
		cat_view_groups varchar(255),
		cat_upload_groups varchar(255),
		cat_rate_groups varchar(255),
		cat_comment_groups varchar(255),
		cat_edit_groups varchar(255),
		cat_delete_groups varchar(255),
		cat_moderator_groups varchar(255),
		cat_approval tinyint(3) NOT NULL DEFAULT '0',
		PRIMARY KEY (cat_id),
		KEY cat_order (cat_order)
		) TYPE=MyISAM";

	$sql[] = "CREATE TABLE " . $table_prefix . "music_config (
  			 	   	    config_name VARCHAR(255) NOT NULL default '',
						config_value varchar(255) NOT NULL default '',
						PRIMARY KEY  (config_name)
						) TYPE=MyISAM";

	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_songs', '1024')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('user_songs_limit', '50')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('mod_songs_limit', '250')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_file_size', '3145728')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rows_per_page', '20')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('cols_per_page', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('top', '5')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('sort_method', 'song_time')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('sort_order', 'DESC')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('mp3_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('wav_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('wma_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('wmv_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('mid_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('ram_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('au_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('mpeg_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('avi_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('swf_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('qt_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rm_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('desc_length', '512000')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('hotlink_prevent', '0')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('hotlink_allowed', 'cfmanager.gate2vn.net')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rate', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rate_scale', '10')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('comment', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('music_version', '.1.0')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_image_size', '1024000')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_image_width', '800')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_image_height', '600')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('download', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('enable_integration', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('override_default_pages', '0')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('index', '5')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('xs_enabled', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('img_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('flv_allowed', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('show_index_subcats', '1')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rows_per_page_pic', '5')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('cols_per_page_pic', '5')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rows_per_page_media', '10')";
	$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('cols_per_page_media', '1')";

	$message .= mx_do_install_upgrade( $sql );
}
else
{

	//
	// Upgrade checks
	//
	$upgrade_206 = 0;
	$upgrade_207 = 0;

	//
	// validate before 2.06
	//
	$result = $db->sql_query( "SELECT config_value from " . $table_prefix . "music_config WHERE config_name = 'enable_integration'" );
	if ( $db->sql_numrows( $result ) == 0 )
	{
		$upgrade_206 = 1;
	}

	//
	// validate before 2.07
	//
	$result = $db->sql_query( "SELECT config_value from " . $table_prefix . "music_config WHERE config_name = 'xs_enabled'" );
	if ( $db->sql_numrows( $result ) == 0 )
	{
		$upgrade_207 = 1;
	}

	$message = "<b>Upgrading!</b><br/><br/>";

	if ( $upgrade_206 == 1 )
	{
		$message .= "<b>Upgrading to v. 2.06 ...</b><br/><br/>";

		$sql[] = "ALTER TABLE " . $table_prefix . "music ADD song_imagename VARCHAR(255) not null AFTER song_filename";
		$sql[] = "ALTER TABLE " . $table_prefix . "music ADD song_download_count VARCHAR(255) not null DEFAULT '0' AFTER song_approval";
		$sql[] = "ALTER TABLE " . $table_prefix . "music_cat ADD cat_views mediumint(8) NOT NULL";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('wmv_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('mid_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('ram_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('au_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('mpeg_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('avi_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('swf_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('qt_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rm_allowed', '1')";

		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_image_size', '1024000')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_image_width', '800')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('max_image_height', '600')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('download', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('enable_integration', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('override_default_pages', '0')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('index', '5')";
	}

	if ( $upgrade_207 == 1 )
	{
		$message .= "<b>Upgrading to v. 2.0.7...</b><br/><br/>";

		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('xs_enabled', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('img_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('flv_allowed', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('show_index_subcats', '1')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rows_per_page_pic', '5')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('cols_per_page_pic', '5')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('rows_per_page_media', '10')";
		$sql[] = "INSERT INTO " . $table_prefix . "music_config VALUES ('cols_per_page_media', '1')";

		$sql[] = "ALTER TABLE " . $table_prefix . "music_cat ADD cat_parent mediumint(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_id";
		$sql[] = "ALTER TABLE " . $table_prefix . "music_cat ADD cat_type tinyint NOT NULL DEFAULT '0' AFTER cat_parent";
		$sql[] = "ALTER TABLE " . $table_prefix . "music ADD song_filetype varchar(255) NOT NULL AFTER song_filename";

		$sql[] = "UPDATE ". $table_prefix ."music_config
				SET config_value = '0.7'
				WHERE config_name = 'music_version'";
	}
	else
	{
		$message .= "<b>Nothing to upgrade...</b><br/><br/>";
	}

	$message .= mx_do_install_upgrade( $sql );

	//
	// Empty module cache
	//
	include_once( $mx_mod_path . 'includes/functions_tools.' . $phpEx );
	$module_cache = new module_cache($root_path);
	$module_cache->tidy();
	$module_cache->save();
}

echo "<br /><br />";
echo "<table  width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">";
echo "<tr><th class=\"thHead\" align=\"center\">Mod Installation/Upgrading/Uninstalling Information - mod specific db tables</th></tr>";
echo "<tr><td class=\"row1\"  align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>";
echo "</table><br />";

include($phpbb_root_path . 'includes/page_tail.'.$phpEx);

?>
--- NEW FILE: music_db_uninstall.php ---
<?php
/**
*
* @package phpBB2 Mod - pafileDB
* @version $Id: music_db_uninstall.php,v 1.1 2008/03/13 04:21:40 orynider 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 );

	$phpbb_root_path = $module_root_path = './';
	$mx_mod_path = $phpbb_root_path . 'mx_mod/';

	include($phpbb_root_path . 'common.' . $phpEx);
	include($mx_mod_path . "includes/functions_required.$phpEx");

	//Check if forum_hack is installed
	if (!isset($mx_root_path))
	{
		$mx_root_path = './';
		@define('IN_PORTAL', true);
		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
	}
	else
	{
		@define('IN_PORTAL', true);
		include_once($mx_root_path . "includes/mx_constants.$phpEx");
		include_once($mx_root_path . "includes/shared/phpbb2/includes/functions.$phpEx");
	}

	require($mx_mod_path . "includes/functions_core.$phpEx");
	require($mx_mod_path . "includes/functions_styles.$phpEx");

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

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

	define( 'PAGE_KB', -502 ); // 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();

	//
	// Page selector
	//
	$page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);

	$is_block = false;

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

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

		//
		// Start user session
		// - populate $userdata and $lang
		//
		$mx_user->init($user_ip, $page_id, false);
		init_userprefs($userdata);

		$mx_user->set_module_default_style('prosilver'); // For compatibility with core 2.8.x

		if (!$userdata['user_level'] == ADMIN)
		{
			die('Only admins may run this script!!!');
		}

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

		//
		// Start user session
		// - populate $userdata and $lang
		//
		$mx_user->init($user_ip, $page_id, false);
		$user->setup();
		//
		// End session management
		//

		$mx_user->set_module_default_style('prosilver'); // For compatibility with core 2.8.x

		if ($userdata['user_type'] != USER_FOUNDER)
		{
			die('Only admins may run this script!!!');
		}
	}
	else
	{
		die('Copy this file in phpbb_root_path were is your viewtopic.php file!!!');
	}
}
else // --------------------------------------------------------------------------------- mxBB Module MODE
{
	define( 'MXBB_MODULE', true );

	if ( !function_exists( 'read_block_config' ) )
	{
		define( 'IN_PORTAL', true );
		$mx_root_path 		= './../../';
		$module_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

		define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.' . $phpEx ) );
	}
	else
	{
		if( !defined('IN_PORTAL') || !is_object($mx_block))
		{
			die("Hacking attempt");
		}

		//
		// Read Block Settings (default mode)
		//
		$title = !empty( $mx_block->block_info['block_title'] ) ? $mx_block->block_info['block_title'] : $lang['KB_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 ) );
}

//
// Check if mx_common Mod is prezent
//
if (!file_exists($mx_mod_path . "includes/functions_admincp.$phpEx"))
{
	die('mx mod is not uploaded!!!');
}
else
{
	require($mx_mod_path . "includes/functions_admincp.$phpEx");
}

$page_title = 'Uninstalling Media Center';
include($phpbb_root_path . 'includes/page_header.'.$phpEx);

$sql = array(
	"DROP TABLE " . $table_prefix . "music",
	"DROP TABLE " . $table_prefix . "music_rate",
	"DROP TABLE " . $table_prefix . "music_comment",
	"DROP TABLE " . $table_prefix . "music_config"
	);

echo "<br /><br />";
echo "<table  width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">";
echo "<tr><th class=\"thHead\" align=\"center\">Mod Installation/Upgrading/Uninstalling Information - mod specific db tables</th></tr>";
echo "<tr><td class=\"row1\"  align=\"left\"><span class=\"gen\">" . mx_do_install_upgrade( $sql ) . "</span></td></tr>";
echo "</table><br />";

include($phpbb_root_path . 'includes/page_tail.'.$phpEx);

?>

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

Removed Files:
	music_db_install.php music_db_uninstall.php 
Log Message:
update for new mx_mod 2.8.2

--- music_db_install.php DELETED ---

--- music_db_uninstall.php DELETED ---

Update of /cvsroot/mxbb/mx_smartor/docs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12568/docs

Modified Files:
	albuming.txt 
Log Message:
upgrade to 2.0.1 gold

Index: albuming.txt
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/docs/albuming.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** albuming.txt	27 Sep 2007 16:11:33 -0000	1.4
--- albuming.txt	13 Mar 2008 03:43:54 -0000	1.5
***************
*** 215,224 ****
  #-----[ OPEN ]------------------------------------------------
  #
! mx_phpbb/includes/forum_hack.php
  #
  #-----[ FIND ]------------------------------------------------
  #

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

  #
--- 215,224 ----
  #-----[ OPEN ]------------------------------------------------
  #
! mx_root_path/common.php
  #
  #-----[ FIND ]------------------------------------------------
  #

! ?>

  #

Update of /cvsroot/mxbb/mx_smartor/album_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12568/album_mod

Modified Files:
	album_bbconstants.php album_common.php 
Removed Files:
	album_acp_functions.php album_bbcode.php album_constants.php 
	album_exif_info.php album_functions.php 
	album_hierarchy_auth.php album_hierarchy_debug.php 
	album_hierarchy_functions.php album_hierarchy_sql.php 
	album_image_class.php album_integration.php 
	album_nuffimage_box.php clown_album_functions.php 
Log Message:
upgrade to 2.0.1 gold

--- album_constants.php DELETED ---

--- album_hierarchy_functions.php DELETED ---

--- album_hierarchy_sql.php DELETED ---

Index: album_bbconstants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_bbconstants.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** album_bbconstants.php	6 Mar 2008 06:43:47 -0000	1.8
--- album_bbconstants.php	13 Mar 2008 03:43:42 -0000	1.9
***************
*** 40,44 ****
  if (!function_exists('this_smartor_mxurl'))
  {
! 	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
  		global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
--- 40,44 ----
  if (!function_exists('this_smartor_mxurl'))
  {
! 	function this_smartor_mxurl($args = '', $force_standalone_mode = '')
  	{
  		global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;

--- album_acp_functions.php DELETED ---

--- album_functions.php DELETED ---

--- album_exif_info.php DELETED ---

--- album_hierarchy_auth.php DELETED ---

Index: album_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** album_common.php	6 Mar 2008 06:43:47 -0000	1.23
--- album_common.php	13 Mar 2008 03:43:42 -0000	1.24
***************
*** 24,35 ****
  }

! include_once($album_root_path . 'album_constants.'.$phpEx);
! 
! 
! // **********************************************************************
! //  Read main language definition and theme images definition
! // **********************************************************************
! $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

  // Cache settings
--- 24,28 ----
  }

! include_once($album_root_path . 'includes/album_constants.'.$phpEx);

  // Cache settings
***************
*** 187,193 ****
  } 

! include_once($album_root_path . 'album_integration.' . $phpEx);
! include_once($album_root_path . 'album_functions.' . $phpEx);
! include_once($album_root_path . 'clown_album_functions.' . $phpEx);
  //
  // Set ALBUM Version
--- 180,186 ----
  } 

! include_once($album_root_path . 'includes/album_integration.' . $phpEx);
! include_once($album_root_path . 'includes/album_functions.' . $phpEx);
! include_once($album_root_path . 'includes/clown_album_functions.' . $phpEx);
  //
  // Set ALBUM Version
***************
*** 261,268 ****
  if ($album_config['album_bbcode'] == 1)
  {
! 	include_once($album_root_path . 'album_bbcode.' . $phpEx);
  }

! include_once($album_root_path . 'album_hierarchy_functions.' . $phpEx);

  ?>
\ No newline at end of file
--- 254,261 ----
  if ($album_config['album_bbcode'] == 1)
  {
! 	include_once($album_root_path . 'includes/album_bbcode.' . $phpEx);
  }

! include_once($album_root_path . 'includes/album_hierarchy_functions.' . $phpEx);

  ?>
\ No newline at end of file

--- album_image_class.php DELETED ---

--- album_integration.php DELETED ---

--- clown_album_functions.php DELETED ---

--- album_bbcode.php DELETED ---

--- album_hierarchy_debug.php DELETED ---

--- album_nuffimage_box.php DELETED ---

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

Modified Files:
	album.php db_install.php db_upgrade.php 
Log Message:
upgrade to 2.0.1 gold

Index: album.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** album.php	8 Feb 2008 10:47:59 -0000	1.22
--- album.php	13 Mar 2008 03:43:41 -0000	1.23
***************
*** 12,19 ****
   *                            MODIFICATIONS
   *                           ---------------
!  *   started            : Saturday, January 18, 2004
!  *   copyright          : © Volodymyr (CLowN) Skoryk
!  *   email              : bla...@ya...
!  *	 version            : 1.5
   *
   *	 MODIFICATIONS:
--- 12,19 ----
   *                            MODIFICATIONS
[...1180 lines suppressed...]
! 			// include our special personal gallery files
! 			// this file holds all the code to handle personal galleries
! 			// except moderation and management of personal gallery categories.
! 			include ($album_root_path . 'album_personal.' . $phpEx);
! 		}
  	}
! 	*/

! 	album_display_index($album_user_id, ALBUM_ROOT_CATEGORY, true, true, true);

! 	// Generate the page
! 	$template->pparse('body');

! 	if ( !is_object($mx_block))
! 	{
! 		include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 	}
  }
  ?>
\ No newline at end of file

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** db_install.php	6 Mar 2008 06:43:48 -0000	1.20
--- db_install.php	13 Mar 2008 03:43:41 -0000	1.21
***************
*** 32,36 ****
  }

! $mx_module_version = '2.0.1';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';

--- 32,36 ----
  }

! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_upgrade.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** db_upgrade.php	6 Mar 2008 06:43:48 -0000	1.20
--- db_upgrade.php	13 Mar 2008 03:43:42 -0000	1.21
***************
*** 30,34 ****
  }

! $mx_module_version = '2.0.1';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';

--- 30,34 ----
  }

! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';

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

Modified Files:
	admin_album_cfg.php admin_album_clown_SP.php 
Log Message:
upgrade to 2.0.1 gold

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

Removed Files:
	.htaccess album_allpics.php album_cat.php album_cat_sort.php 
	album_comment.php album_comment_delete.php 
	album_comment_edit.php album_delete.php album_download.php 
	album_edit.php album_hotornot.php album_jupload.php 
	album_memberlist.php album_modcp.php album_nuffload.php 
	album_nuffload_pbar.php album_otf.php album_otf_thumbnail.php 
	album_page.php album_pclzip_lib.php album_personal.php 
	album_personal_cat_admin.php album_personal_index.php 
	album_personal_old.php album_personal_random.php album_pic.php 
	album_pic_nuffed.php album_picm.php album_rate.php 
	album_rdf.php album_rss.php album_search.php 
	album_showpage.php album_thumbnail.php album_upload.php 
	index.htm 
Log Message:
upgrade to 2.0.1 gold

--- album_personal.php DELETED ---

--- album_edit.php DELETED ---

--- album_comment_edit.php DELETED ---

--- album_modcp.php DELETED ---

--- album_search.php DELETED ---

--- album_delete.php DELETED ---

--- album_download.php DELETED ---

--- album_page.php DELETED ---

--- album_pic.php DELETED ---

--- album_rss.php DELETED ---

--- album_thumbnail.php DELETED ---

--- index.htm DELETED ---

--- album_hotornot.php DELETED ---

--- album_cat_sort.php DELETED ---

--- album_showpage.php DELETED ---

--- album_cat.php DELETED ---

--- album_personal_random.php DELETED ---

--- album_comment_delete.php DELETED ---

--- album_jupload.php DELETED ---

--- album_pclzip_lib.php DELETED ---

--- album_allpics.php DELETED ---

--- album_picm.php DELETED ---

--- album_upload.php DELETED ---

--- album_otf_thumbnail.php DELETED ---

--- album_rate.php DELETED ---

--- album_personal_cat_admin.php DELETED ---

--- album_rdf.php DELETED ---

--- album_memberlist.php DELETED ---

--- album_pic_nuffed.php DELETED ---

--- .htaccess DELETED ---

--- album_personal_old.php DELETED ---

--- album_comment.php DELETED ---

--- album_nuffload_pbar.php DELETED ---

--- album_otf.php DELETED ---

--- album_nuffload.php DELETED ---

--- album_personal_index.php DELETED ---

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12568/album_mod/includes

Added Files:
	album_acp_functions.php album_bbcode.php album_constants.php 
	album_exif_info.php album_functions.php 
	album_hierarchy_auth.php album_hierarchy_debug.php 
	album_hierarchy_functions.php album_hierarchy_sql.php 
	album_image_class.php album_integration.php 
	album_nuffimage_box.php clown_album_functions.php 
Log Message:
upgrade to 2.0.1 gold

--- NEW FILE: album_constants.php ---
<?php
/**
*
* @package Mx-Publisher Module - mx_smartor
* @version $Id: album_constants.php,v 1.2 2008/03/13 03:43:55 orynider Exp $
* @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

 /***************************************************************************
 *
 *   MODIFICATION:
 *   -inserted few extra session handlings
 *   -inserted SP table constant
 *   -inserted medium thumb path constant
 *
 ***************************************************************************/

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

// -------------------------------------------------------------------------
// Extend User Style with module lang and images
// Usage:  $mx_user->extend(LANG, IMAGES)
// Switches:
// - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
// -------------------------------------------------------------------------
$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
$mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

// Album Tables
!defined('ALBUM_TABLE') ? define('ALBUM_TABLE', $mx_table_prefix.'smartor_album') : false;
!defined('ALBUM_CAT_TABLE') ? define('ALBUM_CAT_TABLE', $mx_table_prefix.'smartor_album_cat') : false;
!defined('ALBUM_CONFIG_TABLE') ? define('ALBUM_CONFIG_TABLE', $mx_table_prefix.'smartor_album_config') : false;
!defined('ALBUM_COMMENT_TABLE') ? define('ALBUM_COMMENT_TABLE', $mx_table_prefix.'smartor_album_comment') : false;
!defined('ALBUM_RATE_TABLE') ? define('ALBUM_RATE_TABLE', $mx_table_prefix.'smartor_album_rate') : false;
!defined('ALBUM_SP_CONFIG_TABLE') ? define('ALBUM_SP_CONFIG_TABLE', $mx_table_prefix.'smartor_album_sp_config') : false;

define('PAGE_ALBUM', -50);	// for Session Handling
define('PAGE_ALBUM_PERSONAL', -51);
define('PAGE_ALBUM_PICTURE', -52);
define('PAGE_ALBUM_SEARCH', -53);

define('PERSONAL_GALLERY', 0); // pic_cat_id <- do NOT change this value
define('ALBUM_NAV_ARROW','&nbsp;&raquo;&nbsp;');
define('ALBUM_DATA_ALREADY_READ', -127);

define('ALBUM_ROOT_CATEGORY', -1);
define('ALBUM_PUBLIC_GALLERY', 0);

// Special album jumpbox/selection values
define('ALBUM_JUMPBOX_SEPERATOR', -99999900);
define('ALBUM_JUMPBOX_DELETE', -99999901);
define('ALBUM_JUMPBOX_USERS_GALLERY', -99999902);
define('ALBUM_JUMPBOX_PUBLIC_GALLERY', -99999903);

// Permission rights defined flags
define('ALBUM_AUTH_VIEW', 1);
define('ALBUM_AUTH_UPLOAD', 2);
define('ALBUM_AUTH_CREATE_PERSONAL', 2);
define('ALBUM_AUTH_RATE', 4);
define('ALBUM_AUTH_COMMENT', 8);
define('ALBUM_AUTH_EDIT', 16);
define('ALBUM_AUTH_DELETE', 32);
define('ALBUM_AUTH_MODERATOR', 64);
define('ALBUM_AUTH_MANAGE_PERSONAL_CATEGORIES', 128);

// Special 'predefined' combinations
define('ALBUM_AUTH_ALL', 255);
define('ALBUM_AUTH_VIEW_AND_UPLOAD', 3);

// Used to indicate if you are going to read both public & personal album categories
define('ALBUM_READ_ALL_CATEGORIES', 512);
define('ALBUM_CREATE_CAT_ID_LIST', 1024);

// Select/jumpbox defined flags
define('ALBUM_SELECTBOX_INCLUDE_ALL', 1);
define('ALBUM_SELECTBOX_INCLUDE_ROOT', 2);
define('ALBUM_SELECTBOX_DELETING', 4);
define('ALBUM_SELECTBOX_ALL', 7); // all three options
define('ALBUM_VIEW_ALL', 'all');
define('ALBUM_VIEW_ALL_PICS', 'allpics');
define('ALBUM_VIEW_LIST', 'list');
define('ALBUM_VIEW_NORMAL', '');
define('ALBUM_LISTTYPE_PICTURES', 'pic');
define('ALBUM_LISTTYPE_COMMENTS', 'comment');
define('ALBUM_LISTTYPE_RATINGS', 'rating');

define('ALBUM_INCLUDE_PARENT_ID', true);
define('ALBUM_EXCLUDE_PARENT_ID', false);

// User Levels for Album system <- do NOT change these values
define('ALBUM_ANONYMOUS', -1);
define('ALBUM_GUEST', -1);

define('ALBUM_USER', 0);
define('ALBUM_ADMIN', 1);
define('ALBUM_MOD', 2);
define('ALBUM_PRIVATE', 3);

!defined('PAGE_ALBUM') ? define('PAGE_ALBUM', -502) : false;

//Redefine some GD constants
!defined('IMAGETYPE_PNG') ? define('IMAGETYPE_PNG', 3) : false;
!defined('IMAGETYPE_JPEG') ? define('IMAGETYPE_JPEG', 2) : false;
!defined('IMAGETYPE_GIF') ? define('IMAGETYPE_GIF', 1) : false;

!defined('IMG_PNG') ? define('IMG_PNG', IMAGETYPE_PNG) : false;
!defined('IMG_JPG') ? define('IMG_JPG', IMAGETYPE_JPEG) : false;
!defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false;

// Path (trailing slash required)
define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');

?>
--- NEW FILE: album_hierarchy_functions.php ---
<?php
/**
*
* @package Mx-Publisher Module - mx_smartor
* @version $Id: album_hierarchy_functions.php,v 1.2 2008/03/13 03:43:57 orynider Exp $
* @copyright (c) 2003 [bla...@ya..., idl...@sl...] mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
* some of the code was taken from phpbb forum (generate_smilies function)
*/

/***************************************************************************
 *
 * This mod is strongly based on the Forum Hiearchy Category Mod by Ptirhiik
 * A lot of credit goes to Ptirhiik
 * And some small part of this code is copyrighted by Ptirhiik.
 *
 ***************************************************************************/

[...1727 lines suppressed...]
				'LAST_COMMENT_OVER_COLOR' => $overColor,
				'LAST_COMMENT_OUT_COLOR' => $outColor
				)
			);
		}

		if ($album_config['show_index_last_pic'] == 1 && $indexes[$i] == 6)
		{
			$template->assign_vars(array(
				'COL6' => $rowClass,
				'LAST_PIC_OVER_COLOR' => $overColor,
				'LAST_PIC_OUT_COLOR' => $outColor
				)
			);
		}
		$toggle = !$toggle;
	}
}

?>
--- NEW FILE: album_hierarchy_sql.php ---
<?php
/**
*
* @package Mx-Publisher Module - mx_smartor
* @version $Id: album_hierarchy_sql.php,v 1.2 2008/03/13 03:43:57 orynider Exp $
* @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

/***************************************************************************
 *                          album_hierarchy_sql.php
 *                          ------------------------------------------------
 *     begin                : Friday, June 12, 2004
 *     copyright            : (C) 2004 IdleVoid
 *     email                : idl...@sl...
 *     file version         : 1.2.0
 *     release              : 2.0.0
 ****************************************************************************/
[...2105 lines suppressed...]
				'THUMBNAIL' => $thumbnail_file,
				'PIC_PREVIEW' => $pic_preview,
				'DESC' => $commentsrow[$i]['pic_desc'],
				'COMMENT_TEXT' => $commentsrow[$i]['comment_text'],
				'PIC_ID' => $commentsrow[$i]['pic_id'],
				'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $commentsrow[$i]['pic_title'] . '</a>',
				'POSTER' => $poster,
				'TIME' => create_date2($board_config['default_dateformat'], $commentsrow[$i]['comment_time'], $board_config['board_timezone']),
				'VIEW' => $commentsrow[$i]['pic_view_count'],
				'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '',
				'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($commentsrow[$i]['pic_user_ip']) . '" target="_blank">' . decode_ip($commentsrow[$i]['pic_user_ip']) .'</a><br />' : ''
				)
			);
		}
	}
}

?>
--- NEW FILE: album_acp_functions.php ---
<?php

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

if (!defined('IN_ADMIN'))
{
	die('Can only be used from the album ACP');
}

//------------------------------------------------------------------------
// This file is included in the admin/admin_album_config_extended.php
// which is the new ACP for the ablum.
//
// The file contains all the helper functions nedded for the ACP
//------------------------------------------------------------------------

//------------------------------------------------------------------------
// this little helper function basicly does the template generation
// NOTE : the $config_box_generation_function is defined in the
// $album_config_tabs array that exists in all of the admin_album_config_*
// files. It is just a function 'pointer' to the actual generator function
//------------------------------------------------------------------------
function build_config_box($config_data)
{
	global $template;
	$function = $config_data['generate_function'];

	$template->set_filenames(array('configuration_box' => $config_data['template_file']));

	build_subtab_box($config_data);

	if (!empty($function))
	{
		$function($config_data);
	}

	$template->assign_var_from_handle('CONFIGURATION_BOX', 'configuration_box');
}

function build_sub_config_box($config_data)
{
	global $template;

	$selected_subtab = $config_data['selected_subtab'];

	$function = (!empty($selected_subtab['generate_function'])) ? $selected_subtab['generate_function'] : $config_data['generate_function'];

	$template->set_filenames(array('sub_configuration_box' => $selected_subtab['template_file']));

	if (!empty($function))
	{
		$function($config_data);
	}

	$template->assign_var_from_handle('SUB_CONFIGURATION_BOX', 'sub_configuration_box');	
}

function build_subtab_box($config_data) //, $selected_subtab)
{
	global $template;
	$selected_index = 0;

	$selected_subtab = get_selected_tab_from_config($config_data);

	if (0 == count($selected_subtab))
	{
		return;
	}

	build_sub_config_box($config_data);

	for ($i = 0; $i < count($config_data['sub_config']); $i++)
	{
		if ($config_data['sub_config'][$i]['selection'] == $selected_subtab['selection'])
		{
			$selected_index = $i;
		}

		$template->assign_block_vars('subtab_row', array(
			'TAB_SELECT_NAME' => $config_data['sub_config'][$i]['selection'],
			'L_TAB_TITLE' => $config_data['sub_config'][$i]['title'],
			'TAB_LINKS' => ($config_data['sub_config'][$i]['selection'] == $selected_subtab['selection']) ? 'tab_links' : 'tab_links_unsel',
			'TAB_CLASS' => ($config_data['sub_config'][$i]['selection'] == $selected_subtab['selection']) ? 'tab_headers' : 'tab_headers_unsel'
			)
		);

		$template->assign_vars(array(
			'L_CONFIGURATION_BOX' => $config_data['sub_config'][$selected_index]['title']
			)
		);
	}

}

function get_selected_tab_from_config($config_data)
{
	return $config_data['selected_subtab'];
}

function get_config_table($selection)
{
	global $album_config_tabs;

	for ($i = 0; $i < count($album_config_tabs); $i++)
	{
		if ( 0 == strcasecmp($album_config_tabs[$i]['selection'],$selection) )
		{
			return $album_config_tabs[$i]['config_table_name'];
		}
	}

	return '';
}

function is_valid_config_tab($config_array)
{
	// these two array holds the minimum required fields for an config tab array
	// if there are other that's accepted just don't remove these
	// NOTE : the order of the keys are not important
	$valid_config_keys = array(	0 => 'order',1 => 'selection',2 => 'title',3 => 'detail',4 => 'sub_config',5 => 'config_table_name',6 => 'generate_function',7 => 'template_file');

	$valid_sub_config_keys = array(	0 => 'order',1 => 'selection',2=> 'title',3 => 'detail',4 => 'template_file');

	if (count($config_array) == 0)
	{
		return false;
	}

	for ($outer = 0; $outer < count($valid_config_keys); $outer++)
	{
		// does the key exists ?	
		if (@!array_key_exists($valid_config_keys[$outer],$config_array))
		{
			return false;
		}

		if (strcasecmp($valid_config_keys[$outer], 'sub_config') == 0)
		{
			// check each sub_config in the config array
			for ($inner = 0; $inner < count($config_array['sub_config']); $inner++)
			{
				// and check eacj key in each sub_config array
				for ($i = 0; $i < count($valid_sub_config_keys); $i++)
				{
					// does the key exists ?
					if (@!array_key_exists($valid_sub_config_keys[$i],$config_array['sub_config'][$inner]))
					{
						return false;
					}
				}
			}
		}

	}
	return true;
}

function remove_config_array($config_array, $index)
{
	$temp_array = array();
	for($i = 0; $i < count($config_array); $i++)
	{
		if ($i != $index)
		{
			$temp_array[] = $config_array[$i];
		}
	}

	return $temp_array;
}

?>
--- NEW FILE: album_functions.php ---
<?php
/**
*
* @package Mx-Publisher Module - mx_smartor
* @version $Id: album_functions.php,v 1.2 2008/03/13 03:43:56 orynider Exp $
* @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

// ------------------------------------
// All common functions are here!
// ------------------------------------
// You cannot call this file directly from your browser
//
if ( !defined('IN_PORTAL') )
{
	die('Hacking attempt');
}

if(!function_exists(create_date))
{
	function create_date($format, $gmepoch, $tz)
	{
		return phpBB2::create_date($format, $gmepoch, $tz);
	}

if(!function_exists(create_date2))
{
	function create_date2($format, $gmepoch, $tz)
	{
		return create_date($format, $gmepoch, $tz);
	}
}

if(!function_exists(decode_ip))
{
	function decode_ip($int_ip)
	{
		return phpBB2::decode_ip($int_ip);
	}
}

// ----------------------------------------------------------------------------
// This function will return the access data of the current user for a category
// Default returning value is "0" (means NOT AUTHORISED)
//
// All $*_check must be "1" or "0"
//
// $passed_auth must be a full row from ALBUM_CAT_TABLE. This function still works without
// ... but $passed_auth will make it worked very much faster (because this function is often
// called in a loop)
//
function album_user_access($cat_id, $passed_auth = 0, $view_check, $upload_check, $rate_check, $comment_check, $edit_check, $delete_check)
{
	global $db, $album_config, $userdata;

	// --------------------------------
	// Force to check moderator status
	// --------------------------------
	$moderator_check = 1;

	// --------------------------------
	// Here the array which this function would return. Now we initiate it!
	// --------------------------------
	$album_user_access = array(
		'view' => 0,
		'upload' => 0,
		'rate' => 0,
		'comment' => 0,
		'edit' => 0,
		'delete' => 0,
		'moderator' => 0
	);
	$album_user_access_keys = array_keys($album_user_access);
	//
	// END initiation $album_user_access
	//

	// --------------------------------
	// Check $cat_id
	// --------------------------------
	if ($cat_id == PERSONAL_GALLERY)
	{
		$personal_gallery_access = personal_gallery_access(1,1);

		if ($personal_gallery_access['view'])
		{
			$album_user_access['view'] = 1;
		}

		if ($personal_gallery_access['upload'])
		{
			$album_user_access['upload'] = 1;
			$album_user_access['rate'] = 1;
			$album_user_access['comment'] = 1;

			$album_user_access['edit'] = 1;
			$album_user_access['delete'] = 1;

			if ($userdata['session_logged_in'])
			{
				if ($userdata['user_level'] == ADMIN)
				{
					$album_user_access['moderator'] = 1;
				}
			}
		}

		return $album_user_access;
	}
	else if ($cat_id < 0)
	{
		mx_message_die(GENERAL_ERROR, 'Bad cat_id arguments for function album_user_access()');
	}
	//
	// END check $cat_id
	//

	// --------------------------------
	// If the current user is an ADMIN (ALBUM_ADMIN == ADMIN)
	// --------------------------------
	if ($userdata['user_level'] == ADMIN)
	{
		for ($i = 0; $i < count($album_user_access); $i++)
		{
			$album_user_access[$album_user_access_keys[$i]] = 1; // Authorised All
		}

		//
		// Function EXIT here
		//
		return $album_user_access;
	}
	//
	// END check ADMIN
	//

	// --------------------------------
	// if this is a GUEST, we will ignore some checking
	// --------------------------------
	if (!$userdata['session_logged_in'])
	{
		$edit_check = 0;
		$delete_check = 0;
		$moderator_check = 0;
	}
	//
	// END check GUEST
	//

	// --------------------------------
	// check if RATE or COMMENT are turned off by Album Config, so we can ignore them
	// --------------------------------
	if ($album_config['rate'] == 0)
	{
		$rate_check = 0;
	}
	if ($album_config['comment'] == 0)
	{
		$comment_check = 0;
	}
	//
	// END Check RATE & COMMENT
	//

	// --------------------------------
	// The array that list all access type this function will look for (except MODERATOR)
	// --------------------------------
	$access_type = array();

	if ($view_check != 0)
	{
		$access_type[] = 'view';
	}

	if ($upload_check != 0)
	{
		$access_type[] = 'upload';
	}

	if ($rate_check != 0)
	{
		$access_type[] = 'rate';
	}

	if ($comment_check != 0)
	{
		$access_type[] = 'comment';
	}

	if ($edit_check != 0)
	{
		$access_type[] = 'edit';
	}

	if ($delete_check != 0)
	{
		$access_type[] = 'delete';
	}
	//
	// END generating array $access_type
	//

	// --------------------------------
	// If everything is empty
	// --------------------------------
	if( empty($access_type) and (!$moderator_check) )
	{
		//
		// Function EXIT here
		//
		return $album_user_access;
	}
	//
	// END check empty
	//

	// --------------------------------
	// Generate the SQL query based on $access_type and $moderator_check
	// --------------------------------
	$sql = 'SELECT cat_id';

	for ($i = 0; $i < count($access_type); $i++)
	{
		$sql .= ', cat_'. $access_type[$i] .'_level, cat_'. $access_type[$i] .'_groups';
	}

	if ($moderator_check)
	{
		$sql .= ', cat_moderator_groups';
	}

	$sql .= "
			FROM ". ALBUM_CAT_TABLE ."
			WHERE cat_id = '$cat_id'";
	//
	// END SQL query generating
	//

	// --------------------------------
	// Query the $sql then Fetchrow if $passed_auth == 0
	// --------------------------------
	if( !is_array($passed_auth) )
	{
		if( !$result = $db->sql_query($sql) )
		{
			mx_message_die(GENERAL_ERROR, 'Could not query Album Category information' ,'' , __LINE__, __FILE__, $sql);
		}

		$thiscat = $db->sql_fetchrow($result);
	}
	else
	{
		$thiscat = $passed_auth;
	}
	//
	// END Query and Fetchrow
	//

	// --------------------------------
	// Maybe the access level is not PRIVATE or the groups list is empty
	// ... so we can skip some queries ;)
	// --------------------------------
	$groups_access = array();
	for ($i = 0; $i < count($access_type); $i++)
	{
		switch ($thiscat['cat_'. $access_type[$i] .'_level'])
		{
			case ALBUM_GUEST:
				$album_user_access[$access_type[$i]] = 1;
				break;

			case ALBUM_USER:
				if ($userdata['session_logged_in'])
				{
					$album_user_access[$access_type[$i]] = 1;
				}
				break;

			case ALBUM_PRIVATE:
				if( ($thiscat['cat_'. $access_type[$i] .'_groups'] != '') and ($userdata['session_logged_in']) )
				{
					$groups_access[] = $access_type[$i];
				}
				break;

			case ALBUM_MOD:
				// this will be checked later
				break;

			case ALBUM_ADMIN:
				// ADMIN already returned before at the checking code
				// at the top of this function. So this user cannot be authorised
				$album_user_access[$access_type[$i]] = 0;
				break;

			default:
				$album_user_access[$access_type[$i]] = 0;
		}
	}
	//
	// END Check Access Level
	//

	// --------------------------------
	// We can return now if $groups_access is empty AND $moderator_check == 0
	// --------------------------------
	if( ($moderator_check == 1) and ($thiscat['cat_moderator_groups'] != '') )
	{
		// We can merge them now
		$groups_access[] = 'moderator';
	}

	if (empty($groups_access))
	{
		//
		// Function EXIT here
		//
		return $album_user_access;
	}

	// --------------------------------
	// Now we have the list of usergroups have PRIVATE/MODERATOR access
	// So we will check if this user is in these usergroups or not...
	// --------------------------------
	// upto (6 + 1) loops maximum when this user logged in and All Levels
	// are set to PRIVATE and this function was called to check all.
	// So avoiding PRIVATE will speed up your album. However, these queries are very fast
	for ($i = 0; $i < count($groups_access); $i++)
	{
		$sql = "SELECT group_id, user_id
				FROM ". USER_GROUP_TABLE ."
				WHERE user_id = '". $userdata['user_id'] ."' AND user_pending = 0
					AND group_id IN (". $thiscat['cat_'. $groups_access[$i] .'_groups'] .")";
		if( !$result = $db->sql_query($sql) )
		{
			mx_message_die(GENERAL_ERROR, 'Could not query User-Group information' ,'' , __LINE__, __FILE__, $sql);
		}

		if( $db->sql_numrows($result) > 0 )
		{
			$album_user_access[$groups_access[$i]] = 1;
		}
	}
	//
	// END check PRIVATE/MODERATOR groups
	//

	// --------------------------------
	// If $moderator_check was called and this user is a MODERATOR he
	// will be authorised for all accesses which were not set to ADMIN
	// --------------------------------
	if( ($album_user_access['moderator'] == 1) and ($moderator_check == 1) )
	{
		for ($i = 0; $i < count($album_user_access); $i++)
		{
			if( $thiscat['cat_'. $album_user_access_keys[$i] .'_level'] != ALBUM_ADMIN )
			{
				$album_user_access[$album_user_access_keys[$i]] = 1;
			}
		}
	}
	//
	// END Moderator
	//

	// --------------------------------
	// Return result...
	// --------------------------------
	return $album_user_access;
}
//
// END function album_user_access()
// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------
// This function will check the access (VIEW, UPLOAD) of current user on
// any personal galleries
function personal_gallery_access($check_view, $check_upload)
{
	global $db, $userdata, $album_config;

	// This array will contain the result
	$personal_gallery_access = array(
		'view' => 0,
		'upload' => 0,
	);

	// --------------------------------
	// Who can create personal gallery?
	// --------------------------------
	if ($check_upload)
	{
		switch ($album_config['personal_gallery'])
		{
			case ALBUM_USER:
				if ($userdata['session_logged_in'])
				{
					$personal_gallery_access['upload'] = 1;
				}
				break;

			case ALBUM_PRIVATE:
				if( ($userdata['session_logged_in']) and ($userdata['user_level'] == ADMIN) )
				{
					$personal_gallery_access['upload'] = 1;
				}
				else if(!empty($album_config['personal_gallery_private']) and $userdata['session_logged_in'])
				{
					$sql = "SELECT group_id, user_id
							FROM ". USER_GROUP_TABLE ."
							WHERE user_id = '". $userdata['user_id'] ."' AND user_pending = 0
								AND group_id IN (". $album_config['personal_gallery_private'] .")";
					if( !$result = $db->sql_query($sql) )
					{
						mx_message_die(GENERAL_ERROR, 'Could not query User-Group information' ,'' , __LINE__, __FILE__, $sql);
					}

					if( $db->sql_numrows($result) > 0 )
					{
						$personal_gallery_access['upload'] = 1;
					}
				}
				break;

			case ALBUM_ADMIN:
				if( ($userdata['session_logged_in']) and ($userdata['user_level'] == ADMIN) )
				{
					$personal_gallery_access['upload'] = 1;
				}
				break;
		}
	}

	// --------------------------------
	// Who can view other personal gallery?
	// --------------------------------
	if ($check_view)
	{
		switch ($album_config['personal_gallery_view'])
		{
			case ALBUM_GUEST:
				$personal_gallery_access['view'] = 1;
				break;

			case ALBUM_USER:
				if ($userdata['session_logged_in'])
				{
					$personal_gallery_access['view'] = 1;
				}
				break;

			case ALBUM_PRIVATE:
				if( ($userdata['session_logged_in']) and ($userdata['user_level'] == ADMIN) )
				{
					$personal_gallery_access['view'] = 1;
				}
				else if(!empty($album_config['personal_gallery_private']) and $userdata['session_logged_in'])
				{
					$sql = "SELECT group_id, user_id
							FROM ". USER_GROUP_TABLE ."
							WHERE user_id = '". $userdata['user_id'] ."' AND user_pending = 0
								AND group_id IN (". $album_config['personal_gallery_private'] .")";
					if( !$result = $db->sql_query($sql) )
					{
						mx_message_die(GENERAL_ERROR, 'Could not query User-Group information' ,'' , __LINE__, __FILE__, $sql);
					}

					if( $db->sql_numrows($result) > 0 )
					{
						$personal_gallery_access['view'] = 1;
					}
				}
				break;
		}
	}

	return $personal_gallery_access;
}
//
// END function personal_gallery_access()
// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------
// Build up the array similar to $thiscat array
//
function init_personal_gallery_cat($user_id = 0)
{
	global $userdata, $db, $lang;

	if ($user_id == 0)
	{
		$user_id = $userdata['user_id'];
	}

	$sql = "SELECT COUNT(pic_id) AS count
			FROM ". ALBUM_TABLE ."
			WHERE pic_cat_id = ". PERSONAL_GALLERY ."
				AND pic_user_id = ". $user_id;

	if( !($result = $db->sql_query($sql)) )
	{
		mx_message_die(GENERAL_ERROR, 'Could not count pics for this personal gallery', '', __LINE__, __FILE__, $sql);
	}

	$row = $db->sql_fetchrow($result);

	$count = $row['count'];

	if ($user_id != $userdata['user_id'])
	{
		$sql = "SELECT user_id, username
				FROM ". USERS_TABLE ."
				WHERE user_id = $user_id";

		if( !($result = $db->sql_query($sql)) )
		{
			mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
		}

		$user_row = $db->sql_fetchrow($result);
		$username = $user_row['username'];
	}
	else
	{
		$username = $userdata['username'];
	}

	$thiscat = array(
		'cat_id' => 0,
		'cat_title' => sprintf($lang['Personal_Gallery_Of_User'], $username),
		'cat_desc' => '',
		'cat_order' => 0,
		'count' => $count,
		'cat_view_level' => $album_config['personal_gallery_view'],
		'cat_upload_level' => $album_config['personal_gallery'],
		'cat_rate_level' => $album_config['personal_gallery_view'],
		'cat_comment_level' => $album_config['personal_gallery_view'],
		'cat_edit_level' => $album_config['personal_gallery'],
		'cat_delete_level' => $album_config['personal_gallery'],
		'cat_view_groups' => $album_config['personal_gallery_private'],
		'cat_upload_groups' => $album_config['personal_gallery_private'],
		'cat_rate_groups' => $album_config['personal_gallery_private'],
		'cat_comment_groups' => $album_config['personal_gallery_private'],
		'cat_edit_groups' => $album_config['personal_gallery_private'],
		'cat_delete_groups' => $album_config['personal_gallery_private'],
		'cat_delete_groups' => $album_config['personal_gallery_private'],
		'cat_moderator_groups' => '',
		'cat_approval' => 0
	);

	return $thiscat;
}
//
// END function init_personal_gallery_cat()
// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------
// You must keep my copyright notice with its original content visible
// Do NOT modify anything!!!
function album_end()
{
	global $album_config;

	echo '<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Photo Album Addon 2' . $album_config['album_version'] . ' &copy; 2002, 2003 <a href="http://smartor.is-root.com" target="_blank">Smartor</a></div>';
}

//--- Multiple File Upload - BEGIN
// ----------------------------------------------------------------
// check if the file at index $index was uploaded
// ----------------------------------------------------------------
function was_file_uploaded($files_array, $index)
{
	if ( @phpversion() < '4.2.0' )
	{
		return ( (empty($files_array['tmp_name'][$index]) || $files_array['tmp_name'][$index] == 'none') || $files_array['size'][$index] == 0 ) ? false : true;
	}
	else
	{
		return ( ((empty($files_array['tmp_name'][$index]) || $files_array['tmp_name'][$index] == 'none') || $files_array['size'][$index] == 0) || $files_array['error'][$index] == 4) ? false : true;
	}
}

// ----------------------------------------------------------------
// check if the file has exceeded the maximum allowed file upload
// set in php.ini
// ----------------------------------------------------------------
function file_uploaded_exceeds_max_size($files_array, $index)
{
	// for some bizar reason I can't get the next few lines to work right 'error' is always = 0
	if (@phpversion() >= '4.2.0')
	{
		// UPLOAD_ERR_INI_SIZE == 1 (was first defined in 4.3.0, so 1 here instead)
		return ($files_array['error'][$index] == 1) ? true : false;
	}
	else
	{
		// earlier version of PHP (before 4.2.0) the error associated array didn't exist
		// so we need to TRY to check if the file was too big
		// the rule is the following (not fool proof):
		//
		// if 'name' isn't empty BUT 'tmp_name' and 'size' are empty (or for size = 0)
		// then we must have exceeded our max file size (or another error occured)
		return ( !empty($files_array['name'][$index]) && ( (empty($files_array['tmp_name'][$index]) || $files_array['tmp_name'][$index] == 'none') &&  $files_array['size'][$index] == 0 ) ) ? true : false;
	}
}

// ----------------------------------------------------------------
// generates a picture title, depending on the parameter supplied
// ----------------------------------------------------------------
function generate_picture_title($file_name, $pic_title, $pic_filetype)
{
	global $album_config;

	static $counter = 1;

	// if the user didn't supply a picture title then generate it from the
	// picture filename..and clean it up (remove trailing space, underscores and propercase it)
	if ( empty($pic_title) )
	{
		// remove file extension,
		// NOTE : were do a lowecase of the filename, to ensure that extension with in BIG or misc cApS get removed also
		$pic_title = str_replace($pic_filetype, '', strtolower($file_name));
		// remove underscores '_' and traling spaces
		$pic_title = trim(str_replace('_', ' ', $pic_title));

		if ($album_config['propercase_pic_title'] == 1)
		{
			// convert the first character in each word to upper case and the rest to lower case
			$pic_title = ucwords(strtolower($pic_title));
		}
		/*
		else
		{
			// convert only the first character in a string to upper case, the rest to lower case
			$pic_title = ucfirst(strtolower($pic_title));
		}
		*/
	}
	else
	{
		if ($album_config['propercase_pic_title'] == 1)
		{
			// convert the first character in each word to upper case and the rest to lower case
			$pic_title = ucwords(strtolower($pic_title));
		}
		/*
		else
		{
			// convert only the first character in a string to upper case, the rest to lower case
			$pic_title = ucfirst(strtolower($pic_title));
		}
		*/
		switch ($counter)
		{
			case ($counter < 10):
				$pic_title .= ' - 00' . $counter;
				break;
			case (($counter >= 10) && ($counter < 100)):
				$pic_title .= ' - 0' . $counter;
				break;
			default:
				$pic_title .= ' - ' . $counter;
				break;
		}
		$counter++;
	}

	return $pic_title;
}
//--- Multiple File Upload - END

function generate_single_pic_title($file_name, $pic_title, $pic_filetype)
{
	global $album_config;

	// if the user didn't supply a picture title then generate it from the
	// picture filename and clean it up (remove trailing space, underscores and propercase it)
	if ( empty($pic_title) )
	{
		// remove file extension,
		// NOTE : were do a lowecase of the filename, to ensure that extension with in BIG or misc cApS get removed also
		$pic_title = str_replace($pic_filetype, '', strtolower($file_name));
		// remove underscores '_' and traling spaces
		$pic_title = trim(str_replace('_', ' ', $pic_title));

		if ($album_config['propercase_pic_title'] == 1)
		{
			// convert the first character in each word to upper case and the rest to lower case
			$pic_title = ucwords(strtolower($pic_title));
		}
		/*
		else
		{
			// convert only the first character in a string to upper case, the rest to lower case
			$pic_title = ucfirst(strtolower($pic_title));
		}
		*/
	}
	else
	{
		if ($album_config['propercase_pic_title'] == 1)
		{
			// convert the first character in each word to upper case and the rest to lower case
			$pic_title = ucwords(strtolower($pic_title));
		}
		/*
		else
		{
			// convert only the first character in a string to upper case, the rest to lower case
			$pic_title = ucfirst(strtolower($pic_title));
		}
		*/
	}

	return $pic_title;
}

//to have smilies window popup
function generate_smilies_album($mode, $page_id) //borrowed from phpbbforums...modified to work with album
{
	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path, $mx_root_path;
	global $user_ip, $session_length, $starttime;
	global $userdata;
	// Vars needed for CH 2.1.4
	global $config, $user, $censored_words, $icons, $navigation, $themes, $smilies;

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

	if ($mode == 'window')
	{
		//$userdata = session_pagestart( $user_ip, $page_id );
		//init_userprefs( $userdata );

		$gen_simple_header = true;

		$page_title = "Smilies";

		if ( !$is_block)
 		{
			include($mx_root_path . 'includes/page_header.'.$phpEx);
 		}

		$template->set_filenames(array(
			'smiliesbody' => 'album_posting_smilies.tpl')
		);
	}

	$sql = "SELECT emoticon, code, smile_url
		FROM " . SMILIES_TABLE . "
		ORDER BY smilies_id";
	if ($result = $db->sql_query($sql))
	{
		$num_smilies = 0;
		$rowset = array();
		while ($row = $db->sql_fetchrow($result))
		{
			if (empty($rowset[$row['smile_url']]))
			{
				$rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
				$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
				$num_smilies++;
			}
		}

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

			$s_colspan = 0;
			$row = 0;
			$col = 0;

			while (list($smile_url, $data) = @each($rowset))
			{
				if (!$col)
				{
					$template->assign_block_vars('smilies_row', array());
				}

				$template->assign_block_vars('smilies_row.smilies_col', array(
					'SMILEY_CODE' => $data['code'],
					'SMILEY_IMG' => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smile_url,
					'SMILEY_DESC' => $data['emoticon'])
				);

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

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

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

				$template->assign_vars(array(
					'L_MORE_SMILIES' => $lang['More_emoticons'],
					'U_MORE_SMILIES' => mx_append_sid($phpbb_root_path . "posting.$phpEx?mode=smilies"))
				);
			}

			$template->assign_vars(array(
				'L_EMOTICONS' => $lang['Emoticons'],
				'L_CLOSE_WINDOW' => $lang['Close_window'],
				'S_SMILIES_COLSPAN' => $s_colspan)
			);
		}
	}

	if ($mode == 'window')
	{
		$template->pparse('smiliesbody');

		if ( !$is_block)
 		{
			include($mx_root_path . 'includes/page_tail.'.$phpEx);
 		}

	}
}

if (!function_exists(setFlag))
{
	function setFlag($flags, $flag)
	{
		return $flags | $flag;
	}
}

if (!function_exists(clearFlag))
{
	function clearFlag($flags, $flag)
	{
		return ($flags & ~$flag);
	}
}

if (!function_exists(checkFlag))
{
	function checkFlag($flags, $flag)
	{
		return (($flags & $flag) == $flag) ? true : false;
	}
}

function mx_album_assign_var_from_handle($varname, $handle)
	{
		if (!$this->loadfile($handle))
		{
			die("Template->assign_var_from_handle(): Couldn't load template file for handle $handle");
		}

		// Compile it, with the "no echo statements" option on.
		$_str = "";
		$code = $this->compile($this->uncompiled_code[$handle], true, '_str');

		// evaluate the variable assignment.
		eval($code);
		// assign the value of the generated variable to the given varname.
		$this->assign_var($varname, $_str);

		return true;
	}

function mx_album_uploadfilename($UploadFile) 
{
  $UploadFileNameTmp = explode(".", $UploadFile);
  $y = count($UploadFileNameTmp) - 1;
  $r = "";
  for ($a = 0; $y > $a; $a++) {
    $r .= ".".$UploadFileNameTmp[$a];
  }
  return $r;
}

function mx_album_uploadfiletype($UploadFile) 
{
  $UploadFileTypeTmp = explode(".", $UploadFile);

  $y = count($UploadFileTypeTmp) - 1;
  $r = $UploadFileTypeTmp[$y];;
  return $r;
}

// +------------------------------------------------------+
// |  Powered by Photo Album 2.x.x (c) 2002-2003 Smartor  |
// +------------------------------------------------------+

?>
--- NEW FILE: album_exif_info.php ---
<?php
/***************************************************************************
 *                           exif_info.php
 *                           ---------------
 *  begin     : 03/18/2005
 *  copyright : Pgh-Biker
 *  email     : 
 *
 *	version   : 1.0.0
 ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

// define('IN_PHPBB', true);
// $phpbb_root_path = './';
define('IN_PORTAL', true);
global $board_config;
function make_exif($xkey, $xval)
{
	global $board_config;
	$exif_info = array(
//		'FILE_FileName' => 'File Name',
		'FILE_FileDateTime' => 'File Date and Time',
		'FILE_FileSize' => array(
			'Name' => 'File Size',
			'Units'  => ' bytes'
		),
//		'FILE_MimeType' => 'Mime Type',
		'COMPUTED_Height' => array(
			'Name' => 'Image Height',
			'Units'  => ' pixels'
		),
		'COMPUTED_Width' => array(
			'Name' => 'Image Width',
			'Units' => ' pixels'
		),
		'COMPUTED_ApertureFNumber' => 'Aperture F Number',
		'COMPUTED_UserComment' => 'User Comment',
		'IFD0_ImageDescription' => 'Image Description',
		'IFD0_Make' => 'Camera Make (Manufacturer)',
		'IFD0_Model' => 'Camera Model',
		'IFD0_XResolution' => array(
			'Name' => 'X Resolution',
			'Units' => ' Pixels per'
		),
		'IFD0_YResolution' => array(
			'Name' => 'Y Resolution',
			'Units' => ' Pixels per'
		),
		'IFD0_ResolutionUnit' => array(
			'Name' => 'Resolution Unit',
			2 => ' Inch',
			3 => ' Centimeter'
		),
		'IFD0_Software' => 'Software or Firmware',
		'IFD0_Artist' => 'Artist',
		'IFD0_Copyright' => 'Copyright',
		'EXIF_ExposureTime' => array(
			'Name' => 'Exposure Time',
			'Units' => ' seconds'
		),
//		'EXIF_FNumber' => 'F Number',
		'EXIF_ExposureProgram' => array(
			'Name' => 'Exposure Program',
			0 => 'Not defined',
			1 => 'Manual',
			2 => 'Normal program',
			3 => 'Aperture priority',
			4 => 'Shutter priority',
			5 => 'Creative program (biased toward depth of field)',
			6 => 'Action program (biased toward fast shutter speed)',
			7 => 'Portrait mode (for closeup photos with the background out of focus)',
			8 => 'Landscape mode (for landscape photos with the background in focus)'
		),
		'EXIF_ISOSpeedRatings' => 'ISO Speed Ratings',
		'EXIF_DateTimeOriginal' => 'Date and Time of Original',
		'EXIF_DateTimeDigitized' => 'Date and Time when Digitized',
		'EXIF_ExposureBiasValue' => array(
			'Name' => 'APEX Exposure Bias Value',
			'Units' => ' EV'
		),
		'EXIF_MaxApertureValue' => 'APEX Maximum Aperture Value',
		'EXIF_MeteringMode' => array(
			'Name' => 'Metering Mode',
			0 => 'Unknown',
			1 => 'Average',
			2 => 'Center Weighted Average',
			3 => 'Spot',
			4 => 'Multi Spot',
			5 => 'Pattern',
			6 => 'Partial',
			255 => 'Other'
		),
		'EXIF_LightSource' => array(
			'Name' => 'Light Source',
			0 => 'Unknown',
			1 => 'Daylight',
			2 => 'Fluorescent',
			3 => 'Tungsten (incandescent light)',
			4 => 'Flash',
			9 => 'Fine weather',
			10 => 'Cloudy weather',
			11 => 'Shade',
			12 => 'Daylight fluorescent (D 5700  7100K)',
			13 => 'Day white fluorescent (N 4600  5400K)',
			14 => 'Cool white fluorescent (W 3900  4500K)',
			15 => 'White fluorescent (WW 3200  3700K)',
			17 => 'Standard light A',
			18 => 'Standard light B',
			19 => 'Standard light C',
			20 => 'D55',
			21 => 'D65',
			22 => 'D75',
			23 => 'D50',
			24 => 'ISO studio tungsten',
			255 => 'Other'
		),
		'EXIF_Flash' => array(
			'Name' => 'Flash Mode',
			0 => 'Flash did not fire',
			1 => 'Flash fired',
			5 => 'Strobe return light not detected',
			7 => 'Strobe return light detected',
			9 => 'Flash fired, compulsory flash mode',
			13 => 'Flash fired, compulsory flash mode, return light not detected',
			15 => 'Flash fired, compulsory flash mode, return light detected',
			16 => 'Flash did not fire, compulsory flash suppression mode',
			24 => 'Flash did not fire, auto mode',
			25 => 'Flash fired, auto mode',
			29 => 'Flash fired, auto mode, return light not detected',
			31 => 'Flash fired, auto mode, return light detected',
			32 => 'No flash function',
			65 => 'Flash fired, red-eye reduction mode',
			69 => 'Flash fired, red-eye reduction mode, return light not detected',
			71 => 'Flash fired, red-eye reduction mode, return light detected',
			73 => 'Flash fired, compulsory flash mode, red-eye reduction mode',
			77 => 'Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected',
			79 => 'Flash fired, compulsory flash mode, red-eye reduction mode, return light detected',
			89 => 'Flash fired, auto mode, red-eye reduction mode',
			93 => 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
			95 => 'Flash fired, auto mode, return light detected, red-eye reduction mode'
		),
		'EXIF_FocalLength' => array(
			'Name' => 'Focal Length',
			'Units' => 'mm'
		),
		'EXIF_SensingMethod' => array(
			'Name' => 'Sensing Method',
			1 => 'Not defined',
			2 => 'One-chip colour area sensor',
			3 => 'Two-chip colour area sensor',
			4 => 'Three-chip colour area sensor',
			5 => 'Colour sequential area sensor',
			7 => 'Trilinear sensor',
			8 => 'Colour sequential linear sensor'
		),
		'EXIF_CustomRendered' => array(
			'Name' => 'Custom Renderd Mode',
			0 => 'Normal Process',
			1 => 'Custom Process',
		),
		'EXIF_ExposureMode' => array(
			'Name' => 'Exposure Mode',
			0 => 'Auto exposure',
			1 => 'Manual exposure',
			2 => 'Auto bracket'
		),
		'EXIF_WhiteBalance' => array(
			'Name' => 'White Balance',
			0 => 'Auto white balance',
			1 => 'Manual white balance'
		),
		'EXIF_DigitalZoomRatio' => array(
			'Name' => 'Digital Zoom Ratio',
			'Units' => ' ( Zero = Digital Zoom Not Used )'
		),
		'EXIF_FocalLengthIn35mmFilm' => array(
			'Name' => 'Equivalent Focal Length In 35mm Film',
			'Units' => 'mm'
		),
		'EXIF_SceneCaptureType' => array(
			'Name' => 'Scene Capture Type',
			0 => 'Standard',
			1 => 'Landscape',
			2 => 'Portrait',
			3 => 'Night scene'
		),
		'EXIF_GainControl' => array(
			'Name' => 'Gain Control',
			0 => 'None',
			1 => 'Low gain up',
			2 => 'High gain up',
			3 => 'Low gain down',
			4 => 'High gain down'
		),
		'EXIF_Contrast' => array(
			'Name' => 'Contrast',
			0 => 'Normal',
			1 => 'Soft',
			2 => 'Hard'
		),
		'EXIF_Saturation' => array(
			'Name' => 'Saturation',
			0 => 'Normal',
			1 => 'Low saturation',
			2 => 'High saturation'
		),
		'EXIF_Sharpness' => array(
			'Name' => 'Sharpness',
			0 => 'Normal',
			1 => 'Soft',
			2 => 'Hard'
		),
		'EXIF_SubjectDistanceRange' => array(
			'Name' => 'Subject Distance Range',
			0 => 'Unknown',
			1 => 'Macro',
			2 => 'Close view',
			3 => 'Distant view'
		),
	);

	$i = 0;
	$rexif = array();

	while (!empty($xkey[$i]) )
	{
		if ( ereg("([0-9]{1,})/([0-9]{1,})", $xval[$i], $num) )
		{
			if ( $num[1] > 1 ) $xval[$i] = round( ($num[1] / $num[2]), 6);
		}
		if ( is_array($exif_info[$xkey[$i]]) && $xkey[$i] != 'IFD0_ResolutionUnit' )
		{
			if ( isset($exif_info[$xkey[$i]]['Units']) )
			{
				if ( $xkey[$i+2] == 'IFD0_ResolutionUnit' )
				{
					$rexif[$exif_info[$xkey[$i]]['Name']] = ($xval[$i] . $exif_info[$xkey[$i]]['Units'] . $exif_info[$xkey[$i+2]][$xval[$i+2]]);
				}
				else if ( $xkey[$i+1] == 'IFD0_ResolutionUnit' )
				{
					$rexif[$exif_info[$xkey[$i]]['Name']] = ($xval[$i] . $exif_info[$xkey[$i]]['Units'] . $exif_info[$xkey[$i+1]][$xval[$i+1]]);
				}
				else
				{
					$rexif[$exif_info[$xkey[$i]]['Name']] = ($xval[$i] . $exif_info[$xkey[$i]]['Units']);
				}
			}
			else
			{
				$rexif[$exif_info[$xkey[$i]]['Name']] = $exif_info[$xkey[$i]][$xval[$i]];
			}
		}
		else if ( isset($exif_info[$xkey[$i]]) && $xkey[$i] != 'IFD0_ResolutionUnit' )
		{
			$rexif[$exif_info[$xkey[$i]]] = $xval[$i];
			if ( $xkey[$i] == 'FILE_FileDateTime' )
			{
				$rexif[$exif_info[$xkey[$i]]] = create_date('Y:m:d H:i:s',  $xval[$i], $board_config['board_timezone']);
			}
		}
		$i++;
	}
	return $rexif;
}

$template->assign_block_vars('switch_exif_enabled.exif_switch', array());
$i = 0;
$xkey = array();
$xval = array();

while (list($xk1,$xv1) = each($xif))
{
	$xkey[$i] = $xk1;
	$xval[$i] = $xv1;
	if (is_array($xif[$xk1]))
	{
		while (list($xk2,$xv2) = each($xif[$xk1]))
		{
			$xkey[$i] = $xk1.'_'.$xk2;
			$xval[$i] = $xv2;
			$i++;
		}
	}
	else
	{
		$i++;
	}
}

$exif = make_exif($xkey, $xval);
$i = 0;
$key = array();
$val = array();

while (list($k1,$v1) = each($exif))
{
	$key[$i] = $k1;
	$val[$i] = $v1;
	$i++;
}

$x = intval(($i/2)+.5);

for ($n = 0; $n < $x; $n++)
{
	$template->assign_block_vars('switch_exif_enabled.exif_switch.exif_data', array(
		'EXIFc1' => (!empty($key[$n])) ? $key[$n].':' : '',
		'EXIFd1' => '&nbsp;'.$val[$n],
		'EXIFc2' => (!empty($key[$n+$x])) ? $key[$n+$x].':' : '',
		'EXIFd2' => '&nbsp;'.$val[$n+$x]
		)
	);
}

?>
--- NEW FILE: album_hierarchy_auth.php ---
<?php
/***************************************************************************
 *                          album_hierarchy_auth.php
 *                          ------------------------------------------------
 *     begin                : Friday, June 12, 2004
 *     copyright            : (C) 2004 IdleVoid
 *     email                : idl...@sl...
 *     file version         : 1.0.7
 *     release              : 1.3.0
 ****************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

/***************************************************************************
 *
 * This mod is strongly based on the Forum Hiearchy Category Mod by Ptirhiik
 * Alot of credit goes to Ptirhiik
 * And some small part of this code is copyrighted by Ptirhiik.
 *
 ***************************************************************************/

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

// Album Data Structure description
// indexes :
// - id  : the category id : ie ALBUM_ROOT_CATEGORY, 1, 20, 12 and so on
// - idx : array index
// $album_data['keys'][id]			=> idx, returns the key value for the sub, parent, id and data array
// $album_data['auth'][id]			=> auth_value array : ie album_tree_data['auth'][id]['auth_view'],
// $album_data['sub'][id]			=> array of sub-level ids,
// $album_data['parent'][idx]		=> parent id,
// $album_data['id'][idx]			=> value of the row id : cat_id for cats
// $album_data['personal'][idx]		=> list of db table row which indicated if it's personal category,
// $album_data['data'][idx]			=> db table row,
// --------------------------------------------------------------------------------------------------

// ------------------------------------------------------------------------
// generate the album category hierarchy
// authentication data for the tree
// ------------------------------------------------------------------------
function album_create_user_auth($user_id)
{
	global $album_data;

	// read the user auth if requiered
	if (empty ($album_data['auth']))
	{
		$album_data['auth'] = array ();

		for ($idx = 0; $idx < count($album_data['data']); $idx ++)
		{
			$cat = $album_data['data'][$idx];
			$cat_id = $cat['cat_id'];

			// check all access rights for current user
			//$album_user_access = album_user_access($cat_id, $cat, 1, 1, 1, 1, 1, 1);
			$album_user_access = album_permissions($user_id, $cat_id, ALBUM_AUTH_ALL, $cat);
			if (!empty ($album_user_access))
			{
				reset($album_user_access);
				while (list ($key, $data) = each($album_user_access))
				{
					$album_data['auth'][$cat_id][$key] = $data;
				}
			}
		}
	}

	return $album_data['auth'];
}

// ------------------------------------------------------------------------
// Builds the array of authentication row ids
// where authentication means where $auth_key was
// fullfiled
// ------------------------------------------------------------------------
// Authentication data structure
//
// - id  : the category id : ie ALBUM_ROOT_CATEGORY, 1, 20, 12 and so on
// - auth_id  : array index
// - idx : array in the album_data array structure
//
// $keys['keys'][id]				=> returns ,
// $keys['id'][auth_id]				=> id (used by $album_data ),
// $keys['real_level'][auth_id]		=> level in this auth-tree (root=-1),
// $keys['level'][auth_id]			=> level adjust for display (sub-level=parent level under certain conditions)
// $keys['idx'][auth_id]			=> idx (used by $album_data)
// --------------------------------------------------------------------------------------------------
function album_get_auth_keys($cur_cat_id = ALBUM_ROOT_CATEGORY, $auth_key = ALBUM_AUTH_VIEW, $all = false, $level = -1, $max = -1)
{
	global $album_data, $album_config;

	$keys = array ();
	$last_i = -1;

	/*
	if ($album_config['album_debug_mode'] != '0')
	{
		// define('ALBUM_HIERARCHY_DEBUG_ENABLED', true);
	}
	else
	{
		// define('ALBUM_HIERARCHY_DEBUG_ENABLED', false);
	}
	*/

	// add the level
	if ( ($max < ALBUM_ROOT_CATEGORY + 1) || ($level < $max) || (($level == $max) && ($album_data['parent'][$album_data['keys'][$cur_cat_id]] == ALBUM_ROOT_CATEGORY)) )
	{
		if ($cur_cat_id == ALBUM_ROOT_CATEGORY || album_check_permission($album_data['auth'][$cur_cat_id], $auth_key) || $all)
		{
			// if child of cat, align the level on the parent one
			$orig_level = $level;

			// store this level
			$last_i ++;

			$keys['keys'][$cur_cat_id] = $last_i;
			$keys['id'][$last_i] = $cur_cat_id;
			$keys['real_level'][$last_i] = $orig_level;
			$keys['level'][$last_i] = $level;
			$keys['idx'][$last_i] = (isset ($album_data['keys'][$cur_cat_id]) ? $album_data['keys'][$cur_cat_id] : ALBUM_ROOT_CATEGORY);

			// get sub-levels
			for ($i = 0; $i < count($album_data['sub'][$cur_cat_id]); $i ++)
			{
				$subkeys = array ();
				$subkeys = album_get_auth_keys($album_data['sub'][$cur_cat_id][$i], $auth_key, $all, $orig_level +1, $max);

				// add sub-levels
				for ($j = 0; $j < count($subkeys['id']); $j ++)
				{
					$last_i ++;
					$keys['keys'][$subkeys['id'][$j]] = $last_i;
					$keys['id'][$last_i] = $subkeys['id'][$j];
					$keys['real_level'][$last_i] = $subkeys['real_level'][$j];
					$keys['level'][$last_i] = $subkeys['level'][$j];
					$keys['idx'][$last_i] = $subkeys['idx'][$j];
				} // for( $j = 0.....
			} // for($i = 0.....
		} // if ($cur_cat_id == ALBUM_ROOT....
	} // if (($max < 0 .....

	//if ($level <= ALBUM_ROOT_CATEGORY && ALBUM_HIERARCHY_DEBUG_ENABLED == true)
	if ($level <= ALBUM_ROOT_CATEGORY && $album_config['album_debug_mode'] != '0')
	{
		album_debug('album_get_auth_keys = %s', $keys);
	}

	return $keys;
}

// ------------------------------------------------------------------------
// Check the permissions for public and personal galleries
// If we are checking a personal gallery and it doesn't exists
// the function will then validate it by calling 'personal_gallery_access'
// if the gallery exists or its a public gallery then we use the code in
// album_user_access. After these calls, some more checks are done in this
// function.
// ------------------------------------------------------------------------
function album_permissions($user_id, $cat_id, $permission_checks, $catdata = 0)
{
	global $db, $lang, $userdata, $album_config, $album_data;

	$moderator_check = 1;

	if (album_is_debug_enabled() == true)
	{
		if (!defined('ALBUM_AUTH_VIEW') || !defined('ALBUM_AUTH_UPLOAD') || !defined('ALBUM_AUTH_DELETE') )
		{
			album_debug("album_permissions : The defined authentication constants are NOT found !!!");
		}
	}

	$view_check = (int) checkFlag($permission_checks, ALBUM_AUTH_VIEW);
	$upload_check = (int) checkFlag($permission_checks, ALBUM_AUTH_UPLOAD);
	$rate_check = (int) checkFlag($permission_checks, ALBUM_AUTH_RATE);
	$comment_check = (int) checkFlag($permission_checks, ALBUM_AUTH_COMMENT);
	$edit_check = (int) checkFlag($permission_checks, ALBUM_AUTH_EDIT);
	$delete_check = (int) checkFlag($permission_checks, ALBUM_AUTH_DELETE);

	// ------------------------------------------------------------------------
	// if we are checkinfg the personal gallery cateogry management permission
	// we need to do these also : view and upload
	// ------------------------------------------------------------------------
	if ( checkFlag($permission_checks, ALBUM_AUTH_MANAGE_PERSONAL_CATEGORIES) == true)
	{
		$view_check = 1;
		$upload_check = 1;
	}

	// ------------------------------------------------------------------------
	// did we pass some category data or not ?
	// ------------------------------------------------------------------------
	if (!is_array($catdata))
	{
		$sql = "SELECT *
				FROM ". ALBUM_CAT_TABLE ."
				WHERE cat_id = '$cat_id'";

		if( !$result = $db->sql_query($sql) )
		{
			mx_message_die(GENERAL_ERROR, 'Could not query Album Category information for authentication' ,'' , __LINE__, __FILE__, $sql);
		}

		// ------------------------------------------------------------------------
		// did we find the category or not ?
		// ------------------------------------------------------------------------
		if ($db->sql_numrows($result) == 0)
		{
			// ------------------------------------------------------------------------
			// is it a personal gallery ?
			// ------------------------------------------------------------------------
			if ($user_id != ALBUM_PUBLIC_GALLERY)
			{
				$AH_thiscat = init_personal_gallery_cat($user_id);
				$album_permission = personal_gallery_access(1,1); //$view_check, $upload_check);
			}
			else
			{
				mx_message_die(GENERAL_ERROR, $lang['Category_not_exist'] ,'' , __LINE__, __FILE__, $sql);
			}
		}
		else
		{
			$AH_thiscat = $db->sql_fetchrow($result);
		}
	}
	else
	{
		$AH_thiscat = $catdata;

		// ------------------------------------------------------------------------
		// it is the root category of a non existing personal gallery
		// ------------------------------------------------------------------------
		if ($AH_thiscat['cat_user_id'] != 0 && $AH_thiscat['cat_id'] == 0)
		{
			$album_permission = personal_gallery_access(1,1); //$view_check, $upload_check);
		}
	}

	// ------------------------------------------------------------------------
	// if we set our $AH_thiscat and not our permission array then we must
	// authenticate it
	// ------------------------------------------------------------------------
	if (album_is_debug_enabled() == true)
	{
		album_debug('album_permissions : before album_user_access : %s(id=%d), $album_permission = %s',$AH_thiscat['cat_title'],$AH_thiscat['cat_id'], $album_permission);
	}
	if (empty($album_permission))
	{
		$album_permission = personal_gallery_access(1,1); //$view_check, $upload_check);
	}

	if (!empty($AH_thiscat) && !is_array($album_permission))
	{
		$album_permission = album_user_access($cat_id, $AH_thiscat, $view_check, $upload_check, $rate_check, $comment_check, $edit_check, $delete_check);
	}

	if (album_is_debug_enabled() == true)
	{
		album_debug('album_permissions : after album_user_access : %s(id=%d), $album_permission = %s',$AH_thiscat['cat_title'],$AH_thiscat['cat_id'], $album_permission);
	}
	// ------------------------------------------------------------------------
	// as default nobody can manage the galleries (personal galleries that is)
	// check is done later, but only for personal galleries, so its not possible
	// to manage the categories in the public galleries, only in the ACP
	// ------------------------------------------------------------------------
	$album_permission['manage'] = 0;

	// ------------------------------------------------------------------------
	// $album_permission should now hold our permission stuff for either a personal
	// gallery or a public gallery.
	// lets now do some more authentication for the personal galleries
	// ------------------------------------------------------------------------
	if ($AH_thiscat['cat_user_id'] != 0)
	{
		if (album_is_debug_enabled() == true)
		{
			album_Debug('$album_config[\'personal_gallery\'] = %d', $album_config['personal_gallery']);
		}

		switch ($album_config['personal_gallery'])
		{
			case ALBUM_USER:
				// ------------------------------------------------------------------------
				// are we checking a non existing personal gallery ?
				// ------------------------------------------------------------------------
				if (empty($AH_thiscat) || $AH_thiscat['cat_id'] == 0 || $cat_id == ALBUM_ROOT_CATEGORY)
				{
					// ------------------------------------------------------------------------
					// if the admin has set the creation of personal galleries to 'registered users'
					// then filter out all other users then the current logged in user (and NON ADMIN)
					// ------------------------------------------------------------------------
					if ($userdata['user_id'] != $AH_thiscat['cat_user_id'] && $userdata['user_level'] != ADMIN)
					{
						$album_permission['upload'] = 0;
					}
					// ------------------------------------------------------------------------
					// set the other permissions to the same value of the upload
					// for this non exsting personal gallery,
					// ------------------------------------------------------------------------
					$album_permission['rate'] = $album_permission['upload'];
					$album_permission['edit'] = $album_permission['upload'];
					$album_permission['delete'] = $album_permission['upload'];
					$album_permission['comment'] = $album_permission['upload'];
				}
				break;
			case ALBUM_ADMIN:
				// ------------------------------------------------------------------------
				// Only admins can upload images to users personal gallery
				// ------------------------------------------------------------------------
				if ($userdata['user_level'] != ADMIN)
				{
					$album_permission['upload'] = 0;
				}
				break;
			default:
				// NOTHING;
		}

		// ------------------------------------------------------------------------
			// we need to check the upload permission again to full fill all the
			// permission criterias
			// ------------------------------------------------------------------------
			switch ($AH_thiscat['cat_upload_level'])
			{
				case ALBUM_PRIVATE:
					// ------------------------------------------------------------------------
					// make sure the owner of the personal gallery can upload to his personal ...

[truncated message content]
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21865/includes

Modified Files:
      Tag: core28x
	album_constants.php 
Log Message:
upgrade to 2.0.1 gold

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/Attic/album_constants.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** album_constants.php	13 Mar 2008 03:26:35 -0000	1.1.2.2
--- album_constants.php	13 Mar 2008 03:29:49 -0000	1.1.2.3
***************
*** 30,34 ****
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! $mx_user->extend(MX_LANG_NONE, MX_IMAGES);

  // Album Tables
--- 30,35 ----
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! //$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

  // Album Tables

Update of /cvsroot/mxbb/mx_smartor/album_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21865

Modified Files:
      Tag: core28x
	album_common.php 
Log Message:
upgrade to 2.0.1 gold

Index: album_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.9
diff -C2 -d -r1.19.2.8 -r1.19.2.9
*** album_common.php	13 Mar 2008 03:26:33 -0000	1.19.2.8
--- album_common.php	13 Mar 2008 03:29:46 -0000	1.19.2.9
***************
*** 26,36 ****
  include_once($album_root_path . 'includes/album_constants.'.$phpEx);

- 
- // **********************************************************************
- //  Read main language definition and theme images definition
- // **********************************************************************
- $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
- $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);
- 
  // Cache settings
  $use_cache = 1;
--- 26,29 ----

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13297/album_mod/modules

Modified Files:
      Tag: core28x
	album_cat.php album_cat_sort.php album_comment.php 
	album_comment_delete.php album_comment_edit.php 
	album_delete.php album_download.php album_edit.php 
	album_hotornot.php album_jupload.php album_memberlist.php 
	album_modcp.php album_otf.php album_otf_thumbnail.php 
	album_page.php album_pclzip_lib.php album_personal.php 
	album_personal_cat_admin.php album_personal_index.php 
	album_personal_old.php album_personal_random.php album_pic.php 
	album_picm.php album_rate.php album_rdf.php album_rss.php 
	album_search.php album_showpage.php album_thumbnail.php 
	album_upload.php 
Log Message:
upgrade to 2.0.1 gold

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13297/album_mod/includes

Modified Files:
      Tag: core28x
	album_bbcode.php album_constants.php album_functions.php 
	album_hierarchy_functions.php album_hierarchy_sql.php 
	album_integration.php album_nuffimage_box.php 
	clown_album_functions.php 
Log Message:
upgrade to 2.0.1 gold

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

Modified Files:
      Tag: core28x
	_core.cfg 
Log Message:
upgrade to 2.0.1 gold

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

Modified Files:
      Tag: core28x
	admin_album_auth.php admin_album_cat.php admin_album_cfg.php 
	admin_album_clearcache.php admin_album_clown_SP.php 
	admin_album_config_personal.php admin_album_ext.php 
	admin_album_personal.php 
Log Message:
upgrade to 2.0.1 gold

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

Modified Files:
      Tag: core28x
	lang_admin.php 
Log Message:
upgrade to 2.0.1 gold

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

Modified Files:
      Tag: core28x
	album.php album_lists.php db_install.php db_uninstall.php 
	db_upgrade.php hierarchy_db_migrate.php mx_install_readme.htm 
	welcome.php 
Log Message:
upgrade to 2.0.1 gold

Index: album.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album.php,v
retrieving revision 1.17.2.8
retrieving revision 1.17.2.9
diff -C2 -d -r1.17.2.8 -r1.17.2.9
*** album.php	12 Mar 2008 22:25:43 -0000	1.17.2.8
--- album.php	13 Mar 2008 03:26:14 -0000	1.17.2.9
***************
*** 34,83 ****
  //ini_set('display_errors', '1');

! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
! 	define('IN_PORTAL', true);
! 	$mx_root_path = '../../';
! 	$module_root_path = './';

  	//
! 	// Let's include some stuff...
  	//
! 	$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($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id'];
! 	if( empty($block_id) )
  	{
! 		$sql = "SELECT * FROM " . BLOCK_TABLE . "  WHERE block_title = 'Smartor_album' LIMIT 1";
! 		if(!$result = $db->sql_query($sql))
  		{
! 			mx_message_die(GENERAL_ERROR, "Could not query Smartor_Album module information", "", __LINE__, __FILE__, $sql);
  		}
! 		$row = $db->sql_fetchrow($result);
! 		$block_id = $row['block_id'];
  	}
- 	$is_block = FALSE;
  }
  else
  {
! 	//
! 	// Read block Configuration
! 	$title = $mx_block->block_info['block_title'];
! 	$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' );

! 	$is_block = true;	
! 	  
!   	global $images, $is_block;
! }

! if (empty($album_root_path))
! {
! 	$album_root_path = $module_root_path . 'album_mod/';
  }

--- 34,208 ----
  //ini_set('display_errors', '1');

! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( !defined('PORTAL_BACKEND') && @file_exists( './viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	include($phpbb_root_path . 'common.' . $phpEx);
! 	include($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './';
! 		@define('IN_PORTAL', true);
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	else
! 	{
! 		@define('IN_PORTAL', true);
! 		include_once($mx_root_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_root_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 
! 		//Redefine mx_root_path to include phpbb page_tail.php
! 		$mx_root_path = $phpbb_root_path;
! 	}
! 	
! 	require($mx_mod_path . "includes/functions_core.$phpEx");
! 	require($mx_mod_path . "includes/functions_styles.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_KB', -502 ); // 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();
! 	
! 	//
! 	// Page selector
! 	//
! 	$page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
! 
! 	$is_block = false;
! 	
! 	//
! 	// instatiate the mx_user class
! 	//
! 	$mx_user = new mx_user();
! 
! 	if (file_exists("./modcp.$phpEx")) // phpBB2
  	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 		
! 		//
! 		// Start user session
! 		// - populate $userdata and $lang
! 		//
! 		$mx_user->init($user_ip, $page_id, false);
! 		//init_userprefs($userdata);
! 		$mx_user->init_style(); //Overwrite template class
! 
! 		/*
! 		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! 		if (!$userdata['user_level'] == ADMIN)
  		{
! 			die('Only admins may run this script!!!');
  		}
! 		*/
! 		include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
! 		include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
! 		
! 	}
! 	else if (@file_exists("./mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 		
! 		//
! 		// Start user session
! 		// - populate $userdata and $lang
! 		//
! 		$mx_user->init($user_ip, $page_id, false);
! 		$user->setup();
! 		//
! 		// End session management
! 		//
! 
! 		/*
! 		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! 		if ($userdata['user_type'] != USER_FOUNDER)
! 		{
! 			die('Only admins may run this script!!!');
! 		}
! 		*/
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/bbcode.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions_post.$phpEx");
! 	}
! 	else
! 	{
! 		die('Copy this file in phpbb_root_path were is your viewtopic.php file!!!');
  	}
  }
  else
  {
! 	if( !defined('IN_PORTAL') || !is_object($mx_block))
! 	{
! 		define('IN_PORTAL', true);
! 		$mx_root_path = '../../';
! 		$module_root_path = './';

! 		//
! 		// Let's include some stuff...
! 		//
! 		$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($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id'];
! 		if( empty($block_id) )
! 		{
! 			$sql = "SELECT * FROM " . BLOCK_TABLE . "  WHERE block_title = 'Smartor_album' LIMIT 1";
! 			if(!$result = $db->sql_query($sql))
! 			{
! 				mx_message_die(GENERAL_ERROR, "Could not query Smartor_Album module information", "", __LINE__, __FILE__, $sql);
! 			}
! 			$row = $db->sql_fetchrow($result);
! 			$block_id = $row['block_id'];
! 		}
! 		$is_block = FALSE;
! 	}
! 	else
! 	{
! 		//
! 		// Read block Configuration
! 		$title = $mx_block->block_info['block_title'];
! 		$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' );

! 		$is_block = true;	
! 		  
! 	  	global $images, $is_block;
! 	}
  }

***************
*** 85,88 ****
--- 210,214 ----
  // Get general album information
  //
+ $album_root_path = $module_root_path . 'album_mod/';
  include($album_root_path . 'album_common.'.$phpEx);

Update of /cvsroot/mxbb/mx_smartor/album_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13297/album_mod

Modified Files:
      Tag: core28x
	album_bbconstants.php album_common.php 
Log Message:
upgrade to 2.0.1 gold

Index: album_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -C2 -d -r1.19.2.7 -r1.19.2.8
*** album_common.php	12 Mar 2008 22:36:59 -0000	1.19.2.7
--- album_common.php	13 Mar 2008 03:26:33 -0000	1.19.2.8
***************
*** 30,34 ****
  //  Read main language definition and theme images definition
  // **********************************************************************
! //$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

--- 30,34 ----
  //  Read main language definition and theme images definition
  // **********************************************************************
! $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19578

Modified Files:
	functions_tools.php 
Log Message:
<b> -> [b] in mx_mod

Index: functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes/functions_tools.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** functions_tools.php	12 Mar 2008 23:11:23 -0000	1.2
--- functions_tools.php	13 Mar 2008 00:43:08 -0000	1.3
***************
*** 2036,2052 ****
  			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);

! 			$this->auto_message = "<br />[b]" . $this->langs['item_title'] . ":[/b] " . $this->data['item_title'] . "<br />";
! 			$this->auto_message .= "[b]" . $this->langs['author'] . ":[/b] " . $this->data['item_author'] . "<br />";
! 			$this->auto_message .= "[b]" . $this->langs['item_description'] . ":</b> [i]" . $this->data['item_desc'] . "[/i]<br />";
! 
! 			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= "<br />[b][URL=" . $this->temp_url . "]" . $this->langs['read_full_item'] . "[/URL][/b]";
  			}

! 			//
! 			// Update message
! 			//
! 			$this->auto_message_update = "<br /><i>" . $this->langs['edited_item_info'] . $this->data['item_editor'] . "</i>" . "<br />";

  			//
--- 2036,2070 ----
  			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);

! 			if (!$this->html_on) 
  			{
! 				$this->auto_message = "\n[b]" . $this->langs['item_title'] . ":[/b] " . $this->data['item_title'] . "\n";
! 				$this->auto_message .= "[b]" . $this->langs['author'] . ":[/b] " . $this->data['item_author'] . "\n";
! 				$this->auto_message .= "[b]" . $this->langs['item_description'] . ":[/b] [i]" . $this->data['item_desc'] . "[/i]\n";
! 
! 				if ($action != MX_DELETED_NOTIFICATION)
! 				{
! 					$this->auto_message .= "\n[b][URL=" . $this->temp_url . "]" . $this->langs['read_full_item'] . "[/URL][/b]";
! 				}
! 				//
! 				// Update message
! 				//
! 				$this->auto_message_update = "\n[i]" . $this->langs['edited_item_info'] . $this->data['item_editor'] . "[/i]" . "\n";
  			}
+ 			else
+ 			{
+ 				$this->auto_message = "<br /><b>" . $this->langs['item_title'] . ":</b> " . $this->data['item_title'] . "<br />";
+ 				$this->auto_message .= "<b>" . $this->langs['author'] . ":</b> " . $this->data['item_author'] . "<br />";
+ 				$this->auto_message .= "<b>" . $this->langs['item_description'] . ":</b> <i>" . $this->data['item_desc'] . "</i><br />";

! 				if ($action != MX_DELETED_NOTIFICATION)
! 				{
! 					$this->auto_message .= "<br /><b><a href=\"" . $this->temp_url . "\">" . $this->langs['read_full_item'] . "</a></b>";
! 				}
! 
! 				//
! 				// Update message
! 				//
! 				$this->auto_message_update = "<br /><i>" . $this->langs['edited_item_info'] . $this->data['item_editor'] . "</i>" . "<br />";
! 			}

  			//

Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14605

Modified Files:
	functions_tools.php 
Log Message:
<b> -> [b] in mx_mod

Index: functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes/functions_tools.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions_tools.php	10 Mar 2008 06:02:26 -0000	1.1
--- functions_tools.php	12 Mar 2008 23:11:23 -0000	1.2
***************
*** 2036,2046 ****
  			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);

! 			$this->auto_message = "<br /><b>" . $this->langs['item_title'] . ":</b> " . $this->data['item_title'] . "<br />";
! 			$this->auto_message .= "<b>" . $this->langs['author'] . ":</b> " . $this->data['item_author'] . "<br />";
! 			$this->auto_message .= "<b>" . $this->langs['item_description'] . ":</b> <i>" . $this->data['item_desc'] . "</i><br />";

  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= "<br /><b><a href=\"" . $this->temp_url . "\">" . $this->langs['read_full_item'] . "</a></b>";
  			}

--- 2036,2046 ----
  			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);

! 			$this->auto_message = "<br />[b]" . $this->langs['item_title'] . ":[/b] " . $this->data['item_title'] . "<br />";
! 			$this->auto_message .= "[b]" . $this->langs['author'] . ":[/b] " . $this->data['item_author'] . "<br />";
! 			$this->auto_message .= "[b]" . $this->langs['item_description'] . ":</b> [i]" . $this->data['item_desc'] . "[/i]<br />";

  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= "<br />[b][URL=" . $this->temp_url . "]" . $this->langs['read_full_item'] . "[/URL][/b]";
  			}

Update of /cvsroot/mxbb/mx_smartor/album_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24565

Modified Files:
      Tag: core28x
	album_common.php 
Log Message:
upgrade to 2.0.1 gold

Index: album_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v
retrieving revision 1.19.2.6
retrieving revision 1.19.2.7
diff -C2 -d -r1.19.2.6 -r1.19.2.7
*** album_common.php	12 Mar 2008 22:25:51 -0000	1.19.2.6
--- album_common.php	12 Mar 2008 22:36:59 -0000	1.19.2.7
***************
*** 30,34 ****
  //  Read main language definition and theme images definition
  // **********************************************************************
! $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

--- 30,34 ----
  //  Read main language definition and theme images definition
  // **********************************************************************
! //$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

Update of /cvsroot/mxbb/mx_smartor/templates/_core/images/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23033/templates/_core/images/lang_english

Added Files:
      Tag: core28x
	download.gif download_all.gif guest_avatar.png icon_album.gif 
	index.htm jupload_pic.gif manage_pic.gif normal_view.gif 
	show_all_comments.gif show_all_pics.gif show_all_ratings.gif 
	showall.gif simple_view.gif upload_pic.gif upload_pic_2.gif 
Log Message:
upgrade to 2.0.1 gold

--- NEW FILE: show_all_ratings.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: normal_view.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: manage_pic.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: guest_avatar.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: show_all_comments.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: upload_pic_2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: download_all.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jupload_pic.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: download.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: simple_view.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: show_all_pics.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_album.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: showall.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: upload_pic.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

Update of /cvsroot/mxbb/mx_smartor/templates/_core/images
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23033/templates/_core/images

Added Files:
      Tag: core28x
	Thumbs.db blue_dot.png default_avatar.png green_dot.png 
	icon_dot.gif icon_left_arrow.gif icon_left_arrow2.gif 
	icon_left_arrow3.gif icon_mini_album.gif 
	icon_mini_album_13x13.gif icon_mini_showall.gif 
	icon_minipost_new.gif icon_right_arrow.gif 
	icon_right_arrow2.gif icon_right_arrow3.gif index.htm 
	nothumbnail.jpg orange_dot.png spacer.gif yellow_dot.png 
Log Message:
upgrade to 2.0.1 gold

--- NEW FILE: icon_left_arrow.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mini_album_13x13.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Thumbs.db ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: yellow_dot.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nothumbnail.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mini_album.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_right_arrow2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_left_arrow3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mini_showall.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: green_dot.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: blue_dot.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_right_arrow.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: orange_dot.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: default_avatar.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_left_arrow2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_right_arrow3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

--- NEW FILE: icon_minipost_new.gif ---
(This appears to be a binary file; contents omitted.)

2005	Jan	Feb	Mar (95)	Apr (270)	May (111)	Jun	Jul	Aug (64)	Sep (130)	Oct (319)	Nov (17)	Dec (191)
2006	Jan (53)	Feb	Mar	Apr	May (6)	Jun (387)	Jul (102)	Aug (247)	Sep (120)	Oct (1)	Nov (8)	Dec (21)
2007	Jan (38)	Feb (36)	Mar	Apr (32)	May (135)	Jun (523)	Jul (192)	Aug (103)	Sep (533)	Oct (77)	Nov (23)	Dec (203)
2008	Jan (312)	Feb (1193)	Mar (404)	Apr (67)	May (62)	Jun (497)	Jul (297)	Aug (110)	Sep (335)	Oct (256)	Nov (50)	Dec (118)
2009	Jan (67)	Feb (10)	Mar (1)	Apr (1)	May	Jun (10)	Jul (61)	Aug	Sep (16)	Oct (45)	Nov (12)	Dec (14)
2010	Jan (30)	Feb	Mar	Apr (4)	May	Jun	Jul (7)	Aug (7)	Sep (5)	Oct (5)	Nov	Dec
2011	Jan (7)	Feb (3)	Mar (89)	Apr (11)	May (5)	Jun	Jul (8)	Aug (1)	Sep (2)	Oct	Nov (2)	Dec (89)
2012	Jan (7)	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug (4)	Sep (3)	Oct (42)	Nov (1)	Dec
2013	Jan	Feb	Mar (19)	Apr (90)	May (38)	Jun (235)	Jul (38)	Aug (10)	Sep	Oct (29)	Nov	Dec
2014	Jan	Feb	Mar	Apr (6)	May (52)	Jun	Jul (7)	Aug	Sep (17)	Oct	Nov	Dec

mxbb-commits Mailing List for MX-Publisher (Page 124)

mxbb-commits — Internal Mailing List for CVS Commit Messages