This commit is contained in:
William Knauss
2014-06-05 20:45:28 -04:00
parent 4d07760933
commit 8af4d1e513

View File

@@ -833,25 +833,25 @@ class parseCSV {
* *
* @return CSV data (text string) * @return CSV data (text string)
*/ */
public function unparse ( $data = array(), $fields = array(), $append = false , $is_php = false, $delimiter = null) { public function unparse ($data = array(), $fields = array(), $append = false , $is_php = false, $delimiter = null) {
if ( !is_array($data) || empty($data) ) { if (!is_array($data) || empty($data)) {
$data = &$this->data; $data = &$this->data;
} }
if ( !is_array($fields) || empty($fields) ) { if (!is_array($fields) || empty($fields)) {
$fields = &$this->titles; $fields = &$this->titles;
} }
if ( $delimiter === null ) { if ($delimiter === null) {
$delimiter = $this->delimiter; $delimiter = $this->delimiter;
} }
$string = ( $is_php ) ? "<?php header('Status: 403'); die(' '); ?>".$this->linefeed : '' ; $string = ($is_php) ? "<?php header('Status: 403'); die(' '); ?>".$this->linefeed : '';
$entry = array(); $entry = array();
// create heading // create heading
if ( $this->heading && !$append && !empty($fields) ) { if ($this->heading && !$append && !empty($fields)) {
foreach( $fields as $key => $value ) { foreach ($fields as $key => $value) {
$entry[] = $this->_enclose_value($value, $delimiter); $entry[] = $this->_enclose_value($value, $delimiter);
} }
@@ -860,8 +860,8 @@ class parseCSV {
} }
// create data // create data
foreach( $data as $key => $row ) { foreach ($data as $key => $row) {
foreach( $row as $field => $value ) { foreach ($row as $field => $value) {
$entry[] = $this->_enclose_value($value, $delimiter); $entry[] = $this->_enclose_value($value, $delimiter);
} }