Index: /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/change_confirm.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 22058)
@@ -44,21 +44,21 @@
             <col width="70%" />
             <tr>
-                <th>お名前<span class="attention">※</span></th>
+                <th>お名前</th>
                 <td><!--{$arrForm.name01|h}-->　<!--{$arrForm.name02|h}--></td>
             </tr>
             <tr>
-                <th>お名前(フリガナ)<span class="attention">※</span></th>
+                <th>お名前(フリガナ)</th>
                 <td><!--{$arrForm.kana01|h}-->　<!--{$arrForm.kana02|h}--></td>
             </tr>
             <tr>
-                <th>郵便番号<span class="attention">※</span></th>
+                <th>郵便番号</th>
                 <td><!--{$arrForm.zip01}-->-<!--{$arrForm.zip02}--></td>
             </tr>
             <tr>
-                <th>住所<span class="attention">※</span></th>
+                <th>住所</th>
                 <td><!--{$arrPref[$arrForm.pref]}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}--></td>
             </tr>
             <tr>
-                <th>電話番号<span class="attention">※</span></th>
+                <th>電話番号</th>
                 <td><!--{$arrForm.tel01|h}-->-<!--{$arrForm.tel02}-->-<!--{$arrForm.tel03}--></td>
             </tr>
@@ -68,5 +68,5 @@
             </tr>
             <tr>
-                <th>メールアドレス<span class="attention">※</span></th>
+                <th>メールアドレス</th>
                 <td><a href="<!--{$arrForm.email|escape:'hex'}-->"><!--{$arrForm.email|escape:'hexentity'}--></a></td>
             </tr>
@@ -82,5 +82,5 @@
             </tr>
             <tr>
-                <th>性別<span class="attention">※</span></th>
+                <th>性別</th>
                 <td><!--{$arrSex[$arrForm.sex]}--></td>
             </tr>
@@ -94,15 +94,15 @@
             </tr>
             <tr>
-                <th>希望するパスワード<span class="attention">※</span><br />
+                <th>希望するパスワード<br />
                 </th>
                 <td><!--{$passlen}--></td>
             </tr>
             <tr>
-                <th>パスワードを忘れた時のヒント<span class="attention">※</span></th>
+                <th>パスワードを忘れた時のヒント</th>
                 <td>質問：&nbsp;<!--{$arrReminder[$arrForm.reminder]|h}--><br />
                         答え：&nbsp;<!--{$arrForm.reminder_answer|h}--></td>
             </tr>
             <tr>
-                <th>メールマガジン送付について<span class="attention">※</span></th>
+                <th>メールマガジン送付について</th>
                 <td><!--{$arrMAILMAGATYPE[$arrForm.mailmaga_flg]}--></td>
             </tr>
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_mail.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_mail.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_mail.tpl	(revision 22058)
@@ -31,5 +31,5 @@
 　もしお心当たりが無い場合はこのままこのメールを破棄していただ
 　ければ会員登録はなされません。
-　またその旨<!--{* 問い合わせ受付メール *}--><!--{$CONF.email02}-->まで
+　またその旨 <!--{* 問い合わせ受付メール *}--><!--{$CONF.email02}--> まで
 　ご連絡いただければ幸いです。
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/contact_mail.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/contact_mail.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/contact_mail.tpl	(revision 22058)
@@ -32,5 +32,5 @@
 　もしお心当たりが無い場合は、このままこのメールを破棄して
 　ください。
-　またその旨、<!--{$tpl_infoemail}-->まで
+　またその旨、 <!--{$tpl_infoemail}--> まで
 　ご連絡いただければ幸いです。
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
@@ -46,4 +46,5 @@
 ■住所　　：<!--{$arrPref[$arrForm.pref.value]}--><!--{$arrForm.addr01.value}--><!--{$arrForm.addr02.value}-->
 ■電話番号：<!--{$arrForm.tel01.value}-->-<!--{$arrForm.tel02.value}-->-<!--{$arrForm.tel03.value}-->
+■メールアドレス：<!--{$arrForm.email.value}-->
 ■お問い合わせの内容
 <!--{$arrForm.contents.value}-->
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_regist_mail.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_regist_mail.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_regist_mail.tpl	(revision 22058)
@@ -30,5 +30,5 @@
 　お送りしています。
 　もしお心当たりが無い場合は、
-　その旨<!--{* 問い合わせ受付メール *}--><!--{$CONF.email02}-->まで
+　その旨 <!--{* 問い合わせ受付メール *}--><!--{$CONF.email02}--> まで
 　ご連絡いただければ幸いです。
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/entry/confirm.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/entry/confirm.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/entry/confirm.tpl	(revision 22058)
@@ -37,5 +37,5 @@
             <col width="70%" />
             <tr>
-                <th>お名前<span class="attention">※</span></th>
+                <th>お名前</th>
                 <td>
                     <!--{$arrForm.name01|h}-->&nbsp;
@@ -44,5 +44,5 @@
             </tr>
             <tr>
-                <th>お名前(フリガナ)<span class="attention">※</span></th>
+                <th>お名前(フリガナ)</th>
                 <td>
                     <!--{$arrForm.kana01|h}-->&nbsp;
@@ -51,5 +51,5 @@
             </tr>
             <tr>
-                <th>郵便番号<span class="attention">※</span></th>
+                <th>郵便番号</th>
                 <td>
                     〒<!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}-->
@@ -57,5 +57,5 @@
             </tr>
             <tr>
-                <th>住所<span class="attention">※</span></th>
+                <th>住所</th>
                 <td>
                     <!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}-->
@@ -63,5 +63,5 @@
             </tr>
             <tr>
-                <th>電話番号<span class="attention">※</span></th>
+                <th>電話番号</th>
                 <td>
                     <!--{$arrForm.tel01|h}--> - <!--{$arrForm.tel02|h}--> - <!--{$arrForm.tel03|h}-->
@@ -79,5 +79,5 @@
             </tr>
             <tr>
-                <th>メールアドレス<span class="attention">※</span></th>
+                <th>メールアドレス</th>
                 <td>
                     <a href="mailto:<!--{$arrForm.email|escape:'hex'}-->"><!--{$arrForm.email|escape:'hexentity'}--></a>
@@ -85,5 +85,5 @@
             </tr>
             <tr>
-                <th>性別<span class="attention">※</span></th>
+                <th>性別</th>
                 <td>
                     <!--{if $arrForm.sex eq 1}-->
@@ -109,10 +109,10 @@
             </tr>
             <tr>
-                <th>希望するパスワード<span class="attention">※</span><br />
+                <th>希望するパスワード<br />
                 </th>
                 <td><!--{$passlen}--></td>
             </tr>
             <tr>
-                <th>パスワードを忘れた時のヒント<span class="attention">※</span></th>
+                <th>パスワードを忘れた時のヒント</th>
                 <td>
                     質問：<!--{$arrReminder[$arrForm.reminder]|h}--><br />
@@ -121,5 +121,5 @@
             </tr>
             <tr>
-                <th>メールマガジン送付について<span class="attention">※</span></th>
+                <th>メールマガジン送付について</th>
                 <td>
                     <!--{if $arrForm.mailmaga_flg eq 1}-->
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/products/list.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/products/list.tpl	(revision 21940)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/products/list.tpl	(revision 22058)
@@ -50,10 +50,10 @@
         $.each(hiddenValues, function(){
             // 商品別のフォームに検索条件の値があれば上書き
-            if (cartForm.has('input[name='+this+']')) {
+            if (cartForm.has('input[name='+this+']').length != 0) {
                 cartForm.find('input[name='+this+']').val(searchForm.find('input[name='+this+']').val());
             }
             // なければ追加
             else {
-                cartForm.append($("<input/>").attr("name", this).val(searchForm.find('input[name='+this+']').val()));
+                cartForm.append($('<input type="hidden" />').attr("name", this).val(searchForm.find('input[name='+this+']').val()));
             }
         });
@@ -77,11 +77,4 @@
         <input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->" />
         <!--{* ▲ページナビ関連 *}-->
-        <!--{* ▼注文関連 *}-->
-        <input type="hidden" name="product_id" value="" />
-        <input type="hidden" name="classcategory_id1" value="" />
-        <input type="hidden" name="classcategory_id2" value="" />
-        <input type="hidden" name="product_class_id" value="" />
-        <input type="hidden" name="quantity" value="" />
-        <!--{* ▲注文関連 *}-->
         <input type="hidden" name="rnd" value="<!--{$tpl_rnd|h}-->" />
     </form>
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/products/detail.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/products/detail.tpl	(revision 22058)
@@ -302,5 +302,5 @@
                     <div class="subphotoimg">
                         <!--{if $arrProduct[$lkey]|strlen >= 1}-->
-                            <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_expansion_on.gif', 'expansion_<!--{$lkey|h}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_expansion.gif', 'expansion_<!--{$lkey|h}-->');" target="_blank" >
+                            <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank" >
                         <!--{/if}-->
                         <img src="<!--{$arrFile[$ikey].filepath}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile[$ikey].width}-->" height="<!--{$arrFile[$ikey].height}-->" />
Index: /branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/index.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/index.tpl	(revision 22058)
@@ -54,4 +54,14 @@
             ▽合計金額<br>
             <font color="#ff0000"><!--{$arrOrder[cnt].payment_total|number_format}-->円</font><br>
+            ▽ご注文状況<br>
+            <!--{if $smarty.const.MYPAGE_ORDER_STATUS_DISP_FLAG }-->
+                <!--{assign var=order_status_id value="`$arrOrder[cnt].status`"}-->
+                <!--{if $order_status_id != $smarty.const.ORDER_PENDING }-->
+                    <!--{$arrCustomerOrderStatus[$order_status_id]|h}--><br>
+                <!--{else}-->
+                    <font color="#ff0000"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></font><br>
+                <!--{/if}-->
+            <!--{/if}-->
+            
             <div align="right"><a href="./history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">→詳細を見る</a></div><br>
         <!--{/section}-->
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 21902)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 22058)
@@ -101,5 +101,5 @@
             </tr>
             <tr>
-                <th>ご性別</th>
+                <th>性別</th>
                 <td><!--{$arrSex[$arrForm.sex]|h}--></td>
             </tr>
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl	(revision 22058)
@@ -150,5 +150,5 @@
             </tr>
             <tr>
-                <th>ご性別<span class="attention"> *</span></th>
+                <th>性別<span class="attention"> *</span></th>
                 <td>
                     <span class="attention"><!--{$arrErr.sex}--></span>
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/products/confirm.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/products/confirm.tpl	(revision 21906)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/products/confirm.tpl	(revision 22058)
@@ -77,5 +77,5 @@
                 <!--{foreach from=$arrForm.product_status item=status}-->
                     <!--{if $status != ""}-->
-                        <img src="<!--{$TPL_URLPATH_DEFAULT}--><!--{$arrSTATUS_IMAGE[$status]}-->">
+                        <img src="<!--{$TPL_URLPATH_PC}--><!--{$arrSTATUS_IMAGE[$status]}-->">
                     <!--{/if}-->
                 <!--{/foreach}-->
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/total/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/total/index.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/total/index.tpl	(revision 22058)
@@ -99,4 +99,5 @@
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
         <input type="hidden" name="mode" value="search" />
