← All changes | classes/Visualizer/Module.php +162 -12 3.1.3 → 3.4.2 View file →

		@@ -65,12 +65,28 @@
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 );
	70	+ register_shutdown_function( array($this, 'onShutdown') );
69	71
70	72	}
71	73
72	74	/**
	75	+ * Register a shutdown hook to catch fatal errors.
	76	+ *
	77	+ * @since ?
	78	+ *
	79	+ * @access public
	80	+ */
	81	+ public function onShutdown() {
	82	+ $error = error_get_last();
	83	+ if ( $error['type'] === E_ERROR && false !== strpos( $error['file'], 'Visualizer/' ) ) {
	84	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Critical error %s', print_r( $error, true ) ), 'error', __FILE__, __LINE__ );
	85	+ }
	86	+ }
	87	+
	88	+ /**
73	89	* Registers an action hook.
74	90	*
75	91	* @since 1.0.0
76	92	* @uses add_action() To register action hook.
		@@ -147,8 +163,17 @@
147	163	return $this;
148	164	}
149	165
150	166	/**
	167	+ * A wrapper around the actual function _getDataAs. This function is invoked as a filter.
	168	+ *
	169	+ * @since 3.2.0
	170	+ */
	171	+ public function getDataAs( $final, $chart_id, $type ) {
	172	+ return $this->_getDataAs( $chart_id, $type );
	173	+ }
	174	+
	175	+ /**
151	176	* Extracts the data for a chart and prepares it for the given type.
152	177	*
153	178	* @access public
154	179	* @param int $chart_id The chart id.
		@@ -158,9 +183,9 @@
158	183	$final = null;
159	184	$success = false;
160	185	if ( $chart_id ) {
161	186	$chart = get_post( $chart_id );
162		- $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
	187	+ $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
163	188	}
164	189	if ( $success ) {
165	190	$settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
166	191	$rows = array();
		@@ -195,14 +220,29 @@
195	220	}
196	221	}
197	222	}
198	223
199		- $filename = isset( $settings['title'] ) && ! empty( $settings['title'] ) ? $settings['title'] : 'visualizer#' . $chart_id;
	224	+ $title = 'visualizer#' . $chart_id;
	225	+ if ( ! empty( $settings['title'] ) ) {
	226	+ $title = $settings['title'];
	227	+ }
	228	+ // for ChartJS, title is an array.
	229	+ if ( is_array( $title ) && isset( $title['text'] ) ) {
	230	+ $title = $title['text'];
	231	+ }
	232	+ if ( empty( $title ) ) {
	233	+ $title = 'visualizer#' . $chart_id;
	234	+ }
200	235
	236	+ $filename = $title;
	237	+
201	238	switch ( $type ) {
202	239	case 'csv':
203		- $final = $this->_getCSV( $rows, $filename );
	240	+ $final = $this->_getCSV( $rows, $filename, false );
204	241	break;
	242	+ case 'csv-display':
	243	+ $final = $this->_getCSV( $rows, $filename, true );
	244	+ break;
205	245	case 'xls':
206	246	$final = $this->_getExcel( $rows, $filename );
207	247	break;
208	248	case 'print':
		@@ -218,24 +258,39 @@
218	258	*
219	259	* @access private
220	260	* @param array $rows The array of data.
221	261	* @param string $filename The name of the file to use.
	262	+ * @param bool $enclose Enclose strings that have commas in them in double quotes.
222	263	*/
223		- private function _getCSV( $rows, $filename ) {
	264	+ private function _getCSV( $rows, $filename, $enclose ) {
224	265	$filename .= '.csv';
225	266
	267	+ $bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF );
226	268	$fp = tmpfile();
227	269	// support for MS Excel
228		- fprintf( $fp, $bom = ( chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF ) ) );
	270	+ fprintf( $fp, $bom );
229	271	foreach ( $rows as $row ) {
230	272	fputcsv( $fp, $row );
231	273	}
232	274	rewind( $fp );
233	275	$csv = '';
	276	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
