mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/templates/_core/admin mx_blockcp_admin_body.tpl, 1.2, 1.3

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_blockcp_admin_body.tpl 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_blockcp_admin_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/admin/mx_blockcp_admin_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mx_blockcp_admin_body.tpl	19 Nov 2007 16:34:21 -0000	1.2
--- mx_blockcp_admin_body.tpl	30 Jan 2008 09:11:01 -0000	1.3
***************
*** 386,390 ****
  					 	<td class="row1"><input type="text" size="65" name="block_desc" value="{E_BLOCK_DESC}" class="post" /></td>
  					</tr>
! 					<!-- BEGIN is_auth -->
  					<tr>
  						<td class="row1" width="50%" align="right"><b>{L_SHOW_TITLE}</b><br /><span class="gensmall">{L_SHOW_TITLE_EXPLAIN}</span></td>
--- 386,390 ----
  					 	<td class="row1"><input type="text" size="65" name="block_desc" value="{E_BLOCK_DESC}" class="post" /></td>
  					</tr>
! 					<!-- BEGIN is_mod -->
  					<tr>
  						<td class="row1" width="50%" align="right"><b>{L_SHOW_TITLE}</b><br /><span class="gensmall">{L_SHOW_TITLE_EXPLAIN}</span></td>
***************
*** 401,411 ****
  						<td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES} /> <span class="gensmall">{L_YES}&nbsp;&nbsp;</span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO} /> <span class="gensmall">{L_NO}</span></td>
  					</tr>
! 					<!--
! 					<tr>
! 						<td class="row1" width="50%" align="right"><b>{L_FUNCTION}</b></td>
! 					  	<td class="row1">{S_FUNCTION_LIST}</td>
! 					</tr>
! 					-->
! 					<!-- END is_auth -->
  
  					<tr>
--- 401,405 ----
  						<td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES} /> <span class="gensmall">{L_YES}&nbsp;&nbsp;</span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO} /> <span class="gensmall">{L_NO}</span></td>
  					</tr>
! 					<!-- END is_mod -->
  
  					<tr>

[mxbb-commits] core/modules/mx_textblocks/templates/_core/admin mx_module_parameters.tpl, 1.2, 1.3

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_textblocks/templates/_core/admin

Modified Files:
	mx_module_parameters.tpl 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_module_parameters.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core/admin/mx_module_parameters.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mx_module_parameters.tpl	19 Nov 2007 16:39:57 -0000	1.2
--- mx_module_parameters.tpl	30 Jan 2008 09:10:59 -0000	1.3
***************
*** 240,262 ****
  				   tinyMCE.init({
  				      	mode : "textareas",
- 				      	theme : "advanced",
  						language : "{tinyMCE.LANG}",
                          docs_language : "{tinyMCE.LANG}",
! 				      	plugins : "table,advhr,advimage,advlink,emotions,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable",
! 						theme_advanced_buttons1_add_before : "newdocument,separator",
  						theme_advanced_buttons1_add : "fontselect,fontsizeselect",
! 						theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor,backcolor",
  						theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator",
  						theme_advanced_buttons3_add_before : "tablecontrols,separator",
! 						theme_advanced_buttons3_add : "emotions,flash,advhr,separator,print,separator,ltr,rtl,separator,fullscreen",
  						theme_advanced_toolbar_location : "top",
  						theme_advanced_toolbar_align : "left",
  						theme_advanced_path_location : "bottom",
! 				      	content_css : "{tinyMCE.TEMPLATE}",
! 				      	relative_urls : false,
! 				      	extended_valid_elements : "td[*],div[*],form[*],input[*]"
  				   });
  				</script>
! 				<!-- END tinyMCE -->
  
  				<!-- Module Block Parameter -->
--- 240,345 ----
  				   tinyMCE.init({
  				      	mode : "textareas",
  						language : "{tinyMCE.LANG}",
                          docs_language : "{tinyMCE.LANG}",
! 
!                         apply_source_formatting : "true",
!                         cleanup : "true",
!                         inline_styles : "true",
!                         convert_fonts_to_spans : "true",
!                         fix_list_elements : "true",
!                         fix_table_elements : "true",
!                         force_p_newlines : "true",
!                         remove_trailing_nbsp : "true",
! 
!                         plugins : "style,advimage,advlink,preview,searchreplace,contextmenu,paste,fullscreen",
! 
!                         theme : "advanced",
!                         theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6",
! 
!                         theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace",
! 
!                         theme_advanced_buttons1 : "newdocument,separator,cut,copy,paste,pastetext,pasteword,separator,formatselect,styleselect,fontsizeselect",
! 
! 						theme_advanced_buttons2: "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,sup,sub,separator,link,unlink,image,separator,forecolor,separator,undo,redo",
! 
! 						theme_advanced_buttons3: "",
! 
! 						theme_advanced_disable : "",
! 
! 						theme_advanced_toolbar_location : "top",
! 						theme_advanced_toolbar_align : "left",
! 
! 						content_css : "{tinyMCE.TEMPLATE}",
! 						theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote",
! 
! 						table_styles : "Layout=forumline",
! 						table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3",
! 						table_row_styles : "Table row 1=oddrow",
! 						table_default_border : "0",
! 
! 				      	document_base_url : "{tinyMCE.PATH}index.php",
! 				      	relative_urls : "true",
! 
! 				      	extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]"
! 				   });
! 				</script>
! 				<!-- END tinyMCE -->
! 
! 				<!-- BEGIN tinyMCE_admin -->
! 				<script language="javascript" type="text/javascript" src="{tinyMCE_admin.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
! 				<script language="javascript" type="text/javascript">
! 				   tinyMCE.init({
! 				      	mode : "textareas",
! 						language : "{tinyMCE_admin.LANG}",
!                         docs_language : "{tinyMCE_admin.LANG}",
! 
!                         apply_source_formatting : "true",
!                         cleanup : "true",
!                         inline_styles : "true",
!                         convert_fonts_to_spans : "true",
!                         fix_list_elements : "true",
!                         fix_table_elements : "true",
!                         force_p_newlines : "true",
!                         remove_trailing_nbsp : "true",
! 
!                         plugins : "table,advimage,advlink,insertdatetime,preview,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable",
! 
!                         theme : "advanced",
!                         theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6",
! 
!                         theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace",
! 
!                         theme_advanced_buttons1_add_before : "newdocument,separator",
  						theme_advanced_buttons1_add : "fontselect,fontsizeselect",
! 
! 						theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor",
  						theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator",
+ 
  						theme_advanced_buttons3_add_before : "tablecontrols,separator",
! 						theme_advanced_buttons3_add : "print,separator,ltr,rtl,separator,fullscreen",
! 
! 						theme_advanced_disable : "",
! 
  						theme_advanced_toolbar_location : "top",
  						theme_advanced_toolbar_align : "left",
+ 
  						theme_advanced_path_location : "bottom",
! 						theme_advanced_statusbar_location : "bottom",
! 
! 						content_css : "{tinyMCE_admin.TEMPLATE}",
! 						theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote",
! 
! 						table_styles : "Layout=forumline",
! 						table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3",
! 						table_row_styles : "Table row 1=oddrow",
! 						table_default_border : "0",
! 
! 				      	document_base_url : "{tinyMCE_admin.PATH}index.php",
! 				      	relative_urls : "true",
! 
! 				      	extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]"
  				   });
  				</script>
! 				<!-- END tinyMCE_admin -->
  
  				<!-- Module Block Parameter -->

[mxbb-commits] core/modules/mx_textblocks/admin mx_module_defs.php, 1.25, 1.26

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_textblocks/admin

Modified Files:
	mx_module_defs.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mx_module_defs.php	19 Nov 2007 16:39:57 -0000	1.25
--- mx_module_defs.php	30 Jan 2008 09:10:59 -0000	1.26
***************
*** 537,545 ****
        	{
           	$langcode = mx_get_langcode();
!          	$template->assign_block_vars( "tinyMCE", array(
!             	'PATH' => $mx_root_path,
!             	'LANG' => $tiny_lang,
!             	'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet']
!          	));
        	}
  
--- 537,557 ----
        	{
           	$langcode = mx_get_langcode();
! 
!          	if ($mx_blockcp->auth_mod)
!          	{
! 	         	$template->assign_block_vars( "tinyMCE_admin", array(
! 	            	'PATH' => $mx_root_path,
! 	            	'LANG' => $tiny_lang,
! 	            	'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet']
! 	         	));
!          	}
!          	else
!          	{
! 	         	$template->assign_block_vars( "tinyMCE", array(
! 	            	'PATH' => $mx_root_path,
! 	            	'LANG' => $tiny_lang,
! 	            	'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet']
! 	         	));
!          	}
        	}
  

[mxbb-commits] core/templates/_core overall_footer.tpl,1.1,1.2

[Jon O. <jon...@us...>]

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

Modified Files:
	overall_footer.tpl 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: overall_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/overall_footer.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** overall_footer.tpl	9 Sep 2007 16:50:45 -0000	1.1
--- overall_footer.tpl	30 Jan 2008 09:11:01 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ <!-- BEGIN page_last_updated -->
+ <div align="right"><span class="copyright">{page_last_updated.L_PAGE_UPDATED} {page_last_updated.TIME} {page_last_updated.NAME}&nbsp;</div>
+ <!-- END page_last_updated -->
  <div align="center">
  	<span class="copyright">

[mxbb-commits] core/modules/mx_navmenu NavigationMenu.pak, 1.15, 1.16 mx_menu_nav.php, 1.24, 1.25 mx_site_nav.php, 1.3, 1.4

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_navmenu

Modified Files:
	NavigationMenu.pak mx_menu_nav.php mx_site_nav.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mx_menu_nav.php	22 Dec 2007 02:56:18 -0000	1.24
--- mx_menu_nav.php	30 Jan 2008 09:10:58 -0000	1.25
***************
*** 30,34 ****
  // Setup config parameters
  //
! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync');
  
  for( $i = 0; $i < count($config_name); $i++ )
--- 30,34 ----
  // Setup config parameters
  //
! $config_name = array('menu_custom_tpl', 'menu_display_mode');
  
  for( $i = 0; $i < count($config_name); $i++ )
***************
*** 41,47 ****
  // Define some parameters
  //
! $menu_display_style = $mx_menu_config['menu_display_style'];
  $menu_display_mode = $mx_menu_config['menu_display_mode'];
- $menu_page_sync = ( $mx_menu_config['menu_page_sync'] != 'No' );
  
  //
--- 41,46 ----
  // Define some parameters
  //
! $menu_custom_tpl = $mx_menu_config['menu_custom_tpl'];
  $menu_display_mode = $mx_menu_config['menu_display_mode'];
  
  //
***************
*** 50,54 ****
  //
  $nav_def_key = 'MX_NAV_MENU_' . $block_id;
- 
  if ( defined($nav_def_key) )
  {
--- 49,52 ----
***************
*** 64,99 ****
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
  
! switch( $menu_display_style )
  {
! 	case 'Classic':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
! 		break;
! 	case 'Advanced':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl');
! 		$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js';
! 		$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 		break;
! 	case 'Simple_CSS_menu':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl');
! 		$kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js';
! 		$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 		break;
! 	case 'Advanced_CSS_menu':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl');
! 		$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js';
! 		$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 		break;
! 	case 'Simple_x':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl');
! 		break;
! 	case 'Overall_navigation':
! 		$template_tmp = array('body' => 'mx_menu_overall_standard.tpl');
! 		break;
! 	default:
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
! 		break;
  }
  
! $template->set_filenames($template_tmp);
  
  //
--- 62,89 ----
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
  
! if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation')))
  {
! 	$template_tmp = $menu_custom_tpl;
! }
! else
! {
! 	switch( $menu_display_mode )
! 	{
! 		case 'Horizontal':
! 			$template_tmp = 'mx_menu_horizontal.tpl';
! 			break;
! 		case 'Vertical':
! 			$template_tmp = 'mx_menu_vertical.tpl';
! 			break;
! 		case 'Overall_navigation':
! 			$template_tmp = 'mx_menu_overall_navigation.tpl';
! 			break;
! 		default:
! 			$template_tmp = 'mx_menu_vertical.tpl';
! 			break;
! 	}
  }
  
! $template->set_filenames(array('body' => $template_tmp));
  
  //
***************
*** 144,148 ****
  		//
  		$catData[$key]['is_current'] = false;
! 		if ( $menu_page_sync && !$hasCurrentMenu)
  		{
  			if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false )
--- 134,138 ----
  		//
  		$catData[$key]['is_current'] = false;
! 		if (!$hasCurrentMenu)
  		{
  			if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false )
***************
*** 154,158 ****
  				$catData[$key]['is_current'] = true;
  			}
! 			else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id )
  			{
  				$catData[$key]['is_current'] = true;
--- 144,148 ----
  				$catData[$key]['is_current'] = true;
  			}
! 			else if ( $menu_display_mode == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id )
  			{
  				$catData[$key]['is_current'] = true;
***************
*** 185,189 ****
  	$cat_url_tmp_this = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_id);
  	$catt = ( $catData[0]['cat_url'] != 0 ) ? '<a class="nav" href="' . $cat_url_tmp . '" target="' . $cat_target . '" /><span class="nav">' . $cat . '</span></a>' : '<span class="nav">' . $cat . '</span>';
! 	$cat_url = ( $catData[0]['cat_url'] != 0 ) ? $cat_url_tmp : ( $menu_display_style == 'Classic' ? $cat_url_tmp_this : 'javascript:void(0)' );
  
  	//
--- 175,179 ----
  	$cat_url_tmp_this = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_id);
  	$catt = ( $catData[0]['cat_url'] != 0 ) ? '<a class="nav" href="' . $cat_url_tmp . '" target="' . $cat_target . '" /><span class="nav">' . $cat . '</span></a>' : '<span class="nav">' . $cat . '</span>';
! 	$cat_url = ( $catData[0]['cat_url'] != 0 ) ? $cat_url_tmp : $cat_url_tmp_this;
  
  	//
***************
*** 204,207 ****
--- 194,198 ----
  	// Generate the fold/unfold categories switches
  	//
+ 	//echo(intval($current_cat) . intval($hasCurrentMenu) . intval($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]));
  	$cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 );
  
***************
*** 212,219 ****
  		'BLOCK_ID'				=> intval($block_id),
  		'CATEGORY'				=> $catt,
- 		'CATEGORY_URL'			=> $cat_url,
  		'CATEGORY_NAME'			=> $cat,
  		'CATEGORY_STYLE'		=> $style,
! 		//'U_CAT_ICON'			=> $cat_icon,
  		'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  		'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
--- 203,209 ----
  		'BLOCK_ID'				=> intval($block_id),
  		'CATEGORY'				=> $catt,
  		'CATEGORY_NAME'			=> $cat,
  		'CATEGORY_STYLE'		=> $style,
! 		'U_CATEGORY_URL'		=> $cat_url,
  		'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  		'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
***************
*** 225,231 ****
  	if ( $catData[0]['cat_url'] != 0 )
  	{
! 		$template->assign_block_vars('catrow.modulerow_cat', array(
! 			'CATEGORY_URL'			=> $cat_url,
  			'CATEGORY_NAME'			=> $cat,
  			'CATEGORY_STYLE'		=> $style,
  		));
--- 215,221 ----
  	if ( $catData[0]['cat_url'] != 0 )
  	{
! 		$template->assign_block_vars('catrow.menurow_cat', array(
  			'CATEGORY_NAME'			=> $cat,
+ 			'U_CATEGORY_URL'		=> $cat_url,
  			'CATEGORY_STYLE'		=> $style,
  		));
***************
*** 334,347 ****
  			'MENU_DESC'			=> $desc,
  			'MENU_SEP'			=> $menu_sep,
! 			'U_MENU_MODULE'		=> $menu_link,
! 			'U_LINK_TARGET'		=> $link_target,
! 			'U_MENU_ICON'		=> $menu_icon
  		);
  
! 		$template->assign_block_vars('catrow.modulerow', $menu_array);
  
  		if ($current_cat)
  		{
! 			$template->assign_block_vars('modulerow', $menu_array);
  		}
  	}
--- 324,338 ----
  			'MENU_DESC'			=> $desc,
  			'MENU_SEP'			=> $menu_sep,
! 			'U_MENU_URL'		=> $menu_link,
! 			'U_MENU_URL_TARGET'	=> $link_target,
! 			'U_MENU_ICON'		=> $menu_icon,
! 			'CURRENT' 			=> $menuData['is_current'] ? '-current' : '',
  		);
  
! 		$template->assign_block_vars('catrow.menurow', $menu_array);
  
  		if ($current_cat)
  		{
! 			$template->assign_block_vars('menurow', $menu_array);
  		}
  	}
***************
*** 364,368 ****
  
  	//
! 	// mygosmenu
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,
--- 355,359 ----
  
  	//
! 	// css
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,

Index: mx_site_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_site_nav.php	23 Dec 2007 00:12:01 -0000	1.3
--- mx_site_nav.php	30 Jan 2008 09:10:58 -0000	1.4
***************
*** 30,34 ****
  // Setup config parameters
  //
! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync');
  
  for( $i = 0; $i < count($config_name); $i++ )
--- 30,34 ----
  // Setup config parameters
  //
! $config_name = array('menu_custom_tpl', 'menu_display_mode');
  
  for( $i = 0; $i < count($config_name); $i++ )
***************
*** 41,50 ****
  // Define some parameters
  //
! //$menu_display_style = $mx_menu_config['menu_display_style'];
! $menu_display_style = 'Overall_navigation';
! //$menu_display_mode = $mx_menu_config['menu_display_mode'];
! $menu_display_mode == 'Horizontal';
! //$menu_page_sync = ( $mx_menu_config['menu_page_sync'] != 'No' );
! $menu_page_sync = true;
  
  //
--- 41,46 ----
  // Define some parameters
  //
! $menu_custom_tpl = $mx_menu_config['menu_custom_tpl'];
! $menu_display_mode = $mx_menu_config['menu_display_mode'];
  
  //
***************
*** 53,57 ****
  //
  $nav_def_key = 'MX_SITE_MENU_' . $block_id;
- 
  if ( defined($nav_def_key) )
  {
--- 49,52 ----
***************
*** 67,102 ****
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
  
! switch( $menu_display_style )
  {
! 	case 'Classic':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
! 		break;
! 	case 'Advanced':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl');
! 		$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js';
! 		$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 		break;
! 	case 'Simple_CSS_menu':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl');
! 		$kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js';
! 		$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 		break;
! 	case 'Advanced_CSS_menu':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl');
! 		$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js';
! 		$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 		break;
! 	case 'Simple_x':
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl');
! 		break;
! 	case 'Overall_navigation':
! 		$template_tmp = array('body' => 'mx_menu_overall_standard.tpl');
! 		break;
! 	default:
! 		$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
! 		break;
  }
  
! $template->set_filenames($template_tmp);
  
  generate_site_menu();
--- 62,89 ----
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
  
! if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation')))
  {
! 	$template_tmp = $menu_custom_tpl;
! }
! else
! {
! 	switch( $menu_display_mode )
! 	{
! 		case 'Horizontal':
! 			$template_tmp = 'mx_menu_horizontal.tpl';
! 			break;
! 		case 'Vertical':
! 			$template_tmp = 'mx_menu_vertical.tpl';
! 			break;
! 		case 'Overall_navigation':
! 			$template_tmp = 'mx_menu_overall_navigation.tpl';
! 			break;
! 		default:
! 			$template_tmp = 'mx_menu_vertical.tpl';
! 			break;
! 	}
  }
  
! $template->set_filenames(array('body' => $template_tmp));
  
  generate_site_menu();
***************
*** 124,128 ****
  	
  	//
! 	// mygosmenu
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,
--- 111,115 ----
  	
  	//
! 	// css
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,

Index: NavigationMenu.pak
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/NavigationMenu.pak,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NavigationMenu.pak	12 Aug 2007 20:55:41 -0000	1.15
--- NavigationMenu.pak	30 Jan 2008 09:10:58 -0000	1.16
***************
*** 3,9 ****
  function=+:50=+:51=+:User Navigation Menu=+:Site Navigation=+:mx_menu_nav.php=+:
  parameter=+:51=+:66=+:Nav menu=+:nav_menu=+:=+:=+:0=+:10
! parameter=+:51=+:93=+:menu_display_style=+:Radio_single_select=+:Classic=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:20
! parameter=+:51=+:63=+:menu_display_mode=+:Radio_single_select=+:Vertical=+:a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}=+:0=+:30
! parameter=+:51=+:64=+:menu_page_sync=+:Boolean=+:0=+:=+:0=+:40
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
--- 3,8 ----
  function=+:50=+:51=+:User Navigation Menu=+:Site Navigation=+:mx_menu_nav.php=+:
  parameter=+:51=+:66=+:Nav menu=+:nav_menu=+:=+:=+:0=+:10
! parameter=+:51=+:93=+:menu_custom_tpl=+:Text=+:=+:=+:1=+:20
! parameter=+:51=+:63=+:menu_display_mode=+:Radio_single_select=+:Vertical=+:a:3:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";i:2;s:18:"Overall_navigation";}=+:0=+:30
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
***************
*** 11,17 ****
  function=+:50=+:52=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+:
  parameter=+:52=+:100=+:Site menu=+:site_menu=+:=+:=+:0=+:10
! parameter=+:52=+:101=+:menu_display_style=+:Radio_single_select=+:Overall_navigation=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:20
! parameter=+:52=+:102=+:menu_display_mode=+:Radio_single_select=+:Horizontal=+:a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}=+:0=+:30
! parameter=+:52=+:103=+:menu_page_sync=+:Boolean=+:1=+:=+:0=+:40
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
--- 10,15 ----
  function=+:50=+:52=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+:
  parameter=+:52=+:100=+:Site menu=+:site_menu=+:=+:=+:0=+:10
! parameter=+:52=+:102=+:menu_display_mode=+:Radio_single_select=+:Horizontal=+:a:3:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";i:2;s:18:"Overall_navigation";}=+:1=+:20
! parameter=+:52=+:101=+:menu_custom_tpl=+:Text=+:=+:=+:1=+:30
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1

[mxbb-commits] core/modules/mx_navmenu/includes navmenu_functions.php, 1.8, 1.9

[Jon O. <jon...@us...>]

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

Modified Files:
	navmenu_functions.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: navmenu_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** navmenu_functions.php	19 Nov 2007 16:39:56 -0000	1.8
