Changeset 6031

Timestamp:

2006/10/12 11:20:33 (20 years ago)

Author:

naka

Message:

* empty log message *

Location:

temp/trunk

Files:

• data/conf/core.php (modified) (1 diff)
• html/install/index.php (modified) (2 diffs)

temp/trunk/data/conf/core.php

@@ -33 +33 @@
 define ("DB_ERROR_MAIL_SUBJECT", "OS_TEST_ERROR");
 
-// ¥µ¥¤¥ÈÍÑDB
-define ("DEFAULT_DSN", DB_TYPE . "://" . DB_USER . ":" . DB_PASSWORD . "@" . DB_SERVER . ":" .DB_PORT . "/" . DB_NAME);
+if(defined('DB_TYPE') && defined('DB_USER') && defined('DB_PASSWORD') && defined('DB_SERVER') && defined('DB_PORT') && defined('DB_NAME')) {
+    // ¥µ¥¤¥ÈÍÑDB
+    define ("DEFAULT_DSN", DB_TYPE . "://" . DB_USER . ":" . DB_PASSWORD . "@" . DB_SERVER . ":" .DB_PORT . "/" . DB_NAME);
+}
 
 // ͹ÊØÈÖ¹æÀìÍÑDB

temp/trunk/html/install/index.php

@@ -185 +185 @@
     $arrRet =  $objDBParam->getHashArray();
     
-    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].$port."/".$arrRet['db_name'];
+    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
     $sqlval['shop_name'] = $objWebParam->getValue('shop_name');
     $sqlval['email01'] = $objWebParam->getValue('admin_mail');
@@ -422 +422 @@
         $secure_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
     }
+    
+    print(DEFAULT_DSN);
 
     $objWebParam->addParam("Ź̾", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"));