EC-CUBE#2043 (typo修正・ソース整形・ソースコメントの改善 for 2.13.0)

* 主に空白・空白行の調整。もう少し整えたいが、一旦現状コミット。
seasoftjapan · Jun 8, 2013 · ef9b987 · ef9b987
1 parent 57c3edd
commit ef9b987
Show file tree

Hide file tree

Showing 709 changed files with 1,307 additions and 3,286 deletions.
diff --git a/data/Smarty/templates/admin/contents/recommend.tpl b/data/Smarty/templates/admin/contents/recommend.tpl
@@ -26,7 +26,6 @@
 <script type="text/javascript">
 <!--
 function lfnCheckSubmit( fm ){
-
     var err = '';
     /*
     if ( ! fm["title"].value ){
@@ -72,7 +71,7 @@ function lfnSortItem(mode,data){
             flag = false;
         }
     }
-    
+
     if ( flag ){
         document.form1["mode"].value = mode;
         document.form1["best_id"].value = data;

diff --git a/data/Smarty/templates/admin/contents/recommend_search.tpl b/data/Smarty/templates/admin/contents/recommend_search.tpl
@@ -117,14 +117,14 @@ function func_submit( id ){
             <td><!--{$arr.name|h}--></td>
             <td class="center"><a href="" onclick="return func_submit(<!--{$arr.product_id}-->)">決定</a></td>
         </tr>
-        <!--▲商品<!--{$smarty.foreach.loop.iteration}-->-->    
+        <!--▲商品<!--{$smarty.foreach.loop.iteration}-->-->
         <!--{/foreach}-->
         <!--{if !$tpl_linemax>0}-->
         <tr>
             <td colspan="4">商品が登録されていません</td>
         </tr>
         <!--{/if}-->
-        
+
     </table>
     <!--{/if}-->
     <!--{* ▲検索結果表示 *}-->

diff --git a/data/Smarty/templates/admin/order/edit.tpl b/data/Smarty/templates/admin/order/edit.tpl
@@ -36,7 +36,7 @@
         df = document.form1;
 
         // お届け先名のinputタグのnameを取得
-        var shipping_data = $('input[name^=shipping_name01]').attr('name'); 
+        var shipping_data = $('input[name^=shipping_name01]').attr('name');
         var shipping_slt  = shipping_data.split("shipping_name01");
 
         var shipping_key = "[0]";

diff --git a/data/Smarty/templates/admin/order/index.tpl b/data/Smarty/templates/admin/order/index.tpl
@@ -25,7 +25,6 @@
 <script type="text/javascript">
 <!--
     function fnSelectCheckSubmit(action){
-
         var fm = document.form1;
 
         if (!fm["pdf_order_id[]"]) {
@@ -74,10 +73,9 @@
         fm.mode.value = tmpMode;
         fm.action = tmpAction;
     }
-    
-    
-    function fnSelectMailCheckSubmit(action){
 
+
+    function fnSelectMailCheckSubmit(action){
         var fm = document.form1;
 
         if (!fm["mail_order_id[]"]) {
@@ -103,13 +101,12 @@
             alert('チェックボックスが選択されていません');
             return false;
         }
-        
+
         fm.mode.value="mail_select";
         fm.action=action;
         fm.submit();
     }
 
-
 //-->
 </script>
 <div id="order" class="contents-main">

diff --git a/data/Smarty/templates/admin/order/mail.tpl b/data/Smarty/templates/admin/order/mail.tpl
@@ -37,7 +37,7 @@
 <!--{/foreach}-->
 <div id="order" class="contents-main">
     <h2>メール配信</h2>
-    
+
     <!--{if $order_id_count == 1}-->
     <table class="list">
         <tr>

diff --git a/data/Smarty/templates/admin/order/mail_confirm.tpl b/data/Smarty/templates/admin/order/mail_confirm.tpl
@@ -40,8 +40,8 @@
 <!--{/foreach}-->
 <div id="order" class="contents-main">
     <h2>メール配信</h2>
-    
-    
+
+
     <!--{if $order_id_count > 1}-->
     <span class="red">※本文は1通分の例です。受注情報は各メールごとに異なります</span><br /><br />
     <!--{/if}-->

diff --git a/data/Smarty/templates/admin/order/multiple.tpl b/data/Smarty/templates/admin/order/multiple.tpl
@@ -28,7 +28,6 @@
 <!--
 self.moveTo(20,20);self.focus();
 $(function() {
-
     var product_class_id = window.opener.jQuery('input[id^=product_class_id]');
     var product_code = window.opener.jQuery('input[id^=product_code]');
     var product_name = window.opener.jQuery('input[id^=product_name]');
@@ -54,9 +53,7 @@ $(function() {
 
     var index = 0;
     for (var i = 0; i < product_class_id.length; i++) {
-
         for (var j = 0; j < $(quantity[i]).val(); j++) {
-
             // 表示商品名
             var dispname = '';
 

diff --git a/data/Smarty/templates/admin/ownersstore/plugin.tpl b/data/Smarty/templates/admin/ownersstore/plugin.tpl
@@ -24,7 +24,6 @@
 
 <script type="text/javascript">//<![CDATA[
     $(function() {
-
         /**
          * 「有効/有効にする」チェックボタン押下時
          */
@@ -105,7 +104,6 @@
         }
     }
 
