Changeset 23504

Timestamp:

2014/06/03 14:57:02 (10 years ago)

Author:

shutta

Message:

#2448 typo修正・ソース整形・ソースコメントの改善 for 2.13.3

Location:

branches/version-2_13-dev/data/class

Files:

• SC_Image.php (modified) (1 diff)
• graph/SC_Graph_Line.php (modified) (2 diffs)
• pages/LC_Page_ResizeImage.php (modified) (1 diff)
• pages/admin/basis/LC_Page_Admin_Basis.php (modified) (2 diffs)
• pages/admin/order/LC_Page_Admin_Order_Mail.php (modified) (1 diff)
• pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (modified) (1 diff)
• pages/shopping/LC_Page_Shopping_Confirm.php (modified) (1 diff)
• util/SC_Utils.php (modified) (1 diff)

branches/version-2_13-dev/data/class/SC_Image.php

@@ -167 +167 @@
                 $red = ImageColorAllocate($ImgNew, 255, 0, 0);
                 Imagestring($ImgNew, 4, 5, 5, "GIF $size[0]x$size[1]", $red);
-                ImageRectangle ($ImgNew, 0, 0, ($re_size[0]-1), ($re_size[1]-1),    $black);
+                ImageRectangle ($ImgNew, 0, 0, ($re_size[0]-1), ($re_size[1]-1), $black);
 
                 if ($newFileName) {

branches/version-2_13-dev/data/class/graph/SC_Graph_Line.php

@@ -131 +131 @@
             $x = $arrPointList[$i][0];
             $pos = $this->top + $this->area_height;
-            imageline($this->image, $x - $half_scale, $pos, $x - $half_scale, $pos - LINE_SCALE_SIZE,  $this->flame_color);
+            imageline($this->image, $x - $half_scale, $pos, $x - $half_scale, $pos - LINE_SCALE_SIZE, $this->flame_color);
             // ラベルを入れる
             if (($i % $interval) == 0) {
@@ -149 +149 @@
         // 棒グラフの場合は最後の目盛りを一つ追加する
         if ($bar) {
-            imageline($this->image, $x + $half_scale, $pos, $x + $half_scale, $pos - LINE_SCALE_SIZE,  $this->flame_color);
+            imageline($this->image, $x + $half_scale, $pos, $x + $half_scale, $pos - LINE_SCALE_SIZE, $this->flame_color);
         }
 

branches/version-2_13-dev/data/class/pages/LC_Page_ResizeImage.php

@@ -89 +89 @@
     public function lfInitParam(&$objFormParam)
     {
-        $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n',  array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('商品イメージキー', 'image_key', STEXT_LEN, '',  array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('画像ファイル名', 'image', STEXT_LEN, 'a',  array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('画像の幅', 'width', STEXT_LEN, 'n',  array('NUM_CHECK'));
-        $objFormParam->addParam('画像の高さ', 'height', STEXT_LEN, 'n',  array('NUM_CHECK'));
+        $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('商品イメージキー', 'image_key', STEXT_LEN, '', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('画像ファイル名', 'image', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('画像の幅', 'width', STEXT_LEN, 'n', array('NUM_CHECK'));
+        $objFormParam->addParam('画像の高さ', 'height', STEXT_LEN, 'n', array('NUM_CHECK'));
     }
 

branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php

@@ -141 +141 @@
     public function lfInitParam(&$objFormParam, $post)
     {
-        $objFormParam->addParam('会社名', 'company_name', STEXT_LEN, 'KVa',  array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('会社名(フリガナ)', 'company_kana', STEXT_LEN, 'KVC',  array('KANA_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('会社名', 'company_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('会社名(フリガナ)', 'company_kana', STEXT_LEN, 'KVC', array('KANA_CHECK', 'MAX_LENGTH_CHECK'));
 
         $objFormParam->addParam('店名', 'shop_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('店名(フリガナ)', 'shop_kana',  STEXT_LEN, 'KVC', array('KANA_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('店名(フリガナ)', 'shop_kana', STEXT_LEN, 'KVC', array('KANA_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('店名(英語表記)', 'shop_name_eng', MTEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         // 郵便番号チェック
@@ -182 +182 @@
             $objFormParam->addParam('ダウンロード無制限', 'downloadable_days_unlimited', array('EXIST_CHECK'));
         }
-        $objFormParam->addParam('緯度', 'latitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
-        $objFormParam->addParam('軽度', 'longitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
+        $objFormParam->addParam('緯度', 'latitude', STEXT_LEN, '', array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
+        $objFormParam->addParam('軽度', 'longitude', STEXT_LEN, '', array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
 
         $objFormParam->addParam('定休日', 'regular_holiday_ids', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));

branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php

@@ -262 +262 @@
         parent::lfInitParam($objFormParam);
         $objFormParam->addParam('テンプレート', 'template_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam('メールタイトル', 'subject', STEXT_LEN, 'KVa',  array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
+        $objFormParam->addParam('メールタイトル', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('ヘッダー', 'header', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));

branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php

@@ -303 +303 @@
         $objFormParam->addParam('オーダーID', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('カテゴリID', 'search_category_id', STEXT_LEN, 'KVa',  array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
+        $objFormParam->addParam('カテゴリID', 'search_category_id', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('商品コード', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));

branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

@@ -119 +119 @@
                                                   $arrOrderTemp['discount'],
                                                   $arrOrderTemp['deliv_id'],
-                                                  $arrOrderTemp['order_pref'],  // 税金計算の為に追加　注文者基準
+                                                  $arrOrderTemp['order_pref'], // 税金計算の為に追加　注文者基準
                                                   $arrOrderTemp['order_country_id'] // 税金計算の為に追加　注文者基準
                                                   );

branches/version-2_13-dev/data/class/util/SC_Utils.php

@@ -972 +972 @@
                 $line = fgets($ifp);
                 $line = mb_convert_encoding($line, $enc_type, 'auto');
-                fwrite($ofp,  $line);
+                fwrite($ofp, $line);
             }