mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] mx_phpbb3 db_install.php, NONE, 1.1 db_uninstall.php, NONE, 1.1 index.htm, NONE, 1.1 mx_phpbb3.pak, NONE, 1.1 mx_phpbb3.php, NONE, 1.1 readme.txt, NONE, 1.1

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

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

Added Files:
	db_install.php db_uninstall.php index.htm mx_phpbb3.pak 
	mx_phpbb3.php readme.txt 
Log Message:
This is mx_phpbb3 first atemt ....

--- NEW FILE: mx_phpbb3.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_phpbb3
* @version $Id: mx_phpbb3.php,v 1.1 2008/09/01 04:00:56 orynider Exp $
* @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

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

//
// View Permissions
// Due to BOTs and SPAM, it's preferable to hide some forum pages for anonymous users.
//
// phpBB pages to hide (uncomment to activate):
$private_phpbb_script = array('memberlist', 'privmsg');
//
//

//
// Restore POST vars after redirect
// Will look into this later
//
$HTTP_POST_VARS = $_SESSION['mxbb_post_vars'];
$HTTP_POST_FILES = $_SESSION['mxbb_post_files'];

//
// addslashes to vars if magic_quotes_gpc is off
// this is a security precaution to prevent someone
// trying to break out of a SQL statement.
//
if( !get_magic_quotes_gpc() )
{
	if( is_array($HTTP_POST_VARS) )
	{
		while( list($k, $v) = each($HTTP_POST_VARS) )
		{
			if( is_array($HTTP_POST_VARS[$k]) )
			{
				while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
				{
					$HTTP_POST_VARS[$k][$k2] = addslashes($v2);
				}
				@reset($HTTP_POST_VARS[$k]);
			}
			else
			{
				$HTTP_POST_VARS[$k] = addslashes($v);
			}
		}
		@reset($HTTP_POST_VARS);
	}
}

include_once($mx_root_path . "modules/mx_phpbb3/includes/phpbb3_constants.$phpEx");
include_once($mx_root_path . "modules/mx_phpbb3/includes/forum_hack.$phpEx");

$phpbb_auth->acl($mx_user->data); // Do only once, in user_init // Move later

//
// Auth
//
if ( isset($private_phpbb_script) )
{
	if ( in_array($mx_forum->phpbb_script, $private_phpbb_script) && !$userdata['session_logged_in'] )
	{
		mx_redirect( mx_append_sid( $mx_root_path . "login.$phpEx?redirect=" . mx_this_url(), true ) );
	}
}

ob_start();
$mx_forum->read_file( $mx_forum->phpbb_script );
$phpbb_output = ob_get_contents();
ob_end_clean();

//
// Final template code fixup - these are really phpBB "bugs", hardcoded images etc.
//
switch ( $mx_forum->phpbb_script )
{
	case 'index':
		$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_new_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_new_big.gif', $phpbb_output);
		$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_big.gif', $phpbb_output);
		$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_locked_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_locked_big.gif', $phpbb_output);
		$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/whosonline.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/whosonline.gif', $phpbb_output);
		break;

	case 'viewforum':
		break;

	case 'viewtopic':
		$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_output);
		$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_output);
		break;

	case 'posting':
		break;

	case 'faq':
		$phpbb_output = str_replace('#top', $phpbb_root_path . 'faq.php#top', $phpbb_output);
		break;
}


$phpbb_output = str_replace('"templates/'.$theme['template_name'], '"' . $phpbb_root_path . 'templates/'.$theme['template_name'], $phpbb_output);

//die(str_replace("\n", '<br>', htmlspecialchars($phpbb_output)));
echo($phpbb_output);
unset($phpbb_output);
?>
--- NEW FILE: db_uninstall.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_phpbb
* @version $Id: db_uninstall.php,v 1.1 2008/09/01 04:00:48 orynider Exp $
* @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

define( 'IN_PORTAL', true );
if ( !defined( 'IN_ADMIN' ) )
{
	$mx_root_path = './../../';
	$phpEx = substr(strrchr(__FILE__, '.'), 1);
	include( $mx_root_path . 'common.' . $phpEx );
	// Start session management
	$mx_user->init($user_ip, PAGE_INDEX);

	if ( !$userdata['session_logged_in'] )
	{
		die( "Hacking attempt(1)" );
	}

	if ( $userdata['user_level'] != ADMIN )
	{
		die( "Hacking attempt(2)" );
	}
	// End session management
}