+        <input type="hidden" name="form" value="<!--{$arrForm.form.value|h}-->" />
         <input type="hidden" name="type" value="<!--{$arrForm.type.value|h}-->" />
         <input type="hidden" name="page" value="<!--{$arrForm.page.value|h}-->" />
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/plugin.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/plugin.tpl	(revision 21971)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/plugin.tpl	(revision 22058)
@@ -34,7 +34,13 @@
 
             if(mode === 'disable') {
-                result = window.confirm('プラグインを無効しても宜しいですか？');
+                result = window.confirm('プラグインを無効にしても宜しいですか？');
+                if(result === false) {
+                    $(event.target).attr("checked", "checked");
+                }
             } else if(mode === 'enable') {
                 result = window.confirm('プラグインを有効にしても宜しいですか？');
+                if(result === false) {
+                    $(event.target).attr("checked", "");
+                }
             }
             if(result === true){
Index: /branches/version-2_12-multilang/data/Smarty/templates/sphone/products/list.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/sphone/products/list.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/sphone/products/list.tpl	(revision 22058)
@@ -47,9 +47,4 @@
         <input type="hidden" name="disp_number" value="<!--{$disp_number|h}-->" />
         <input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->" />
-        <input type="hidden" name="product_id" value="" />
-        <input type="hidden" name="classcategory_id1" value="" />
-        <input type="hidden" name="classcategory_id2" value="" />
-        <input type="hidden" name="product_class_id" value="" />
-        <input type="hidden" name="quantity" value="" />
         <input type="hidden" name="rnd" value="<!--{$tpl_rnd|h}-->" />
     </form>
Index: /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/index.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/index.tpl	(revision 22058)
@@ -56,5 +56,14 @@
                                     <em>購入日時：</em><span class="create_date"><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></span><br />
                                     <em>お支払い方法：</em><span class="payment_id"><!--{$arrPayment[$payment_id]|h}--></span><br />
-                                    <em>合計金額：</em><span class="payment_total"><!--{$arrOrder[cnt].payment_total|number_format}--></span>円
+                                    <em>合計金額：</em><span class="payment_total"><!--{$arrOrder[cnt].payment_total|number_format}--></span>円<br />
+                                    <em>ご注文状況：</em>
+                                    <!--{if $smarty.const.MYPAGE_ORDER_STATUS_DISP_FLAG }-->
+                                        <!--{assign var=order_status_id value="`$arrOrder[cnt].status`"}-->
+                                        <!--{if $order_status_id != $smarty.const.ORDER_PENDING }-->
+                                        <span class="order_status"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></span><br />
+                                        <!--{else}-->
+                                        <span class="order_status attention"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></span><br />
+                                        <!--{/if}-->
+                                    <!--{/if}-->
                                 </p>
                                 <a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->" rel="external"></a>
Index: /branches/version-2_12-multilang/data/downloads/KEN_ALL.CSV
===================================================================
--- /branches/version-2_12-multilang/data/downloads/KEN_ALL.CSV	(revision 21958)
+++ /branches/version-2_12-multilang/data/downloads/KEN_ALL.CSV	(revision 22058)
@@ -11933,5 +11933,5 @@
 03213,"02868","0286846","²ÜÃ¹Ý","ÆÉÍ¼","¼Þ®³ÎÞ³¼ÞÏÁ¼ÀÏ´À","âè§","ñËs","ò@¬º^Oc",0,0,0,0,0,0
 03213,"02868","0286923","²ÜÃ¹Ý","ÆÉÍ¼","¼Þ®³ÎÞ³¼ÞÏÁ¼ÀÑ×","âè§","ñËs","ò@¬ºº",0,0,0,0,0,0
-03213,"02868","0286931","²ÜÃ¹Ý","ÆÉÍ¼","¼Þ®³ÎÞ³¼ÞÏÁ¼ÂÍß²","âè§","ñËs","ò@¬K½",0,0,0,0,0,0
+03213,"02868","0286931","²ÜÃ¹Ý","ÆÉÍ¼","¼Þ®³ÎÞ³¼ÞÏÁ¼¯Íß²","âè§","ñËs","ò@¬K½",0,0,0,0,1,5
 03213,"02868","0286951","²ÜÃ¹Ý","ÆÉÍ¼","¼Þ®³ÎÞ³¼ÞÏÁ¼Ð½Þ¼ÞØ","âè§","ñËs","ò@¬´
 K",0,0,0,0,0,0
@@ -21026,5 +21026,5 @@
 07202,"965  ","9650081","Ì¸¼Ï¹Ý","±²ÂÞÜ¶ÏÂ¼","º³»Þ¼ÏÁÆ¼·ÄÞ","§","ïÃá¼s","_w¬¼éË",0,0,0,0,0,0
 07202,"965  ","9650085","Ì¸¼Ï¹Ý","±²ÂÞÜ¶ÏÂ¼","º³»Þ¼ÏÁÆ®×²ÄÞ³","§","ïÃá¼s","_w¬@°",0,0,0,0,0,0
-07202,"965  ","9650080","Ì¸¼Ï¹Ý","±²ÂÞÜ¶ÏÂ¼","º³»Þ¼ÏÁÊ¼ÓÄ","§","ïÃá¼s","_w¬´{",0,0,0,0,1,5
+07202,"965  ","9650080","Ì¸¼Ï¹Ý","±²ÂÞÜ¶ÏÂ¼","º³»Þ¼ÏÁÊ¼ÓÄ","§","ïÃá¼s","_w¬´{",0,0,0,0,0,0
 07202,"965  ","9650089","Ì¸¼Ï¹Ý","±²ÂÞÜ¶ÏÂ¼","º³»Þ¼ÏÁË¶Þ¼·ÄÞ","§","ïÃá¼s","_w¬éË",0,0,0,0,0,0
 07202,"965  ","9650084","Ì¸¼Ï¹Ý","±²ÂÞÜ¶ÏÂ¼","º³»Þ¼ÏÁË¶Þ¼º³»Þ¼","§","ïÃá¼s","_w¬_w",0,0,0,0,0,0
@@ -29855,5 +29855,5 @@
 10202,"37033","3703332","¸ÞÝÏ¹Ý","À¶»·¼","¼×²ÜÏÁ","Qn§","ès","â¬",0,0,0,0,0,0
 10202,"370  ","3700825","¸ÞÝÏ¹Ý","À¶»·¼","¼Û¶ÞÈÁ®³","Qn§","ès","â¬",0,0,0,0,0,0
-10202,"370  ","3700866","¸ÞÝÏ¹Ý","À¶»·¼","¼ÛÔÏÁ®³","Qn§","ès","éR¬",0,0,1,0,0,0
+10202,"370  ","3700866","¸ÞÝÏ¹Ý","À¶»·¼","¼ÛÔÏÏÁ","Qn§","ès","éR¬",0,0,1,0,1,5
 10202,"370  ","3700821","¸ÞÝÏ¹Ý","À¶»·¼","¼ÝºÝÔÏÁ","Qn§","ès","V®®¬",0,0,0,0,0,0
 10202,"370  ","3700054","¸ÞÝÏ¹Ý","À¶»·¼","¼ÝÁ®³","Qn§","ès","^¬",0,0,0,0,0,0
@@ -35282,5 +35282,5 @@
 12212,"285  ","2850815","ÁÊÞ¹Ý","»¸×¼","¼Þ®³","çt§","²qs","é",0,0,0,0,0,0
 12212,"285  ","2850854","ÁÊÞ¹Ý","»¸×¼","¼Þ®³»Þ","çt§","²qs","ãÀ",0,0,0,0,0,0
-12212,"285  ","2850017","ÁÊÞ¹Ý","»¸×¼","¼Þ®³Å²Á®³","çt§","²qs","éà¬",0,0,0,0,1,5
+12212,"285  ","2850017","ÁÊÞ¹Ý","»¸×¼","¼Þ®³Å²Á®³","çt§","²qs","éà¬",0,0,0,0,0,0
 12212,"285  ","2850045","ÁÊÞ¹Ý","»¸×¼","¼Û¶ÞÈ","çt§","²qs","â",0,0,1,0,0,0
 12212,"285  ","2850862","ÁÊÞ¹Ý","»¸×¼","¼Ý³½²ÀÞ","çt§","²qs","VPäc",0,0,0,0,0,0
@@ -42072,5 +42072,5 @@
 14108,"236  ","2360037","¶Å¶ÞÜ¹Ý","ÖºÊÏ¼¶Å»ÞÜ¸","ÑÂ³×Ë¶Þ¼","_Þì§","¡lsàòæ","ZY",0,0,1,0,0,0
 14108,"236  ","2360038","¶Å¶ÞÜ¹Ý","ÖºÊÏ¼¶Å»ÞÜ¸","ÑÂ³×ÐÅÐ","_Þì§","¡lsàòæ","ZYì",0,0,1,0,0,0
-14108,"236  ","2360016","¶Å¶ÞÜ¹Ý","ÖºÊÏ¼¶Å»ÞÜ¸","ÔÂÏÁ","_Þì§","¡lsàòæ","JÃ¬",0,0,0,0,0,0
+14108,"236  ","2360016","¶Å¶ÞÜ¹Ý","ÖºÊÏ¼¶Å»ÞÜ¸","ÔÂÁ®³","_Þì§","¡lsàòæ","JÃ¬",0,0,0,0,1,5
 14108,"236  ","2360026","¶Å¶ÞÜ¹Ý","ÖºÊÏ¼¶Å»ÞÜ¸","ÔÅ·ÞÁ®³","_Þì§","¡lsàòæ","ö¬",0,0,0,0,0,0
 14109,"222  ","2220000","¶Å¶ÞÜ¹Ý","ÖºÊÏ¼º³Î¸¸","²¶Æ¹²»²¶ÞÅ²ÊÞ±²","_Þì§","¡ls`kæ","ÈºÉfÚªÈ¢ê",0,0,0,0,0,0
@@ -53478,5 +53478,5 @@
 17201,"920  ","9200047","²¼¶Ü¹Ý","¶Å»ÞÜ¼","ÏÒÀÞÎÝÏÁ(¿ÉÀ)","Îì§","àòs","å¤c{¬i»Ì¼j",1,1,0,0,0,0
 17201,"920  ","9200937","²¼¶Ü¹Ý","¶Å»ÞÜ¼","ÏÙÉ³Á","Îì§","àòs","ÛÌà",0,0,0,0,0,0
-17201,"920  ","9200809","²¼¶Ü¹Ý","¶Å»ÞÜ¼","Ð²¹»¶´ÏÁ","Îì§","àòs","Orh¬",0,0,0,0,1,3
+17201,"920  ","9200809","²¼¶Ü¹Ý","¶Å»ÞÜ¼","Ð²¹»¶´ÏÁ","Îì§","àòs","Orh¬",0,0,0,0,0,0
 17201,"920  ","9200808","²¼¶Ü¹Ý","¶Å»ÞÜ¼","Ð²¹¼ÝÏÁ","Îì§","àòs","OrV¬",0,0,0,0,0,0
 17201,"920  ","9200802","²¼¶Ü¹Ý","¶Å»ÞÜ¼","Ð²¹ÏÁ","Îì§","àòs","Or¬",0,1,0,0,0,0
@@ -59743,6 +59743,6 @@
 20207,"382  ","3820063","Å¶ÞÉ¹Ý","½»Þ¶¼","Æ¼ÏÁ","·ì§","{âs","¼¬",0,0,0,0,0,0
 20207,"382  ","3820046","Å¶ÞÉ¹Ý","½»Þ¶¼","ÆÎÞ¸ÏÁ","·ì§","{âs","ñr¬",0,0,0,0,0,0
-20207,"38622","3862211","Å¶ÞÉ¹Ý","½»Þ¶¼","ÆÚ²ÏÁ(3153-1-3153-1100<ÐÈÉÊ×>)","·ì§","{âs","mç¬iRPTR|P`RPTR|PPOOuôÌ´vj",1,0,0,0,1,5
-20207,"382  ","3820034","Å¶ÞÉ¹Ý","½»Þ¶¼","ÆÚ²ÏÁ(¿ÉÀ)","·ì§","{âs","mç¬i»Ì¼j",1,0,0,0,1,5
+20207,"38622","3862211","Å¶ÞÉ¹Ý","½»Þ¶¼","ÆÚ²ÏÁ(3153-1-3153-1100<ÐÈÉÊ×>)","·ì§","{âs","mç¬iRPTR|P`RPTR|PPOOuôÌ´vj",1,0,0,0,0,0
+20207,"382  ","3820034","Å¶ÞÉ¹Ý","½»Þ¶¼","ÆÚ²ÏÁ(¿ÉÀ)","·ì§","{âs","mç¬i»Ì¼j",1,0,0,0,0,0
 20207,"382  ","3820064","Å¶ÞÉ¹Ý","½»Þ¶¼","ÇÏÒÏÁ","·ì§","{âs","ÀÚ¬",0,0,0,0,0,0
 20207,"382  ","3820037","Å¶ÞÉ¹Ý","½»Þ¶¼","ÉÍÞÏÁ","·ì§","{âs","ìÓ¬",0,0,0,0,0,0
@@ -63312,5 +63312,5 @@
 21219,"50151","5015124","·ÞÌ¹Ý","¸Þ¼Þ®³¼","¼ÛÄØÁ®³µµ¼Ï","ò§","Sãs","¹¬å",0,0,0,0,0,0
 21219,"50151","5015115","·ÞÌ¹Ý","¸Þ¼Þ®³¼","¼ÛÄØÁ®³µÝ¼Þ","ò§","Sãs","¹¬¶n",0,0,0,0,0,0
-21219,"50151","5015125","·ÞÌ¹Ý","¸Þ¼Þ®³¼","¼ÛÄØÁ®³ºÂ»","ò§","Sãs","¹¬z²",0,0,0,0,0,0
+21219,"50151","5015125","·ÞÌ¹Ý","¸Þ¼Þ®³¼","¼ÛÄØÁ®³º¯»","ò§","Sãs","¹¬z²",0,0,0,0,1,5
 21219,"50151","5015121","·ÞÌ¹Ý","¸Þ¼Þ®³¼","¼ÛÄØÁ®³¼ÛÄØ","ò§","Sãs","¹¬¹",0,0,0,0,0,0
 21219,"50151","5015122","·ÞÌ¹Ý","¸Þ¼Þ®³¼","¼ÛÄØÁ®³ÀÒ»ÞÆ","ò§","Sãs","¹¬×^",0,0,0,0,0,0
@@ -63362,5 +63362,5 @@
 21219,"50142","5014211","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³Å¶ÂÎÞ","ò§","Sãs","ª¦¬Ø",0,0,1,0,0,0
 21219,"50142","5014237","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³ÅËÞ","ò§","Sãs","ª¦¬ßä",0,0,0,0,0,0
-21219,"50142","5014207","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³Æ¼µÂÊß×","ò§","Sãs","ª¦¬¼³´",0,0,0,0,0,0
+21219,"50142","5014207","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³Æ¼µ¯Êß×","ò§","Sãs","ª¦¬¼³´",0,0,0,0,1,5
 21219,"50144","5014454","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³ÉÉ¸×","ò§","Sãs","ª¦¬ìXq",0,0,0,0,0,0
 21219,"50142","5014227","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³Ê¼ÓÄÁ®³","ò§","Sãs","ª¦¬´{¬",0,0,0,0,0,0
@@ -63371,5 +63371,5 @@
 21219,"50142","5014214","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³ÔÅ·ÞÏÁ","ò§","Sãs","ª¦¬ö¬",0,0,0,0,0,0
 21219,"50142","5014206","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÊÁÏÝÁ®³Ö¼É","ò§","Sãs","ª¦¬gì",0,0,0,0,0,0
-21219,"50141","5014104","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÐÅÐÁ®³³ÒÊÞ×","ò§","Sãs","üÀ¬~´",0,0,0,0,0,0
+21219,"50141","5014104","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÐÅÐÁ®³³ÒÊ×","ò§","Sãs","üÀ¬~´",0,0,0,0,1,5
 21219,"50141","5014107","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÐÅÐÁ®³µµÊ×","ò§","Sãs","üÀ¬å´",0,0,0,0,0,0
 21219,"50141","5014101","·ÞÌ¹Ý","¸Þ¼Þ®³¼","ÐÅÐÁ®³¶ÐÀ","ò§","Sãs","üÀ¬ãc",0,0,0,0,0,0
@@ -63406,11 +63406,11 @@
 21219,"50145","5014514","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³±ºÞÉ","ò§","Sãs","aÇ¬À½ì",0,0,0,0,0,0
 21219,"50145","5014501","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¶¸×","ò§","Sãs","aÇ¬­q",0,0,0,0,0,0
-21219,"50145","5014508","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¶Ð»Ü","ò§","Sãs","aÇ¬ãò",0,0,0,0,0,0
+21219,"50145","5014508","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¶Ð»ÞÜ","ò§","Sãs","aÇ¬ãò",0,0,0,0,1,5
 21219,"50145","5014512","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¶ÐÄÞ·®³","ò§","Sãs","aÇ¬ãy",0,0,0,0,0,0
 21219,"50145","5014517","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³»Ü","ò§","Sãs","aÇ¬ò",0,0,0,0,0,0
-21219,"50145","5014509","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¼Ó»Ü","ò§","Sãs","aÇ¬ºò",0,0,0,0,0,0
+21219,"50145","5014509","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¼Ó»ÞÜ","ò§","Sãs","aÇ¬ºò",0,0,0,0,1,5
 21219,"50145","5014513","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¼ÓÄÞ·®³","ò§","Sãs","aÇ¬ºy",0,0,0,0,0,0
-21219,"50145","5014511","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¼ÓÎ×","ò§","Sãs","aÇ¬º´",0,0,0,0,0,0
-21219,"50145","5014504","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³ÀË×","ò§","Sãs","aÇ¬c½",0,0,0,0,0,0
+21219,"50145","5014511","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³¼ÓÎÞ×","ò§","Sãs","aÇ¬º´",0,0,0,0,1,5
+21219,"50145","5014504","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³ÀËÞ×","ò§","Sãs","aÇ¬c½",0,0,0,0,1,5
 21219,"50145","5014518","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³ÄÞ·®³","ò§","Sãs","aÇ¬y",0,0,0,0,0,0
 21219,"50145","5014503","·ÞÌ¹Ý","¸Þ¼Þ®³¼","Ü×Á®³É¼ÞØ","ò§","Sãs","aÇ¬ìK",0,0,0,0,0,0
@@ -72592,6 +72592,6 @@
 23217,"483  ","4838366","±²Á¹Ý","º³ÅÝ¼","º³ÉÁ®³¶ÝÁ¸","¤m§","]ìs","Íì¬Ç|",0,0,0,0,0,0
 23217,"483  ","4838369","±²Á¹Ý","º³ÅÝ¼","º³ÉÁ®³º³É","¤m§","]ìs","Íì¬Íì",0,0,0,0,0,0
+23217,"483  ","4838363","±²Á¹Ý","º³ÅÝ¼","º³ÉÁ®³ºÞ¼Þ¯¹Ý","¤m§","]ìs","Íì¬Ü\Ô",0,0,0,0,1,5
 23217,"483  ","4838362","±²Á¹Ý","º³ÅÝ¼","º³ÉÁ®³ºÜ·","¤m§","]ìs","Íì¬¬e",0,0,0,0,0,0
-23217,"483  ","4838363","±²Á¹Ý","º³ÅÝ¼","º³ÉÁ®³ºÞ¼Þ­¯¹Ý","¤m§","]ìs","Íì¬Ü\Ô",0,0,0,0,0,0
 23217,"483  ","4838136","±²Á¹Ý","º³ÅÝ¼","ºµØÁ®³(»¸Ó)","¤m§","]ìs","¬Ü¬i÷_j",1,0,0,0,0,0
 23217,"483  ","4838137","±²Á¹Ý","º³ÅÝ¼","ºµØÁ®³(ÊÁØ­³)","¤m§","]ìs","¬Ü¬iª³j",1,0,0,0,0,0
@@ -85840,5 +85840,6 @@
 26214,"61911","6191111","·®³ÄÌ","·ÂÞ¶ÞÜ¼","¶ÓÁ®³ÔÏÀÞ","s{","ØÃìs","ÁÎ¬Rc",0,1,0,0,0,0
 26214,"61911","6191106","·®³ÄÌ","·ÂÞ¶ÞÜ¼","¶ÓÁ®³Ú²Í²","s{","ØÃìs","ÁÎ¬á¼",0,1,0,0,0,0
-26214,"61902","6190214","·®³ÄÌ","·ÂÞ¶ÞÜ¼","·ÂÞ","s{","ØÃìs","ØÃ",0,1,0,0,0,0
+26214,"61902","6190214","·®³ÄÌ","·ÂÞ¶ÞÜ¼","·ÂÞ","s{","ØÃìs","ØÃ",0,1,0,1,1,5
+26214,"61902","6190214","·®³ÄÌ","·ÂÞ¶ÞÜ¼","·ÂÞ´·Ï´","s{","ØÃìs","ØÃwO",0,0,1,1,1,3
 26214,"61902","6190225","·®³ÄÌ","·ÂÞ¶ÞÜ¼","·ÂÞ¶ÞÜÀÞ²","s{","ØÃìs","ØÃìä",0,0,1,0,0,0
 26214,"61902","6190217","·®³ÄÌ","·ÂÞ¶ÞÜ¼","·ÂÞÏÁ","s{","ØÃìs","ØÃ¬",0,0,0,0,0,0
@@ -89990,5 +89991,4 @@
 28102,"657  ","6570054","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","Ë´Ê×Á®³","ºÉ§","_Ësåæ","B´¬",0,0,1,0,0,0
 28102,"657  ","6570029","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ËµÁ®³","ºÉ§","_Ësåæ","úö¬",0,0,1,0,0,0
-28102,"657  ","6570855","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ËÉÃÞÁ®³","ºÉ§","_Ësåæ","úo¬",0,0,0,1,0,0
 28102,"657  ","6570041","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ËÞÜÁ®³","ºÉ§","_Ësåæ","úi¬",0,0,1,0,0,0
 28102,"657  ","6570037","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ËÞÝºÞÁ®³","ºÉ§","_Ësåæ","õã¬",0,0,1,0,0,0
@@ -89996,5 +89996,5 @@
 28102,"657  ","6570824","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","Ì¸½ÞÐÄÞµØ","ºÉ§","_Ësåæ","ZÊ",0,0,1,0,0,0
 28102,"657  ","6570842","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ÌÅÃÞ×ÄÞµØ","ºÉ§","_Ësåæ","DÊ",0,0,1,0,0,0
-28102,"657  ","6570855","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ÏÔ¶²¶ÞÝÄÞµØ","ºÉ§","_Ësåæ","ëCÝÊ",0,0,1,1,0,0
+28102,"657  ","6570855","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ÏÔ¶²¶ÞÝÄÞµØ","ºÉ§","_Ësåæ","ëCÝÊ",0,0,1,0,1,5
 28102,"65701","6570104","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ÏÔ»Ý","ºÉ§","_Ësåæ","ëR",0,0,0,0,0,0
 28102,"65701","6570105","Ë®³ºÞ¹Ý","º³ÍÞ¼ÅÀÞ¸","ÏÔ»ÝÁ®³","ºÉ§","_Ësåæ","ëR¬",0,0,0,0,0,0
@@ -100610,5 +100610,5 @@
 32203,"693  ","6930033","¼ÏÈ¹Ý","²½ÞÓ¼","Á²ÐÔÁ®³","ª§","o_s","mä{¬",0,0,0,0,0,0
 32203,"691  ","6910071","¼ÏÈ¹Ý","²½ÞÓ¼","ÁºÞ³Á®³","ª§","o_s","n¬",0,0,0,0,0,0
-32203,"693  ","6930029","¼ÏÈ¹Ý","²½ÞÓ¼","Â·ÔÏ¼ÝÏÁ","ª§","o_s","zRV¬",0,0,0,0,1,3
+32203,"693  ","6930029","¼ÏÈ¹Ý","²½ÞÓ¼","Â·ÔÏ¼ÝÏÁ","ª§","o_s","zRV¬",0,0,0,0,0,0
 32203,"693  ","6930057","¼ÏÈ¹Ý","²½ÞÓ¼","ÂÈÏÂÁ®³","ª§","o_s","í¼¬",0,0,0,0,0,0
 32203,"693  ","6930005","¼ÏÈ¹Ý","²½ÞÓ¼","ÃÝ¼ÞÝÁ®³","ª§","o_s","V_¬",0,0,0,0,0,0
@@ -106722,4 +106722,5 @@
 35207,"744  ","7440032","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","²¸ÉÔÆ¼","Rû§","º¼s","¶ì®¼",1,0,1,0,0,0
 35207,"744  ","7440033","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","²¸ÉÔÐÅÐ","Rû§","º¼s","¶ì®ì",1,0,1,0,0,0
+35207,"744  ","7440007","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","´·ÐÅÐ","Rû§","º¼s","wì",0,0,1,0,1,5
 35207,"744  ","7440015","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","µµÃÏÁ","Rû§","º¼s","åè¬",0,0,1,0,0,0
 35207,"74402","7440272","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","µµÌ¼ÞÀÞÆ","Rû§","º¼s","å¡J",0,0,0,0,0,0
@@ -106783,4 +106784,5 @@
 35207,"744  ","7440074","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","¼µÈÁ®³","Rû§","º¼s","ª¹¬",0,0,1,0,0,0
 35207,"744  ","7440062","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","¼®³ÜÏÁ","Rû§","º¼s","ºa¬",0,0,1,0,0,0
+35207,"744  ","7440008","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","¼Ý¶Ü","Rû§","º¼s","Vì",0,0,1,0,1,5
 35207,"744  ","7440024","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","½´À¹¶Ð","Rû§","º¼s","ã",0,0,0,1,0,0
 35207,"744  ","7440024","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","½´À¹¶Ð(±¹ÞÁÞ)","Rû§","º¼s","ãiãnj",1,0,0,1,0,0
@@ -106823,5 +106825,5 @@
 35207,"744  ","7440043","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","Ä³Ö³","Rû§","º¼s","z",0,0,1,0,0,0
 35207,"744  ","7440053","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","Ä³Ü","Rû§","º¼s","a",0,0,1,0,0,0
-35207,"744  ","7440014","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","Å¶²Á","Rû§","º¼s","s",0,0,0,0,0,0
+35207,"744  ","7440014","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","Å¶²Á","Rû§","º¼s","s",0,0,1,0,1,5
 35207,"74402","7440275","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","Å¶½ÐÅÐ","Rû§","º¼s","{ì",0,0,0,0,0,0
 35207,"744  ","7440011","ÔÏ¸ÞÁ¹Ý","¸ÀÞÏÂ¼","Æ¼ÄÖ²","Rû§","º¼s","¼Lä",0,0,0,1,0,0
@@ -106882,5 +106884,5 @@
 35208,"740  ","7400024","ÔÏ¸ÞÁ¹Ý","²Ü¸Æ¼","±»ËÏÁ","Rû§","âs","®¬",0,0,1,0,0,0
 35208,"741  ","7410094","ÔÏ¸ÞÁ¹Ý","²Ü¸Æ¼","±¼ÞÅ","Rû§","âs","¢i",0,0,0,0,0,0
-35208,"740  ","7400037","ÔÏ¸ÞÁ¹Ý","²Ü¸Æ¼","±ÀºÞÏÁ","Rû§","âs","¤¬",0,0,1,0,1,5
+35208,"740  ","7400037","ÔÏ¸ÞÁ¹Ý","²Ü¸Æ¼","±ÀºÞÏÁ","Rû§","âs","¤¬",0,0,1,0,0,0
 35208,"740  ","7400003","ÔÏ¸ÞÁ¹Ý","²Ü¸Æ¼","²²ÀÞÏÁ","Rû§","âs","Ñc¬",0,0,1,0,0,0
 35208,"74003","7400324","ÔÏ¸ÞÁ¹Ý","²Ü¸Æ¼","²Ì»","Rû§","âs","É[",0,0,0,0,0,0
@@ -116265,4 +116267,5 @@
 40349,"81123","8112301","Ì¸µ¶¹Ý","¶½Ô¸ÞÝ¶½ÔÏÁ","¶Ðµµ¸Ï","ª§","®S®¬","ãåG",0,0,0,0,0,0
 40349,"81123","8112309","Ì¸µ¶¹Ý","¶½Ô¸ÞÝ¶½ÔÏÁ","¶Ö²Á®³","ª§","®S®¬","í^",0,0,1,0,0,0
+40349,"81123","8112315","Ì¸µ¶¹Ý","¶½Ô¸ÞÝ¶½ÔÏÁ","º³Å¶ÊÞÙ","ª§","®S®¬","b´",0,0,1,0,1,2
 40349,"81123","8112303","Ì¸µ¶¹Ý","¶½Ô¸ÞÝ¶½ÔÏÁ","»¶ÄÞ","ª§","®S®¬","ða",0,0,0,0,0,0
 40349,"81123","8112311","Ì¸µ¶¹Ý","¶½Ô¸ÞÝ¶½ÔÏÁ","Á®³¼Þ¬ÊÞÙ","ª§","®S®¬","·Ò´",0,0,0,0,0,0
@@ -126446,6 +126449,6 @@
 47214,"90605","9060506","µ·ÅÜ¹Ý","ÐÔº¼ÞÏ¼","²×ÌÞÅ¶ÞÊÏ","«ê§","{Ãs","ÉÇ·l",0,0,0,0,0,0
 47214,"90605","9060501","µ·ÅÜ¹Ý","ÐÔº¼ÞÏ¼","²×ÌÞÏ´»Ä¿´","«ê§","{Ãs","ÉÇO¢Y",0,0,0,0,0,0
-47214,"90602","9060202","µ·ÅÜ¹Ý","ÐÔº¼ÞÏ¼","³´É±×»ÞÄ","«ê§","{Ãs","ãìV¢",0,0,0,0,0,0
 47214,"90602","9060204","µ·ÅÜ¹Ý","ÐÔº¼ÞÏ¼","³´É³´É","«ê§","{Ãs","ãìãì",0,0,0,0,0,0
+47214,"90602","9060202","µ·ÅÜ¹Ý","ÐÔº¼ÞÏ¼","³´É¼Ý»ÞÄ","«ê§","{Ãs","ãìV¢",0,0,0,0,1,5
 47214,"90602","9060201","µ·ÅÜ¹Ý","ÐÔº¼ÞÏ¼","³´ÉÉÊÞÙ","«ê§","{Ãs","ãìì´",0,0,0,0,0,0
 47214,"90602","9060203","µ·ÅÜ¹Ý","ÐÔº¼ÞÏ¼","³´ÉÐÔ¸ÞÆ","«ê§","{Ãs","ãì{",0,0,0,0,0,0
Index: /branches/version-2_12-multilang/data/class/util/SC_Utils.php
===================================================================
--- /branches/version-2_12-multilang/data/class/util/SC_Utils.php	(revision 21927)
+++ /branches/version-2_12-multilang/data/class/util/SC_Utils.php	(revision 22058)
@@ -1750,4 +1750,52 @@
     }
 