-
     /**
      * 優先度変更.
      */

diff --git a/data/Smarty/templates/admin/products/product_class.tpl b/data/Smarty/templates/admin/products/product_class.tpl
@@ -276,7 +276,7 @@
                     <!--{if $arrErr[$key][$index]}-->
                         <span class="attention"><!--{$arrErr[$key][$index]}--></span>
                     <!--{/if}-->
-                    <input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />                
+                    <input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />
                 </td>
                 <td class="class-product-type">
                     <!--{assign var=key value="product_type_id"}-->

diff --git a/data/Smarty/templates/default/mypage/history.tpl b/data/Smarty/templates/default/mypage/history.tpl
@@ -32,7 +32,7 @@
                 <span class="st">購入日時：&nbsp;</span><!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
                 <span class="st">注文番号：&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
                 <span class="st">お支払い方法：&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
-                <!--{if $is_price_change == true}-->    
+                <!--{if $is_price_change == true}-->
                     <div class="attention" Align="right">※金額が変更されている商品があるため、再注文時はご注意ください。</div>
                 <!--{/if}-->
             </p>

diff --git a/data/Smarty/templates/default/mypage/index.tpl b/data/Smarty/templates/default/mypage/index.tpl
@@ -63,7 +63,7 @@
                         <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
                         <td class="alignC"><!--{$arrPayment[$payment_id]|h}--></td>
                         <td class="alignR"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
-                        
+
                         <!--{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 }-->

diff --git a/data/Smarty/templates/mobile/entry/confirm.tpl b/data/Smarty/templates/mobile/entry/confirm.tpl
@@ -53,7 +53,7 @@
 
         ●電話番号<br>
         <!--{$arrForm.tel01|h}-->-<!--{$arrForm.tel02|h}-->-<!--{$arrForm.tel03|h}--><br>
-        
+
         ●ﾒｰﾙｱﾄﾞﾚｽ<br>
         <!--{$arrForm.email|h}--><br>
 

diff --git a/data/Smarty/templates/mobile/entry/index.tpl b/data/Smarty/templates/mobile/entry/index.tpl
@@ -112,7 +112,7 @@
         <input type="text" size="<!--{$size}-->" name="fax01" value="<!--{$arrForm.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
         <input type="text" size="<!--{$size}-->" name="fax02" value="<!--{$arrForm.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
         <input type="text" size="<!--{$size}-->" name="fax03" value="<!--{$arrForm.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" /><br>
-        
+
         ●メールアドレス<font color="#FF0000"> *</font><br>
         <font color="#FF0000"><!--{$arrErr.email}--></font>
         <input type="text" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">

diff --git a/data/Smarty/templates/mobile/mypage/change_confirm.tpl b/data/Smarty/templates/mobile/mypage/change_confirm.tpl
@@ -49,7 +49,7 @@
         【携帯ﾒｰﾙｱﾄﾞﾚｽ】<br>
         <!--{$arrForm.email_mobile|default:"未登録"|h}--><br>
         <br>
-        
+
         【ﾊﾟｽﾜｰﾄﾞ確認用質問】<br>
         <!--{$arrReminder[$arrForm.reminder]|h}--><br>
         <br>

diff --git a/data/Smarty/templates/mobile/mypage/index.tpl b/data/Smarty/templates/mobile/mypage/index.tpl
@@ -62,7 +62,7 @@
                     <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}-->
         <hr>

diff --git a/data/Smarty/templates/mobile/products/search.tpl b/data/Smarty/templates/mobile/products/search.tpl
@@ -24,7 +24,7 @@
 
 <!--{strip}-->
     お探しの商品名・型番を入力してください。<br>
-    
+
     <form method="get" action="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php">
         <center>
             <input type="hidden" name="mode" value="search">

