Changeset 16275

Timestamp:

2007/10/05 21:36:25 (17 years ago)

Author:

nanasess

Message:

デザイン管理のブロック編集が反映されるよう修正

Location:

branches/feature-module-update/data/class/pages

Files:

• admin/design/LC_Page_Admin_Design_Bloc.php (modified) (4 diffs)
• frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php (modified) (1 diff)
• frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (modified) (2 diffs)
• frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (modified) (1 diff)
• frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php (modified) (1 diff)
• frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (modified) (1 diff)
• frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (modified) (2 diffs)

branches/feature-module-update/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php

@@ -66 +66 @@
         if ($bloc_id != '') {
             $arrBlocData = $this->lfgetBlocData(" bloc_id = ? " , array($bloc_id));
-            $arrBlocData[0]['tpl_path'] = TEMPLATE_DIR . $arrBlocData[0]['tpl_path'];
+
+            // ユーザー作成ブロックが存在する場合
+            if (is_file(USER_PATH . $arrBlocData[0]['tpl_path'])) {
+                $arrBlocData[0]['tpl_path'] = USER_PATH
+                    . $arrBlocData[0]['tpl_path'];
+
+            // 存在しない場合は指定テンプレートのブロックを取得
+            } else {
+                $arrBlocData[0]['tpl_path'] = TEMPLATE_DIR
+                    . $arrBlocData[0]['tpl_path'];
+            }
 
             // テンプレートファイルの読み込み
@@ -113 +123 @@
 
                 // ファイルの削除
-                $del_file=BLOC_PATH . $arrBlocData[0]['filename']. '.tpl';
+                //$del_file=BLOC_PATH . $arrBlocData[0]['filename']. '.tpl';
+                $del_file = USER_PATH . $arrBlocData[0]['tpl_path'];
                 if (file_exists($del_file)) {
                     unlink($del_file);
@@ -119 +130 @@
 
                 // ファイル作成
-                $fp = fopen(BLOC_PATH . $_POST['filename'] . '.tpl',"w");
+                $fp = fopen(USER_PATH . BLOC_DIR . $_POST['filename'] . '.tpl',"w");
                 fwrite($fp, $_POST['bloc_html']); // FIXME
                 fclose($fp);
@@ -180 +191 @@
     function destroy() {
         parent::destroy();
+        $this->p(USER_PATH . BLOC_DIR);
     }
 

branches/feature-module-update/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php

@@ -28 +28 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = BLOC_PATH . 'best5.tpl';
+        $bloc_file = 'best5.tpl';
+        if (is_file(USER_PATH . BLOC_DIR . $bloc_file)) {
+            $this->tpl_mainpage = USER_PATH . BLOC_DIR . $bloc_file;
+        } else {
+            $this->tpl_mainpage = BLOC_PATH . $bloc_file;
+        }
     }
 

branches/feature-module-update/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php

@@ -14 +14 @@
  * @package Page
  * @author LOCKON CO.,LTD.
- * @version $Id$
+ * @version $Id:LC_Page_FrontParts_Bloc_Cart.php 15532 2007-08-31 14:39:46Z nanasess $
  */
 class LC_Page_FrontParts_Bloc_Cart extends LC_Page {
@@ -28 +28 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = BLOC_PATH . 'cart.tpl';
+        $bloc_file = 'cart.tpl';
+        if (is_file(USER_PATH . BLOC_DIR . $bloc_file)) {
+            $this->tpl_mainpage = USER_PATH . BLOC_DIR . $bloc_file;
+        } else {
+            $this->tpl_mainpage = BLOC_PATH . $bloc_file;
+        }
     }
 

branches/feature-module-update/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php

@@ -28 +28 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = BLOC_PATH . 'category.tpl';
+        $bloc_file = 'category.tpl';
+        if (is_file(USER_PATH . BLOC_DIR . $bloc_file)) {
+            $this->tpl_mainpage = USER_PATH . BLOC_DIR . $bloc_file;
+        } else {
+            $this->tpl_mainpage = BLOC_PATH . $bloc_file;
+        }
     }
 

branches/feature-module-update/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php

@@ -28 +28 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = BLOC_PATH . 'login.tpl';
+        $bloc_file = 'login.tpl';
+        if (is_file(USER_PATH . BLOC_DIR . $bloc_file)) {
+            $this->tpl_mainpage = USER_PATH . BLOC_DIR . $bloc_file;
+        } else {
+            $this->tpl_mainpage = BLOC_PATH . $bloc_file;
+        }
         $this->tpl_login = false;
         $this->tpl_disable_logout = false;

branches/feature-module-update/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php

@@ -28 +28 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = BLOC_PATH . 'news.tpl';
+        $bloc_file = 'news.tpl';
+        if (is_file(USER_PATH . BLOC_DIR . $bloc_file)) {
+            $this->tpl_mainpage = USER_PATH . BLOC_DIR . $bloc_file;
+        } else {
+            $this->tpl_mainpage = BLOC_PATH . $bloc_file;
+        }
     }
 

branches/feature-module-update/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php

@@ -14 +14 @@
  * @package Page
  * @author LOCKON CO.,LTD.
- * @version $Id$
+ * @version $Id:LC_Page_FrontParts_Bloc_SearchProducts.php 15532 2007-08-31 14:39:46Z nanasess $
  */
 class LC_Page_FrontParts_Bloc_SearchProducts extends LC_Page {
@@ -28 +28 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = BLOC_PATH . 'search_products.tpl';
+        $bloc_file = 'search_products.tpl';
+        if (is_file(USER_PATH . BLOC_DIR . $bloc_file)) {
+            $this->tpl_mainpage = USER_PATH . BLOC_DIR . $bloc_file;
+        } else {
+            $this->tpl_mainpage = BLOC_PATH . $bloc_file;
+        }
     }