234	277	while ( ( $array = fgetcsv( $fp ) ) !== false ) {
235	278	if ( strlen( $csv ) > 0 ) {
236	279	$csv .= PHP_EOL;
237	280	}
	281	+ // if enclosure is required, check every item of this line
	282	+ // if a comma exists in the item, add enclosure.
	283	+ if ( $enclose ) {
	284	+ $temp_array = array();
	285	+ foreach ( $array as $item ) {
	286	+ if ( strpos( $item, ',' ) !== false ) {
	287	+ $item = VISUALIZER_CSV_ENCLOSURE . $item . VISUALIZER_CSV_ENCLOSURE;
	288	+ }
	289	+ $temp_array[] = $item;
	290	+ }
	291	+ $array = $temp_array;
	292	+ }
238	293	$csv .= implode( ',', $array );
239	294	}
240	295	fclose( $fp );
241	296
		@@ -241,8 +296,9 @@
241	296
242	297	return array(
243	298	'csv' => $csv,
244	299	'name' => $filename,
	300	+ 'string' => str_replace( $bom, '', $csv ),
245	301	);
246	302	}
247	303
248	304	/**
		@@ -279,8 +335,9 @@
279	335	}
280	336	return array(
281	337	'csv' => 'data:application/vnd.ms-excel;base64,' . base64_encode( $xlsData ),
282	338	'name' => $filename,
	339	+ 'raw' => base64_encode( $xlsData ),
283	340	);
284	341	}
285	342
286	343	/**
		@@ -310,8 +367,14 @@
310	367
311	368	$table = '<table class="visualizer-print">';
312	369	$index = 0;
313	370	foreach ( $rows as $row ) {
	371	+ // skip the data type row.
	372	+ if ( 1 === $index ) {
	373	+ $index++;
	374	+ continue;
	375	+ }
	376	+
314	377	$table .= '<tr>';
315	378	foreach ( $row as $col ) {
316	379	if ( $index === 0 ) {
317	380	$table .= '<th>' . $col . '</th>';
		@@ -418,11 +481,16 @@
418	481	require_once( ABSPATH . 'wp-admin/includes/file.php' );
419	482	WP_Filesystem();
420	483	global $wp_filesystem;
421	484
422		- $dir = $wp_filesystem->wp_content_dir() . 'uploads/visualizer';
423		- $file = $wp_filesystem->wp_content_dir() . 'uploads/visualizer/customization.js';
	485	+ $multisite_arg = '/';
	486	+ if ( is_multisite() && ! is_main_site() ) {
	487	+ $multisite_arg = '/sites/' . get_current_blog_id() . '/';
	488	+ }
424	489
	490	+ $dir = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer';
	491	+ $file = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer/customization.js';
	492	+
425	493	if ( $wp_filesystem->is_readable( $file ) ) {
426	494	return $specific;
427	495	}
428	496
		@@ -431,8 +499,9 @@
431	499	return $default;
432	500	}
433	501
434	502	if ( ! $wp_filesystem->exists( $dir ) ) {
	503	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
435	504	if ( ( $done = $wp_filesystem->mkdir( $dir ) ) === false ) {
436	505	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to create directory %s', $dir ), 'error', __FILE__, __LINE__ );
437	506	return $default;
438	507	}
		@@ -440,8 +509,9 @@
440	509
441	510	// if file does not exist, copy.
442	511	if ( ! $wp_filesystem->exists( $file ) ) {
443	512	$src = str_replace( ABSPATH, $wp_filesystem->abspath(), VISUALIZER_ABSPATH . '/js/customization.js' );
	513	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
444	514	if ( ( $done = $wp_filesystem->copy( $src, $file ) ) === false ) {
445	515	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to copy file %s to %s', $src, $file ), 'error', __FILE__, __LINE__ );
446	516	return $default;
447	517	}
		@@ -453,18 +523,18 @@
453	523	/**
454	524	* Load the class for the given chart's chart type so that its assets can be loaded.
455	525	*/
456	526	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 );
	527	+ $name = $this->load_chart_class_name( $chart_id );
459	528	$class = null;
460	529	if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
461	530	$class = new $name;
462	531	}
463	532
464		- if ( is_null( $class ) && VISUALIZER_PRO ) {
	533	+ if ( is_null( $class ) && Visualizer_Module::is_pro() ) {
465	534	// 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 ) ) );
	535	+ $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
	536	+ $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	537	}
468	538
469	539	return is_null( $class ) ? null : $class->getLibrary();
470	540	}
		@@ -469,8 +539,26 @@
