Changeset 6243 for temp/trunk

Timestamp:

2006/10/13 12:02:46 (20 years ago)

Author:

naka

Message:

* empty log message *

File:

• temp/trunk/html/install/index.php (modified) (11 diffs)

temp/trunk/html/install/index.php

@@ -81 +81 @@
     // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
     $arrRet =  $objDBParam->getHashArray();
+    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
     
     /*
@@ -86 +87 @@
         ¡Ê£Ä£Â¹½À®¤Î²¼°Ì¸ß´¹¤Î¤¿¤á¥¹¥­¥Ã¥×»þ¤â¶¯À©¡Ë
     */
-    if(count($objPage->arrErr) == 0) {
-        
-    }
+    
     
     if(count($objPage->arrErr) == 0) {
@@ -102 +101 @@
     
     // ¥Æ¡¼¥Ö¥ë¤ÎºîÀ®
-    $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 +111 @@
     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 +121 @@
     // ½é´ü¥Ç¡¼¥¿¤ÎºîÀ®
     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 +131 @@
     // ¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
     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 +141 @@
     // ¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
     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 +165 @@
     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 +176 @@
     // ¥Æ¡¼¥Ö¥ë¤Îºï½ü
     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 +555 @@
 
 // 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 +565 @@
             fclose($fp);
         }
-
-        $dsn = $db_type."://".$db_user.":".$db_password."@".$db_server.":".$db_port."/".$db_name;
         
         $objDB = DB::connect($dsn);