← All changes | classes/Visualizer/Module.php +102 -10 3.1.3 → 3.3.2 View file →

		@@ -65,8 +65,9 @@
65	65	$this->_plugin = $plugin;
66	66
67	67	$this->_addFilter( Visualizer_Plugin::FILTER_UNDO_REVISIONS, 'undoRevisions', 10, 2 );
68	68	$this->_addFilter( Visualizer_Plugin::FILTER_HANDLE_REVISIONS, 'handleExistingRevisions', 10, 2 );
	69	+ $this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, 'getDataAs', 10, 3 );
69	70
70	71	}
71	72
72	73	/**
		@@ -147,8 +148,17 @@
147	148	return $this;
148	149	}
149	150
150	151	/**
	152	+ * A wrapper around the actual function _getDataAs. This function is invoked as a filter.
	153	+ *
	154	+ * @since 3.2.0
	155	+ */
	156	+ public function getDataAs( $final, $chart_id, $type ) {
	157	+ return $this->_getDataAs( $chart_id, $type );
	158	+ }
	159	+
	160	+ /**
151	161	* Extracts the data for a chart and prepares it for the given type.
152	162	*
153	163	* @access public
154	164	* @param int $chart_id The chart id.
		@@ -158,9 +168,9 @@
158	168	$final = null;
159	169	$success = false;
160	170	if ( $chart_id ) {
161	171	$chart = get_post( $chart_id );
162		- $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
	172	+ $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
163	173	}
164	174	if ( $success ) {
165	175	$settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
166	176	$rows = array();
		@@ -195,10 +205,22 @@
195	205	}
196	206	}
197	207	}
198	208
199		- $filename = isset( $settings['title'] ) && ! empty( $settings['title'] ) ? $settings['title'] : 'visualizer#' . $chart_id;
	209	+ $title = 'visualizer#' . $chart_id;
	210	+ if ( ! empty( $settings['title'] ) ) {
	211	+ $title = $settings['title'];
	212	+ }
	213	+ // for ChartJS, title is an array.
	214	+ if ( is_array( $title ) && isset( $title['text'] ) ) {
	215	+ $title = $title['text'];
	216	+ }
	217	+ if ( empty( $title ) ) {
	218	+ $title = 'visualizer#' . $chart_id;
	219	+ }
200	220
	221	+ $filename = $title;
	222	+
201	223	switch ( $type ) {
202	224	case 'csv':
203	225	$final = $this->_getCSV( $rows, $filename );
204	226	break;
		@@ -222,16 +244,18 @@
222	244	*/
223	245	private function _getCSV( $rows, $filename ) {
224	246	$filename .= '.csv';
225	247
	248	+ $bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF );
226	249	$fp = tmpfile();
227	250	// support for MS Excel
228		- fprintf( $fp, $bom = ( chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF ) ) );
	251	+ fprintf( $fp, $bom );
229	252	foreach ( $rows as $row ) {
230	253	fputcsv( $fp, $row );
231	254	}
232	255	rewind( $fp );
233	256	$csv = '';
	257	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
234	258	while ( ( $array = fgetcsv( $fp ) ) !== false ) {
235	259	if ( strlen( $csv ) > 0 ) {
236	260	$csv .= PHP_EOL;
237	261	}
		@@ -241,8 +265,9 @@
241	265
242	266	return array(
243	267	'csv' => $csv,
244	268	'name' => $filename,
	269	+ 'string' => str_replace( $bom, '', $csv ),
245	270	);
246	271	}
247	272
248	273	/**
		@@ -279,8 +304,9 @@
279	304	}
280	305	return array(
281	306	'csv' => 'data:application/vnd.ms-excel;base64,' . base64_encode( $xlsData ),
282	307	'name' => $filename,
	308	+ 'raw' => base64_encode( $xlsData ),
283	309	);
284	310	}
285	311
286	312	/**
		@@ -310,8 +336,14 @@
310	336
311	337	$table = '<table class="visualizer-print">';
312	338	$index = 0;
313	339	foreach ( $rows as $row ) {
	340	+ // skip the data type row.
	341	+ if ( 1 === $index ) {
	342	+ $index++;
	343	+ continue;
	344	+ }
	345	+
314	346	$table .= '<tr>';
315	347	foreach ( $row as $col ) {
316	348	if ( $index === 0 ) {
317	349	$table .= '<th>' . $col . '</th>';
		@@ -418,11 +450,16 @@
418	450	require_once( ABSPATH . 'wp-admin/includes/file.php' );
419	451	WP_Filesystem();
420	452	global $wp_filesystem;
421	453
422		- $dir = $wp_filesystem->wp_content_dir() . 'uploads/visualizer';
423		- $file = $wp_filesystem->wp_content_dir() . 'uploads/visualizer/customization.js';
	454	+ $multisite_arg = '/';
	455	+ if ( is_multisite() && ! is_main_site() ) {
	456	+ $multisite_arg = '/sites/' . get_current_blog_id() . '/';
	457	+ }
424	458
	459	+ $dir = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer';
	460	+ $file = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer/customization.js';
	461	+
425	462	if ( $wp_filesystem->is_readable( $file ) ) {
426	463	return $specific;
427	464	}
428	465
		@@ -431,8 +468,9 @@
431	468	return $default;
432	469	}
433	470
434	471	if ( ! $wp_filesystem->exists( $dir ) ) {
	472	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
435	473	if ( ( $done = $wp_filesystem->mkdir( $dir ) ) === false ) {
436	474	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to create directory %s', $dir ), 'error', __FILE__, __LINE__ );
437	475	return $default;
438	476	}
		@@ -440,8 +478,9 @@
440	478
441	479	// if file does not exist, copy.
442	480	if ( ! $wp_filesystem->exists( $file ) ) {
443	481	$src = str_replace( ABSPATH, $wp_filesystem->abspath(), VISUALIZER_ABSPATH . '/js/customization.js' );
	482	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
444	483	if ( ( $done = $wp_filesystem->copy( $src, $file ) ) === false ) {
445	484	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to copy file %s to %s', $src, $file ), 'error', __FILE__, __LINE__ );
446	485	return $default;
447	486	}
		@@ -453,18 +492,18 @@
453	492	/**
454	493	* Load the class for the given chart's chart type so that its assets can be loaded.
455	494	*/
456	495	protected function load_chart_type( $chart_id ) {
457		- $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
458		- $name = 'Visualizer_Render_Sidebar_Type_' . ucwords( $type );
	496	+ $name = $this->load_chart_class_name( $chart_id );
459	497	$class = null;
460	498	if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
461	499	$class = new $name;
462	500	}
463	501
464		- if ( is_null( $class ) && VISUALIZER_PRO ) {
	502	+ if ( is_null( $class ) && Visualizer_Module::is_pro() ) {
465	503	// lets see if this type exists in pro. New Lite(3.1.0+) & old Pro(1.8.0-).
466		- $class = apply_filters( 'visualizer_pro_chart_type_sidebar', null, array( 'type' => $type, 'settings' => get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) ) );
	504	+ $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
	505	+ $class = apply_filters( 'visualizer_pro_chart_type_sidebar', null, array( 'id' => $chart_id, 'type' => $type, 'settings' => get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) ) );