--- navmenu_functions.php	30 Jan 2008 09:10:58 -0000	1.9
***************
*** 134,138 ****
  
  /**
!  * Enter description here...
   *
   * @access public
--- 134,138 ----
  
  /**
!  * UserCP Panel
   *
   * @access public
***************
*** 203,207 ****
  
  /**
!  * Enter description here...
   *
   * @access public
--- 203,207 ----
  
  /**
!  * UserCP Panel
   *
   * @access public
***************
*** 354,359 ****
  						'BLOCK_ID'				=> intval($block_id),
  						'CATEGORY'				=> $catt,
- 						'CATEGORY_URL'			=> $cat_url,
  						'CATEGORY_NAME'			=> $cat,
  						'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  						'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
--- 354,359 ----
  						'BLOCK_ID'				=> intval($block_id),
  						'CATEGORY'				=> $catt,
  						'CATEGORY_NAME'			=> $cat,
+ 						'U_CATEGORY_URL'		=> $cat_url,
  						'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  						'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
***************
*** 366,374 ****
  						// Overall Nav
  						//
! 						'U_MENU_MODULE'			=> $cat_url,
! 						'U_LINK_TARGET'			=> $link_target,
! 						'MENU_NAME'				=> $cat,
! 						'MENU_DESC'				=> $desc,
! 						'MENU_STYLE'			=> $style,
  
  					));
--- 366,374 ----
  						// Overall Nav
  						//
! 						'U_CATEGORY_URL'			=> $cat_url,
! 						'U_CATEGORY_URL_TARGET'		=> $link_target,
! 						'CATEGORY_NAME'				=> $cat,
! 						'CATEGORY_DESC'				=> $desc,
! 						'CATEGORY_STYLE'			=> $style,
  
  					));
***************
*** 383,395 ****
  						$link_target = ( true ) ? '' : '_blank';
  
! 						$template->assign_block_vars('modulerow_cat', array(
  							//
  							// Overall Nav
  							//
! 							'U_MENU_MODULE'			=> $cat_url,
! 							'U_LINK_TARGET'			=> $link_target,
! 							'MENU_NAME'				=> $cat,
! 							'MENU_DESC'				=> $desc,
! 							'MENU_STYLE'			=> $style,
  
  						));
--- 383,396 ----
  						$link_target = ( true ) ? '' : '_blank';
  
! 						$template->assign_block_vars('menurow_cat', array(
  							//
  							// Overall Nav
  							//
! 							'U_CATEGORY_URL'		=> $cat_url,
! 							'U_CATEGORY_URL_TARGET' => $link_target,
! 							'CATEGORY_NAME'			=> $cat,
! 							'CATEGORY_DESC'			=> $desc,
! 							'CATEGORY_STYLE'		=> $style,
! 							'CURRENT' 				=> $is_current ? '-current' : '',
  
  						));
***************
*** 465,478 ****
  		'MENU_DESC'			=> $desc,
  		'MENU_SEP'			=> $menu_sep,
! 		'U_MENU_MODULE'		=> $menu_link,
! 		'U_LINK_TARGET'		=> $link_target,
! 		'U_MENU_ICON'		=> $menu_icon
  	);
  
! 	$template->assign_block_vars('catrow.modulerow', $menu_array);
  
  	if ($current_parent_page)
  	{
! 		$template->assign_block_vars('modulerow', $menu_array);
  	}
  }
--- 466,480 ----
  		'MENU_DESC'			=> $desc,
  		'MENU_SEP'			=> $menu_sep,
! 		'U_MENU_URL'		=> $menu_link,
! 		'U_MENU_URL_TARGET'		=> $link_target,
! 		'U_MENU_ICON'		=> $menu_icon,
! 		'CURRENT' 			=> $is_current ? '-current' : '',
  	);
  
! 	$template->assign_block_vars('catrow.menurow', $menu_array);
  
  	if ($current_parent_page)
  	{
! 		$template->assign_block_vars('menurow', $menu_array);
  	}
  }

[mxbb-commits] core/modules/mx_navmenu/templates/_core mx_menu_overall_standard.tpl, 1.1, 1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_navmenu/templates/_core

Modified Files:
	mx_menu_overall_standard.tpl 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_menu_overall_standard.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/mx_menu_overall_standard.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_menu_overall_standard.tpl	9 Sep 2007 16:52:52 -0000	1.1
--- mx_menu_overall_standard.tpl	30 Jan 2008 09:10:59 -0000	1.2
***************
*** 1,64 ****
! <style type="text/css">
! <!--
! .nav-cat .nav-button {
!     border-width: 1px;
!     border-color: {T_TH_COLOR1};
!     border-style: none none solid none;
!     position: relative;
! }
! .nav-cat .nav-button-current {
! 	background-color: {T_TR_COLOR1};
!     border-width: 1px;
!     border-color: {T_TH_COLOR1};
!     border-style: solid solid none solid;
!     position: relative;
! }
! td.nav-button {
! 	background-color: {T_TR_COLOR1};
! }
! td.nav-button-current {
! 	background-color: {T_TR_COLOR2};
! }
! * html .nav-cat td { position: relative; } /* ie 5.0 fix */
! -->
! </style>
! 
! <table width="100%" cellpadding="0" cellspacing="1" border="0" align="center">
! 	<tr>
! 		<td class="cat" align="center" valign="top">
! 			<table cellpadding="0" cellspacing="0" border="0" class="nav-cat">
  				<tr>
  					<!-- BEGIN catrow -->
! 					<td align="left" valign="top">
! 						<div class="nav-button{catrow.CURRENT}">
! 						<table cellpadding="5" cellspacing="0" border="0">
! 							<tr>
! 								<td align="left" width="100%" height="30" style="border:none;">
! 									{catrow.U_MENU_ICON}{catrow.CATEGORY}
! 								</td>
! 							</tr>
! 						</table>
! 						</div>
  					</td>
  					<!-- END catrow -->
  				</tr>
  			</table>
- 		</td>
- 	</tr>
- </table>
  
! <table width="100%" cellpadding="0" cellspacing="1" border="0" align="center">
! 	<tr>
! 		<td class="row1" align="center" valign="top">
! 			<table cellpadding="3" cellspacing="0" border="0" class="nav-menu">
  				<tr>
  					<!-- BEGIN modulerow -->
! 					<td style="border:none;" class="" valign="center" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';">
! 						{modulerow.U_MENU_ICON}<span class="{modulerow.MENU_STYLE}"><a href="{modulerow.U_MENU_MODULE}" target="{modulerow.U_LINK_TARGET}" class="genmed" title="{modulerow.MENU_DESC}">{modulerow.MENU_NAME}</a></span>
  					</td>
  					<!-- END modulerow -->
  				</tr>
! 			</table>
! 		</td>
! 	</tr>
! </table>
--- 1,20 ----
! 			<table cellpadding="0" cellspacing="0" border="0" align="center">
  				<tr>
  					<!-- BEGIN catrow -->
! 					<td align="center" valign="middle">
! 						<div class="cat-button{catrow.CURRENT}" onmouseout="this.className='cat-button{catrow.CURRENT}';" onmouseover="this.className='cat-button-current';">{catrow.U_MENU_ICON}<a href="{catrow.CATEGORY_URL}">{catrow.CATEGORY_NAME}</a></div>
  					</td>
  					<!-- END catrow -->
  				</tr>
  			</table>
  
! 
! 			<table cellpadding="0" cellspacing="0" border="0" align="center">
  				<tr>
  					<!-- BEGIN modulerow -->
! 					<td align="center" valign="middle">
! 						<div class="nav-button{modulerow.CURRENT}" onmouseout="this.className='nav-button{modulerow.CURRENT}';" onmouseover="this.className='nav-button-current';">{modulerow.U_MENU_ICON}<a href="{modulerow.U_MENU_MODULE}" target="{modulerow.U_LINK_TARGET}">{modulerow.MENU_NAME}</a></div>
  					</td>
  					<!-- END modulerow -->
  				</tr>
! 			</table>
\ No newline at end of file

[mxbb-commits] core config.php,1.10,1.11

[Jon O. <jon...@us...>]

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

Modified Files:
	config.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: config.php
===================================================================
RCS file: /cvsroot/mxbb/core/config.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** config.php	8 Jan 2006 23:17:58 -0000	1.10
--- config.php	30 Jan 2008 09:10:55 -0000	1.11
***************
*** 1,10 ****
  <?php
  
! // mxBB Portal auto-generated config file
  // Do not change anything in this file!
  
! // This file must be put into the mxBB Portal directory, not into the phpBB directory.
  
  
  
  ?>
\ No newline at end of file
--- 1,19 ----
  <?php
  
! // mxBB Modular System auto-generated config file
  // Do not change anything in this file!
  
! // This file must be put into the mxBB Modular System directory, not into the phpBB directory.
  
+ $dbms = 'mysql';
  
+ $dbhost = 'localhost';
+ $dbname = 'test';
+ $dbuser = 'root';
+ $dbpasswd = '';
+ 
+ $mx_table_prefix = 'mx_';
+ 
+ define('MX_INSTALLED', true);
  
  ?>
\ No newline at end of file

[mxbb-commits] core/modules/mx_mod_rewrite/includes rewrite_functions.php, 1.7, 1.8

[Jon O. <jon...@us...>]

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

Modified Files:
	rewrite_functions.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: rewrite_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_mod_rewrite/includes/rewrite_functions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rewrite_functions.php	12 Dec 2007 09:53:12 -0000	1.7
--- rewrite_functions.php	30 Jan 2008 09:10:58 -0000	1.8
***************
*** 25,28 ****
--- 25,32 ----
   		global $mx_root_path;
  
+  		if (substr_count($url, 'modrewrite=no'))
+  		{
+  			return $url;
+  		}
   		//
   		// First redirect to *.htm

[mxbb-commits] core/modules/mx_coreblocks/templates/_core mx_site_log.tpl, 1.1, 1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_coreblocks/templates/_core

Modified Files:
	mx_site_log.tpl 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_site_log.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/_core/mx_site_log.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_site_log.tpl	9 Sep 2007 16:49:36 -0000	1.1
--- mx_site_log.tpl	30 Jan 2008 09:10:57 -0000	1.2
***************
*** 18,22 ****
  	<!-- END msg_row -->
  	<tr>
! 		<td align="right" valign="top" nowrap="nowrap" colspan="2" class="cat"><span class="gensmall">{PAGINATION}</span></td>
  	</tr>
  </table>
\ No newline at end of file
--- 18,22 ----
  	<!-- END msg_row -->
  	<tr>
! 		<td align="right" valign="top" nowrap="nowrap" colspan="2" class="cat"><span class="gensmall">{PAGINATION}<br />{PAGE_NUMBER}</span></td>
  	</tr>
  </table>
\ No newline at end of file

[mxbb-commits] core/includes mx_functions_blockcp.php, 1.19, 1.20 mx_functions_core.php, 1.61, 1.62 mx_functions_tools.php, 1.16, 1.17 page_tail.php, 1.35, 1.36

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_blockcp.php mx_functions_core.php 
	mx_functions_tools.php page_tail.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_functions_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mx_functions_blockcp.php	9 Sep 2007 16:48:16 -0000	1.19
--- mx_functions_blockcp.php	30 Jan 2008 09:10:56 -0000	1.20
***************
*** 361,365 ****
  		// Activate BlockCP SubPanels, based on auth
  		//
! 		if (!$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general', array(
--- 361,365 ----
  		// Activate BlockCP SubPanels, based on auth
  		//
! 		if (($this->auth_mod || $is_admin) && !$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general', array(
***************
*** 368,374 ****
  				'S_SUBMIT' => $buttonvalue
  			));
  		}
  
! 		if ( ($this->auth_mod || $is_admin ) || $new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general_adds', array(
--- 368,379 ----
  				'S_SUBMIT' => $buttonvalue
  			));
+ 
+ 			//
+ 			// Some general blockcp settings are moderator only
+ 			//
+ 			$blockcptemplate->assign_block_vars('blockcp_general.is_mod', array());
  		}
  
! 		if ( ($is_admin ) || $new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general_adds', array(
***************
*** 414,418 ****
  		}
  
! 		if ( ($this->auth_mod || $is_admin) && !$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_permissions', array(
--- 419,423 ----
  		}
  
! 		if ( ($is_admin) && !$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_permissions', array(
***************
*** 543,547 ****
  		}
  
! 		if ( $is_admin && !$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_delete', array(
--- 548,552 ----
  		}
  
