Changeset 17343 for branches/version-2/data/class/pages/admin

Timestamp:

2008/06/03 20:26:52 (18 years ago)

Author:

naka

Message:

CSV出力データ作成関数の不具合修正

Location:

branches/version-2/data/class/pages/admin

Files:

• contents/LC_Page_Admin_Contents_CsvSql.php (modified) (2 diffs)
• customer/LC_Page_Admin_Customer.php (modified) (2 diffs)
• mail/LC_Page_Admin_Mail.php (modified) (1 diff)

branches/version-2/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php

@@ -148 +148 @@
                 $header .= "\n";
 
-                $data = $this->lfGetCSVData($arrCsvOutputData, $arrKey);
+                $data = SC_Utils_Ex::getCSVData($arrCsvOutputData, $arrKey);
                 // CSV出力
                 SC_Utils_Ex::sfCSVDownload($header.$data);
@@ -411 +411 @@
         return $ret;
     }
-
-
-    //---- CSV出力用データ取得
-    function lfGetCSVData( $array, $arrayIndex){
-        $return = "";
-        for ($i=0; $i<count($array); $i++){
-            for ($j=0; $j<count($array[$i]); $j++ ){
-                if ( $j > 0 ) $return .= ",";
-                $return .= "\"";
-                if ( $arrayIndex ){
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";
-                } else {
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
-                }
-            }
-            $return .= "\n";
-        }
-
-        return $return;
-    }
 }
 ?>

branches/version-2/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -275 +275 @@
 
                     //-　CSV出力
-                    $data = $this->lfGetCSVData($this->search_data, $arrColumn);
+                    $data = SC_Utils_Ex::getCSVData($this->search_data, $arrColumn);
 
                     SC_Utils_Ex::sfCSVDownload($header.$data);
@@ -491 +491 @@
         }
     }
-
-    //---- CSV出力用データ取得
-    function lfGetCSVData( $array, $arrayIndex){
-
-        for ($i=0; $i<count($array); $i++){
-
-            for ($j=0; $j<count($array[$i]); $j++ ){
-                if ( $j > 0 ) $return .= ",";
-                $return .= "\"";
-                if ( $arrayIndex ){
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";
-                } else {
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
-                }
-            }
-            $return .= "\n";
-        }
-
-        return $return;
-    }
 }
 ?>

branches/version-2/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -425 +425 @@
 
         if ( $result ){
-            $return = $this->lfGetCSVData( $result, $arrTitle);
-        }
-        return $return;
-    }
-
-    //---- CSV出力用データ取得
-    function lfGetCSVData( $array, $arrayIndex){
-
-        for ($i=0; $i<count($array); $i++){
-
-            for ($j=0; $j<count($array[$i]); $j++ ){
-                if ( $j > 0 ) $return .= ",";
-                $return .= "\"";
-                if ( $arrayIndex ){
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";
-                } else {
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
-                }
-            }
-            $return .= "\n";
+            $return = SC_Utils_Ex::getCSVData( $result, $arrTitle);
         }
         return $return;