Changeset 5100 for temp/trunk

Timestamp:

2006/09/19 09:18:35 (20 years ago)

Author:

kakinaka

Message:

blank

File:

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

temp/trunk/html/install/index.php

@@ -31 +31 @@
 $objWebParam = lfInitWebParam($objWebParam);
 $objDBParam = lfInitDBParam($objDBParam);
+
+if ($_POST['db_type'] == 'pgsql') {
+    $port = "";
+}else{
+    $port = ":".$_POST['db_port'];
+}
 
 //¥Õ¥©¡¼¥àÇÛÎó¤Î¼èÆÀ
@@ -62 +68 @@
 case 'step2':
     //ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
-    if ($_POST['db_type'] == 'pgsql') {
-        $_POST['db_port'] = "";
-    }else{
-        $_POST['db_port'] = ":".$_POST['db_port'];
-        $objDBParam->setValue("db_port", $_POST['db_port']);
-    }
-    
     $objPage->arrErr = lfCheckDBError($objDBParam);
     
@@ -170 +169 @@
     // ¥·¥ç¥Ã¥×¥Þ¥¹¥¿¾ðÊó¤Î½ñ¤­¹þ¤ß
     $arrRet =  $objDBParam->getHashArray();
-    $dsn = "pgsql://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server']."/".$arrRet['db_name'];
+    $dsn = "pgsql://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].$port."/".$arrRet['db_name'];
     $sqlval['shop_name'] = $objWebParam->getValue('shop_name');
     $sqlval['email01'] = $objWebParam->getValue('admin_mail');
@@ -390 +389 @@
     $objWebParam->addParam("URL(¥»¥­¥å¥¢)", "secure_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $secure_url);
     $objWebParam->addParam("¥É¥á¥¤¥ó", "domain", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $domain);  
-    
+
     return $objWebParam;
 }
@@ -430 +429 @@
     if(count($objErr->arrErr) == 0) {
         // Àܳ³Îǧ
-        $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].$arrRet['db_port']."/".$arrRet['db_name'];
+        $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].$port."/".$arrRet['db_name'];
         // Debug¥â¡¼¥É»ØÄê
         $options['debug'] = 3;
@@ -458 +457 @@
         }
 
-        $dsn = $db_type."://".$db_user.":".$db_password."@".$db_server.$db_port."/".$db_name;
+        $dsn = $db_type."://".$db_user.":".$db_password."@".$db_server.$port."/".$db_name;
         
-        print($dsn);
-
         $objDB = DB::connect($dsn);
         // Àܳ¥¨¥é¡¼