$sql = array(
	"DROP TABLE IF EXISTS " . $mx_table_prefix . "phpbb3_plugin_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\">Module Installation/Upgrading/Uninstalling Information - module 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 />";

?>
--- NEW FILE: db_install.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_phpbb3
* @version $Id: db_install.php,v 1.1 2008/09/01 04:00:48 orynider Exp $
* @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

define( 'IN_PORTAL', true );

if ( !defined( 'IN_ADMIN' ) )
{
	$mx_root_path = './../../';
	$phpEx = substr(strrchr(__FILE__, '.'), 1);
	include( $mx_root_path . 'common.' . $phpEx );

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

	if ( !$userdata['session_logged_in'] )
	{
		die( "Hacking attempt(1)" );
	}

	if ( $userdata['user_level'] != ADMIN )
	{
		die( "Hacking attempt(2)" );
	}

}

$mx_module_version = '3.0.0-alfa';
$mx_module_copy = 'Original mxBB <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mxbb.net" target="_blank">Jon</a>';

// If fresh install

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

	$sql = array();

	$sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "phpbb3_plugin_config";

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

	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('override_default_pages', '0')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('enable_module', '1')";

	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('faq', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('groupcp', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('index', '2')";

	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('login', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('memberlist', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('privmsg', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('profile', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('search', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('viewonline', '2')";
	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb3_plugin_config VALUES ('other', '2')";

	$sql[] = "UPDATE " . $mx_table_prefix . "module" . "
				    SET module_version  = '" . $mx_module_version . "',
				      module_copy  = '" . $mx_module_copy . "'
				    WHERE module_id = '" . $mx_module_id . "'";

	$message .= mx_do_install_upgrade( $sql );
}
else
{
	// If already installed
	$message = "<b>Module is already installed... consider upgrading ;)</b><br/><br/>";
}

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

?>

--- NEW FILE: readme.txt ---
/**
*
* @package mxBB Portal Module - mx_phpbb3
* @version $Id: readme.txt,v 1.1 2008/09/01 04:00:57 orynider Exp $
* @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

/********************************************************************************\
| Installation Instructions
\********************************************************************************/

Note: In order for this module to install you must have a working phpBB and mxBB installation.
phpbbroot refers to where your phpBB2 install is located, e.g in phpBB2/ or forum/


#
#-----[ OPEN ]------------------------------------------
#

phpbbroot/common.php

#
#-----[ FIND ]------------------------------------------
#

?>

#
#-----[ REPLACE WITH ]------------------------------------------
#

//+mxbb_portal
if( !defined('IN_ADMIN') )
{
	$mx_root_path = './../';
	if (file_exists($mx_root_path.'modules/mx_phpbb3/includes/forum_hack.'.$phpEx))
	{
		include_once($mx_root_path.'modules/mx_phpbb3/includes/forum_hack.'.$phpEx);
	}
}
//-mxbb_portal

?>

#
#-----[ SAVE/CLOSE ALL FILES ]------------------------------------------
#
# EoM


/********************************************************************************\
| Portal Setup
\********************************************************************************/

** Now, add the newly created mx_phpbb Block to a relevant portal page
and remove, the now redundant mx_forum block.

** By default, native phpBB urls are redirected to portal page 2. Visit the module adminCP for customization.


/********************************************************************************\
|	End Of Document
\********************************************************************************/

--- NEW FILE: mx_phpbb3.pak ---
module=+:59=+:phpBB3 Integration=+:modules/mx_phpbb3/=+:Vanilla phpBB3 Forum Integration=+:1
New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
function=+:59=+:58=+:phpBB=+:mxBB Forum Integration=+:mx_phpbb3.php=+:
parameter=+:58=+:98=+:Source_phpBB_Forums=+:phpbb_type_select=+:=+:=+:0=+:0
parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
block=+:=+:phpBB3=+:Demo block=+:58=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
function=+:0=+:0=+:0=+:endoflist=+:0=+:0

--- 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>

[mxbb-commits] mx_phpbb3/admin admin_forums_ext.php, NONE, 1.1 index.htm, NONE, 1.1 mx_module_defs.php, NONE, 1.1

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

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

Added Files:
	admin_forums_ext.php index.htm mx_module_defs.php 
Log Message:
This is mx_phpbb3 first atemt ....

--- NEW FILE: mx_module_defs.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_phpbb
* @version $Id: mx_module_defs.php,v 1.1 2008/09/01 04:00:46 orynider Exp $
* @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

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

/********************************************************************************\
| Class: mx_module_defs
| The mx_module_defs object provides additional module block parameters...
\********************************************************************************/

//
// The following flags are class specific options
//
//define('MX_ALL_DATA'		, -1);		// Flag - write all data

class mx_module_defs
{
	// ------------------------------
	// Private Methods
	//
	//

	// ===================================================
	// define module specific block parameters
	// ===================================================
	function get_parameters($type_row = '')
	{
		global $lang;

		if (empty($type_row))
		{
			$type_row = array();
		}

		$type_row['phpbb_type_select'] = !empty($lang['ParType_phpbb_type_select']) ? $lang['ParType_phpbb_type_select'] : "phpBB Source";

		return $type_row;
	}

	// ===================================================
	// Submit custom parameter field and data
	// ===================================================
	function submit_module_parameters( $parameter_data, $block_id )
	{
		global $HTTP_POST_VARS, $db, $board_config, $mx_blockcp, $mx_root_path, $phpEx;
		global $html_entities_match, $html_entities_replace;

		$parameter_value = $HTTP_POST_VARS[$parameter_data['parameter_id']];
		$parameter_opt = '';

		switch ( $parameter_data['parameter_type'] )
		{
			case 'phpbb_type_select':
				$parameter_value = addslashes( serialize( $parameter_value ) );
				break;
		}
		return array('parameter_value' => $parameter_value, 'parameter_opt' => $parameter_opt);
	}

	// ===================================================
	// display parameter field and data in the add/edit page
	// ===================================================
	function display_module_parameters( $parameter_data, $block_id )
	{
		global $template, $mx_blockcp, $mx_root_path, $theme, $lang;

		switch ( $parameter_data['parameter_type'] )
		{
			case 'phpbb_type_select':
				$this->display_edit_Phpbb_type_select( $block_id, $parameter_data['parameter_id'], $parameter_data );
				break;
		}
	}

	function display_edit_Phpbb_type_select( $block_id, $parameter_id, $parameter_data )
	{
		global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpEx, $mx_table_prefix, $table_prefix;

		$module_root_path = $mx_root_path . $mx_blockcp->module_root_path;
		include_once( $module_root_path . "includes/phpbb_constants.$phpEx" );
		include_once( $module_root_path . "includes/phpbb_defs.$phpEx" );

		$template->set_filenames(array(
			'parameter' => 'admin/mx_module_parameters.tpl')
		);

		// Get number of forums in db
		$sql = "SELECT *
			FROM " . NEWS_CAT_TABLE . "
			ORDER BY $cat_extract_order";
		if ( !( $result = $db->sql_query( $sql ) ) )
		{
			mx_message_die( GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql );
		}

		$forums = $db->sql_fetchrowset( $result );
		$db->sql_freeresult($result);

		// Get array of categories from the database

		$sql = "SELECT cat_id, cat_title
						FROM " . CATEGORIES_TABLE . "
						ORDER BY cat_order";
		if ( !( $result = $db->sql_query( $sql ) ) )
		{
			mx_message_die( GENERAL_ERROR, "Couldn't obtain category list.", "", __LINE__, __FILE__, $sql );
		}

		$categories = $db->sql_fetchrowset( $result );
		$db->sql_freeresult($result);

		$phpbb_type_select_data = ( !empty( $mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value'] ) ) ? unserialize($mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value']) : array();

		//
		// Check that some categories exist
		//
		if ( $total_categories = count( $categories ) )
		{
			//
			// Check that some forums exist (these were queried earlier)
			//
			if ( $total_forums = count( $forums ) )
			{
				$template->assign_block_vars( 'switch_forums_phpbb', array( 'COLSPAN' => count( $item_types_array ) + 2
						) );

				for( $i = 0; $i < $total_categories; $i++ )
				{
					$template->assign_block_vars( 'catrow', array( 'CAT_ID' => $categories[$i]['cat_id'],
							'COLSPAN' => count( $item_types_array ) + 1,
							'CAT_NAME' => $categories[$i]['cat_title']
							) );

					for( $j = 0; $j < $total_forums; $j++ )
					{
						if ( $forums[$j]['cat_id'] == $categories[$i]['cat_id'] || $forums[$j]['cat_id'] == '' )
						{
							$template->assign_block_vars( 'catrow.forumrow_phpbb', array( 'FORUM_ID' => $forums[$j][$catt_id],
									'FORUM_NAME' => $forums[$j][$catt_name],
									'FORUM_DESC' => $forums[$j][$catt_desc],

									'CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']] ? 'CHECKED' : '' ),
								));
						}
					}
				}
			}
		}

		$template->assign_vars(array(
			'SCRIPT_PATH' => $module_root_path,
			'MX_IMAGES_ROOT' =>  $mx_root_path . 'templates/subSilver/images/admin_icons/',
			'MX_ROOT_PATH' =>  $mx_root_path,
			'NAME' =>  $lang[$parameter_data['parameter_name']],
			'SELECT_NAME' =>  $parameter_data['parameter_id'],
			'PARAMETER_TITLE' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'],
			'PARAMETER_TYPE' => ( !empty($lang["ParType_".$parameter_data['parameter_type']]) ) ? $lang["ParType_".$parameter_data['parameter_type']] : '',
			'PARAMETER_TYPE_EXPLAIN' => ( !empty($lang["ParType_".$parameter_data['parameter_type'] . "_info"]) ) ? '<br />' . $lang["ParType_".$parameter_data['parameter_type'] . "_info"]  : '',

			'SCRIPT_PATH' => $module_root_path,
			'I_ANNOUNCE' => $images['phpbb_folder_announce'],
			'I_STICKY' => $images['phpbb_folder_sticky'],
			'I_NORMAL' => $images['phpbb_folder'],

			'L_ANNOUNCEMENT' => $lang['Post_Announcement'],
			'L_STICKY' => $lang['Post_Sticky'],
			'L_NORMAL' => $lang['Posted'],
		));

		$template->pparse('parameter');

	}
}
?>
--- NEW FILE: admin_forums_ext.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_phpbb
* @version $Id: admin_forums_ext.php,v 1.1 2008/09/01 04:00:45 orynider Exp $
* @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

define( 'IN_PORTAL', 1 );

if ( !empty( $setmodules ) )
{
	$file = basename( __FILE__ );
	$module['phpBB3 plugin']['Management'] = 'modules/mx_phpbb3/admin/' . $file;
	return;
}

$mx_root_path = './../../../';
$module_root_path = "./../";
$phpEx = substr(strrchr(__FILE__, '.'), 1);
require( $mx_root_path . '/admin/pagestart.' . $phpEx );

include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
include_once( $module_root_path . 'includes/phpbb3_constants.' . $phpEx );

// **********************************************************************
// Read language definition
// **********************************************************************
if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
{
	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
}
else
{
	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
}

//
// Mode setting
//
$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, '');

//
// Main db settings
// Pull all config data
//
$sql = "SELECT *
	 FROM " . PHPBB3_CONFIG_TABLE;
if ( !$result = $db->sql_query( $sql ) )
{
	mx_message_die( CRITICAL_ERROR, "Could not query phpbb plugin base configuration information", "", __LINE__, __FILE__, $sql );
}
else
{
	while ( $row = $db->sql_fetchrow( $result ) )
	{
		$phpbb_config_name = $row['config_name'];
		$phpbb_config_value = $row['config_value'];
		$phpbb_default_config[$phpbb_config_name] = $phpbb_config_value;

		$phpbb_new[$phpbb_config_name] = ( isset( $HTTP_POST_VARS[$phpbb_config_name] ) ) ? $HTTP_POST_VARS[$phpbb_config_name] : $phpbb_default_config[$phpbb_config_name];
		if ( isset( $HTTP_POST_VARS['submit'] ) )
		{
			$sql = "UPDATE " . PHPBB3_CONFIG_TABLE . " SET
			   		config_value = '" . str_replace( "\'", "''", $phpbb_new[$phpbb_config_name] ) . "'
					WHERE config_name = '$phpbb_config_name'";
			if ( !$db->sql_query( $sql ) )
			{
				mx_message_die( GENERAL_ERROR, "Failed to update general configuration for $config_name", "", __LINE__, __FILE__, $sql );
			}
		}
	}
	$db->sql_freeresult($result);

	if ( isset( $HTTP_POST_VARS['submit'] ) )
	{
		$message = $lang['phpbb_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_phpbb_config'], "<a href=\"" . mx_append_sid( "admin_forums_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" );
		mx_message_die( GENERAL_MESSAGE, $message );
	}
}

//
// Populate parameter variables
//
$phpbb_index = $phpbb_new['index'];
$phpbb_viewforum = $phpbb_new['viewforum'];
$phpbb_viewtopic = $phpbb_new['viewtopic'];

$phpbb_faq = $phpbb_new['faq'];
$phpbb_groupcp = $phpbb_new['groupcp'];
$phpbb_login = $phpbb_new['login'];
$phpbb_memberlist = $phpbb_new['memberlist'];
$phpbb_modcp = $phpbb_new['modcp'];
$phpbb_posting = $phpbb_new['posting'];
$phpbb_privmsg = $phpbb_new['privmsg'];
$phpbb_profile = $phpbb_new['profile'];
$phpbb_search = $phpbb_new['search'];
$phpbb_viewonline = $phpbb_new['viewonline'];
$phpbb_other = $phpbb_new['other'];


$phpbb_override_default_pages = $phpbb_new['override_default_pages'];
$phpbb_integration_enabled = $phpbb_new['enable_module'];

//
// Get page_list selects
//
$pagelist_index = get_list_formatted('page_list', $phpbb_new['index'], 'index');
//$pagelist_viewforum = get_list_formatted('page_list', $phpbb_new['viewforum'], 'viewforum');
//$pagelist_viewtopic = get_list_formatted('page_list', $phpbb_new['viewtopic'], 'viewtopic');

$pagelist_faq = get_list_formatted('page_list', $phpbb_new['faq'], 'faq');
$pagelist_groupcp = get_list_formatted('page_list', $phpbb_new['groupcp'], 'groupcp');
$pagelist_login = get_list_formatted('page_list', $phpbb_new['login'], 'login');
$pagelist_memberlist = get_list_formatted('page_list', $phpbb_new['memberlist'], 'memberlist');
//$pagelist_modcp = get_list_formatted('page_list', $phpbb_new['modcp'], 'modcp');
//$pagelist_posting = get_list_formatted('page_list', $phpbb_new['posting'], 'posting');
$pagelist_privmsg = get_list_formatted('page_list', $phpbb_new['privmsg'], 'privmsg');
$pagelist_profile = get_list_formatted('page_list', $phpbb_new['profile'], 'profile');
$pagelist_search = get_list_formatted('page_list', $phpbb_new['search'], 'search');
$pagelist_viewonline = get_list_formatted('page_list', $phpbb_new['viewonline'], 'viewonline');
$pagelist_other = get_list_formatted('page_list', $phpbb_new['other'], 'other');

//
// Start page proper
//
$template->set_filenames( array( "body" => "admin/forum_admin_body_ext.tpl" ));

$template->assign_vars( array(
		'S_FORUM_ACTION' => mx_append_sid( "admin_forums_ext.$phpEx" ),

		'L_FORUM_TITLE' => $lang['mx_forum_admin'],
		'L_FORUM_EXPLAIN' => $lang['mx_forum_admin_explain'],

		'L_SUBMIT' => $lang['submit'],
		'L_RESET' => $lang['reset'],

		'L_DEFAULT_PAGES_TITLE' => $lang['default_pages_title'],
		'L_DEFAULT_PAGES_TITLE_EXPLAIN' => $lang['default_pages_title_explain'],

		'L_DEFAULT_PAGES_MORE_TITLE' => $lang['default_pages_more_title'],
		'L_DEFAULT_PAGES_MORE_TITLE_EXPLAIN' => $lang['default_pages_more_title_explain'],

		//
		// Enable/Disable phpBB integration
		//
		'L_PHPBB_INTEGRATION_ENABLED' => $lang['phpbb_integration_enabled'],
		'L_PHPBB_INTEGRATION_ENABLED_EXPLAIN' => $lang['phpbb_integration_enabled_explain'],

		'L_PHPBB_INTEGRATION_ENABLED_YES' => $lang['phpbb_integration_enabled_yes'],
		'L_PHPBB_INTEGRATION_ENABLED_NO' => $lang['phpbb_integration_enabled_no'],

		'PHPBB_INTEGRATION_ENABLED_YES' => ( $phpbb_integration_enabled == '1' ) ? ' checked="checked"' : '',
		'PHPBB_INTEGRATION_ENABLED_NO' => ( $phpbb_integration_enabled == '0' ) ? ' checked="checked"' : '',

		//
		// Default static settings or block settings
		//
		'L_PHPBB_OVERRIDE_DEFAULT_PAGES' => $lang['phpbb_override'],
		'L_PHPBB_OVERRIDE_DEFAULT_PAGES_EXPLAIN' => $lang['phpbb_override_explain'],

		'L_PHPBB_OVERRIDE_DEFAULT_PAGES_YES' => $lang['phpbb_override_yes'],
		'L_PHPBB_OVERRIDE_DEFAULT_PAGES_NO' => $lang['phpbb_override_no'],

		'OVERRIDE_DEFAULT_PAGES_CHECKBOX_YES' => ( $phpbb_override_default_pages == '1' ) ? ' checked="checked"' : '',
		'OVERRIDE_DEFAULT_PAGES_CHECKBOX_NO' => ( $phpbb_override_default_pages == '0' ) ? ' checked="checked"' : '',

		//
		// ProfileCP compatitility och info
		//
		'L_DEFAULT_PAGES_PROFILECP' => $lang['default_pages_profilecp'],
		'L_PHPBB_EXPLAIN' => $lang['phpbb_explain'],

		'L_PHPBB_FAQ' => $lang['phpbb_faq'],
		'PHPBB_FAQ' => $pagelist_faq,

		'L_PHPBB_GROUPCP' => $lang['phpbb_groupcp'],
		'PHPBB_GROUPCP' => $pagelist_groupcp,

		'L_PHPBB_INDEX' => $lang['phpbb_index'] . ', ' . $lang['phpbb_viewforum'] . ', ' . $lang['phpbb_viewtopic'] . ', ' . $lang['phpbb_posting'] . ', ' . $lang['phpbb_modcp'],
		'PHPBB_INDEX' => $pagelist_index,

		'L_PHPBB_LOGIN' => $lang['phpbb_login'],
		'PHPBB_LOGIN' => $pagelist_login,

		'L_PHPBB_MEMBERLIST' => $lang['phpbb_memberlist'],
		'PHPBB_MEMBERLIST' => $pagelist_memberlist,

		//'L_PHPBB_MODCP' => $lang['phpbb_modcp'],
		//'PHPBB_MODCP' => $pagelist_modcp,

		//'L_PHPBB_POSTING' => $lang['phpbb_posting'],
		//'PHPBB_POSTING' => $pagelist_posting,

		'L_PHPBB_PRIVMSG' => $lang['phpbb_privmsg'],
		'PHPBB_PRIVMSG' => $pagelist_privmsg,

		'L_PHPBB_PROFILE' => $lang['phpbb_profile'],
		'PHPBB_PROFILE' => $pagelist_profile,

		'L_PHPBB_SEARCH' => $lang['phpbb_search'],
		'PHPBB_SEARCH' => $pagelist_search,

		//'L_PHPBB_VIEWFORUM' => $lang['phpbb_viewforum'],
		//'PHPBB_VIEWFORUM' => $pagelist_viewforum,

		'L_PHPBB_VIEWONLINE' => $lang['phpbb_viewonline'],
		'PHPBB_VIEWONLINE' => $pagelist_viewonline,

		'L_PHPBB_OTHER' => $lang['phpbb_other'],
		'PHPBB_OTHER' => $pagelist_other,

		//'L_PHPBB_VIEWTOPIC' => $lang['phpbb_viewtopic'],
		//'PHPBB_VIEWTOPIC' => $pagelist_viewtopic
	));

$template->pparse( "body" );
include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );

?>

--- 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>

[mxbb-commits] mx_phpbb3/templates/_core/admin - New directory

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

Update of /cvsroot/mxbb/mx_phpbb3/templates/_core/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10829/admin

Log Message:
Directory /cvsroot/mxbb/mx_phpbb3/templates/_core/admin added to the repository

[mxbb-commits] mx_phpbb3/templates/_core - New directory

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

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

Log Message:
Directory /cvsroot/mxbb/mx_phpbb3/templates/_core added to the repository

[mxbb-commits] mx_phpbb3/language/lang_english - New directory

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

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

Log Message:
Directory /cvsroot/mxbb/mx_phpbb3/language/lang_english added to the repository

[mxbb-commits] mx_phpbb3/templates - New directory

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

Update of /cvsroot/mxbb/mx_phpbb3/templates
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8886/templates

Log Message:
Directory /cvsroot/mxbb/mx_phpbb3/templates added to the repository

[mxbb-commits] mx_phpbb3/language - New directory

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

Update of /cvsroot/mxbb/mx_phpbb3/language
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8886/language

Log Message:
Directory /cvsroot/mxbb/mx_phpbb3/language added to the repository

[mxbb-commits] mx_phpbb3/includes - New directory

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

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

Log Message:
Directory /cvsroot/mxbb/mx_phpbb3/includes added to the repository

[mxbb-commits] mx_phpbb3/admin - New directory

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

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

Log Message:
Directory /cvsroot/mxbb/mx_phpbb3/admin added to the repository

[mxbb-commits] core/modules/mx_phpbb3blocks/includes mx_functions_display.php, 1.4, 1.5

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

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

Modified Files:
	mx_functions_display.php 
Log Message:
fix

Index: mx_functions_display.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes/mx_functions_display.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mx_functions_display.php	12 Feb 2008 11:00:44 -0000	1.4
--- mx_functions_display.php	1 Sep 2008 03:48:47 -0000	1.5
***************
*** 1108,1112 ****
  * Get user rank title and image
  *
! * @param int $mx_user_rank the current stored users rank id
  * @param int $mx_user_posts the users number of posts
  * @param string &$rank_title the rank title will be stored here after execution
--- 1108,1112 ----
  * Get user rank title and image
  *
! * @param int $user_rank the current stored users rank id
  * @param int $mx_user_posts the users number of posts
  * @param string &$rank_title the rank title will be stored here after execution
***************
*** 1115,1119 ****
  *
  */
! function mx_get_user_rank($mx_user_rank, $mx_user_posts, &$rank_title, &$rank_img, &$rank_img_src)
  {
  	global $ranks, $board_config;
--- 1115,1119 ----
  *
  */
! function mx_get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src)
  {
  	global $ranks, $board_config;
***************
*** 1121,1133 ****
  	if (empty($ranks))
  	{
! 		global $cache;
! 		$ranks = $cache->obtain_ranks();
  	}
  
! 	if (!empty($mx_user_rank))
  	{
! 		$rank_title = (isset($ranks['special'][$mx_user_rank]['rank_title'])) ? $ranks['special'][$mx_user_rank]['rank_title'] : '';
! 		$rank_img = (!empty($ranks['special'][$mx_user_rank]['rank_image'])) ? '<img src="' . $board_config['ranks_path'] . '/' . $ranks['special'][$mx_user_rank]['rank_image'] . '" alt="' . $ranks['special'][$mx_user_rank]['rank_title'] . '" title="' . $ranks['special'][$mx_user_rank]['rank_title'] . '" />' : '';
! 		$rank_img_src = (!empty($ranks['special'][$mx_user_rank]['rank_image'])) ? $board_config['ranks_path'] . '/' . $ranks['special'][$mx_user_rank]['rank_image'] : '';
  	}
  	else
--- 1121,1133 ----
  	if (empty($ranks))
  	{
! 		global $mx_cache;
! 		$ranks = $mx_cache->obtain_ranks();
  	}
  
! 	if (!empty($user_rank))
  	{
! 		$rank_title = (isset($ranks['special'][$user_rank]['rank_title'])) ? $ranks['special'][$user_rank]['rank_title'] : '';
! 		$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $board_config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : '';
! 		$rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $board_config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : '';
  	}
  	else
***************
*** 1137,1141 ****
  			foreach ($ranks['normal'] as $rank)
  			{
! 				if ($mx_user_posts >= $rank['rank_min'])
  				{
  					$rank_title = $rank['rank_title'];
--- 1137,1141 ----
  			foreach ($ranks['normal'] as $rank)
  			{
! 				if ($user_posts >= $rank['rank_min'])
  				{
  					$rank_title = $rank['rank_title'];

[mxbb-commits] core/includes mx_functions_core.php,1.100,1.101

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

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

Modified Files:
	mx_functions_core.php 
Log Message:
added cache functions for mx_phpbb3

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** mx_functions_core.php	27 Aug 2008 05:17:35 -0000	1.100
--- mx_functions_core.php	1 Sep 2008 03:27:20 -0000	1.101
***************
*** 1242,1245 ****
--- 1242,1551 ----
  		return $censors;
  	}
+ 	
+ 	/**
+ 	* Obtain ranks
+ 	*/
+ 	function obtain_ranks()
+ 	{
+ 		if (($ranks = $this->get('_ranks')) === false)
+ 		{
+ 			global $db;
+ 	
+ 			$sql = 'SELECT *
+ 				FROM ' . RANKS_TABLE . '
+ 				ORDER BY rank_min DESC';
+ 			$result = $db->sql_query($sql);
+ 
+ 			$ranks = array();
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				if ($row['rank_special'])
+ 				{
+ 					$ranks['special'][$row['rank_id']] = array(
+ 						'rank_title'	=>	$row['rank_title'],
+ 						'rank_image'	=>	$row['rank_image']
+ 					);
+ 				}
+ 				else
+ 				{
+ 					$ranks['normal'][] = array(
+ 						'rank_title'	=>	$row['rank_title'],
+ 						'rank_min'		=>	$row['rank_min'],
+ 						'rank_image'	=>	$row['rank_image']
+ 					);
+ 				}
+ 			}
+ 			$db->sql_freeresult($result);
+ 
+ 			$this->put('_ranks', $ranks);
+ 		}
+ 
+ 		return $ranks;
+ 	}
+ 
+ 	/**
+ 	* Obtain allowed extensions
+ 	*
+ 	* @param mixed $forum_id If false then check for private messaging, if int then check for forum id. If true, then only return extension informations.
+ 	*
+ 	* @return array allowed extensions array.
+ 	*/
+ 	function obtain_attach_extensions($forum_id)
+ 	{
+ 		if (($extensions = $this->get('_extensions')) === false)
+ 		{
+ 			global $db;
+ 
+ 			$extensions = array(
+ 				'_allowed_post'	=> array(),
+ 				'_allowed_pm'	=> array(),
+ 			);
+ 
+ 			// The rule is to only allow those extensions defined. ;)
+ 			$sql = 'SELECT e.extension, g.*
+ 				FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g
+ 				WHERE e.group_id = g.group_id
+ 					AND (g.allow_group = 1 OR g.allow_in_pm = 1)';
+ 			$result = $db->sql_query($sql);
+ 
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				$extension = strtolower(trim($row['extension']));
+ 
+ 				$extensions[$extension] = array(
+ 					'display_cat'	=> (int) $row['cat_id'],
+ 					'download_mode'	=> (int) $row['download_mode'],
+ 					'upload_icon'	=> trim($row['upload_icon']),
+ 					'max_filesize'	=> (int) $row['max_filesize'],
+ 					'allow_group'	=> $row['allow_group'],
+ 					'allow_in_pm'	=> $row['allow_in_pm'],
+ 				);
+ 
+ 				$allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array();
+ 
+ 				// Store allowed extensions forum wise
+ 				if ($row['allow_group'])
+ 				{
+ 					$extensions['_allowed_post'][$extension] = (!sizeof($allowed_forums)) ? 0 : $allowed_forums;
+ 				}
+ 
+ 				if ($row['allow_in_pm'])
+ 				{
+ 					$extensions['_allowed_pm'][$extension] = 0;
+ 				}
+ 			}
+ 			$db->sql_freeresult($result);
+ 
+ 			$this->put('_extensions', $extensions);
+ 		}
+ 
+ 		// Forum post
+ 		if ($forum_id === false)
+ 		{
+ 			// We are checking for private messages, therefore we only need to get the pm extensions...
+ 			$return = array('_allowed_' => array());
+ 
+ 			foreach ($extensions['_allowed_pm'] as $extension => $check)
+ 			{
+ 				$return['_allowed_'][$extension] = 0;
+ 				$return[$extension] = $extensions[$extension];
+ 			}
+ 
+ 			$extensions = $return;
+ 		}
+ 		else if ($forum_id === true)
+ 		{
+ 			return $extensions;
+ 		}
+ 		else
+ 		{
+ 			$forum_id = (int) $forum_id;
+ 			$return = array('_allowed_' => array());
+ 
+ 			foreach ($extensions['_allowed_post'] as $extension => $check)
+ 			{
+ 				// Check for allowed forums
+ 				if (is_array($check))
+ 				{
+ 					$allowed = (!in_array($forum_id, $check)) ? false : true;
+ 				}
+ 				else
+ 				{
+ 					$allowed = true;
+ 				}
+ 
+ 				if ($allowed)
+ 				{
+ 					$return['_allowed_'][$extension] = 0;
+ 					$return[$extension] = $extensions[$extension];
+ 				}
+ 			}
+ 
+ 			$extensions = $return;
+ 		}
+ 
+ 		if (!isset($extensions['_allowed_']))
+ 		{
+ 			$extensions['_allowed_'] = array();
+ 		}
+ 
+ 		return $extensions;
+ 	}
+ 
+ 	/**
+ 	* Obtain active bots
+ 	*/
+ 	function obtain_bots()
+ 	{
+ 		if (($bots = $this->get('_bots')) === false)
+ 		{
+ 			global $db;
+ 	
+ 			switch ($db->sql_layer)
+ 			{
+ 				case 'mssql':
+ 				case 'mssql_odbc':
+ 					$sql = 'SELECT user_id, bot_agent, bot_ip
+ 						FROM ' . BOTS_TABLE . '
+ 						WHERE bot_active = 1
+ 					ORDER BY LEN(bot_agent) DESC';
+ 				break;
+ 
+ 				case 'firebird':
+ 					$sql = 'SELECT user_id, bot_agent, bot_ip
+ 						FROM ' . BOTS_TABLE . '
+ 						WHERE bot_active = 1
+ 					ORDER BY CHAR_LENGTH(bot_agent) DESC';
+ 				break;
+ 
+ 				// LENGTH supported by MySQL, IBM DB2 and Oracle for sure...
+ 				default:
+ 					$sql = 'SELECT user_id, bot_agent, bot_ip
+ 						FROM ' . BOTS_TABLE . '
+ 						WHERE bot_active = 1
+ 					ORDER BY LENGTH(bot_agent) DESC';
+ 				break;
+ 			}
+ 			$result = $db->sql_query($sql);
+ 
+ 			$bots = array();
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				$bots[] = $row;
+ 			}
+ 			$db->sql_freeresult($result);
+ 
+ 			$this->put('_bots', $bots);
+ 		}
+ 	
+ 		return $bots;
+ 	}
+ 
+ 	/**
+ 	* Obtain cfg file data
+ 	*/
+ 	function obtain_cfg_items($theme)
+ 	{
+ 		global $config, $phpbb_root_path;
+ 
+ 		$parsed_items = array(
+ 			'theme'		=> array(),
+ 			'template'	=> array(),
+ 			'imageset'	=> array()
+ 		);
+ 
+ 		foreach ($parsed_items as $key => $parsed_array)
+ 		{
+ 			$parsed_array = $this->get('_cfg_' . $key . '_' . $theme[$key . '_path']);
+ 
+ 			if ($parsed_array === false)
+ 			{
+ 				$parsed_array = array();
+ 			}
+ 
+ 			$reparse = false;
+ 			$filename = $phpbb_root_path . 'styles/' . $theme[$key . '_path'] . '/' . $key . '/' . $key . '.cfg';
+ 
+ 			if (!file_exists($filename))
+ 			{
+ 				continue;
+ 			}
+ 
+ 			if (!isset($parsed_array['filetime']) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))
+ 			{
+ 				$reparse = true;
+ 			}
+ 
+ 			// Re-parse cfg file
+ 			if ($reparse)
+ 			{
+ 				$parsed_array = parse_cfg_file($filename);
+ 				$parsed_array['filetime'] = @filemtime($filename);
+ 
+ 				$this->put('_cfg_' . $key . '_' . $theme[$key . '_path'], $parsed_array);
+ 			}
+ 			$parsed_items[$key] = $parsed_array;
+ 		}
+ 
+ 		return $parsed_items;
+ 	}
+ 
+ 	/**
+ 	* Obtain disallowed usernames
+ 	*/
+ 	function obtain_disallowed_usernames()
+ 	{
+ 		if (($usernames = $this->get('_disallowed_usernames')) === false)
+ 		{
+ 			global $db;
+ 
+ 			$sql = 'SELECT disallow_username
+ 				FROM ' . DISALLOW_TABLE;
+ 			$result = $db->sql_query($sql);
+ 
+ 			$usernames = array();
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				$usernames[] = str_replace('%', '.*?', preg_quote(utf8_clean_string($row['disallow_username']), '#'));
+ 			}
+ 			$db->sql_freeresult($result);
+ 
+ 			$this->put('_disallowed_usernames', $usernames);
+ 		}
+ 
+ 		return $usernames;
+ 	}
+ 
+ 	/**
+ 	* Obtain hooks...
+ 	*/
+ 	function obtain_hooks()
+ 	{
+ 		global $phpbb_root_path, $phpEx;
+ 
+ 		if (($hook_files = $this->get('_hooks')) === false)
+ 		{
+ 			$hook_files = array();
+ 
+ 			// Now search for hooks...
+ 			$dh = @opendir($phpbb_root_path . 'includes/hooks/');
+ 
+ 			if ($dh)
+ 			{
+ 				while (($file = readdir($dh)) !== false)
+ 				{
+ 					if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
+ 					{
+ 						$hook_files[] = substr($file, 0, -(strlen($phpEx) + 1));
+ 					}
+ 				}
+ 				closedir($dh);
+ 			}
+ 
+ 			$this->put('_hooks', $hook_files);
+ 		}
+ 
+ 		return $hook_files;
+ 	}	
  }
  

