Index: /branches/comu-ver2/html/admin/system/system.php
===================================================================
--- /branches/comu-ver2/html/admin/system/system.php	(revision 17573)
+++ /branches/comu-ver2/html/admin/system/system.php	(revision 17573)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2008 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_PATH . "page_extends/admin/system/LC_Page_Admin_System_System_Ex.php");
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Admin_System_System_Ex();
+register_shutdown_function(array($objPage, "destroy"));
+$objPage->init();
+$objPage->process();
+?>
Index: /branches/comu-ver2/html/install/sql/insert_data.sql
===================================================================
--- /branches/comu-ver2/html/install/sql/insert_data.sql	(revision 17567)
+++ /branches/comu-ver2/html/install/sql/insert_data.sql	(revision 17573)
@@ -801,11 +801,6 @@
 INSERT INTO mtb_constants VALUES ('UPDATE_CSV_COL_MAX','13',30,'アップデート管理用CSVカラム数');
 INSERT INTO mtb_constants VALUES ('MODULE_CSV_COL_MAX','16',31,'モジュール管理用CSVカラム数');
-INSERT INTO mtb_constants VALUES ('EBIS_TAG_MID','1',32,'エビスタグ機能のモジュールID');
-INSERT INTO mtb_constants VALUES ('AFF_TAG_MID','3',33,'アフィリエイトタグ機能のモジュールID');
 INSERT INTO mtb_constants VALUES ('AFF_SHOPPING_COMPLETE','1',34,'商品購入完了');
 INSERT INTO mtb_constants VALUES ('AFF_ENTRY_COMPLETE','2',35,'ユーザ登録完了');
-INSERT INTO mtb_constants VALUES ('CREDIT_HTTP_DOMAIN','"http://rcv.ec-cube.net/"',36,'決済受信用URL');
-INSERT INTO mtb_constants VALUES ('CREDIT_HTTP_ANALYZE_PROGRAM','"rcv_credit.php"',37,'決済受信用URL');
-INSERT INTO mtb_constants VALUES ('CREDIT_HTTP_ANALYZE_URL','CREDIT_HTTP_DOMAIN . CREDIT_HTTP_ANALYZE_PROGRAM',38,'決済受信用URL');
 INSERT INTO mtb_constants VALUES ('CHAR_CODE','"UTF-8"',39,'文字コード');
 INSERT INTO mtb_constants VALUES ('LOCALE','"ja_JP.UTF-8"',40,'ロケール設定');
@@ -867,6 +862,4 @@
 INSERT INTO mtb_constants VALUES ('LINE_LIMIT_SIZE','60',97,'文字数が多すぎるときに強制改行するサイズ(半角)');
 INSERT INTO mtb_constants VALUES ('BIRTH_MONTH_POINT','0',98,'誕生日月ポイント');
-INSERT INTO mtb_constants VALUES ('CGI_DIR','HTML_PATH . "../cgi-bin/"',99,'クレジットカード(ベリトランス) モジュール格納ディレクトリ');
-INSERT INTO mtb_constants VALUES ('CGI_FILE','"mauthonly.cgi"',100,'コアCGI');
 INSERT INTO mtb_constants VALUES ('ROOT_CATEGORY_1','2',101,'ルートカテゴリID');
 INSERT INTO mtb_constants VALUES ('ROOT_CATEGORY_2','3',102,'ルートカテゴリID');
Index: /branches/comu-ver2/html/user_data/packages/default/css/admin_contents.css
===================================================================
--- /branches/comu-ver2/html/user_data/packages/default/css/admin_contents.css	(revision 17572)
+++ /branches/comu-ver2/html/user_data/packages/default/css/admin_contents.css	(revision 17573)
@@ -444,4 +444,6 @@
 .area99 { width: 715px; height: 523px; }	/*W99?H40*/
 
