Changeset 20459 for branches/version-2_5-dev/data/class/SC_View.php

Timestamp:

2011/03/02 13:55:04 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20458

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/abouts/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fabouts%2Findex.tpl
data/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php
data/class/pages/LC_Page.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page.php
data/class/pages/abouts/LC_Page_Abouts.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fabouts%2FLC_Page_Abouts.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 17073@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Calendar.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Cart.php
data/class/pages/rss/LC_Page_Rss_Products.php 16193@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Frss%2FLC_Page_Rss_Products.php
data/require_classes.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_classes.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110302045448-fb8y0kp3tbqnr6lt

bzr:revno:

3186

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/abouts/index.tpl ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/SC_View.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/pages/LC_Page.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/pages/abouts/LC_Page_Abouts.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/class/pages/rss/LC_Page_Rss_Products.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h
data/require_classes.php ohkouchi@loop-az.jp-20110302045234-il10jugwj4mjz27h

bzr:timestamp:

2011-03-02 13:54:48.059999943 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-02T04:54:48.060000Z

Message:

#997(冗長な dtb_baseinfo の取得)

• SC_View のコンストラクタで取得していたのを LC_Page へ移動

#793 (非推奨機能の削除)

• SC_SiteInfo クラスの削除

File:

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

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

@@ -22 +22 @@
  */
 
-$viewDir = realpath(dirname(__FILE__)) . '/'; // XXX グローバル変数として流用あり
-require_once $viewDir . '../module/Smarty/libs/Smarty.class.php';
+require_once realpath(dirname(__FILE__)) . '/../module/Smarty/libs/Smarty.class.php';
 
 class SC_View {
 
     var $_smarty;
-    var $objSiteInfo; // サイト情報
 
     // コンストラクタ
     function SC_View($siteinfo = true) {
-        global $viewDir;
 
         $this->_smarty = new Smarty;
@@ -51 +48 @@
         $this->_smarty->register_modifier("sfRmDupSlash", array("SC_Utils_Ex", "sfRmDupSlash"));
         $this->_smarty->register_modifier("sfCutString", array("SC_Utils_Ex", "sfCutString"));
-        $this->_smarty->plugins_dir=array("plugins", $viewDir . "../smarty_extends");
+        $this->_smarty->plugins_dir=array("plugins", realpath(dirname(__FILE__)) . "/../smarty_extends");
         $this->_smarty->register_modifier("sfMbConvertEncoding", array("SC_Utils_Ex", "sfMbConvertEncoding"));
         $this->_smarty->register_modifier("sfGetEnabled", array("SC_Utils_Ex", "sfGetEnabled"));
@@ -63 +60 @@
         if(ADMIN_MODE == '1') {
             $this->time_start = SC_Utils_Ex::sfMicrotimeFloat();
-        }
-
-        // サイト情報を取得する
-        // XXX LC_Page 配下で取得した方が良い
-        if($siteinfo) {
-            if(!defined('LOAD_SITEINFO')) {
-                $this->objSiteInfo = new SC_SiteInfo();
-                $arrInfo['arrSiteInfo'] = $this->objSiteInfo->data;
-
-                // 都道府県名を変換
-                $masterData = new SC_DB_MasterData_Ex();
-                $arrPref = $masterData->getMasterData('mtb_pref');
-                $arrInfo['arrSiteInfo']['pref'] =
-                    isset($arrPref[$arrInfo['arrSiteInfo']['pref']])
-                    ? $arrPref[$arrInfo['arrSiteInfo']['pref']] : "";
-
-                 // サイト情報を割り当てる
-                foreach ($arrInfo as $key => $value){
-                    $this->_smarty->assign($key, $value);
-                }
-
-                define('LOAD_SITEINFO', 1);
-            }
         }
     }
@@ -161 +135 @@
     /* サイト初期設定 */
     function initpath() {
-        global $viewDir;
 
-        $array['tpl_mainnavi'] = $viewDir . '../Smarty/templates/frontparts/mainnavi.tpl';
+        $array['tpl_mainnavi'] = realpath(dirname(__FILE__)) . '/../Smarty/templates/frontparts/mainnavi.tpl';
 
         $objDb = new SC_Helper_DB_Ex();