[mxbb-commits] mx_phpbb/includes forum_hack.php,1.62,1.63

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

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

Modified Files:
	forum_hack.php 
Log Message:
fix

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** forum_hack.php	19 Jul 2008 23:06:33 -0000	1.62
--- forum_hack.php	1 Sep 2008 02:23:38 -0000	1.63
***************
*** 243,247 ****
  			{
  				$row = $db->sql_fetchrow( $result );
! 				if (file_exists( $mx_root_path . 'includes/sessions/index.htm' ))
  				{
  					//
--- 243,247 ----
  			{
  				$row = $db->sql_fetchrow( $result );
! 				if (file_exists($mx_root_path . 'includes/sessions/phpbb3/index.htm'))
  				{
  					//

[mxbb-commits] core/includes mx_functions_style.php, 1.90, 1.91 template.php, 1.33, 1.34

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

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

Modified Files:
	mx_functions_style.php template.php 
Log Message:
some problems solved with mx_phpbb3, now we have the main index showed with no overall header etc

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/template.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** template.php	31 Aug 2008 00:49:25 -0000	1.33
--- template.php	1 Sep 2008 02:14:18 -0000	1.34
***************
*** 831,835 ****
  	function set_filename($handle, $filename, $xs_include = false, $quiet = false)
  	{
! 		global $board_config;
  		$can_cache = $this->use_cache;
  		if(strpos($filename, '..') !== false)
--- 831,835 ----
  	function set_filename($handle, $filename, $xs_include = false, $quiet = false)
  	{
! 		global $board_config, $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block;
  		$can_cache = $this->use_cache;
  		if(strpos($filename, '..') !== false)
***************
*** 858,873 ****
  		}
  		
- 		if (strpos($this->files[$handle],'overall_header.') && $xs_include && defined('MX_PHPBB3_BLOCK'))
- 		{
- 			//Do not include phpBB3 overall header and footer files using xs_include inside forum integration
- 			$this->files[$handle] = str_replace($filename, 'index.htm', $this->files[$handle]);													
- 		}
- 
- 		if (strpos($this->files[$handle],'overall_footer.') && $xs_include && defined('MX_PHPBB3_BLOCK'))
- 		{
- 			//Do not include phpBB3 overall header and footer files using xs_include inside forum integration
- 			$this->files[$handle] = str_replace($filename, 'index.htm', $this->files[$handle]);													
- 		}		
- 		
  		// creating cache filename
  		if($can_cache != '')
--- 858,861 ----

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** mx_functions_style.php	30 Aug 2008 19:04:58 -0000	1.90
--- mx_functions_style.php	1 Sep 2008 02:14:16 -0000	1.91
***************
*** 143,147 ****
  		//
  		$filename2 = substr_count($filename, 'html') ? str_replace(".html", ".tpl", $filename) : str_replace(".tpl", ".html", $filename);
! 
  		//
  		// Look at MX-Publisher-Module folder.........................................................................MX-Publisher-module
--- 143,147 ----
  		//
  		$filename2 = substr_count($filename, 'html') ? str_replace(".html", ".tpl", $filename) : str_replace(".tpl", ".html", $filename);
! 		
  		//
  		// Look at MX-Publisher-Module folder.........................................................................MX-Publisher-module
***************
*** 164,167 ****
--- 164,168 ----
  			}
  		}
+ 		
  
  		//
***************
*** 344,349 ****
--- 345,463 ----
  		return true;
  	}
+ 	
+ 	/**
+ 	 * Assigns template filename for handle.
+ 	 */
+ 	function set_filename($handle, $filename, $xs_include = false, $quiet = false)
+ 	{
+ 		global $board_config, $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block;
+ 		$can_cache = $this->use_cache;
+ 		if(strpos($filename, '..') !== false)
+ 		{
+ 			$can_cache = false;
+ 		}
+ 		$this->files[$handle] = $this->make_filename($filename, $xs_include);
+ 		$this->files_cache[$handle] = '';
+ 		$this->files_cache2[$handle] = '';
+ 		// check if we are in admin control panel and override extreme styles mod controls if needed
+ 		if(defined('XS_ADMIN_OVERRIDE') && XS_ADMIN_OVERRIDE === true && @function_exists('xs_admin_override'))
+ 		{
+ 			xs_admin_override();
+ 		}
+ 		// checking if we have valid filename
+ 		if(!$this->files[$handle])
+ 		{
+ 			if($xs_include || $quiet)
+ 			{
+ 				return false;
+ 			}
+ 			else
+ 			{
+ 				die("Template->make_filename(): Error - invalid template $filename");
+ 			}
+ 		}
+ 		
+ 		//Do not include phpBB3 overall header and footer files using xs_include inside forum integration		
+ 		if ($xs_include && defined('MX_PHPBB3_BLOCK') && $module_root_path)
+ 		{
+ 			if (strpos($this->files[$handle],'overall_header.'))
+ 			{
+ 				$filename3 = 'overall_header_plugin.html';
+ 				$filename2 = 'index.htm';
+ 				$this->debug_paths .= '<br>Module';
+ 				$fileSearch = array();
+ 				$fileSearch[] = $style_path; // First check current template
+ 				$fileSearch[] = $mx_user->cloned_template_name; // Then check Cloned template
+ 				$fileSearch[] = $moduleDefault; // Finally check Default template
+ 				$fileSearch[] = './'; // Compatibility with primitive modules
+ 
+ 				$this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path);												
+ 			}
+ 			
+ 			if (strpos($this->files[$handle],'overall_footer.'))
+ 			{			
+ 				$this->files[$handle] = $module_root_path . "templates/index.htm"; //Temp fix													
+ 			}
+ 		}
  
  
+ 		// creating cache filename
+ 		if($can_cache != '')
+ 		{
+ 			$this->files_cache2[$handle] = $this->make_filename_cache($this->files[$handle]);
+ 			if(@file_exists($this->files_cache2[$handle]))
+ 			{
+ 				$this->files_cache[$handle] = $this->files_cache2[$handle];
+ 			}
+ 		}
+ 		// checking if tpl and/or php file exists
+ 		if(empty($this->files_cache[$handle]) && !@file_exists($this->files[$handle]))
+ 		{
+ 			// trying to load alternative filename (usually subSilver)
+ 			if(!empty($this->tpldef) && !empty($this->tpl) && ($this->tpldef !== $this->tpl))
+ 			{
+ 				$this->files[$handle] = '';
+ 				// save old configuration
+ 				$root = $this->root;
+ 				$tpl_name = $this->tpl;
+ 				// set temporary configuration
+ 				$this->root = $this->tpldir . $this->tpldef;
+ 				$this->tpl = $this->tpldef;
+ 				// recursively run set_filename
+ 				$res = $this->set_filename($handle, $filename, $xs_include, $quiet);
+ 				// restore old configuration
+ 				$this->root = $root;
+ 				$this->tpl = $tpl_name;
+ 				return $res;
+ 			}
+ 			if($quiet)
+ 			{
+ 				return false;
+ 			}
+ 			if($xs_include)
+ 			{
+ 				if($board_config['xs_warn_includes'])
+ 				{
+ 					die('Template->make_filename(): Error - included template file not found: ' . $filename);
+ 				}
+ 				return false;
+ 			}
+ 			else
+ 			{
+ 				die('Template->make_filename(): Error - template file not found: ' . $filename);
+ 			}
+ 		}
+ 		// checking if we should recompile cache
+ 		if(!empty($this->files_cache[$handle]) && !empty($board_config['xs_auto_recompile']))
+ 		{
+ 			$cache_time = @filemtime($this->files_cache[$handle]);
+ 			if(@filemtime($this->files[$handle]) > $cache_time || $board_config['xs_template_time'] > $cache_time)
+ 			{
+ 				// file was changed. don't use cache file (will be recompled if configuration allowes it)
+ 				$this->files_cache[$handle] = '';
+ 			}
+ 		}
+ 		return true;
+ 	}
  }	// class mx_Template
  

