Changeset 19802 for branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php

Timestamp:

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

Author:

Seasoft

Message:

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

File:

• branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php (modified) (8 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php

@@ -51 +51 @@
         // 現在のURLの取得
         if ($preview === false) {
-            $url = preg_replace('|^' . preg_quote(URL_DIR) . '|', '', $url);
+            $url = preg_replace('|^' . preg_quote(URL_PATH) . '|', '', $url);
 
             // URLを元にページデザインを取得
@@ -137 +137 @@
                 if ($target_id == $val['target_id'] ) {
                     if ($val['php_path'] != '') {
-                        $arrNavi[$key]['php_path'] = HTML_PATH . $val['php_path'];
+                        $arrNavi[$key]['php_path'] = HTML_FILE_PATH . $val['php_path'];
                     } else {
                         $arrNavi[$key]['tpl_path'] = $this->getTemplatePath($device_type_id) . BLOC_DIR . $val['tpl_path'];
@@ -202 +202 @@
     function lfDelFile($arrData) {
         // ファイルディレクトリ取得
-        $del_php = HTML_PATH . $arrData['php_dir'] . $arrData['filename'] . ".php";
-        $del_tpl = HTML_PATH . $arrData['tpl_dir'] . $arrData['filename'] . ".tpl";
+        $del_php = HTML_FILE_PATH . $arrData['php_dir'] . $arrData['filename'] . ".php";
+        $del_tpl = HTML_FILE_PATH . $arrData['tpl_dir'] . $arrData['filename'] . ".tpl";
 
         // phpファイルの削除
@@ -248 +248 @@
         case DEVICE_TYPE_MOBILE:
             $dir = MOBILE_TEMPLATE_DIR;
-            $userPath = HTML_PATH . MOBILE_DIR . USER_DIR;
+            $userPath = HTML_FILE_PATH . MOBILE_DIR . USER_DIR;
             $templateName = MOBILE_TEMPLATE_NAME;
             break;
@@ -254 +254 @@
         case DEVICE_TYPE_SMARTPHONE:
             $dir = SMARTPHONE_TEMPLATE_DIR;
-            $userPath = HTML_PATH . SMARTPHONE_DIR . USER_DIR;
+            $userPath = HTML_FILE_PATH . SMARTPHONE_DIR . USER_DIR;
             $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
@@ -279 +279 @@
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
-            return HTML_PATH . MOBILE_DIR . USER_DIR;
+            return HTML_FILE_PATH . MOBILE_DIR . USER_DIR;
             break;
 
         case DEVICE_TYPE_SMARTPHONE:
-            return HTML_PATH . SMARTPHONE_DIR . USER_DIR;
+            return HTML_FILE_PATH . SMARTPHONE_DIR . USER_DIR;
             break;
 
@@ -305 +305 @@
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
-            $userDir = URL_DIR . MOBILE_DIR . USER_DIR;
+            $userDir = URL_PATH . MOBILE_DIR . USER_DIR;
             $templateName = MOBILE_TEMPLATE_NAME;
             break;
 
         case DEVICE_TYPE_SMARTPHONE:
-            $userDir = URL_DIR . SMARTPHONE_DIR . USER_DIR;
+            $userDir = URL_PATH . SMARTPHONE_DIR . USER_DIR;
             $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
@@ -316 +316 @@
         case DEVICE_TYPE_PC:
         default:
-            $userDir = URL_DIR . USER_DIR;
+            $userDir = URL_PATH . USER_DIR;
             $templateName = TEMPLATE_NAME;
         }