Merge pull request #856 from Codeinwp/bugfix/316

Fix render chart issue when creating first time chart

Author: cristian-ungureanu

classes/Visualizer/Module.php

@@ -740,16 +740,28 @@ public static final function get_features_for_license( $plan ) {
 	 */
 	public static function get_chart_data( $chart, $type, $run_filter = true ) {
 		// change HTML entities
-		$data = unserialize( html_entity_decode( htmlentities( $chart->post_content ) ) );
+		$post_content = html_entity_decode( htmlentities( $chart->post_content ) );
+		$post_content = preg_replace_callback(
+			'!s:(\d+):"(.*?)";!s',
+			function ( $matches ) {
+				if ( isset( $matches[2] ) ) {
+					return 's:' . strlen( $matches[2] ) . ':"' . $matches[2] . '";';
+				}
+			},
+			$post_content
+		);
+		$data = unserialize( $post_content );
 		$altered = array();
-		foreach ( $data as $index => $array ) {
-			if ( ! is_array( $index ) && is_array( $array ) ) {
-				foreach ( $array as &$datum ) {
-					if ( is_string( $datum ) ) {
-						$datum = stripslashes( $datum );
+		if ( ! empty( $data ) ) {
+			foreach ( $data as $index => $array ) {
+				if ( ! is_array( $index ) && is_array( $array ) ) {
+					foreach ( $array as &$datum ) {
+						if ( is_string( $datum ) ) {
+							$datum = stripslashes( $datum );
+						}
 					}
+					$altered[ $index ] = $array;
 				}
-				$altered[ $index ] = $array;
 			}
 		}
 		// if something goes wrong and the end result is empty, be safe and use the original data

classes/Visualizer/Module/Chart.php

@@ -1137,6 +1137,7 @@ public function uploadData() {
 					$chart->post_content = $content;
 				}
 				wp_update_post( $chart->to_array() );
+
 				update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
 				update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
 				update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
@@ -1146,6 +1147,15 @@ public function uploadData() {
 				Visualizer_Module_Utility::set_defaults( $chart, null );
 
 				$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
+				if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $source->getSeries() ) > 1 ) ) {
+					$diff_total_series = abs( count( $settings['series'] ) - count( $source->getSeries() ) );
+					if ( $diff_total_series ) {
+						foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
+							$settings['series'][] = end( $settings['series'] );
+						}
+						update_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
+					}
+				}
 
 				$render->id     = $chart->ID;
 				$render->data   = json_encode( $source->getRawData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );

classes/Visualizer/Module/Frontend.php

@@ -581,13 +581,25 @@ private function getChartData( $cache_key = '', $chart_id = 0 ) {
 		// Get chart by ID.
 		$chart = get_post( $chart_id );
 		if ( $chart && Visualizer_Plugin::CPT_VISUALIZER === $chart->post_type ) {
+			$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
+			$series   = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
+
+			if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $series ) > 1 ) ) {
+				$diff_total_series = abs( count( $settings['series'] ) - count( $series ) );
+				if ( $diff_total_series ) {
+					foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
+						$settings['series'][] = end( $settings['series'] );
+					}
+				}
+			}
 			$chart_data = array(
 				'chart'       => $chart,
 				'type'        => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ),
-				'settings'    => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ),
-				'series'      => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ),
+				'settings'    => $settings,
+				'series'      => $series,
 				'chart_image' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true ),
 			);
+
 			// Put the results in a transient. Expire after 12 hours.
 			set_transient( $cache_key, $chart_data, apply_filters( Visualizer_Plugin::FILTER_HANDLE_CACHE_EXPIRATION_TIME, 12 * HOUR_IN_SECONDS ) );
 			return $chart_data;

classes/Visualizer/Source/Csv/Remote.php

@@ -97,6 +97,9 @@ private function _repopulate( $chart_id ) {
 	 * @return array The re populated array of data or old one.
 	 */
 	public function repopulateData( $data, $chart_id ) {
+		if ( ! is_array( $data ) ) {
+			$data = array();
+		}
 		return array_key_exists( 'data', $data ) ? $data['data'] : $data;
 	}