From 844a1520f3a1698b6201ed330d3c693c5cd20d5d Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:14:16 -0400 Subject: [PATCH 1/8] made _wfile proctected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index d14d3f0..eefb9d1 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -1170,7 +1170,7 @@ class parseCSV { /** * Write to local file * - * @access public + * @access protected * @param file local filename * @param string data to write to file * @param mode fopen() mode @@ -1178,7 +1178,7 @@ class parseCSV { * * @return true or false */ - public function _wfile ($file, $string = '', $mode = 'wb', $lock = 2) { + protected function _wfile ($file, $string = '', $mode = 'wb', $lock = 2) { if ( $fp = fopen($file, $mode) ) { flock($fp, $lock); $re = fwrite($fp, $string); From e1c8cae852463a182998ecdc97ff7b1c28f92529 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:14:50 -0400 Subject: [PATCH 2/8] made _rfile protected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index eefb9d1..4143f62 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -1148,12 +1148,12 @@ class parseCSV { /** * Read local file * - * @access public + * @access protected * @param file local filename * * @return Data from file, or false on failure */ - public function _rfile ($file = null) { + protected function _rfile ($file = null) { if ( is_readable($file) ) { if ( !($fh = fopen($file, 'r')) ) { return false; From 0d5ae35a34e2c6cc58ed335d39fa9ecff35a9986 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:15:20 -0400 Subject: [PATCH 3/8] made _check_count protected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 4143f62..15fb6d0 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -1103,7 +1103,7 @@ class parseCSV { * Check if passed info might be delimiter * Only used by find_delimiter * - * @access public + * @access protected * @param [type] $char [description] * @param [type] $array [description] * @param [type] $depth [description] @@ -1111,7 +1111,7 @@ class parseCSV { * * @return special string used for delimiter selection, or false */ - public function _check_count ($char, $array, $depth, $preferred) { + protected function _check_count ($char, $array, $depth, $preferred) { if ( $depth == count($array) ) { $first = null; $equal = null; From d1f25ee3df683b08b0e286aa55cb1cfc6607eb41 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:16:45 -0400 Subject: [PATCH 4/8] made _check_data protected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 15fb6d0..e19f51a 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -1084,12 +1084,12 @@ class parseCSV { /** * Check file data * - * @access public + * @access protected * @param file local filename * * @return true or false */ - public function _check_data ($file = null) { + protected function _check_data ($file = null) { if ( empty($this->file_data) ) { if ( $file === null ) $file = $this->file; From b8248af92e3d030acdea817ce723c0748307eaa0 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:17:08 -0400 Subject: [PATCH 5/8] made _enclose_value protected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index e19f51a..dfa704e 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -1060,12 +1060,12 @@ class parseCSV { * Enclose values if needed * - only used by unparse() * - * @access public + * @access protected * @param value string to process * * @return Processed value */ - public function _enclose_value ($value = null, $delimiter = null) { + protected function _enclose_value ($value = null, $delimiter = null) { if ( $delimiter === null ) { $delimiter = $this->delimiter; } From b8920f99cb93c3fdf4c1d23440c8492fd5168225 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:17:29 -0400 Subject: [PATCH 6/8] made _validate_offset protected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index dfa704e..4f3a4f5 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -1043,12 +1043,12 @@ class parseCSV { /** * Validates if the row is within the offset or not if sorting is disabled * - * @access public + * @access protected * @param current_row the current row number being processed * * @return true of false */ - public function _validate_offset ($current_row) { + protected function _validate_offset ($current_row) { if ( $this->sort_by === null && $this->offset !== null && $current_row < $this->offset ) { return false; } From 5cb602be2dbea8c7e92b026912a1974b014872c1 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:17:58 -0400 Subject: [PATCH 7/8] made _validate_row_condition protected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 4f3a4f5..6acfd15 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -965,13 +965,13 @@ class parseCSV { /** * Validate a row against a single condition * - * @access public + * @access protected * @param row array with values from a row * @param condition specified condition that the row must match * * @return true of false */ - public function _validate_row_condition ($row, $condition) { + protected function _validate_row_condition ($row, $condition) { $operators = array( '=', 'equals', 'is', '!=', 'is not', From 734b35abc5b810cd7082257e429dea26c15ba1ed Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:18:17 -0400 Subject: [PATCH 8/8] made _validate_row_conditions protected --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 6acfd15..2fdd9ee 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -926,13 +926,13 @@ class parseCSV { /** * Validate a row against specified conditions * - * @access public + * @access protected * @param row array with values from a row * @param conditions specified conditions that the row must match * * @return true of false */ - public function _validate_row_conditions ($row = array(), $conditions = null) { + protected function _validate_row_conditions ($row = array(), $conditions = null) { if ( !empty($row) ) { if ( !empty($conditions) ) { $conditions = (strpos($conditions, ' OR ') !== false) ? explode(' OR ', $conditions) : array($conditions) ;