Changeset 18544

Timestamp:

2010/02/03 15:17:02 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100202103421-3rbbop6uzpfn6g0j

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/helper/SC_Helper_CSV.php 15535@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_CSV.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20100203061657-95zs5i4upxoc23qk

bzr:revno:

2154

bzr:revprop:branch-nick:

branches/comu-ver2

bzr:root:

branches/comu-ver2

bzr:text-parents:

data/class/helper/SC_Helper_CSV.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18234

bzr:timestamp:

2010-02-03 15:16:57.414999962 +0900

bzr:user-agent:

bzr2.0.4+bzr-svn1.0.1

svn:original-date:

2010-02-03T06:16:57.415000Z

Message:

merged r18542

• Fix typo

File:

• branches/comu-ver2/data/class/helper/SC_Helper_CSV.php (modified) (12 diffs)

branches/comu-ver2/data/class/helper/SC_Helper_CSV.php

@@ -99 +99 @@
     }
 
-
     // CSVを送信する。(商品)
     function sfDownloadProductsCsv($where, $arrval, $order) {
@@ -117 +116 @@
             ,$arrval
         );
-        
+
         // 規格分類名一覧
         if (in_array('classcategory_id1', $arrOutputCols) || in_array('classcategory_id2', $arrOutputCols)) {
@@ -125 +124 @@
 
         $outputArray = array();
-        
+
         // ヘッダ行
         $outputArray[] = $arrOutput['disp_name'];
-        
+
         // データ行
         foreach ($dataRows as $row) {
@@ -146 +145 @@
                                   "category_id",
                                   "product_id = ?",
-                                  array($row['product_id']));
-            }
-
-            $outputArray[] = $row;
-        }
-        
-        // CSVを送信する。
-        $this->lfDownloadCsv($outputArray);
-        
-        // 成功終了
-        return ture;
+                                   array($row['product_id']));
+         }
+
+           $outputArray[] = $row;
+       }
+
+       // CSVを送信する。
+       $this->lfDownloadCsv($outputArray);
+
+       // 成功終了
+       return true;
     }
 
@@ -201 +200 @@
     function sfDownloadCategoryCsv() {
 
-        // CSV出力タイトル行の作成
-        $arrOutput = SC_Utils_Ex::sfSwapArray($this->sfgetCsvOutput(5, " WHERE csv_id = 5 AND status = 1"));
-        if (count($arrOutput) <= 0) return false; // 失敗終了
+    // CSV出力タイトル行の作成
+    $arrOutput = SC_Utils_Ex::sfSwapArray($this->sfgetCsvOutput(5, " WHERE csv_id = 5 AND status = 1"));
+    if (count($arrOutput) <= 0) return false; // 失敗終了
         $arrOutputCols = $arrOutput['col'];
 
@@ -214 +213 @@
             ,'del_flg = 0'
         );
-        
+
         $outputArray = array();
-        
+
         // ヘッダ行
         $outputArray[] = $arrOutput['disp_name'];
-        
+
         // データ行
         foreach ($dataRows as $row) {
             $outputArray[] = $row;
         }
-        
+
         // CSVを送信する。
         $this->lfDownloadCsv($outputArray, 'category');
-        
+
         // 成功終了
-        return ture;
+        return true;
     }
 
@@ -254 +253 @@
     function lfMakeCSV($list) {
         $line = "";
-        
-        foreach($list as $key => $val) {
+
+        eset($list);
+        while(list($key, $val) = each($list)){
             $tmp = "";
             switch($key) {
-                case 'order_pref':
-                case 'deliv_pref':
-                    $tmp = $this->arrPref[$val];
-                    break;
-                default:
-                    $tmp = $val;
-                    break;
+            case 'order_pref':
+            case 'deliv_pref':
+                $tmp = $this->arrPref[$val];
+                break;
+            default:
+                $tmp = $val;
+                break;
             }
 
@@ -278 +278 @@
     function lfMakeReviewCSV($list) {
         $line = "";
-
-        foreach($list as $key => $val) {
+        reset($list);
+        while(list($key, $val) = each($list)){
             $tmp = "";
             switch($key) {
@@ -307 +307 @@
     // 各項目をCSV出力用に変換する。(トラックバック)
     function lfMakeTrackbackCSV($list) {
-
         $line = "";
-
-        foreach($list as $key => $val) {
+        reset($list);
+        while(list($key, $val) = each($list)){
             $tmp = "";
             switch($key) {
@@ -404 +403 @@
                                            );
     }
-    
+
+
     /**
      * 1次元配列を1行のCSVとして返す
@@ -410 +410 @@
      */
     function sfArrayToCsv($fields, $delimiter = ',', $enclosure = '"', $arrayDelimiter = '|') {
-        
+
         if( strlen($delimiter) != 1 ) {
             trigger_error('delimiter must be a single character', E_USER_WARNING);
             return "";
         }
-        
+
         if( strlen($enclosure) < 1 ) {
             trigger_error('enclosure must be a single character', E_USER_WARNING);
             return "";
         }
-        
+
         foreach (array_keys($fields) as $key) {
             $field =& $fields[$key];
-            
+
             // 配列を「|」区切りの文字列に変換する
             if (is_array($field)) {
                 $field = implode($arrayDelimiter, $field);
             }
-            
+
             /* enclose a field that contains a delimiter, an enclosure character, or a newline */
             if (
@@ -437 +437 @@
             }
         }
-        
+
         return implode($delimiter, $fields);
     }
-    
+
     /**
      * CSVを送信する。