mirror of
https://github.com/parsecsv/parsecsv-for-php.git
synced 2026-02-19 08:36:39 +00:00
unparse readability
This commit is contained in:
@@ -792,19 +792,28 @@ class parseCSV {
|
|||||||
* @param delimiter field delimiter to use
|
* @param delimiter field delimiter to use
|
||||||
* @return CSV data (text string)
|
* @return CSV data (text string)
|
||||||
*/
|
*/
|
||||||
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) ) $data = &$this->data;
|
if ( !is_array($data) || empty($data) ) {
|
||||||
if ( !is_array($fields) || empty($fields) ) $fields = &$this->titles;
|
$data = &$this->data;
|
||||||
if ( $delimiter === null ) $delimiter = $this->delimiter;
|
}
|
||||||
|
|
||||||
|
if ( !is_array($fields) || empty($fields) ) {
|
||||||
|
$fields = &$this->titles;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $delimiter === null ) {
|
||||||
|
$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);
|
$entry[] = $this->_enclose_value($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
$string .= implode($delimiter, $entry).$this->linefeed;
|
$string .= implode($delimiter, $entry).$this->linefeed;
|
||||||
$entry = array();
|
$entry = array();
|
||||||
}
|
}
|
||||||
@@ -814,8 +823,9 @@ class parseCSV {
|
|||||||
foreach( $row as $field => $value ) {
|
foreach( $row as $field => $value ) {
|
||||||
$entry[] = $this->_enclose_value($value);
|
$entry[] = $this->_enclose_value($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
$string .= implode($delimiter, $entry).$this->linefeed;
|
$string .= implode($delimiter, $entry).$this->linefeed;
|
||||||
$entry = array();
|
$entry = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $string;
|
return $string;
|
||||||
|
|||||||
Reference in New Issue
Block a user