diff --git a/data/Smarty/templates/sphone/mypage/history.tpl b/data/Smarty/templates/sphone/mypage/history.tpl
@@ -44,7 +44,7 @@
         </div>
         <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
             <h3>お届け先<!--{if $isMultiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-        <div class="historyBox">	
+        <div class="historyBox">
         <p>
             <!--{if $isMultiple}-->
                     <!--{foreach item=item from=$shippingItem.shipment_item}-->
@@ -57,7 +57,7 @@
                                 <!--{if $item.productsClass.classcategory_name2 != ""}-->
                                     <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--><br />
                                 <!--{/if}-->
-                        
+
                         <em>単価：&nbsp;</em><!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->円<br />
                         <em>数量：&nbsp;</em><!--{$item.quantity}--><br />
                         <!--{* XXX 購入小計と誤差が出るためコメントアウト
@@ -74,7 +74,7 @@
             <em>電話番号</em>：&nbsp;<!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--><br />
                             <!--{if $shippingItem.shipping_fax01 > 0}-->
             <em>FAX番号</em>：&nbsp;<!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}--><br />
-                            <!--{/if}-->            
+                            <!--{/if}-->
             <em>お届け日</em>：&nbsp;<!--{$shippingItem.shipping_date|default:'指定なし'|h}--><br />
             <em>お届け時間</em>：&nbsp;<!--{$shippingItem.shipping_time|default:'指定なし'|h}--><br />
 </p>

diff --git a/data/Smarty/templates/sphone/mypage/index.tpl b/data/Smarty/templates/sphone/mypage/index.tpl
@@ -135,14 +135,14 @@
                         var historyEl = $(".arrowBox").get(maxCnt);
                         historyEl = $(historyEl).clone(true).insertAfter(historyEl);
                         maxCnt++;
-                        
+
                         var regex = new RegExp('([0-9]{2,4}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).');
                         var matches = history.create_date.match(regex);
                         var formatted_date = history.create_date;
                         if(matches != null){
                             formatted_date = matches[1]+'/'+matches[2]+'/'+matches[3]+' '+matches[4]+':'+matches[5];
                         }
-                        
+
                         var formatted_payment_total = history.payment_total.toString().replace(/([0-9]+?)(?=(?:[0-9]{3})+$)/g , '$1,');
 
                         //注文番号をセット

diff --git a/data/Smarty/templates/sphone/products/detail.tpl b/data/Smarty/templates/sphone/products/detail.tpl
@@ -386,7 +386,7 @@
             </ul>
             <!--{/if}-->
         </div>
-    
+
     <!--お客様の声ここまで-->
 
 

diff --git a/data/Smarty/templates/sphone/shopping/index.tpl b/data/Smarty/templates/sphone/shopping/index.tpl
@@ -27,7 +27,6 @@
         if (checkLogin == false) {
             return false;
         } else {
-
             var postData = new Object;
             postData['<!--{$smarty.const.TRANSACTION_ID_NAME}-->'] = "<!--{$transactionid}-->";
             postData['mode'] = 'login';

diff --git a/data/Smarty/templates/sphone/shopping/payment.tpl b/data/Smarty/templates/sphone/shopping/payment.tpl
@@ -208,7 +208,7 @@
                                         <!--{html_options options=$arrDelivDate selected=$shipping_date_value}-->
                                     </select>
                                 <!--{/if}-->
-                                
+
                                 <!--★お届け時間★-->
                                 <!--{assign var=key value="deliv_time_id`$index`"}-->
                                 <span class="attention"><!--{$arrErr[$key]}--></span>

diff --git a/data/class/SC_Batch.php b/data/class/SC_Batch.php
@@ -28,18 +28,15 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Batch 
+class SC_Batch
 {
-
-    // }}}
-    // {{{ functions
-
     /**
      * バッチ処理を実行する
      *
      * @param mixed $argv コマンドライン引数
      * @return mixed バッチの実行結果
      */
     function execute($argv = '')
-    {}
+    {
+    }
 }
diff --git a/data/class/SC_Cache.php b/data/class/SC_Cache.php
@@ -28,15 +28,14 @@
  */
 class SC_Cache
 {
-
     /**
      * Instance of PEAR::Cache_Lite class.
-     * @var object 
+     * @var object
      */
     static $_instance = NULL;
 
     /**
-     * Default cache lifetime. 
+     * Default cache lifetime.
      */
     const LIFETIME = MAX_LIFETIME;
 
@@ -47,7 +46,7 @@ class SC_Cache
 
     /**
      * Create Cache_Lite object and set it to static variable.
-     * 
+     *
      * @return void
      */
     public static function forge()
@@ -68,6 +67,7 @@ public static function forge()
     public static function getInstance()
     {
         is_null(SC_Cache_Ex::$_instance) and SC_Cache_Ex::forge();
+
         return SC_Cache_Ex::$_instance;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ @@
     <script type="text/javascript">//<![CDATA[
         $(function() {
             /**
              * 「有効/有効にする」チェックボタン押下時
              */
@@ Expand Down Expand Up / @@ -105,7 +104,6 @@ @@
             }
         }
         /**
          * 優先度変更.
          */
@@ Expand Down @@