Changeset 6211 for temp/trunk

Timestamp:

2006/10/13 09:54:46 (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) (2 diffs)
• html/install/user_data/templates/mypage (deleted)

temp/trunk/data/lib/slib.php

@@ -20 +20 @@
 
 /* ¥Æ¡¼¥Ö¥ë¤Î¸ºß¥Á¥§¥Ã¥¯ */
-function sfTabaleExists($table_name, $db_type=DB_TYPE) {
-    $objQuery = new SC_Query(); 
+function sfTabaleExists($table_name, $dsn = DEFAULT_DSN) {
+    $objQuery = new SC_Query($dsn);
+    list($db_type) = split(":", $dsn);
+            
     // postgresql¤Èmysql¤È¤Ç½èÍý¤òʬ¤±¤ë
     if ($db_type == "pgsql") {

temp/trunk/html/install/index.php

@@ -427 +427 @@
         $secure_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
     }
-    
-    /*
+
     // Ź̾¡¢´ÉÍý¼Ô¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò¼èÆÀ¤¹¤ë¡£(ºÆ¥¤¥ó¥¹¥È¡¼¥ë»þ)
     if(defined('DEFAULT_DSN')) {
+        $ret = sfTabaleExists("dtb_baseinfo", DEFAULT_DSN);
+        
+        if($ret) {
+            print("ari");
+        } else {
+            print("nasi");
+        }
+        
         $objQuery = new SC_Query();
         $arrRet = $objQuery->select("shop_name, email01", "dtb_baseinfo");
@@ -436 +443 @@
         $admin_mail = $arrRet[0]['email01'];
     }
-    */
 
     $objWebParam->addParam("Ź̾", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $shop_name);