Changeset 19805 for branches/version-2_5-dev/data/class/SC_Initial.php

Timestamp:

2010/12/31 23:23:49 (15 years ago)

Author:

Seasoft

Message:

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

File:

• branches/version-2_5-dev/data/class/SC_Initial.php (modified) (6 diffs)

branches/version-2_5-dev/data/class/SC_Initial.php

@@ -75 +75 @@
         if (defined('ECCUBE_INSTALL')) {
             define('MOBILE_DIR', 'mobile/');
-            define('MOBILE_HTML_FILE_PATH', HTML_FILE_PATH . MOBILE_DIR);
+            define('MOBILE_HTML_REALDIR', HTML_REALDIR . MOBILE_DIR);
             define('MOBILE_HTTP_URL', HTTP_URL . MOBILE_DIR);
             define('MOBILE_HTTPS_URL', HTTPS_URL . MOBILE_DIR);
@@ -81 +81 @@
 
             define('SMARTPHONE_DIR', 'sphone/');
-            define('SMARTPHONE_HTML_FILE_PATH', HTML_FILE_PATH . SMARTPHONE_DIR);
+            define('SMARTPHONE_HTML_REALDIR', HTML_REALDIR . SMARTPHONE_DIR);
             define('SMARTPHONE_HTTP_URL', HTTP_URL . SMARTPHONE_DIR);
             define('SMARTPHONE_HTTPS_URL', HTTPS_URL . SMARTPHONE_DIR);
@@ -190 +190 @@
         $errorMessage = "<div style='color: #F00; font-weight: bold; "
             . "background-color: #FEB; text-align: center'>"
-            . CACHE_FILE_PATH
+            . CACHE_REALDIR
             . " にユーザ書込み権限(777等)を付与して下さい。</div>";
 
         // 定数を設定
-        if (is_file(CACHE_FILE_PATH . "mtb_constants.php")) {
-            require_once(CACHE_FILE_PATH . "mtb_constants.php");
+        if (is_file(CACHE_REALDIR . "mtb_constants.php")) {
+            require_once(CACHE_REALDIR . "mtb_constants.php");
 
             // キャッシュが無ければ, 初期データからコピー
-        } elseif (is_file(CACHE_FILE_PATH . "../mtb_constants_init.php")) {
-
-            $mtb_constants = file_get_contents(CACHE_FILE_PATH . "../mtb_constants_init.php");
-            if (is_writable(CACHE_FILE_PATH)) {
-                $handle = fopen(CACHE_FILE_PATH . "mtb_constants.php", "w");
+        } elseif (is_file(CACHE_REALDIR . "../mtb_constants_init.php")) {
+
+            $mtb_constants = file_get_contents(CACHE_REALDIR . "../mtb_constants_init.php");
+            if (is_writable(CACHE_REALDIR)) {
+                $handle = fopen(CACHE_REALDIR . "mtb_constants.php", "w");
                 if (!$handle) {
                     die($errorMessage);
@@ -211 +211 @@
                 fclose($handle);
 
-                require_once(CACHE_FILE_PATH . "mtb_constants.php");
+                require_once(CACHE_REALDIR . "mtb_constants.php");
             } else {
                 die($errorMessage);
             }
         } else {
-            die(CACHE_FILE_PATH . "../mtb_constants_init.php が存在しません");
+            die(CACHE_REALDIR . "../mtb_constants_init.php が存在しません");
         }
     }
@@ -229 +229 @@
      */
     function createCacheDir() {
-        if (defined("HTML_FILE_PATH")) {
+        if (defined("HTML_REALDIR")) {
             umask(0);
             if (!file_exists(COMPILE_DIR)) {
@@ -235 +235 @@
             }
 
-            if (!file_exists(MOBILE_COMPILE_FILE_PATH)) {
-                mkdir(MOBILE_COMPILE_FILE_PATH);
-            }
-
-            if (!file_exists(SMARTPHONE_COMPILE_FILE_PATH)) {
-                mkdir(SMARTPHONE_COMPILE_FILE_PATH);
-            }
-
-            if (!file_exists(COMPILE_ADMIN_FILE_PATH)) {
-                mkdir(COMPILE_ADMIN_FILE_PATH);
+            if (!file_exists(MOBILE_COMPILE_REALDIR)) {
+                mkdir(MOBILE_COMPILE_REALDIR);
+            }
+
+            if (!file_exists(SMARTPHONE_COMPILE_REALDIR)) {
+                mkdir(SMARTPHONE_COMPILE_REALDIR);
+            }
+
+            if (!file_exists(COMPILE_ADMIN_REALDIR)) {
+                mkdir(COMPILE_ADMIN_REALDIR);
             }
         }