From 346dde8e97daf1b80c746c0190c290752aba2f7f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 28 Oct 2016 14:35:32 +0300 Subject: [PATCH] Fix for parseCSV constructor error --- app/Includes/parsecsv.lib.php | 170 +++++++++++++++++----------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/app/Includes/parsecsv.lib.php b/app/Includes/parsecsv.lib.php index 7fe04984db97..797beef30340 100644 --- a/app/Includes/parsecsv.lib.php +++ b/app/Includes/parsecsv.lib.php @@ -1,21 +1,21 @@ output (true, 'movies.csv', $array); ---------------- - + */ @@ -83,87 +83,87 @@ class parseCSV { * Configuration * - set these options with $object->var_name = 'value'; */ - + # use first line/entry as field names var $heading = true; - + # override field names var $fields = []; - + # sort entries by this field var $sort_by = null; var $sort_reverse = false; - + # delimiter (comma) and enclosure (double quote) var $delimiter = ','; var $enclosure = '"'; - + # basic SQL-like conditions for row matching var $conditions = null; - + # number of rows to ignore from beginning of data var $offset = null; - + # limits the number of returned rows to specified amount var $limit = null; - + # number of rows to analyze when attempting to auto-detect delimiter var $auto_depth = 15; - + # characters to ignore when attempting to auto-detect delimiter var $auto_non_chars = "a-zA-Z0-9\n\r"; - + # preferred delimiter characters, only used when all filtering method # returns multiple possible delimiters (happens very rarely) var $auto_preferred = ",;\t.:|"; - + # character encoding options var $convert_encoding = false; var $input_encoding = 'ISO-8859-1'; var $output_encoding = 'ISO-8859-1'; - + # used by unparse(), save(), and output() functions var $linefeed = "\r\n"; - + # only used by output() function var $output_delimiter = ','; var $output_filename = 'data.csv'; - - + + /** * Internal variables */ - + # current file var $file; - + # loaded file contents var $file_data; - + # array of field values in data parsed var $titles = []; - + # two dimentional array of CSV data var $data = []; - - + + /** * Constructor * @param input CSV file or string * @return nothing */ - function parseCSV ($input = null, $offset = null, $limit = null, $conditions = null) { + function __construct ($input = null, $offset = null, $limit = null, $conditions = null) { if ( $offset !== null ) $this->offset = $offset; if ( $limit !== null ) $this->limit = $limit; if ( count($conditions) > 0 ) $this->conditions = $conditions; if ( !empty($input) ) $this->parse($input); } - - + + // ============================================== // ----- [ Main Functions ] --------------------- // ============================================== - + /** * Parse CSV file or string * @param input CSV file or string @@ -184,7 +184,7 @@ class parseCSV { } return true; } - + /** * Save changes, or new file and/or data * @param file file to save to @@ -199,7 +199,7 @@ class parseCSV { $is_php = ( preg_match('/\.php$/i', $file) ) ? true : false ; return $this->_wfile($file, $this->unparse($data, $fields, $append, $is_php), $mode); } - + /** * Generate CSV based string for output * @param output if true, prints headers and strings to browser @@ -220,7 +220,7 @@ class parseCSV { } return $data; } - + /** * Convert character encoding * @param input input character encoding, uses default if left blank @@ -232,7 +232,7 @@ class parseCSV { if ( $input !== null ) $this->input_encoding = $input; if ( $output !== null ) $this->output_encoding = $output; } - + /** * Auto-Detect Delimiter: Find delimiter by analyzing a specific number of * rows to determine most probable delimiter character @@ -244,13 +244,13 @@ class parseCSV { * @return delimiter character */ function auto ($file = null, $parse = true, $search_depth = null, $preferred = null, $enclosure = null) { - + if ( $file === null ) $file = $this->file; if ( empty($search_depth) ) $search_depth = $this->auto_depth; if ( $enclosure === null ) $enclosure = $this->enclosure; - + if ( $preferred === null ) $preferred = $this->auto_preferred; - + if ( empty($this->file_data) ) { if ( $this->_check_data($file) ) { $data = &$this->file_data; @@ -258,24 +258,24 @@ class parseCSV { } else { $data = &$this->file_data; } - + $chars = []; $strlen = strlen($data); $enclosed = false; $n = 1; $to_end = true; - + // walk specific depth finding posssible delimiter characters for ( $i=0; $i < $strlen; $i++ ) { $ch = $data{$i}; $nch = ( isset($data{$i+1}) ) ? $data{$i+1} : false ; $pch = ( isset($data{$i-1}) ) ? $data{$i-1} : false ; - + // open and closing quotes if ( $ch == $enclosure && (!$enclosed || $nch != $enclosure) ) { $enclosed = ( $enclosed ) ? false : true ; - - // inline quotes + + // inline quotes } elseif ( $ch == $enclosure && $enclosed ) { $i++; @@ -287,7 +287,7 @@ class parseCSV { } else { $n++; } - + // count character } elseif (!$enclosed) { if ( !preg_match('/['.preg_quote($this->auto_non_chars, '/').']/i', $ch) ) { @@ -299,7 +299,7 @@ class parseCSV { } } } - + // filtering $depth = ( $to_end ) ? $n-1 : $n ; $filtered = []; @@ -308,24 +308,24 @@ class parseCSV { $filtered[$match] = $char; } } - + // capture most probable delimiter ksort($filtered); $delimiter = reset($filtered); $this->delimiter = $delimiter; - + // parse data if ( $parse ) $this->data = $this->parse_string(); - + return $delimiter; - + } - - + + // ============================================== // ----- [ Core Functions ] --------------------- // ============================================== - + /** * Read file to string and call parse_string() * @param file local CSV file @@ -336,7 +336,7 @@ class parseCSV { if ( empty($this->file_data) ) $this->load_data($file); return ( !empty($this->file_data) ) ? $this->parse_string() : false ; } - + /** * Parse CSV strings to arrays * @param data CSV string @@ -348,7 +348,7 @@ class parseCSV { $data = &$this->file_data; } else return false; } - + $rows = []; $row = []; $row_count = 0; @@ -358,19 +358,19 @@ class parseCSV { $enclosed = false; $was_enclosed = false; $strlen = strlen($data); - + // walk through each character for ( $i=0; $i < $strlen; $i++ ) { $ch = $data{$i}; $nch = ( isset($data{$i+1}) ) ? $data{$i+1} : false ; $pch = ( isset($data{$i-1}) ) ? $data{$i-1} : false ; - + // open and closing quotes if ( $ch == $this->enclosure && (!$enclosed || $nch != $this->enclosure) ) { $enclosed = ( $enclosed ) ? false : true ; if ( $enclosed ) $was_enclosed = true; - - // inline quotes + + // inline quotes } elseif ( $ch == $this->enclosure && $enclosed ) { $current .= $ch; $i++; @@ -382,7 +382,7 @@ class parseCSV { $row[$key] = $current; $current = ''; $col++; - + // end of row if ( $ch == "\n" || $ch == "\r" ) { if ( $this->_validate_offset($row_count) && $this->_validate_row_conditions($row, $this->conditions) ) { @@ -406,7 +406,7 @@ class parseCSV { $i = $strlen; } } - + // append character to current field } else { $current .= $ch; @@ -421,7 +421,7 @@ class parseCSV { } return $rows; } - + /** * Create CSV data from array * @param data 2D array with data @@ -436,10 +436,10 @@ class parseCSV { if ( !is_array($data) || empty($data) ) $data = &$this->data; if ( !is_array($fields) || empty($fields) ) $fields = &$this->titles; if ( $delimiter === null ) $delimiter = $this->delimiter; - + $string = ( $is_php ) ? "".$this->linefeed : '' ; $entry = []; - + // create heading if ( $this->heading && !$append ) { foreach( $fields as $key => $value ) { @@ -448,7 +448,7 @@ class parseCSV { $string .= implode($delimiter, $entry).$this->linefeed; $entry = []; } - + // create data foreach( $data as $key => $row ) { foreach( $row as $field => $value ) { @@ -457,10 +457,10 @@ class parseCSV { $string .= implode($delimiter, $entry).$this->linefeed; $entry = []; } - + return $string; } - + /** * Load local file or string * @param input local CSV file @@ -488,16 +488,16 @@ class parseCSV { } return false; } - - + + // ============================================== // ----- [ Internal Functions ] ----------------- // ============================================== - + /** * Validate a row against specified conditions * @param row array with values from a row - * @param conditions specified conditions that the row must match + * @param conditions specified conditions that the row must match * @return true of false */ function _validate_row_conditions ($row = [], $conditions = null) { @@ -523,11 +523,11 @@ class parseCSV { } return false; } - + /** * Validate a row against a single condition * @param row array with values from a row - * @param condition specified condition that the row must match + * @param condition specified condition that the row must match * @return true of false */ function _validate_row_condition ($row, $condition) { @@ -583,7 +583,7 @@ class parseCSV { } return '1'; } - + /** * Validates if the row is within the offset or not if sorting is disabled * @param current_row the current row number being processed @@ -593,7 +593,7 @@ class parseCSV { if ( $this->sort_by === null && $this->offset !== null && $current_row < $this->offset ) return false; return true; } - + /** * Enclose values if needed * - only used by unparse() @@ -611,7 +611,7 @@ class parseCSV { } return $value; } - + /** * Check file data * @param file local filename @@ -624,8 +624,8 @@ class parseCSV { } return true; } - - + + /** * Check if passed info might be delimiter * - only used by find_delimiter() @@ -656,7 +656,7 @@ class parseCSV { } else return false; } } - + /** * Read local file * @param file local filename @@ -689,7 +689,7 @@ class parseCSV { } return false; } - + } -?> \ No newline at end of file +?>