Changeset 20725 for branches/version-2_5-dev

Timestamp:

2011/03/18 21:37:08 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20724

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110318123611-k39fpbpa4vod3uyp

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110318123705-op2j7bjwup1hwaxl

bzr:revno:

3439

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

html/install/index.php ohkouchi@loop-az.jp-20110318123611-k39fpbpa4vod3uyp

bzr:timestamp:

2011-03-18 21:37:05.710999966 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-18T12:37:05.711000Z

Message:

#951 (再インストールでDB初期化をしない場合、ログイン出来なくなる)

• config/config.php の生成タイミングを step4 に変更
• complete 画面で, SHOP情報, 会員情報を INSERT するように変更
• DBスキップした場合でも, 上記処理を行い, 前回の AUTH_MAGIC を使いまわすように修正

File:

• branches/version-2_5-dev/html/install/index.php (modified) (6 diffs)

branches/version-2_5-dev/html/install/index.php

@@ -115 +115 @@
     $objPage->arrErr = lfCheckDBError($objDBParam);
     if (count($objPage->arrErr) == 0) {
-        // 設定ファイルの生成
-        lfMakeConfigFile();
         if ($err = renameAdminDir($objWebParam->getValue('admin_dir')) !== true) {
             $objPage->arrErr["all"] .= $err;
@@ -138 +136 @@
         $skip = $_POST["db_skip"];
         if ($skip == "on") {
-            $objPage = lfDispComplete($objPage);
-            //$objPage = lfDispStep4($objPage);
+            $objPage = lfDispStep4($objPage);
             break;
         }
@@ -216 +213 @@
 // 完了画面
 case 'complete':
-    // ショップマスタ情報の書き込み
-    $arrRet =  $objDBParam->getHashArray();
-
-    $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');
-    $sqlval['email02'] = $objWebParam->getValue('admin_mail');
-    $sqlval['email03'] = $objWebParam->getValue('admin_mail');
-    $sqlval['email04'] = $objWebParam->getValue('admin_mail');
-    $sqlval['email05'] = $objWebParam->getValue('admin_mail');
-    $sqlval['top_tpl'] = "default1";
-    $sqlval['product_tpl'] = "default1";
-    $sqlval['detail_tpl'] = "default1";
-    $sqlval['mypage_tpl'] = "default1";
-    $sqlval['update_date'] = 'now()';
-    $objQuery = new SC_Query($dsn);
-    $cnt = $objQuery->count("dtb_baseinfo");
-    if($cnt > 0) {
-        $objQuery->update("dtb_baseinfo", $sqlval);
-    } else {
-        $objQuery->insert("dtb_baseinfo", $sqlval);
-    }
-
-    // 管理者登録
-    $login_id = $objWebParam->getValue('login_id');
-    $salt = SC_Utils_Ex::sfGetRandomString(10);
-    $login_pass = SC_Utils_Ex::sfGetHashString($objWebParam->getValue('login_pass'), $salt);
-
-    $objQuery->delete("dtb_member", "login_id = ?", array($login_id));
-
-    $member_id = $objQuery->nextVal("dtb_member_member_id");
-    $objQuery->insert("dtb_member", array("member_id" => $member_id,
-                                          "name" => "管理者",
-                                          "login_id" => $login_id,
-                                          "password" => $login_pass,
-                                          "salt" => $salt,
-                                          "creator_id" => 0,
-                                          "authority" => 0,
-                                          "work" => 1,
-                                          "del_flg" => 0,
-                                          "rank" => 1,
-                                          "create_date" => "now()",
-                                          "update_date" => "now()"));
 
     $GLOBAL_ERR = "";
@@ -540 +494 @@
     global $objDb;
 
+    // 設定ファイルの生成
+    lfMakeConfigFile();
+
     // hiddenに入力値を保持
     $objPage->arrHidden = $objWebParam->getHashArray();
@@ -575 +532 @@
     // hiddenに入力値を保持
     $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+
+    // ショップマスタ情報の書き込み
+    $arrRet =  $objDBParam->getHashArray();
+
+    $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');
+    $sqlval['email02'] = $objWebParam->getValue('admin_mail');
+    $sqlval['email03'] = $objWebParam->getValue('admin_mail');
+    $sqlval['email04'] = $objWebParam->getValue('admin_mail');
+    $sqlval['email05'] = $objWebParam->getValue('admin_mail');
+    $sqlval['top_tpl'] = "default1";
+    $sqlval['product_tpl'] = "default1";
+    $sqlval['detail_tpl'] = "default1";
+    $sqlval['mypage_tpl'] = "default1";
+    $sqlval['update_date'] = 'now()';
+    $objQuery = new SC_Query($dsn);
+    $cnt = $objQuery->count("dtb_baseinfo");
+    if($cnt > 0) {
+        $objQuery->update("dtb_baseinfo", $sqlval);
+    } else {
+        $objQuery->insert("dtb_baseinfo", $sqlval);
+    }
+
+    // 管理者登録
+    $login_id = $objWebParam->getValue('login_id');
+    $salt = SC_Utils_Ex::sfGetRandomString(10);
+    $login_pass = SC_Utils_Ex::sfGetHashString($objWebParam->getValue('login_pass'), $salt);
+
+    $objQuery->delete("dtb_member", "login_id = ?", array($login_id));
+
+    $member_id = $objQuery->nextVal("dtb_member_member_id");
+    $objQuery->insert("dtb_member", array("member_id" => $member_id,
+                                          "name" => "管理者",
+                                          "login_id" => $login_id,
+                                          "password" => $login_pass,
+                                          "salt" => $salt,
+                                          "creator_id" => 0,
+                                          "authority" => 0,
+                                          "work" => 1,
+                                          "del_flg" => 0,
+                                          "rank" => 1,
+                                          "create_date" => "now()",
+                                          "update_date" => "now()"));
+
+
     $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
     $objPage->tpl_mainpage = 'complete.tpl';
@@ -941 +944 @@
     }
     //MAGICハッシュワード決定
-    $auth_magic = SC_Utils_Ex::sfGetRandomString(40);
+    if ($_POST['db_skip'] && defined('AUTH_MAGIC')) {
+        $auth_magic = AUTH_MAGIC;
+    } else {
+        $auth_magic = SC_Utils_Ex::sfGetRandomString(40);
+        define('AUTH_MAGIC', $auth_magic);
+    }
+
     $config_data =
     "<?php\n".