+/*COLOR*/
+.red { color: #ff0000; }
 
 /*
Index: /branches/comu-ver2/data/Smarty/templates/default/shopping/complete.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/shopping/complete.tpl	(revision 17498)
+++ /branches/comu-ver2/data/Smarty/templates/default/shopping/complete.tpl	(revision 17573)
@@ -27,10 +27,4 @@
     </p>
     <h2 class="title"><!--{$tpl_title|escape}--></h2>
-
-    <!-- ▼クレジット(コンビニ)決済 -->
-    <!--{if $arrModuleParam.module_id > 0 }-->
-      <img src="<!--{$smarty.const.CREDIT_HTTP_ANALYZE_URL}-->?mid=<!--{$arrModuleParam.module_id}-->&tid=<!--{$arrModuleParam.payment_total}-->&pid=<!--{$arrModuleParam.payment_id}-->" width="0" height="0" border="0" style="width: 0px; height: 0px" />
-    <!--{/if}-->
-    <!-- ▲クレジット(コンビニ)決済 -->
 
     <!-- ▼その他決済情報を表示する場合は表示 -->
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/home.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/home.tpl	(revision 17563)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/home.tpl	(revision 17573)
@@ -1,3 +1,3 @@
-<!--{*
+<!--{*
 /*
  * This file is part of EC-CUBE
@@ -25,113 +25,117 @@
 <div id="home">
 
-  <!--{* お知らせここから *}-->
-  <div id="home-info">
-    <!--{foreach item=info from=$arrInfo}-->
-    <dl class="home-info-item">
-      <dt class="date"><!--{$info.disp_date|sfDispDBDate:false|escape}--></dt>
-      <dt class="title"><!--{$info.title}--></dt>
-      <dd class="body"><!--{$info.body}--></dd>
-    </dl>
-    <!--{/foreach}-->
-  </div>
-  <!--{* お知らせここまで *}-->
+    <!--{* お知らせここから *}-->
+    <div id="home-info">
+        <!--{foreach item=info from=$arrInfo}-->
+        <dl class="home-info-item">
+            <dt class="date"><!--{$info.disp_date|sfDispDBDate:false|escape}--></dt>
+            <dt class="title"><!--{$info.title}--></dt>
+            <dd class="body"><!--{$info.body}--></dd>
+        </dl>
+        <!--{/foreach}-->
+    </div>
+    <!--{* お知らせここまで *}-->
 
-  <!--{* メインエリア *}-->
-  <div id="home-main">
-  <form name="form1" method="post" action="#">
+    <!--{* メインエリア *}-->
+    <div id="home-main">
+    <form name="form1" method="post" action="#">
 
-      <!--{* システム情報ここから *}-->
-      <h2>システム情報</h2>
-      <table summary="システム情報" class="shop-info">
-        <tr>
-          <th>EC-CUBEバージョン</td>
-          <td><!--{$smarty.const.ECCUBE_VERSION}--></td>
-        </tr>
-        <tr>
-          <th>PHPバージョン</td>
-          <td><!--{$php_version}--></td>
-        </tr>
-        <tr>
-          <th>DBバージョン</td>
-          <td><!--{$db_version}--></td>
-        </tr>
-        <tr>
-          <th>OSバージョン</th>
-          <td><!--{$os_version|escape}--></td>
-        </tr>
-      </table>
-      <!--{* システム情報ここまで *}-->
-      
-      <!--{* ショップの状況ここから *}-->
-      <h2>ショップの状況</h2>
-      <table summary="ショップの状況" class="shop-info">
-        <tr>
-          <th>現在の会員数</td>
-          <td><!--{$customer_cnt|default:"0"|number_format}-->名</td>
-        </tr>
-        <tr>
-          <th>昨日の売上高</td>
-          <td><!--{$order_yesterday_amount|default:"0"|number_format}-->円</td>
-        </tr>
-        <tr>
-          <th>昨日の売上件数</td>
-          <td><!--{$order_yesterday_cnt|default:"0"|number_format}-->件</td>
-        </tr>
-        <tr>
-          <th><span>今月の売上高</span><span>(昨日まで) </span></td>
-          <td><!--{$order_month_amount|default:"0"|number_format}-->円</td>
-        </tr>
-        <tr>
-          <th><span>今月の売上件数 </span><span>(昨日まで) </span></td>
-          <td><!--{$order_month_cnt|default:"0"|number_format}-->件</td>
-        </tr>
-        <tr>
-          <th>昨日のレビュー書き込み数</td>
-          <td><!--{$review_yesterday_cnt|default:"0"}-->件</td>
-        </tr>
-        <tr>
-          <th>顧客の保持ポイント合計</td>
-          <td><!--{$customer_point|default:"0"}-->pt</td>
-        </tr>
-        <tr>
-          <th>レビュー書き込み非表示数</td>
-          <td><!--{$review_nondisp_cnt|default:"0"}-->件</td>
-        </tr>
-        <tr>
-          <th>品切れ商品</td>
-          <td>
-          <!--{section name=i loop=$arrSoldout}-->
-          <!--{$arrSoldout[i].product_id}-->:<!--{$arrSoldout[i].name|escape}--><br />
-          <!--{/section}-->
-          </td>
-        </tr>
-      </table>
-      <!--{* ショップの状況ここまで *}-->
+            <!--{* システム情報ここから *}-->
+            <h2>システム情報</h2>
+            <table summary="システム情報" class="shop-info">
+                <tr>
+                    <th>EC-CUBEバージョン</td>
+                    <td><!--{$smarty.const.ECCUBE_VERSION}--></td>
+                </tr>
+                <tr>
+                    <th>PHPバージョン</td>
+                    <td><!--{$php_version}--></td>
+                </tr>
+                <tr>
+                    <th>DBバージョン</td>
+                    <td><!--{$db_version}--></td>
+                </tr>
+                <tr>
+                    <th>OSバージョン</th>
+                    <td><!--{$os_version|escape}--></td>
+                </tr>
+                <tr>
+                    <th>詳細</td>
+                    <td><a href="<!--{$smarty.const.URL_DIR}-->admin/system/system.php">システム設定＞システム情報</a></td>
+                </tr>
+            </table>
+            <!--{* システム情報ここまで *}-->
+            
+            <!--{* ショップの状況ここから *}-->
+            <h2>ショップの状況</h2>
+            <table summary="ショップの状況" class="shop-info">
+                <tr>
+                    <th>現在の会員数</td>
+                    <td><!--{$customer_cnt|default:"0"|number_format}-->名</td>
+                </tr>
+                <tr>
+                    <th>昨日の売上高</td>
+                    <td><!--{$order_yesterday_amount|default:"0"|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th>昨日の売上件数</td>
+                    <td><!--{$order_yesterday_cnt|default:"0"|number_format}-->件</td>
+                </tr>
+                <tr>
+                    <th><span>今月の売上高</span><span>(昨日まで) </span></td>
+                    <td><!--{$order_month_amount|default:"0"|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th><span>今月の売上件数 </span><span>(昨日まで) </span></td>
+                    <td><!--{$order_month_cnt|default:"0"|number_format}-->件</td>
+                </tr>
+                <tr>
+                    <th>昨日のレビュー書き込み数</td>
+                    <td><!--{$review_yesterday_cnt|default:"0"}-->件</td>
+                </tr>
+                <tr>
+                    <th>顧客の保持ポイント合計</td>
+                    <td><!--{$customer_point|default:"0"}-->pt</td>
+                </tr>
+                <tr>
+                    <th>レビュー書き込み非表示数</td>
+                    <td><!--{$review_nondisp_cnt|default:"0"}-->件</td>
+                </tr>
+                <tr>
+                    <th>品切れ商品</td>
+                    <td>
+                    <!--{section name=i loop=$arrSoldout}-->
+                    <!--{$arrSoldout[i].product_id}-->:<!--{$arrSoldout[i].name|escape}--><br />
+                    <!--{/section}-->
+                    </td>
+                </tr>
+            </table>
+            <!--{* ショップの状況ここまで *}-->
 
-      <!--{* 新規受付一覧ここから *}-->
-      <h2>新規受付一覧</h2>
-      <table summary="新規受付一覧" id="home-order">
-        <tr>
-          <th>受注日</th>
-          <th>顧客名</th>
-          <th>購入商品</th>
-          <th>支払方法</th>
-          <th>購入金額(円)</th>
-        </tr>
-        <!--{section name=i loop=$arrNewOrder}-->
-        <tr>
-          <td><!--{$arrNewOrder[i].create_date}--></td>
-          <td><!--{$arrNewOrder[i].name01|escape}--> <!--{$arrNewOrder[i].name02|escape}--></td>
-          <td><!--{$arrNewOrder[i].product_name|escape}--></td>
-          <td><!--{$arrNewOrder[i].payment_method|escape}--></td>
-          <td class="right"><!--{$arrNewOrder[i].total|number_format}-->円</td>
-        </tr>
-        <!--{/section}-->
-      </table>
-      <!--{* 新規受付一覧ここまで *}-->
+            <!--{* 新規受付一覧ここから *}-->
+            <h2>新規受付一覧</h2>
+            <table summary="新規受付一覧" id="home-order">
+                <tr>
+                    <th>受注日</th>
+                    <th>顧客名</th>
+                    <th>購入商品</th>
+                    <th>支払方法</th>
+                    <th>購入金額(円)</th>
+                </tr>
+                <!--{section name=i loop=$arrNewOrder}-->
+                <tr>
+                    <td><!--{$arrNewOrder[i].create_date}--></td>
+                    <td><!--{$arrNewOrder[i].name01|escape}--> <!--{$arrNewOrder[i].name02|escape}--></td>
+                    <td><!--{$arrNewOrder[i].product_name|escape}--></td>
+                    <td><!--{$arrNewOrder[i].payment_method|escape}--></td>
+                    <td class="right"><!--{$arrNewOrder[i].total|number_format}-->円</td>
+                </tr>
+                <!--{/section}-->
+            </table>
+            <!--{* 新規受付一覧ここまで *}-->
 
-  </form>
-  </div>
-  <!--{* メインエリア *}-->
+    </form>
+    </div>
+    <!--{* メインエリア *}-->
 
 </div>
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/products/product.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/products/product.tpl	(revision 17444)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/products/product.tpl	(revision 17573)
@@ -405,5 +405,5 @@
         <!--{assign var=image_path value="`$smarty.const.NO_IMAGE_DIR`"}-->
       <!--{/if}-->
-        <img src="<!--{$smarty.const.SITE_URL}-->resize_image.php?image=<!--{$image_path|sfRmDupSlash}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|escape}-->" />
+        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$image_path|sfRmDupSlash}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|escape}-->" />
       </th>
       <td>
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/system/parameter.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/system/parameter.tpl	(revision 17571)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/system/parameter.tpl	(revision 17573)
@@ -25,5 +25,5 @@
 <input type="hidden" name="mode" value="update" />
 <div id="basis" class="contents-main">
-  <ul>
+  <ul class="red fs12st">
     <li>パラメータの値がPHP定数として設定されます。</li>
     <li>文字列は「&quot;」で囲んで下さい。</li>
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/system/bkup.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/system/bkup.tpl	(revision 17351)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/system/bkup.tpl	(revision 17573)
@@ -26,67 +26,71 @@
 <input type="hidden" name="list_name" value="" />
 <div id="system" class="contents-main">
-  <h2>バックアップ作成</h2>
-  <table class="form">
-    <tr>
-      <th>バックアップ名<span class="attention"> *</span></th>
-      <td>
-        <!--{if $arrErr.bkup_name}-->
-        <span class="attention"><!--{$arrErr.bkup_name}--></span>
+    <h2>バックアップ作成</h2>
+    <ul>
+        <li>データベースのバックアップを行います。</li>
+        <li>テンプレートファイル等はバックアップされません。</li>
+    </ul>                                        
+    <table class="form">
+        <tr>
+            <th>バックアップ名<span class="attention"> *</span></th>
+            <td>
+                <!--{if $arrErr.bkup_name}-->
+                <span class="attention"><!--{$arrErr.bkup_name}--></span>
+                <!--{/if}-->
+                <input type="text" name="bkup_name" value="<!--{$arrForm.bkup_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.bkup_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> ime-mode: disabled;" /><span class="attention"> （上限<!--{$smarty.const.STEXT_LEN}-->文字）</span>
+            </td>
+        </tr>
+        <tr>
+            <th>バックアップメモ</th>
+            <td>
+                <!--{if $arrErr.bkup_memo}-->
+                <span class="attention"><!--{$arrErr.bkup_memo}--></span>
+                <!--{/if}-->
+                <textarea name="bkup_memo" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" cols="60" rows="5" class="area60" style="<!--{if $arrErr.bkup_memo != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" ><!--{$arrForm.bkup_memo|escape}--></textarea>
+                <span class="attention"> （上限<!--{$smarty.const.MTEXT_LEN}-->文字）</span>
+            </td>
+        </tr>
+    </table>
+
+    <div class="btn"><button type="button" name="cre_bkup" onClick="document.body.style.cursor = 'wait'; form1.mode.value='bkup'; submit();"><span>バックアップデータを作成する</span></button></div>
+
+    <h2>バックアップ一覧</h2>
+    <!--{* 一覧が存在する場合のみ表示する *}-->
+    <!--{if count($arrBkupList) > 0 }-->
+    <table class="list">
+        <tr>
+            <th>バックアップ名</th>
+            <th>バックアップメモ</th>
+            <th>作成日</th>
+            <th>リストア</th>
+            <th>ダウンロード</th>
+            <th>削除</th>
+        </tr>
+        <!--{section name=cnt loop=$arrBkupList}-->
+        <tr>
+            <td ><!--{$arrBkupList[cnt].bkup_name}--></td>
+            <td ><!--{$arrBkupList[cnt].bkup_memo}--></td>
+            <td align="center"><!--{$arrBkupList[cnt].create_date|sfCutString:19:true:false}--></td>
+            <td align="center"><a href="#" onclick="document.body.style.cursor = 'wait'; fnModeSubmit('restore','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">restore</a></td>
+            <td align="center"><a href="#" onclick="fnModeSubmit('download','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">download</a></td>
+            <td align="center">
+                <a href="#" onclick="fnModeSubmit('delete','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">delete</a>
+            </td>
+        </tr>
+        <!--{/section}-->
+    </table>
+    <!--{/if}-->
+
+    
+    <!--{if $restore_msg != ""}-->
+    <h2>実行結果</h2>
+    <div class="message">
+        <!--{if $restore_err == false}-->
+        <div class="btn"><button type="button" name="restore_config" onClick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$restore_name}-->'; submit();"><span>テーブル構成を無視してリストアする</span></button></div>
         <!--{/if}-->
-        <input type="text" name="bkup_name" value="<!--{$arrForm.bkup_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.bkup_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> ime-mode: disabled;" /><span class="attention"> （上限<!--{$smarty.const.STEXT_LEN}-->文字）</span>
-      </td>
-    </tr>
-    <tr>
-      <th>バックアップメモ</th>
-      <td>
-        <!--{if $arrErr.bkup_memo}-->
-        <span class="attention"><!--{$arrErr.bkup_memo}--></span>
-        <!--{/if}-->
-        <textarea name="bkup_memo" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" cols="60" rows="5" class="area60" style="<!--{if $arrErr.bkup_memo != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" ><!--{$arrForm.bkup_memo|escape}--></textarea>
-        <span class="attention"> （上限<!--{$smarty.const.MTEXT_LEN}-->文字）</span>
-      </td>
-    </tr>
-  </table>
-
-  <div class="btn"><button type="button" name="cre_bkup" onClick="document.body.style.cursor = 'wait'; form1.mode.value='bkup'; submit();"><span>バックアップデータを作成する</span></button></div>
-
-  <h2>バックアップ一覧</h2>
-  <!--{* 一覧が存在する場合のみ表示する *}-->
-  <!--{if count($arrBkupList) > 0 }-->
-  <table class="list">
-    <tr>
-      <th>バックアップ名</th>
-      <th>バックアップメモ</th>
-      <th>作成日</th>
-      <th>リストア</th>
-      <th>ダウンロード</th>
-      <th>削除</th>
-    </tr>
-    <!--{section name=cnt loop=$arrBkupList}-->
-    <tr>
-      <td ><!--{$arrBkupList[cnt].bkup_name}--></td>
-      <td ><!--{$arrBkupList[cnt].bkup_memo}--></td>      
-      <td align="center"><!--{$arrBkupList[cnt].create_date|sfCutString:19:true:false}--></td>
-      <td align="center"><a href="#" onclick="document.body.style.cursor = 'wait'; fnModeSubmit('restore','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">restore</a></td>
-      <td align="center"><a href="#" onclick="fnModeSubmit('download','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">download</a></td>
-      <td align="center">
-        <a href="#" onclick="fnModeSubmit('delete','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">delete</a>
-      </td>  
-    </tr>
-    <!--{/section}-->
-  </table>
-  <!--{/if}-->
-
-  
-  <!--{if $restore_msg != ""}-->
-  <h2>実行結果</h2>
-  <div class="message">
-    <!--{if $restore_err == false}-->
-    <div class="btn"><button type="button" name="restore_config" onClick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$restore_name}-->'; submit();"><span>テーブル構成を無視してリストアする</span></button></div>
+        <!--{$restore_msg}-->
+    </div>
     <!--{/if}-->
-    <!--{$restore_msg}-->
-  </div>
-  <!--{/if}-->
-  
+    
 </div>
 </form>
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/system/system.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/system/system.tpl	(revision 17573)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/system/system.tpl	(revision 17573)
@@ -0,0 +1,40 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2007 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.
+ */
+*}-->
+
+<h2>システム情報</h2>
+<table border="0" cellspacing="1" cellpadding="8" summary=" ">
+    <!--{foreach from=$arrSystemInfo item=info}-->
+    <tr>
+        <th>
+        <!--{$info.title|escape}-->
+        </td>
+        <td>
+        <!--{$info.value|escape|nl2br}-->
+        </td>
+    </tr>
+    <!--{/foreach}-->
+</table>
+
+<h2>PHP情報</h2>
+<iframe src="?mode=info" height="500" frameborder="0" style="width: 100%;"></iframe>
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/system/subnavi.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/system/subnavi.tpl	(revision 17571)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/system/subnavi.tpl	(revision 17573)
@@ -27,3 +27,4 @@
 <li<!--{if $tpl_subno == 'parameter'}--> class="on"<!--{/if}--> id="navi-system-parameter"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/parameter.php"><span>パラメータ設定</span></a></li>
 <li<!--{if $tpl_subno == 'masterdata'}--> class="on"<!--{/if}--> id="navi-system-masterdata"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/masterdata.php"><span>マスタデータ管理</span></a></li>
