Merge pull request #635 from contactashish13/issue-214

data changed in one editor to be editable in the other

Author: rodica-andronache

classes/Visualizer/Module.php

@@ -237,7 +237,10 @@ public function _getDataAs( $chart_id, $type ) {
 
 			switch ( $type ) {
 				case 'csv':
-					$final   = $this->_getCSV( $rows, $filename );
+					$final   = $this->_getCSV( $rows, $filename, false );
+					break;
+				case 'csv-display':
+					$final   = $this->_getCSV( $rows, $filename, true );
 					break;
 				case 'xls':
 					$final   = $this->_getExcel( $rows, $filename );
@@ -256,8 +259,9 @@ public function _getDataAs( $chart_id, $type ) {
 	 * @access private
 	 * @param array  $rows The array of data.
 	 * @param string $filename The name of the file to use.
+	 * @param bool   $enclose Enclose strings that have commas in them in double quotes.
 	 */
-	private function _getCSV( $rows, $filename ) {
+	private function _getCSV( $rows, $filename, $enclose ) {
 		$filename .= '.csv';
 
 		$bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF );
@@ -274,6 +278,18 @@ private function _getCSV( $rows, $filename ) {
 			if ( strlen( $csv ) > 0 ) {
 				$csv .= PHP_EOL;
 			}
+			// if enclosure is required, check every item of this line
+			// if a comma exists in the item, add enclosure.
+			if ( $enclose ) {
+				$temp_array = array();
+				foreach ( $array as $item ) {
+					if ( strpos( $item, ',' ) !== false ) {
+						$item = VISUALIZER_CSV_ENCLOSURE . $item . VISUALIZER_CSV_ENCLOSURE;
+					}
+					$temp_array[] = $item;
+				}
+				$array = $temp_array;
+			}
 			$csv .= implode( ',', $array );
 		}
 		fclose( $fp );

classes/Visualizer/Module/Chart.php

@@ -885,8 +885,14 @@ private function handleCSVasString( $data, $editor_type ) {
 						if ( empty( $row ) ) {
 							continue;
 						}
-						$columns = explode( ',', $row );
-						fputcsv( $handle, $columns );
+						// don't use fpucsv here because we need to just dump the data
+						// minus the empty rows
+						// and if any row contains ' or ", fputcsv will mess it up
+						// because fputcsv needs to tokenize
+						// and let's standardize the CSV enclosure
+						$row = str_replace( "'", VISUALIZER_CSV_ENCLOSURE, $row );
+						fwrite( $handle, $row );
+						fwrite( $handle, PHP_EOL );
 					}
 				}
 				$source = new Visualizer_Source_Csv( $tmpfile );
@@ -946,7 +952,7 @@ private function handleTabularData() {
 		for ( $j = 0; $j < count( $columns[0] ); $j++ ) {
 			$row = array();
 			for ( $i = 0; $i < count( $headers ); $i++ ) {
-				$row[] = $columns[ $i ][ $j ];
+				$row[] = sanitize_text_field( $columns[ $i ][ $j ] );
 			}
 			$csv[]  = $row;
 		}

classes/Visualizer/Render/Layout.php

@@ -336,7 +336,7 @@ public static function _renderSimpleEditorScreen( $args ) {
 	 */
 	public static function _renderTextEditor( $args ) {
 		$chart_id = $args[1];
-		$csv = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, array(), $chart_id, 'csv' );
+		$csv = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, array(), $chart_id, 'csv-display' );
 		$data = '';
 		if ( ! empty( $csv ) && isset( $csv['string'] ) ) {
 			$data = str_replace( PHP_EOL, "\n", $csv['string'] );
@@ -368,7 +368,7 @@ public static function _renderEditorTable( $args ) {
 			}
 			$chart      = get_post( $chart_id );
 			$type       = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
-			$data       = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $type );
+			$data       = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( str_replace( "'", "\'", html_entity_decode( $chart->post_content ) ) ), $type );
 		} else {
 			$headers    = array_keys( $data[0] );
 		}
@@ -442,7 +442,7 @@ public static function _renderEditorTable( $args ) {
 			}
 			foreach ( array_values( $row ) as $value ) {
 				if ( $editable_data ) {
-					echo '<td><input type="text" name="data' . $index++ . '[]" value="' . esc_attr( $value ) . '"></td>';
+					echo '<td><input type="text" name="data' . $index++ . '[]" value="' . esc_attr( stripslashes( $value ) ) . '"></td>';
 				} else {
 					echo '<td>' . ( is_array( $value ) ? __( 'Invalid Data', 'visualizer' ) : $value ) . '</td>';
 				}