-
+    /**
+     * マルチバイト対応の trim
+     *
+     * @param string $str 入力文字列
+     * @param string $charlist 削除する文字を指定
+     * @return string 変更後の文字列
+     */
+    static function trim($str, $charlist = null) {
+        $re = SC_Utils_Ex::getTrimPregPattern($charlist);
+        return preg_replace('/(^' . $re . ')|(' . $re . '$)/us', '', $str);
+    }
+
+    /**
+     * マルチバイト対応の ltrim
+     *
+     * @param string $str 入力文字列
+     * @param string $charlist 削除する文字を指定
+     * @return string 変更後の文字列
+     */
+    static function ltrim($str, $charlist = null) {
+        $re = SC_Utils_Ex::getTrimPregPattern($charlist);
+        return preg_replace('/^' . $re . '/us', '', $str);
+    }
+
+    /**
+     * マルチバイト対応の rtrim
+     *
+     * @param string $str 入力文字列
+     * @param string $charlist 削除する文字を指定
+     * @return string 変更後の文字列
+     */
+    static function rtrim($str, $charlist = null) {
+        $re = SC_Utils_Ex::getTrimPregPattern($charlist);
+        return preg_replace('/' . $re . '$/us', '', $str);
+    }
+
+    /**
+     * 文字列のトリム処理で使用する PCRE のパターン
+     *
+     * @param string $charlist 削除する文字を指定
+     * @return string パターン
+     */
+    static function getTrimPregPattern($charlist = null) {
+        if (is_null($charlist)) {
+            return '\s+';
+        } else {
+            return '[' . preg_quote($charlist, '/') . ']+';
+        }
+    }
 }
