[mxbb-commits] mx_pafiledb/pafiledb/modules pa_download.php,1.9,1.10 pa_user_upload.php,1.10,1.11

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

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

Modified Files:
	pa_download.php pa_user_upload.php 
Log Message:
updating for pafiledb 2.0.1

Index: pa_download.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_download.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pa_download.php	9 Jan 2005 21:44:14 -0000	1.9
--- pa_download.php	21 Apr 2005 20:55:42 -0000	1.10
***************
*** 197,201 ****
  			$this->display( $lang['Download'], 'pa_mirrors_body.tpl' );
  			include( $mx_root_path . 'includes/page_tail.' . $phpEx );
! 		}elseif ( ( !empty( $mirrors_data ) && $mirror_id == -1 ) || ( empty( $mirrors_data ) ) )
  		{
  			$real_filename = $file_data['real_name'];
--- 197,202 ----
  			$this->display( $lang['Download'], 'pa_mirrors_body.tpl' );
  			include( $mx_root_path . 'includes/page_tail.' . $phpEx );
! 		}
! 		elseif ( ( !empty( $mirrors_data ) && $mirror_id == -1 ) || ( empty( $mirrors_data ) ) )
  		{
  			$real_filename = $file_data['real_name'];
***************
*** 203,207 ****
  			$upload_dir = ( !empty( $file_data['upload_dir'] ) ) ? $file_data['upload_dir'] : $pafiledb_config['upload_dir'];
  			$file_url = $file_data['file_dlurl'];
! 		}elseif ( $mirror_id > 0 && !empty( $mirrors_data[$mirror_id] ) )
  		{
  			$real_filename = $mirrors_data[$mirror_id]['real_name'];
--- 204,209 ----
  			$upload_dir = ( !empty( $file_data['upload_dir'] ) ) ? $file_data['upload_dir'] : $pafiledb_config['upload_dir'];
  			$file_url = $file_data['file_dlurl'];
! 		}
! 		elseif ( $mirror_id > 0 && !empty( $mirrors_data[$mirror_id] ) )
  		{
  			$real_filename = $mirrors_data[$mirror_id]['real_name'];
***************
*** 242,253 ****
  			// now send the file to the user so he can enjoy it :D
  			// =========================================================================
! 			if ( $pafiledb_functions->get_extension( $physical_filename ) == 'pdf' )
  			{
! 				$file_url = $module_root_path . $upload_dir . $physical_filename;
! 				pa_redirect( $file_url );
! 			}elseif ( !send_file_to_browser( $real_filename, 'application/force-download', $physical_filename, $module_root_path . $upload_dir ) )
  			{
! 				$file_url = $module_root_path . $upload_dir . $physical_filename;
! 				pa_redirect( $file_url );
  			}
  		}
--- 244,259 ----
  			// now send the file to the user so he can enjoy it :D
  			// =========================================================================
! 			if($pafiledb_functions->get_extension($physical_filename) == 'pdf')
  			{
! 			   $mimetype = 'application/pdf';
! 			}
! 			else
  			{
! 			   $mimetype = 'application/force-download';
! 			}
! 			
! 			if(!send_file_to_browser($real_filename, $mimetype, $physical_filename, $module_root_path . $upload_dir))
! 			{
! 			   message_die(GENERAL_ERROR, $lang['Error_no_download'] . '<br /><br /><b>404 File Not Found:</b> The File <i>' . $real_filename . '</i> does not exist.');
  			}
  		}
***************
*** 350,354 ****
  	if ( $browser_agent == 'ie' )
  	{
! 		header( 'Content-Type: ' . $mimetype );
  		header( 'Content-Disposition: inline; filename="' . $real_filename . '"' );
  	}
--- 356,360 ----
  	if ( $browser_agent == 'ie' )
  	{
! 		header( 'Content-Type: ' . $mimetype . '; name="' . $real_filename . '"' );
  		header( 'Content-Disposition: inline; filename="' . $real_filename . '"' );
  	}

Index: pa_user_upload.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_user_upload.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pa_user_upload.php	11 Apr 2005 17:55:41 -0000	1.10
--- pa_user_upload.php	21 Apr 2005 20:55:42 -0000	1.11
***************
*** 141,149 ****
  								
  				// PM notify
! 				$pa_admins = pa_get_admins( true);
  				
! 				for ($i = 0; $i < count($pa_admins) || $i < 10; $ii)
  				{
! 					pa_notify( $pafiledb_config['pm_notify'], $pa_message, $pa_admins[$i]['user_id'], $pa_pm['file_editor_id'], $info = 'new' );
  				}
  			}
--- 141,149 ----
  								
  				// PM notify
! 				$pa_admins = pa_get_admins( true );
  				
! 				for ($i = 0; $i < count($pa_admins) || $i < 10; $i++)
  				{
! 					 pa_notify( $pafiledb_config['pm_notify'], $pa_message, $pa_admins[$i]['user_id'], $pa_pm['file_editor_id'], $info = 'new' );
  				}
  			}