[mxbb-commits] mx_pafiledb/pafiledb/modules pa_quickdl.php,1.2,1.3

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16551/modules/mx_pafiledb/pafiledb/modules

Modified Files:
	pa_quickdl.php 
Log Message:
rewritten part of the quickdl block:
- now better in sync with navigation menu

Index: pa_quickdl.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_quickdl.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pa_quickdl.php	1 Oct 2005 14:15:20 -0000	1.2
--- pa_quickdl.php	12 Oct 2005 15:40:20 -0000	1.3
***************
*** 30,39 ****
  		// =======================================================
  		
! 		// Get quickdl root cat
! 		$pa_mapping_data = array();
! 		$pa_mapping_temp = $pafiledb_quickdl['pa_mapping'];
! 		$pa_mapping_temp = stripslashes( $pa_mapping_temp );
! 		$pa_mapping_list = eval( "return " . $pa_mapping_temp . ";" );	
  		
  		if ( isset( $_REQUEST['dynamic_block'] ) )
  		{
--- 30,50 ----
  		// =======================================================
  		
! 		$pa_mapping_list = !empty($pafiledb_quickdl['pa_mapping']) ? unserialize( stripslashes( $pafiledb_quickdl['pa_mapping'] )) : array();
! 
! 		//
! 		// Setup mappings
! 		//
! 		for ( $i = 0; $i < count( $pa_mapping_list ); $i++ )	
! 		{
! 			$pa_get_dynamic[$pa_mapping_list[$i]['map_cat_id']] = $pa_mapping_list[$i]['map_dyn_id'];
! 			$pa_get_cat[$pa_mapping_list[$i]['map_dyn_id']] = $pa_mapping_list[$i]['map_cat_id'];
! 		}
! 
! 		//
! 		// Get pafiledb cat id - either from cat_id (GET), mapping (GET) or default cat_id (PAR)
! 		//
! 		$pa_cat_id = isset( $_REQUEST['cat_id'] ) ? intval( $_REQUEST['cat_id'] ) : ( isset( $_REQUEST['dynamic_block'] ) && !empty( $pa_get_cat[$_REQUEST['dynamic_block']] ) ? intval( $pa_get_cat[$_REQUEST['dynamic_block']] ) : intval( $pafiledb_quickdl['pa_quick_cat'] ) );
  		
+ 		/*	
  		if ( isset( $_REQUEST['dynamic_block'] ) )
  		{
***************
*** 56,59 ****
--- 67,71 ----
  
  		$pa_cat_id = isset( $_REQUEST['cat_id'] ) ? intval( $_REQUEST['cat_id'] ) : $map_cat_id;
+ 		*/
  		
  		$start = ( isset( $_REQUEST['start'] ) ) ? intval( $_REQUEST['start'] ) : 0;
***************
*** 148,162 ****
  		$quickdl = $this->cat_rowset[$pa_cat_id];
  		
! 		$quickdl_tmp = '';
! 		if ( !empty( $pa_cat_id ) && $pa_cat_id != $map_cat_id )
  		{
! 			$quickdl_tmp = '&laquo; ';
  		}
  		
! 		$map_xtra = isset( $_REQUEST['dynamic_block'] ) ? '&dynamic_block=' . $_REQUEST['dynamic_block'] : '';
  
  		$pafiledb_template->assign_vars( array( 
! 				'U_DOWNLOAD' => append_sid( pa_this_mxurl( 'action=quickdl&cat_id=' . $map_cat_id . $map_xtra ) ),
! 				'DOWNLOAD' => $quickdl_tmp . $quickdl['cat_name'] 
  				) 
  		);
--- 160,175 ----
  		$quickdl = $this->cat_rowset[$pa_cat_id];
  		
! 		$quickdl_back = '';
! 		if ( $pa_cat_id != $pafiledb_quickdl['pa_quick_cat'] )
  		{
! 			$quickdl_back = '&laquo; ';
  		}
  		
! 		$map_xtra = !empty( $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] ) ? '&dynamic_block=' . $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']]  : '';
  
  		$pafiledb_template->assign_vars( array( 
! 				'U_DOWNLOAD' => append_sid( pa_this_mxurl( 'action=quickdl&cat_id=' . $pafiledb_quickdl['pa_quick_cat'] . $map_xtra ) ),
! 				'DOWNLOAD' => $quickdl['cat_name'], 
! 				'BACK' => $quickdl_back 
  				) 
  		);
***************
*** 170,174 ****
  			$no_file_message = false;
  
! 			$this->category_display_quickdl( $pa_cat_id );
  		}
  
--- 183,187 ----
  			$no_file_message = false;
  
! 			$this->category_display_quickdl( $pa_cat_id, $pa_get_dynamic );
  		}