+<li<!--{if $tpl_subno == 'system'}--> class="on"<!--{/if}--> id="navi-system-system"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/system.php"><span>システム情報</span></a></li>
 </ul>
Index: /branches/comu-ver2/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php
===================================================================
--- /branches/comu-ver2/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php	(revision 17573)
+++ /branches/comu-ver2/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php	(revision 17573)
@@ -0,0 +1,67 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2008 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_PATH . "pages/admin/system/LC_Page_Admin_System_System.php");
+
+/**
+ * システム情報 のページクラス(拡張).
+ *
+ * LC_Page_Admin_System_System をカスタマイズする場合はこのクラスを編集する.
+ *
+ * @package Page
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class LC_Page_Admin_System_System_Ex extends LC_Page_Admin_System_System {
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        parent::process();
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+}
Index: /branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_System.php
===================================================================
--- /branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_System.php	(revision 17573)
+++ /branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_System.php	(revision 17573)
@@ -0,0 +1,122 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2008 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_PATH . "pages/LC_Page.php");
+
+/**
+ * システム情報 のページクラス.
+ *
+ * @package Page
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class LC_Page_Admin_System_System extends LC_Page {
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+        $this->tpl_mainpage = 'system/system.tpl';
+        $this->tpl_subnavi  = 'system/subnavi.tpl';
+        $this->tpl_subno    = 'system';
+        $this->tpl_mainno   = 'system';
+        $this->tpl_subtitle = 'システム情報';
+    }
+
+    /**
+     * フォームパラメータ初期化
+     *
+     * @return void
+     */
+    function initForm() {
+        $objForm = new SC_FormParam();
+        $objForm->addParam('mode', 'mode', INT_LEN, '', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
+        $objForm->setParam($_GET);
+        $this->objForm = $objForm;
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+
+        SC_Utils_Ex::sfIsSuccess(new SC_Session);
+        $objView = new SC_AdminView();
+
+        $this->initForm();
+        switch($this->objForm->getValue('mode')) {
+
+        // PHP INFOを表示
+        case 'info':
+            phpinfo();
+            exit;
+            break;
+
+        default:
+            break;
+        }
+
+        $this->arrSystemInfo = $this->getSystemInfo();
+
+        $objView->assignobj($this);
+        $objView->display(MAIN_FRAME);
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+
+    /**
+     * システム情報を取得する
+     *
+     * @return array
+     */
+    function getSystemInfo() {
+        $objDB = SC_DB_DBFactory::getInstance();
+
+        $arrSystemInfo = array(
+            array('title' => 'EC-CUBE',  'value' => ECCUBE_VERSION),
+            array('title' => 'OS',       'value' => php_uname()),
+            array('title' => 'DBサーバ',  'value' => $objDB->sfGetDBVersion()),
+            array('title' => 'WEBサーバ', 'value' => $_SERVER['SERVER_SOFTWARE']),
+            array('title' => 'PHP',      'value' => phpversion()),
+            array('title' => 'GD',       'value' => extension_loaded('GD') ? 'Loaded' : '--'),
+        );
+
+        return $arrSystemInfo;
+    }
+}
Index: /branches/comu-ver2/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- /branches/comu-ver2/data/class/pages/products/LC_Page_Products_List.php	(revision 17567)
+++ /branches/comu-ver2/data/class/pages/products/LC_Page_Products_List.php	(revision 17573)
@@ -260,5 +260,5 @@
             $tpl_subtitle = "全商品";
         }else{
-            $arrFirstCat = $objDb->sfGetFirstCat($arrCategory_id);
+            $arrFirstCat = $objDb->sfGetFirstCat($arrCategory_id[0]);
             $tpl_subtitle = $arrFirstCat['name'];
         }