469	539	return is_null( $class ) ? null : $class->getLibrary();
470	540	}
471	541
472	542	/**
	543	+ * Returns the class name for the given chart's chart type.
	544	+ */
	545	+ protected function load_chart_class_name( $chart_id ) {
	546	+ $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
	547	+ $lib = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	548	+
	549	+ // backward compatibility.
	550	+ if ( empty( $lib ) ) {
	551	+ $lib = 'GoogleCharts';
	552	+ if ( 'dataTable' === $type ) {
	553	+ $lib = 'DataTable';
	554	+ }
	555	+ }
	556	+ $name = 'Visualizer_Render_Sidebar_Type_' . $lib . '_' . ucwords( $type );
	557	+ return $name;
	558	+ }
	559	+
	560	+ /**
473	561	* Generates the inline CSS to apply to the chart and adds these classes to the settings.
474	562	*
475	563	* @access public
476	564	* @param int $id The id of the chart.
		@@ -491,9 +579,9 @@
491	579	foreach ( $element as $property => $value ) {
492	580	$attributes[] = $this->handle_css_property( $property, $value );
493	581	}
494	582	$class_name = $id . $name;
495		- $properties = implode( '; ', array_filter( $attributes ) );
	583	+ $properties = implode( ' !important; ', array_filter( $attributes ) );
496	584	if ( ! empty( $properties ) ) {
497	585	$css .= '.' . $class_name . ' {' . $properties . ' !important;}';
498	586	$classes[ $name ] = $class_name;
499	587	}
		@@ -545,7 +633,69 @@
545	633	);
546	634
547	635	$q = new WP_Query( $args );
548	636	return $q->found_posts > 0;
	637	+ }
	638	+
	639	+ /**
	640	+ * Determines how many charts have been created.
	641	+ */
	642	+ protected static function numberOfCharts() {
	643	+ $args = array(
	644	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	645	+ 'fields' => 'ids',
	646	+ 'post_status' => 'publish',
	647	+ 'posts_per_page' => 300,
	648	+ );
	649	+
	650	+ $q = new WP_Query( $args );
	651	+ return $q->found_posts;
	652	+ }
	653	+
	654	+ /**
	655	+ * Checks if the PRO version is active.
	656	+ *
	657	+ * @since 3.3.0
	658	+ */
	659	+ public static function is_pro() {
	660	+ // versions of pro before 1.9.0 will use the constant VISUALIZER_PRO
	661	+ // versions of pro 1.9.0 onwards will use the filter
	662	+ return apply_filters( 'visualizer_is_pro', VISUALIZER_PRO );
	663	+ }
	664	+
	665	+ /**
	666	+ * Checks if the PRO version is older than a particular version.
	667	+ *
	668	+ * @since 3.3.0
	669	+ */
	670	+ public static function is_pro_older_than( $version ) {
	671	+ return version_compare( VISUALIZER_PRO_VERSION, $version, '<' );
	672	+ }
	673	+
	674	+ /**
	675	+ * Should we show some specific feature on the basis of the version?
	676	+ *
	677	+ * @since 3.4.0
	678	+ */
	679	+ public static function can_show_feature( $feature ) {
	680	+ switch ( $feature ) {
	681	+ case 'simple-editor':
	682	+ // if user has pro but an older version, then don't load the simple editor functionality
	683	+ // as the select box will not behave as expected because the pro editor's functionality will supercede.
	684	+ return ! Visualizer_Module::is_pro() || ! Visualizer_Module::is_pro_older_than( '1.9.2' );
	685	+ }
	686	+ return false;
	687	+ }
	688	+
	689	+ /**
	690	+ * Gets the features for the provided license type.
	691	+ */
	692	+ public static final function get_features_for_license( $plan ) {
	693	+ switch ( $plan ) {
	694	+ case 1:
	695	+ return array( 'import-wp', 'db-query' );
	696	+ case 2:
	697	+ return array( 'schedule-chart', 'chart-permissions' );
	698	+ }
549	699	}
550	700
551	701	}