[Svn-src-all:1380] [version-2_5-dev 20270] refs #793 #970 #982
shutta
admin ＠ mail.ec-cube.net
2011年 2月 20日 (日) 21:21:33 JST
Subversion committed to /home/svn/open 20270
http://svn.ec-cube.net/open_trac/changeset/20270
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-20 21:21:33 +0900 (日, 20 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
refs #793 #970 #982
トラックバック機能の削除
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
D branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl
D branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
U branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
D branches/version-2_5-dev/data/class/pages/tb/
D branches/version-2_5-dev/data/class_extends/page_extends/tb/
D branches/version-2_5-dev/html/tb/
U branches/version-2_5-dev/html/user_data/packages/default/css/products.css
削除: branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl 2011-02-20 12:02:15 UTC (rev 20269)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl 2011-02-20 12:21:33 UTC (rev 20270)
@@ -1,162 +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="products" class="contents-main">
-<form name="search_form" method="post" action="?" >
-<input type="hidden" name="mode" value="search" />
- <h2>検索条件設定</h2>
-
- <!--検索条件設定テーブルここから-->
- <table class="form">
- <tr>
- <th>ブログ名</th>
- <td><input type="text" name="search_blog_name" value="<!--{$arrForm.search_blog_name|h}-->" size="30" class="box30" /></td>
- <th>ブログ記事タイトル</th>
- <td><input type="text" name="search_blog_title" value="<!--{$arrForm.search_blog_title|h}-->" size="30" class="box30" /></td>
- </tr>
- <tr>
- <th>URL</th>
- <td><input type="text" name="search_blog_url" value="<!--{$arrForm.search_blog_url|h}-->" size="30" class="box30" /></td>
- <th>状態</th>
- <td>
- <select name="search_status" style="<!--{$arrErr.search_status|sfGetErrorColor}-->">
- <option value="">----</option>
- <!--{html_options options=$arrTrackBackStatus selected=$arrForm.search_status}-->
- </select>
- </td>
- </tr>
- <tr>
- <th>商品名</th>
- <td><input type="text" name="search_name" value="<!--{$arrForm.search_name|h}-->" size="30" class="box30" /></td>
- <th>商品コード</th>
- <td><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code|h}-->" size="30" class="box30" /></td>
- </tr>
- <tr>
- <th>投稿日</th>
- <td colspan="3">
- <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
- <span class="attention"><!--{$arrErr.search_startyear}--></span>
- <span class="attention"><!--{$arrErr.search_endyear}--></span>
- <!--{/if}-->
- <select name="search_startyear" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
- <option value="">----</option>
- <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear}-->
- </select>年
- <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
- <option value="">--</option>
- <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth}-->
- </select>月
- <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
- <option value="">--</option>
- <!--{html_options options=$arrStartDay selected=$arrForm.search_startday}-->
- </select>日〜
- <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
- <option value="">----</option>
- <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear}-->
- </select>年
- <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
- <option value="">--</option>
- <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth}-->
- </select>月
- <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
- <option value="">--</option>
- <!--{html_options options=$arrEndDay selected=$arrForm.search_endday}-->
- </select>日
- </td>
- </tr>
- </table>
-
- <div class="btn">
- <p class="page_rows">検索結果表示件数
- <!--{assign var=key value="search_page_max"}-->
- <!--{if $arrErr[$key]}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <!--{/if}-->
- <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
- <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
- </select> 件</p>
- <div class="btn-area">
- <ul>
- <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', ''); return false;"><span class="btn-next">この条件で検索する</span></a></li>
- </ul>
- </div>
- </div>
- <!--検索条件設定テーブルここまで-->
-</form>
-
-
-<!--{if $smarty.post.mode == 'search'}-->
-
-<!--★★検索結果一覧★★-->
-<form name="form1" id="form1" method="post" action="?">
- <input type="hidden" name="mode" value="search" />
- <input type="hidden" name="trackback_id" value="" />
- <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
- <!--{foreach key=key item=item from=$arrHidden}-->
- <!--{if $key ne "search_pageno"}-->
- <input type="hidden" name="<!--{$key}-->" value="<!--{$item}-->" />
- <!--{/if}-->
- <!--{/foreach}-->
-
- <h2>検索結果一覧</h2>
- <div class="btn">
- <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span> が該当しました。
- <!--{if $smarty.const.ADMIN_MODE == '1'}-->
- <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('delete_all','',''); return false;"><span>検索結果をすべて削除</span></a>
- <!--{/if}-->
- <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('csv','',''); return false;" ><span>CSV ダウンロード</span></a>
- </div>
- <!--{if $arrTrackback > 0 & $tpl_linemax > 0}-->
-
- <!--{include file=$tpl_pager}-->
-
- <!--{* 検索結果表示テーブル *}-->
- <table class="list" id="products-trackback-result">
- <tr>
- <th>投稿日</th>
- <th>商品名</th>
- <th>ブログ名</th>
- <th>ブログ記事タイトル</th>
- <th>状態</th>
- <th class="edit">編集</th>
- <th class="delete">削除</th>
- </tr>
-
- <!--{section name=cnt loop=$arrTrackback}-->
- <tr>
- <td><!--{$arrTrackback[cnt].create_date|sfDispDBDate}--></td>
- <td><!--{$arrTrackback[cnt].name|h}--></td>
- <td><a href="<!--{$arrTrackback[cnt].url|h}-->"><!--{$arrTrackback[cnt].blog_name|h}--></a></td>
- <td><!--{$arrTrackback[cnt].title|h}--></td>
- <td><!--{if $arrTrackback[cnt].status eq 1}-->表示<!--{elseif $arrTrackback[cnt].status eq 2}-->非表示<!--{elseif $arrTrackback[cnt].status eq 3}-->スパム<!--{/if}--></td>
- <td><a class="btn-normal" href="javascript:;" onclick="fnChangeAction('./trackback_edit.php'); fnModeSubmit('','trackback_id','<!--{$arrTrackback[cnt].trackback_id}-->'); return false;"><span>編集</span></a></td>
- <td><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('delete','trackback_id','<!--{$arrTrackback[cnt].trackback_id}-->'); return false;"><span>削除</span></a></td>
- </tr>
- <!--{/section}-->
- </table>
- <!--{* 検索結果表示テーブル *}-->
- <!--{/if}-->
-</form>
-<!--{/if}-->
-<!--★★検索結果一覧★★-->
-</div>
削除: branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl 2011-02-20 12:02:15 UTC (rev 20269)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl 2011-02-20 12:21:33 UTC (rev 20270)
@@ -1,84 +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.
- */
-*}-->
-?<form name="form1" id="form1" method="post" action="?" >
-<input type="hidden" name="mode" value="complete" />
-<!--{foreach key=key item=item from=$arrTrackback}-->
-<!--{if $key ne "mode"}-->
-<input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
-<!--{/if}-->
-<!--{/foreach}-->
-<!--{foreach key=key item=item from=$arrSearchHidden}-->
-<input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
-<!--{/foreach}-->
-
-<div id="products" class="contents-main">
- <h2>トラックバック設定</h2>
-
-<!--▼編集テーブルここから-->
-<table>
- <tr>
- <th>商品名</th>
- <td><!--{$arrTrackback.name|h}--></td>
- </tr>
- <tr>
- <th>ブログ名</th>
- <td><!--{$arrTrackback.blog_name|h}--></td>
- </tr>
- <tr>
- <th>ブログ記事タイトル</th>
- <td><!--{$arrTrackback.title|h}--></td>
- </tr>
- <tr>
- <th>ブログ記事内容</th>
- <td><!--{$arrTrackback.excerpt|h}--></td>
- </tr>
- <tr>
- <th>ブログURL</th>
- <td><!--{$arrTrackback.url|h}--></td>
- </tr>
- <tr>
- <th>投稿日</th>
- <td><!--{$arrTrackback.create_date|sfDispDBDate}--></td>
- </tr>
- <tr>
- <th>状態</th>
- <td>
- <!--{assign var=key value="status"}-->
- <span class="attention"><!--{$arrErr.status}--></span>
- <select name="<!--{$key}-->" style="<!--{$arrErr.status|sfGetErrorColor}-->" >
- <option value="">選択してください</option>
- <!--{html_options options=$arrTrackBackStatus selected=$arrTrackback[$key]}-->
- </select>
- </td>
- </tr>
-</table>
-<!--▲編集テーブルここまで-->
- <div class="btn-area">
- <ul>
- <li><a class="btn-action" href="javascript:;" onclick="document.form1.action='./trackback.php'; fnModeSubmit('search','',''); return false;"><span class="btn-prev">検索画面に戻る</span></a></li>
- <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('complete','',''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
- </ul>
- </div>
-</div>
-</form>
変更: branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl 2011-02-20 12:02:15 UTC (rev 20269)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl 2011-02-20 12:21:33 UTC (rev 20270)
@@ -460,26 +460,6 @@
<!--お客様の声ここまで-->
- <!--{if $arrTrackbackView == "ON"}-->
- <!--▼トラックバック-->
- <div id="trackbackarea">
- <h2>この商品に対するトラックバック</h2>
- <h3>この商品のトラックバック先URL</h3>
- <input type="text" name="trackback" value="<!--{$trackback_url}-->" size="100" class="box500" />
-
- <!--{if $arrTrackback}-->
- <ul>
- <!--{section name=cnt loop=$arrTrackback}-->
- <li><strong><!--{$arrTrackback[cnt].create_date|sfDispDBDate:false}--> <a href="<!--{$arrTrackback[cnt].url}-->" target="_blank"><!--{$arrTrackback[cnt].title|h}--></a> from <!--{$arrTrackback[cnt].blog_name|h}--></strong>
- <p><!--{$arrTrackback[cnt].excerpt|mb_strimwidth:0:200:"..."|h}--></p></li>
- <!--{/section}-->
- </ul>
- <!--{/if}-->
- </div>
- <!--▲トラックバック-->
- <!--{/if}-->
-
-
<!--▼関連商品-->
<!--{if $arrRecommend}-->
<div id="whoboughtarea">
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php 2011-02-20 12:02:15 UTC (rev 20269)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php 2011-02-20 12:21:33 UTC (rev 20270)
@@ -28,13 +28,7 @@
/** レビュータイトル */
var $arrREVIEW_CVSTITLE;
- /** トラックバック項目 */
- var $arrTRACKBACK_CVSCOL;
- /** トラックバックタイトル */
- var $arrTRACKBACK_CVSTITLE;
-
-
// }}}
// {{{ constructor
@@ -191,25 +185,6 @@
return $data;
}
- // CSV出力データを作成する。(トラックバック)
- function lfGetTrackbackCSV($where, $option, $arrval) {
- $from = "dtb_trackback AS A INNER JOIN dtb_products AS B on A.product_id = B.product_id ";
- $cols = SC_Utils_Ex::sfGetCommaList($this->arrTRACKBACK_CVSCOL);
-
- $objQuery =& SC_Query::getSingletonInstance();
- $objQuery->setOption($option);
-
- $list_data = $objQuery->select($cols, $from, $where, $arrval);
-
- $max = count($list_data);
- if (!isset($data)) $data = "";
- for($i = 0; $i < $max; $i++) {
- // 各項目をCSV出力用に変換する。
- $data .= $this->lfMakeTrackbackCSV($list_data[$i]);
- }
- return $data;
- }
-
// CSVを送信する。(カテゴリ)
function sfDownloadCategoryCsv() {
@@ -318,30 +293,6 @@
return $line;
}
- // 各項目をCSV出力用に変換する。(トラックバック)
- function lfMakeTrackbackCSV($list) {
-
- $line = "";
-
- foreach($list as $key => $val) {
- $tmp = "";
- switch($key) {
- case 'status':
- $tmp = $this->arrTrackBackStatus[$val];
- break;
- default:
- $tmp = $val;
- break;
- }
-
- $tmp = preg_replace('/[",]/', " ", $tmp);
- $line .= "\"".$tmp."\",";
- }
- // 文末の","を変換
- $line = $this->replaceLineSuffix($line);
- return $line;
- }
-
/**
* 行末の ',' を CRLF へ変換する.
*
@@ -399,24 +350,6 @@
'タイトル',
'コメント'
);
-
- $this->arrTRACKBACK_CVSTITLE = array(
- '商品名',
- 'ブログ名',
- 'ブログ記事タイトル',
- 'ブログ記事内容',
- '状態',
- '投稿日'
- );
-
- $this->arrTRACKBACK_CVSCOL = array(
- 'B.name',
- 'A.blog_name',
- 'A.title',
- 'A.excerpt',
- 'A.status',
- 'A.create_date'
- );
}
/**
変更: 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-20 12:02:15 UTC (rev 20269)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php 2011-02-20 12:21:33 UTC (rev 20270)
@@ -106,11 +106,6 @@
// プルダウンの作成
for ($i = 0; $i < count($arrSiteControlList); $i++) {
switch ($arrSiteControlList[$i]["control_id"]) {
- // トラックバック
- case SITE_CONTROL_TRACKBACK:
- $arrSiteControlList[$i]["control_area"]
- = $masterData->getMasterData("mtb_site_control_track_back");
- break;
// アフィリエイト
case SITE_CONTROL_AFFILIATE:
$arrSiteControlList[$i]["control_area"]
変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-20 12:02:15 UTC (rev 20269)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-20 12:21:33 UTC (rev 20270)
@@ -266,16 +266,7 @@
$this->arrPayment = $this->lfGetPayment();
//レビュー情報の取得
$this->arrReview = $this->lfGetReviewData($product_id);
- // トラックバック情報の取得
- // トラックバック機能の稼働状況チェック
- if (SC_Utils_Ex::sfGetSiteControlFlg(SITE_CONTROL_TRACKBACK) != 1) {
- $this->arrTrackbackView = "OFF";
- } else {
- $this->arrTrackbackView = "ON";
- $this->arrTrackback = $this->lfGetTrackbackData($product_id);
- }
- $this->trackback_url = TRACKBACK_TO_URL . $product_id;
//関連商品情報表示
$this->arrRecommend = $this->lfPreGetRecommendProducts($product_id);
}
@@ -515,25 +506,6 @@
return $arrReview;
}
- /*
- * 商品ごとのトラックバック情報を取得する
- *
- * @param $product_id
- * @return $arrTrackback
- */
- function lfGetTrackbackData($product_id) {
-
- $arrTrackback = array();
-
- $objQuery =& SC_Query::getSingletonInstance();
- //商品ごとのトラックバック情報を取得する
- $col = "blog_name, url, title, excerpt, title, create_date";
- $from = "dtb_trackback";
- $where = "del_flg = 0 AND status = 1 AND product_id = ? ORDER BY create_date DESC LIMIT " . TRACKBACK_VIEW_MAX;
- $arrTrackback = $objQuery->select($col, $from, $where, array($product_id));
- return $arrTrackback;
- }
-
//支払方法の取得
//payment_id 1:クレジット 2:ショッピングローン
function lfGetPayment() {
変更: branches/version-2_5-dev/html/user_data/packages/default/css/products.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/products.css 2011-02-20 12:02:15 UTC (rev 20269)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/products.css 2011-02-20 12:21:33 UTC (rev 20270)
@@ -286,28 +286,6 @@
color: #FF0000;
}
-/* トラックバック
------------------------------------------------ */
-div#trackbackarea {
- clear: both;
- padding: 35px 0 0 0;
-}
-
-div#trackbackarea h2 {
- padding: 0 0 10px 0;
-}
-
-div#trackbackarea h3 {
- font-size: 100%;
- font-weight: bold;
- padding: 0 0 10px 0;
-}
-
-div#trackbackarea .box500 {
- width: 500px;
- border: solid 1px #ccc;
-}
-
/* 関連商品
----------------------------------------------- */
div#whoboughtarea {
Svn-src-all メーリングリストの案内