[Svn-src-all:1415] [version-2_5-dev 20306] SC_Viewクラス関連のclass_extends対応。
shutta
admin ＠ mail.ec-cube.net
2011年 2月 21日 (月) 19:26:08 JST
Subversion committed to /home/svn/open 20306
http://svn.ec-cube.net/open_trac/changeset/20306
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-21 19:26:08 +0900 (月, 21 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
SC_Viewクラス関連のclass_extends対応。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_AdminView.php
U branches/version-2_5-dev/data/class/SC_Display.php
U branches/version-2_5-dev/data/class/SC_InstallView.php
U branches/version-2_5-dev/data/class/SC_MobileView.php
U branches/version-2_5-dev/data/class/SC_SiteView.php
U branches/version-2_5-dev/data/class/SC_SmartphoneView.php
U branches/version-2_5-dev/data/class/SC_UserView.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
U branches/version-2_5-dev/data/class/pages/LC_Page_InputZip.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
U branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
U branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php
U branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php
U branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php
U branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss.php
U branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss_Products.php
U branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php
A branches/version-2_5-dev/data/class_extends/SC_AdminView_Ex.php
A branches/version-2_5-dev/data/class_extends/SC_InstallView_Ex.php
A branches/version-2_5-dev/data/class_extends/SC_MobileView_Ex.php
A branches/version-2_5-dev/data/class_extends/SC_SiteView_Ex.php
A branches/version-2_5-dev/data/class_extends/SC_SmartphoneView_Ex.php
A branches/version-2_5-dev/data/class_extends/SC_UserView_Ex.php
A branches/version-2_5-dev/data/class_extends/SC_View_Ex.php
U branches/version-2_5-dev/data/require_classes.php
U branches/version-2_5-dev/html/install/index.php
U branches/version-2_5-dev/html/user_data/__default.php
U branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php
U branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php
U branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_Admin_Plugin_Recommend.php
U branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_FrontParts_Bloc_Recommend.php
変更: branches/version-2_5-dev/data/class/SC_AdminView.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_AdminView.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/SC_AdminView.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-class SC_AdminView extends SC_View {
+class SC_AdminView extends SC_View_Ex {
function SC_AdminView() {
parent::SC_View(false);
$this->_smarty->template_dir = TEMPLATE_ADMIN_REALDIR;
変更: branches/version-2_5-dev/data/class/SC_Display.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Display.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/SC_Display.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -103,16 +103,16 @@
switch ($device){
case DEVICE_TYPE_MOBILE:
$this->response->setContentType("text/html");
- $this->setView(new SC_MobileView());
+ $this->setView(new SC_MobileView_Ex());
break;
case DEVICE_TYPE_SMARTPHONE:
- $this->setView(new SC_SmartphoneView());
+ $this->setView(new SC_SmartphoneView_Ex());
break;
case DEVICE_TYPE_PC:
- $this->setView(new SC_SiteView());
+ $this->setView(new SC_SiteView_Ex());
break;
case DEVICE_TYPE_ADMIN:
- $this->setView(new SC_AdminView());
+ $this->setView(new SC_AdminView_Ex());
}
$this->deviceSeted = true;
}
変更: branches/version-2_5-dev/data/class/SC_InstallView.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_InstallView.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/SC_InstallView.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-class SC_InstallView extends SC_View {
+class SC_InstallView extends SC_View_Ex {
function SC_InstallView($template_dir, $compile_dir = COMPILE_REALDIR) {
parent::SC_View(false);
$this->_smarty->template_dir = $template_dir;
変更: branches/version-2_5-dev/data/class/SC_MobileView.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_MobileView.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/SC_MobileView.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-class SC_MobileView extends SC_SiteView {
+class SC_MobileView extends SC_SiteView_Ex {
function SC_MobileView($setPrevURL = true) {
parent::SC_SiteView($setPrevURL);
$this->_smarty->template_dir = MOBILE_TEMPLATE_REALDIR;
変更: branches/version-2_5-dev/data/class/SC_SiteView.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_SiteView.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/SC_SiteView.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-class SC_SiteView extends SC_View {
+class SC_SiteView extends SC_View_Ex {
function SC_SiteView($setPrevURL = true) {
parent::SC_View();
変更: branches/version-2_5-dev/data/class/SC_SmartphoneView.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_SmartphoneView.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/SC_SmartphoneView.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-class SC_SmartphoneView extends SC_SiteView {
+class SC_SmartphoneView extends SC_SiteView_Ex {
function SC_SmartphoneView($setPrevURL = true) {
parent::SC_SiteView($setPrevURL);
$this->_smarty->template_dir = SMARTPHONE_TEMPLATE_REALDIR;
変更: branches/version-2_5-dev/data/class/SC_UserView.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_UserView.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/SC_UserView.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-class SC_UserView extends SC_SiteView {
+class SC_UserView extends SC_SiteView_Ex {
function SC_UserView($template_dir, $compile_dir = COMPILE_REALDIR) {
parent::SC_SiteView();
$this->_smarty->template_dir = $template_dir;
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -56,7 +56,7 @@
$objSiteInfo = new SC_SiteInfo();
$arrInfo = $objSiteInfo->data;
- $objMailView = new SC_SiteView();
+ $objMailView = new SC_SiteView_Ex();
// メール本文の取得
$objMailView->assignobj($objPage);
$body = $objMailView->fetch($this->arrMAILTPLPATH[$template_id]);
@@ -151,9 +151,9 @@
$arrTplVar->tpl_user_point = $objCustomer->getValue('point');
if(Net_UserAgent_Mobile::isMobile() === true) {
- $objMailView = new SC_MobileView();
+ $objMailView = new SC_MobileView_Ex();
} else {
- $objMailView = new SC_SiteView();
+ $objMailView = new SC_SiteView_Ex();
}
// メール本文の取得
$objMailView->assignobj($arrTplVar);
@@ -182,7 +182,7 @@
// テンプレートを使用したメールの送信
function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage) {
- $objMailView = new SC_SiteView();
+ $objMailView = new SC_SiteView_Ex();
$objSiteInfo = new SC_SiteInfo();
$arrInfo = $objSiteInfo->data;
// メール本文の取得
@@ -219,7 +219,7 @@
//件名にテンプレートを用いる
function sfMakeSubject($subject) {
$objQuery = new SC_Query();
- $objMailView = new SC_SiteView();
+ $objMailView = new SC_SiteView_Ex();
$objTplAssign = new stdClass;
$arrInfo = $objQuery->select("*","dtb_baseinfo");
@@ -286,7 +286,7 @@
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
- $objMailText = new SC_SiteView();
+ $objMailText = new SC_SiteView_Ex();
$objMailText->assign("CONF", $CONF);
$objMailText->assign("name", $arrCustomerData['name01'] . $arrCustomerData['name02']);
$objMailText->assign("uniqid", $arrCustomerData['secret_key']);
変更: branches/version-2_5-dev/data/class/pages/LC_Page_InputZip.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_InputZip.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_InputZip.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -52,7 +52,7 @@
* @return void
*/
function process() {
- $objView = new SC_SiteView(false);
+ $objView = new SC_SiteView_Ex(false);
// 入力エラーチェック
$arrErr = $this->fnErrorCheck($_GET);
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -67,7 +67,7 @@
* @return void
*/
function action() {
- $objView = new SC_AdminView();
+ $objView = new SC_AdminView_Ex();
$this->objLayout = new SC_Helper_PageLayout_Ex();
// 認証可否の判定
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -90,7 +90,7 @@
// uniqidをテンプレートへ埋め込み
$this->uniqid = $objSession->getUniqId();
- $objView = new SC_AdminView();
+ $objView = new SC_AdminView_Ex();
switch($this->getMode()) {
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -100,7 +100,7 @@
function action() {
$objSess = new SC_Session();
$this->objDb = new SC_Helper_DB_Ex();
- $objView = new SC_SiteView();
+ $objView = new SC_SiteView_Ex();
// 認証可否の判定
SC_Utils_Ex::sfIsSuccess($objSess);
変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -210,7 +210,7 @@
function lfSendMail($uniqid, $arrForm){
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
- $objMailText = new SC_SiteView();
+ $objMailText = new SC_SiteView_Ex();
$objMailText->assign("CONF", $CONF);
$objMailText->assign("name01", $arrForm['name01']);
$objMailText->assign("name02", $arrForm['name02']);
変更: branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -278,7 +278,7 @@
*/
function lfSendMail(&$CONF, $email, $customer_name, $new_password){
// パスワード変更お知らせメール送信
- $objMailText = new SC_SiteView(false);
+ $objMailText = new SC_SiteView_Ex(false);
$objMailText->assign('customer_name', $customer_name);
$objMailText->assign('new_password', $new_password);
$toCustomerMail = $objMailText->fetch("mail_templates/forgot_mail.tpl");
変更: branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -51,7 +51,7 @@
* @return void
*/
function process() {
- $objView = new SC_SiteView();
+ $objView = new SC_SiteView_Ex();
$objSess = new SC_Session();
SC_Utils_Ex::sfIsSuccess($objSess);
変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -78,7 +78,7 @@
* @return void
*/
function action() {
- //$objView = new SC_SiteView();
+ //$objView = new SC_SiteView_Ex();
$objQuery = new SC_Query();
if ($_SERVER["REQUEST_METHOD"] == "POST") {
変更: branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -154,7 +154,7 @@
$objCustomer->setLogin($data['email']);
//-- メール送信
- $objMailText = new SC_SiteView();
+ $objMailText = new SC_SiteView_Ex();
$objMailText->assign("CONF", $CONF);
$objMailText->assign("name01", $data["name01"]);
$objMailText->assign("name02", $data["name02"]);
変更: branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -55,7 +55,7 @@
*/
function process() {
$objQuery = SC_Query::getSingletonInstance();
- $objView = new SC_SiteView(false);
+ $objView = new SC_SiteView_Ex(false);
//新着情報を取得
$arrNews = $this->lfGetNews($objQuery);
変更: branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss_Products.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss_Products.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss_Products.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -63,7 +63,7 @@
* @return void
*/
function action() {
- $objView = new SC_SiteView();
+ $objView = new SC_SiteView_Ex();
$objSiteInfo = new SC_SiteInfo();
//店舗情報をセット
変更: branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -126,7 +126,7 @@
foreach ($objRet->data as $product) {
$arrProducts[] = get_object_vars($product);
}
- $objView = new SC_AdminView();
+ $objView = new SC_AdminView_Ex();
$objView->assign('arrProducts', $arrProducts);
$template = 'ownersstore/products_list.tpl';
追加: branches/version-2_5-dev/data/class_extends/SC_AdminView_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_AdminView_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_AdminView_Ex.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_AdminView.php");
+
+class SC_AdminView_Ex extends SC_AdminView {
+}
+
+?>
追加: branches/version-2_5-dev/data/class_extends/SC_InstallView_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_InstallView_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_InstallView_Ex.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_InstallView.php");
+
+class SC_InstallView_Ex extends SC_InstallView {
+}
+
+?>
追加: branches/version-2_5-dev/data/class_extends/SC_MobileView_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_MobileView_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_MobileView_Ex.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_MobileView.php");
+
+class SC_MobileView_Ex extends SC_MobileView {
+}
+
+?>
追加: branches/version-2_5-dev/data/class_extends/SC_SiteView_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_SiteView_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_SiteView_Ex.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_SiteView.php");
+
+class SC_SiteView_Ex extends SC_SiteView {
+}
+
+?>
追加: branches/version-2_5-dev/data/class_extends/SC_SmartphoneView_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_SmartphoneView_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_SmartphoneView_Ex.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_SmartphoneView.php");
+
+class SC_SmartphoneView_Ex extends SC_SmartphoneView {
+}
+
+?>
追加: branches/version-2_5-dev/data/class_extends/SC_UserView_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_UserView_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_UserView_Ex.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_UserView.php");
+
+class SC_UserView_Ex extends SC_UserView {
+}
+
+?>
追加: branches/version-2_5-dev/data/class_extends/SC_View_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/SC_View_Ex.php (rev 0)
+++ branches/version-2_5-dev/data/class_extends/SC_View_Ex.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+require_once(CLASS_REALDIR . "SC_View.php");
+
+class SC_View_Ex extends SC_View {
+}
+
+?>
変更: branches/version-2_5-dev/data/require_classes.php
===================================================================
--- branches/version-2_5-dev/data/require_classes.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/data/require_classes.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -26,13 +26,13 @@
require_once(CLASS_EX_REALDIR . "util_extends/SC_Utils_Ex.php");
require_once(CLASS_EX_REALDIR . "db_extends/SC_DB_MasterData_Ex.php");
require_once(CLASS_EX_REALDIR . "db_extends/SC_DB_DBFactory_Ex.php");
-require_once(CLASS_REALDIR . "SC_View.php");
-require_once(CLASS_REALDIR . "SC_AdminView.php");
-require_once(CLASS_REALDIR . "SC_SiteView.php");
-require_once(CLASS_REALDIR . "SC_UserView.php");
-require_once(CLASS_REALDIR . "SC_InstallView.php");
-require_once(CLASS_REALDIR . "SC_MobileView.php");
-require_once(CLASS_REALDIR . "SC_SmartphoneView.php");
+require_once(CLASS_EX_REALDIR . "SC_View_Ex.php");
+require_once(CLASS_EX_REALDIR . "SC_AdminView_Ex.php");
+require_once(CLASS_EX_REALDIR . "SC_SiteView_Ex.php");
+require_once(CLASS_EX_REALDIR . "SC_UserView_Ex.php");
+require_once(CLASS_EX_REALDIR . "SC_InstallView_Ex.php");
+require_once(CLASS_EX_REALDIR . "SC_MobileView_Ex.php");
+require_once(CLASS_EX_REALDIR . "SC_SmartphoneView_Ex.php");
require_once(CLASS_REALDIR . "SC_Session.php");
require_once(CLASS_REALDIR . "SC_Query.php");
require_once(CLASS_REALDIR . "SC_SelectSql.php");
変更: branches/version-2_5-dev/html/install/index.php
===================================================================
--- branches/version-2_5-dev/html/install/index.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/html/install/index.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -59,7 +59,7 @@
exit;
}
-$objView = new SC_InstallView($ownDir . 'templates', $ownDir . 'temp');
+$objView = new SC_InstallView_Ex($ownDir . 'templates', $ownDir . 'temp');
// パラメータ管理クラス
$objWebParam = new SC_FormParam();
変更: branches/version-2_5-dev/html/user_data/__default.php
===================================================================
--- branches/version-2_5-dev/html/user_data/__default.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/html/user_data/__default.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -26,7 +26,7 @@
* @return void
*/
function process() {
- $objView = new SC_SiteView();
+ $objView = new SC_SiteView_Ex();
// 画面の表示
$objView->assignobj($this);
変更: branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php
===================================================================
--- branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -104,7 +104,7 @@
default:
}
- $objView = new SC_AdminView();
+ $objView = new SC_AdminView_Ex();
$objView->assignobj($this);
$objView->display(MAIN_FRAME);
}
変更: branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php
===================================================================
--- branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/html/user_data/plugins/google_analytics/classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -55,7 +55,7 @@
* @return void
*/
function process() {
- $objView = new SC_SiteView();
+ $objView = new SC_SiteView_Ex();
$objView->assignobj($this);
$objView->display($this->tpl_mainpage);
}
変更: branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_Admin_Plugin_Recommend.php
===================================================================
--- branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_Admin_Plugin_Recommend.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_Admin_Plugin_Recommend.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -57,7 +57,7 @@
// 認証可否の判定
SC_Utils_Ex::sfIsSuccess(new SC_Session());
- $objView = new SC_AdminView();
+ $objView = new SC_AdminView_Ex();
$objView->assignobj($this);
$objView->display(MAIN_FRAME);
}
変更: branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_FrontParts_Bloc_Recommend.php
===================================================================
--- branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_FrontParts_Bloc_Recommend.php 2011-02-21 10:13:22 UTC (rev 20305)
+++ branches/version-2_5-dev/html/user_data/plugins/recommend/classes/LC_Page_FrontParts_Bloc_Recommend.php 2011-02-21 10:26:08 UTC (rev 20306)
@@ -56,7 +56,7 @@
* @return void
*/
function process() {
- $objSubView = new SC_SiteView(false);
+ $objSubView = new SC_SiteView_Ex(false);
$this->arrRecommendProducts = $this->lfGetRecommendProducts($_REQUEST['product_id']);
Svn-src-all メーリングリストの案内