[Phpbb-checkins] CVS: phpBB2/admin admin_db_utilities.php,1.42.2.2,1.42.2.3

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8675

Modified Files:
      Tag: phpBB-2_0_0
	admin_db_utilities.php 
Log Message:
Fix for not downloading additional_tables


Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
diff -C2 -r1.42.2.2 -r1.42.2.3
*** admin_db_utilities.php	12 May 2002 00:47:40 -0000	1.42.2.2
--- admin_db_utilities.php	13 May 2002 22:00:37 -0000	1.42.2.3
***************
*** 746,751 ****
  				$template->set_filenames(array(
  					"body" => "admin/db_utils_backup_body.tpl")
! 				);
! 				
  				$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
  
--- 746,750 ----
  				$template->set_filenames(array(
  					"body" => "admin/db_utils_backup_body.tpl")
! 				);	
  				$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
  
***************
*** 773,776 ****
--- 772,779 ----
  			else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) )
  			{
+ 				if(is_array($additional_tables))
+ 				{
+ 					$additional_tables = implode(',', $additional_tables);
+ 				}
  				$template->set_filenames(array(
  					"body" => "admin/admin_message_body.tpl")
***************
*** 778,782 ****
  
  				$template->assign_vars(array(
! 					"META" => "<meta http-equiv=\"refresh\" content=\"0;url=admin_db_utilities.$phpEx?perform=backup&amp;additional_tables=" . quotemeta($additional_tables) . "&amp;backup_type=$backup_type&amp;drop=1&amp;backupstart=1&amp;gzipcompress=$gzipcompress&amp;startdownload=1\">",
  
  					"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
--- 781,785 ----
  
  				$template->assign_vars(array(
! 					"META" => "<meta http-equiv=\"refresh\" content=\"2;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&amp;backupstart=1&gzipcompress=$gzipcompress&startdownload=1\">",
  
  					"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
***************
*** 809,813 ****
  				@ob_start();
  				@ob_implicit_flush(0);
! 				header("Content-Type: text/x-delimtext; name=\"phpbb_db_backup.sql.gz\"");
  				header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
  			}
--- 812,816 ----
  				@ob_start();
  				@ob_implicit_flush(0);
! 				header("Content-Type: application/x-gzip; name=\"phpbb_db_backup.sql.gz\"");
  				header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
  			}