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

Timestamp:

2011/01/08 06:19:28 (13 years ago)

Author:

tao

Message:

refs #841 shopマスタでの変更機能を追加。あと凡ミスも修正。

File:

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

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

@@ -656 +656 @@
     //管理画面のディレクトリ名を取得（再インストール時）
     if(defined("ADMIN_DIR")){
-        $admin_dir = ADMIN_DIR;
+        $admin_dir = str_replace("/","",ADMIN_DIR);
     }
 
@@ -737 +737 @@
     // パスワードのチェック
     $objErr->doFunc( array("管理者：パスワード",'login_pass',ID_MIN_LEN , ID_MAX_LEN ) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK" ));
-
-    // 管理画面ディレクトリ名のチェック
-    $objErr->doFunc( array("管理画面：ディレクトリ",'admin_dir',ID_MIN_LEN , ID_MAX_LEN ) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK" ));
 
     return $objErr->arrErr;
@@ -924 +921 @@
     $force_ssl = FALSE;
     if($objWebParam->getValue('admin_force_ssl') == 1){
-        $force_ssl = TRUE;
+        $force_ssl = "TRUE";
+    }else{
+        $force_ssl = "FALSE";
     }
     //管理画面IP制限
@@ -931 +930 @@
     if(!empty($hosts)){
         $hosts = str_replace("\r","",$hosts);
-        if(strpos("\n",$hosts) === false){
+        if(strpos($hosts,"\n") === false){
             $hosts .= "\n";
         }
@@ -956 +955 @@
     "    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
     "    define ('ADMIN_DIR', '" . $objWebParam->getValue('admin_dir') .  "/');\n" .
-    "    define ('ADMIN_FORCE_SSL', " . $force_ssl .  ");\n";
-    if(count($allow_hosts) > 0){
-        $config_data .= "    define ('ADMIN_ALLOW_HOSTS', '".serialize($allow_hosts)."');\n";
-    }
-    $config_data .= "?>";
+    "    define ('ADMIN_FORCE_SSL', " . $force_ssl .  ");\n".
+    "    define ('ADMIN_ALLOW_HOSTS', '".serialize($allow_hosts)."');\n".
+    "?>";
 
     if($fp = fopen($filepath,"w")) {