[phpBT-dev] CVS: phpbt install.php,1.7,1.8

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv17532

Modified Files:
	install.php 
Log Message:
Tweaks to the download option

Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- install.php	2001/12/04 14:27:23	1.7
+++ install.php	2001/12/14 14:42:09	1.8
@@ -50,6 +50,7 @@
 		'/TBL_CONFIGURATION/' => $_pv['tbl_prefix'].'configuration',
 		'/TBL_GROUP_PERM/' => $_pv['tbl_prefix'].'group_perm',
 		'/TBL_OS/' => $_pv['tbl_prefix'].'os',
+		'/TBL_PROJECT_GROUP/' => $_pv['tbl_prefix'].'project_group',
 		'/TBL_PROJECT/' => $_pv['tbl_prefix'].'project',
 		'/TBL_RESOLUTION/'  => $_pv['tbl_prefix'].'resolution',
 		'/TBL_SAVED_QUERY/' => $_pv['tbl_prefix'].'saved_query',
@@ -97,7 +98,7 @@
 	$t->set_root('.');
 	$t->set_file('content', 'config-dist.php');
 	$t->set_var($_pv);
-	return "<?php\n".$t->finish($t->parse('main', 'content'));
+	return $t->finish($t->parse('main', 'content'));
 }
 
 function create_tables() {
@@ -163,14 +164,13 @@
  	header('Content-Type: text/x-delimtext; name="config.php"');
  	header('Content-disposition: attachment; filename=config.php');
  	echo grab_config_file();
-	show_finished();
 }
 
 function save_config_file() {
 
 	if (!check_vars()) return;
 	create_tables();
-	if (!$fp = fopen('config.php', 'w')) {
+	if (!$fp = @fopen('config.php', 'w')) {
 		show_front('Error writing to config.php');
 	} else {
 		fwrite($fp, grab_config_file());
@@ -184,16 +184,7 @@
 	
 	$t->set_root('templates/default');
 	$t->set_file('done', 'install-complete.html');
-	$t->set_block('done', 'writeableblock', 'writeable');
-	$t->set_block('done', 'unwriteableblock', 'unwriteable');
 	$t->set_var('login', $_pv['admin_login']);
-	if (is_writeable('config.php')) {
-		$t->parse('writeable', 'writeableblock', true);
-		$t->set_var('unwriteable', '');
-	} else {
-		$t->parse('unwriteable', 'unwriteableblock', true);
-		$t->set_var('writeable', '');
-	}
 
 	print $t->finish($t->parse('main', 'done'));
 }
@@ -225,7 +216,7 @@
 
 	// If we can write to the config file, show that we will do that, otherwise
 	// offer the config file as a download
-	if (is_writeable('config.php')) {
+	if (@is_writeable('config.php')) {
 		$t->parse('writeable', 'writeableblock', true);
 		$t->set_var('unwriteable', '');
 	} else {