Index: /branches/version-2_12-multilang/data/class/db/SC_DB_DBFactory.php
===================================================================
--- /branches/version-2_12-multilang/data/class/db/SC_DB_DBFactory.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/db/SC_DB_DBFactory.php	(revision 22058)
@@ -169,3 +169,13 @@
     function initObjQuery(SC_Query &$objQuery) {
     }
+
+    /**
+     * テーブル一覧を取得する
+     *
+     * @return array テーブル名の配列
+     */
+    function listTables(SC_Query &$objQuery) {
+        $objManager =& $objQuery->conn->loadModule('Manager');
+        return $objManager->listTables();
+    }
 }
Index: /branches/version-2_12-multilang/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
===================================================================
--- /branches/version-2_12-multilang/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php	(revision 22058)
@@ -251,3 +251,16 @@
         return '';
     }
+
+    /**
+     * テーブル一覧を取得する
+     *
+     * MDB2_Driver_Manager_pgsql#listTables の不具合回避を目的として独自実装している。
+     * @return array テーブル名の配列
+     */
+    function listTables(SC_Query &$objQuery) {
+        $col = 'tablename';
+        $from = 'pg_tables';
+        $where = "schemaname NOT IN ('pg_catalog', 'information_schema', 'sys')";
+        return $objQuery->getCol($col, $from, $where);
+    }
 }
Index: /branches/version-2_12-multilang/data/class/SC_UploadFile.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_UploadFile.php	(revision 22031)
+++ /branches/version-2_12-multilang/data/class/SC_UploadFile.php	(revision 22058)
@@ -156,7 +156,7 @@
                         $uniqname = date('mdHi') . '_' . uniqid('').'.';
                         $this->temp_file[$cnt] = preg_replace("/^.*\./", $uniqname, $_FILES[$keyname]['name']);