@@ -361,5 +361,5 @@
         $this->arrSearch = $arrSearch;
         $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . "products/list.tpl";
-        
+
         $objView->assignobj($this);
         $objView->display(SITE_FRAME);
@@ -461,4 +461,5 @@
         $name = ereg_replace(",", "", $name);
         if ( strlen($name) > 0 ){
+            $name = trim(mb_convert_kana($name, 's')); // 半角/全角スペースを削除
             $where .= " AND ( name ILIKE ? OR comment3 ILIKE ?) ";
             $ret = SC_Utils_Ex::sfManualEscape($name);
@@ -480,5 +481,5 @@
         $linemax = count($objQuery->getAll("SELECT DISTINCT product_id "
                                          . "FROM vw_products_allclass AS allcls "
-                                         . (!empty($where) ? " WHERE " . $where 
+                                         . (!empty($where) ? " WHERE " . $where
                                                            : ""), $arrval));
 
Index: /branches/comu-ver2/data/mtb_constants_init.php
===================================================================
--- /branches/comu-ver2/data/mtb_constants_init.php	(revision 17509)
+++ /branches/comu-ver2/data/mtb_constants_init.php	(revision 17573)
@@ -52,18 +52,8 @@
 /** モジュール管理用CSVカラム数 */
 define('MODULE_CSV_COL_MAX', 16);
-/** エビスタグ機能のモジュールID */
-define('EBIS_TAG_MID', 1);
-/** アフィリエイトタグ機能のモジュールID */
-define('AFF_TAG_MID', 3);
 /** 商品購入完了 */
 define('AFF_SHOPPING_COMPLETE', 1);
 /** ユーザ登録完了 */
 define('AFF_ENTRY_COMPLETE', 2);
-/** 決済受信用URL */
-define('CREDIT_HTTP_DOMAIN', "http://rcv.ec-cube.net/");
-/** 決済受信用URL */
-define('CREDIT_HTTP_ANALYZE_PROGRAM', "rcv_credit.php");
-/** 決済受信用URL */
-define('CREDIT_HTTP_ANALYZE_URL', CREDIT_HTTP_DOMAIN . CREDIT_HTTP_ANALYZE_PROGRAM);
 /** 文字コード */
 define('CHAR_CODE', "UTF-8");
@@ -186,8 +176,4 @@
 /** 誕生日月ポイント */
 define('BIRTH_MONTH_POINT', 0);
-/** クレジットカード(ベリトランス) モジュール格納ディレクトリ */
-define('CGI_DIR', HTML_PATH . "../cgi-bin/");
-/** コアCGI */
-define('CGI_FILE', "mauthonly.cgi");
 /** ルートカテゴリID */
 define('ROOT_CATEGORY_1', 2);