[mxbb-commits] mx_music/music_box/includes music_constants.php, 1.1.2.4, 1.1.2.5 music_functions.php, 1.1.2.4, 1.1.2.5 music_integration.php, 1.1.2.4, 1.1.2.5

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

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

Modified Files:
      Tag: core28x
	music_constants.php music_functions.php music_integration.php 
Log Message:
upgrade version for core28x branch



Index: music_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_constants.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** music_constants.php	10 Mar 2008 05:56:39 -0000	1.1.2.4
--- music_constants.php	13 Mar 2008 10:34:58 -0000	1.1.2.5
***************
*** 16,27 ****
  if ( !MXBB_MODULE )
  {
! 	$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';
! 	$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
! 	$server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : '';
! 	$script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path']));
! 	$script_name = ($script_name == '') ? $script_name : '/' . $script_name;
! 
! 	define( 'PORTAL_URL', $server_protocol . $server_name . $server_port . $script_name . '/' );
! 	define( 'PHPBB_URL', PORTAL_URL );
  
  	$mx_table_prefix = $table_prefix;
--- 16,21 ----
  if ( !MXBB_MODULE )
  {
! 	define('PORTAL_URL', $portal_config['portal_url']);
! 	define('PHPBB_URL', PORTAL_URL);
  
  	$mx_table_prefix = $table_prefix;
***************
*** 64,74 ****
  // Footer Copyrights
  // -------------------------------------------------------------------------
  if (!MXBB_MODULE)
  {
  	if (!defined( 'IN_ADMIN' ))
  	{	
! 		$mx_user->set_module_cfg_name('linkdb');
! 		$mx_user->set_module_lang_path($module_root_path . 'linkdb/');
! 		$mx_user->extend();
  	}
  }
--- 58,69 ----
  // Footer Copyrights
  // -------------------------------------------------------------------------
+ //$mx_user->set_module_lang_path($module_root_path . 'music_box/');
+ 
  if (!MXBB_MODULE)
  {
  	if (!defined( 'IN_ADMIN' ))
  	{	
! 		$mx_user->set_module_lang_path($module_root_path . 'music_box/');
! 		$mx_user->set_module_cfg_name('mx_music');
  	}
  }
***************
*** 77,95 ****
  	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
! 		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! 	}
! 
! 	if (is_object($mx_page))
! 	{
! 		// -------------------------------------------------------------------------
! 		// Extend User Style with module lang and images
! 		// Usage:  $mx_user->extend(LANG, IMAGES)
! 		// Switches:
! 		// - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
! 		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
! 		// -------------------------------------------------------------------------
! 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
  	}
  }
  
  ?>
\ No newline at end of file
--- 72,87 ----
  	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
! 		//$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  	}
  }
  
+ // -------------------------------------------------------------------------
+ // Extend User Style with module lang and images
+ // Usage:  $mx_user->extend(LANG, IMAGES)
+ // Switches:
+ // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
+ // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
+ // -------------------------------------------------------------------------
+ $mx_user->extend(MX_LANG_ALL, MX_IMAGES);
+ 
  ?>
\ No newline at end of file