-                        set_time_limit(0);
                         $result  = copy($_FILES[$keyname]['tmp_name'], $this->temp_dir . $this->temp_file[$cnt]);
                         GC_Utils_Ex::gfPrintLog($result.' -> '. $this->temp_dir . $this->temp_file[$cnt]);
+                        SC_Utils_Ex::extendTimeOut();
                     }
                 }
Index: /branches/version-2_12-multilang/data/class/SC_Initial.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_Initial.php	(revision 22048)
+++ /branches/version-2_12-multilang/data/class/SC_Initial.php	(revision 22058)
@@ -38,5 +38,5 @@
 
         /** EC-CUBEのバージョン */
-        define('ECCUBE_VERSION', '2.12.2-dev');
+        define('ECCUBE_VERSION', '2.12.3-dev');
     }
 
Index: /branches/version-2_12-multilang/data/class/SC_SiteView.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_SiteView.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/SC_SiteView.php	(revision 22058)
@@ -38,5 +38,4 @@
 
         $this->assignTemplatePath(DEVICE_TYPE_PC);
-        $this->initpath();
     }
 
Index: /branches/version-2_12-multilang/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- /branches/version-2_12-multilang/data/class/helper/SC_Helper_Purchase.php	(revision 21951)
+++ /branches/version-2_12-multilang/data/class/helper/SC_Helper_Purchase.php	(revision 22058)
@@ -200,31 +200,29 @@
      */
     function verifyChangeCart($uniqId, &$objCartSession) {
-        $cartKeys = $objCartSession->getKeys();
+        $cartKey = $objCartSession->getKey();
 
         // カート内が空でないか
-        if (SC_Utils_Ex::isBlank($cartKeys)) {
+        if (SC_Utils_Ex::isBlank($cartKey)) {
             SC_Response_Ex::sendRedirect(CART_URLPATH);
             exit;
         }
 
-        foreach ($cartKeys as $cartKey) {
-            // 初回のみカートの内容を保存
-            $objCartSession->saveCurrentCart($uniqId, $cartKey);
-
-            /*
-             * POSTのユニークIDとセッションのユニークIDを比較
-             *(ユニークIDがPOSTされていない場合はスルー)
-             */
-            if (!SC_SiteSession_Ex::checkUniqId()) {
-                SC_Utils_Ex::sfDispSiteError(CANCEL_PURCHASE);
-                exit;
-            }
-
-            // 購入ボタンを押してから変化がないか
-            $quantity = $objCartSession->getTotalQuantity($cartKey);
-            if ($objCartSession->checkChangeCart($cartKey) || !($quantity > 0)) {
-                SC_Response_Ex::sendRedirect(CART_URLPATH);
-                exit;
-            }
+        // 初回のみカートの内容を保存
+        $objCartSession->saveCurrentCart($uniqId, $cartKey);
+
+        /*
+         * POSTのユニークIDとセッションのユニークIDを比較
+         *(ユニークIDがPOSTされていない場合はスルー)
+         */
+        if (!SC_SiteSession_Ex::checkUniqId()) {
+            SC_Utils_Ex::sfDispSiteError(CANCEL_PURCHASE);
+            exit;
+        }
+
+        // 購入ボタンを押してから変化がないか
+        $quantity = $objCartSession->getTotalQuantity($cartKey);
+        if ($objCartSession->checkChangeCart($cartKey) || !($quantity > 0)) {
+            SC_Response_Ex::sendRedirect(CART_URLPATH);
+            exit;
         }
     }
Index: /branches/version-2_12-multilang/data/class/helper/SC_Helper_CSV.php
===================================================================
--- /branches/version-2_12-multilang/data/class/helper/SC_Helper_CSV.php	(revision 22040)
+++ /branches/version-2_12-multilang/data/class/helper/SC_Helper_CSV.php	(revision 22058)
@@ -71,7 +71,4 @@
      */
     function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false) {
-        // 実行時間を制限しない
-        @set_time_limit(0);
-
         // CSV出力タイトル行の作成
         $arrOutput = SC_Utils_Ex::sfSwapArray($this->sfGetCsvOutput($csv_id, 'status = ' . CSV_COLUMN_STATUS_FLG_ENABLE));
@@ -207,4 +204,5 @@
         $line .= "\r\n";
         fwrite($this->fpOutput, $line);
+        SC_Utils_Ex::extendTimeOut();
         return true;
     }
@@ -223,6 +221,4 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-        // 実行時間を制限しない
-        @set_time_limit(0);
         // ヘッダ構築
         if (is_array($arrHeader)) {
Index: /branches/version-2_12-multilang/data/class/helper/SC_Helper_Plugin.php
===================================================================
--- /branches/version-2_12-multilang/data/class/helper/SC_Helper_Plugin.php	(revision 21956)
+++ /branches/version-2_12-multilang/data/class/helper/SC_Helper_Plugin.php	(revision 22058)
@@ -79,5 +79,5 @@
      */
     static function getSingletonInstance($plugin_activate_flg = true) {
-        if (!isset($GLOBALS['_SC_Helper_Plugin_instance']) || is_null($GLOBALS['_SC_Helper_Plugin_instance'])) {
+        if (!isset($GLOBALS['_SC_Helper_Plugin_instance'])) {
             // プラグインのローダーがDB接続を必要とするため、
             // SC_Queryインスタンス生成後のみオブジェクトを生成する。
Index: /branches/version-2_12-multilang/data/class/helper/SC_Helper_FPDI.php
===================================================================
--- /branches/version-2_12-multilang/data/class/helper/SC_Helper_FPDI.php	(revision 21991)
+++ /branches/version-2_12-multilang/data/class/helper/SC_Helper_FPDI.php	(revision 22058)
@@ -167,8 +167,6 @@
             $h = 4;
             $i = 0;
-            $y = $this->y;
             $this->Cell(5, $h, '', 0, 0, '', 0, '');
             foreach ($row as $col) {
-                $this->y = $y;
                 // FIXME 汎用的ではない処理。この指定は呼び出し元で行うようにしたい。
                 if ($i == 0) {
Index: /branches/version-2_12-multilang/data/class/helper/SC_Helper_Mail.php
===================================================================
--- /branches/version-2_12-multilang/data/class/helper/SC_Helper_Mail.php	(revision 22046)
+++ /branches/version-2_12-multilang/data/class/helper/SC_Helper_Mail.php	(revision 22058)
@@ -261,4 +261,6 @@
         $objMailView->assignobj($objTplAssign);
         $subject = $objMailView->fetch('mail_templates/mail_title.tpl');
+        // #1940 (SC_Helper_Mail#sfMakeSubject 先頭に改行を含む値を返す) 対応
+        $subject = trim($subject);
         return $subject;
     }
Index: /branches/version-2_12-multilang/data/class/helper/SC_Helper_DB.php
===================================================================
--- /branches/version-2_12-multilang/data/class/helper/SC_Helper_DB.php	(revision 22046)
+++ /branches/version-2_12-multilang/data/class/helper/SC_Helper_DB.php	(revision 22058)
@@ -985,11 +985,22 @@
             $uprank = $rank + 1;
             $up_id = $objQuery->get($colname, $table, $where, array($uprank));
+
             // ランク入れ替えの実行
-            $sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?";
+            $where = "$colname = ?";
             if ($andwhere != '') {
-                $sqlup.= " AND $andwhere";
-            }
-            $objQuery->exec($sqlup, array($rank + 1, $id));
-            $objQuery->exec($sqlup, array($rank, $up_id));
+                $where .= " AND $andwhere";
+            }
+
+            $sqlval = array(
+                'rank' => $rank + 1,
+            );
+            $arrWhereVal = array($id);
+            $objQuery->update($table, $sqlval, $where, $arrWhereVal);
+
+            $sqlval = array(
+                'rank' => $rank,
+            );
+            $arrWhereVal = array($up_id);
+            $objQuery->update($table, $sqlval, $where, $arrWhereVal);
         }
         $objQuery->commit();
@@ -1024,11 +1035,22 @@
             $downrank = $rank - 1;
             $down_id = $objQuery->get($colname, $table, $where, array($downrank));
+
             // ランク入れ替えの実行
-            $sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?";
+            $where = "$colname = ?";
             if ($andwhere != '') {
-                $sqlup.= " AND $andwhere";
-            }
-            $objQuery->exec($sqlup, array($rank - 1, $id));
-            $objQuery->exec($sqlup, array($rank, $down_id));
+                $where .= " AND $andwhere";
+            }
+
+            $sqlval = array(
+                'rank' => $rank - 1,
+            );
+            $arrWhereVal = array($id);
+            $objQuery->update($table, $sqlval, $where, $arrWhereVal);
+
+            $sqlval = array(
+                'rank' => $rank,
+            );
+            $arrWhereVal = array($down_id);
+            $objQuery->update($table, $sqlval, $where, $arrWhereVal);
         }
         $objQuery->commit();
@@ -1078,19 +1100,33 @@
 
         // 指定した順位の商品から移動させる商品までのrankを１つずらす
-        $sql = "UPDATE $tableName SET rank = $term WHERE rank BETWEEN ? AND ?";
+        $sqlval = array();
+        $arrRawSql = array(
+            'rank' => $term,
+        );
+        $str_where = 'rank BETWEEN ? AND ?';
         if ($where != '') {
-            $sql.= " AND $where";
-        }
-
-        if ($position > $rank) $objQuery->exec($sql, array($rank + 1, $position));
-        if ($position < $rank) $objQuery->exec($sql, array($position, $rank - 1));
+            $str_where .= " AND $where";
+        }
+
+        if ($position > $rank) {
+            $arrWhereVal = array($rank + 1, $position);
+            $objQuery->update($tableName, $sqlval, $str_where, $arrWhereVal, $arrRawSql);
+        }
+        if ($position < $rank) {
+            $arrWhereVal = array($position, $rank - 1);
+            $objQuery->update($tableName, $sqlval, $str_where, $arrWhereVal, $arrRawSql);
+        }
 
         // 指定した順位へrankを書き換える。
-        $sql  = "UPDATE $tableName SET rank = ? WHERE $keyIdColumn = ? ";
+        $sqlval = array(
+            'rank' => $position,
+        );
+        $str_where = "$keyIdColumn = ?";
         if ($where != '') {
-            $sql.= " AND $where";
-        }
-
-        $objQuery->exec($sql, array($position, $keyId));
+            $str_where .= " AND $where";
+        }
+        $arrWhereVal = array($keyId);
+        $objQuery->update($tableName, $sqlval, $str_where, $arrWhereVal);
+
         $objQuery->commit();
     }
@@ -1122,8 +1158,11 @@
         if (!$delete) {
             // ランクを最下位にする、DELフラグON
-            $sqlup = "UPDATE $table SET rank = 0, del_flg = 1 ";
-            $sqlup.= "WHERE $colname = ?";
-            // UPDATEの実行
-            $objQuery->exec($sqlup, array($id));
+            $sqlval = array(
+                'rank'      => 0,
+                'del_flg'   => 1,
+            );
+            $where = "$colname = ?";
+            $arrWhereVal = array($id);
+            $objQuery->update($table, $sqlval, $where, $arrWhereVal);
         } else {
             $objQuery->delete($table, "$colname = ?", array($id));
@@ -1131,10 +1170,15 @@
 
         // 追加レコードのランクより上のレコードを一つずらす。
+        $sqlval = array();
         $where = 'rank > ?';
         if ($andwhere != '') {
-            $where.= " AND $andwhere";
-        }
-        $sqlup = "UPDATE $table SET rank = (rank - 1) WHERE $where";
-        $objQuery->exec($sqlup, array($rank));
+            $where .= " AND $andwhere";
+        }
+        $arrWhereVal = array($rank);
+        $arrRawSql = array(
+            'rank' => '(rank - 1)',
+        );
+        $objQuery->update($table, $sqlval, $where, $arrWhereVal, $arrRawSql);
+
         $objQuery->commit();
     }
