[mxbb-commits] mx_music music.php,1.3,1.4

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

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

Modified Files:
	music.php 
Log Message:


Index: music.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** music.php	30 Aug 2007 03:52:17 -0000	1.3
--- music.php	30 Aug 2007 05:38:59 -0000	1.4
***************
*** 265,269 ****
  	}
  
- 
  	// ------------------------------------------
  	// Get Last song of this Category
--- 265,268 ----
***************
*** 355,363 ****
  			$last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="';
  
! 			$last_song_info .= append_sid(this_mo_mxurl("music_mode=music_page&song_id=" . $lastrow['song_id'])) .'">' ;
  
  			$last_song_info .= $lastrow['song_title'] .'</a>';
  		}
  		// END of Last Song
  	} 
  	else 
--- 354,373 ----
  			$last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="';
  
! 			$last_song_info .= append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $lastrow['song_id'])) .'">' ;
  
  			$last_song_info .= $lastrow['song_title'] .'</a>';
  		}
  		// END of Last Song
+ 
+ 		$template->assign_block_vars('catrow', array(
+ 			'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])),
+ 			'CAT_TITLE' => $catrows[$i]['cat_title'],
+ 			'CAT_DESC' => $catrows[$i]['cat_desc'],
+ 			'SONGS' => $catrows[$i]['count'],
+ 			'CAT_VIEWS' => $catrows[$i]['cat_views'],
+ 			'L_MODERATORS' => $l_moderators,
+ 			'MODERATORS' => $moderators_list,
+ 			'LAST_SONG_INFO' => $last_song_info)
+         	);
  	} 
  	else 
***************
*** 372,376 ****
                  if ( !($sc_result = $db->sql_query($sc_sql)) ) 
                  { 
!                         mx_message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); 
                  } 
    
--- 382,386 ----
                  if ( !($sc_result = $db->sql_query($sc_sql)) ) 
                  { 
!                         message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); 
                  } 
    
***************
*** 396,424 ****
    
                  $template->assign_block_vars('catrow', array( 
!                         'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), 
!                         'CAT_TITLE' => $catrows[$i]['cat_title'], 
!                         'CAT_DESC' => $catrows[$i]['cat_desc'], 
!                         'SONGS' => $subcat_count, 
!                         'SUBCATS' => $subcats, 
!                         ) 
!                 );  
  	} 
- 
  	// ------------------------------------------
  	// Parse to template the info of the current Category
  	// ------------------------------------------
! 
! 	if ($catrows[$i]['cat_type'] == 0) 
  	{ 
! 		$template->assign_block_vars('catrow', array(
! 			'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])),
! 			'CAT_TITLE' => $catrows[$i]['cat_title'],
! 			'CAT_DESC' => $catrows[$i]['cat_desc'],
! 			'CAT_VIEWS' => $catrows[$i]['cat_views'],
! 			'L_MODERATORS' => $l_moderators,
! 			'MODERATORS' => $moderators_list,
! 			'SONGS' => $catrows[$i]['count'],
! 			'LAST_SONG_INFO' => $last_song_info)
!         	);
  	}
  }
--- 406,426 ----
    
                  $template->assign_block_vars('catrow', array( 
! 			'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), 
! 			'CAT_TITLE' => $catrows[$i]['cat_title'], 
! 			'CAT_DESC' => $catrows[$i]['cat_desc'], 
! 			'SONGS' => $subcat_count, 
! 			'SUBCATS' => $subcats,
! 			'CAT_VIEWS' => $catrows[$i]['cat_views'],
! 			'L_MODERATORS' => $l_moderators,
! 			'MODERATORS' => $moderators_list,
! 			'LAST_SONG_INFO' => $last_song_info)  
!                 ); 
  	} 
  	// ------------------------------------------
  	// Parse to template the info of the current Category
  	// ------------------------------------------
! 	if ($catrows[$i]['cat_type'] == 0)
  	{ 
! 		//Removed code
  	}
  }