From 8bb8e2d7cf5d32279c09fb7ec484369a42a2da64 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Wed, 5 Feb 2014 19:09:57 -0500 Subject: [PATCH] output readability --- parsecsv.lib.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index f09ab11..84f4c8e 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -278,14 +278,22 @@ class parseCSV { * @return CSV data using delimiter of choice, or default */ function output ($filename = null, $data = array(), $fields = array(), $delimiter = null) { - if ( empty($filename) ) $filename = $this->output_filename; - if ( $delimiter === null ) $delimiter = $this->output_delimiter; + if (empty($filename)) { + $filename = $this->output_filename; + } + + if ($delimiter===null) { + $delimiter = $this->output_delimiter; + } + $data = $this->unparse($data, $fields, null, null, $delimiter); - if ( $filename !== null ) { + + if ($filename!==null) { header('Content-type: application/csv'); header('Content-Disposition: attachment; filename="'.$filename.'"'); echo $data; } + return $data; }