467	506	}
468	507
469	508	return is_null( $class ) ? null : $class->getLibrary();
470	509	}
		@@ -469,8 +508,26 @@
469	508	return is_null( $class ) ? null : $class->getLibrary();
470	509	}
471	510
472	511	/**
	512	+ * Returns the class name for the given chart's chart type.
	513	+ */
	514	+ protected function load_chart_class_name( $chart_id ) {
	515	+ $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
	516	+ $lib = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	517	+
	518	+ // backward compatibility.
	519	+ if ( empty( $lib ) ) {
	520	+ $lib = 'GoogleCharts';
	521	+ if ( 'dataTable' === $type ) {
	522	+ $lib = 'DataTable';
	523	+ }
	524	+ }
	525	+ $name = 'Visualizer_Render_Sidebar_Type_' . $lib . '_' . ucwords( $type );
	526	+ return $name;
	527	+ }
	528	+
	529	+ /**
473	530	* Generates the inline CSS to apply to the chart and adds these classes to the settings.
474	531	*
475	532	* @access public
476	533	* @param int $id The id of the chart.
		@@ -491,9 +548,9 @@
491	548	foreach ( $element as $property => $value ) {
492	549	$attributes[] = $this->handle_css_property( $property, $value );
493	550	}
494	551	$class_name = $id . $name;
495		- $properties = implode( '; ', array_filter( $attributes ) );
	552	+ $properties = implode( ' !important; ', array_filter( $attributes ) );
496	553	if ( ! empty( $properties ) ) {
497	554	$css .= '.' . $class_name . ' {' . $properties . ' !important;}';
498	555	$classes[ $name ] = $class_name;
499	556	}
		@@ -545,7 +602,42 @@
545	602	);
546	603
547	604	$q = new WP_Query( $args );
548	605	return $q->found_posts > 0;
	606	+ }
	607	+
	608	+ /**
	609	+ * Determines how many charts have been created.
	610	+ */
	611	+ protected static function numberOfCharts() {
	612	+ $args = array(
	613	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	614	+ 'fields' => 'ids',
	615	+ 'post_status' => 'publish',
	616	+ 'posts_per_page' => 300,
	617	+ );
	618	+
	619	+ $q = new WP_Query( $args );
	620	+ return $q->found_posts;
	621	+ }
	622	+
	623	+ /**
	624	+ * Checks if the PRO version is active.
	625	+ *
	626	+ * @since 3.3.0
	627	+ */
	628	+ public static function is_pro() {
	629	+ // versions of pro before 1.9.0 will use the constant VISUALIZER_PRO
	630	+ // versions of pro 1.9.0 onwards will use the filter
	631	+ return apply_filters( 'visualizer_is_pro', VISUALIZER_PRO );
	632	+ }
	633	+
	634	+ /**
	635	+ * Checks if the PRO version is older than a particular version.
	636	+ *
	637	+ * @since 3.3.0
	638	+ */
	639	+ public static function is_pro_older_than( $version ) {
	640	+ return version_compare( VISUALIZER_PRO_VERSION, $version, '<' );
549	641	}
550	642
551	643	}