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

Timestamp:

2010/12/31 10:46:42 (13 years ago)

Author:

Seasoft

Message:

#834(パラメータの定数名に「URL」を含むにもかかわらず、パスのみのものがある) 一部改修

File:

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

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

@@ -23 +23 @@
 // ▼require.php 相当
 // rtrim は PHP バージョン依存対策
-define('HTML_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
-
-require_once HTML_PATH . 'define.php';
+define('HTML_FILE_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
+
+require_once HTML_FILE_PATH . 'define.php';
 define('INSTALL_FUNCTION', true);
-require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+require_once HTML_FILE_PATH . HTML2DATA_DIR . 'require_base.php';
 // ▲require.php 相当
 
 $INSTALL_DIR = realpath(dirname( __FILE__));
-require_once(DATA_PATH . "module/Request.php");
+require_once(DATA_FILE_PATH . "module/Request.php");
 
 define("INSTALL_LOG", "./temp/install.log");
@@ -389 +389 @@
     // プログラムで書込みされるファイル・ディレクトリ
     $arrWriteFile = array(
-        DATA_PATH . "install.php",
+        DATA_FILE_PATH . "install.php",
         USER_PATH,
-        HTML_PATH . "upload",
-        DATA_PATH . "cache/",
-        DATA_PATH . "class/",
-        DATA_PATH . "Smarty/",
-        DATA_PATH . "logs/",
-        DATA_PATH . "downloads/",
-        DATA_PATH . "upload/",
+        HTML_FILE_PATH . "upload",
+        DATA_FILE_PATH . "cache/",
+        DATA_FILE_PATH . "class/",
+        DATA_FILE_PATH . "Smarty/",
+        DATA_FILE_PATH . "logs/",
+        DATA_FILE_PATH . "downloads/",
+        DATA_FILE_PATH . "upload/",
     );
 
@@ -457 +457 @@
         $objPage->tpl_mode = 'step0';
         umask(0);
-        $path = HTML_PATH . "upload/temp_template";
+        $path = HTML_FILE_PATH . "upload/temp_template";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/save_image";
+        $path = HTML_FILE_PATH . "upload/save_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/temp_image";
+        $path = HTML_FILE_PATH . "upload/temp_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/graph_image";
+        $path = HTML_FILE_PATH . "upload/graph_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/mobile_image";
+        $path = HTML_FILE_PATH . "upload/mobile_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "downloads/module";
+        $path = DATA_FILE_PATH . "downloads/module";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "downloads/update";
+        $path = DATA_FILE_PATH . "downloads/update";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "upload/csv";
+        $path = DATA_FILE_PATH . "upload/csv";
         if(!file_exists($path)) {
             mkdir($path);
@@ -513 +513 @@
     // ファイルコピー
     $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./user_data/", USER_PATH, $objPage->copy_mess);
-    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./save_image/", HTML_PATH . "upload/save_image/", $objPage->copy_mess);
+    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./save_image/", HTML_FILE_PATH . "upload/save_image/", $objPage->copy_mess);
     return $objPage;
 }
@@ -620 +620 @@
     global $objDb;
 
-    if(defined('SITE_URL')) {
-        $normal_url = SITE_URL;
+    if(defined('HTTP_URL')) {
+        $normal_url = HTTP_URL;
     } else {
         $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
@@ -627 +627 @@
     }
 
-    if(defined('SSL_URL')) {
-        $secure_url = SSL_URL;
+    if(defined('HTTPS_URL')) {
+        $secure_url = HTTPS_URL;
     } else {
         $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
@@ -900 +900 @@
     $url_dir = ereg_replace("^https?://[a-zA-Z0-9_:~=&\?\.\-]+", "", $normal_url);
 
-    $filepath = DATA_PATH . "install.php";
+    $filepath = DATA_FILE_PATH . "install.php";
 
     $config_data =
     "<?php\n".
     "    define ('ECCUBE_INSTALL', 'ON');\n" .
-    "    define ('SITE_URL', '" . $normal_url . "');\n" .
-    "    define ('SSL_URL', '" . $secure_url . "');\n" .
-    "    define ('URL_DIR', '" . $url_dir . "');\n" .
+    "    define ('HTTP_URL', '" . $normal_url . "');\n" .
+    "    define ('HTTPS_URL', '" . $secure_url . "');\n" .
+    "    define ('URL_PATH', '" . $url_dir . "');\n" .
     "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
     "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .