Changeset 16313 for branches/feature-module-update/html/install/index.php

Timestamp:

2007/10/07 00:00:08 (19 years ago)

Author:

nanasess

Message:

インストーラ修正

File:

• branches/feature-module-update/html/install/index.php (modified) (13 diffs)

branches/feature-module-update/html/install/index.php

@@ -97 +97 @@
     // 入力データを渡す。
     $arrRet =  $objDBParam->getHashArray();
+    define("DB_TYPE", $arrRet['db_type']);
     $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
 
@@ -153 +154 @@
     if(count($objPage->arrErr) == 0) {
         $objPage->arrErr = lfExecuteSQL("./sql/insert_data.sql", $dsn);
-
         if(count($objPage->arrErr) == 0) {
             $objPage->tpl_message.="○：初期データの作成に成功しました。<br>";
@@ -198 +198 @@
     // 入力データを渡す。
     $arrRet =  $objDBParam->getHashArray();
+    if (!defined("DB_TYPE")) {
+        define("DB_TYPE", $arrRet['db_type']);
+    }
     $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
 
@@ -555 +558 @@
 
     $arrDbParam = $objDBParam->getHashArray();
+    if (!defined("DB_TYPE")) {
+        define("DB_TYPE", $arrDbParam['db_type']);
+    }
     $dsn = $arrDbParam['db_type']."://".$arrDbParam['db_user'].":".$arrDbParam['db_password']."@".$arrDbParam['db_server'].":".$arrDbParam['db_port']."/".$arrDbParam['db_name'];
 
@@ -707 +713 @@
 function lfCheckDBError($objFormParam) {
     global $objPage;
+    global $objDb;
 
     // 入力データを渡す。
@@ -717 +724 @@
         // 接続確認
         $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
+        define("DB_TYPE", $arrRet['db_type']);
         // Debugモード指定
         $options['debug'] = PEAR_DB_DEBUG;
@@ -729 +737 @@
             ereg("\[(.*)\]", $objDB->userinfo, $arrKey);
             $objErr->arrErr['all'].= $arrKey[0] . "<br>";
-            gfPrintLog($objDB->userinfo, INSTALL_LOG);
+            GC_Utils_Ex::gfPrintLog($objDB->userinfo, INSTALL_LOG);
         }
     }
@@ -763 +771 @@
                         $arrErr['all'].= $arrKey[0] . "<br>";
                         $objPage->update_mess.=">> テーブル構成の変更に失敗しました。<br>";
-                        gfPrintLog($ret->userinfo, INSTALL_LOG);
+                        GC_Utils_Ex::gfPrintLog($ret->userinfo, INSTALL_LOG);
                     }
                 }
@@ -769 +777 @@
         } else {
             $arrErr['all'] = ">> " . $objDB->message;
-            gfPrintLog($objDB->userinfo, INSTALL_LOG);
+            GC_Utils_Ex::gfPrintLog($objDB->userinfo, INSTALL_LOG);
         }
     }
@@ -799 +807 @@
 
     // ディレクトリの取得
-    $url_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $normal_url);
+    $url_dir = ereg_replace("^https?://[a-zA-Z0-9_:~=&\?\.\-]+", "", $normal_url);
 
     $data_path = SC_Utils_Ex::sfRmDupSlash($root_dir . HTML2DATA_DIR);
@@ -904 +912 @@
             ereg("\[(.*)\]", $objDB->userinfo, $arrKey);
             $arrErr['all'].= $arrKey[0] . "<br>";
-            gfPrintLog($objDB->userinfo, INSTALL_LOG);
+            GC_Utils_Ex::gfPrintLog($objDB->userinfo, INSTALL_LOG);
         }
     }
@@ -913 +921 @@
 function lfAddColumn($dsn) {
     global $objDBParam;
+    global $objDb;
 
     // 受注テーブル
@@ -971 +980 @@
     if (!$objDb->sfColumnExists("dtb_customer", "mobile_phone_id", "text", $dsn, true)) {
         // インデックスの追加
-        sfIndexExists("dtb_customer", "mobile_phone_id", "dtb_customer_mobile_phone_id_key", 64, $dsn, true);
+        $objDb->sfIndexExists("dtb_customer", "mobile_phone_id", "dtb_customer_mobile_phone_id_key", 64, $dsn, true);
     }