[mxbb-commits] mx_smartor/album_mod/includes album_functions.php, 1.5, 1.6 album_hierarchy_functions.php, 1.3, 1.4 album_hierarchy_sql.php, 1.7, 1.8 album_integration.php, 1.5, 1.6

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

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

Modified Files:
	album_functions.php album_hierarchy_functions.php 
	album_hierarchy_sql.php album_integration.php 
Log Message:
some solved issues

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** album_integration.php	31 Aug 2008 13:28:56 -0000	1.5
--- album_integration.php	1 Sep 2008 01:11:49 -0000	1.6
***************
*** 45,53 ****
  // Generate paths for page and standalone mode
  // ...function based on original function written by Markus :-)
  if (!function_exists('this_smartor_mxurl'))
  {
! 	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
  		if( $force_standalone_mode || !$is_block )
--- 45,74 ----
  // Generate paths for page and standalone mode
  // ...function based on original function written by Markus :-)
+ // This has mod_rewrite disabled
  if (!function_exists('this_smartor_mxurl'))
  {
! 	function this_smartor_mxurl($args = '', $force_standalone_mode = false, $new_pageid = '')
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $mx_request_vars;
! 		global $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
! 
! 		if (!$mx_request_vars->is_empty_request('dynamic_block'))
! 		{
! 			$dynamic_block = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, '');
! 		}
! 		elseif (!$mx_request_vars->is_empty_get('dynamic_block'))
! 		{
! 			$dynamic_block = $mx_request_vars->get('dynamic_block', MX_TYPE_INT, 0);
! 		}
! 		{
! 			$dynamic_block = '';
! 		}
! 		
! 		$pageid = ($new_pageid) ? intval($new_pageid) : $mx_request_vars->request('page', MX_TYPE_INT, 1);
! 
! 		$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
! 		
! 		$dynamicId = !empty($dynamic_block) ? ( $non_html_amp ? '&dynamic_block=' : '&dynamic_block=' ) . $dynamic_block : '';
! 
  
  		if( $force_standalone_mode || !$is_block )
***************
*** 60,64 ****
  			if( is_numeric($page_id) && !empty($page_id) )
  			{
! 				$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
  			}
  			else
--- 81,85 ----
  			if( is_numeric($page_id) && !empty($page_id) )
  			{
! 				$mxurl .= '?page=' . $pageid . $dynamicId. ($args == '' ? '' : '&' . $args);
  			}
  			else
***************
*** 67,83 ****
  			}
  		}
