[Svn-src-all:1541] [version-2_5-dev 20437] #793 (非推奨機能の削除)
nanasess
admin ＠ mail.ec-cube.net
2011年 2月 28日 (月) 13:39:01 JST
Subversion committed to /home/svn/open 20437
http://svn.ec-cube.net/open_trac/changeset/20437
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2011-02-28 13:39:01 +0900 (月, 28 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#793 (非推奨機能の削除)
* キャンペーン関連の残存ファイルを削除
* トラックバック関連の残存ファイルを削除
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
D branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/contact/complete.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/entry/complete.tpl
D branches/version-2_5-dev/data/Smarty/templates/default/user_data/
U branches/version-2_5-dev/data/Smarty/templates/sphone/contact/complete.tpl
U branches/version-2_5-dev/data/Smarty/templates/sphone/entry/complete.tpl
D branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php
U branches/version-2_5-dev/data/class/util/SC_Utils.php
D branches/version-2_5-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Control_Ex.php
U branches/version-2_5-dev/data/require_classes.php
D branches/version-2_5-dev/html/admin/basis/control.php
D branches/version-2_5-dev/html/user_data/include/campaign/
削除: branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl 2011-02-28 04:39:01 UTC (rev 20437)
@@ -1,53 +0,0 @@
-<!--{*
-/*
- * 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.
- */
-*}-->
-<div id="basis" class="contents-main">
- <table class="list">
- <colgroup width="80%">
- <colgroup width="10%">
- <colgroup width="10%">
- <tr>
- <th>管理タイトル/管理内容</th>
- <th>選択項目</th>
- <th class="edit">編集</th>
- </tr>
- <!--{section name=cnt loop=$arrControlList}-->
- <tr>
- <td><strong><!--{$arrControlList[cnt].control_title|h}--></strong><br /><!--{$arrControlList[cnt].control_text|h}--></td>
- <td align="center">
- <form name="form<!--{$smarty.section.cnt.index}-->" id="form<!--{$smarty.section.cnt.index}-->" method="post" action="?">
- <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
- <input type="hidden" name="mode" value="edit" />
- <input type="hidden" name="control_id" value="<!--{$arrControlList[cnt].control_id}-->" />
- <select name="control_flg" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
- <!--{html_options options=$arrControlList[cnt].control_area selected=$arrControlList[cnt].control_flg.value}-->
- </select>
- </form>
- </td>
- <td class="menu">
- <a href="javascript:;" onclick="document.form<!--{$smarty.section.cnt.index}-->.submit(); return false;">編集</a>
- </td>
- </tr>
- <!--{/section}-->
- </table>
-</div>
変更: branches/version-2_5-dev/data/Smarty/templates/default/contact/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/contact/complete.tpl 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/Smarty/templates/default/contact/complete.tpl 2011-02-28 04:39:01 UTC (rev 20437)
@@ -40,15 +40,9 @@
<div class="btn_area">
<ul>
<li>
- <!--{if $is_campaign}-->
- <a href="<!--{$smarty.const.CAMPAIGN_URL}--><!--{$campaign_dir}-->/<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" border="0" name="b_toppage" id="b_toppage" /></a>
- </li>
- <!--{else}-->
- <li>
<a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" border="0" name="b_toppage" id="b_toppage" /></a>
</li>
</ul>
- <!--{/if}-->
</div>
</div>
</div>
変更: branches/version-2_5-dev/data/Smarty/templates/default/entry/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/entry/complete.tpl 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/Smarty/templates/default/entry/complete.tpl 2011-02-28 04:39:01 UTC (rev 20437)
@@ -39,14 +39,8 @@
<div class="btn_area">
<ul>
- <!--{if $is_campaign}-->
<li>
- <a href="<!--{$smarty.const.SHOPPING_URL}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" border="0" name="b_toppage" /></a>
- </li>
- <li>
- <!--{else}-->
<a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" border="0" name="b_toppage" /></a>
- <!--{/if}-->
</li>
</ul>
</div>
変更: branches/version-2_5-dev/data/Smarty/templates/sphone/contact/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/contact/complete.tpl 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/contact/complete.tpl 2011-02-28 04:39:01 UTC (rev 20437)
@@ -35,13 +35,7 @@
E-mail：<a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->"><!--{$arrSiteInfo.email02|escape:'hexentity'}--></a></p>
</div>
<div class="tblareabtn">
- <!--{if $is_campaign}-->
- <a href="<!--{$smarty.const.CAMPAIGN_URL}--><!--{$campaign_dir}-->/<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" id="b_toppage" /></a>
-
- <!--{else}-->
-
<a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" id="b_toppage" /></a>
- <!--{/if}-->
</div>
</div>
</div>
変更: branches/version-2_5-dev/data/Smarty/templates/sphone/entry/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/entry/complete.tpl 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/entry/complete.tpl 2011-02-28 04:39:01 UTC (rev 20437)
@@ -35,11 +35,7 @@
</p>
<div class="tblareabtn">
- <!--{if $is_campaign}-->
- <a href="<!--{$smarty.const.SHOPPING_URL}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
- <!--{else}-->
<a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
- <!--{/if}-->
</div>
</div>
</div>
削除: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php 2011-02-28 04:39:01 UTC (rev 20437)
@@ -1,159 +0,0 @@
-<?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.
- */
-
-// {{{ requires
-require_once(CLASS_EX_REALDIR . "page_extends/admin/LC_Page_Admin_Ex.php");
-
-/**
- * サイト管理設定 のページクラス.
- *
- * @package Page
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class LC_Page_Admin_Basis_Control extends LC_Page_Admin_Ex {
-
- // }}}
- // {{{ functions
-
- /**
- * Page を初期化する.
- *
- * @return void
- */
- function init() {
- parent::init();
- $this->tpl_mainpage = 'basis/control.tpl';
- $this->tpl_subnavi = 'basis/subnavi.tpl';
- $this->tpl_mainno = 'basis';
- $this->tpl_subno = 'control';
- $this->tpl_subtitle = 'サイト管理設定';
- }
-
- /**
- * Page のプロセス.
- *
- * @return void
- */
- function process() {
- $this->action();
- $this->sendResponse();
- }
-
- /**
- * Page のアクション.
- *
- * @return void
- */
- function action() {
-
- $objFormParam = new SC_FormParam();
- $this->lfInitParam($objFormParam);
- $objFormParam->setParam($_POST);
-
- switch($this->getMode()) {
- case 'edit':
- // 入力値の変換
- $objFormParam->convParam();
-
- // エラーチェック
- $this->arrErr = $objFormParam->checkError();
- if(count($this->arrErr) == 0) {
- $this->lfSiteControlData($objFormParam->getHashArray());
- // javascript実行
- $this->tpl_onload = "alert('更新が完了しました。');";
- }
-
- break;
- default:
- break;
- }
-
- $this->arrControlList = $arrSiteControlList;
- }
-
- function lfGetControlList() {
- // サイト管理情報の取得
- $arrSiteControlList = $this->lfGetControlList();
- $masterData = new SC_DB_MasterData_Ex();
-
- // プルダウンの作成
- for ($i = 0; $i < count($arrSiteControlList); $i++) {
- switch ($arrSiteControlList[$i]["control_id"]) {
- // アフィリエイト
- case SITE_CONTROL_AFFILIATE:
- $arrSiteControlList[$i]["control_area"]
- = $masterData->getMasterData("mtb_site_control_affiliate");
- break;
- default:
- break;
- }
- }
- return $arrSiteControlList;
- }
-
- /**
- * デストラクタ.
- *
- * @return void
- */
- function destroy() {
- parent::destroy();
- }
-
- // サイト管理情報の取得
- function lfGetControlList() {
- $objQuery =& SC_Query::getSingletonInstance();
- // サイト管理情報の取得
- $sql = "SELECT * FROM dtb_site_control ";
- $sql .= "WHERE del_flg = 0";
- $arrRet = $objQuery->getAll($sql);
- return $arrRet;
- }
-
- /* パラメータ情報の初期化 */
- function lfInitParam(&$objFormParam) {
- $objFormParam->addParam("設定状況", "control_flg", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
- $objFormParam->addParam('コントロールID', 'control_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
- }
-
- /* DBへデータを登録する */
- function lfSiteControlData($post) {
- $objQuery =& SC_Query::getSingletonInstance();
- $sqlval = $post;
- $sqlval['update_date'] = 'Now()';
-
- // 新規登録
- if($post['control_id'] == "") {
- // INSERTの実行
- $sqlval['create_date'] = 'Now()';
- $objQuery->nextVal("dtb_site_control_control_id");
- $objQuery->insert("dtb_site_control", $sqlval);
- // 既存編集
- } else {
- $where = "control_id = ?";
- $objQuery->update("dtb_site_control", $sqlval, $where, array($post['control_id']));
- }
- }
-}
-?>
変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-28 04:39:01 UTC (rev 20437)
@@ -183,7 +183,6 @@
/* サイトエラーページの表示 */
function sfDispSiteError($type, $objSiteSess = "", $return_top = false, $err_msg = "") {
- global $objCampaignSess;
require_once(CLASS_EX_REALDIR . "page_extends/error/LC_Page_Error_Ex.php");
削除: branches/version-2_5-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Control_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Control_Ex.php 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Control_Ex.php 2011-02-28 04:39:01 UTC (rev 20437)
@@ -1,68 +0,0 @@
-<?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.
- */
-
-// {{{ requires
-require_once(CLASS_REALDIR . "pages/admin/basis/LC_Page_Admin_Basis_Control.php");
-
-/**
- * サイト管理設定 のページクラス(拡張).
- *
- * LC_Page_Admin_Basis_Control をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Page
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class LC_Page_Admin_Basis_Control_Ex extends LC_Page_Admin_Basis_Control {
-
- // }}}
- // {{{ functions
-
- /**
- * Page を初期化する.
- *
- * @return void
- */
- function init() {
- parent::init();
- }
-
- /**
- * Page のプロセス.
- *
- * @return void
- */
- function process() {
- parent::process();
- }
-
- /**
- * デストラクタ.
- *
- * @return void
- */
- function destroy() {
- parent::destroy();
- }
-}
-?>
変更: branches/version-2_5-dev/data/require_classes.php
===================================================================
--- branches/version-2_5-dev/data/require_classes.php 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/data/require_classes.php 2011-02-28 04:39:01 UTC (rev 20437)
@@ -45,7 +45,6 @@
require_once(CLASS_REALDIR . "SC_FormParam.php");
require_once(CLASS_REALDIR . "SC_CartSession.php");
require_once(CLASS_REALDIR . "SC_SiteSession.php");
-require_once(CLASS_REALDIR . "SC_CampaignSession.php");
require_once(CLASS_REALDIR . "SC_Customer.php");
require_once(CLASS_REALDIR . "SC_CustomerList.php");
require_once(CLASS_REALDIR . "SC_Cookie.php");
削除: branches/version-2_5-dev/html/admin/basis/control.php
===================================================================
--- branches/version-2_5-dev/html/admin/basis/control.php 2011-02-28 03:47:39 UTC (rev 20436)
+++ branches/version-2_5-dev/html/admin/basis/control.php 2011-02-28 04:39:01 UTC (rev 20437)
@@ -1,35 +0,0 @@
-<?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.
- */
-
-// {{{ requires
-require_once '../require.php';
-require_once CLASS_EX_REALDIR . 'page_extends/admin/basis/LC_Page_Admin_Basis_Control_Ex.php';
-
-// }}}
-// {{{ generate page
-
-$objPage = new LC_Page_Admin_Basis_Control_Ex();
-register_shutdown_function(array($objPage, 'destroy'));
-$objPage->init();
-$objPage->process();
-?>
Svn-src-all メーリングリストの案内