Merge pull request #641 from contactashish13/issue-637

Allow apostrophes in charts

Author: rodica-andronache

classes/Visualizer/Module.php

@@ -190,7 +190,7 @@ public function _getDataAs( $chart_id, $type ) {
 			$settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
 			$rows   = array();
 			$series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
-			$data   = unserialize( $chart->post_content );
+			$data = self::get_chart_data( $chart, $type, false );
 			if ( ! empty( $series ) ) {
 				$row = array();
 				foreach ( $series as $array ) {
@@ -698,4 +698,30 @@ public static final function get_features_for_license( $plan ) {
 		}
 	}
 
+	/**
+	 * Gets the chart content after common manipulations.
+	 */
+	public static function get_chart_data( $chart, $type, $run_filter = true ) {
+		// change HTML entities
+		$data = unserialize( html_entity_decode( $chart->post_content ) );
+		$altered = array();
+		foreach ( $data as $index => $array ) {
+			if ( ! is_array( $index ) ) {
+				foreach ( $array as &$datum ) {
+					if ( is_string( $datum ) ) {
+						$datum = stripslashes( $datum );
+					}
+				}
+				$altered[ $index ] = $array;
+			}
+		}
+		// if something goes wrong and the end result is empty, be safe and use the original data
+		if ( empty( $altered ) ) {
+			$altered = $data;
+		}
+		if ( $run_filter ) {
+			return apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, $altered, $chart->ID, $type );
+		}
+		return $altered;
+	}
 }

classes/Visualizer/Module/Admin.php

@@ -878,7 +878,7 @@ public function renderLibraryPage() {
 			}
 
 			$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
-			$data   = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
+			$data   = self::get_chart_data( $chart, $type );
 
 			$library = $this->load_chart_type( $chart->ID );
 

classes/Visualizer/Module/Chart.php

@@ -358,7 +358,7 @@ private function _getChartArray( WP_Post $chart = null ) {
 		}
 		$type   = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
 		$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
-		$data   = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
+		$data   = self::get_chart_data( $chart, $type );
 		$library = $this->load_chart_type( $chart->ID );
 
 		$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
@@ -887,10 +887,11 @@ private function handleCSVasString( $data, $editor_type ) {
 						}
 						// 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 );
+						// we can standardize the CSV enclosure here and replace all ' with "
+						// we can assume that if there are an even number of ' they should be changed to "
+						// but that will screw up words like fo'c'sle
+						// so here let's just assume ' will NOT be used for enclosures
 						fwrite( $handle, $row );
 						fwrite( $handle, PHP_EOL );
 					}

classes/Visualizer/Module/Frontend.php

@@ -253,7 +253,7 @@ public function renderChart( $atts ) {
 		}
 
 		// handle data filter hooks
-		$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
+		$data   = self::get_chart_data( $chart, $type );
 		if ( ! empty( $atts['data'] ) ) {
 			$data = apply_filters( $atts['data'], $data, $chart->ID, $type );
 		}

classes/Visualizer/Render/Layout.php

@@ -141,7 +141,10 @@ public static function _renderJsonScreen( $args ) {
 		$root = get_post_meta( $id, Visualizer_Plugin::CF_JSON_ROOT, true );
 		$paging = get_post_meta( $id, Visualizer_Plugin::CF_JSON_PAGING, true );
 		$headers = get_post_meta( $id, Visualizer_Plugin::CF_JSON_HEADERS, true );
-		if ( empty( $headers['method'] ) ) {
+		if ( empty( $headers ) ) {
+			$headers = array();
+		}
+		if ( $headers && empty( $headers['method'] ) ) {
 			$headers['method'] = 'get';
 		}
 		$methods = apply_filters( 'visualizer_json_request_methods', array( 'GET', 'POST' ) );
@@ -174,7 +177,7 @@ class="visualizer-input json-form-element">
 									<div>
 										<select name="method" class="json-form-element">
 										<?php foreach ( $methods as $method ) { ?>
-											<option value="<?php echo $method; ?>" <?php selected( $headers['method'], $method ); ?>><?php echo $method; ?></option>
+											<option value="<?php echo $method; ?>" <?php $headers && selected( $headers['method'], $method ); ?>><?php echo $method; ?></option>
 										<?php } ?>
 										</select>
 									</div>
@@ -339,7 +342,7 @@ public static function _renderTextEditor( $args ) {
 		$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'] );
+			$data = str_replace( PHP_EOL, "\n", stripslashes( $csv['string'] ) );
 		}
 		?>
 		<div class="viz-simple-editor-type viz-text-editor">
@@ -368,7 +371,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( str_replace( "'", "\'", html_entity_decode( $chart->post_content ) ) ), $type );
+			$data       = Visualizer_Module::get_chart_data( $chart, $type );
 		} else {
 			$headers    = array_keys( $data[0] );
 		}

classes/Visualizer/Source.php

@@ -237,7 +237,8 @@ protected function _normalizeData( $data ) {
 					}
 					break;
 				case 'string':
-					$data[ $i ] = $this->toUTF8( $data[ $i ] );
+					// if a ' is provided, strip the backslash
+					$data[ $i ] = stripslashes( $this->toUTF8( $data[ $i ] ) );
 					break;
 			}
 		}