Changeset 3501 for temp/trunk

Timestamp:

2006/08/31 17:12:55 (20 years ago)

Author:

naka

Message:

* empty log message *

Location:

temp/trunk

Files:

• data/lib/slib.php (modified) (1 diff)
• html/install/index.php (modified) (3 diffs)

temp/trunk/data/lib/slib.php

@@ -25 +25 @@
         if(file_exists($path)) {
             sfErrorHeader(">> /install/index.php¤Ï¥»¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤Ë¤Ê¤ê¤Þ¤¹¡£¥¤¥ó¥¹¥È¡¼¥ë´°Î»¸å¤Ï¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£");
-        }       
-        $objConn = new SC_DbConn(DEFAULT_DSN);
-        $result = $objConn->getAll("SELECT * FROM dtb_baseinfo");
-        if(count($result) == 0) {
-            sfErrorHeader(">> ´ÉÍý²èÌÌ-´ðËܾðÊó´ÉÍý¤«¤éSHOP¥Þ¥¹¥¿¤òÅÐÏ¿¤·¤Æ¤¯¤À¤µ¤¤¡£");
-        }       
+        }
     }
 }

temp/trunk/html/install/index.php

@@ -157 +157 @@
 case 'complete':
     // ¥·¥ç¥Ã¥×¥Þ¥¹¥¿¾ðÊó¤Î½ñ¤­¹þ¤ß
-    $objQuery = new SC_Query();
+    $arrRet =  $objDBParam->getHashArray();
+    $dsn = "pgsql://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server']."/".$arrRet['db_name'];
     $sqlval['shop_name'] = $objWebParam->getValue('shop_name');
     $sqlval['email01'] = $objWebParam->getValue('admin_mail');
@@ -164 +165 @@
     $sqlval['email04'] = $objWebParam->getValue('admin_mail');
     $sqlval['email05'] = $objWebParam->getValue('admin_mail');
+    $objQuery = new SC_Query($dsn);
     $cnt = $objQuery->count("dtb_baseinfo");
     if($cnt > 0) {
@@ -169 +171 @@
     } else {
         $objQuery->insert("dtb_baseinfo", $sqlval);     
-    }   
+    }
     global $GLOBAL_ERR;
     $GLOBAL_ERR = "";