From 98a146bd3872cb61b48600dbb332b111d65d097f Mon Sep 17 00:00:00 2001 From: Norcoen Date: Tue, 3 Jun 2014 14:45:07 +0200 Subject: [PATCH] Force enclosing of all columns with optional switch --- parsecsv.lib.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index b18d95c..aad6df5 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -145,6 +145,15 @@ class parseCSV { * @var string */ public $enclosure = '"'; + + /** + * Enclose All + * Force enclosing all columns + * + * @access public + * @var bool + */ + public $enclose_all = false; /** * Conditions @@ -1049,7 +1058,7 @@ class parseCSV { if ( $value !== null && $value != '' ) { $delimiter = preg_quote($this->delimiter, '/'); $enclosure = preg_quote($this->enclosure, '/'); - if ( preg_match("/".$delimiter."|".$enclosure."|\n|\r/i", $value) || ($value{0} == ' ' || substr($value, -1) == ' ') ) { + if ( preg_match("/".$delimiter."|".$enclosure."|\n|\r/i", $value) || ($value{0} == ' ' || substr($value, -1) == ' ') || $this->enclose_all ) { $value = str_replace($this->enclosure, $this->enclosure.$this->enclosure, $value); $value = $this->enclosure.$value.$this->enclosure; }