Changeset 18616 for branches/comu-ver2/data/class/pages/admin

Timestamp:

2010/04/16 12:02:27 (16 years ago)

Author:

Seasoft

Message:

• #657(CSVダウンロードの改善)現状コミット
• #148(CSV ダウンロード時の改行コードが LF になっている)修正

Location:

branches/comu-ver2/data/class/pages/admin

Files:

• contents/LC_Page_Admin_Contents_CSV.php (modified) (1 diff)
• contents/LC_Page_Admin_Contents_Campaign.php (modified) (1 diff)
• customer/LC_Page_Admin_Customer.php (modified) (1 diff)
• order/LC_Page_Admin_Order.php (modified) (1 diff)

branches/comu-ver2/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php

@@ -118 +118 @@
 
         // 出力項目の取得
-        $arrOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_csv, "WHERE csv_id = ? AND status = 1", array($subno_id)));
+        $arrOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_csv, 'status = 1'));
         $arrOutput = SC_Utils_Ex::sfarrCombine($arrOutput['no'], $arrOutput['disp_name']);
 
         // 非出力項目の取得
-        $arrChoice = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_csv, "WHERE csv_id = ? AND status = 2", array($subno_id)));
+        $arrChoice = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_csv, 'status = 2'));
 
         if (!isset($arrChoice['no'])) $arrChoice['no'] = array();

branches/comu-ver2/data/class/pages/admin/contents/LC_Page_Admin_Contents_Campaign.php

@@ -120 +120 @@
 
             // CSV出力タイトル行の作成
-            $arrCsvOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(4, " WHERE csv_id = 4 AND status = 1"));
+            $arrCsvOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(4, 'status = 1'));
 
             if (count($arrCsvOutput) <= 0) break;

branches/comu-ver2/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -309 +309 @@
 
                     // CSVカラム取得
-                    $arrCsvOutput = ($objCSV->sfgetCsvOutput(2, " WHERE csv_id = 2 AND status = 1"));
+                    $arrCsvOutput = ($objCSV->sfgetCsvOutput(2, 'status = 1'));
 
                     if (count($arrCsvOutput) <= 0) break;

branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order.php

@@ -288 +288 @@
 
                             // CSV出力タイトル行の作成
-                            $arrCsvOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(3, " WHERE csv_id = 3 AND status = 1"));
+                            $arrCsvOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(3, 'status = 1'));
 
                             if (count($arrCsvOutput) <= 0) break;
 
                             $arrCsvOutputCols = $arrCsvOutput['col'];
+                            $arrCsvOutputConvs = $arrCsvOutput['conv'];
                             $arrCsvOutputTitle = $arrCsvOutput['disp_name'];
                             $head = SC_Utils_Ex::sfGetCSVList($arrCsvOutputTitle);
-                            $data = $objCSV->lfGetCSV("dtb_order", $where, $option, $arrval, $arrCsvOutputCols);
+                            $data = $objCSV->lfGetCSV("dtb_order", $where, $option, $arrval, $arrCsvOutputCols, $arrCsvOutputConvs);
 
                             // CSVを送信する。