parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 08:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

output readability

Browse Source
This commit is contained in:
William Knauss
2014-02-05 19:09:57 -05:00
parent c7e1f825a0
commit 8bb8e2d7cf
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parsecsv.lib.php
View File

@@ -278,14 +278,22 @@ class parseCSV {
* @return CSV data using delimiter of choice, or default * @return CSV data using delimiter of choice, or default
*/ */
function output ($filename = null, $data = array(), $fields = array(), $delimiter = null) { function output ($filename = null, $data = array(), $fields = array(), $delimiter = null) {
if ( empty($filename) ) $filename = $this->output_filename; if (empty($filename)) {
if ( $delimiter === null ) $delimiter = $this->output_delimiter; $filename = $this->output_filename;
}
if ($delimiter===null) {
$delimiter = $this->output_delimiter;
}
$data = $this->unparse($data, $fields, null, null, $delimiter); $data = $this->unparse($data, $fields, null, null, $delimiter);
if ( $filename !== null ) {
if ($filename!==null) {
header('Content-type: application/csv'); header('Content-type: application/csv');
header('Content-Disposition: attachment; filename="'.$filename.'"'); header('Content-Disposition: attachment; filename="'.$filename.'"');
echo $data; echo $data;
} }
return $data; return $data;
} }