- 		// Is mod_rewrite enabled? If so, do some url rewrites...
- 		if (is_object($mx_mod_rewrite))
- 		{
- 			//$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
- 		}	
  		
  		return $mxurl;
  	}
  }
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
  	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block,$mx_mod_rewrite;
  
  	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
--- 88,102 ----
  			}
  		}
  		
  		return $mxurl;
  	}
  }
+ 
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
  	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block,$mx_mod_rewrite;
  
+ 	$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
+ 
  	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
***************
*** 85,89 ****
  	if (is_object($mx_mod_rewrite))
  	{
! 		//$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
  	}	
  		
--- 104,108 ----
  	if (is_object($mx_mod_rewrite))
  	{
! 		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
  	}	
  		
***************
*** 91,99 ****
  }
  
! function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
! 	if( $integration_enabled != "1" )
  	{
  		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
--- 110,127 ----
  }
  
! function this_fap_portalurl($args = '', $force_standalone_mode = false, $new_pageid = '', $modrewrite = 'no')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $mx_request_vars; 
! 	global $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
! 	$mod_rewrite = $mx_request_vars->get('modrewrite', MX_TYPE_INT, $modrewrite);
! 	
! 	// Is mod_rewrite enabled? If so, do some url rewrites...
! 	if ($mod_rewrite === 'no')
! 	{
! 		$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
! 	}	
! 	
! 	if($force_standalone_mode || !$integration_enabled)
  	{
  		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
***************
*** 102,106 ****
  	{
  		$mxurl = $mx_root_path . 'index.' . $phpEx;
! 		if( is_numeric($page_id) && !empty($page_id) )
  		{
  			$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
--- 130,134 ----
  	{
  		$mxurl = $mx_root_path . 'index.' . $phpEx;
! 		if($page_id && is_numeric($page_id))
  		{
  			$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
***************
*** 113,117 ****
  	}
  	// Is mod_rewrite enabled? If so, do some url rewrites...
! 	if (is_object($mx_mod_rewrite))
  	{
  		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
--- 141,145 ----
  	}
  	// Is mod_rewrite enabled? If so, do some url rewrites...
! 	if (is_object($mx_mod_rewrite) && !($mod_rewrite === 'no'))
  	{
  		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
***************
*** 124,127 ****
--- 152,157 ----
  	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $mx_mod_rewrite;
  
+ 	$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
+ 	
  	if( $force_standalone_mode )
  	{
***************
*** 132,140 ****
  		$mxurl = $mx_root_path . 'index.' . $phpEx . '?page=' . $album_index . ($args == '' ? '' : '&' . $args);
  	}
- 	// Is mod_rewrite enabled? If so, do some url rewrites...
- 	if (is_object($mx_mod_rewrite))
- 	{
- 		//$mxurl = $mx_mod_rewrite->encode($mxurl);
- 	}	
  	
  	return $mxurl;
--- 162,165 ----
***************
*** 144,147 ****
--- 169,173 ----
  	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
+ 	$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
  
  	$mxurl = $mx_root_path . 'index.' . $phpEx;
***************
*** 159,162 ****
--- 185,190 ----
  {
  	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
+ 	
+ 	$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
  
  	if( $integration_enabled != "1" )
***************
*** 175,179 ****
  	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
! 
  	if( $force_standalone_mode || !$is_block )
  	{
--- 203,208 ----
  	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
! 	$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
! 	
  	if( $force_standalone_mode || !$is_block )
  	{

Index: album_hierarchy_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_functions.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_hierarchy_functions.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_hierarchy_functions.php	1 Sep 2008 01:11:48 -0000	1.4
***************
*** 527,530 ****
--- 527,531 ----
  			'L_MODERATORS' => empty($moderators) ? '' : $lang['Moderators'] . ' :',
  			'MODERATORS' => $moderators,
+ 			'S_ROW_COUNT'=> $j
  			)
  		);

Index: album_hierarchy_sql.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_sql.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** album_hierarchy_sql.php	30 Aug 2008 22:33:41 -0000	1.7
--- album_hierarchy_sql.php	1 Sep 2008 01:11:49 -0000	1.8
***************
*** 813,817 ****
  
  	$info .= '<br />' . $lang['Pic_Image'] . ': <a href="';
! 	$info .= ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $row['pic_id'], true)) . '" target="_blank">' : mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic" . '&pic_id=' . $row['pic_id'], true)) . '">' ;
  	$info .= $row['pic_title'] . '</a>';
  
--- 813,817 ----
  
  	$info .= '<br />' . $lang['Pic_Image'] . ': <a href="';
! 	$info .= ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $row['pic_id'], false)) . '" target="_blank">' : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $row['pic_id'], false)) . '">' ;
  	$info .= $row['pic_title'] . '</a>';
  
***************
*** 962,966 ****
  	}
  
! 	$info .= '<br />' . $lang['Pic_Image'] . ': <a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic" . '?pic_id=' . $row['pic_id'], true)) . '">' . $row['pic_title'] . '</a>';
  
  	return $info;
--- 962,966 ----
  	}
  
! 	$info .= '<br />' . $lang['Pic_Image'] . ': <a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic" . '?pic_id=' . $row['pic_id'], false)) . '">' . $row['pic_title'] . '</a>';
  
  	return $info;

Index: album_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** album_functions.php	29 Aug 2008 05:58:23 -0000	1.5
--- album_functions.php	1 Sep 2008 01:11:48 -0000	1.6
***************
*** 35,53 ****
  // Create date/time from format and timezone
  //
! function album_create_date($format, $gmepoch, $tz)
  {
! 	global $board_config, $lang;
  	static $translate;
! 
! 	if ( empty($translate) && $board_config['default_lang'] != 'english' )
  	{
! 		@reset($lang['datetime']);
! 		while ( list($match, $replace) = @each($lang['datetime']) )
! 		{
! 			$translate[$match] = $replace;
! 		}
! 	}
  
! 	return ( !empty($translate) ) ? strtr(@gmdate($format, $gmepoch + (3600 * $tz)), $translate) : @gmdate($format, $gmepoch + (3600 * $tz));
  }
  
--- 35,68 ----
  // Create date/time from format and timezone
  //
! function album_create_date($format = false, $gmepoch, $tz, $forcedate = false)
  {
! 	global $board_config, $lang, $mx_user;
  	static $translate;
! 	
! 	switch (PORTAL_BACKEND)
  	{
! 		case 'internal':
! 						
! 		case 'phpbb2':			
  
! 			if (empty($translate) && ($mx_user->lang['default_lang'] != 'english'))
! 			{
! 				@reset($lang['datetime']);
! 				while ( list($match, $replace) = @each($lang['datetime']) )
! 				{
! 					$translate[$match] = $replace;
! 				}
! 			}
! 
! 			return ( !empty($translate) ) ? strtr(@gmdate($format, $gmepoch + (3600 * $tz)), $translate) : @gmdate($format, $gmepoch + (3600 * $tz));						
! 
! 		break;
! 
! 		case 'phpbb3':
! 		
! 			return $mx_user->format_date($gmepoch, $format, $forcedate);
! 			
! 		break;			
! 	}	
  }
  
***************
*** 157,161 ****
  function album_get_profile_url($mode, $user_id, $username = false, $user_color = false)
  {
! 	global $userdata;
  	
  	switch (PORTAL_BACKEND)
--- 172,176 ----
  function album_get_profile_url($mode, $user_id, $username = false, $user_color = false)
  {
! 	global $lang, $userdata;
  	
  	switch (PORTAL_BACKEND)

[mxbb-commits] mx_smartor album_lists.php, 1.27, 1.28 db_install.php, 1.24, 1.25 welcome.php, 1.14, 1.15

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

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

Modified Files:
	album_lists.php db_install.php welcome.php 
Log Message:
some solved issues

Index: album_lists.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_lists.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** album_lists.php	31 Aug 2008 13:40:28 -0000	1.27
--- album_lists.php	1 Sep 2008 01:11:47 -0000	1.28
***************
*** 15,20 ****
  
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
! include_once($mx_root_path . 'common.'.$phpEx);
  
  //
--- 15,20 ----
  
  
! //$phpEx = substr(strrchr(__FILE__, '.'), 1); 
! //include_once($mx_root_path . 'common.'.$phpEx);
  
  //
***************
*** 32,35 ****
--- 32,39 ----
  $title = $mx_block->block_info['block_title'];
  $block_size = ( !empty($block_size) ? $block_size : '100%' );
+ $description = $mx_block->block_info['block_desc'];
+ $show_block = $mx_block->block_info['show_block'];
+ $show_title = ($userdata['user_level'] == ADMIN) ? true : $mx_block->block_info['show_title'];
+ $show_stats = $mx_block->block_info['show_stats'];
  
  
***************
*** 79,114 ****
  if (($mx_cache->get('album_cat_list')) && ($use_cache))
  {
! 	$catrows = $mx_cache->get('album_cat_list');
  }
- else
- {
- 	 $sql = "SELECT c.*, COUNT(p.pic_id) AS count
- 	 		FROM ". ALBUM_CAT_TABLE ." AS c
- 	 			LEFT JOIN ". ALBUM_TABLE ." AS p ON c.cat_id = p.pic_cat_id
- 	 		WHERE cat_id <> 0
- 	 		GROUP BY cat_id
- 	 		ORDER BY cat_order ASC";
- 	 if( !($result = $db->sql_query($sql)) )
- 	 {
- 	 	mx_message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql);
- 	 }
- 	 
- 	 $catrows = array();
  
! 	 while( $row = $db->sql_fetchrow($result) )
! 	 {
! 	 	$album_user_access = album_user_access($row['cat_id'], $row, 1, 0, 0, 0, 0, 0); // VIEW
! 	 	if ($album_user_access['view'] == 1)
! 	 	{
! 	 		$catrows[] = $row;
! 	 	}
! 	 }
  
! 	if ($use_cache)
! 	{
! 		$mx_cache->put('album_cat_list', $catrows);
! 	}
  }
  
  $allowed_cat = ''; // For Recent Public Pics below
  // $catrows now stores all categories which this user can view. Dump them out!
--- 83,118 ----
  if (($mx_cache->get('album_cat_list')) && ($use_cache))
  {
! 	$catrows_cache = $mx_cache->get('album_cat_list');
  }
  
!  $sql = "SELECT c.*, COUNT(p.pic_id) AS count
!  		FROM ". ALBUM_CAT_TABLE ." AS c
!  			LEFT JOIN ". ALBUM_TABLE ." AS p ON c.cat_id = p.pic_cat_id
!  		WHERE cat_id <> 0
!  		GROUP BY cat_id
!  		ORDER BY cat_order ASC";
!  if( !($result = $db->sql_query($sql)) )
!  {
!  	mx_message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql);
!  }
! 	 
!  $catrows = array();
  
!  while( $row = $db->sql_fetchrow($result) )
!  {
!  	$album_user_access = album_user_access($row['cat_id'], $row, 1, 0, 0, 0, 0, 0); // VIEW
!  	if ($album_user_access['view'] == 1)
!  	{
!  		$catrows[] = $row;
!  	}
!  }
!  
! if (intval($catrows['count']) <> count($catrows_cache))
! {
! 	$use_cache = false;
! 	$mx_cache->put('album_cat_list', $catrows);
  }
  
+ 
  $allowed_cat = ''; // For Recent Public Pics below
  // $catrows now stores all categories which this user can view. Dump them out!
***************
*** 197,208 ****
  					);
  
! 					if( ($recentrow[$j]['user_id'] == ALBUM_GUEST) or ($recentrow[$j]['username'] == '') )
! 					{
! 						$recent_poster = ($recentrow[$j]['pic_username'] == '') ? $lang['Guest'] : $recentrow[$j]['pic_username'];
! 					}
! 					else
! 					{
! 						$recent_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $recentrow[$j]['user_id']) .'">'. $recentrow[$j]['username'] .'</a>';
! 					}
  					
  					$rating_image = ImageRating($recentrow[$j]['rating']);