@@ -1170,4 +1214,6 @@
     /**
      * カテゴリ変更時の移動処理を行う.
+     * 
+     * ※この関数って、どこからも呼ばれていないのでは？？
      *
      * @param SC_Query $objQuery SC_Query インスタンス
@@ -1186,16 +1232,24 @@
         // 旧カテゴリでのランク削除処理
         // 移動レコードのランクを取得する。
+        $sqlval = array();
         $where = "$id_name = ?";
         $rank = $objQuery->get('rank', $table, $where, array($id));
         // 削除レコードのランクより上のレコードを一つ下にずらす。
         $where = "rank > ? AND $cat_name = ?";
-        $sqlup = "UPDATE $table SET rank = (rank - 1) WHERE $where";
-        $objQuery->exec($sqlup, array($rank, $old_catid));
+        $arrWhereVal = array($rank, $old_catid);
+        $arrRawSql = array(
+            'rank' => '(rank - 1)',
+        );
+        $objQuery->update($table, $sqlval, $where, $arrWhereVal, $arrRawSql);
+
         // 新カテゴリでの登録処理
         // 新カテゴリの最大ランクを取得する。
         $max_rank = $objQuery->max('rank', $table, "$cat_name = ?", array($new_catid)) + 1;
+        $sqlval = array(
+            'rank' => $max_rank,
+        );
         $where = "$id_name = ?";
-        $sqlup = "UPDATE $table SET rank = ? WHERE $where";
-        $objQuery->exec($sqlup, array($max_rank, $id));
+        $arrWhereVal = array($id);
+        $objQuery->update($table, $sqlval, $where, $arrWhereVal);
     }
 
Index: /branches/version-2_12-multilang/data/class/SC_Query.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_Query.php	(revision 22031)
+++ /branches/version-2_12-multilang/data/class/SC_Query.php	(revision 22058)
@@ -839,6 +839,5 @@
      */
     function listTables() {
-        $objManager =& $this->conn->loadModule('Manager');
-        return $objManager->listTables();
+        return $this->dbFactory->listTables($this);
     }
 
Index: /branches/version-2_12-multilang/data/class/SC_View.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_View.php	(revision 22031)
+++ /branches/version-2_12-multilang/data/class/SC_View.php	(revision 22058)
@@ -190,14 +190,4 @@
     }
 
-    /* サイト初期設定 */
-    function initpath() {
-        $array = array();
-        $array['tpl_mainnavi'] = realpath(dirname(__FILE__)) . '/../Smarty/templates/frontparts/mainnavi.tpl';
-
-        $objDb = new SC_Helper_DB_Ex();
-        $array['tpl_root_id'] = $objDb->sfGetRootId();
-        $this->assignarray($array);
-    }
-
     /**
      * テンプレートパスをアサインする.
Index: /branches/version-2_12-multilang/data/class/SC_Fpdf.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_Fpdf.php	(revision 22030)
+++ /branches/version-2_12-multilang/data/class/SC_Fpdf.php	(revision 22058)
@@ -267,11 +267,17 @@
     }
 
+    /**
+     * 備考の出力を行う
+     *
+     * @param string $str 入力文字列
+     * @return string 変更後の文字列
+     */
     function setEtcData() {
         $this->Cell(0, 10, '', 0, 1, 'C', 0, '');
         $this->SetFont('Gothic', 'B', 9);
         $this->MultiCell(0, 6, SC_I18n_Ex::t('SC_FPDF_LABEL_ETC'), 'T', 2, 'L', 0, '');  //備考
-        $this->Ln();
         $this->SetFont('SJIS', '', 8);
-        $this->MultiCell(0, 4, $this->arrData['etc1']."\n".$this->arrData['etc2']."\n".$this->arrData['etc3'], '', 2, 'L', 0, '');  //備考
+        $text = SC_Utils_Ex::rtrim($this->arrData['etc1'] . "\n" . $this->arrData['etc2'] . "\n" . $this->arrData['etc3']);
+        $this->MultiCell(0, 4, $text, '', 2, 'L', 0, '');
     }
 
Index: /branches/version-2_12-multilang/data/class/SC_AdminView.php
===================================================================
--- /branches/version-2_12-multilang/data/class/SC_AdminView.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/SC_AdminView.php	(revision 22058)
@@ -32,7 +32,7 @@
         $this->_smarty->template_dir = TEMPLATE_ADMIN_REALDIR;
         $this->_smarty->compile_dir = COMPILE_ADMIN_REALDIR;
+        $this->assign('TPL_URLPATH_PC', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . '/');
         $this->assign('TPL_URLPATH_DEFAULT', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/');
         $this->assign('TPL_URLPATH', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . 'admin/');
-        $this->initpath();
     }
 }
Index: /branches/version-2_12-multilang/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/entry/LC_Page_Entry.php	(revision 21950)
+++ /branches/version-2_12-multilang/data/class/pages/entry/LC_Page_Entry.php	(revision 22058)
@@ -140,6 +140,4 @@
                     $uniqid             = $this->lfRegistCustomerData($this->lfMakeSqlVal($objFormParam));
 
-                    $this->tpl_mainpage = 'entry/complete.tpl';
-                    $this->tpl_title    = '会員登録(完了ページ)';
                     $this->lfSendMail($uniqid, $this->arrForm);
 
Index: /branches/version-2_12-multilang/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/products/LC_Page_Products_Detail.php	(revision 21988)
+++ /branches/version-2_12-multilang/data/class/pages/products/LC_Page_Products_Detail.php	(revision 22058)
@@ -609,14 +609,26 @@
      */
     function doMobileSelectItem() {
-        $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,$this->tpl_classcat_find1,$this->tpl_classcat_find2);
+        $objProduct = new SC_Product_Ex();
+
+        $this->arrErr = $this->lfCheckError($this->mode, $this->objFormParam, $this->tpl_classcat_find1, $this->tpl_classcat_find2);
+
+        // この段階では、商品規格ID・数量の入力チェックエラーを出させない。
+        // FIXME: エラーチェックの定義で mode で定義を分岐する方が良いように感じる
+        unset($this->arrErr['product_class_id']);
+        unset($this->arrErr['quantity']);
 
         // 規格2が設定されていて、エラーを検出した場合
-        if ($this->tpl_classcat_find2 and $this->arrErr['classcategory_id2']) {
+        if ($this->tpl_classcat_find2 and !empty($this->arrErr)) {
             // templateの変更
             $this->tpl_mainpage = 'products/select_find2.tpl';
-            break;
-        }
+            return;
+        }
+
+        $product_id = $this->objFormParam->getValue('product_id');
 
         $value1 = $this->objFormParam->getValue('classcategory_id1');
+        if (strlen($value1) === 0) {
+            $value1 = '__unselected';
+        }
 
         // 規格2が設定されている場合.
@@ -627,12 +639,6 @@
         }
 
-        if (strlen($value1) === 0) {
-            $value1 = '__unselected';
-        }
-
+        $objProduct->setProductsClassByProductIds(array($product_id));
         $this->tpl_product_class_id = $objProduct->classCategories[$product_id][$value1][$value2]['product_class_id'];
-
-        // この段階では、数量の入力チェックエラーを出させない。
-        unset($this->arrErr['quantity']);
 
         // 数量の入力を行う
Index: /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	(revision 21829)
+++ /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	(revision 22058)
@@ -343,7 +343,4 @@
         $zv_filesize = filesize($realpath);
         header('Content-Length: ' . $zv_filesize);
-        set_time_limit(0);
-        ob_end_flush();
-        flush();
         //ファイル読み込み
         $handle = fopen($realpath, 'rb');
@@ -353,7 +350,7 @@
         }
         while (!feof($handle)) {
-            echo(fread($handle, DOWNLOAD_BLOCK*1024));
-            ob_flush();
-            flush();
+            echo fread($handle, DOWNLOAD_BLOCK*1024);
+            SC_Utils_Ex::sfFlush();
+            SC_Utils_Ex::extendTimeOut();
         }
         fclose($handle);
Index: /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_Favorite.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_Favorite.php	(revision 22058)
@@ -126,5 +126,9 @@
 
         $objQuery->setOrder('create_date DESC');
-        $arrProductId  = $objQuery->getCol('product_id', 'dtb_customer_favorite_products', 'customer_id = ?', array($customer_id));
+        $where = 'customer_id = ?';
+        if (NOSTOCK_HIDDEN) {
+            $where .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = dtb_customer_favorite_products.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
+        }
+        $arrProductId  = $objQuery->getCol('product_id', 'dtb_customer_favorite_products', $where, array($customer_id));
 
         $objQuery       =& SC_Query_Ex::getSingletonInstance();
@@ -176,8 +180,4 @@
             $where = '0<>0';
         }
-        // 在庫無し商品の非表示
-        if (NOSTOCK_HIDDEN) {
-            $where .= ' AND (stock_max >= 1 OR stock_unlimited_max = 1)';
-        }
         return $where;
     }
Index: /branches/version-2_12-multilang/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php	(revision 21981)
+++ /branches/version-2_12-multilang/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php	(revision 22058)
@@ -74,6 +74,4 @@
         $objFormParam->setParam($_POST);
 
