Changeset 20723

Timestamp:

2011/03/18 20:30:50 (12 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110318103119-r7ato8e4h2wbznp4

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-20110318113011-pwm5xo8irbv8020z

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110318113046-xys047dg2v4j6jr9

bzr:revno:

3437

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-20110318113011-pwm5xo8irbv8020z

bzr:timestamp:

2011-03-18 20:30:46.707000017 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-18T11:30:46.707000Z

Message:

#841 (管理画面のディレクトリ名をパラメータに)

• 再インストール時, SSL制限, IP制限の値を引き継ぐように修正

File:

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

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

@@ -623 +623 @@
     $oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR);
 
+    if (defined('ADMIN_FORCE_SSL')) {
+        $admin_force_ssl = ADMIN_FORCE_SSL;
+    } else {
+        $admin_force_ssl = '';
+    }
+
+    if (defined('ADMIN_ALLOW_HOSTS')) {
+        $arrAllowHosts = unserialize(ADMIN_ALLOW_HOSTS);
+        $admin_allow_hosts = '';
+        foreach ($arrAllowHosts as $val) {
+            $admin_allow_hosts .= $val . "\n";
+        }
+
+    } else {
+        $admin_allow_hosts = '';
+    }
+
     $objWebParam->addParam("店名", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $shop_name);
     $objWebParam->addParam("管理者：メールアドレス", "admin_mail", MTEXT_LEN, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"), $admin_mail);
@@ -628 +645 @@
     $objWebParam->addParam("管理者：パスワード", "login_pass", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
     $objWebParam->addParam("管理機能：ディレクトリ", "admin_dir", ID_MAX_LEN, "a", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"), $oldAdminDir);
-    $objWebParam->addParam("管理機能：SSL制限", "admin_force_ssl", 1, "n", array("SPTAB_CHECK", "NUM_CHECK","MAX_LENGTH_CHECK"));
-    $objWebParam->addParam("管理機能：IP制限", "admin_allow_hosts", LTEXT_LEN, "an", array("IP_CHECK","MAX_LENGTH_CHECK"));
+    $objWebParam->addParam("管理機能：SSL制限", "admin_force_ssl", 1, "n", array("SPTAB_CHECK", "NUM_CHECK","MAX_LENGTH_CHECK"), $admin_force_ssl);
+    $objWebParam->addParam("管理機能：IP制限", "admin_allow_hosts", LTEXT_LEN, "an", array("IP_CHECK","MAX_LENGTH_CHECK"), $admin_allow_hosts);
     $objWebParam->addParam("URL(通常)", "normal_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $normal_url);
     $objWebParam->addParam("URL(セキュア)", "secure_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $secure_url);