! 		if ( $is_admin && !$new_block && $this->blockcp_mode != 'mx_blockcp') // Do not allow deleting blocks in blockcp mode
  		{
  			$blockcptemplate->assign_block_vars('blockcp_delete', array(

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** mx_functions_core.php	23 Jan 2008 08:24:48 -0000	1.61
--- mx_functions_core.php	30 Jan 2008 09:10:56 -0000	1.62
***************
*** 438,441 ****
--- 438,442 ----
  						pag.page_header,
  						pag.page_footer,
+ 						pag.page_main_layout,
  						pag.navigation_block,
  						pag.auth_view AS pag_auth_view,
***************
*** 487,490 ****
--- 488,492 ----
  				"page_header" => $row['page_header'],
  				"page_footer" => $row['page_footer'],
+ 				"page_main_layout" => $row['page_main_layout'],
  				"page_navigation_block" => $row['navigation_block'],
  				"page_auth_view" => $row['pag_auth_view'],
***************
*** 1509,1513 ****
  	function output()
  	{
! 		global $layouttemplate;
  
  		$layouttemplate->assign_block_vars('layout_column.blocks', array(
--- 1511,1515 ----
  	function output()
  	{
! 		global $layouttemplate, $mx_page;
  
  		$layouttemplate->assign_block_vars('layout_column.blocks', array(
***************
*** 1515,1518 ****
--- 1517,1530 ----
  			'BLOCK'			=> $this->block_contents
  		));
+ 
+ 		//
+ 		// Update all-in-all stats for the page
+ 		//
+ 		if (!empty($this->block_time) && $this->block_time > $mx_page->last_updated)
+ 		{
+ 			$mx_page->last_updated = $this->block_time;
+ 			$mx_page->last_updated_by = $this->editor_id;
+ 		}
+ 
  	}
  
***************
*** 2528,2537 ****
  			{
  				$selected = '';
! 				foreach( $data as $field_value )
  				{
! 					if ( $field_value == $value )
  					{
! 						$selected = '  selected="selected"';
! 						break;
  					}
  				}
--- 2540,2552 ----
  			{
  				$selected = '';
! 				if (is_array($data))
  				{
! 					foreach( $data as $field_value )
  					{
! 						if ( $field_value == $value )
! 						{
! 							$selected = '  selected="selected"';
! 							break;
! 						}
  					}
  				}
***************
*** 2578,2587 ****
  			{
  				$checked = '';
! 				foreach( $data as $field_value )
  				{
! 					if ( $field_value == $value )
  					{
! 						$checked = ' checked';
! 						break;
  					}
  				}
--- 2593,2605 ----
  			{
  				$checked = '';
! 				if (is_array($data))
  				{
! 					foreach( $data as $field_value )
  					{
! 						if ( $field_value == $value )
! 						{
! 							$checked = ' checked';
! 							break;
! 						}
  					}
  				}
***************
*** 2677,2680 ****
--- 2695,2702 ----
  	var $editcp_show = false;
  
+ 	var $last_updated = '';
+ 	var $last_updated_by = '';
+ 
+ 
  	// ------------------------------
  	// Properties

Index: page_tail.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** page_tail.php	12 Jan 2008 10:43:45 -0000	1.35
--- page_tail.php	30 Jan 2008 09:10:56 -0000	1.36
***************
*** 41,44 ****
--- 41,60 ----
  }
  
+ //
+ // Page last updated (by)
+ //
+ if (!empty($mx_page->last_updated))
+ {
+ 	$editor_name_tmp = mx_get_userdata($mx_page->last_updated_by);
+ 	$editor_name = $editor_name_tmp['username'];
+ 	$edit_time = phpBB2::create_date( $board_config['default_dateformat'], $mx_page->last_updated, $board_config['board_timezone'] );
+ 
+ 	$template->assign_block_vars('page_last_updated', array(
+ 		'L_PAGE_UPDATED'	=> $lang['Page_updated_date'],
+ 		'NAME' 		=> $userdata['user_level'] == ADMIN ? $lang['Page_updated_by'] . $editor_name : '',
+ 		'TIME' 		=> $edit_time,
+ 	));
+ }
+ 
  $mxbb_footer_text = $lang['mx_about_title'];
  $mxbb_footer_text_url = PORTAL_URL . 'index.' . $phpEx . '?sid=' . $userdata['session_id'] . '&mx_copy=true';

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mx_functions_tools.php	9 Sep 2007 16:48:17 -0000	1.16
--- mx_functions_tools.php	30 Jan 2008 09:10:56 -0000	1.17
***************
*** 1778,1782 ****
  	   //get 'to user's info
  	   //
! 	   $sql = "SELECT user_id, user_notify_pm, user_email, user_lang, user_active
  	      FROM " . USERS_TABLE . "
  	      WHERE user_id = '" . $this->to_id . "'
--- 1778,1782 ----
  	   //get 'to user's info
  	   //
! 	   $sql = "SELECT user_id, user_email
  	      FROM " . USERS_TABLE . "
  	      WHERE user_id = '" . $this->to_id . "'
***************
*** 1960,1964 ****
  	   //get to users info
  	   //
! 	   $sql = "SELECT user_id, user_notify_pm, user_email, user_lang, user_active
  	      FROM " . USERS_TABLE . "
  	      WHERE user_id = '".$this->to_id."'
--- 1960,1964 ----
  	   //get to users info
  	   //
! 	   $sql = "SELECT user_id, user_email
  	      FROM " . USERS_TABLE . "
  	      WHERE user_id = '".$this->to_id."'
***************
*** 3095,3099 ****
  	    $smilies_on = 1)
  	{
! 		global $db, $phpbb_root_path, $phpEx, $board_config, $user_ip, $bugsbt_config, $lang, $userdata;
  
  		//
--- 3095,3099 ----
  	    $smilies_on = 1)
  	{
! 		global $db, $phpbb_root_path, $phpEx, $board_config, $user_ip, $portal_config, $lang, $userdata;
  
  		//
***************
*** 3724,3728 ****
  	{
  		global $template, $lang, $board_config, $phpEx, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars;
  
  		//
--- 3724,3728 ----
  	{
  		global $template, $lang, $board_config, $phpEx, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $portal_config;
  
  		//
***************
*** 3756,3760 ****
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on); // Note: allowed_html_tags is altered above
! 		$mx_text->allow_all_html_tags = $bugsbt_config['allow_wysiwyg'] ? true : false;
  
  		$mx_text_formatting = new mx_text_formatting();
--- 3756,3760 ----
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on); // Note: allowed_html_tags is altered above
! 		$mx_text->allow_all_html_tags = $this->allow_wysiwyg ? true : false;
  
  		$mx_text_formatting = new mx_text_formatting();
***************
*** 3770,3774 ****
  
  		$ranksrow = array();
! 		$this->obtain_ranks( $ranksrow );
  
  		while ( $this->comments_row = $db->sql_fetchrow( $result ) )
--- 3770,3777 ----
  
  		$ranksrow = array();
! 		if ($portal_config['portal_backend'] != 'internal')
! 		{
! 			$this->obtain_ranks( $ranksrow );
! 		}
  
  		while ( $this->comments_row = $db->sql_fetchrow( $result ) )
***************
*** 3924,3928 ****
  	{
  		global $template, $lang, $board_config, $phpEx, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars;
  
  		if ( !isset($this->topic_id) || $this->topic_id < 0 )
--- 3927,3931 ----
  	{
  		global $template, $lang, $board_config, $phpEx, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $portal_config;
  
  		if ( !isset($this->topic_id) || $this->topic_id < 0 )
***************
*** 3975,3979 ****
  
  		$ranksrow = array();
! 		$this->obtain_ranks( $ranksrow );
  
  		while ( $this->comments_row = $db->sql_fetchrow( $result ) )
--- 3978,3985 ----
  
  		$ranksrow = array();
! 		if ($portal_config['portal_backend'] != 'internal')
! 		{
! 			$this->obtain_ranks( $ranksrow );
! 		}
  
  		while ( $this->comments_row = $db->sql_fetchrow( $result ) )
***************
*** 4157,4161 ****
  	function get_internal_comments()
  	{
! 		global $db, $template;
  
  		$sql = "SELECT COUNT(".$this->table_field_id.") AS number
--- 4163,4167 ----
  	function get_internal_comments()
  	{
! 		global $db, $template, $lang;
  
  		$sql = "SELECT COUNT(".$this->table_field_id.") AS number
***************
*** 4202,4206 ****
  	function get_phpbb_comments()
  	{
! 		global $db, $template;
  
  		$sql = "SELECT COUNT(post_id) AS number
--- 4208,4212 ----
  	function get_phpbb_comments()
  	{
! 		global $db, $template, $lang;
  
  		$sql = "SELECT COUNT(post_id) AS number

[mxbb-commits] core/modules/mx_coreblocks mx_blockcp.php, 1.18, 1.19 mx_site_log.php, 1.16, 1.17

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_coreblocks

Modified Files:
	mx_blockcp.php mx_site_log.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mx_site_log.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mx_site_log.php	9 Sep 2007 16:49:36 -0000	1.16
--- mx_site_log.php	30 Jan 2008 09:10:57 -0000	1.17
***************
*** 95,98 ****
--- 95,99 ----
  // Find all blocks, sorted by edited_time
  //
+ /*
  $sql = "SELECT blk.block_id
     		FROM " . BLOCK_TABLE . " blk
***************
*** 100,103 ****
--- 101,110 ----
  			AND blk.block_time <> ''
  			AND blk.block_editor_id > 0";
+ */
+ 
+ $sql = "SELECT blk.block_id
+    		FROM " . BLOCK_TABLE . " blk
+ 		WHERE blk.block_time <> ''
+ 			AND blk.block_editor_id > 0";
  
  if ( $log_time_filter_lo != 'no' && !empty($log_time_filter_lo) )
***************
*** 106,110 ****
  }
  
! $sql .= " ORDER BY block_time DESC LIMIT 5";
  
  if ( !$result = $db->sql_query( $sql ) )
--- 113,117 ----
  }
  
! $sql .= " ORDER BY block_time";
  
  if ( !$result = $db->sql_query( $sql ) )
***************
*** 266,270 ****
  	$db->sql_freeresult($result);
  
! 	$base_url = mx_this_url();
  
  	$template->assign_vars( array(
--- 273,277 ----
  	$db->sql_freeresult($result);
  
! 	$base_url = mx_this_url('modrewrite=no');
  
  	$template->assign_vars( array(

Index: mx_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mx_blockcp.php	9 Sep 2007 16:49:36 -0000	1.18
--- mx_blockcp.php	30 Jan 2008 09:10:57 -0000	1.19
***************
*** 220,226 ****
  if ($is_admin)
  {
! 	$mx_dynamic_select = new mx_dynamic_select();
! 	$mx_dynamic_select->generate($block_id);
! 	$blockcptemplate->assign_block_vars('dynamic_select', array());
  }
  
--- 220,229 ----
  if ($is_admin)
  {
! 	//
! 	// Removed from here atm
! 	//
! 	// $mx_dynamic_select = new mx_dynamic_select();
! 	// $mx_dynamic_select->generate($block_id);
! 	// $blockcptemplate->assign_block_vars('dynamic_select', array());
  }
  

[mxbb-commits] core/language/lang_english lang_admin.php, 1.79, 1.80 lang_main.php, 1.36, 1.37

[Jon O. <jon...@us...>]

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

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** lang_main.php	5 May 2007 20:13:17 -0000	1.36
--- lang_main.php	30 Jan 2008 09:10:57 -0000	1.37
***************
*** 28,31 ****
--- 28,33 ----
  $lang['Block_updated_date'] = 'Updated ';
  $lang['Block_updated_by'] = 'by ';
+ $lang['Page_updated_date'] = 'This page was updated ';
+ $lang['Page_updated_by'] = 'by ';
  $lang['Powered_by'] = 'Powered by ';
  

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** lang_admin.php	13 Sep 2007 09:13:19 -0000	1.79
--- lang_admin.php	30 Jan 2008 09:10:57 -0000	1.80
***************
*** 492,503 ****
  // Menu Navigation
  //
! $lang['menu_display_style'] = 'Menu Style';
! $lang['menu_display_style_explain '] = 'Standard, Simple, Advanced or Advanced App';
! 
  $lang['menu_display_mode'] = 'Layout mode';
  $lang['menu_display_mode_explain '] = 'Horizonal or Vertical layout mode';
! 
! $lang['menu_page_sync'] = 'Highlight current?';
! $lang['menu_page_sync_explain'] = 'Highlight current Navigation Menu entry...';
  
  //
--- 492,503 ----
  // Menu Navigation
  //
! //$lang['menu_display_style'] = 'Menu Style';
! //$lang['menu_display_style_explain '] = 'Standard, Simple, Advanced or Advanced App';
  $lang['menu_display_mode'] = 'Layout mode';
  $lang['menu_display_mode_explain '] = 'Horizonal or Vertical layout mode';
! //$lang['menu_page_sync'] = 'Highlight current?';
! //$lang['menu_page_sync_explain'] = 'Highlight current Navigation Menu entry...';
! $lang['menu_custom_tpl']				= "Custom template file";
! $lang['menu_custom_tpl_explain ']		= "Eg mx_menu_custom.tpl";
  
  //

[mxbb-commits] core/install/schemas mysql_schema_install.sql, 1.48, 1.49

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/install/schemas
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/install/schemas

Modified Files:
	mysql_schema_install.sql 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: mysql_schema_install.sql
===================================================================
RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** mysql_schema_install.sql	15 Jan 2008 11:54:39 -0000	1.48
--- mysql_schema_install.sql	30 Jan 2008 09:10:56 -0000	1.49
***************
*** 96,112 ****
  
  INSERT INTO mx_table_block_system_parameter VALUES("8", "66", "", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("8", "93", "Classic", "", "0");
  INSERT INTO mx_table_block_system_parameter VALUES("8", "63", "Vertical", "", "0");
- INSERT INTO mx_table_block_system_parameter VALUES("8", "64", "TRUE", "", "0");
  
  INSERT INTO mx_table_block_system_parameter VALUES("25", "66", "", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("25", "93", "Classic", "", "0");
  INSERT INTO mx_table_block_system_parameter VALUES("25", "63", "Horizontal", "", "0");
- INSERT INTO mx_table_block_system_parameter VALUES("25", "64", "TRUE", "", "0");
  
  INSERT INTO mx_table_block_system_parameter VALUES("31", "100", "", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("31", "101", "Overall_navigation", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("31", "102", "Horizontal", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("31", "103", "TRUE", "", "0");
  
  INSERT INTO mx_table_block_system_parameter VALUES("9", "50", "This is basically a [i:021a122fa6]standard[/i:021a122fa6] TextBlock, but you may configure settings for bbcodes, html and smilies for [i:021a122fa6]this[/i:021a122fa6] block.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "021a122fa6", "0");
--- 96,109 ----
  
  INSERT INTO mx_table_block_system_parameter VALUES("8", "66", "", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("8", "93", "", "", "0");
  INSERT INTO mx_table_block_system_parameter VALUES("8", "63", "Vertical", "", "0");
  
  INSERT INTO mx_table_block_system_parameter VALUES("25", "66", "", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("25", "93", "", "", "0");
  INSERT INTO mx_table_block_system_parameter VALUES("25", "63", "Horizontal", "", "0");
  
  INSERT INTO mx_table_block_system_parameter VALUES("31", "100", "", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("31", "101", "", "", "0");
! INSERT INTO mx_table_block_system_parameter VALUES("31", "102", "Overall_navigation", "", "0");
  
  INSERT INTO mx_table_block_system_parameter VALUES("9", "50", "This is basically a [i:021a122fa6]standard[/i:021a122fa6] TextBlock, but you may configure settings for bbcodes, html and smilies for [i:021a122fa6]this[/i:021a122fa6] block.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "021a122fa6", "0");
***************
*** 402,410 ****
  # Dumping data for table 'mx_table_module'
  #
! INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (10, 'Core Blocks', 'modules/mx_coreblocks/', 'mxBB Portal Core Blocks', '', 'mxBB Core Module', 'Original mxBB <i>Core Blocks</i> module by <a href="http://www.mxbb.net" target="_blank">The mxBB Development Team</a>');
! INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (20, 'Textblocks', 'modules/mx_textblocks/', 'mxBB Portal Textblocks', '', 'mxBB Core Module', 'Original mxBB <i>Textblocks</i> module by <a href="http://www.mxbb.net" target="_blank">Jon</a>');
! INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (30, 'phpBB2 Blocks', 'modules/mx_phpbb2blocks/', 'mxBB Portal phpBB2 blocks', '', 'mxBB Core Module', 'Original mxBB <i>phpBB2 Blocks</i> module by <a href="http://www.mxbb.net" target="_blank"> The mxBB Development Team</a>');
! INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (40, 'Users and Groups', 'modules/mx_users/', 'Users and Group adminCP', '1', 'mxBB Core Module', 'Based on original phpBB <i>Admin Tool MODs</i> by Adam Alkins, Omar Ramadan & wGEric :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>');
! INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (50, 'Navigation Menu', 'modules/mx_navmenu/', 'mxBB Portal Site Navigation', '', 'mxBB Core Module', 'Original mxBB <i>Navigation Menu</i> module by <a href="http://www.mxbb.net" target="_blank">Jon</a>');
  
  #
--- 399,413 ----
  # Dumping data for table 'mx_table_module'
  #
! #INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (10, 'Core Blocks', 'modules/mx_coreblocks/', 'mxBB Portal Core Blocks', '', 'mxBB Core Module', 'Original mxBB <i>Core Blocks</i> module by <a href="http://www.mxbb.net" target="_blank">The mxBB Development Team</a>');
! #INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (20, 'Textblocks', 'modules/mx_textblocks/', 'mxBB Portal Textblocks', '', 'mxBB Core Module', 'Original mxBB <i>Textblocks</i> module by <a href="http://www.mxbb.net" target="_blank">Jon</a>');
! #INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (30, 'phpBB2 Blocks', 'modules/mx_phpbb2blocks/', 'mxBB Portal phpBB2 blocks', '', 'mxBB Core Module', 'Original mxBB <i>phpBB2 Blocks</i> module by <a href="http://www.mxbb.net" target="_blank"> The mxBB Development Team</a>');
! #INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (40, 'Users and Groups', 'modules/mx_users/', 'Users and Group adminCP', '1', 'mxBB Core Module', 'Based on original phpBB <i>Admin Tool MODs</i> by Adam Alkins, Omar Ramadan & wGEric :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>');
! #INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (50, 'Navigation Menu', 'modules/mx_navmenu/', 'mxBB Portal Site Navigation', '', 'mxBB Core Module', 'Original mxBB <i>Navigation Menu</i> module by <a href="http://www.mxbb.net" target="_blank">Jon</a>');
! 
! INSERT INTO mx_table_module VALUES("10", "Core Blocks", "modules/mx_coreblocks/", "mxBB Portal Core Blocks", "", "mxBB Core Module", "Original mxBB <i>Core Blocks</i> module by <a href=\"http://www.mxbb.net\" target=\"_blank\">The mxBB Development Team</a>");
! INSERT INTO mx_table_module VALUES("20", "Textblocks", "modules/mx_textblocks/", "mxBB Portal Textblocks", "", "mxBB Core Module", "Original mxBB <i>Textblocks</i> module by <a href=\"http://www.mxbb.net\" target=\"_blank\">Jon</a>");
! INSERT INTO mx_table_module VALUES("30", "phpBB2 Blocks", "modules/mx_phpbb2blocks/", "mxBB Portal phpBB2 blocks", "", "mxBB Core Module", "Original mxBB <i>phpBB2 Blocks</i> module by <a href=\"http://www.mxbb.net\" target=\"_blank\"> The mxBB Development Team</a>");
! INSERT INTO mx_table_module VALUES("40", "Users and Groups", "modules/mx_users/", "Users and Group adminCP", "1", "mxBB Core Module", "Based on original phpBB <i>Admin Tool MODs</i> by Adam Alkins, Omar Ramadan & wGEric :: Adapted for mxBB by <a href=\"http://www.mxbb.net\" target=\"_blank\">Jon</a>");
! INSERT INTO mx_table_module VALUES("50", "Navigation Menu", "modules/mx_navmenu/", "mxBB Portal Site Navigation", "", "mxBB Core Module", "Original mxBB <i>Navigation Menu</i> module by <a href=\"http://www.mxbb.net\" target=\"_blank\">Jon</a>");
  
  #
***************
*** 544,555 ****
  
  INSERT INTO mx_table_parameter VALUES("66", "51", "Nav menu", "nav_menu", "", "", "0", "10");
! INSERT INTO mx_table_parameter VALUES("93", "51", "menu_display_style", "Radio_single_select", "Classic", "a:5:{i:0;s:7:\"Classic\";i:1;s:8:\"Advanced\";i:2;s:15:\"Simple_CSS_menu\";i:3;s:17:\"Advanced_CSS_menu\";i:4;s:18:\"Overall_navigation\";}", "0", "20");
! INSERT INTO mx_table_parameter VALUES("63", "51", "menu_display_mode", "Radio_single_select", "Vertical", "a:2:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";}", "0", "30");
! INSERT INTO mx_table_parameter VALUES("64", "51", "menu_page_sync", "Boolean", "0", "", "0", "40");
  
  INSERT INTO mx_table_parameter VALUES("100", "52", "Site menu", "site_menu", "", "", "0", "10");
! INSERT INTO mx_table_parameter VALUES("101", "52", "menu_display_style", "Radio_single_select", "Overall_navigation", "a:5:{i:0;s:7:\"Classic\";i:1;s:8:\"Advanced\";i:2;s:15:\"Simple_CSS_menu\";i:3;s:17:\"Advanced_CSS_menu\";i:4;s:18:\"Overall_navigation\";}", "0", "20");
! INSERT INTO mx_table_parameter VALUES("102", "52", "menu_display_mode", "Radio_single_select", "Horizontal", "a:2:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";}", "0", "30");
! INSERT INTO mx_table_parameter VALUES("103", "52", "menu_page_sync", "Boolean", "1", "", "0", "40");
  
  INSERT INTO mx_table_parameter VALUES("92", "10", "numOfEvents", "Number", "5", "", "0", "0");
--- 547,556 ----
  
  INSERT INTO mx_table_parameter VALUES("66", "51", "Nav menu", "nav_menu", "", "", "0", "10");
! INSERT INTO mx_table_parameter VALUES("93", "51", "menu_custom_tpl", "Text", "", "", "0", "20");
! INSERT INTO mx_table_parameter VALUES("63", "51", "menu_display_mode", "Radio_single_select", "Vertical", "a:3:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";i:2;s:18:\"Overall_navigation\";}", "0", "30");
  
  INSERT INTO mx_table_parameter VALUES("100", "52", "Site menu", "site_menu", "", "", "0", "10");
! INSERT INTO mx_table_parameter VALUES("101", "52", "menu_custom_tpl", "Text", "", "", "0", "20");
! INSERT INTO mx_table_parameter VALUES("102", "52", "menu_display_mode", "Radio_single_select", "Overall_navigation", "a:3:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";i:2;s:18:\"Overall_navigation\";}", "0", "30");
  
  INSERT INTO mx_table_parameter VALUES("92", "10", "numOfEvents", "Number", "5", "", "0", "0");

[mxbb-commits] core/admin index.php,1.37,1.38

[Jon O. <jon...@us...>]

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

Modified Files:
	index.php 
Log Message:
fixing urls...

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** index.php	29 Jan 2008 19:37:25 -0000	1.37
--- index.php	30 Jan 2008 08:52:11 -0000	1.38
***************
*** 975,979 ****
  					$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
  					$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], $board_config['version']) . '</p>';
! 				}				
  				break;
  		}
--- 975,979 ----
  					$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
  					$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], $board_config['version']) . '</p>';
! 				}
  				break;
  		}
***************
*** 1077,1082 ****
  	$template->assign_vars(array(
  		'ADMIN_TITLE' => $lang['mxBB_adminCP'],
! 		"S_FRAME_NAV" => mx_append_sid("index_right.$phpEx?pane=left"),
! 		"S_FRAME_MAIN" => mx_append_sid("index_right.$phpEx?pane=right"))
  	);
  
--- 1077,1082 ----
  	$template->assign_vars(array(
  		'ADMIN_TITLE' => $lang['mxBB_adminCP'],
! 		"S_FRAME_NAV" => mx_append_sid("index.$phpEx?pane=left"),
! 		"S_FRAME_MAIN" => mx_append_sid("index.$phpEx?pane=right"))
  	);
  

[mxbb-commits] mx_music/includes index.htm, 1.2, NONE music_cat.php, 1.15, NONE music_comment.php, 1.5, NONE music_comment_delete.php, 1.4, NONE music_comment_edit.php, 1.4, NONE music_delete.php, 1.3, NONE music_download.php, 1.6, NONE music_edit.php, 1.3, NONE music_list.php, 1.2, NONE music_lists.php, 1.1, NONE music_media_cat.php, 1.8, NONE music_modcp.php, 1.3, NONE music_page.php, 1.12, NONE music_pic_cat.php, 1.7, NONE music_rate.php, 1.3, NONE music_rss.php, 1.6, NONE music_song.php, 1.7, NONE music_stream.php, 1.2, NONE music_upload.php, 1.8, NONE

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

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

Removed Files:
	index.htm music_cat.php music_comment.php 
	music_comment_delete.php music_comment_edit.php 
	music_delete.php music_download.php music_edit.php 
	music_list.php music_lists.php music_media_cat.php 
	music_modcp.php music_page.php music_pic_cat.php 
	music_rate.php music_rss.php music_song.php music_stream.php 
	music_upload.php 
Log Message:
the mx_music includes folder was removed long ago, please deleate him from hdd

--- music_upload.php DELETED ---

--- music_delete.php DELETED ---

--- music_comment_edit.php DELETED ---

--- music_pic_cat.php DELETED ---

--- music_cat.php DELETED ---

--- music_modcp.php DELETED ---

--- music_comment_delete.php DELETED ---

--- music_edit.php DELETED ---

--- music_stream.php DELETED ---

--- music_rss.php DELETED ---

--- music_list.php DELETED ---

--- music_comment.php DELETED ---

--- index.htm DELETED ---

--- music_lists.php DELETED ---

--- music_media_cat.php DELETED ---

--- music_song.php DELETED ---

--- music_download.php DELETED ---

--- music_page.php DELETED ---

--- music_rate.php DELETED ---

[mxbb-commits] core/admin index_right.php,1.1,NONE

[Jon O. <jon...@us...>]

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

Removed Files:
	index_right.php 
Log Message:
removed

--- index_right.php DELETED ---

[mxbb-commits] core/admin index_new.php, NONE, 1.1 index.php, 1.36, 1.37

[Jon O. <jon...@us...>]

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

Modified Files:
	index.php 
Added Files:
	index_new.php 
Log Message:
going back to old adminCP
development adminCP is moved to index_new.php

--- NEW FILE: index_new.php ---
<?php
/**
*
* @package mxBB Portal Core
* @version $Id: index_new.php,v 1.1 2008/01/29 19:37:26 jonohlsson Exp $
* @copyright (c) 2002-2006 mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mxbb.net
 * @origin This file is borrowed from phpBB, with some modifications
*/

// Security and Page header
define( 'IN_PORTAL', 1 );
$mx_root_path = './../';
$phpEx = substr( strrchr( __FILE__, '.' ), 1 );
$no_page_header = true;
require( './pagestart.' . $phpEx );
error_reporting( E_ALL ^E_NOTICE);
// ------------------------------
// DEBUG ONLY ;-)
// error_reporting(E_ALL);
// ------------------------------
// ---------------
// Begin functions
/**
 * Enter description here...
 *
 * @param unknown_type $needle
 * @param unknown_type $haystack
 * @return unknown
 */
function inarray( $needle, $haystack )
{
	for( $i = 0; $i < sizeof( $haystack ); $i++ )
	{
		if ( $haystack[$i] == $needle )
		{
			return true;
		}
	}
	return false;
}

/**
 * Enter description here...
 *
 * @param unknown_type $dir_module
 * @return unknown
 */
function read_admin( $dir_module )
{
	global $phpEx, $template, $lang, $board_config, $phpbb_root_path, $mx_user;

	$module = array();
	if ( $dir = @opendir( $dir_module ) )
	{
		$setmodules = 1;
		while ( $file = @readdir( $dir ) )
		{
			if ( preg_match( "/^admin_.*?\." . $phpEx . "$/", $file ) )
			{
				include( $dir_module . '/' . $file );
			}
		}
		@closedir( $dir );
		unset( $setmodules );
	}
	return $module;
}
// End functions
// -------------
/**
 */
if ( !defined( 'PORTAL_BACKEND'))
{
	define( 'PORTAL_BACKEND', 'phpbb2');
}
define( 'PHPBB2X_BACKEND', 'phpbb2' );
define( 'OLYMPUS_BACKEND', 'phpbb3' );

define( 'MAIN_CATEGORY', 'portal' );
define( 'MODULE_CATEGORY', 'modules' );
define( 'PHPBB2X_CATEGORY', 'phpbb2' );
define( 'OLYMPUS_CATEGORY', 'phpbb3' );


if ( (empty( $_SID) || $_SID == 'sid=' ) )
{
	$_SID = 'sid='.$HTTP_GET_VARS['sid'];
}
if ( (empty( $SID) || $SID == 'sid=' ) )
{
	$SID = 'sid='.$HTTP_GET_VARS['sid'];
}

if ( PORTAL_BACKEND == PHPBB2X_BACKEND)
{
	mx_page::load_file( 'functions_selects', 'phpbb2');
}
//mx_page::load_file( 'functions_');
class mx_acp
{
	var $template;
	var $db;
	var $panel_html = '';
	var $category = '';
	var $panel = '';

	var $tabs = array();

	var $menu_complete = array();
	var $menu_actions = array();
	var $menu = array();
	var $category_title = '';
	var $panel_title = '';

	var $action_script = '';
	var $phpbb3_hook = null;
	var $phpbb3_i = null;
	/**
	 * Constructor
	 *
	 * @access protected
	 */
	function mx_acp()
	{
		global $template, $db, $lang, $phpEx, $mx_root_path;

		$this->template = $template;
		$this->db = $db;

		$this->_template_set_filenames();
		$this->category = MAIN_CATEGORY;
		$this->category_title = $lang['MX_Portal'];

		if ( OLYMPUS_CATEGORY == PORTAL_BACKEND )
		{
			include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx );
			$this->phpbb3_hook = new mx_phpbb3_admin();
			$this->phpbb3_hook->hook( 'admin' );
		}
	}

	/*
	 * Parsing params for display
	 * @param string $params query string
	 */
	function decode_url( $params )
	{
		global $lang, $mx_user ;
		if ( isset( $params['cat'] ) )
		{
			$this->category = $params['cat'];
			switch ( $this->category )
			{
				case MAIN_CATEGORY:
					$this->category_title = $lang['MX_Portal'];
					break;
				case MODULE_CATEGORY:
					$this->category_title = $lang['MX_Modules'];
					break;
				case PHPBB2X_CATEGORY:
					$this->category_title = $lang['Phpbb'];
					break;
				case OLYMPUS_CATEGORY:
					$this->category_title = '';
					$this->phpbb3_i = @$params['i'];
					break;
			} // switch
		}
		if ( isset( $params['panel'] ) )
		{
			$this->panel = $params['panel'];
		}
	}

	/*
	 * get current tabs
	 */
	function assign_tabs()
	{
		global $lang, $mx_user, $db;
		// MX PORTAL MAIN CATEGORY
		$this->tabs = array();
		$this->tabs[] = array( // #
			'ACTIVE_TAB' => ( $this->category == MAIN_CATEGORY )?' id="activetab"':'',
			'CATEGORY' => MAIN_CATEGORY,
			'PARAMS' => '',
			'L_TAB' => $lang['MX_Portal'],
		);
		// MX PORTAL MODULE CATEGORY
		$this->tabs[] = array( // #
			'ACTIVE_TAB' => ( $this->category == MODULE_CATEGORY )?' id="activetab"':'',
			'CATEGORY' => MODULE_CATEGORY,
			'PARAMS' => '',
			'L_TAB' => $lang['MX_Modules'],
		);
		// PHPBB TABS
		switch ( PORTAL_BACKEND )
		{
			case PHPBB2X_BACKEND: // phpBB2 Backend TABS
				$this->tabs[] = array( // #
					'ACTIVE_TAB' => ( $this->category == PHPBB2X_CATEGORY )?' id="activetab"':'',
					'CATEGORY' => PHPBB2X_CATEGORY,
					'PARAMS' => '',
					'L_TAB' => $lang['Phpbb'],
				);
				break;
			case OLYMPUS_BACKEND: // phpBB3 Backend TABS
				$phpbb3_tabs = $this->phpbb3_hook->get_tabs( $this->phpbb3_i );
				if ( $this->category == OLYMPUS_CATEGORY )
				{
					$this->category_title = $lang['Phpbb'] . ' &bull; ' . $phpbb3_tabs['CATEGORY_TITLE'];
				}
				$this->tabs = array_merge( $this->tabs, $phpbb3_tabs['TABS'] );
				break;
		}

		foreach( $this->tabs as $key => $tab )
		{
			$this->template->assign_block_vars( 'tab', $tab );
		}
	}

	function _read_menu_actions( $menu_array, $category = MAIN_CATEGORY)
	{
		if ( !is_array( $menu_array))
		{
			return;
		}

		switch( $category)
		{
			case MAIN_CATEGORY:
			case MODULE_CATEGORY:
			case PHPBB2X_CATEGORY:

				$cat_keys = array_keys( $menu_array);
				for( $i = 0; $i< count($menu_array); $i++)
				{
					while( list( $menu, $action) = each( $menu_array[$cat_keys[$i]]))
					{
						$this->menu_actions[$action] = 'panel='.$menu;
					}

				}

				break;
			case OLYMPUS_CATEGORY:


				$cat_main = array_keys( $menu_array);

				for( $i=0; $i< count( $menu_array); $i++)
				{
					$cat_keys = array_keys( $menu_array[$cat_main[$i]]);
					for( $j=0; $j< count( $menu_array[$cat_main[$i]]); $j++)
					{
						while( list( $menu, $action) = each($menu_array[$cat_main[$i]][$cat_keys[$j]]))
						{
							$this->menu_actions[$action] = $menu;
						}
					}
				}
				break;
		}
	}

	function assign_menu()
	{
		global $lang, $db, $mx_user, $mx_root_path, $phpbb_root_path, $phpEx;

		$allow_menu_sort = true;

		// #
		// # Load Main Portal Menu
		// #

		$this->menu_complete[MAIN_CATEGORY] = read_admin( './' );
		$this->_read_menu_actions( $this->menu_complete[MAIN_CATEGORY], MAIN_CATEGORY);
		// #
		// # Load Main Modules Menu
		// #
		$sql = "SELECT *
				FROM " . MODULE_TABLE . "
				WHERE module_include_admin = 1
				ORDER BY module_name";

		if ( !( $q_modules = $db->sql_query( $sql ) ) )
		{
			mx_message_die( GENERAL_ERROR, "Could not query modules information", '', __LINE__, __FILE__, $sql );
		}



		if ( $total_modules = $db->sql_numrows( $q_modules ) )
		{
			$module_rows = $db->sql_fetchrowset( $q_modules );
		}
		$db->sql_freeresult( $result );
		$menu_array = array();
		for( $module_cnt = 0; $module_cnt < $total_modules; $module_cnt++ )
		{
			$module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/";
			$module_path_root = $mx_root_path . $module_rows[$module_cnt]['module_path'];
			// **********************************************************************
			// Read language definition
			// **********************************************************************
			$board_langfile = $module_path_root . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx;
			$main_langfile = $module_path_root . 'language/lang_english/lang_admin.' . $phpEx;
			if ( file_exists( $board_langfile ) )
			{
				include( $board_langfile );
			}
			else if ( file_exists( $main_langfile ) )
			{
				include( $main_langfile );
			}

			$menu_array = array_merge_recursive( $menu_array, read_admin( $module_path_admin ) );
		}
		$this->menu_complete[MODULE_CATEGORY] = $menu_array;
		$this->_read_menu_actions( $this->menu_complete[MODULE_CATEGORY], MODULE_CATEGORY);


		switch( PORTAL_BACKEND)
		{
			case PHPBB2X_BACKEND:
				$mnu_ary = read_admin( $phpbb_root_path . 'admin/' );
				$menu_array = array();

				foreach( $mnu_ary as $key => $menu)
				{
					$i = 0;

					foreach( $menu as $menu_id => $action_file)
					{
						$menu_array[$key][$menu_id . '_' . $key] = substr($phpbb_root_path, strlen($mx_root_path)) . 'admin/' . $action_file;
						$lang[ $menu_id . '_' . $key ] = $lang[ $menu_id];
						$i++;
					}

				}
				$this->menu_complete[PHPBB2X_CATEGORY] = $menu_array;
				$this->_read_menu_actions( $menu_array, PHPBB2X_CATEGORY);

				break;
			case OLYMPUS_BACKEND:
				$this->menu_complete[OLYMPUS_CATEGORY] = $this->phpbb3_hook->get_menu_complete();
				$this->_read_menu_actions( $this->menu_complete[OLYMPUS_CATEGORY], OLYMPUS_CATEGORY);
				break;
		}

		$menu_array = $this->menu_complete[$this->category];
		switch ( $this->category )
		{
			case MAIN_CATEGORY:
			case MODULE_CATEGORY:
			case PHPBB2X_CATEGORY:
				if ( empty( $this->panel ) )
				{
					$mnu_ary = $menu_array;
					ksort( $mnu_ary );
					$menu_array_keys = array_keys( $mnu_ary );
					ksort( $mnu_ary[$menu_array_keys[0]] );
					$panel_keys = array_keys( $mnu_ary[$menu_array_keys[0]] );
					$this->panel = $panel_keys[0];
				}
				break;
			case OLYMPUS_CATEGORY:
				$allow_menu_sort = false;
				$menu_array = $this->phpbb3_hook->get_menu( $this->phpbb3_i );
				break;
		}

		if ( sizeOf( $menu_array ) == 0 )
		{
			return;
		}

		$this->menu = $menu_array;

		if ( $allow_menu_sort )
		{
			ksort( $menu_array );
		}
		$menu_cat_id = 0;
		while ( list( $category, $action_array ) = each( $menu_array ) )
		{
			$lang_category = ( !empty( $lang[$category] ) ) ? $lang[$category] : preg_replace( "/_/", " ", $category );

			$this->template->assign_block_vars( 'category', array(
			// +MOD: DHTML Menu for ACP
					'MENU_CAT_ID' => $menu_cat_id,
					'MENU_CAT_ROWS' => count( $action_array ),
			// -MOD: DHTML Menu for ACP
					'ADMIN_CATEGORY' => $lang_category )
			);

			if ( $allow_menu_sort )
			{
				ksort( $action_array );
			}
			$row_count = 0;
			while ( list( $panel, $file ) = each( $action_array ) )
			{
				$lang_menu = isset( $mx_user->lang[$panel] )?$mx_user->lang[$panel]:( !empty( $lang[$panel] ) ? $lang[$panel] : preg_replace( "/_/", " ", $panel ) );
				$file_part = explode( '?', $file );
				if ( $this->panel == $panel )
				{
					if ( strpos( $file, 'http://' ) !== false )
					{
						header( 'Location: ' . $file );
					}
					$this->action_script = $file_part[0];
					$this->panel_title = $lang_menu;
				}

				$menu_link_params = str_replace( '?', '', '&amp;cat=' . $this->category . '&amp;panel=' . $panel . '&amp;' . $file_part[1] );

				$menu_link_params = explode( '&amp;', $menu_link_params );
				sort( $menu_link_params, SORT_STRING );
				reset( $menu_link_params );
				$menu_link = basename( __FILE__ ) . '?' . implode( '&amp;', $menu_link_params );

				$menu_link = str_replace( '&amp;&amp;', '&amp;', $menu_link );
				$menu_link = str_replace( '?&amp;', '?', $menu_link );

				if ( strpos( $menu_link, 'sid=' ) === false )
				{
					$menu_link = mx_append_sid( $menu_link );
				}

				$this->template->assign_block_vars( 'category.panel', array( "ROW_COLOR" => "#" . $row_color,
						"ROW_CLASS" => $row_class,
				// +MOD: DHTML Menu for ACP
						'ROW_COUNT' => $row_count,
				// -MOD: DHTML Menu for ACP
						"L_PANEL" => $lang_menu,
						'U_PANEL' => $menu_link,
						'A_PANEL' => $this->panel == $panel?' id="activemenu"':'',
				) );
				$row_count++;
			}
			// +MOD: DHTML Menu for ACP
			$menu_cat_id++;
			// -MOD: DHTML Menufor ACP
		}
	}

	function prepare_action_script()
	{
		if ( empty( $this->action_script ) )
		{
			return '';
		}

		global $mx_root_path, $phpbb_root_path;


		switch ( $this->category )
		{
			case MAIN_CATEGORY:
			case MODULE_CATEGORY:
			case PHPBB2X_CATEGORY:
				$script = trim( file_get_contents( $mx_root_path . $this->action_script ) );
				$folders = explode( '/' , dirname( $this->action_script ) );
				$module_root_path = '';
				for( $i = 0; $i < sizeOf( $folders ); $i++ )
				{
					if ( $folders[$i] == 'admin' )
					{
						unset( $folders[$i] );
					}
				}
				$module_root_path = implode( '/', $folders ) . '/';


				$preg_array = array(
				 '#^<\?(php)?#'				=> '',
				 '#\?>$#'				=> '',
				 "#define\('IN_PORTAL', 1\);#si"				=> '',
				 '#\$mx_root_path = [^;]*;#si'				=> '',
				 '#([^_]{1})append_sid#si'				=> '\1mx_append_sid',
				 '#([^_]{1})message_die#si'				=> '\1mx_message_die',
				'#\$phpEx = [^;]*;#'				=> '',
				 '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#'				=> '',
				 "#\\\$module_root_path = ['\\\"]([^']*)['\\\"];#"				=> '$module_root_path = "' . $mx_root_path . $module_root_path . '";',
				 '#.*(\$HTTP_GET_VARS\[\'pane\'\] == \'right\')#si'				=> 'if ( 1==1',
				 '#\$db->sql_close\(\);#si'				=> '',
				'#->assign_vars\([^(]*\(#si'				=> '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,",
				// '#if.*setmodules.*return[^\}]*\}#' => '',
				'#\$phpbb_root_path =[^;]*;#si'				=> '// \0 <= has been allready defined',
				'#require[^;]*;#si' => '// \0',
				);
				if ( $this->category == PHPBB2X_CATEGORY)
				{
					$preg_array = array_merge( $preg_array, array( // #
					 "#\n(@?(include|require)[^;]*;)#si" => "\n" . '// \1 <= has been allready defined',
					'#phpbb_realpath#si' => 'phpbb2::phpbb_realpath',
					//$preg_replace[] = "\n" . '\1';
					));

					$func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match);

					for( $i = 0; $i<$func_cnt; $i++)
					{
						if ( function_exists( $func_match[1][$i]))
						{
							$preg_array = array_merge( $preg_array, array( // #
							"#\nfunction ".$func_match[1][$i]. '#si' => "\nfunction ".$func_match[1][$i].'_defined',
							));
						}
					}

				}


				$script = preg_replace( array_keys($preg_array), array_values($preg_array), $script );
				break;
			case OLYMPUS_BACKEND:
				$script = trim( file_get_contents( $phpbb_root_path . $this->action_script ) );
				break;
		} // switch
		return $script;
	}

	function display()
	{
		// print_r( $this->template->files);die();
		$this->_template_assign_vars();
		$this->template->pparse( 'adm_header' );
		// $this->template->assign_var( 'CONTENT_ACP', $this->panel_html );
		$this->template->pparse( 'adm_body' );
		$this->template->pparse( 'adm_footer' );
	}

	function _template_set_filenames()
	{
		$this->template->set_filenames( array( 'adm_header' => 'admin/mainpage_header.html',
				'adm_body' => 'admin/mainpage_body.html',
				'adm_footer' => 'admin/mainpage_footer.html',
		) );
	}

	function assign_content_acp( $acp_html )
	{
		global $mx_root_path, $phpbb_root_path, $phpEx;

		$preg_pattern = $preg_replace = array();
		switch ( $this->category )
		{
			case MAIN_CATEGORY:
			case MODULE_CATEGORY:
			case PHPBB2X_CATEGORY:
			default:

				$match_count = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/|adm/)?([^"?]*)?))\??([^"]*?))"#si', $acp_html, $match_links );

				for( $i=0; $i < $match_count; $i++)
				{
					if ( eregi( 'javascript:', $match_links[2][$i]) || empty($match_links[8][$i]) || eregi( './../index.php', $match_links[2][$i] ) )
					{
						continue;
					}
					//print $match_links[2][$i] . ' &bull; ' . $match_links[8][$i]. '<br/>';

					for( $j = 0;$j <= $menu_array_normal_count;$j++ )
					{
						//print $menu_array_normal[$menu_array_normal_keys[$j]] . '<br/>';
						if ( strpos( $menu_array_normal[$menu_array_normal_keys[$j]], $match_links[8][$i] ) !== false )
						{

							$action_file = $menu_array_normal_keys[$j];
							$query_string = '';
							if ( $match_links[9][$i] != '' )
							{
								$query_string = '&' . $match_links[9][$i];
							}
							$acp_html = str_replace( $match_links[2][$i], mx_append_sid( "index.$phpEx?cat=" . $this->category . "&panel=$action_file$query_string" ), $acp_html );
							break;
						}
					}
					//print '<p>&nbsp;</p><hr/>';


				}


				break;
			case OLYMPUS_CATEGORY:
				break;
		} // switch

		$forms_cnt = preg_match_all( "#<form([^>]*)>#si", $acp_html, $forms);
		//		print '<pre font-size="12px">';
		for( $f_i = 0; $f_i < $forms_cnt; $f_i++)
		{
			$form_cnt = preg_match_all( "#([^=]*)=[\"']([^\"']*)[\"']#si", $forms[1][$f_i], $form);
			//print $f_i . ' &bull; ' . $forms[1][$f_i] . '<br/>';
			//print_r( $form);
			$form_action = '';
			$form_method = '';
			for( $i= 0; $i< $form_cnt; $i++)
			{
				if ( strtolower(trim($form[1][$i])) == 'method' )
				{
					$form_method = strtoupper($form[2][$i]);
				}
				else if ( strtolower(trim($form[1][$i])) == 'action')
				{
					$form_action = $form[2][$i];
				}
			}
			$html_add = "\n";

			if ( $form_method == 'GET')
			{

				$action = explode( '?', $form_action);
				$params = explode( '&', $action[1]);
				for( $i=0; $i< count( $params); $i++)
				{
					$param = explode( '=', $params[$i]);
					$html_add .= '<input type="hidden" name="'.$param[0]. '" value="' . $param[1] . '" />' . "\n";
				}
			}
			//print htmlentities( $forms[1][$f_i]) . '><br/>';
			//print htmlentities( $forms[1][$f_i] . '>'. $html_add) . '<br/>';
			$acp_html = str_replace( $forms[1][$f_i] . '>', $forms[1][$f_i] .'>'. $html_add, $acp_html);
		}
		//print '</pre>';

		$this->template->assign_var( 'CONTENT_ACP', $acp_html );
	}

	function _template_assign_vars()
	{
		global $board_config, $userdata, $lang, $mx_user, $admincp_nav_icon_url;
		global $theme, $images;

		$l_timezone = explode('.', $board_config['board_timezone']);
		$l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])];

		//
		// Generate stats
		//
		$endtime = explode(' ', microtime());
		$stime = ( $endtime[1] + $endtime[0] ) - $mx_starttime;
		$execution_stats = sprintf($lang['Execution_Stats'], $db->num_queries, round($stime, 4));

		switch (PORTAL_BACKEND)
		{
			case 'internal':
			case 'phpbb2':
			$current_phpbb_version = '2' . $board_config['version'];
			break;

			case 'phpbb3':
			$current_phpbb_version = $board_config['version'];
			break;
		}

		// isset( $mx_user->lang[$action_file_id] )?$mx_user->lang[$action_file_id]:( isset( $lang[$action_file_id] )?$lang[$action_file_id]:str_replace( '_' , ' ', $action_file_id ) )
		$global_vars = array(
		// +MOD: DHTML Menu for ACP
			'COOKIE_NAME' => $board_config['cookie_name'],
			'COOKIE_PATH' => $board_config['cookie_path'],
			'COOKIE_DOMAIN' => $board_config['cookie_domain'],
			'COOKIE_SECURE' => $board_config['cookie_secure'],
			'IMG_URL_CONTRACT' => $admincp_nav_icon_url . '/contract.gif',
			'IMG_URL_EXPAND' => $admincp_nav_icon_url . '/expand.gif',
		// -MOD: DHTML Menu for ACP
			'U_PORTAL_ROOT_PATH' => PORTAL_URL,
			'U_PHPBB_ROOT_PATH' => PHPBB_URL,
			'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,

			'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'],
			'T_MXBB_STYLESHEET' => $theme['head_stylesheet'],
			'T_GECKO_STYLESHEET' => 'gecko.css',

			'MX_ICON_CSS' => $images['mx_graphics']['icon_style'],
			'LOGO' => !empty($images['mx_logo_acp']) ? $images['mx_logo_acp']: $images['mx_logo'],

			"U_PORTAL_INDEX" => mx_append_sid( PORTAL_URL . basename( __FILE__ ) ),
			"U_FORUM_INDEX" => mx_append_sid( PHPBB_URL . "index.$phpEx" ),
			"U_PORTAL_ADMIN_INDEX" => mx_append_sid( basename( __FILE__ ) ),
			"U_ADMIN_INDEX" => mx_append_sid( basename( __FILE__ ) ),
			'U_LOGOUT' => mx_append_sid( PORTAL_URL . 'login.' . $phpEx . '?logout=1' ),

			'ADMIN_TITLE' => $lang['mxBB_adminCP'],

			'USERNAME' => $mx_user->data['username'],
			'CATEGORY' => $this->category,

			'L_LOGGED_IN_AS' => $lang['Logged_in_as'],
			"L_PORTAL_INDEX" => $lang['Portal_index'],
			"L_PREVIEW_PORTAL" => $lang['Preview_portal'],

			'L_LOGOUT' => $lang['Log_out'],
			"L_FORUM_INDEX" => $lang['Main_index'],
			"L_ADMIN_INDEX" => $lang['Admin_Index'],
			"L_PREVIEW_FORUM" => $lang['Preview_forum'],
			'L_ADMIN_CATEGORY' => $this->category_title,
			'L_ADMIN_PART' => $this->panel_title,

			'ACTION_SCRIPT' => $this->action_script,

			'SITENAME' => $board_config['sitename'],

			'L_ADMIN' => $lang['Admin'],
			'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']),
			'L_FAQ' => $lang['FAQ'],
			'U_INDEX' => mx_append_sid('../index.'.$phpEx),

			'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
			'S_LOGIN_ACTION' => mx_append_sid('../login.'.$phpEx),
			'S_JUMPBOX_ACTION' => mx_append_sid('../viewforum.'.$phpEx),
			'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),

			'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
			'S_CONTENT_ENCODING' => $lang['ENCODING'],
			'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
			'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
			'S_USER_LANG' => $mx_user->lang['default_lang'],

			'PHPBB_VERSION' 		=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $current_phpbb_version : '',
			'MX_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '',
			'TRANSLATION_INFO' 		=> (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''),
			'POWERED_BY'           	=> $lang['Powered_by'],
			'EXECUTION_STATS' 		=> $execution_stats
		);

		$this->template->assign_vars( $global_vars );
	}
}

$mx_acp = new mx_acp();
$mx_acp->decode_url( $HTTP_GET_VARS );

$mx_acp->assign_tabs();
$mx_acp->assign_menu();

$script = $mx_acp->prepare_action_script();

switch ( 0 )
{
	case 0;
	ob_start();
	eval( $script );
	$panel_html = ob_get_contents();
	ob_end_clean();
	break;
	case 1:

		$panel_html = preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", '&nbsp;&nbsp;&nbsp;'), str_replace( "\n", "<br/>\n", htmlentities( $script ) ));
		break;
	case 2:
		ob_start();
		eval( $script );
		$panel_html = ob_get_contents();
		ob_end_clean();
		$panel_html .= preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", '&nbsp;&nbsp;&nbsp;'), str_replace( "\n", "<br/>\n", htmlentities( $script ) ));
		break;
	case 3:
		ob_start();
		eval( $script );
		$panel_html = ob_get_contents();
		ob_end_clean();
		$panel_html .= preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", '&nbsp;&nbsp;&nbsp;'), str_replace( "\n", "<br/>\n", htmlentities( $panel_html ) ));;
		break;
}
$mx_acp->assign_content_acp( $panel_html );
$mx_acp->display();

die();

if ( !$is_phpbb || PORTAL_BACKEND == 'phpbb2' )
{
	while ( list( $cat, $menu_list ) = each( $menu_array ) )
	{
		while ( list( $menu_id, $menu_link ) = each( $menu_list ) )
		{
			$menu_array_normal[$menu_id] = $menu_link;
			$menu_array_revert[$menu_link] = $menu_id;
		}
	}

	$d = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/)?([^"?]*)?))\??([^"]*?))"#si', $admin_html, $matches_links );

	$menu_array_normal_keys = array_keys( $menu_array_normal );
	$menu_array_normal_count = count( $menu_array_normal );

	for( $i = 0; $i < count( $matches_links[0] ); $i++ )
	{
		if ( strpos( $matches_links[2][$i], 'javascript:' ) !== false || $matches_links[8][$i] == '' || strpos( $matches_links[2][$i], './../index.php' ) !== false )
		{
			continue;
		}
		for( $j = 0;$j < $menu_array_normal_count;$j++ )
		{
			if ( strpos( $menu_array_normal[$menu_array_normal_keys[$j]], $matches_links[8][$i] ) !== false )
			{
				$action_file = $menu_array_normal_keys[$j];
				$query_string = '';
				if ( $matches_links[9][$i] != '' )
				{
					$query_string = '&' . $matches_links[9][$i];
				}
				$admin_html = str_replace( $matches_links[2][$i], mx_append_sid( "index.$phpEx?cat=$category&action_file=$action_file$query_string" ), $admin_html );
				break;
			}
		}
	}
}

$template->assign_block_vars( 'module_portal', array( 'ACTIVETAB' => $is_portal?' id="activetab"':'',
) );
$template->assign_block_vars( 'module_mx', array( 'ACTIVETAB' => $is_module?' id="activetab"':'',
) );
// error_reporting( E_ALL);
$menu_params = '';

$template->assign_var( 'L_ADMIN_CATEGORY', $lang_category );

display_tab_menu( $menu_array, $action_file_id, $allow_menu_sort, $menu_params );
$template->pparse( 'adm_header' );

$template->assign_var( 'CONTENT_ACP', $admin_html );

$template->pparse( 'adm_body' );
$template->pparse( 'adm_footer' );
// print '<pre>';
// print_r( $lang);
// print '</pre>';

?>
Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** index.php	21 Jan 2008 01:06:20 -0000	1.36
--- index.php	29 Jan 2008 19:37:25 -0000	1.37
***************
*** 7,26 ****
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  * @link http://www.mxbb.net
!  * @origin This file is borrowed from phpBB, with some modifications
  */
  
  // Security and Page header
! define( 'IN_PORTAL', 1 );
  $mx_root_path = './../';
! $phpEx = substr( strrchr( __FILE__, '.' ), 1 );
! $no_page_header = true;
[...1871 lines suppressed...]
! 	$template->set_filenames(array(
! 		"body" => "admin/index_frameset.tpl")
! 	);
  
+ 	$template->assign_vars(array(
+ 		'ADMIN_TITLE' => $lang['mxBB_adminCP'],
+ 		"S_FRAME_NAV" => mx_append_sid("index_right.$phpEx?pane=left"),
+ 		"S_FRAME_MAIN" => mx_append_sid("index_right.$phpEx?pane=right"))
+ 	);
+ 
+ 	header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
+ 	header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+ 
+ 	$template->pparse("body");
+ 
+ 	$db->sql_close();
+ 	exit;
+ }
  ?>
\ No newline at end of file

[mxbb-commits] mx_music/templates/_core/images/lang_english upload_song.gif, NONE, 1.1

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

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

Added Files:
	upload_song.gif 
Log Message:
This upgrade will make mx_music compatible with 2.9

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

[mxbb-commits] mx_music/templates/_core _core.cfg, NONE, 1.1 subSilver.cfg, 1.1, NONE

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

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

Added Files:
	_core.cfg 
Removed Files:
	subSilver.cfg 
Log Message:
This upgrade will make mx_music compatible with 2.9

--- subSilver.cfg DELETED ---

--- NEW FILE: _core.cfg ---
<?php
/**
*
* @package mxBB Portal Module - mx_music
* @version $Id: _core.cfg,v 1.1 2008/01/29 07:54:18 orynider Exp $
* @copyright (c) 2002-2006 mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

//
// **      Configuration file for subSilver template       **
//
// **         copyright (C) 2001 The phpBB Group           **
// **             Created by subBlue design                **
// **                  www.subBlue.com                     **
//
// **    subSilver dev. forum: www.subSky.com/phpBB2/      **
//
// $Id: _core.cfg,v 1.1 2008/01/29 07:54:18 orynider Exp $
//
// Please note that to enable support of different languages
// the ". LANG ." place holder is available. This will be replaced
// with xxx where xxx is the users selected language. If
// that language isn't available it will default to english.
// Therefore you MUST ensure you have at least a english
// directory if you choose to localise your template
//

//
// Do not alter this line!
//
if( !defined('MX_TEMPLATE_CONFIG'))
{
	define(MX_TEMPLATE_CONFIG, TRUE);
	$mx_template_config = true;
}

$mx_template_name = 'subSilver';


// -------------------------------------------------------------------------
// Prefix with PORTAL_URL
// -------------------------------------------------------------------------
// $current_template_images = PORTAL_URL . $current_template_path . "/images";


$current_template_images = $module_root_path . "templates/". $mx_template_name ."/images";
$current_template_phpbb_images = PHPBB_URL . "templates/". $mx_template_name ."/images"; // phpBB graphics template


if ( !file_exists( $current_template_images . '/lang_' . $board_config['default_lang'] ) )
{
	$link_language='lang_english';
}	
else
{
	$link_language='lang_' . $board_config['default_lang'];
}
 
define('LANG', $link_language);

// -------------------------------------------------------------------------
// (Re)Define images
// -------------------------------------------------------------------------

// MOM Pics
$mx_images['upload_song'] = "$current_template_images/" . LANG . "/upload_song.gif";
$mx_images['no_image'] = "$current_template_images/no_image.gif";

// Use standard phpBB graphics
//
$mx_images['icon_quote'] = "$current_template_phpbb_images/" . LANG . "/icon_quote.gif";
$mx_images['icon_edit'] = "$current_template_phpbb_images/" . LANG . "/icon_edit.gif";
$mx_images['icon_search'] = "$current_template_phpbb_images/" . LANG . "/icon_search.gif";
$mx_images['icon_profile'] = "$current_template_phpbb_images/" . LANG . "/icon_profile.gif";
$mx_images['icon_pm'] = "$current_template_phpbb_images/" . LANG . "/icon_pm.gif";
$mx_images['icon_email'] = "$current_template_phpbb_images/" . LANG . "/icon_email.gif";
$mx_images['icon_delpost'] = "$current_template_phpbb_images/icon_delete.gif";
$mx_images['icon_ip'] = "$current_template_phpbb_images/" . LANG . "/icon_ip.gif";
$mx_images['icon_www'] = "$current_template_phpbb_images/" . LANG . "/icon_www.gif";
$mx_images['icon_icq'] = "$current_template_phpbb_images/" . LANG . "/icon_icq_add.gif";
$mx_images['icon_aim'] = "$current_template_phpbb_images/" . LANG . "/icon_aim.gif";
$mx_images['icon_yim'] = "$current_template_phpbb_images/" . LANG . "/icon_yim.gif";
$mx_images['icon_msnm'] = "$current_template_phpbb_images/" . LANG . "/icon_msnm.gif";
$mx_images['icon_minipost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_gotopost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_minipost_new'] = "$current_template_phpbb_images/icon_minipost_new.gif";
$mx_images['icon_latest_reply'] = "$current_template_phpbb_images/icon_latest_reply.gif";
$mx_images['icon_newest_reply'] = "$current_template_phpbb_images/icon_newest_reply.gif";

$mx_images['forum'] = "$current_template_phpbb_images/folder_big.gif";
$mx_images['forum_new'] = "$current_template_phpbb_images/folder_new_big.gif";
$mx_images['forum_locked'] = "$current_template_phpbb_images/folder_locked_big.gif";
?>

[mxbb-commits] mx_music/templates/prosilver music_lists.html, NONE, 1.1 prosilver.cfg, NONE, 1.1

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

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

Added Files:
	music_lists.html prosilver.cfg 
Log Message:
This upgrade will make mx_music compatible with 2.9

--- NEW FILE: prosilver.cfg ---
<?php
/**
*
* @package mxBB Portal Module - mx_music
* @version $Id: prosilver.cfg,v 1.1 2008/01/29 07:54:18 orynider Exp $
* @copyright (c) 2002-2006 mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

//
// **      Configuration file for subSilver template       **
//
// **         copyright (C) 2001 The phpBB Group           **
// **             Created by subBlue design                **
// **                  www.subBlue.com                     **
//
// **    subSilver dev. forum: www.subSky.com/phpBB2/      **
//
// $Id: prosilver.cfg,v 1.1 2008/01/29 07:54:18 orynider Exp $
//
// Please note that to enable support of different languages
// the ". LANG ." place holder is available. This will be replaced
// with xxx where xxx is the users selected language. If
// that language isn't available it will default to english.
// Therefore you MUST ensure you have at least a english
// directory if you choose to localise your template
//

//
// Do not alter this line!
//
if( !defined('MX_TEMPLATE_CONFIG'))
{
	define(MX_TEMPLATE_CONFIG, TRUE);
	$mx_template_config = true;
}

$mx_template_name = 'subSilver';


// -------------------------------------------------------------------------
// Prefix with PORTAL_URL
// -------------------------------------------------------------------------
// $current_template_images = PORTAL_URL . $current_template_path . "/images";


$current_template_images = $module_root_path . "templates/". $mx_template_name ."/images";
$current_template_phpbb_images = PHPBB_URL . "templates/". $mx_template_name ."/images"; // phpBB graphics template


if ( !file_exists( $current_template_images . '/lang_' . $board_config['default_lang'] ) )
{
	$link_language='lang_english';
}	
else
{
	$link_language='lang_' . $board_config['default_lang'];
}
 
define('LANG', $link_language);

// -------------------------------------------------------------------------
// (Re)Define images
// -------------------------------------------------------------------------

// MOM Pics
$mx_images['upload_song'] = "$current_template_images/" . LANG . "/upload_song.gif";
$mx_images['no_image'] = "$current_template_images/no_image.gif";

// Use standard phpBB graphics
//
$mx_images['icon_quote'] = "$current_template_phpbb_images/" . LANG . "/icon_quote.gif";
$mx_images['icon_edit'] = "$current_template_phpbb_images/" . LANG . "/icon_edit.gif";
$mx_images['icon_search'] = "$current_template_phpbb_images/" . LANG . "/icon_search.gif";
$mx_images['icon_profile'] = "$current_template_phpbb_images/" . LANG . "/icon_profile.gif";
$mx_images['icon_pm'] = "$current_template_phpbb_images/" . LANG . "/icon_pm.gif";
$mx_images['icon_email'] = "$current_template_phpbb_images/" . LANG . "/icon_email.gif";
$mx_images['icon_delpost'] = "$current_template_phpbb_images/icon_delete.gif";
$mx_images['icon_ip'] = "$current_template_phpbb_images/" . LANG . "/icon_ip.gif";
$mx_images['icon_www'] = "$current_template_phpbb_images/" . LANG . "/icon_www.gif";
$mx_images['icon_icq'] = "$current_template_phpbb_images/" . LANG . "/icon_icq_add.gif";
$mx_images['icon_aim'] = "$current_template_phpbb_images/" . LANG . "/icon_aim.gif";
$mx_images['icon_yim'] = "$current_template_phpbb_images/" . LANG . "/icon_yim.gif";
$mx_images['icon_msnm'] = "$current_template_phpbb_images/" . LANG . "/icon_msnm.gif";
$mx_images['icon_minipost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_gotopost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_minipost_new'] = "$current_template_phpbb_images/icon_minipost_new.gif";
$mx_images['icon_latest_reply'] = "$current_template_phpbb_images/icon_latest_reply.gif";
$mx_images['icon_newest_reply'] = "$current_template_phpbb_images/icon_newest_reply.gif";

$mx_images['forum'] = "$current_template_phpbb_images/folder_big.gif";
$mx_images['forum_new'] = "$current_template_phpbb_images/folder_new_big.gif";
$mx_images['forum_locked'] = "$current_template_phpbb_images/folder_locked_big.gif";
?>
--- NEW FILE: music_lists.html ---
<div class="forabg">
<div class="inner" style="vertical-align:top; display:block">
	<div class="textbody"></div>
	<dl>
		<dt class="row1" style="text-align:left">{L_RECENT_SONGS}</dt>
	</dl>
	<!-- BEGIN music_lists_no_songs -->
	<dl>
		<dt class="row2" style="text-align:left">{L_NO_SONGS}</dt>
	</dl>
	<!-- END music_lists_no_songs -->
	<!-- BEGIN music_recent -->
	<dl>
	<dt class="row2" style="vertical-align:top">
	<!-- END music_recent -->
	<!-- BEGIN music_recent_lists -->
		<li class="row<!-- IF music_recent_lists.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF music_recent_lists.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF music_recent_lists.S_POST_STICKY --> sticky<!-- ENDIF --><!-- music_recent_lists.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
			<dl class="icon" style="text-align:left">
				{music_recent_lists.BULLET} <span class="genmed">{music_recent_lists.TITLE}</span>
			</dl>
			<dl style="text-align:right">
				<span class="gensmall">{music_recent_lists.L_POSTER}: {music_recent_lists.POSTER}</span>&nbsp;
			</dl>
		</li>
	<!-- END music_recent_lists -->
	<!-- BEGIN music_recent -->
	</dt>
	</dl>
	<!-- END music_recent -->
	</div>
	<span class="corners-bottom"><span></span></span>
</div>
<br clear="all" />

[mxbb-commits] mx_music/templates/_core music_cat_body.tpl, NONE, 1.1 music_cat_xs.tpl, NONE, 1.1 music_comment_body.tpl, NONE, 1.1 music_edit_body.tpl, NONE, 1.1 music_index_body.tpl, NONE, 1.1 music_list_body.tpl, NONE, 1.1 music_lists.tpl, NONE, 1.1 music_media_cat_body.tpl, NONE, 1.1 music_modcp_body.tpl, NONE, 1.1 music_move_body.tpl, NONE, 1.1 music_page_body.tpl, NONE, 1.1 music_pic_cat_body.tpl, NONE, 1.1 music_rate_body.tpl, NONE, 1.1 music_upload_body.tpl, NONE, 1.1 subSilver.cfg, NONE, 1.1

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

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

Added Files:
	music_cat_body.tpl music_cat_xs.tpl music_comment_body.tpl 
	music_edit_body.tpl music_index_body.tpl music_list_body.tpl 
	music_lists.tpl music_media_cat_body.tpl music_modcp_body.tpl 
	music_move_body.tpl music_page_body.tpl music_pic_cat_body.tpl 
	music_rate_body.tpl music_upload_body.tpl subSilver.cfg 
Log Message:
This upgrade will make mx_music compatible with 2.9

--- NEW FILE: music_rate_body.tpl ---
<center><b><span class="genmed"><h3>{SONG_TITLE} :: {SINGER}</h3></span></b></center>
<script language="JavaScript" type="text/javascript">
<!--
function checkRateForm() {
	if (document.rateform.rate.value == -1)
	{
		return false;
	}
	else
	{
		return true;
	}
}
// -->
</script>

<form name="rateform" action="{S_MUSIC_ACTION}" method="post" onsubmit="return checkRateForm();">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td class="nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
  </tr>
</table>

<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  <tr>
	<th class="thTop" height="25" colspan="2">{L_RATING}</th>
  </tr>
  <tr>
	<td class="row1" align="center" width="50%"><table width="100%" cellspacing="2" cellpadding="2" border="0">
		<tr>
		  <td align="right" nowrap="nowrap" class="genmed">{L_POSTER}:</td>
		  <td class="genmed"><strong>{POSTER}</strong></td>
		</tr>
		<tr>
		  <td align="right" nowrap="nowrap" class="genmed">{L_POSTED}:</td>
		  <td class="genmed"><strong>{SONG_TIME}</strong></td>
		</tr>
		<tr>
		  <td align="right" nowrap="nowrap" class="genmed">{L_VIEW}:</td>
		  <td class="genmed"><strong>{SONG_VIEW}</strong></td>
		</tr>
	</table></td>
	<td class="row1" valign="top">
	<span class="gen"><br />{L_CURRENT_RATING}:&nbsp;<strong>{SONG_RATING}</strong><br />
	<br />{L_PLEASE_RATE_IT}:&nbsp;<select name="rate">
	<option value="-1">{S_RATE_MSG}</option>
	<!-- BEGIN rate_row -->
	<option value="{rate_row.POINT}">{rate_row.POINT}</option>
	<!-- END rate_row -->
	</select><br />&nbsp;</span>
	</td>
  </tr>
  <tr>
	<td class="catBottom" align="center" height="28" colspan="2"><input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /></td>
  </tr>
</table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}
--- NEW FILE: music_list_body.tpl ---
<form action="{S_MUSIC_ACTION}" method="post">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
  <tr>
	<td><span class="gensmall">
	<!-- BEGIN switch_user_logged_in -->
	{LAST_VISIT_DATE}<br />
	<!-- END switch_user_logged_in -->
	{CURRENT_TIME}<br />
	</span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a href="{U_MUSIC}" class="nav">{L_MUSIC}</a></span></td>
  </tr>
</table>
<table width="100%" cellpadding="1" cellspacing="1" border="0" class="forumline">
  <tr> 
    <th class="thTop" height="25" colspan="6" nowrap="nowrap">{L_SEARCH_SONGS} <input class="post" type="text" name="search" size="30" />&nbsp;&nbsp;	
		<select name="search_cond">
        	<option value='title'>{L_SONG_TITLE}</option>
        	<option value='singer'>{L_SINGER}</option>
        	<option value='poster'>{L_POSTER}</option>
      	</select> &nbsp;&nbsp; 
	<input type="submit" name="submit" value="{L_SEARCH}" class="liteoption" /></th>       	
  </tr>
  <tr> 
    <td width="38%" class="catbottom" align="center"><span class="gen">{L_SONG_TITLE}</span></td>
    <td width="16%" class="catbottom" align="center"><span class="gen">{L_SINGER}</span></td>
    <td width="22%" class="catbottom" align="center"><span class="gen">{L_POSTED}</span></td>
    <td width="6%" class="catbottom" align="center"><span class="gen">{L_VIEW}</span></td>
    <td width="8%" class="catbottom" align="center"><span class="gen">{L_RATING}</span></td>
    <td width="10%" class="catbottom" align="center"><span class="gen">{L_COMMENTS}</span></td>
  </tr>
    <!-- BEGIN no_songs -->
  <tr> 
    <td class="row1" align="center" colspan="6" height="50"><span class="gen">{L_NO_SONGS}</span></td>
  </tr>
  <!-- END no_songs -->
  <!-- BEGIN search_row -->
  <!-- END search_row -->
  <!-- BEGIN search_songs -->
  <!-- BEGIN search_detail -->
  <tr>
    <td width="38%" class="row1" align="center"><span class="genmed">{search_songs.search_detail.TITLE}</span></td>
    <td width="16%" class="row2" align="center"><span class="genmed">{search_songs.search_detail.SINGER}</span></td>
    <td width="22%" class="row1" align="center"><span class="gensmall">{search_songs.search_detail.POSTER}<br />{search_songs.search_detail.TIME}</span></td>
	<td width="6%" class="row2" align="center"><span class="gensmall">{search_songs.search_detail.VIEW}</span></td>
    <td width="8%" class="row1" align="center"><span class="gensmall">{search_songs.search_detail.RATING}</span></td>
    <td width="10%" class="row2" align="center"><span class="gensmall">{search_songs.search_detail.COMMENTS}</span></td>
    <!-- END search_detail -->
  </tr>
  <!-- END search_songs -->
</table>
</form>
<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}
--- NEW FILE: music_modcp_body.tpl ---
<form name="modcp" action="{S_MUSIC_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td width="100%"><a class="maintitle" href="{U_VIEW_CAT}">{CAT_TITLE}</a></td>
	<td align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td>
  </tr>
  <tr>
	<td class="nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a></span></td>
	<td align="right" nowrap="nowrap">
		<span class="gensmall">{L_SELECT_SORT_METHOD}:
		<select name="sort_method">
			<option {SORT_TIME} value='song_time'>{L_TIME}</option>
			<option {SORT_SONG_TITLE} value='song_title'>{L_SONG_TITLE}</option>
			<option {SORT_USERNAME} value='song_user_id'>{L_USERNAME}</option>
			<option {SORT_VIEW} value='song_view_count'>{L_VIEW}</option>
			{SORT_RATING_OPTION}
			{SORT_COMMENTS_OPTION}
			{SORT_NEW_COMMENT_OPTION}
		</select>
		&nbsp;{L_ORDER}:
		<select name="sort_order">
			<option {SORT_ASC} value='ASC'>{L_ASC}</option>
			<option {SORT_DESC} value='DESC'>{L_DESC}</option>
		</select>
		&nbsp;<input type="submit" name="submit" value="{L_SORT}" class="liteoption" /></span>
	</td>
  </tr>
</table>

<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  <tr>
	<td class="catLeft" height="25" align="center" colspan="6"><span class="cattitle">{L_MODCP}</span></th>
  </tr>
  <tr>
	<th class="thCornerL" height="25" nowrap="nowrap">&nbsp;{L_SONG_TITLE}&nbsp;</th>
	<th width="5%" class="thTop" nowrap="nowrap">&nbsp;{L_RATING}&nbsp;</th>
	<th width="5%" class="thTop" nowrap="nowrap">&nbsp;{L_COMMENTS}&nbsp;</th>
	<th width="5%" class="thTop" nowrap="nowrap">&nbsp;{L_STATUS}&nbsp;</th>
	<th width="5%" class="thTop" nowrap="nowrap">&nbsp;{L_APPROVAL}&nbsp;</th>
	<th width="5%" class="thCornerR" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
  </tr>
  <!-- BEGIN no_songs -->
  <tr>
	<td class="row1" align="center" colspan="6" height="50"><span class="gen">{L_NO_SONGS}</span></td>
  </tr>
  <!-- END no_songs -->
  <!-- BEGIN songrow -->
  <tr>
	<td class="row1" height="25"><span class="genmed">{L_SONG_TITLE}: {songrow.SONG_TITLE}<br />{L_POSTER}: {songrow.POSTER}<br />{L_TIME}: {songrow.TIME}</span></td>
	<td align="center" class="row2"><span class="genmed">{songrow.RATING}</span></td>
	<td align="center" class="row2"><span class="genmed">{songrow.COMMENTS}</span></td>
	<td align="center" class="row2"><span class="genmed">{songrow.LOCK}</span></td>
	<td align="center" class="row2"><span class="genmed">{songrow.APPROVAL}</span></td>
	<td align="center" class="row3"><span class="genmed"><input type="checkbox" name="song_id[]" value="{songrow.SONG_ID}" /></span></td>
  </tr>
  <!-- END songrow -->
  <tr>
	<td class="catbottom" colspan="6" align="right" height="28">
		<input type="hidden" name="mode" value="modcp" />
		<input type="submit" class="liteoption" name="move" value="{L_MOVE}" />
		<input type="submit" class="liteoption" name="lock" value="{L_LOCK}" />
		<input type="submit" class="liteoption" name="unlock" value="{L_UNLOCK}" />
		{DELETE_BUTTON}
		{APPROVAL_BUTTON}
		{UNAPPROVAL_BUTTON}
	</td>
  </tr>
</table>

<table width="100%" cellspacing="2" border="0" cellpadding="2">
  <tr>
	<td align="right" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br />
		<span class="nav">{PAGINATION}</span></td>
  </tr>
  <tr>
	<td colspan="3"><span class="nav">{PAGE_NUMBER}</span></td>
  </tr>
</table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}

--- NEW FILE: music_upload_body.tpl ---
<script language="JavaScript" type="text/javascript">
<!--
function checkMUSICForm() {
	formErrors = false;

	if (document.upload.song_file.value.length < 8)
	{
		if (document.upload.song_url.value.length < 15)
			{			
				formErrors = "{L_UPLOAD_NO_FILE}";
			}
	}
	else if (document.upload.song_file.value.length > 8)
	{
		if (document.upload.song_url.value.length > 15)
			{			
				formErrors = "{L_UPLOAD_BOTH_FILE}";
			}
	}
	else if (document.upload.song_title.value.length < 2)
	{
		formErrors = "{L_UPLOAD_NO_TITLE}";
	}
	else if (document.upload.song_desc.value.length > {S_SONG_DESC_MAX_LENGTH})
	{
		formErrors = "{L_DESC_TOO_LONG}";
	}

	if (formErrors) {
		alert(formErrors);
		return false;
	} else {
		return true;
	}
}
// -->
</script>

<form name="upload" action="{S_MUSIC_ACTION}" method="post" enctype="multipart/form-data" onSubmit="return checkMUSICForm()">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td class="nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
  </tr>
</table>

<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
  <tr>
	<th class="thTop" height="25" colspan="2">{L_UPLOAD_SONG}</th>
  </tr>
<!-- BEGIN switch_user_logged_out -->
  <tr>
	<td class="row1" width="30%" height="28"><span class="gen">{L_USERNAME}:</span></td>
	<td class="row2"><input class="post" type="text" name="song_username" size="32" maxlength="32" /></td>
  </tr>
<!-- END switch_user_logged_out -->
  <tr>
	<td class="row1"><span class="gen">{L_UPLOAD_SONG_FROM_MACHINE}:</span></td>
	<td class="row2"><input class="post" type="file" name="song_file" size="49" /></td>
  </tr>
  <tr>
	<td class="row1" height="28"><span class="gen">{L_SONG_URL}:</span></td>
	<td class="row2"><input class="post" type="text" name="song_url" size="60" /></td>
  </tr>
  <tr>
		<td class="row1" rowspan="2"><span class="gen">{L_SONG_IMAGE}:</span><br /><span class="gensmall">{L_SONG_IMAGE_DESC}</span></td>
		<td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" />{L_NO_IMAGE} &nbsp; &nbsp;<input type="radio" name="image_system" value="1"  /> {L_UPLOAD_IMAGE}</span></td>
  </tr>
  <tr>
	<td class="row2"><input class="post" type="file" name="song_image" size="49" /></td>
  </tr>
  <tr>
	<td class="row1" height="28"><span class="gen">{L_SONG_TITLE}:</span></td>
	<td class="row2"><input class="post" type="text" name="song_title" size="60" /></td>
  </tr>
  <tr>
	<td class="row1" height="28"><span class="gen">{L_SINGER}:</span></td>
	<td class="row2"><input class="post" type="text" name="song_singer" size="60" /></td>
  </tr>
  <tr>
	<td class="row1" valign="top" height="28"><span class="gen">{L_SONG_DESC}:<br />
	</span><span class="genmed">{L_PLAIN_TEXT_ONLY}<br />{L_MAX_LENGTH}: <b>{S_SONG_DESC_MAX_LENGTH}</b></span></td>
	<td class="row2"><textarea class="post" cols="60" rows="10" name="song_desc" size="60"></textarea></td>
  </tr>
  <tr>
	<td height="28" class="row1"><span class="gen">{L_UPLOAD_TO_CATEGORY}:</span></td>
	<td class="row2">{SELECT_CAT}</td>
  </tr>
  <tr>
	<td class="row1" height="28"><span class="gen">{L_MAX_FILESIZE}:</span></td>
	<td class="row2"><span class="gen"><b>{S_MAX_FILESIZE}</b></span></td>
  </tr>
  <tr>
	<td class="row1" height="28"><span class="gen">{L_ALLOWED_FILE}:</span></td>
	<td class="row2"><span class="gen"><b>{S_MP3} {S_WMA} {S_WMV} {S_MPEG} {S_AVI} {S_SWF} {S_AU} {S_WAV} {S_MIDI} {S_RAM} {S_QT} {S_RM}</b></span></td>
  </tr>
  <tr>
	<td class="catBottom" align="center" height="28" colspan="2"><input type="reset" value="{L_RESET}" class="liteoption" />&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /></td>
  </tr>
</table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}

--- NEW FILE: music_edit_body.tpl ---
<script language="JavaScript" type="text/javascript">
<!--
function checkMUSICForm() {
	formErrors = false;

	if (document.editform.song_title.value.length < 2)
	{
		formErrors = "{L_UPLOAD_NO_TITLE}";
	}
	else if (document.editform.song_desc.value.length > {S_SONG_DESC_MAX_LENGTH})
	{
		formErrors = "{L_DESC_TOO_LONG}";
	}

	if (formErrors)
	{
		alert(formErrors);
		return false;
	}
	else
	{
		return true;
	}
}
// -->
</script>

<form name="editform" action="{S_MUSIC_ACTION}" method="post" onsubmit="return checkMUSICForm()" enctype="multipart/form-data">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td class="nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
  </tr>
</table>

<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  <tr>
	<th class="thTop" height="25" colspan="2">{L_EDIT_SONG_INFO}</th>
  </tr>
  <tr>
	<td class="row1" width="30%" height="28"><span class="gen">{L_SONG_TITLE}</span></td>
	<td class="row2"><input class="post" type="text" name="song_title" size="60" value="{SONG_TITLE}" /></td>
  </tr>
  <tr>
	<td class="row1" width="30%" height="28"><span class="gen">{L_SONG_URL}</span></td>
	<td class="row2"><input class="post" type="text" name="song_url" size="60" value="{SONG_URL}" /></td>
  </tr>
  <tr>
	<td class="row1" width="30%" height="28"><span class="gen">{L_SINGER}</span></td>
	<td class="row2"><input class="post" type="text" name="song_singer" size="60" value="{SONG_SINGER}" /></td>
  </tr>
  <tr>
	<td class="row1" width="30%" rowspan="2"><span class="gen">{L_SONG_IMAGE}:</span><br /><span class="gensmall">{L_SONG_IMAGE_DESC}</span></td>
	<td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" />{L_NO_IMAGE} &nbsp; &nbsp;<input type="radio" name="image_system" value="1"  /> {L_UPLOAD_IMAGE}</span></td>
  </tr>
  <tr>
	<td class="row2"><input class="post" type="file" name="song_image" size="49" /></td>
  </tr>
  <tr>
	<td class="row1" valign="top" width="30%" height="28"><span class="gen">{L_SONG_DESC}<br /></span><span class="genmed">{L_PLAIN_TEXT_ONLY}<br />{L_MAX_LENGTH}: <b>{S_SONG_DESC_MAX_LENGTH}</b></span></td>
	<td class="row2"><textarea class="post" cols="60" rows="4" name="song_desc" size="60">{SONG_DESC}</textarea></td>
  </tr>
  <tr>
	<td class="catBottom" align="center" height="28" colspan="2"><input type="reset" value="{L_RESET}" class="liteoption" />&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /></td>
  </tr>
</table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}

--- NEW FILE: music_page_body.tpl ---
<center><b><span class="genmed"><h3>{SONG_TITLE} :: {SINGER}</h3></span></b></center>

<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td class="nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
  </tr>
</table>

<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  <tr> 
    <th height="25" colspan="2" class="thTop">{SONG_TITLE}</th>
  </tr>
  <tr> 
    <td width="44%" class="row1" align="center">
      <!-- BEGIN media -->
            <SCRIPT LANGUAGE="JavaScript"> 
            var WMP7; 
            var Mac; 
            var Win;
            var Unix;
            var Linux; 

            Win = navigator.userAgent.indexOf("Win") > -1; 
            Mac = navigator.userAgent.indexOf("Mac") > -1;
            Unix = navigator.appVersion.indexOf("X11") > -1;
            Linux = navigator.appVersion.indexOf("Linux") > -1; 
 

            if (Mac)
            {

            if ( navigator.appName == "Netscape" ){ 
                 //Netscape code
                 document.write ('    <Embed id="wmp" name="wmp" type="audio/mpeg"');
                 document.write ('        pluginspage="http://www.microsoft.com/windows/windowsmedia/"');
                 document.write ('        filename="{U_SONG}"');
                 document.write ('        src="{U_SONG}"');
                 document.write ('        Name=MediaPlayer');
                 document.write ('        ShowControls=1');
                 document.write ('        ShowDisplay=1');
                 document.write ('        ShowStatusBar=1');
                 document.write ('        AUTOSTART=1');
                 document.write ('        AutoSize=1');
                 document.write ('        width={WIDTH}');
                 document.write ('        height={HEIGHT}>');
                 document.write ('    </Embed>'); } 

            if ( navigator.appName != "Netscape" ){ 
            document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="70" height="300" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="1" filename="{U_SONG}" src="{U_SONG}" ></embed>'); } 
            }


            if (Win)
            {
            if ( navigator.appName != "Netscape" ){ 
            WMP7 = new ActiveXObject('WMPlayer.OCX'); 
            } 

            // Windows Media Player 7 Code 
            if ( WMP7 ) 
            { 

                 document.write ('  <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"');
                 document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"');
                 document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">');
                 document.write ('<PARAM NAME="url" VALUE="{U_SONG}">');
                 document.write ('<PARAM NAME="FileName" value="{U_SONG}">');
                 document.write ('<PARAM NAME="AutoStart" VALUE="true">');
                 document.write ('<PARAM NAME="ShowControls" VALUE="1">');
                 document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
                 document.write ('<PARAM NAME="AutoSize" VALUE="1">');
                 document.write ('<PARAM NAME="uiMode" VALUE="mini">'); 

                 document.write ('    <Embed type="application/x-mplayer2"');
                 document.write ('        pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"');
                 document.write ('        filename="{U_SONG}"');
                 document.write ('        src="{U_SONG}"');
                 document.write ('        Name="MediaPlayer2"');
                 document.write ('        ShowControls="1"');
                 document.write ('        ShowDisplay="1"');
                 document.write ('        ShowStatusBar="1"');
                 document.write ('        AUTOSTART="true"');
                 document.write ('        AutoSize="1"');
                 document.write ('        width="70"');
                 document.write ('        height="300">');
                 document.write ('    </embed>');

                 document.write ('</OBJECT>');


            } 

            // Windows Media Player 6.4 Code 
            else 

            { 

            //IE Code
            document.write ('  <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"');
            document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"');
            document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">');
            document.write ('<PARAM NAME="url" VALUE="{U_SONG}">');
            document.write ('<PARAM NAME="FileName" value="{U_SONG}">');
            document.write ('<PARAM NAME="AutoStart" VALUE="true">');
            document.write ('<PARAM NAME="ShowControls" VALUE="1">');
            document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
            document.write ('<PARAM NAME="AutoSize" VALUE="1">');  

            //Firefox code
            document.write ('    <Embed type="application/x-mplayer2"');
            document.write ('        pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"');
            document.write ('        filename="{U_SONG}"');
            document.write ('        src="{U_SONG}"');
            document.write ('        Name="MediaPlayer"');
            document.write ('        ShowControls="1"');
            document.write ('        ShowDisplay="1"');
            document.write ('        ShowStatusBar="1"');
            document.write ('        AUTOSTART="true"');
            document.write ('        AutoSize="1"');
            document.write ('        width="{WIDTH}"');
            document.write ('        height="{HEIGHT}">');
            document.write ('    </embed>');

            document.write ('</OBJECT>');
 
            }
            } 

            else 
            { 

            document.write(' <embed type="audio/mpeg" height="70" width="300" AUTOSTART="1" filename="{U_SONG}" src="{U_SONG}" ></embed>'); 

            } 

            </SCRIPT>
      <!-- END media -->

      <!-- BEGIN flash --> 
	<EMBED src="{U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">
	</EMBED>
      <!-- END flash -->

      <!-- BEGIN flashvideo --> 
	<embed src="{SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars="">
	</embed>
      <!-- END flashvideo -->

      <!-- BEGIN youtube -->
	<object width="425" height="350">
		<param name="movie" value="{VIDEO_URL}" />
		<param name="wmode" value="transparent" />
		<param name="allowfullscreen" value="true" />
		<param name="flashvars" value="&rs=1&sn=1&iurl={U_IMG}" />
		<embed src="{VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={U_IMG}" />
	</object> 
      <!-- END youtube -->

      <!-- BEGIN flv -->
	<div id="flvplayer">
		<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="425" height="350" id="flvplayer" align="center">
		<param name="allowScriptAccess" value="always" />
		<param name="movie" value="{VIDEO_URL}" />
		<param name="loop" value="false" />
		<param name="menu" value="false" />
		<param name="quality" value="high" />
		<param name="allowfullscreen" value="true" />
		<param name="scale" value="noscale" />
		<param name="salign" value="lt" />
		<param name="bgcolor" value="000000" />
		<param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" />
		<embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
		</object>
	</div>
      <!-- END flv -->

	<!-- BEGIN ram -->
<embed src="{U_SONG}" align="center" 
width="275" height="40" type="audio/x-pn-realaudio-plugin" console="cons" 
controls="ControlPanel" autostart="false"></embed>
	<!-- END ram -->

	<!-- BEGIN qt -->
    	<object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212">
				<param name="qtsrc" value="{U_SONG}">
				<param name="autoplay" value="true">
				<param name="loop" value="false">
				<param name="controller" value="true">
				<param name="kioskmode" value="true">
				<param name="cache" value="false">
				<embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="true" kioskmode="true" cache="false">
				</embed>
		</object>
	<!-- END qt -->

	<!-- BEGIN  img --> 
		<a href="javascript:void(0);" onClick="window.open('{SONG_FULL_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{SONG_THUMB_URL}" id="image" type="image" width="425" height="350" border="1"></a>
	<!-- END img -->

</td>
    <td rowspan="2" class="row1"><table width="90%" height="90%" border="0" align="center" cellpadding="3" cellspacing="2">
  	<tr> 
    	  <td valign="top" align="center"><img src="{U_IMG}" border="0"></td>
  	</tr>
        <tr> 
          <td valign="top" align="center"><br /><span class="gen">{SONG_DESC}</span></td>
        </tr>
        <!-- BEGIN rate_switch -->
        <!-- END rate_switch -->
        <!-- BEGIN comment_switch -->
        <!-- END comment_switch -->
        <!-- BEGIN download_switch -->
        <!-- END download_switch -->
      </table></td>
  </tr>
  <tr> 
    <td class="row2">
<table width="90%" align="center" border="0" cellpadding="3" cellspacing="2">
        <tr> 
          <td width="25%" align="right"><span class="genmed">{L_POSTER}:</span></td>
          <td><span class="genmed"><b>{POSTER}</b></span></td>
        </tr>
        <tr> 
          <td width="25%" align="right"><span class="genmed">{L_SINGER}:</span></td>
          <td><span class="genmed"><b>{SINGER}</b></span></td>
        </tr>
        <tr> 
          <td align="right"><span class="genmed">{L_POSTED}:</span></td>
          <td><b><span class="genmed">{SONG_TIME}</span></b></td>
        </tr>
        <tr> 
          <td align="right"><span class="genmed">{L_VIEW}:</span></td>
          <td><b><span class="genmed">{SONG_VIEW}</span></b></td>
        </tr>
        <!-- BEGIN rate_switch -->
        <tr> 
          <td valign="top" align="right"><span class="genmed"><a href="{U_RATE}">{L_RATING}:</a></span></td>
          <td><b><span class="genmed">{SONG_RATING}</span></b></td>
        </tr>
        <!-- END rate_switch -->
        <!-- BEGIN comment_switch -->
        <tr> 
          <td align="right"><span class="genmed"><a href="{U_COMMENT}">{L_COMMENTS}:</a></span></td>
          <td><b><span class="genmed">{SONG_COMMENTS}</span></b></td>
        </tr>
        <!-- END comment_switch -->
        <!-- BEGIN download_switch -->
        <tr> 
          <td align="right"><span class="genmed"><a href="{U_DOWNLOAD}">{L_DOWNLOAD}:</a></span></td>
          <td><b><span class="genmed">{SONG_DOWNLOAD}</span></b></td>
        </tr>
        <!-- END download_switch -->
      </table>
</td>
  </tr>
  <tr> 
    <td height="28" colspan="2" align="center" class="catbottom"><span class="cattitle">&laquo; 
      <a href="{U_PREVIOUS}" class="cattitle">{L_PREVIOUS}</a>&nbsp;-&nbsp;<a href="{U_NEXT}" class="cattitle">{L_NEXT}</a> 
      &raquo;</span></td>
  </tr>
</table>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}
--- NEW FILE: music_media_cat_body.tpl ---
<form action="{S_MUSIC_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td valign="bottom" width="100%"><a class="maintitle" href="{U_VIEW_CAT}">{CAT_TITLE}</a><br />
		<span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span></td>
	<td align="right" valign="bottom" nowrap="nowrap"><span class="nav">{PAGINATION}</span></td>
  </tr>
</table>

<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td>
	<!-- BEGIN enable_soung_upload -->
	<a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a>
	<!-- END enable_soung_upload -->
	</td>
	<td class="nav" width="100%">
		<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a>&nbsp;{NAV_SEP}&nbsp;<!-- IF CAT_PARENT eq 0 --><!-- ELSE --><a href="{U_VIEW_CAT_PARENT}" class="nav">{CAT_PARENT_TITLE}</a>&nbsp;{NAV_SEP}&nbsp;<!-- ENDIF --><a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC}&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_VIEW_CAT_VIRTUAL}">{CAT_TITLE_VIRTUAL}</a></span>
	</td>
  </tr>
</table>

<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  <tr> 
    <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE}</th>
  </tr>
  <!-- BEGIN no_songs -->
  <tr> 
	<td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td>
  </tr>
  <!-- END no_songs -->
  <!-- BEGIN songrow -->
  <tr>
  <!-- BEGIN songcol -->
	<td align="center" width="{S_COL_WIDTH}" class="row1"></td>
  <!-- END songcol -->
  </tr>
  <tr>
   	<!-- BEGIN song_detail -->
	<!-- IF song_detail.SWITCH_ROW_TYPE eq MEDIA -->
	<td>
	<table width="100%" cellpadding="2" cellspacing="1" border="0">
	 <tr> 
	    <th height="25" colspan="7" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th>
	 </tr>
	 <tr> 
		<td width="44%" colspan="7" class="row1" align="center">
		      <!-- IF song_detail.S_ROW_TYPE eq MEDIA -->
		      <SCRIPT LANGUAGE="JavaScript"> 
			var WMP7; 
			var Mac; 
			var Win;
			var Unix;
			var Linux; 
	
			Win = navigator.userAgent.indexOf("Win") > -1; 
			Mac = navigator.userAgent.indexOf("Mac") > -1;
			Unix = navigator.appVersion.indexOf("X11") > -1;
			Linux = navigator.appVersion.indexOf("Linux") > -1; 
	
			if (Mac)
			{
	
		            if ( navigator.appName == "Netscape" ){ 
		                 //Netscape code
		                 document.write ('    <Embed id="wmp" name="wmp" type="audio/mpeg"');
		                 document.write ('        pluginspage="http://www.microsoft.com/windows/windowsmedia/"');
		                 document.write ('        filename="{song_detail.SONG_URL}"');
		                 document.write ('        src="{song_detail.SONG_URL}"');
		                 document.write ('        Name=MediaPlayer');
		                 document.write ('        ShowControls=1');
		                 document.write ('        ShowDisplay=1');
		                 document.write ('        ShowStatusBar=1');
		                 document.write ('        AUTOSTART=0');
		                 document.write ('        AutoSize=0');
		                 document.write ('        width="{song_detail.WIDTH}"');
		                 document.write ('        height="{song_detail.HEIGHT}">');
				   document.write ('    </Embed>'); } 

		            if ( navigator.appName != "Netscape" ){ 
		            document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } 
			}


			if (Win)
			{
			     if ( navigator.appName != "Netscape" )
			     { 
					WMP7 = new ActiveXObject('WMPlayer.OCX'); 
			     } 
	
		            // Windows Media Player 7 Code 
		            if ( WMP7 ) 
		            { 
	
				   document.write ('  <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"');
				   document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"');
				   document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">');
		                 document.write ('<PARAM NAME="url" VALUE="{song_detail.SONG_URL}">');
		                 document.write ('<PARAM NAME="FileName" value="{song_detail.SONG_URL}">');
		                 document.write ('<PARAM NAME="AutoStart" VALUE="false">');
		                 document.write ('<PARAM NAME="ShowControls" VALUE="1">');
			          document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
		            	   document.write ('<PARAM NAME="AutoSize" VALUE="0">');
		                 document.write ('<PARAM NAME="uiMode" VALUE="mini">');
	            		   document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">');
	            		   document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); 

		                 document.write ('    <Embed type="application/x-mplayer2"');
		                 document.write ('        pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"');
		                 document.write ('        filename="{song_detail.SONG_URL}"');
		                 document.write ('        src="{song_detail.SONG_URL}"');
		                 document.write ('        Name="MediaPlayer2"');
		                 document.write ('        ShowControls="1"');
		                 document.write ('        ShowDisplay="1"');
		                 document.write ('        ShowStatusBar="1"');
		                 document.write ('        AUTOSTART="false"');
		            	   document.write ('        AutoSize="0"');
		                 document.write ('        width="{song_detail.WIDTH}"');
		                 document.write ('        height="{song_detail.HEIGHT}">');
		                 document.write ('    </embed>');

		                 document.write ('</OBJECT>');

		            } 

		            // Windows Media Player 6.4 Code 
		            else 
		            { 

			            //IE Code
				     document.write ('  <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"');
				     document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"');
				     document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">');
			            document.write ('<PARAM NAME="url" VALUE="{song_detail.SONG_URL}">');
			            document.write ('<PARAM NAME="FileName" value="{song_detail.SONG_URL}">');
			            document.write ('<PARAM NAME="AutoStart" VALUE="false">');
			            document.write ('<PARAM NAME="ShowControls" VALUE="1">');
				     document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
			            document.write ('<PARAM NAME="AutoSize" VALUE="0">');
	            		     document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">');
	            		     document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">');  

			            //Firefox code
			            document.write ('    <Embed type="application/x-mplayer2"');
			            document.write ('        pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"');
			            document.write ('        filename="{song_detail.SONG_URL}"');
			            document.write ('        src="{song_detail.SONG_URL}"');
			            document.write ('        Name="MediaPlayer"');
			            document.write ('        ShowControls="1"');
			            document.write ('        ShowDisplay="1"');
			            document.write ('        ShowStatusBar="1"');
			            document.write ('        AUTOSTART="0"');
			            document.write ('        AutoSize="0"');
			            document.write ('        width="{song_detail.WIDTH}"');
			            document.write ('        height="{song_detail.HEIGHT}">');
			            document.write ('    </embed>');
	
			            document.write ('</OBJECT>');
 
		            }
			} 
			else 
			{ 
		            document.write(' <embed type="audio/mpeg" height="{song_detail.HEIGHT}" width="{song_detail.WIDTH}" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); 
			} 
		      </SCRIPT>
		      <!-- ENDIF -->

		      <!-- IF song_detail.S_ROW_TYPE eq FLASH --> 
		      <EMBED src="{song_detail.SONG_URL}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">
		      </EMBED>
		      <!-- ENDIF -->

		      <!-- IF song_detail.S_ROW_TYPE eq FLASHVIDEO -->
		      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}">
			<param name="allowScriptAccess" value="always" />
			<param name="movie" value="{song_detail.VIDEO_URL}" />
			<param name="wmode" value="transparent" />
			<param name="loop" value="false" />
			<param name="menu" value="false" />
			<param name="quality" value="high" />
			<param name="allowfullscreen" value="true" />
			<param name="scale" value="noscale" />
			<param name="salign" value="lt" /> 
		      <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" allowfullscreen="true">
		      </embed>
		      </object>
		      <!-- ENDIF -->

		      <!-- IF song_detail.S_ROW_TYPE eq YOUTUBE --> 
		      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="VideoPlayback" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}">
			<param name="movie" value="{song_detail.VIDEO_URL}" />
			<param name="wmode" value="transparent" />
			<param name="allowfullscreen" value="true" />
			<param name="flashvars" value="&rs=1&sn=1&iurl={song_detail.U_IMG}" />
			<embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={song_detail.U_IMG}" />
		      </object>
		      <!-- ENDIF -->

		      <!-- IF song_detail.S_ROW_TYPE eq FLV -->
			<div id="flvplayer">
				<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center">
				<param name="allowScriptAccess" value="always" />
				<param name="movie" value="{song_detail.VIDEO_URL}" />
				<param name="loop" value="false" />
				<param name="menu" value="false" />
				<param name="quality" value="high" />
				<param name="allowfullscreen" value="true" />
				<param name="scale" value="noscale" />
				<param name="salign" value="lt" />
				<param name="bgcolor" value="000000" />
				<param name="flashvars" value="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" />
				<embed src="{song_detail.VIDEO_URL}" flashvars="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
				</object>
			</div>
      			<!-- ENDIF -->

		      <!-- IF song_detail.S_ROW_TYPE eq RAM -->
		      <embed src="{song_detail.SONG_URL}" align="center" 
		      width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="audio/x-pn-realaudio-plugin" console="cons" 
		      controls="ControlPanel" autostart="false"></embed>
		      <!-- ENDIF -->

		      <!-- IF song_detail.S_ROW_TYPE eq QT -->
		      <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}">
				<param name="qtsrc" value="{song_detail.SONG_URL}">
				<param name="autoplay" value="false">
				<param name="loop" value="false">
				<param name="controller" value="true">
				<param name="kioskmode" value="true">
				<param name="cache" value="false">
				<embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.SONG_URL}" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false">

				</embed>
		      </object>
		      <!-- ENDIF -->

		      <!-- IF song_detail.S_ROW_TYPE eq IMG -->
			<a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.SONG_URL}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.SONG_URL}<!-- ENDIF -->" id="image" type="image" border="1"></a> 
		      <!-- ENDIF -->
		</td>
	 </tr>
  	 <tr> 
	    <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE}</span></td>
	    <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER}&nbsp;</span></td>
	    <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED}&nbsp;</span></td>
	    <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW}&nbsp;</span></td>
	    <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING}&nbsp;</span></td>
	    <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS}&nbsp;</span></td>
	    <td width="5%" align="center" class="catBottom" height="28">&nbsp;</td>
  	 </tr>
  	 <tr> 
	    <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} 
	    </span></td>
	    <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td>
	    <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td>
 	    <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td>
 	    <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td>
	    <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td>
  	    <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR />
	     {songrow.song_detail.DELETE}<BR />
	     {songrow.song_detail.LOCK}<BR />
	     {songrow.song_detail.MOVE}</span></td>
  	 </tr>
	</table>
	</td>
   	<!-- ELSE -->
	<td>
		<table width="100%" cellpadding="2" cellspacing="1" border="0">
		 <tr> 
		    <th height="25" colspan="7" class="thTop"><span class="genmed">{L_PIC_TITLE} :: {song_detail.SONG_TITLE}</span></th>
		 </tr>
		 <tr>
			<td class="row1" width="{S_COL_WIDTH}" colspan="7" align="center" valign="top" class="catBottom">
				<div align="center" valign="top">
				<a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a>
				</div>
				<!--
					<div align="center" valign="top">
					<span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span>
					</div>
				-->
	         	</td>
	        </tr>
	  	 <tr> 
		    <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_PIC_TITLE}</span></td>
		    <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER}&nbsp;</span></td>
		    <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED}&nbsp;</span></td>
		    <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW}&nbsp;</span></td>
		    <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING}&nbsp;</span></td>
		    <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS}&nbsp;</span></td>
		    <td width="5%" align="center" class="catBottom" height="28">&nbsp;</td>
	  	 </tr>
	  	 <tr> 
		    <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} 
		    </span></td>
		    <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td>
		    <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td>
	 	    <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td>
	 	    <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td>
		    <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td>
	  	    <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR />
		     {songrow.song_detail.DELETE}<BR />
		     {songrow.song_detail.LOCK}<BR />
		     {songrow.song_detail.MOVE}</span></td>
	  	 </tr>
		</table>
	</td> 
   	<!-- ENDIF -->
	<!-- END song_detail -->
  </tr>
  <!-- END songrow -->
  <tr> 
    <td class="catBottom" colspan="7" align="center" height="28"> <span class="gensmall">{L_SELECT_SORT_METHOD}: 
      <select name="sort_method">
        <option {SORT_TIME} value='song_time'>{L_TIME}</option>
        <option {SORT_SONG_TITLE} value='song_title'>{L_SONG_TITLE}</option>
        <option {SORT_SINGER} value='song_singer'>{L_SINGER}</option>
        <option {SORT_USERNAME} value='username'>{L_USERNAME}</option>
        <option {SORT_VIEW} value='song_view_count'>{L_VIEW}</option>
			{SORT_RATING_OPTION}
			{SORT_COMMENTS_OPTION}
			{SORT_NEW_COMMENT_OPTION}
		
      </select>
      &nbsp;{L_ORDER}: 
      <select name="sort_order">
        <option {SORT_ASC} value='ASC'>{L_ASC}</option>
        <option {SORT_DESC} value='DESC'>{L_DESC}</option>
      </select>
      &nbsp; 
      <input type="submit" name="submit" value="{L_SORT}" class="liteoption" />
      </span> </td>
  </tr>
</table>
<table width="100%" cellspacing="2" border="0" cellpadding="2">
  <tr>
	<td>
	<!-- BEGIN enable_soung_upload -->
	<a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a>
	<!-- END enable_soung_upload -->
	</td>
	<td class="nav" width="100%">
		<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a>&nbsp;{NAV_SEP}&nbsp;<!-- IF CAT_PARENT eq 0 --><!-- ELSE --><a href="{U_VIEW_CAT_PARENT}" class="nav">{CAT_PARENT_TITLE}</a>&nbsp;{NAV_SEP}&nbsp;<!-- ENDIF --><a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC}&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_VIEW_CAT_VIRTUAL}">{CAT_TITLE_VIRTUAL}</a></span>
	</td>
	<td align="right" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br />
		<span class="nav">{PAGINATION}</span></td>
  </tr>
  <tr>
	<td colspan="3"><span class="nav">{PAGE_NUMBER}</span></td>
  </tr>
</table>
</form>

<table width="100%" cellspacing="0" border="0" cellpadding="0">
  <tr>
	<td align="right" class="gensmall" nowrap="nowrap">{MUSIC_JUMPBOX}</td>
  </tr>
  <tr>
	<td align="right" class="gensmall">{S_AUTH_LIST}</td>
  </tr>
</table>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}
--- NEW FILE: subSilver.cfg ---
<?php
/**
*
* @package mxBB Portal Module - mx_music
* @version $Id: subSilver.cfg,v 1.1 2008/01/29 07:51:31 orynider Exp $
* @copyright (c) 2002-2006 mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

//
// **      Configuration file for subSilver template       **
//
// **         copyright (C) 2001 The phpBB Group           **
// **             Created by subBlue design                **
// **                  www.subBlue.com                     **
//
// **    subSilver dev. forum: www.subSky.com/phpBB2/      **
//
// $Id: subSilver.cfg,v 1.1 2008/01/29 07:51:31 orynider Exp $
//
// Please note that to enable support of different languages
// the ". LANG ." place holder is available. This will be replaced
// with xxx where xxx is the users selected language. If
// that language isn't available it will default to english.
// Therefore you MUST ensure you have at least a english
// directory if you choose to localise your template
//

//
// Do not alter this line!
//
if( !defined('MX_TEMPLATE_CONFIG'))
{
	define(MX_TEMPLATE_CONFIG, TRUE);
	$mx_template_config = true;
}

$mx_template_name = 'subSilver';


// -------------------------------------------------------------------------
// Prefix with PORTAL_URL
// -------------------------------------------------------------------------
// $current_template_images = PORTAL_URL . $current_template_path . "/images";


$current_template_images = $module_root_path . "templates/". $mx_template_name ."/images";
$current_template_phpbb_images = PHPBB_URL . "templates/". $mx_template_name ."/images"; // phpBB graphics template


if ( !file_exists( $current_template_images . '/lang_' . $board_config['default_lang'] ) )
{
	$link_language='lang_english';
}	
else
{
	$link_language='lang_' . $board_config['default_lang'];
}
 
define('LANG', $link_language);

// -------------------------------------------------------------------------
// (Re)Define images
// -------------------------------------------------------------------------

// MOM Pics
$mx_images['upload_song'] = "$current_template_images/" . LANG . "/upload_song.gif";
$mx_images['no_image'] = "$current_template_images/no_image.gif";

// Use standard phpBB graphics
//
$mx_images['icon_quote'] = "$current_template_phpbb_images/" . LANG . "/icon_quote.gif";
$mx_images['icon_edit'] = "$current_template_phpbb_images/" . LANG . "/icon_edit.gif";
$mx_images['icon_search'] = "$current_template_phpbb_images/" . LANG . "/icon_search.gif";
$mx_images['icon_profile'] = "$current_template_phpbb_images/" . LANG . "/icon_profile.gif";
$mx_images['icon_pm'] = "$current_template_phpbb_images/" . LANG . "/icon_pm.gif";
$mx_images['icon_email'] = "$current_template_phpbb_images/" . LANG . "/icon_email.gif";
$mx_images['icon_delpost'] = "$current_template_phpbb_images/icon_delete.gif";
$mx_images['icon_ip'] = "$current_template_phpbb_images/" . LANG . "/icon_ip.gif";
$mx_images['icon_www'] = "$current_template_phpbb_images/" . LANG . "/icon_www.gif";
$mx_images['icon_icq'] = "$current_template_phpbb_images/" . LANG . "/icon_icq_add.gif";
$mx_images['icon_aim'] = "$current_template_phpbb_images/" . LANG . "/icon_aim.gif";
$mx_images['icon_yim'] = "$current_template_phpbb_images/" . LANG . "/icon_yim.gif";
$mx_images['icon_msnm'] = "$current_template_phpbb_images/" . LANG . "/icon_msnm.gif";
$mx_images['icon_minipost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_gotopost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_minipost_new'] = "$current_template_phpbb_images/icon_minipost_new.gif";
$mx_images['icon_latest_reply'] = "$current_template_phpbb_images/icon_latest_reply.gif";
$mx_images['icon_newest_reply'] = "$current_template_phpbb_images/icon_newest_reply.gif";

$mx_images['forum'] = "$current_template_phpbb_images/folder_big.gif";
$mx_images['forum_new'] = "$current_template_phpbb_images/folder_new_big.gif";
$mx_images['forum_locked'] = "$current_template_phpbb_images/folder_locked_big.gif";
?>
--- NEW FILE: music_cat_body.tpl ---
<form action="{S_MUSIC_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td valign="bottom" width="100%"><a class="maintitle" href="{U_VIEW_CAT}">{CAT_TITLE}</a><br />
		<span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span></td>
	<td align="right" valign="bottom" nowrap="nowrap"><span class="nav">{PAGINATION}</span></td>
  </tr>
</table>

<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td>
	<!-- BEGIN enable_soung_upload -->
	<a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a>
	<!-- END enable_soung_upload -->
	</td>
	<td class="nav" width="100%">
		<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {U_NAV_CAT_PARENT}&nbsp;{NAV_SEP}&nbsp; <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a>
		{NAV_CAT_DESC} </span>
	</td>
  </tr>
</table>

<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  <tr> 
    <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE}</th>
  </tr>
  <!-- BEGIN no_songs -->
  <tr> 
    <td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td>
  </tr>
  <!-- END no_songs -->
  <!-- BEGIN songrow -->
  <tr>
  <!-- BEGIN songcol -->
	<td align="center" width="{S_COL_WIDTH}" class="row1"></td>
  <!-- END songcol -->
  </tr>
  <tr>
   	<!-- BEGIN song_detail -->
	<td>
	<table width="100%" cellpadding="2" cellspacing="1" border="0">
		<tr> 
			<th height="25" colspan="7" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th>
		</tr>
  		<tr> 
    			<td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE}</span></td>
    			<td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER}&nbsp;</span></td>
    			<td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED}&nbsp;</span></td>
    			<td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW}&nbsp;</span></td>
    			<td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING}&nbsp;</span></td>
    			<td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS}&nbsp;</span></td>
    			<td width="5%" align="center" class="catBottom" height="28">&nbsp;</td>
  		</tr>
  		<tr> 
    			<td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} 
      			</span></td>
    			<td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td>
   			<td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td>
    			<td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td>
    			<td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td>
    			<td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td>
    			<td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR />
     			 {songrow.song_detail.DELETE}<BR />
    			 {songrow.song_detail.LOCK}<BR />
     			 {songrow.song_detail.MOVE}</span></td>
  		</tr>
	</table>
	</td>
	<!-- END song_detail -->
  </tr>
  <!-- END songrow -->
  <tr> 
    <td class="catBottom" colspan="7" align="center" height="28"> <span class="gensmall">{L_SELECT_SORT_METHOD}: 
      <select name="sort_method">
        <option {SORT_TIME} value='song_time'>{L_TIME}</option>
        <option {SORT_SONG_TITLE} value='song_title'>{L_SONG_TITLE}</option>
        <option {SORT_SINGER} value='song_singer'>{L_SINGER}</option>
        <option {SORT_USERNAME} value='username'>{L_USERNAME}</option>
        <option {SORT_VIEW} value='song_view_count'>{L_VIEW}</option>
			{SORT_RATING_OPTION}
			{SORT_COMMENTS_OPTION}
			{SORT_NEW_COMMENT_OPTION}
		
      </select>
      &nbsp;{L_ORDER}: 
      <select name="sort_order">
        <option {SORT_ASC} value='ASC'>{L_ASC}</option>
        <option {SORT_DESC} value='DESC'>{L_DESC}</option>
      </select>
      &nbsp; 
      <input type="submit" name="submit" value="{L_SORT}" class="liteoption" />
      </span> </td>
  </tr>
</table>
<table width="100%" cellspacing="2" border="0" cellpadding="2">
  <tr>
	<td>
	<!-- BEGIN enable_soung_upload -->
	<a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a>
	<!-- END enable_soung_upload -->
	</td>
	<td class="nav" width="100%">
		<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {U_NAV_CAT_PARENT}&nbsp;{NAV_SEP}&nbsp; <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a>
		{NAV_CAT_DESC} </span>
	</td>
	<td align="right" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br />
		<span class="nav">{PAGINATION}</span></td>
  </tr>
  <tr>
	<td colspan="3"><span class="nav">{PAGE_NUMBER}</span></td>
  </tr>
</table>
</form>

<table width="100%" cellspacing="0" border="0" cellpadding="0">
  <tr>
	<td align="right" class="gensmall" nowrap="nowrap">{MUSIC_JUMPBOX}</td>
  </tr>
  <tr>
	<td align="right" class="gensmall">{S_AUTH_LIST}</td>
  </tr>
</table>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
{MUSIC_COPYRIGHT}
--- NEW FILE: music_pic_cat_body.tpl ---
<style type="text/css">
<!--
.shadow {color:#00aa00; filter: DropShadow(Color=#660000, OffX=3, OffY=3, Positive=1)}
img.shadow {color:#00aa00;  filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=3, OffY=3, Color='gray', Positive='true')}
-->
</style>

<form action="{S_MUSIC_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td valign="bottom" width="100%"><a class="maintitle" href="{U_VIEW_CAT}">{CAT_TITLE}</a><br />
		<span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span></td>
	<td align="right" valign="bottom" nowrap="nowrap"><span class="nav">{PAGINATION}</span></td>
  </tr>
</table>

<table width="100%" cellspacing="2" cellpadding="2" border="0">
  <tr>
	<td>
	<!-- BEGIN enable_soung_upload -->
	<a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a>
	<!-- END enable_soung_upload -->
	</td>
	<td class="nav" width="100%">
		<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_MUSIC}">{L_MUSIC}</a>&nbsp;{NAV_SEP}&nbsp;<!-- IF CAT_PARENT eq 0 --><!-- ELSE --><a href="{U_VIEW_CAT_PARENT}" class="nav">{CAT_PARENT_TITLE}</a>&nbsp;{NAV_SEP}&nbsp;<!-- ENDIF --><a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC}&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_VIEW_CAT_VIRTUAL}">{CAT_TITLE_VIRTUAL}</a></span>
	</td>
  </tr>
</table>

<table width="100%" cellpadding="1" cellspacing="1" border="0" class="forumline">
	<tr> 
    		<th width="{S_COL_WIDTH}" height="25" class="cat" align="center" colspan="{S_COLS}" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE} :: {L_ALL_CAT_PICS}</th>
	</tr>
	<!-- BEGIN no_songs -->
	<tr> 
		<td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td>...
 
[truncated message content]

[mxbb-commits] mx_music/templates/_core/admin music_admin_body_ext.tpl, NONE, 1.1 music_auth_body.tpl, NONE, 1.1 music_cat_body.tpl, NONE, 1.1 music_cat_delete_body.tpl, NONE, 1.1 music_cat_new_body.tpl, NONE, 1.1 music_cat_select_body.tpl, NONE, 1.1 music_config_body.tpl, NONE, 1.1

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

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

Added Files:
	music_admin_body_ext.tpl music_auth_body.tpl 
	music_cat_body.tpl music_cat_delete_body.tpl 
	music_cat_new_body.tpl music_cat_select_body.tpl 
	music_config_body.tpl 
Log Message:
This upgrade will make mx_music compatible with 2.9

--- NEW FILE: music_config_body.tpl ---
<h1>{L_MUSIC_CONFIG}</h1>

<p>{L_MUSIC_CONFIG_EXPLAIN}</p>

<form action="{S_MUSIC_CONFIG_ACTION}" method="post">
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
	<tr>
	  <th class="thHead" colspan="2">{L_MUSIC_CONFIG}</th>
	</tr>
	<tr>
	 <td class="row1"><span class="genmed">{L_INDEX_SHOW_SUBCATS}</span></td>
	 <td class="row2"><span class="genmed"><input onchange="setChange();" type="radio" {INDEX_SHOW_SUBCATS_ENABLED} name="show_index_subcats" value="1" />{L_YES}&nbsp;&nbsp;<input onchange="setChange();" type="radio" {INDEX_SHOW_SUBCATS_DISABLED} name="show_index_subcats" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1" width="45%"><span class="genmed">{L_MAX_SONGS}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="9" size="9" name="max_songs" value="{MAX_SONGS}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_USER_SONGS_LIMIT}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="12" size="5" name="user_songs_limit" value="{USER_SONGS_LIMIT}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MOD_SONGS_LIMIT}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="12" size="5" name="mod_songs_limit" value="{MOD_SONGS_LIMIT}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MAX_FILE_SIZE}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="12" size="12" name="max_file_size" value="{MAX_FILE_SIZE}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_SONG_DESC_MAX_LENGTH}</span></td>
	  <td class="row2"><input class="post" type="text" size="6" name="desc_length" value="{SONG_DESC_MAX_LENGTH}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MP3_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {MP3_ENABLED} name="mp3_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {MP3_DISABLED} name="mp3_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_WAV_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {WAV_ENABLED} name="wav_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {WAV_DISABLED} name="wav_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_WMA_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {WMA_ENABLED} name="wma_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {WMA_DISABLED} name="wma_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_WMV_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {WMV_ENABLED} name="wmv_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {WMV_DISABLED} name="wmv_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MIDI_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {MIDI_ENABLED} name="mid_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {MIDI_DISABLED} name="mid_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_RAM_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {RAM_ENABLED} name="ram_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {RAM_DISABLED} name="ram_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_AU_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {AU_ENABLED} name="au_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {AU_DISABLED} name="au_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MPEG_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {MPEG_ENABLED} name="mpeg_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {MPEG_DISABLED} name="mpeg_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_AVI_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {AVI_ENABLED} name="avi_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {AVI_DISABLED} name="avi_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_SWF_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {SWF_ENABLED} name="swf_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {SWF_DISABLED} name="swf_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_QT_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {QT_ENABLED} name="qt_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {QT_DISABLED} name="qt_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_FLV_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {FLV_ENABLED} name="flv_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {FLV_DISABLED} name="flv_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_RM_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {RM_ENABLED} name="rm_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {RM_DISABLED} name="rm_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_IMG_ALLOWED}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {IMG_ENABLED} name="img_allowed" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {IMG_DISABLED} name="img_allowed" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_HOTLINK_PREVENT}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {HOTLINK_PREVENT_ENABLED} name="hotlink_prevent" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {HOTLINK_PREVENT_DISABLED} name="hotlink_prevent" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_HOTLINK_ALLOWED}</span></td>
	  <td class="row2"><input class="post" type="text" size="40" name="hotlink_allowed" value="{HOTLINK_ALLOWED}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_ROWS_PER_PAGE}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="rows_per_page" value="{ROWS_PER_PAGE}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_COLS_PER_PAGE}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="cols_per_page" value="{COLS_PER_PAGE}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">eXtreme Styles</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {XS_ENABLED} name="xs_enabled" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {XS_DISABLED} name="xs_enabled" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_ROWS_PER_PAGE_PIC}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="rows_per_page_pic" value="{ROWS_PER_PAGE_PIC}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_COLS_PER_PAGE_PIC}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="cols_per_page_pic" value="{COLS_PER_PAGE_PIC}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_ROWS_PER_PAGE_MEDIA}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="rows_per_page_media" value="{ROWS_PER_PAGE_MEDIA}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_COLS_PER_PAGE_MEDIA}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="cols_per_page_media" value="{COLS_PER_PAGE_MEDIA}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_TOP}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="top" value="{TOP}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MAX_IMAGE_SIZE}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="10" size="6" name="max_image_size" value="{MAX_IMAGE_SIZE}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MAX_IMAGE_WIDTH}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="3" size="2" name="max_image_width" value="{MAX_IMAGE_WIDTH}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MAX_IMAGE_HEIGHT}</span></td>
	  <td class="row2"><input class="post" type="text" maxlength="3" size="2" name="max_image_height" value="{MAX_IMAGE_HEIGHT}" /></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_DEFAULT_SORT_METHOD}</span></td>
	  <td class="row2">
		<select name="sort_method">
			<option {SORT_TIME} value='song_time'>{L_TIME}</option>
			<option {SORT_SONG_TITLE} value='song_title'>{L_SONG_TITLE}</option>
			<option {SORT_USERNAME} value='username'>{L_USERNAME}</option>
			<option {SORT_VIEW} value='song_view_count'>{L_VIEW}</option>
			<option {SORT_RATING} value='rating'>{L_RATING}</option>
			<option {SORT_COMMENTS} value='comments'>{L_COMMENTS}</option>
			<option {SORT_NEW_COMMENT} value='new_comment'>{L_NEW_COMMENT}</option>
		</select>
	  </td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_DEFAULT_SORT_ORDER}</span></td>
	  <td class="row2">
		<select name="sort_order">
			<option {SORT_ASC} value='ASC'>{L_ASC}</option>
			<option {SORT_DESC} value='DESC'>{L_DESC}</option>
		</select>
	  </td>
	</tr>
	<tr>
	  <th class="thHead" colspan="2">{L_EXTRA_SETTINGS}</th>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_RATE_SYSTEM}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {RATE_ENABLED} name="rate" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {RATE_DISABLED} name="rate" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_RATE_SCALE}</span></td>
	  <td class="row2">
		<select name="rate_scale">
			<option {RATE_SCALE} value='5'>5</option>
			<option {RATE_SCALE} value='6'>6</option>
			<option {RATE_SCALE} value='7'>7</option>
			<option {RATE_SCALE} value='8'>8</option>
			<option {RATE_SCALE} value='9'>9</option>
			<option {RATE_SCALE} value='10'>10</option>
		</select>
</td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_COMMENT_SYSTEM}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {COMMENT_ENABLED} name="comment" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {COMMENT_DISABLED} name="comment" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_DOWNLOAD_SYSTEM}</span></td>
	  <td class="row2"><span class="genmed"><input type="radio" {DOWNLOAD_ENABLED} name="download" value="1" />{L_YES}&nbsp;&nbsp;<input type="radio" {DOWNLOAD_DISABLED} name="download" value="0" />{L_NO}</span></td>
	</tr>
	<tr>
	  <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
	</tr>
</table></form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Music Online {MUSIC_VERSION} &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a> is modified by <a href="http://www.mx-system.com/">MX-Team</a><br /></div>
--- NEW FILE: music_cat_select_body.tpl ---
<h1>{L_MUSIC_AUTH_TITLE}</h1>

<p>{L_MUSIC_AUTH_EXPLAIN}</p>

<form action="{S_MUSIC_ACTION}" method="post">
<table width="50%" align="center" cellpadding="3" cellspacing="1" border="0" class="forumline">
	<tr>
		<th class="thHead" colspan="2" height="28">{L_SELECT_CAT}</th>
	</tr>
	<tr>
		<td class="row1" height="25">
			<select name="cat_id">
			<!-- BEGIN catrow -->
			<option value="{catrow.CAT_ID}">{catrow.CAT_TITLE}</option>
			<!-- END catrow -->
			</select>
		</td>
		<td class="row1" width="100%" align="center"><input name="submit" type="submit" value="{L_LOOK_UP_CAT}" class="liteoption" />
		</td>
		</tr>
</table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Music Online {MUSIC_VERSION} &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a></div>
--- NEW FILE: music_cat_new_body.tpl ---
<h1>{L_MUSIC_CAT_TITLE}</h1>

<p>{L_MUSIC_CAT_EXPLAIN}</p>

<form action="{S_MUSIC_ACTION}" method="post">
{CAT_PARENT} 
{CAT_TYPE}
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
	<tr>
		<th class="thHead" height="25" nowrap="nowrap" colspan="2">{L_PANEL_TITLE}</th>
	</tr>
	<tr>
		<td class="row1" width="20%"><span class="gen">{L_CAT_TITLE}:</span></td>
		<td class="row2"><input name="cat_title" type="text" class="post" size="35" value="{S_CAT_TITLE}" /></td>
	</tr>
	<tr>
		<td valign="top" nowrap="nowrap" class="row1"><span class="gen">{L_CAT_DESC}:&nbsp;</span></td>
		<td class="row2"><textarea name="cat_desc" class="post" cols="50" rows="5">{S_CAT_DESC}</textarea></td>
	</tr>
	<tr>
		<th class="thHead" height="25" nowrap="nowrap" colspan="2">{L_CAT_PERMISSIONS}</th>
	</tr>
	<tr>
		<td class="row1"><span class="gen">{L_VIEW_LEVEL}:</span></td>
		<td class="row2"><select name="cat_view_level"><option {VIEW_GUEST} value="{S_GUEST}">{L_GUEST}</option><option {VIEW_REG} value="{S_USER}">{L_REG}</option><option {VIEW_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {VIEW_MOD} value="{S_MOD}">{L_MOD}</option><option {VIEW_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td>
	</tr>
	<tr>
		<td class="row1"><span class="gen">{L_UPLOAD_LEVEL}:</span></td>
		<td class="row2"><select name="cat_upload_level"><option {UPLOAD_GUEST} value="{S_GUEST}">{L_GUEST}</option><option {UPLOAD_REG} value="{S_USER}">{L_REG}</option><option {UPLOAD_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {UPLOAD_MOD} value="{S_MOD}">{L_MOD}</option><option {UPLOAD_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td>
	</tr>
	<tr>
		<td class="row1"><span class="gen">{L_RATE_LEVEL}:</span></td>
		<td class="row2"><select name="cat_rate_level"><option {RATE_GUEST} value="{S_GUEST}">{L_GUEST}</option><option {RATE_REG} value="{S_USER}">{L_REG}</option><option {RATE_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {RATE_MOD} value="{S_MOD}">{L_MOD}</option><option {RATE_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td>
	</tr>
	<tr>
		<td class="row1"><span class="gen">{L_COMMENT_LEVEL}:</span></td>
		<td class="row2"><span class="gen"><select name="cat_comment_level"><option {COMMENT_GUEST} value="{S_GUEST}">{L_GUEST}</option><option {COMMENT_REG} value="{S_USER}">{L_REG}</option><option {COMMENT_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {COMMENT_MOD} value="{S_MOD}">{L_MOD}</option><option {COMMENT_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></span></td>
	</tr>
	<tr>
		<td class="row1"><span class="gen">{L_EDIT_LEVEL}:</span></td>
		<td class="row2"><select name="cat_edit_level"><option {EDIT_REG} value="{S_USER}">{L_REG}</option><option {EDIT_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {EDIT_MOD} value="{S_MOD}">{L_MOD}</option><option {EDIT_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td>
	</tr>
	<tr>
		<td class="row1"><span class="gen">{L_DELETE_LEVEL}:</span></td>
		<td class="row2"><select name="cat_delete_level"><option {DELETE_REG} value="{S_USER}">{L_REG}</option><option {DELETE_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {DELETE_MOD} value="{S_MOD}">{L_MOD}</option><option {DELETE_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td>
	</tr>
	<tr>
		<td class="row1"><span class="gen">{L_SONGS_APPROVAL}:</span></td>
		<td class="row2"><select name="cat_approval"><option {APPROVAL_DISABLED} value="{S_USER}">{L_DISABLED}</option><option {APPROVAL_MOD} value="{S_MOD}">{L_MOD}</option><option {APPROVAL_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td>
	</tr>
	<tr>
		<td class="catBottom" align="center" height="28" colspan="2"><input type="hidden" value="{S_MODE}" name="mode" /><input name="submit" type="submit" value="{L_PANEL_TITLE}" class="liteoption" /></td>
	</tr>
</table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Music Online {MUSIC_VERSION} &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a></div>
--- NEW FILE: music_auth_body.tpl ---
<h1>{L_MUSIC_AUTH_TITLE}</h1>

<p>{L_MUSIC_AUTH_EXPLAIN}</p>

<form action="{S_MUSIC_ACTION}" method="post">
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
	<tr>
		<th class="thCornerL" height="25" nowrap="nowrap">{L_GROUPS}</th>
		<th class="thTop" nowrap="nowrap">{L_VIEW}</th>
		<th class="thTop" nowrap="nowrap">{L_UPLOAD}</th>
		<th class="thTop" nowrap="nowrap">{L_RATE}</th>
		<th class="thTop" nowrap="nowrap">{L_COMMENT}</th>
		<th class="thTop" nowrap="nowrap">{L_EDIT}</th>
		<th class="thTop" nowrap="nowrap">{L_DELETE}</th>
		<th class="thCornerR" nowrap="nowrap">{L_IS_MODERATOR}</th>
	</tr>
	<!-- BEGIN grouprow -->
	<tr>
		<td class="row1" align="center" height="28"><span class="gen">{grouprow.GROUP_NAME}</span></td>
		<td class="row2" align="center">
		<input name="view[]" type="checkbox" {grouprow.VIEW_CHECKED} value="{grouprow.GROUP_ID}" />
		</td>
		<td class="row2" align="center">
		<input name="upload[]" type="checkbox" {grouprow.UPLOAD_CHECKED} value="{grouprow.GROUP_ID}" />
		</td>
		<td class="row2" align="center">
		<input name="rate[]" type="checkbox" {grouprow.RATE_CHECKED} value="{grouprow.GROUP_ID}" />
		</td>
		<td class="row2" align="center">
		<input name="comment[]" type="checkbox" {grouprow.COMMENT_CHECKED} value="{grouprow.GROUP_ID}" />
		</td>
		<td class="row2" align="center">
		<input name="edit[]" type="checkbox" {grouprow.EDIT_CHECKED} value="{grouprow.GROUP_ID}" />
		</td>
		<td class="row2" align="center">
		<input name="delete[]" type="checkbox" {grouprow.DELETE_CHECKED} value="{grouprow.GROUP_ID}" />
		</td>
		<td class="row2" align="center">
		<input name="moderator[]" type="checkbox" {grouprow.MODERATOR_CHECKED} value="{grouprow.GROUP_ID}" />
		</td>
	</tr>
	<!-- END grouprow -->
	<tr>
		<td class="catBottom" height="25" align="center" colspan="8"><input type="reset" value="{L_RESET}" class="liteoption" />&nbsp;&nbsp;&nbsp;<input name="submit" type="submit" value="{L_SUBMIT}" class="mainoption" /></td>
	</tr>
</table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Music Online {MUSIC_VERSION} &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a></div>
--- NEW FILE: music_cat_delete_body.tpl ---
<h1>{L_CAT_DELETE}</h1>

<p>{L_CAT_DELETE_EXPLAIN}</p>

<form action="{S_MUSIC_ACTION}" method="post">
  <table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
	<tr>
	  <th colspan="2" class="thHead">{L_CAT_DELETE}</th>
	  </tr>
	<tr>
	  <td class="row1"><span class="gen">{L_CAT_TITLE}</span></td>
	  <td class="row1"><span class="genmed">{S_CAT_TITLE}</span></td>
	</tr>
	<tr>
	  <td class="row1"><span class="genmed">{L_MOVE_CONTENTS}</span></td>
	  <td class="row1">{S_SELECT_TO}</td>
	</tr>
	<tr>
	  <td class="catBottom" colspan="2" align="center"><input type="hidden" name="mode" value="delete" /><input type="submit" name="submit" value="{L_MOVE_DELETE}" class="mainoption" /></td>
	</tr>
  </table>
</form>

<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Music Online {MUSIC_VERSION} &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a></div>
--- NEW FILE: music_cat_body.tpl ---
<h1>{L_MUSIC_CAT_TITLE}</h1>

<p>{L_MUSIC_CAT_EXPLAIN}</p>

<form action="{S_MUSIC_ACTION}" method="post">
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
	<tr>
		<th class="thHead" height="25" colspan="5">{L_MUSIC_CAT_TITLE}</th>
	</tr>
	<!-- BEGIN catrow -->
	<tr>
		<td colspan="{catrow.COLSPAN}" class="{catrow.COLOR}" width="60%" height="25"><span class="gen">{catrow.TITLE}<br /></span><span class="gensmall">{catrow.DESC}</span></td> 
		{catrow.ADD_SC} 
		<td class="{catrow.COLOR}" align="center"><span
		class="genmed"><a href="{catrow.S_MOVE_UP}">{L_MOVE_UP}</a><br /><a href="{catrow.S_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td>
		<td class="{catrow.COLOR}" align="center"><span
		class="genmed"><a href="{catrow.S_EDIT_ACTION}">{L_EDIT}</a></span></td>
		<td class="{catrow.COLOR}" align="center"><span
		class="genmed"><a href="{catrow.S_DELETE_ACTION}">{L_DELETE}</a></span></td>
	</tr>
	<!-- END catrow -->
	<tr>
		 <td class="catBottom" align="center" height="28" colspan="5"><form action="{S_MUSIC_ACTION}" method="post"><input type="hidden" value="new" name="mode" /><input name="submit" type="submit" value="{L_CREATE_MUSIC}" class="liteoption"></form><form action="{S_MUSIC_ACTION}&newcat" method="post"><input type="hidden" value="newcat" name="mode" /><input name="submit" type="submit" value="{L_CREATE_CATEGORY}" class="liteoption"></td>
	</tr>
</table>
</form>


<br clear="all" />

<!--
Do not remove my copyright notice and keep visible with its original content!
-->
<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Music Online {MUSIC_VERSION} &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a> is modified by <a href="http://www.mx-system.com/">MX-Team</a><br /></div>
--- NEW FILE: music_admin_body_ext.tpl ---
<table width="100%" align="center" cellspacing="1" cellpadding="2" border="0">
	<tr>
		<td class="nav">
			<span class="nav">
				<a href="{U_INDEX}" class="nav">{L_INDEX}</a>{NAV_SEP}
				<a href="{U_MX_MUSIC}" class="nav">{L_MUSIC}</a>
			</span>
		</td>
		<td align="right">
			&nbsp;
		</td>
	</tr>
</table>

<h1>{L_MUSIC_TITLE}</h1>

<p>{L_MUSIC_EXPLAIN}</p>

<form action="{S_FORUM_ACTION}" method="post">
<table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
	<tr>
	  <th class="thHead" colspan="2">{L_DEFAULT_PAGES_TITLE}<br /><span class="gensmall">{L_DEFAULT_PAGES_TITLE_EXPLAIN}</span></th>
	</tr>
	<tr>
		<td class="row1" width="50%">{L_MUSIC_INTEGRATION_ENABLED}<br /><span class="gensmall">{L_MUSIC_INTEGRATION_ENABLED_EXPLAIN}</span></td>
		<td class="row2" width="50%"><input type="radio" name="enable_integration" value="1" {MUSIC_INTEGRATION_ENABLED_YES} /><span class="gensmall">{L_MUSIC_INTEGRATION_ENABLED_YES}&nbsp;<input type="radio" name="enable_integration" value="0" {PHPBB_INTEGRATION_ENABLED_NO} /><span class="gensmall">{L_MUSIC_INTEGRATION_ENABLED_NO}</span></td>
	</tr>	
	<tr>
		<td class="row1" width="50%">{L_MUSIC_INDEX}<br /><span class="gensmall">{L_MUSIC_EXPLAIN}</span></td>
		<td class="row2" width="50%">{MUSIC_INDEX}</td>
	</tr>	
	<tr>
		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
	</tr>
</table>
</form>

[mxbb-commits] mx_music/templates/_core/images icon_mini_music.gif, NONE, 1.1 no_image.gif, NONE, 1.1

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

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

Added Files:
	icon_mini_music.gif no_image.gif 
Log Message:
This upgrade will make mx_music compatible with 2.9

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

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

[mxbb-commits] mx_music/music_box/includes index.htm, 1.1, 1.2 music_constants.php, 1.1, 1.2 music_functions.php, 1.1, 1.2 music_integration.php, 1.1, 1.2

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

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

Added Files:
	index.htm music_constants.php music_functions.php 
	music_integration.php 
Log Message:
This upgrade will make mx_music compatible with 2.9

--- NEW FILE: music_functions.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_music
* @version $Id: music_functions.php,v 1.2 2008/01/29 07:51:05 orynider Exp $
* @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/


// ------------------------------------
// All common functions are here!
// ------------------------------------
// You cannot call this file directly from your browser
//
if ( !defined('IN_PORTAL') )
{
	die('Hacking attempt');
}




// ----------------------------------------------------------------------------
// This function will return the access data of the current user for a category
// Default returning value is "0" (means NOT AUTHORISED)
//
// All $*_check must be "1" or "0"
//
// $passed_auth must be a full row from MUSIC_CAT_TABLE. This function still works without
// ... but $passed_auth will make it worked very much faster (because this function is often
// called in a loop)
//
function music_user_access($cat_id, $passed_auth = 0, $view_check, $upload_check, $rate_check, $comment_check, $edit_check, $delete_check)
{
	global $db, $music_config, $userdata;

	// --------------------------------
	// Force to check moderator status
	// --------------------------------
	$moderator_check = 1;


	// --------------------------------
	// Here the array which this function would return. Now we initiate it!
	// --------------------------------
	$music_user_access = array(
		'view' => 0,
		'upload' => 0,
		'rate' => 0,
		'comment' => 0,
		'edit' => 0,
		'delete' => 0,
		'moderator' => 0
	);
	$music_user_access_keys = array_keys($music_user_access);
	//
	// END initiation $music_user_access
	//


	// --------------------------------
	// Check $cat_id
	// --------------------------------
	if ($cat_id < 0)
	{
		mx_message_die(GENERAL_ERROR, 'Bad cat_id arguments for function music_user_access()');
	}
	//
	// END check $cat_id
	//


	// --------------------------------
	// If the current user is an ADMIN (MUSIC_ADMIN == ADMIN)
	// --------------------------------
	if ($userdata['user_level'] == ADMIN)
	{
		for ($i = 0; $i < count($music_user_access); $i++)
		{
			$music_user_access[$music_user_access_keys[$i]] = 1; // Authorised All
		}

		//
		// Function EXIT here
		//
		return $music_user_access;
	}
	//
	// END check ADMIN
	//


	// --------------------------------
	// if this is a GUEST, we will ignore some checking
	// --------------------------------
	if (!$userdata['session_logged_in'])
	{
		$edit_check = 0;
		$delete_check = 0;
		$moderator_check = 0;
	}
	//
	// END check GUEST
	//


	// --------------------------------
	// check if RATE or COMMENT are turned off by music Config, so we can ignore them
	// --------------------------------
	if ($music_config['rate'] == 0)
	{
		$rate_check = 0;
	}
	if ($music_config['comment'] == 0)
	{
		$comment_check = 0;
	}
	//
	// END Check RATE & COMMENT
	//


	// --------------------------------
	// The array that list all access type this function will look for (except MODERATOR)
	// --------------------------------
	$access_type = array();

	if ($view_check != 0)
	{
		$access_type[] = 'view';
	}

	if ($upload_check != 0)
	{
		$access_type[] = 'upload';
	}

	if ($rate_check != 0)
	{
		$access_type[] = 'rate';
	}

	if ($comment_check != 0)
	{
		$access_type[] = 'comment';
	}

	if ($edit_check != 0)
	{
		$access_type[] = 'edit';
	}

	if ($delete_check != 0)
	{
		$access_type[] = 'delete';
	}
	//
	// END generating array $access_type
	//


	// --------------------------------
	// If everything is empty
	// --------------------------------
	if( empty($access_type) and (!$moderator_check) )
	{
		//
		// Function EXIT here
		//
		return $music_user_access;
	}
	//
	// END check empty
	//


	// --------------------------------
	// Generate the SQL query based on $access_type and $moderator_check
	// --------------------------------
	$sql = 'SELECT cat_id';

	for ($i = 0; $i < count($access_type); $i++)
	{
		$sql .= ', cat_'. $access_type[$i] .'_level, cat_'. $access_type[$i] .'_groups';
	}

	if ($moderator_check)
	{
		$sql .= ', cat_moderator_groups';
	}

	$sql .= "
			FROM ". MUSIC_CAT_TABLE ."
			WHERE cat_id = '$cat_id'";
	//
	// END SQL query generating
	//


	// --------------------------------
	// Query the $sql then Fetchrow if $passed_auth == 0
	// --------------------------------
	if( !is_array($passed_auth) )
	{
		if( !$result = $db->sql_query($sql) )
		{
			mx_message_die(GENERAL_ERROR, 'Could not query music Category information' ,'' , __LINE__, __FILE__, $sql);
		}

		$thiscat = $db->sql_fetchrow($result);
	}
	else
	{
		$thiscat = $passed_auth;
	}
	//
	// END Query and Fetchrow
	//


	// --------------------------------
	// Maybe the access level is not PRIVATE or the groups list is empty
	// ... so we can skip some queries ;)
	// --------------------------------
	$groups_access = array();
	for ($i = 0; $i < count($access_type); $i++)
	{
		switch ($thiscat['cat_'. $access_type[$i] .'_level'])
		{
			case MUSIC_GUEST:
				$music_user_access[$access_type[$i]] = 1;
				break;

			case MUSIC_USER:
				if ($userdata['session_logged_in'])
				{
					$music_user_access[$access_type[$i]] = 1;
				}
				break;

			case MUSIC_PRIVATE:
				if( ($thiscat['cat_'. $access_type[$i] .'_groups'] != '') and ($userdata['session_logged_in']) )
				{
					$groups_access[] = $access_type[$i];
				}
				break;

			case MUSIC_MOD:
				// this will be checked later
				break;

			case MUSIC_ADMIN:
				// ADMIN already returned before at the checking code
				// at the top of this function. So this user cannot be authorised
				$music_user_access[$access_type[$i]] = 0;
				break;

			default:
				$music_user_access[$access_type[$i]] = 0;
		}
	}
	//
	// END Check Access Level
	//


	// --------------------------------
	// We can return now if $groups_access is empty AND $moderator_check == 0
	// --------------------------------
	if( ($moderator_check == 1) and ($thiscat['cat_moderator_groups'] != '') )
	{
		// We can merge them now
		$groups_access[] = 'moderator';
	}

	if (empty($groups_access))
	{
		//
		// Function EXIT here
		//
		return $music_user_access;
	}


	// --------------------------------
	// Now we have the list of usergroups have PRIVATE/MODERATOR access
	// So we will check if this user is in these usergroups or not...
	// --------------------------------
	// upto (6 + 1) loops maximum when this user logged in and All Levels
	// are set to PRIVATE and this function was called to check all.
	// So avoiding PRIVATE will speed up your music. However, these queries are very fast
	for ($i = 0; $i < count($groups_access); $i++)
	{
		$sql = "SELECT group_id, user_id
				FROM ". USER_GROUP_TABLE ."
				WHERE user_id = '". $userdata['user_id'] ."' AND user_pending = 0
					AND group_id IN (". $thiscat['cat_'. $groups_access[$i] .'_groups'] .")";
		if( !$result = $db->sql_query($sql) )
		{
			mx_message_die(GENERAL_ERROR, 'Could not query User-Group information' ,'' , __LINE__, __FILE__, $sql);
		}

		if( $db->sql_numrows($result) > 0 )
		{
			$music_user_access[$groups_access[$i]] = 1;
		}
	}
	//
	// END check PRIVATE/MODERATOR groups
	//


	// --------------------------------
	// If $moderator_check was called and this user is a MODERATOR he
	// will be authorised for all accesses which were not set to ADMIN
	// --------------------------------
	if( ($music_user_access['moderator'] == 1) and ($moderator_check == 1) )
	{
		for ($i = 0; $i < count($music_user_access); $i++)
		{
			if( $thiscat['cat_'. $music_user_access_keys[$i] .'_level'] != MUSIC_ADMIN )
			{
				$music_user_access[$music_user_access_keys[$i]] = 1;
			}
		}
	}
	//
	// END Moderator
	//


	// --------------------------------
	// Return result...
	// --------------------------------
	return $music_user_access;
}
//
// END function music_user_access()
// ----------------------------------------------------------------------------




// ----------------------------------------------------------------------------
// You must retain the full copyright notice below including the link to my site.
// This not only gives respect to the large amount of time given freely 
// but also helps promoting my scripts. If you refuse to include this then 
// support by me may be affected. And Do NOT modify anything!!!
function music_end()
{
	global $music_config;

	echo '<div align="center" style="font-family: Verdana; font-size: 10px; letter-spacing: -1px">Powered by Music Online 2' . $music_config['music_version'] . ' &copy; 2003 <a href="http://cfmanager.net.tf" target="_blank">Cf Manager</a></div>';
}
//
// OR you can pay me for the copyright notice removal. Contact me!
// ----------------------------------------------------------------------------


// +------------------------------------------------------+
// | Powered by Music Online 2.0 (c) 2003 Cf Manager |
// +------------------------------------------------------+


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

--- NEW FILE: music_integration.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_music
* @version $Id: music_integration.php,v 1.2 2008/01/29 07:51:05 orynider Exp $
* @copyright (c) 2002-2006 [OryNider, ory...@rd...] mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

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

/*
if( defined('music_CONFIG_TABLE') )
{
	$music_config = array();

	$sql = "SELECT * FROM " . MUSIC_CONFIG_TABLE;
	if( !($result = $db->sql_query($sql)) )
	{
		mx_message_die(GENERAL_ERROR, "Couldn't query radio config table", "", __LINE__, __FILE__, $sql);
	}
	else
	{
		while( $row = $db->sql_fetchrow($result) )
		{
			$config_name = $row['config_name'];
			$config_value = $row['config_value'];
			$music_config[$row['config_name']] = $row['config_value'];
		}
	}
}
*/

$music_index = $music_config['index'];
$override_default_pages = $music_config['override_default_pages'];
$integration_enabled = $music_config['enable_integration'];



// MX add-on
// Generate paths for page and standalone mode
// ...function based on original function written by Markus :-)
function this_mo_mxurl($args = '', $force_standalone_mode = false)
{
	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block;

	if( $force_standalone_mode || !$is_block )
	{
		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args);
	}
	else
	{
		$mxurl = $mx_root_path . 'index.' . $phpEx;
		if( is_numeric($page_id) && !empty($page_id) )
		{
			$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
		}
		else
		{
			$mxurl .= '?page=' . $music_index . ($args == '' ? '' : '&' . $args);
		}
	}
	return $mxurl;
}

function this_mo_portalurl($args = '', $force_standalone_mode = false)
{
	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block;

	if( $force_standalone_mode || !$integration_enabled )
	{
		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args);
	}
	else
	{
		$mxurl = $mx_root_path . 'index.' . $phpEx . '?page=' . $music_index . ($args == '' ? '' : '&' . $args);

	}
	return $mxurl;
}
function this_mo_loginurl($args = '')
{
	global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block;

	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'music.' . $phpEx : $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx;
	
	if( is_numeric($page_id) && !empty($page_id) )
	{
		$mxurl .= ($args == '' ? '' : '&' . $args) . '&page=' . $page_id;
	}
	else
	{
		$mxurl .= ($args == '' ? '' : '&' . $args) . '&page=' . $music_index;
	}
	return $mxurl;
}
function this_mo_rssurl($args = '', $force_standalone_mode = false)
{
	global $music_index, $phpEx;

	if( $force_standalone_mode )
	{
		$mxurl = ( !MXBB_MODULE ) ? 'music.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args);
	}
	else
	{
		$mxurl = ( !MXBB_MODULE ) ? 'music.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'music.' . $phpEx . ($args == '' ? '' : '?' . $args);
	}
	return $mxurl;
}
// --------------------------------------------------------------------------------
// That's all Folks!
// --------------------------------------------------------------------------------
?>
--- NEW FILE: music_constants.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_music
* @version $Id: music_constants.php,v 1.2 2008/01/29 07:51:05 orynider Exp $
* @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

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

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;
	$is_block = false; // This also makes the script work for phpBB ;)
}

define('PAGE_MUSIC', -19);	// for Session Handling


// User Levels for Music system <- do NOT change these values
define('MUSIC_ANONYMOUS', -1);
define('MUSIC_GUEST', -1);

define('MUSIC_USER', 0);
define('MUSIC_ADMIN', 1);
define('MUSIC_MOD', 2);
define('MUSIC_PRIVATE', 3);

if ( !MXBB_MODULE )
{
	// Path (trailing slash required)
	define('MUSIC_UPLOAD_PATH', $module_root_path . 'music_box/upload/');
	define('MUSIC_IMAGE_PATH', $module_root_path . 'muisc_box/upload/song_image/');
}
else
{
	// Path (trailing slash required)
	define('MUSIC_UPLOAD_PATH', $module_root_path . 'upload/');
	define('MUSIC_IMAGE_PATH', $module_root_path . 'upload/song_image/');
}

// Table names
!defined('MUSIC_TABLE') ? define('MUSIC_TABLE', $mx_table_prefix.'music') : false;
!defined('MUSIC_CAT_TABLE') ? define('MUSIC_CAT_TABLE', $mx_table_prefix.'music_cat') : false;
!defined('MUSIC_CONFIG_TABLE') ? define('MUSIC_CONFIG_TABLE', $mx_table_prefix.'music_config') : false;
!defined('MUSIC_COMMENT_TABLE') ? define('MUSIC_COMMENT_TABLE', $mx_table_prefix.'music_comment') : false;
!defined('MUSIC_RATE_TABLE') ? define('MUSIC_RATE_TABLE', $mx_table_prefix.'music_rate') : false;

?>