-        $mode = $this->getMode();
-
         switch ($mode) {
             // インストール
@@ -82,8 +80,7 @@
                 $this->arrErr = $this->checkUploadFile($file_key);
                 if ($this->isError($this->arrErr) === false) {
-                    $upload_file = $_FILES[$file_key];
-                    $upload_file_file_name = $upload_file['name'];
+                    $archive_file_name = $_FILES[$file_key]['name'];
                     // インストール処理.
-                    $this->arrErr = $this->installPlugin($upload_file_file_name, 'plugin_file');
+                    $this->arrErr = $this->installPlugin($archive_file_name, 'plugin_file');
                     if ($this->isError($this->arrErr) === false) {
                         // コンパイルファイルのクリア処理
@@ -112,5 +109,4 @@
             // 有効化
             case 'enable':
-
                 // エラーチェック
                 $this->arrErr = $objFormParam->checkError();
@@ -152,5 +148,7 @@
                 $this->arrErr = $objFormParam->checkError();
                 if ($this->isError($this->arrErr) === false) {
-                    $target_plugin_code = $objFormParam->getValue('plugin_code'); // アップデート対象のプラグインコード
+                    $plugin_id = $objFormParam->getValue('plugin_id');
+                    $plugin = SC_Plugin_Util_Ex::getPluginByPluginId($plugin_id);
+                    $target_plugin_code = $plugin['plugin_code']; // アップデート対象のプラグインコード
                     $this->arrErr = $this->checkUploadFile($target_plugin_code);
 
@@ -197,5 +195,5 @@
                 $plugins[$key]['logo'] = ROOT_URLPATH . 'plugin/' . $plugins[$key]['plugin_code'] . '/logo.png';
             } else {
-                $plugins[$key]['logo'] = IMAGE_SAVE_URLPATH . 'noimage_plugin_list.gif';
+                $plugins[$key]['logo'] = IMAGE_SAVE_URLPATH . 'noimage_plugin_list.png';
             }
 
@@ -229,5 +227,4 @@
         $objFormParam->addParam('mode', 'mode', INT_LEN, '', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('plugin_id', 'plugin_id', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('plugin_code', 'plugin_code', MTEXT_LEN, '', array('ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
         if ($mode === 'priority') {
             $objFormParam->addParam('優先度', 'priority', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -315,6 +312,6 @@
      */
     function getHtmlPluginDir($plugin_code) {
-        $plugin_dir_path = PLUGIN_HTML_REALDIR . $plugin_code . '/';
-        return $plugin_dir_path;
+        $plugin_html_dir_path = PLUGIN_HTML_REALDIR . $plugin_code . '/';
+        return $plugin_html_dir_path;
     }
 
@@ -323,8 +320,9 @@
      *
      * @param string $plugin_code プラグインコード
+     * @param string $plugin_class プラグインクラス名
      * @return string $plugin_file_path クラスファイルのパス.
      */
-    function getPluginFilePath($plugin_code) {
-        $plugin_file_path = $this->getPluginDir($plugin_code) . $plugin_code . '.php';
+    function getPluginFilePath($plugin_code , $plugin_class) {
+        $plugin_file_path = $this->getPluginDir($plugin_code) . $plugin_class . '.php';
         return $plugin_file_path;
     }
@@ -333,12 +331,15 @@
      * プラグインをインストールします.
      *
-     * @param string $plugin_code プラグインコード.
+     * @param string $archive_file_name アーカイブファイル名.
      * @param string $key キー.
      * @return array エラー情報を格納した連想配列.
      */
-    function installPlugin($upload_file_file_name, $key) {
-        // インストール前に不要なファイルを消しておきます.
-        SC_Helper_FileManager_Ex::deleteFile(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, false);
-
+    function installPlugin($archive_file_name, $key) {
+        // 一時展開ディレクトリにファイルがある場合は事前に削除.
+        $arrFileHash = SC_Helper_FileManager_Ex::sfGetFileList(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR);
+        if(count($arrFileHash) > 0) {
+            SC_Helper_FileManager_Ex::deleteFile(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, false);
+        }
+        
         //シンタックスエラーがあるtar.gzをアップ後、削除するとたまにディレクトリが消えるので追加
         $this->makeDir(PLUGIN_UPLOAD_REALDIR);
@@ -351,5 +352,5 @@
         }
         // ファイルをチェックし一時展開用ディレクトリに展開します.
-        $arrErr = $this->unpackPluginFile($upload_file_file_name, DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, $key);
+        $arrErr = $this->unpackPluginFile($archive_file_name, DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, $key);
         if ($this->isError($arrErr) === true) {
             return $arrErr;
@@ -372,13 +373,8 @@
         }
 
-        // プラグインコード
-        $plugin_code = $arrPluginInfo['PLUGIN_CODE'];
-        // プラグイン名
-        $plugin_name = $arrPluginInfo['PLUGIN_NAME'];
-
         // 既にインストールされていないかを判定.
-        if ($this->isInstalledPlugin($plugin_code) === true) {
+        if ($this->isInstalledPlugin($arrPluginInfo['PLUGIN_CODE']) === true) {
             $this->rollBack(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR);
-            $arrErr['plugin_file'] = '※ ' . $plugin_name . 'は既にインストールされています。<br/>';
+            $arrErr['plugin_file'] = '※ ' . $arrPluginInfo['PLUGIN_NAME'] . 'は既にインストールされています。<br/>';
             return $arrErr;
         }
@@ -392,13 +388,13 @@
 
         // プラグイン保存ディレクトリを作成し、一時展開用ディレクトリから移動します.
-        $plugin_dir_path = PLUGIN_UPLOAD_REALDIR . $plugin_code . '/';
+        $plugin_dir_path = $this->getPluginDir($arrPluginInfo['PLUGIN_CODE']);
         $this->makeDir($plugin_dir_path);
         SC_Utils_Ex::copyDirectory(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, $plugin_dir_path);
 
         // プラグイン情報を取得
-        $plugin = SC_Plugin_Util_Ex::getPluginByPluginCode($plugin_code);
+        $plugin = SC_Plugin_Util_Ex::getPluginByPluginCode($arrPluginInfo['PLUGIN_CODE']);
 
         // クラスファイルを読み込み.
-        $plugin_class_file_path = $plugin_dir_path . $plugin['class_name'] . '.php';
+        $plugin_class_file_path = $this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
         $arrErr = $this->requirePluginFile($plugin_class_file_path, $key);
         if ($this->isError($arrErr) === true) {
@@ -407,10 +403,10 @@
         }
         // プラグインhtmlディレクトリ作成
-        $plugin_html_dir = PLUGIN_HTML_REALDIR . $plugin_code;
-        $this->makeDir($plugin_html_dir);
+        $plugin_html_dir_path = $this->getHtmlPluginDir($plugin['plugin_code']);
+        $this->makeDir($plugin_html_dir_path);
 
         $arrErr = $this->execPlugin($plugin, $plugin['class_name'], 'install');
         if ($this->isError($arrErr) === true) {
-            $this->rollBack(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, $plugin['plugin_id'], $plugin_html_dir);
+            $this->rollBack(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, $plugin['plugin_id'], $plugin_html_dir_path);
             return $arrErr;
         }
@@ -427,7 +423,7 @@
      * @param string $temp_dir インストール・アップデート時の一時展開用ディレクトリのパス.
      * @param string $plugin_id プラグインID.
-     * @param string $plugin_html_dir プラグイン毎に生成されるhtmlディレクトリのパス.
-     */
-    function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir ='') {
+     * @param string $plugin_html_dir_path プラグイン毎に生成されるhtmlディレクトリのパス.
+     */
+    function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir_path ='') {
         // 一時ディレクトリを削除.
         SC_Helper_FileManager_Ex::deleteFile($temp_dir, false);
@@ -437,6 +433,6 @@
         }
         // htmlディレクトリを削除
-        if (empty($plugin_html_dir) === false) {
-            SC_Helper_FileManager_Ex::deleteFile($plugin_html_dir, true);
+        if (empty($plugin_html_dir_path) === false) {
+            SC_Helper_FileManager_Ex::deleteFile($plugin_html_dir_path, true);
         }
     }
@@ -483,7 +479,8 @@
      *
      * @param ReflectionClass $objReflection リフレクションオブジェクト
+     * @param string $dir_path チェックするプラグインディレクトリ
      * @return array エラー情報を格納した連想配列.
      */
-    function checkPluginConstants(ReflectionClass $objReflection, $unpack_dir) {
+    function checkPluginConstants(ReflectionClass $objReflection, $dir_path) {
         $arrErr = array();
         // プラグイン情報を取得
@@ -502,6 +499,6 @@
             return $arrErr;
         }
-        $class_path = $unpack_dir . $arrPluginInfo['CLASS_NAME'] . '.php';
-        if (file_exists($class_path) === false) {
+        $plugin_class_file_path = $dir_path . $arrPluginInfo['CLASS_NAME'] . '.php';
+        if (file_exists($plugin_class_file_path) === false) {
             $arrErr['plugin_file'] = '※ CLASS_NAMEが正しく定義されていません。<br/>';
             return $arrErr;
@@ -550,5 +547,5 @@
      * プラグインをアップデートします.
      *
-     * @param string $target_plugin アップデートするプラグインコード.
+     * @param array $target_plugin アップデートするプラグイン情報の配列.
      * @param string $upload_file_name アップロードファイル名.
      * @return array エラー情報を格納した連想配列.
@@ -598,12 +595,12 @@
      *
      * @param string $unpack_file_name 解凍ファイル名
-     * @param string $unpack_dir 解凍先ディレクトリ
+     * @param string $unpack_dir_path 解凍先ディレクトリパス
      * @param string $file_key ファイルキー
      * @return array エラー情報を格納した連想配列.
      */
-    function unpackPluginFile($unpack_file_name, $unpack_dir, $file_key) {
+    function unpackPluginFile($unpack_file_name, $unpack_dir_path, $file_key) {
         $arrErr = array();
         // 解凍ディレクトリディレクトリを作成し、一時ディレクトリからファイルを移動
-        $objUpFile = new SC_UploadFile_Ex(PLUGIN_TEMP_REALDIR, $unpack_dir);
+        $objUpFile = new SC_UploadFile_Ex(PLUGIN_TEMP_REALDIR, $unpack_dir_path);
         $this->initUploadFile($objUpFile, $file_key);
         $arrErr = $objUpFile->makeTempFile($file_key, false);
@@ -619,6 +616,6 @@
         $objUpFile->moveTempFile();
         // 解凍
-        $update_plugin_file_path = $unpack_dir . $unpack_file_name;
-        if (!$this->unpackPluginArchive($update_plugin_file_path)) {
+        $unpack_file_path = $unpack_dir_path . $unpack_file_name;
+        if (!$this->unpackPluginArchive($unpack_file_path)) {
             $arrErr['plugin_file'] = '※ 解凍に失敗しました。<br/>';
             return $arrErr;
@@ -636,5 +633,5 @@
         $arrErr = array();
         // プラグインファイルを読み込みます.
-        $plugin_class_file_path = PLUGIN_UPLOAD_REALDIR . $plugin['plugin_code'] . '/' . $plugin['class_name'] . '.php';
+        $plugin_class_file_path = $this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
         $arrErr = $this->requirePluginFile($plugin_class_file_path, 'plugin_error');
         if ($this->isError($arrErr) === true) {
@@ -670,5 +667,5 @@
         $arrErr = array();
         // クラスファイルを読み込み.
-        $plugin_class_file_path = PLUGIN_UPLOAD_REALDIR . $plugin['plugin_code'] . '/' . $plugin['class_name'] . '.php';
+        $plugin_class_file_path = $this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
         $arrErr = $this->requirePluginFile($plugin_class_file_path, 'plugin_error');
         if ($this->isError($arrErr) === true) {
@@ -695,5 +692,5 @@
         $arrErr = array();
         // クラスファイルを読み込み.
-        $plugin_class_file_path = PLUGIN_UPLOAD_REALDIR . $plugin['plugin_code'] . '/' . $plugin['class_name'] . '.php';
+        $plugin_class_file_path =$this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
         $arrErr = $this->requirePluginFile($plugin_class_file_path, 'plugin_error');
         if ($this->isError($arrErr) === true) {
@@ -859,5 +856,7 @@
         $result = $tar->extractModify($dir. '/', $unpacking_name);
         GC_Utils_Ex::gfPrintLog('解凍：' . $dir.'/'.$file_name.'->'.$dir.'/'.$unpacking_name);
-
+        // 解凍元のファイルを削除する.
+        unlink($path);
+        
         return $result;
     }
Index: /branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php	(revision 22058)
@@ -144,22 +144,18 @@
     function lfUpdPageData($arrUpdData = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $sql = '';
-
-        // SQL生成
-        $sql .= ' UPDATE ';
-        $sql .= '     dtb_pagelayout ';
-        $sql .= ' SET ';
-        $sql .= '     author = ? , ';
-        $sql .= '     description = ? , ';
-        $sql .= '     keyword = ? ';
-        $sql .= ' WHERE ';
-        $sql .= '     device_type_id = ? ';
-        $sql .= '     AND page_id = ? ';
-        $sql .= ' ';
-
-        // SQL実行
-        $ret = $objQuery->query($sql, $arrUpdData);
-
-        return $ret;
+
+        $table = 'dtb_pagelayout';
+        $sqlval = array(
+            'author'        => $arrUpdData[0],
+            'description'   => $arrUpdData[1],
+            'keyword'       => $arrUpdData[2],
+        );
+        $where = 'device_type_id = ? AND page_id = ?';
+        $arrWhereVal = array(
+            $arrUpdData[3],
+            $arrUpdData[4],
+        );
+
+        return $objQuery->update($table, $sqlval, $where, $arrWhereVal);
     }
 
Index: /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	(revision 22058)
@@ -469,6 +469,9 @@
             $rank = $objQuery->get('rank', 'dtb_category', $where, array($parent_category_id));
             // 追加レコードのランク以上のレコードを一つあげる。
-            $sqlup = 'UPDATE dtb_category SET rank = (rank + 1) WHERE rank >= ?';
-            $objQuery->exec($sqlup, array($rank));
+            $where = 'rank >= ?';
+            $arrRawSql = array(
+                'rank' => '(rank + 1)',
+            );
+            $objQuery->update('dtb_category', array(), $where, array($rank), $arrRawSql);
         }
 
@@ -564,8 +567,9 @@
         $arrRet = $objDb->sfGetChildrenArray($table, $pid_name, $id_name, $id);
         $line = SC_Utils_Ex::sfGetCommaList($arrRet);
-        $sql = "UPDATE $table SET rank = (rank + $count) WHERE $id_name IN ($line) ";
-        $sql.= 'AND del_flg = 0';
-        $ret = $objQuery->exec($sql);
-        return $ret;
+        $where = "$id_name IN ($line) AND del_flg = 0";
+        $arrRawVal = array(
+            'rank' => "(rank + $count)",
+        );
+        return $objQuery->update($table, array(), $where, array(), $arrRawVal);
     }
 
@@ -575,8 +579,9 @@
         $arrRet = $objDb->sfGetChildrenArray($table, $pid_name, $id_name, $id);
         $line = SC_Utils_Ex::sfGetCommaList($arrRet);
-        $sql = "UPDATE $table SET rank = (rank - $count) WHERE $id_name IN ($line) ";
-        $sql.= 'AND del_flg = 0';
-        $ret = $objQuery->exec($sql);
-        return $ret;
+        $where = "$id_name IN ($line) AND del_flg = 0";
+        $arrRawVal = array(
+            'rank' => "(rank - $count)",
+        );
+        return $objQuery->update($table, array(), $where, array(), $arrRawVal);
     }
 }
Index: /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 21867)
+++ /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 22058)
@@ -528,6 +528,9 @@
             $rank = $objQuery->get('rank', 'dtb_category', $where, array($parent_category_id));
             // 追加レコードのランク以上のレコードを一つあげる。
-            $sqlup = 'UPDATE dtb_category SET rank = (rank + 1) WHERE rank >= ?';
-            $objQuery->exec($sqlup, array($rank));
+            $where = 'rank >= ?';
+            $arrRawSql = array(
+                'rank' => '(rank + 1)',
+            );
+            $objQuery->update('dtb_category', array(), $where, array($rank), $arrRawSql);
         }
 
Index: /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 21981)
+++ /branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 22058)
@@ -452,9 +452,9 @@
         // 商品規格テーブルのカラムに存在しているもののうち、Form投入設定されていないデータは上書きしない。
         $sqlval = SC_Utils_Ex::sfArrayIntersectKeys($arrList, $this->arrProductClassColumn);
-        // 必須入力では無い項目だが、空文字では問題のある特殊なカラム値の初期値設定
-        $sqlval = $this->lfSetProductClassDefaultData($sqlval);
 
         if ($product_class_id == '') {
             // 新規登録
+            // 必須入力では無い項目だが、空文字では問題のある特殊なカラム値の初期値設定
+            $sqlval = $this->lfSetProductClassDefaultData($sqlval);
             $sqlval['product_id'] = $product_id;
             $sqlval['product_class_id'] = $objQuery->nextVal('dtb_products_class_product_class_id');
@@ -465,4 +465,6 @@
         } else {
             // UPDATEの実行
+            // 必須入力では無い項目だが、空文字では問題のある特殊なカラム値の初期値設定
+            $sqlval = $this->lfSetProductClassDefaultData($sqlval, true);
             $where = 'product_class_id = ?';
             $objQuery->update('dtb_products_class', $sqlval, $where, array($product_class_id));
@@ -560,7 +562,8 @@
      *
      * @param array $sqlval 商品登録情報配列
+     * @param boolean $upload_flg 更新フラグ(更新の場合true)
      * @return $sqlval 登録情報配列
      */
-    function lfSetProductClassDefaultData(&$sqlval) {
+    function lfSetProductClassDefaultData(&$sqlval, $upload_flg) {
         //新規登録時のみ設定する項目
         if ($sqlval['product_class_id'] == '') {
@@ -579,4 +582,5 @@
             $sqlval['creator_id'] = $_SESSION['member_id'];
         }
+
         // 在庫無制限フラグ列を利用する場合、
         if (array_key_exists('stock_unlimited', $sqlval)) {
@@ -586,7 +590,10 @@
             }
         } else {
-            // 在庫数設定がされていない場合、在庫無制限フラグ = 無制限
-            if (strlen($sqlval['stock']) === 0) {
-                $sqlval['stock_unlimited'] = UNLIMITED_FLG_UNLIMITED;
+            // 初期登録の場合は、在庫数設定がされていない場合、在庫無制限フラグ = 無制限。
+            if (strlen($sqlval['stock']) === 0){
+                //更新の場合は、sqlvalのキーにstockがある場合のみ対象
+                if(!$upload_flg or ($upload_flg and array_key_exists('stock', $sqlval))) {
+                    $sqlval['stock_unlimited'] = UNLIMITED_FLG_UNLIMITED;
+                }
             }
             // 在庫数を入力している場合、在庫無制限フラグ = 制限有り
Index: /branches/version-2_12-multilang/data/class/pages/admin/total/LC_Page_Admin_Total.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/total/LC_Page_Admin_Total.php	(revision 21935)
+++ /branches/version-2_12-multilang/data/class/pages/admin/total/LC_Page_Admin_Total.php	(revision 22058)
@@ -274,4 +274,5 @@
 
         $arrRet = $objFormParam->getHashArray();
+        $out_flg = 0;
 
         foreach ($arrRet as $key => $val) {
@@ -290,7 +291,12 @@
                                                                     $objFormParam->getValue('search_startmonth_m'),
                                                                     CLOSE_DAY);
+                    $out_flg = 1;
                     break;
                 default:
                     break;
+            }
+            // 月度集計の場合に、集計期間が本日日付で上書きされてしまうのを回避するため
+            if (($objFormParam->getValue('form') == 1) && ($out_flg == 1 )) {
+                break;
             }
         }
@@ -802,4 +808,8 @@
             foreach ($arrDataCol as $val) {
                 $arrRet[$i][$val] = $arrData[$i][$val];
+            }
+            // 期間別集計の合計行の「期間」項目に不要な値が表示されてしまわない様、'合計'と表示する
+            if (($i === $max -1) && isset($arrRet[$i]['str_date'])) {
+                $arrRet[$i]['str_date'] = '合計';
             }
             $csv_data.= SC_Utils_Ex::sfGetCSVList($arrRet[$i]);
Index: /branches/version-2_12-multilang/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	(revision 21986)
+++ /branches/version-2_12-multilang/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	(revision 22058)
@@ -285,7 +285,4 @@
      */
     function lfCreateBkupData($bkup_name, $work_dir) {
-        // 実行時間を制限しない
-        set_time_limit(0);
-
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $csv_autoinc = '';
@@ -378,4 +375,5 @@
         $line .= SC_Helper_CSV_Ex::sfArrayToCsv($data);
         $line .= "\n";
+        SC_Utils_Ex::extendTimeOut();
         return fwrite($this->fpOutput, $line);
     }
@@ -479,8 +477,4 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-        // 実行時間を制限しない
-        // FIXME ファイル展開時に限定すべき
-        set_time_limit(0);
-
         $bkup_filepath = $bkup_dir . $bkup_name . $bkup_ext;
         $work_dir = $bkup_dir . $bkup_name . '/';
@@ -519,4 +513,6 @@
         // FIXME この辺りで、バックアップ時と同等の一時ファイルの削除を実行すべきでは?
 
+        SC_Utils_Ex::extendTimeOut();
+
         return $success;
     }
@@ -628,5 +624,4 @@
         }
 
-        $delsql = 'DELETE FROM dtb_bkup WHERE bkup_name = ?';
         $objQuery->delete('dtb_bkup', 'bkup_name = ?', array($arrForm['list_name']));
 
Index: /branches/version-2_12-multilang/html/install/index.php
===================================================================
--- /branches/version-2_12-multilang/html/install/index.php	(revision 21938)
+++ /branches/version-2_12-multilang/html/install/index.php	(revision 22058)
@@ -196,4 +196,15 @@
             }
         }
+
+        //マスターデータのキャッシュを削除
+        $cache_dir = '../../data/cache/';
+        $res_dir = opendir( $cache_dir );
+        while( $file_name = readdir( $res_dir ) ){
+            //dummy以外は削除
+            if($file_name != 'dummy'){
+                unlink($cache_dir . $file_name);
+            }
+        }
+        closedir( $res_dir );
 
         $objPage = lfDispStep3($objPage);
Index: /branches/version-2_12-multilang/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_12-multilang/html/install/sql/insert_data.sql	(revision 22005)
+++ /branches/version-2_12-multilang/html/install/sql/insert_data.sql	(revision 22058)
@@ -304,5 +304,5 @@
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (68, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT product_status_id FROM dtb_product_status WHERE dtb_product_status.product_id = prdcls.product_id and del_flg = 0 ORDER BY dtb_product_status.product_status_id), '','')) as product_statuses', '商品ステータス', 68, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (69, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT name FROM dtb_product_status LEFT JOIN mtb_status ON  dtb_product_status.product_status_id = mtb_status.id  WHERE dtb_product_status.product_id = prdcls.product_id and del_flg = 0 ORDER BY dtb_product_status.product_status_id), '','')) as product_status_names', '商品ステータス名', 69, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (70, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT category_id FROM dtb_product_categories WHERE dtb_product_categories.product_id = prdcls.product_id ORDER BY dtb_product_categories.rank), '','')) as category_ids', 'カテゴリID', 70, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (70, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT category_id FROM dtb_product_categories WHERE dtb_product_categories.product_id = prdcls.product_id ORDER BY dtb_product_categories.rank), '','')) as category_ids', 'カテゴリID', 70, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (71, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT category_name FROM dtb_product_categories LEFT JOIN dtb_category ON dtb_product_categories.category_id = dtb_category.category_id WHERE dtb_product_categories.product_id = prdcls.product_id ORDER BY dtb_product_categories.rank), '','')) as category_names', 'カテゴリ名', 71, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (72, 2, 'customer_id', '会員ID', 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
Index: /branches/version-2_12-multilang/html/rss/product.php
===================================================================
--- /branches/version-2_12-multilang/html/rss/product.php	(revision 21867)
+++ /branches/version-2_12-multilang/html/rss/product.php	(revision 22058)
@@ -29,4 +29,7 @@
 // {{{ generate page
 
+// @deprecated 2.12.3 html/rss/products.php が正しい。
+trigger_error('前方互換用ファイルが使用されました。', E_USER_WARNING);
+
 $objPage = new LC_Page_Rss_Products_Ex();
 register_shutdown_function(array($objPage, 'destroy'));
Index: /branches/version-2_12-multilang/html/rss/products.php
===================================================================
--- /branches/version-2_12-multilang/html/rss/products.php	(revision 22058)
+++ /branches/version-2_12-multilang/html/rss/products.php	(revision 22058)
@@ -0,0 +1,34 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2012 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/rss/LC_Page_Rss_Products_Ex.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Rss_Products_Ex();
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
