Changeset 15820

Timestamp:

2007/09/21 01:35:20 (17 years ago)

Author:

adachi

Message:

tpl_mainpageを切り替えるように修正

File:

• branches/feature-templates/data/class/SC_View.php (modified) (2 diffs)

branches/feature-templates/data/class/SC_View.php

@@ -255 +255 @@
     }
 
-    function initDisplay($template) {
-        if (empty($this->tplName)) return;
-
-        $tpl_mainpage  = $this->_smarty->get_template_vars('tpl_mainpage');
-        $template_name = $this->tplName;
-
-        // ¥Æ¥ó¥×¥ì¡¼¥È¥Ñ¥Ã¥±¡¼¥¸¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¾ì¹ç
-        if ($template_name) {
-            $template_dir = TPL_PKG_PATH . $template_name . '/templates/admin/';
-
-            // tpl_mainpage¤Èmain_frame.tpl¤¬Î¾Êý¸ºß¤¹¤ë»þ¤Î¤ß¥Æ¥ó¥×¥ì¡¼¥È¥Ñ¥Ã¥±¡¼¥¸¤Ç½ÐÎÏ
-            if (file_exists($template_dir . $tpl_mainpage)
-                && file_exists($template_dir . $template)) {
-echo '<font color="#ffffff">ok</font>';
-                $this->_smarty->template_dir = $template_dir;
-                $this->_smarty->compile_dir  = COMPILE_DIR . "/$template_name";
-            }
-        }
-    }
 }
 
@@ -298 +279 @@
 
         $tpl_mainpage  = $this->_smarty->get_template_vars('tpl_mainpage');
-        $template_name = $this->tplName;
-
-        // ¥Æ¥ó¥×¥ì¡¼¥È¥Ñ¥Ã¥±¡¼¥¸¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¾ì¹ç
-        if ($template_name) {
-            $template_dir = TPL_PKG_PATH . $template_name . '/templates/';
-
-            // tpl_mainpage¤Èsite_frame.tpl¤¬Î¾Êý¸ºß¤¹¤ë»þ¤Î¤ß¥Æ¥ó¥×¥ì¡¼¥È¥Ñ¥Ã¥±¡¼¥¸¤Ç½ÐÎÏ
-            if (
-                (file_exists($template_dir . $tpl_mainpage) || file_exists($tpl_mainpage))
-                && file_exists($template_dir . $template)) {
-echo 'ok';
-                $this->_smarty->template_dir = $template_dir;
-                $this->_smarty->compile_dir  = COMPILE_DIR . "/$template_name";
+        $template_dir = TPL_PKG_PATH . $this->tplName . '/templates/';
+
+        $win = "^[a-zA-Z]{1}:";
+        $other = "^\/";
+        $pattern = "/($win)|($other)/";
+        if (!preg_match($pattern, $tpl_mainpage)) {
+            $tpl_pkg_mainpage = $template_dir . $tpl_mainpage;
+            if (file_exists($tpl_pkg_mainpage)) {
+                $this->assign('tpl_mainpage', $tpl_pkg_mainpage);
             }
         }