[Svn-src-all:2735] [version-2_12-dev 21634] #1613 (typo修正・ソース整形・ソースコメントの改善)

[Seasoft]

Subversion committed to /home/svn/open 21634
http://svn.ec-cube.net/open_trac/changeset/21634
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-12 16:13:06 +0900 (月, 12  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
#1607 (未使用定義の削除)
  * SC_Utils#getCSVData 怪しい処理を含むため保守しようとしたが、利用箇所がないようなので破棄。

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/class/SC_SendMail.php
U   branches/version-2_12-dev/data/class/util/SC_Utils.php

変更: branches/version-2_12-dev/data/class/SC_SendMail.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SendMail.php	2012-03-12 07:11:48 UTC (rev 21633)
+++ branches/version-2_12-dev/data/class/SC_SendMail.php	2012-03-12 07:13:06 UTC (rev 21634)
@@ -144,7 +144,7 @@
                 $_name = ereg_replace('<','＜', $_name);
                 $_name = ereg_replace('>','＞', $_name);
                 $_name = mb_encode_mimeheader($_name, 'JIS', 'B', "\n");
-                $name_address = "\"". $_name . "\"<" . $mail_address . '>';
+                $name_address = '"' . $_name . '"<' . $mail_address . '>';
             } else {
                 $name_address = $mail_address;
             }
@@ -222,14 +222,14 @@
     // ヘッダーを返す
     function getTEXTHeader() {
         $arrHeader = $this->getBaseHeader();
-        $arrHeader['Content-Type'] = "text/plain; charset=\"ISO-2022-JP\"";
+        $arrHeader['Content-Type'] = 'text/plain; charset="ISO-2022-JP"';
         return $arrHeader;
     }
 
     // ヘッダーを返す
     function getHTMLHeader() {
         $arrHeader = $this->getBaseHeader();
-        $arrHeader['Content-Type'] = "text/html; charset=\"ISO-2022-JP\"";
+        $arrHeader['Content-Type'] = 'text/html; charset="ISO-2022-JP"';
         return $arrHeader;
     }
 

変更: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php	2012-03-12 07:11:48 UTC (rev 21633)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php	2012-03-12 07:13:06 UTC (rev 21634)
@@ -519,7 +519,7 @@
         if (count($array) > 0) {
             foreach ($array as $key => $val) {
                 $val = mb_convert_encoding($val, CHAR_CODE, CHAR_CODE);
-                $line .= "\"".$val."\",";
+                $line .= '"' .$val. '",';
             }
             $line = ereg_replace(",$", "\r\n", $line);
         } else {
@@ -583,14 +583,14 @@
 
     function sfGetEnabled($val) {
         if (! $val) {
-            return " disabled=\"disabled\"";
+            return ' disabled="disabled"';
         }
         return '';
     }
 
     function sfGetChecked($param, $value) {
         if ((string)$param === (string)$value) {
-            return "checked=\"checked\"";
+            return 'checked="checked"';
         }
         return '';
     }
@@ -1560,32 +1560,6 @@
     }
 
     /**
-     * CSV出力用データ取得
-     *
-     * @return string
-     */
-    function getCSVData($array, $arrayIndex) {
-        for ($i = 0; $i < count($array); $i++) {
-            // インデックスが設定されている場合
-            if (is_array($arrayIndex) && 0 < count($arrayIndex)) {
-                for ($j = 0; $j < count($arrayIndex); $j++) {
-                    if ($j > 0) $return .= ',';
-                    $return .= "\"";
-                    $return .= mb_ereg_replace('<','＜',mb_ereg_replace("\"","\"\"",$array[$i][$arrayIndex[$j]])) ."\"";
-                }
-            } else {
-                for ($j = 0; $j < count($array[$i]); $j++) {
-                    if ($j > 0) $return .= ',';
-                    $return .= "\"";
-                    $return .= mb_ereg_replace('<','＜',mb_ereg_replace("\"","\"\"",$array[$i][$j])) ."\"";
-                }
-            }
-            $return .= "\n";
-        }
-        return $return;
-    }
-
-    /**
      * 配列をテーブルタグで出力する。
      *
      * @return string