--- 201,205 ----
  					);
  
! 					$recent_poster = album_get_profile_url('full', $recentrow[$j]['user_id'], $recentrow[$j]['username'], false);
  					
  					$rating_image = ImageRating($recentrow[$j]['rating']);
***************
*** 318,329 ****
  					);
  
! 					if( ($mostrow[$j]['user_id'] == ALBUM_GUEST) or ($mostrow[$j]['username'] == '') )
! 					{
! 						$most_poster = ($mostrow[$j]['pic_username'] == '') ? $lang['Guest'] : $mostrow[$j]['pic_username'];
! 					}
! 					else
! 					{
! 						$most_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $mostrow[$j]['user_id']) .'">'. $mostrow[$j]['username'] .'</a>';
! 					}
  					
  					$rating_image = ImageRating($mostrow[$j]['rating']);
--- 315,319 ----
  					);
  
! 					$most_poster = album_get_profile_url('full', $mostrow[$j]['user_id'], $mostrow[$j]['username'], false);					
  					
  					$rating_image = ImageRating($mostrow[$j]['rating']);
***************
*** 438,449 ****
  					);
  
! 					if( ($highestrow[$j]['user_id'] == ALBUM_GUEST) or ($highestrow[$j]['username'] == '') ) 
! 					{
! 						$highest_poster = ($highestrow[$j]['pic_username'] == '') ? $lang['Guest'] : $highestrow[$j]['pic_username']; 
! 					}
! 					else 
! 					{
! 						$highest_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $highestrow[$j]['user_id']) .'">'. $highestrow[$j]['username'] .'</a>'; 
! 					}
  			
  					$rating_image = ImageRating($highestrow[$j]['rating']);
--- 428,432 ----
  					);
  
! 					$highest_poster = album_get_profile_url('full', $highestrow[$j]['user_id'], $highestrow[$j]['username'], false);				
  			
  					$rating_image = ImageRating($highestrow[$j]['rating']);
***************
*** 556,568 ****
  						)
  					);
! 
! 					if( ($randrow[$j]['user_id'] == ALBUM_GUEST) or ($randrow[$j]['username'] == '') )
! 					{
! 						$rand_poster = ($randrow[$j]['pic_username'] == '') ? $lang['Guest'] : $randrow[$j]['pic_username'];
! 					}
! 					else
! 					{
! 						$rand_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $randrow[$j]['user_id']) .'">'. $randrow[$j]['username'] .'</a>';
! 					}
  					
  					
--- 539,544 ----
  						)
  					);
! 					
! 					$rand_poster = album_get_profile_url('full', $randrow[$j]['user_id'], $randrow[$j]['username'], false);						
  					
  					
***************
*** 632,635 ****
--- 608,614 ----
  	'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'],
  
+ 	'L_DESCRIPTION' => $description,
+ 	'S_SHOW_TITLE' => $show_title,
+ 	'BLOCK_SIZE' => $block_size,	
  	'S_COLS' => $album_sp_config['img_cols'],
  	'S_COL_WIDTH' => (100/$album_sp_config['img_cols']) . '%',

Index: welcome.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** welcome.php	31 Aug 2008 13:40:29 -0000	1.14
--- welcome.php	1 Sep 2008 01:11:48 -0000	1.15
***************
*** 18,23 ****
  }
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
! include_once($mx_root_path . 'common.'.$phpEx);
  
  //
--- 18,23 ----
  }
  
! //$phpEx = substr(strrchr(__FILE__, '.'), 1); 
! //include_once($mx_root_path . 'common.'.$phpEx);
  
  //
***************
*** 79,83 ****
  // ------------------------------------
  
! if( ($user_id < 1) and (!$userdata['session_logged_in']) )
  {
  	$user_id = ANONYMOUS;
--- 79,83 ----
  // ------------------------------------
  
! if( ($user_id < 2) || ($mx_user->data['user_id'] == ANONYMOUS) )
  {
  	$user_id = ANONYMOUS;
***************
*** 88,91 ****
--- 88,93 ----
  // ------------------------------------
  
+ $row = album_get_userdata($user_id, false);
+ 
  $sql = "SELECT *
  		FROM ". USERS_TABLE ."
***************
*** 105,117 ****
  $user_lastvisit = $row['user_lastvisit'];
  
! if( empty($username) )
  {
! 	$username = ( !empty($userdata['username']) ? $userdata['username'] : $lang['Guest'] );
! 	$user_avatar_type = ( !empty($userdata['user_avatar_type']) ? $userdata['user_avatar_type'] : '' );
! 	$user_allowavatar = ( !empty($userdata['user_allowavatar']) ? $userdata['user_allowavatar'] : '' );
! 	$user_avatar = ( !empty($userdata['user_avatar']) ? $userdata['user_avatar'] : '' );
! 	$user_lastvisit = ( !empty($userdata['user_lastvisit']) ? $userdata['user_lastvisit'] : '' );
  }
  
  // ------------------------------------
  // Check Permissions
--- 107,120 ----
  $user_lastvisit = $row['user_lastvisit'];
  
! if(empty($username) || ($lang['Guest']))
  {
! 	$username = ( !empty($mx_user->data['username']) ? $mx_user->data['username'] : $lang['Guest'] );
! 	$user_avatar_type = ( !empty($mx_user->data['user_avatar_type']) ? $mx_user->data['user_avatar_type'] : '' );
! 	$user_allowavatar = ( !empty($mx_user->data['user_allowavatar']) ? $mx_user->data['user_allowavatar'] : '' );
! 	$user_avatar = ( !empty($mx_user->data['user_avatar']) ? $mx_user->data['user_avatar'] : '' );
! 	$user_lastvisit = ($mx_user->data['user_id'] != ANONYMOUS) ? album_create_date($board_config['default_dateformat'], $mx_user->data['user_lastvisit'], $board_config['board_timezone']) : '';
  }
  
+ 
  // ------------------------------------
  // Check Permissions
***************
*** 173,199 ****
  	switch( $user_avatar_type )
  	{
! 	case USER_AVATAR_UPLOAD:
! 		$avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$user_avatar.'" alt="" border="0" />' : '';
! 		break;
! 	case USER_AVATAR_REMOTE:
! 		$img_width = '';
! 		if( ($img_info = @getimagesize($userdata['user_avatar'])) !== FALSE )
! 		{
! 			if( $img_info[0] > $board_config['avatar_max_width'] )
  			{
! 				$img_width = ' width="'.$board_config['avatar_max_width'].'"';
  			}
! 		}
! 		$avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$user_avatar.'"'.$img_width.' alt="" border="0" />' : '';
! 		break;
! 	case USER_AVATAR_GALLERY:
! 		$avatar_img = ( $board_config['allow_avatar_local']  ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$user_avatar.'" alt="" border="0" />' : '';
! 		break;
  	}
  }
  
! if( empty($avatar_img) && !empty($default_avatar) )
  {
! 	if( $user_id == ANONYMOUS )
  	{
  		$avatar_img = '<img src="' . $guest_avatar . '" alt="" border="0" />';
--- 176,202 ----
  	switch( $user_avatar_type )
  	{
! 		case USER_AVATAR_UPLOAD:
! 			$avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$user_avatar.'" alt="" border="0" />' : '';
! 			break;
! 		case USER_AVATAR_REMOTE:
! 			$img_width = '';
! 			if( ($img_info = @getimagesize($userdata['user_avatar'])) !== FALSE )
  			{
! 				if( $img_info[0] > $board_config['avatar_max_width'] )
! 				{
! 					$img_width = ' width="'.$board_config['avatar_max_width'].'"';
! 				}
  			}
! 			$avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$user_avatar.'"'.$img_width.' alt="" border="0" />' : '';
! 			break;
! 		case USER_AVATAR_GALLERY:
! 			$avatar_img = ( $board_config['allow_avatar_local']  ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$user_avatar.'" alt="" border="0" />' : '';
! 			break;
  	}
  }
  
! if(!($avatar_img))
  {
! 	if ($mx_user->data['user_id'] == ANONYMOUS) 
  	{
  		$avatar_img = '<img src="' . $guest_avatar . '" alt="" border="0" />';
***************
*** 212,215 ****
--- 215,244 ----
  );
  
+ switch (PORTAL_BACKEND)
+ {
+ 	case 'internal':
+ 
+ 		$u_phpbb_sendpass = '';
+ 		$u_phpbb_register = '';
+ 		$u_privatemsgs = '';		
+ 	break;
+ 	case 'phpbb2':
+ 
+ 		$u_phpbb_sendpass = mx_append_sid(PHPBB_URL . 'profile.'.$phpEx.'?mode=sendpassword');
+ 		$u_phpbb_register = mx_append_sid(PHPBB_URL . 'profile.'.$phpEx.'?mode=register');
+ 		$u_privatemsgs = mx_append_sid(PHPBB_URL . 'profile.'.$phpEx.'?i=pm&folder=inbox');		
+ 	break;
+ 
+ 	case 'phpbb3':
+ 
+ 		$u_phpbb_sendpass = ($board_config['email_enable']) ? mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '';
+ 		$u_phpbb_register = mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register');
+ 		$u_privatemsgs = mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", '?i=pm&folder=inbox');
+ 	break;
+ }
+ 
+ $l_timezone = explode( '.', $portal_config['board_timezone'] );
+ $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $portal_config['board_timezone'] )] : $lang[number_format( $portal_config['board_timezone'] )];
+ 
  //
  // Activate template switches for Vertical/Horizontal Layout...
***************
*** 227,234 ****
  // Get User Dependent Information...
  //
! if( $userdata['session_logged_in'] )
  {
- 	$s_last_visit = album_create_date($board_config['default_dateformat'], $user_lastvisit, $board_config['board_timezone']);
- 
  	if( $view_postcount )
  	{
--- 256,261 ----
  // Get User Dependent Information...
  //
! if($mx_user->data['user_id'] != ANONYMOUS)
  {
  	if( $view_postcount )
  	{
***************
*** 237,242 ****
  			' WHERE p.post_id = t.topic_first_post_id' .
  				' AND p2.post_id = t.topic_last_post_id' .
! 				' AND p2.post_time > ' . $userdata['user_lastvisit'] .
! 				' AND t.forum_id IN (' . get_auth_forum() . ')';
  		if( ($result = $db->sql_query($sql)) == TRUE )
  		{
--- 264,269 ----
  			' WHERE p.post_id = t.topic_first_post_id' .
  				' AND p2.post_id = t.topic_last_post_id' .
! 				' AND p2.post_time > ' . $mx_user->data['user_lastvisit'] .
! 				' AND t.forum_id IN (' . $phpbb_auth->get_auth_forum() . ')';
  		if( ($result = $db->sql_query($sql)) == TRUE )
  		{
***************
*** 244,249 ****
  			$rowset = $db->sql_fetchrowset($result);
  
! 			$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array();
! 			$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array();
  
  			for( $i = 0; $i < count($rowset); $i++ )
--- 271,276 ----
  			$rowset = $db->sql_fetchrowset($result);
  
! 			$tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_t']) : array();
! 			$tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_f']) : array();
  
  			for( $i = 0; $i < count($rowset); $i++ )
***************
*** 253,257 ****
  					continue;
  				}
! 				if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
  				{
  					$topic_id = $rowset[$i]['topic_id'];
--- 280,284 ----
  					continue;
  				}
! 				if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) )
  				{
  					$topic_id = $rowset[$i]['topic_id'];
***************
*** 271,277 ****
  						}
  					}
! 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
  					{
! 						if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $rowset[$i]['post_time'] )
  						{
  							continue;
--- 298,304 ----
  						}
  					}
! 					if( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) )
  					{
! 						if( $_COOKIE[$board_config['cookie_name'] . '_f_all'] > $rowset[$i]['post_time'] )
  						{
  							continue;
***************
*** 291,295 ****
  {
  	$s_last_visit = '';
! 	$register_msg = sprintf($register_msg, '<a href="'.append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=register').'">', '</a>');
  	$template->assign_block_vars('welcome_user_logged_out', array());
  
--- 318,322 ----
  {
  	$s_last_visit = '';
! 	$register_msg = sprintf($register_msg, '<a href="'.$u_phpbb_register.'">', '</a>');
  	$template->assign_block_vars('welcome_user_logged_out', array());
  
***************
*** 302,306 ****
  	}
  }
! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&amp;".$user_id).'">'.$username.'</a>' : $lang['Guest'];
  
  if( $report_page == 0 )
--- 329,333 ----
  	}
  }
! $user_link = album_get_profile_url('full', $user_id, $username, false);
  
  if( $report_page == 0 )
***************
*** 315,318 ****
--- 342,347 ----
  $u_egostarted = mx_append_sid($u_view_topics.'egostarted');
  
+ 
+ 
  //
  // Setup common template vars and display the block.
***************
*** 330,336 ****
  	'L_LOG_ME_IN'			=> $lang['Log_me_in'],
  	'L_FORGOTTEN_PSW'		=> $lang['Forgotten_password'],
! 	'U_FORGOTTEN_PSW'		=> mx_append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=sendpassword'),
  	'L_REGISTER'			=> $lang['Register'],
! 	'U_REGISTER'			=> mx_append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=register'),
  	'L_REGISTER_MSG'		=> $register_msg,
  
--- 359,365 ----
  	'L_LOG_ME_IN'			=> $lang['Log_me_in'],
  	'L_FORGOTTEN_PSW'		=> $lang['Forgotten_password'],
! 	'U_FORGOTTEN_PSW'		=> $u_phpbb_sendpass,
  	'L_REGISTER'			=> $lang['Register'],
! 	'U_REGISTER'			=> $u_phpbb_register,
  	'L_REGISTER_MSG'		=> $register_msg,
  
***************
*** 360,370 ****
  	'U_PRIVATE_MSGS'		=> mx_append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'),
  
! 	'LAST_VISIT_DATE'		=> sprintf($lang['You_last_visit'], $s_last_visit),
! 	'CURRENT_TIME'			=> sprintf($lang['Current_time'], album_create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
! 	'S_TIMEZONE'			=> sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])]))
  );
  if( $view_jump_to )
  {
! 	make_jumpbox(PHPBB_URL.'viewforum.'.$phpEx);
  }
  $template->pparse('welcome_body');
