Index: /temp/trunk/html/install/index.php
===================================================================
--- /temp/trunk/html/install/index.php	(revision 6242)
+++ /temp/trunk/html/install/index.php	(revision 6243)
@@ -81,4 +81,5 @@
 	// ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
 	$arrRet =  $objDBParam->getHashArray();
+	$dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
 	
 	/*
@@ -86,7 +87,5 @@
 		¡Ê£Ä£Â¹½À®¤Î²¼°Ì¸ß´¹¤Î¤¿¤á¥¹¥­¥Ã¥×»þ¤â¶¯À©¡Ë
 	*/
-	if(count($objPage->arrErr) == 0) {
-		
-	}
+	
 	
 	if(count($objPage->arrErr) == 0) {
@@ -102,5 +101,5 @@
 	
 	// ¥Æ¡¼¥Ö¥ë¤ÎºîÀ®
-	$objPage->arrErr = lfExecuteSQL("./sql/create_table_".$arrRet['db_type'].".sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port']); 
+	$objPage->arrErr = lfExecuteSQL("./sql/create_table_".$arrRet['db_type'].".sql", $dsn); 
 	if(count($objPage->arrErr) == 0) {
 		$objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
@@ -112,5 +111,5 @@
 	if(count($objPage->arrErr) == 0 and $arrRet['db_type'] == 'pgsql') {
 		// ¥Ó¥å¡¼¤ÎºîÀ®
-		$objPage->arrErr = lfExecuteSQL("./sql/create_view.sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port']); 
+		$objPage->arrErr = lfExecuteSQL("./sql/create_view.sql", $dsn); 
 		if(count($objPage->arrErr) == 0) {
 			$objPage->tpl_message.="¡û¡§¥Ó¥å¡¼¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
@@ -122,5 +121,5 @@
 	// ½é´ü¥Ç¡¼¥¿¤ÎºîÀ®
 	if(count($objPage->arrErr) == 0) {
-		$objPage->arrErr = lfExecuteSQL("./sql/insert_data.sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port']); 
+		$objPage->arrErr = lfExecuteSQL("./sql/insert_data.sql", $dsn); 
 		if(count($objPage->arrErr) == 0) {
 			$objPage->tpl_message.="¡û¡§½é´ü¥Ç¡¼¥¿¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
@@ -132,5 +131,5 @@
 	// ¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
 	if(count($objPage->arrErr) == 0) {
-		$objPage->arrErr = lfExecuteSQL("./sql/column_comment.sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port']); 
+		$objPage->arrErr = lfExecuteSQL("./sql/column_comment.sql", $dsn); 
 		if(count($objPage->arrErr) == 0) {
 			$objPage->tpl_message.="¡û¡§¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
@@ -142,5 +141,5 @@
 	// ¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
 	if(count($objPage->arrErr) == 0) {
-		$objPage->arrErr = lfExecuteSQL("./sql/table_comment.sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port']); 
+		$objPage->arrErr = lfExecuteSQL("./sql/table_comment.sql", $dsn); 
 		if(count($objPage->arrErr) == 0) {
 			$objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
@@ -166,5 +165,5 @@
 	if ($arrRet['db_type'] == 'pgsql'){
 		// ¥Ó¥å¡¼¤Îºï½ü
-		$objPage->arrErr = lfExecuteSQL("./sql/drop_view.sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port'], false); 
+		$objPage->arrErr = lfExecuteSQL("./sql/drop_view.sql", $dsn, false); 
 		if(count($objPage->arrErr) == 0) {
 			$objPage->tpl_message.="¡û¡§¥Ó¥å¡¼¤Îºï½ü¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
@@ -177,5 +176,5 @@
 	// ¥Æ¡¼¥Ö¥ë¤Îºï½ü
 	if(count($objPage->arrErr) == 0) {
-		$objPage->arrErr = lfExecuteSQL("./sql/drop_table.sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port'], false); 
+		$objPage->arrErr = lfExecuteSQL("./sql/drop_table.sql", $dsn, false); 
 		if(count($objPage->arrErr) == 0) {
 			$objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¤Îºï½ü¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
@@ -556,5 +555,5 @@
 
 // SQLʸ¤Î¼Â¹Ô
-function lfExecuteSQL($filepath, $db_user, $db_password, $db_server, $db_name, $db_type, $db_port, $disp_err = true) {
+function lfExecuteSQL($filepath, $dsn, $disp_err = true) {
 	$arrErr = array();
 
@@ -566,6 +565,4 @@
 			fclose($fp);
 		}
-
-		$dsn = $db_type."://".$db_user.":".$db_password."@".$db_server.":".$db_port."/".$db_name;
 		
 		$objDB = DB::connect($dsn);