[mxbb-commits] mx_music/music_box index.htm, 1.2, 1.3 music_common.php, 1.5, 1.6 index.html, 1.1,

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

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

Modified Files:
	index.htm music_common.php 
Removed Files:
	index.html music_constants.php music_functions.php 
	music_integration.php 
Log Message:
This upgrade will make mx_music compatible with 2.9

Index: music_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/music_common.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** music_common.php	8 Sep 2007 13:28:29 -0000	1.5
--- music_common.php	29 Jan 2008 07:48:55 -0000	1.6
***************
*** 26,30 ****
  }
  
! include_once($music_root_path . 'music_constants.'.$phpEx);
  
  // **********************************************************************
--- 26,30 ----
  }
  
! include_once($music_root_path . 'includes/' . 'music_constants.'.$phpEx);
  
  // **********************************************************************
***************
*** 32,61 ****
  // **********************************************************************
  
! 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'];
! } 
  
  // **********************************************************************
  //  Read theme definition and language in theme definition
  // **********************************************************************
! 
! if ( file_exists( $module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg" ) )
  {
! // ----------
! 	include($module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg");
! // ----------
! }	
  else
  {
! // ----------
! 	include($module_root_path . "templates/" . "subSilver/" . "subSilver.cfg");
! // ----------
  } 
  
--- 32,167 ----
  // **********************************************************************
  
! if ( !MXBB_MODULE )
  {
! 	if ( !file_exists( $module_root_path . 'music_box/language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx ) )
! 	{
! 		include_once( $module_root_path . 'music_box/language/lang_english/lang_main_music.' . $phpEx );
! 		$link_language='lang_english';
! 	}
! 	else
! 	{
! 		include_once( $module_root_path . 'music_box/language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx );
! 		$link_language='lang_' . $board_config['default_lang'];
! 	}
! }
  else
  {
! 	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'];
! 	} 
! }
  
  // **********************************************************************
  //  Read theme definition and language in theme definition
  // **********************************************************************
! if ( !MXBB_MODULE )
  {
! 	$sql = 'SELECT *
! 		FROM ' . THEMES_TABLE . '
! 		WHERE themes_id = ' . (int) $userdata['user_style'];
! 	if ( !($result = $db->sql_query($sql)) )
! 	{
! 		mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 	}
! 
! 	if ( $row = $db->sql_fetchrow($result) )
! 	{
! 		$db->sql_freeresult($result);
! 		$template_name = $row['template_name'] ;
! 	}
! 	else
! 	{
! 		// We are trying to setup a style which does not exist in the database
! 		// Try to fallback to the board default (if the user had a custom style)
! 		// and then any users using this style to the default if it succeeds
! 		if ( $userdata['user_style'] != $board_config['default_style'])
! 		{
! 			$sql = 'SELECT *
! 				FROM ' . THEMES_TABLE . '
! 				WHERE themes_id = ' . (int) $board_config['default_style'];
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 			}
! 
! 			if ( $row = $db->sql_fetchrow($result) )
! 			{
! 				$db->sql_freeresult($result);
! 				$template_name = $row['template_name'] ;
! 			}
! 			else
! 			{
! 				mx_message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
! 			}
! 		}
! 		else
! 		{
! 			mx_message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
! 		}
! 	}
! 
! 	$template_path = 'templates/' ;
! 	//$template_name = $row['template_name'] ;
! 
! 	//$template = new Template($phpbb_root_path . $template_path . $template_name);
! 
! 	if ( $template )
! 	{
! 		$current_template_path = $template_path . $template_name;
! 	}
! 	else
! 	{
! 		$current_template_path = $template_path . 'subSilver';
! 	}
! 
! 	// -------------------------------------------------------------------------
! 	// Prefix with PORTAL_URL
! 	// -------------------------------------------------------------------------
! 	$current_template_images = $phpbb_root_path . $current_template_path . "/images";
! 
! 	@include($phpbb_root_path . $template_path . $template_name . '/' . 'music.cfg');
! 
! 	$img_lang = ( file_exists($phpbb_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
! 
! 	while( list($key, $value) = @each($mx_images) )
! 	{
! 		if (is_array($value))
! 		{
! 			foreach( $value as $key2 => $val2 )
! 			{
! 				$images[$key][$key2] = $val2;
! 				$mx_images[$key][$key2] = $val2;
! 			}
! 		}
! 		else
! 		{
! 			$images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value);
! 			$mx_images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value);
! 			//$mx_images[$key] = str_replace('admin/templates/','templates/',$mx_images[$key]);
! 		}
! 
! 	}
! }
  else
  {
! 	if ( file_exists( $module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg" ) )
! 	{
! 	// ----------
! 		include($module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg");
! 	// ----------
! 	}	
! 	else
! 	{
! 	// ----------
! 		include($module_root_path . "templates/" . "subSilver/" . "subSilver.cfg");
! 	// ----------
! 	}
  } 
  
***************
*** 67,71 ****
  if(!$result = $db->sql_query($sql))
  {
! 	message_die(GENERAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql);
  }
  while( $row = $db->sql_fetchrow($result) )
--- 173,177 ----
  if(!$result = $db->sql_query($sql))
  {
! 	mx_message_die(GENERAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql);
  }
  while( $row = $db->sql_fetchrow($result) )
***************
*** 76,81 ****
  }
  
! include($music_root_path . 'music_functions.' . $phpEx);
! include($music_root_path . 'music_integration.' . $phpEx);
  
  //
--- 182,193 ----
  }
  
! include($music_root_path . 'includes/' . 'music_functions.' . $phpEx);
! include($music_root_path . 'includes/' . 'music_integration.' . $phpEx);
! 
! if (defined( 'IN_ADMIN' ))
! {
! 	//include_once( $module_root_path . 'music_box/includes/music_admin.' . $phpEx );
! 	//$music_box = new music_admin();
! }
  
  //
***************
*** 85,88 ****
--- 197,201 ----
  $module_name = 'Music Center';
  
+ /*
  $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_name = '$module_name'";
  
***************
*** 98,101 ****
--- 211,215 ----
  	$music_module_version = $module['module_version']; 
  }
+ */
  
  
***************
*** 103,107 ****
  {
  	$music_module_copyright = '<div align="center" class="gensmall" style="font-family: Verdana, Arial, Helvetica, sans-serif; letter-spacing: -1px">';
! 	$music_module_copyright .= 'Media Center Powered by:&nbsp;<a href="http://pubory.uv.ro/" target="_blank">OryNider</a>, &nbsp;mxBB <i> - ' . $music_module_name . '</i> ' . $music_module_version . '&nbsp;&copy;&nbsp;2007 is modified by <a href="http://www.mx-system.com/">MX-Team</a><br />';
  	$music_module_copyright .= '[based on &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a> - <i>Music Online</i> v2.' . $music_config['music_version'] . ']';
  	$music_module_copyright .= '</div>';
--- 217,221 ----
  {
  	$music_module_copyright = '<div align="center" class="gensmall" style="font-family: Verdana, Arial, Helvetica, sans-serif; letter-spacing: -1px">';
! 	$music_module_copyright .= 'Media Center Powered by:&nbsp;<a href="http://mxbb.net" target="_blank">OryNider</a>, &nbsp;mxBB <i> - ' . $music_module_name . '</i> ' . $music_module_version . '&nbsp;&copy;&nbsp;2007 is modified by <a href="http://www.mx-system.com/">MX-Team</a><br />';
  	$music_module_copyright .= '[based on &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a> - <i>Music Online</i> v2.' . $music_config['music_version'] . ']';
  	$music_module_copyright .= '</div>';
***************
*** 110,114 ****
  {
  	$music_module_copyright = '<div align="center" class="gensmall" style="font-family: Verdana, Arial, Helvetica, sans-serif; letter-spacing: -1px">';
! 	$music_module_copyright .= 'Media Center Powered by:&nbsp;<a href="http://pubory.uv.ro/" target="_blank">OryNider</a>, &nbsp;mxBB <i> - Music Center</i> v2.0.x  &nbsp;&copy;&nbsp;2007 is modified by <a href="http://www.mx-system.com/">MX-Team</a><br />';
  	$music_module_copyright .= '[based on &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a> - <i>Music Online</i> v2.' . $music_config['music_version'] . ']';
  	$music_module_copyright .= '</div>';
--- 224,228 ----
  {
  	$music_module_copyright = '<div align="center" class="gensmall" style="font-family: Verdana, Arial, Helvetica, sans-serif; letter-spacing: -1px">';
! 	$music_module_copyright .= 'Media Center Powered by:&nbsp;<a href="http://mxbb.net" target="_blank">OryNider</a>, &nbsp;mxBB <i> - Music Center</i> v2.1.x  &nbsp;&copy;&nbsp;2007 is modified by <a href="http://www.mx-system.com/">MX-Team</a><br />';
  	$music_module_copyright .= '[based on &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a> - <i>Music Online</i> v2.' . $music_config['music_version'] . ']';
  	$music_module_copyright .= '</div>';
***************
*** 122,131 ****
  	'MUSIC_COPYRIGHT' => $music_module_copyright,
  	'L_INDEX' => '<<',
! 	'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  	'L_MUSIC_INDEX' => $lang['Music'],
  	'L_MUSIC' => $lang['Music'],
! 	'U_MUSIC' => append_sid(this_mo_mxurl()),
  	'L_SEARCH' => $lang['Search'],
! 	'U_MX_MUSIC' => append_sid(this_mo_portalurl())
  	)
  );
--- 236,245 ----
  	'MUSIC_COPYRIGHT' => $music_module_copyright,
  	'L_INDEX' => '<<',
! 	'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  	'L_MUSIC_INDEX' => $lang['Music'],
  	'L_MUSIC' => $lang['Music'],
! 	'U_MUSIC' => mx_append_sid(this_mo_mxurl()),
  	'L_SEARCH' => $lang['Search'],
! 	'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl())
  	)
  );

--- index.html DELETED ---

--- music_constants.php DELETED ---

--- music_functions.php DELETED ---

--- music_integration.php DELETED ---

Index: index.htm
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/index.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.htm	13 Sep 2007 11:25:58 -0000	1.2
--- index.htm	29 Jan 2008 07:48:55 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  <body bgcolor="#FFFFFF" text="#000000">
  
+ 
  </body>
  </html>

[mxbb-commits] mx_music/music_box index.htm, 1.2, 1.3 music_common.php, 1.5, 1.6 index.html, 1.1,

[mxbb-commits] mx_music/music_box index.htm, 1.2, 1.3 music_common.php, 1.5, 1.6 index.html, 1.1, NONE music_constants.php, 1.2, NONE music_functions.php, 1.2, NONE music_integration.php, 1.3, NONE