--- 389,399 ----
  	'U_PRIVATE_MSGS'		=> mx_append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'),
  
! 	'LAST_VISIT_DATE'		=> sprintf($lang['You_last_visit'], $user_lastvisit),
! 	'CURRENT_TIME'			=> sprintf($lang['Current_time'], album_create_date($portal_config['default_dateformat'], time(), $portal_config['board_timezone'])),
! 	'S_TIMEZONE'			=> sprintf($lang['All_times'], $l_timezone ))
  );
  if( $view_jump_to )
  {
! 	phpBB2::make_jumpbox(PHPBB_URL.'viewforum.'.$phpEx);
  }
  $template->pparse('welcome_body');

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** db_install.php	31 Aug 2008 13:30:06 -0000	1.24
--- db_install.php	1 Sep 2008 01:11:47 -0000	1.25
***************
*** 32,36 ****
  }
  
! global $mx_user, $client_ip;
  
  $mx_module_version = '2.9.3';
--- 32,54 ----
  }
  
! global $mx_user;
! 
! 
! switch (PORTAL_BACKEND)
! {
! 	case 'internal':
! 						
! 	case 'phpbb2':
! 			
! 		$pic_user_id = $userdata['user_id'];
! 		$pic_user_ip = $userdata['session_ip'];
! 	break;
! 
! 	case 'phpbb3':
! 
! 		$pic_user_id = $mx_user->data['user_id'];
! 		$pic_user_ip = album_encode_ip($mx_user->data['session_ip']);
! 	break;
! }
  
  $mx_module_version = '2.9.3';
***************
*** 403,407 ****
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_cat VALUES ('1', 'Test Category', 'Just a test category.', '', '10', '-1', '2', '0', '0', '3', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2', '0', '0')";
  	
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album VALUES ('1', 'mx_publisher_cms_testimage.png', 'mx_publisher_cms_testimage.png', 'Mxp Pic', 'Mx-Publisher Image', '" . $mx_user->data['user_id'] . "', '" . $mx_user->data['username'] . "', '" . $client_ip . "', '" . time() . "', '1', '1', '0', '1')";
  
  
--- 421,425 ----
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_cat VALUES ('1', 'Test Category', 'Just a test category.', '', '10', '-1', '2', '0', '0', '3', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2', '0', '0')";
  	
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album VALUES ('1', 'mx_publisher_cms_testimage.png', 'mx_publisher_cms_testimage.png', 'Mxp Pic', 'Mx-Publisher Image', '" . $pic_user_id . "', '" . $mx_user->data['username'] . "', '" . $pic_user_ip. "', '" . time() . "', '1', '1', '0', '1')";
  
  

[mxbb-commits] mx_smartor/templates/prosilver/images default_avatar.png, 1.1, 1.2

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

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

Modified Files:
	default_avatar.png 
Log Message:
some solved issues

Index: default_avatar.png
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/prosilver/images/default_avatar.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsfmzVC4 and /tmp/cvslipLsH differ

[mxbb-commits] mx_smartor/album_mod/modules album_upload.php, 1.4, 1.5

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

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

Modified Files:
	album_upload.php 
Log Message:
some solved issues

Index: album_upload.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_upload.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_upload.php	29 Aug 2008 05:58:24 -0000	1.4
--- album_upload.php	1 Sep 2008 01:11:49 -0000	1.5
***************
*** 778,781 ****
--- 778,798 ----
  		$pic_user_id = $userdata['user_id'];
  		$pic_user_ip = $userdata['session_ip'];
+ 		
+ 		switch (PORTAL_BACKEND)
+ 		{
+ 			case 'internal':
+ 						
+ 			case 'phpbb2':
+ 			
+ 				$pic_user_id = $userdata['user_id'];
+ 				$pic_user_ip = $userdata['session_ip'];
+ 			break;
+ 
+ 			case 'phpbb3':
+ 
+ 				$pic_user_id = $mx_user->data['user_id'];
+ 				$pic_user_ip = album_encode_ip($mx_user->data['session_ip']);
+ 			break;
+ 		}		
  
  

[mxbb-commits] mx_smartor/templates/_core/images default_avatar.png, 1.1, 1.2

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

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

Modified Files:
	default_avatar.png 
Log Message:
some solved issues

Index: default_avatar.png
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/images/default_avatar.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsupGEqT and /tmp/cvsBmw15l differ

[mxbb-commits] mx_smartor/templates/_core album_box.tpl, 1.4, 1.5 album_lists.tpl, 1.3, 1.4 welcome_body.tpl, 1.1, 1.2

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

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

Modified Files:
	album_box.tpl album_lists.tpl welcome_body.tpl 
Log Message:
some solved issues

Index: album_box.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_box.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_box.tpl	29 Aug 2008 13:34:37 -0000	1.4
--- album_box.tpl	1 Sep 2008 01:11:49 -0000	1.5
***************
*** 48,70 ****
  				<!-- BEGIN catrow -->
  				<tr>
! 					<td class="row1 icon" width="1%"><img src="{catmain.catrow.CAT_IMG}" alt="" /></td>
! 					<!-- <td class="row1" height="50" onMouseOver="this.style.backgroundColor='{T_TD_COLOR1}';" onMouseOut="this.style.backgroundColor='{T_TR_COLOR1}';"> -->
! 					<td class="row1 icon" height="50" onMouseOver="this.className='row2';" onMouseOut="this.className='row1';">
! 						<span class="forumlink">
! 							&nbsp;{NAV_DOT}&nbsp;<a href="{catmain.catrow.U_VIEWCAT}" class="forumlink">{catmain.catrow.CAT_TITLE}</a>
  							<!-- BEGIN newpics -->
! 							<img src="{catmain.catrow.newpics.I_NEWEST_PICS}" border="0" alt="{catmain.catrow.newpics.L_NEWEST_PICS}" title="{catmain.catrow.newpics.L_NEWEST_PICS}">
! 							<!-- END newpics -->
! 						</span>
! 						<span class="genmed" nowrap="nowrap">{catmain.catrow.SLIDESHOW}&nbsp;</span>
! 						<br />
! 						<img src="{SPACER}" width="14" height="1" alt="" />
! 						<span class="genmed">{catmain.catrow.CAT_DESC}&nbsp;</span>
! 						<span class="gensmall">{catmain.catrow.L_MODERATORS}&nbsp;{catmain.catrow.MODERATORS}</span>
! 						<!-- BEGIN subcat_link -->
! 						<br />
! 						<img src="{SPACER}" width="1" height="14" alt="" />
! 						<span class="gensmall">{catmain.catrow.subcat_link.L_LINKS}:&nbsp;{catmain.catrow.subcat_link.LINKS}</span>
! 						<!-- END subcat_link -->
  					</td>
  					<!-- BEGIN thumb -->
--- 48,69 ----
  				<!-- BEGIN catrow -->
  				<tr>
! 					<td class="row1 bg1" width="1%"><img src="{catmain.catrow.CAT_IMG}" alt="" /></td>
! 					<td class="row1 bg1" height="50" onMouseOver="this.className='row2';" onMouseOut="this.className='row1';">
! 							<div style="font-weight: bold"><a href="{catmain.catrow.U_VIEWCAT}" class="forumlink">{catmain.catrow.CAT_TITLE}</a></div>
  							<!-- BEGIN newpics -->
! 							<span class="lastpost">							
! 									<img src="{catmain.catrow.newpics.I_NEWEST_PICS}" border="0" alt="{catmain.catrow.newpics.L_NEWEST_PICS}" title="{catmain.catrow.newpics.L_NEWEST_PICS}">
! 							</span>							
! 								<!-- END newpics -->
! 							<span class="genmed" nowrap="nowrap">{catmain.catrow.SLIDESHOW}&nbsp;</span>
! 							<br />
! 							<img src="{SPACER}" width="14" height="1" alt="" />
! 							<span class="genmed">{catmain.catrow.CAT_DESC}&nbsp;</span>
! 							<span class="gensmall">{catmain.catrow.L_MODERATORS}&nbsp;{catmain.catrow.MODERATORS}</span>
! 							<!-- BEGIN subcat_link -->
! 							<br />
! 							<img src="{SPACER}" width="1" height="14" alt="" />
! 							<span class="gensmall">{catmain.catrow.subcat_link.L_LINKS}:&nbsp;{catmain.catrow.subcat_link.LINKS}</span>
! 							<!-- END subcat_link -->
  					</td>
  					<!-- BEGIN thumb -->

Index: album_lists.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_lists.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_lists.tpl	29 Aug 2008 05:58:25 -0000	1.3
--- album_lists.tpl	1 Sep 2008 01:11:50 -0000	1.4
***************
*** 1,7 ****
  <!-- BEGIN recent_pics_block -->
  <div class="forabg block">
! 	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>
! 		<div class="textbody">
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  			  <tr>
--- 1,17 ----
+ <!-- IF S_SHOW_TITLE  eq 1 -->
+ <div class="forabg block">
+ 	<span class="topiclist"><span></span></span>
+ 	<span class="corners-bottom"><span></span></span>
+ </div>
+ <!-- ENDIF  -->
+ 
  <!-- BEGIN recent_pics_block -->
  <div class="forabg block">
! 	<div class="inner"><span class="corners-top"><span></span></span>
! 	<ul class="topiclist">
! 		<li class="header">
! 	</ul></li>
! 	<div id="p1" class="post bg2 online">	
! 	<div class="textbody">	
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  			  <tr>
***************
*** 42,48 ****
  <!-- BEGIN most_pics_block -->
  <div class="forabg block">
! 	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>
! 		<div class="textbody">
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  			  <tr>
--- 52,61 ----
  <!-- BEGIN most_pics_block -->
  <div class="forabg block">
! 	<div class="inner"><span class="corners-top"><span></span></span>
! 	<ul class="topiclist">
! 		<li class="header">
! 	</ul></li>
! 	<div id="p1" class="post bg2 online">	
! 	<div class="textbody">
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  			  <tr>
***************
*** 83,89 ****
  <!-- BEGIN highest_pics_block -->
  <div class="forabg block">
! 	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>
! 		<div class="textbody">
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> 
  			  <tr> 
--- 96,105 ----
  <!-- BEGIN highest_pics_block -->
  <div class="forabg block">
! 	<div class="inner"><span class="corners-top"><span></span></span>
! 	<ul class="topiclist">
! 		<li class="header">
! 	</ul></li>
! 	<div id="p1" class="post bg2 online">	
! 	<div class="textbody">
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> 
  			  <tr> 
***************
*** 125,131 ****
  <!-- BEGIN random_pics_block -->
  <div class="forabg block">
! 	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>
! 		<div class="textbody">
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  			  <tr>
--- 141,150 ----
  <!-- BEGIN random_pics_block -->
  <div class="forabg block">
! 	<div class="inner"><span class="corners-top"><span></span></span>
! 	<ul class="topiclist">
! 		<li class="header">
! 	</ul></li>
! 	<div id="p1" class="post bg2 online">	
! 	<div class="textbody">
  			<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  			  <tr>

Index: welcome_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/welcome_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** welcome_body.tpl	5 Feb 2008 04:04:25 -0000	1.1
--- welcome_body.tpl	1 Sep 2008 01:11:50 -0000	1.2
***************
*** 1,2 ****
--- 1,7 ----
+ <div class="forabg block">
+ 	<div id="p1" class="post bg2 online">
+ 		<div class="inner"><span class="corners-top"><span></span></span>
+ 		<div class="textbody">
+ 
  <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  	<tr>
***************
*** 12,16 ****
  			<span class="gen">{L_WELCOME_USER}<br />&nbsp;<br />{L_WELCOME_MSG}</span>
  		<!-- BEGIN welcome_user_logged_out -->
! 			<!-- {AVATAR_IMG} -->
  			<div align="center">
  			<form action="{S_LOGIN_ACTION}" method="post" style="margin-bottom:0px;">
--- 17,21 ----
  			<span class="gen">{L_WELCOME_USER}<br />&nbsp;<br />{L_WELCOME_MSG}</span>
  		<!-- BEGIN welcome_user_logged_out -->
! 			{AVATAR_IMG}
  			<div align="center">
  			<form action="{S_LOGIN_ACTION}" method="post" style="margin-bottom:0px;">
***************
*** 137,139 ****
--- 142,148 ----
  </table>
  
+ 		</div></div>
+ 	</div>
+ 	<span class="corners-bottom"><span></span></span>
+ </div>
  <br clear="all" />

[mxbb-commits] mx_smartor/upload mx_publisher_cms_testimage.png, NONE, 1.1

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

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

Added Files:
	mx_publisher_cms_testimage.png 
Log Message:
some solved issues

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

[mxbb-commits] mx_smartor album_lists.php, 1.26, 1.27 welcome.php, 1.13, 1.14

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

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

Modified Files:
	album_lists.php welcome.php 
Log Message:
fix

Index: album_lists.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_lists.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** album_lists.php	29 Aug 2008 05:58:23 -0000	1.26
--- album_lists.php	31 Aug 2008 13:40:28 -0000	1.27
***************
*** 211,215 ****
  						'TITLE' => $recentrow[$j]['pic_title'],
  						'POSTER' => $recent_poster,
! 						'TIME' => create_date2($board_config['default_dateformat'], $recentrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $recentrow[$j]['pic_view_count'],
--- 211,215 ----
  						'TITLE' => $recentrow[$j]['pic_title'],
  						'POSTER' => $recent_poster,
! 						'TIME' => album_create_date($board_config['default_dateformat'], $recentrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $recentrow[$j]['pic_view_count'],
***************
*** 332,336 ****
  						'TITLE' => $mostrow[$j]['pic_title'],
  						'POSTER' => $most_poster,
! 						'TIME' => create_date2($board_config['default_dateformat'], $mostrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $mostrow[$j]['pic_view_count'],
--- 332,336 ----
  						'TITLE' => $mostrow[$j]['pic_title'],
  						'POSTER' => $most_poster,
! 						'TIME' => album_create_date($board_config['default_dateformat'], $mostrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $mostrow[$j]['pic_view_count'],
***************
*** 452,456 ****
  						'H_TITLE' => $highestrow[$j]['pic_title'], 
  						'H_POSTER' => $highest_poster, 
! 						'H_TIME' => create_date2($board_config['default_dateformat'], $highestrow[$j]['pic_time'], $board_config['board_timezone']), 
  
  						'H_VIEW' => $highestrow[$j]['pic_view_count'], 
--- 452,456 ----
  						'H_TITLE' => $highestrow[$j]['pic_title'], 
  						'H_POSTER' => $highest_poster, 
! 						'H_TIME' => album_create_date($board_config['default_dateformat'], $highestrow[$j]['pic_time'], $board_config['board_timezone']), 
  
  						'H_VIEW' => $highestrow[$j]['pic_view_count'], 
***************
*** 573,577 ****
  						'TITLE' => $randrow[$j]['pic_title'],
  						'POSTER' => $rand_poster,
! 						'TIME' => create_date2($board_config['default_dateformat'], $randrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $randrow[$j]['pic_view_count'],
--- 573,577 ----
  						'TITLE' => $randrow[$j]['pic_title'],
  						'POSTER' => $rand_poster,
! 						'TIME' => album_create_date($board_config['default_dateformat'], $randrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $randrow[$j]['pic_view_count'],

Index: welcome.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** welcome.php	29 Aug 2008 05:58:23 -0000	1.13
--- welcome.php	31 Aug 2008 13:40:29 -0000	1.14
***************
*** 229,233 ****
  if( $userdata['session_logged_in'] )
  {
! 	$s_last_visit = create_date($board_config['default_dateformat'], $user_lastvisit, $board_config['board_timezone']);
  
  	if( $view_postcount )
--- 229,233 ----
  if( $userdata['session_logged_in'] )
  {
! 	$s_last_visit = album_create_date($board_config['default_dateformat'], $user_lastvisit, $board_config['board_timezone']);
  
  	if( $view_postcount )
***************
*** 361,365 ****
  
  	'LAST_VISIT_DATE'		=> sprintf($lang['You_last_visit'], $s_last_visit),
! 	'CURRENT_TIME'			=> sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
  	'S_TIMEZONE'			=> sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])]))
  );
--- 361,365 ----
  
  	'LAST_VISIT_DATE'		=> sprintf($lang['You_last_visit'], $s_last_visit),
! 	'CURRENT_TIME'			=> sprintf($lang['Current_time'], album_create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
  	'S_TIMEZONE'			=> sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])]))
  );

