[mxbb-commits] mx_music/music_box music_common.php, 1.4, 1.5 music_integration.php, 1.2, 1.3

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

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

Modified Files:
	music_common.php music_integration.php 
Log Message:
This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P

Index: music_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/music_common.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** music_common.php	1 Sep 2007 05:38:52 -0000	1.4
--- music_common.php	8 Sep 2007 13:28:29 -0000	1.5
***************
*** 34,43 ****
  if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx ) )
  {
!   	include( $module_root_path . 'language/lang_english/lang_main_music.' . $phpEx );
  	$link_language='lang_english';
  }	
  else
  {
!   	include(  $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx );
  	$link_language='lang_' . $board_config['default_lang'];
  } 
--- 34,43 ----
  if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx ) )
  {
!   	include_once( $module_root_path . 'language/lang_english/lang_main_music.' . $phpEx );
  	$link_language='lang_english';
  }	
  else
  {
!   	include_once(  $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx );
  	$link_language='lang_' . $board_config['default_lang'];
  } 

Index: music_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/music_integration.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** music_integration.php	1 Aug 2007 23:33:29 -0000	1.2
--- music_integration.php	8 Sep 2007 13:28:29 -0000	1.3
***************
*** 69,77 ****
  }
  
! function this_mo_portalurl($args = '')
  {
  	global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block;
  
! 	if( $integration_enabled != "1" )
  	{
  		$mxurl = $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args);
--- 69,77 ----
  }
  
! function this_mo_portalurl($args = '', $force_standalone_mode = false)
  {
  	global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block;
  
! 	if( $force_standalone_mode || $integration_enabled != "1" )
  	{
  		$mxurl = $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args);
***************
*** 84,88 ****
  	return $mxurl;
  }
! function this_mo_loginurl($args = '', $force_standalone_mode = false)
  {
  	global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block;
--- 84,88 ----
  	return $mxurl;
  }
! function this_mo_loginurl($args = '')
  {
  	global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block;
***************
*** 100,103 ****
--- 100,118 ----
  	return $mxurl;
  }
+ function this_mo_rssurl($args = '', $force_standalone_mode = false)
+ {
+ 	global $music_index, $phpEx;
+ 
+ 	if( $force_standalone_mode )
+ 	{
+ 		$mxurl = 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args);
+ 	}
+ 	else
+ 	{
+ 		$mxurl = 'index.' . $phpEx . '?page=' . $music_index . ($args == '' ? '' : '&' . $args);
+ 
+ 	}
+ 	return $mxurl;
+ }
  // --------------------------------------------------------------------------------
  // That's all Folks!