[mxbb-commits] mx_smartor db_install.php,1.23,1.24

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

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

Modified Files:
	db_install.php 
Log Message:
test category added

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** db_install.php	29 Aug 2008 05:58:23 -0000	1.23
--- db_install.php	31 Aug 2008 13:30:06 -0000	1.24
***************
*** 32,35 ****
--- 32,37 ----
  }
  
+ global $mx_user, $client_ip;
+ 
  $mx_module_version = '2.9.3';
  $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>';
***************
*** 178,182 ****
  elseif( !$result = $db->sql_query("SELECT config_name from ".$mx_table_prefix."smartor_album_sp_config"))
  { 
! $message = "<b>This is a fresh install!</b><br/><br/>";
  
  	$sql = array();
--- 180,184 ----
  elseif( !$result = $db->sql_query("SELECT config_name from ".$mx_table_prefix."smartor_album_sp_config"))
  { 
! 	$message = "<b>This is a fresh install!</b><br/><br/>";
  
  	$sql = array();
***************
*** 395,400 ****
--- 397,408 ----
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_sp_config VALUES ('midthumb_cache', '1')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_sp_config VALUES ('jaime_lettering', '0')";
+ 	
  
  	$sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_rate ADD  rate_hon_point TINYINT(3) DEFAULT '0' NOT NULL";
+ 	
+ 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_cat VALUES ('1', 'Test Category', 'Just a test category.', '', '10', '-1', '2', '0', '0', '3', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2', '0', '0')";
+ 	
+ 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album VALUES ('1', 'mx_publisher_cms_testimage.png', 'mx_publisher_cms_testimage.png', 'Mxp Pic', 'Mx-Publisher Image', '" . $mx_user->data['user_id'] . "', '" . $mx_user->data['username'] . "', '" . $client_ip . "', '" . time() . "', '1', '1', '0', '1')";
+ 
  
  	$sql[] = "UPDATE " . $mx_table_prefix . "module" . "

[mxbb-commits] mx_smartor/album_mod/includes album_integration.php, 1.4, 1.5

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

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

Modified Files:
	album_integration.php 
Log Message:
mod rewrite does not work :(

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_integration.php	31 Aug 2008 00:06:43 -0000	1.4
--- album_integration.php	31 Aug 2008 13:28:56 -0000	1.5
***************
*** 70,74 ****
  		if (is_object($mx_mod_rewrite))
  		{
! 			$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
  		}	
  		
--- 70,74 ----
  		if (is_object($mx_mod_rewrite))
  		{
! 			//$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
  		}	
  		
***************
*** 85,89 ****
  	if (is_object($mx_mod_rewrite))
  	{
! 		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
  	}	
  		
--- 85,89 ----
  	if (is_object($mx_mod_rewrite))
  	{
! 		//$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
  	}	
  		
***************
*** 135,139 ****
  	if (is_object($mx_mod_rewrite))
  	{
! 		$mxurl = $mx_mod_rewrite->encode($mxurl);
  	}	
  	
--- 135,139 ----
  	if (is_object($mx_mod_rewrite))
  	{
! 		//$mxurl = $mx_mod_rewrite->encode($mxurl);
  	}	
  	
***************
*** 196,200 ****
  	if (is_object($mx_mod_rewrite))
  	{
! 		$mxurl = $mx_mod_rewrite->encode($mxurl);
  	}	
  	
--- 196,200 ----
  	if (is_object($mx_mod_rewrite))
  	{
! 		//$mxurl = $mx_mod_rewrite->encode($mxurl);
  	}	
  	

[mxbb-commits] core/includes template.php,1.32,1.33

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

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

Modified Files:
	template.php 
Log Message:
clean up

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/template.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** template.php	31 Aug 2008 00:26:18 -0000	1.32
--- template.php	31 Aug 2008 00:49:25 -0000	1.33
***************
*** 956,968 ****
  		if ($filename)
  		{
! 			($include_once) ? include_once($filename) : include($filename);
  		}
  		elseif ($admin_script)
  		{
! 			($include_once) ? include_once($admin_script) : include($admin_script); // See note above
  		}
  		else
  		{
! 			eval($code);
  		}
  
--- 956,968 ----
  		if ($filename)
  		{
! 			($include_once) ? @include_once($filename) : @include($filename);
  		}
  		elseif ($admin_script)
  		{
! 			($include_once) ? @include_once($admin_script) : @include($admin_script); // See note above
  		}
  		else
  		{
! 			@eval($code);
  		}
  

[mxbb-commits] core/includes template.php,1.31,1.32

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

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

Modified Files:
	template.php 
Log Message:
clean up

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/template.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** template.php	30 Aug 2008 19:04:58 -0000	1.31
--- template.php	31 Aug 2008 00:26:18 -0000	1.32
***************
*** 952,963 ****
  		{
  			echo '<!-- template ', $this->files[$handle], ' start -->';
- 		}
- 		
- 		if ((strpos($filename,'overall_header.')) && defined('MX_PHPBB3_BLOCK'))
- 		{
- 			die("overall_header.");
- 			//Do not include phpBB3 overall header and footer files.
- 			$filename = str_replace('overall_header.', 'index.', $filename);
- 			$filename = str_replace('overall_footer.', 'index.', $filename);													
  		}			
  
--- 952,955 ----
***************
*** 1014,1026 ****
  		}
  		$this->xs_startup();
! 		$force_recompile = empty($this->uncompiled_code[$handle]) ? false : true;
! 		
! 		if ((strpos($this->files_cache[$handle],'overall_header.')) && defined('MX_PHPBB3_BLOCK'))
! 		{
! 			die("overall_header.");
! 			//Do not include phpBB3 overall header and footer files.
! 			$filename = str_replace('overall_header.', 'index.', $filename);
! 			$filename = str_replace('overall_footer.', 'index.', $filename);													
! 		}		
  		
  		// checking if php file exists.
--- 1006,1010 ----
  		}
  		$this->xs_startup();
! 		$force_recompile = empty($this->uncompiled_code[$handle]) ? false : true;		
  		
  		// checking if php file exists.