← All changes | classes/Visualizer/Module.php +34 -292 3.10.0 → 3.2.0 View file →

		@@ -66,28 +66,12 @@
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	69	$this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, 'getDataAs', 10, 3 );
70		- $this->_addAction( 'pre_get_posts', 'PreGetPosts' );
71		- register_shutdown_function( array($this, 'onShutdown') );
72	70
73	71	}
74	72
75	73	/**
76		- * Register a shutdown hook to catch fatal errors.
77		- *
78		- * @since ?
79		- *
80		- * @access public
81		- */
82		- public function onShutdown() {
83		- $error = error_get_last();
84		- if ( $error && $error['type'] === E_ERROR && false !== strpos( $error['file'], 'Visualizer/' ) ) {
85		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Critical error %s', print_r( $error, true ) ), 'error', __FILE__, __LINE__ );
86		- }
87		- }
88		-
89		- /**
90	74	* Registers an action hook.
91	75	*
92	76	* @since 1.0.0
93	77	* @uses add_action() To register action hook.
		@@ -190,9 +174,9 @@
190	174	if ( $success ) {
191	175	$settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
192	176	$rows = array();
193	177	$series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
194		- $data = self::get_chart_data( $chart, $type, false );
	178	+ $data = unserialize( $chart->post_content );
195	179	if ( ! empty( $series ) ) {
196	180	$row = array();
197	181	foreach ( $series as $array ) {
198	182	$row[] = $array['label'];
		@@ -221,29 +205,14 @@
221	205	}
222	206	}
223	207	}
224	208
225		- $title = 'visualizer#' . $chart_id;
226		- if ( ! empty( $settings['title'] ) ) {
227		- $title = $settings['title'];
228		- }
229		- // for ChartJS, title is an array.
230		- if ( is_array( $title ) && isset( $title['text'] ) ) {
231		- $title = $title['text'];
232		- }
233		- if ( empty( $title ) ) {
234		- $title = 'visualizer#' . $chart_id;
235		- }
	209	+ $filename = isset( $settings['title'] ) && ! empty( $settings['title'] ) ? $settings['title'] : 'visualizer#' . $chart_id;
236	210
237		- $filename = $title;
238		-
239	211	switch ( $type ) {
240	212	case 'csv':
241		- $final = $this->_getCSV( $rows, $filename, false );
	213	+ $final = $this->_getCSV( $rows, $filename );
242	214	break;
243		- case 'csv-display':
244		- $final = $this->_getCSV( $rows, $filename, true );
245		- break;
246	215	case 'xls':
247	216	$final = $this->_getExcel( $rows, $filename );
248	217	break;
249	218	case 'print':
		@@ -248,11 +217,8 @@
248	217	break;
249	218	case 'print':
250	219	$final = $this->_getHTML( $rows );
251	220	break;
252		- case 'image':
253		- $final = $this->_getImage( $chart );
254		- break;
255	221	}
256	222	}
257	223	return $final;
258	224	}
		@@ -262,23 +228,14 @@
262	228	*
263	229	* @access private
264	230	* @param array $rows The array of data.
265	231	* @param string $filename The name of the file to use.
266		- * @param bool $enclose Enclose strings that have commas in them in double quotes.
267	232	*/
268		- private function _getCSV( $rows, $filename, $enclose ) {
	233	+ private function _getCSV( $rows, $filename ) {
269	234	$filename .= '.csv';
270	235
271	236	$bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF );
272		- // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
273		- $fp = function_exists( 'tmpfile' ) ? @tmpfile() : null;
274		- if ( null === $fp ) {
275		- $fp = fopen( wp_tempnam(), 'w+' );
276		- }
277		- if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
278		- unset( $rows[1] );
279		- $rows = array_values( $rows );
280		- }
	237	+ $fp = tmpfile();
281	238	// support for MS Excel
282	239	fprintf( $fp, $bom );
283	240	foreach ( $rows as $row ) {
284	241	fputcsv( $fp, $row );
		@@ -289,20 +246,8 @@
289	246	while ( ( $array = fgetcsv( $fp ) ) !== false ) {
290	247	if ( strlen( $csv ) > 0 ) {
291	248	$csv .= PHP_EOL;
292	249	}
293		- // if enclosure is required, check every item of this line
294		- // if a comma exists in the item, add enclosure.
295		- if ( $enclose ) {
296		- $temp_array = array();
297		- foreach ( $array as $item ) {
298		- if ( strpos( $item, ',' ) !== false ) {
299		- $item = VISUALIZER_CSV_ENCLOSURE . $item . VISUALIZER_CSV_ENCLOSURE;
300		- }
301		- $temp_array[] = $item;
302		- }
303		- $array = $temp_array;
304		- }
305	250	$csv .= implode( ',', $array );
306	251	}
307	252	fclose( $fp );
308	253
		@@ -323,22 +268,14 @@
323	268	private function _getExcel( $rows, $filename ) {
324	269	// PHPExcel did not like sheet names longer than 31 characters and we will assume the same with PhpSpreadsheet
325	270	$chart = substr( $filename, 0, 30 );
326	271	$filename .= '.xlsx';
327		- if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
328		- unset( $rows[1] );
329		- $rows = array_values( $rows );
330		- $rows = array_map(
331		- function( $r ) {
332		- return array_map( 'strval', $r );
333		- },
334		- $rows
335		- );
336		- }
	272	+
337	273	$vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
338	274	if ( is_readable( $vendor_file ) ) {
339	275	include_once( $vendor_file );
340	276	}
	277	+
341	278	$xlsData = '';
342	279	if ( class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) ) {
343	280	$doc = new PhpOffice\PhpSpreadsheet\Spreadsheet();
344	281	$doc->getActiveSheet()->fromArray( $rows, null, 'A1' );
		@@ -415,22 +352,8 @@
415	352	);
416	353	}
417	354
418	355	/**
419		- * Disable revisions temporarily for visualizer post type.
420		- */
421		- protected final function disableRevisionsTemporarily() {
422		- add_filter(
423		- 'wp_revisions_to_keep', function( $num, $post ) {
424		- if ( $post->post_type === Visualizer_Plugin::CPT_VISUALIZER ) {
425		- return 0;
426		- }
427		- return $num;
428		- }, 10, 2
429		- );
430		- }
431		-
432		- /**
433	356	* Undo revisions for the chart, and if necessary, restore the earliest version.
434	357	*
435	358	* @return bool If any revisions were found.
436	359	*/
		@@ -435,11 +358,9 @@
435	358	* @return bool If any revisions were found.
436	359	*/
437	360	public final function undoRevisions( $chart_id, $restore = false ) {
438	361	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'undoRevisions for %d with%s restore', $chart_id, ( $restore ? '' : 'out' ) ), 'debug', __FILE__, __LINE__ );
439		- if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
440		- return false;
441		- }
	362	+
442	363	$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
443	364	if ( count( $revisions ) > 1 ) {
444	365	$revision_ids = array_keys( $revisions );
445	366
		@@ -445,9 +366,9 @@
445	366
446	367	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'found %d revisions = %s', count( $revisions ), print_r( $revision_ids, true ) ), 'debug', __FILE__, __LINE__ );
447	368
448	369	// when we restore, a new revision is likely to be created. so, let's disable revisions for the time being.
449		- $this->disableRevisionsTemporarily();
	370	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
450	371
451	372	if ( $restore ) {
452	373	// restore to the oldest one i.e. the first one.
453	374	wp_restore_post_revision( array_shift( $revision_ids ) );
		@@ -466,13 +387,10 @@
466	387	/**
467	388	* If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing.
468	389	*/
469	390	public final function handleExistingRevisions( $chart_id, $chart ) {
	391	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
470	392
471		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
472		- if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
473		- return $chart_id;
474		- }
475	393	// undo revisions.
476	394	$revisions_found = $this->undoRevisions( $chart_id, true );
477	395
478	396	// create revision for the edit action.
		@@ -520,16 +438,11 @@
520	438	require_once( ABSPATH . 'wp-admin/includes/file.php' );
521	439	WP_Filesystem();
522	440	global $wp_filesystem;
523	441
524		- $multisite_arg = '/';
525		- if ( is_multisite() && ! is_main_site() ) {
526		- $multisite_arg = '/sites/' . get_current_blog_id() . '/';
527		- }
	442	+ $dir = $wp_filesystem->wp_content_dir() . 'uploads/visualizer';
	443	+ $file = $wp_filesystem->wp_content_dir() . 'uploads/visualizer/customization.js';
528	444
529		- $dir = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer';
530		- $file = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer/customization.js';
531		-
532	445	if ( $wp_filesystem->is_readable( $file ) ) {
533	446	return $specific;
534	447	}
535	448
		@@ -562,21 +475,18 @@
562	475	/**
563	476	* Load the class for the given chart's chart type so that its assets can be loaded.
564	477	*/
565	478	protected function load_chart_type( $chart_id ) {
566		- $name = $this->load_chart_class_name( $chart_id );
	479	+ $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
	480	+ $name = 'Visualizer_Render_Sidebar_Type_' . ucwords( $type );
567	481	$class = null;
568	482	if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
569		- if ( 'Visualizer_Render_Sidebar_Type_DataTable_DataTable' === $name ) {
570		- $name = 'Visualizer_Render_Sidebar_Type_DataTable_Tabular';
571		- }
572	483	$class = new $name;
573	484	}
574	485
575		- if ( is_null( $class ) && Visualizer_Module::is_pro() ) {
	486	+ if ( is_null( $class ) && VISUALIZER_PRO ) {
576	487	// lets see if this type exists in pro. New Lite(3.1.0+) & old Pro(1.8.0-).
577		- $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
578		- $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 ) ) );
	488	+ $class = apply_filters( 'visualizer_pro_chart_type_sidebar', null, array( 'type' => $type, 'settings' => get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) ) );
579	489	}
580	490
581	491	return is_null( $class ) ? null : $class->getLibrary();
582	492	}
		@@ -581,26 +491,8 @@
581	491	return is_null( $class ) ? null : $class->getLibrary();
582	492	}
583	493
584	494	/**
585		- * Returns the class name for the given chart's chart type.
586		- */
587		- protected function load_chart_class_name( $chart_id ) {
588		- $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
589		- $lib = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
590		-
591		- // backward compatibility.
592		- if ( empty( $lib ) ) {
593		- $lib = 'GoogleCharts';
594		- if ( 'dataTable' === $type ) {
595		- $lib = 'DataTable';
596		- }
597		- }
598		- $name = 'Visualizer_Render_Sidebar_Type_' . $lib . '_' . ucwords( $type );
599		- return $name;
600		- }
601		-
602		- /**
603	495	* Generates the inline CSS to apply to the chart and adds these classes to the settings.
604	496	*
605	497	* @access public
606	498	* @param int $id The id of the chart.
		@@ -608,31 +500,32 @@
608	500	*/
609	501	protected function get_inline_custom_css( $id, $settings ) {
610	502	$css = '';
611	503
	504	+ $arguments = array( '', $settings );
	505	+ if ( ! isset( $settings['customcss'] ) ) {
	506	+ return $arguments;
	507	+ }
	508	+
612	509	$classes = array();
613	510	$css = '<style type="text/css" name="visualizer-custom-css" id="customcss-' . $id . '">';
614		- if ( ! empty( $settings['customcss'] ) ) {
615		- foreach ( $settings['customcss'] as $name => $element ) {
616		- $attributes = array();
617		- foreach ( $element as $property => $value ) {
618		- $attributes[] = $this->handle_css_property( $property, $value );
619		- }
620		- $class_name = $id . $name;
621		- $properties = implode( ' !important; ', array_filter( $attributes ) );
622		- if ( ! empty( $properties ) ) {
623		- $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
624		- $classes[ $name ] = $class_name;
625		- }
	511	+ foreach ( $settings['customcss'] as $name => $element ) {
	512	+ $attributes = array();
	513	+ foreach ( $element as $property => $value ) {
	514	+ $attributes[] = $this->handle_css_property( $property, $value );
626	515	}
627		- $settings['cssClassNames'] = $classes;
	516	+ $class_name = $id . $name;
	517	+ $properties = implode( '; ', array_filter( $attributes ) );
	518	+ if ( ! empty( $properties ) ) {
	519	+ $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
	520	+ $classes[ $name ] = $class_name;
	521	+ }
628	522	}
	523	+ $css .= '</style>';
629	524
630		- $img_path = VISUALIZER_ABSURL . 'images';
631		- $css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}.google-visualization-controls-categoryfilter label.google-visualization-controls-label {vertical-align: middle;}.google-visualization-controls-categoryfilter li.goog-inline-block {margin: 0 0.2em;}.google-visualization-controls-categoryfilter li {padding: 0 0.2em;}";
632		- $css .= '</style>';
	525	+ $settings['cssClassNames'] = $classes;
633	526
634		- $arguments = array( $css, $settings );
	527	+ $arguments = array( $css, $settings );
635	528	apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) );
636	529
637	530	return $arguments;
638	531	}
		@@ -676,156 +569,5 @@
676	569	$q = new WP_Query( $args );
677	570	return $q->found_posts > 0;
678	571	}
679	572
680		- /**
681		- * Determines how many charts have been created.
682		- */
683		- protected static function numberOfCharts() {
684		- $args = array(
685		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
686		- 'fields' => 'ids',
687		- 'post_status' => 'publish',
688		- 'posts_per_page' => 300,
689		- );
690		-
691		- $q = new WP_Query( $args );
692		- return $q->found_posts;
693		- }
694		-
695		- /**
696		- * Checks if the PRO version is active.
697		- *
698		- * @since 3.3.0
699		- */
700		- public static function is_pro() {
701		- // versions of pro before 1.9.0 will use the constant VISUALIZER_PRO
702		- // versions of pro 1.9.0 onwards will use the filter
703		- return apply_filters( 'visualizer_is_pro', VISUALIZER_PRO );
704		- }
705		-
706		- /**
707		- * Checks if the PRO version is older than a particular version.
708		- *
709		- * @since 3.3.0
710		- */
711		- public static function is_pro_older_than( $version ) {
712		- return version_compare( VISUALIZER_PRO_VERSION, $version, '<' );
713		- }
714		-
715		- /**
716		- * Should we show some specific feature on the basis of the version?
717		- *
718		- * @since 3.4.0
719		- */
720		- public static function can_show_feature( $feature ) {
721		- switch ( $feature ) {
722		- case 'simple-editor':
723		- // if user has pro but an older version, then don't load the simple editor functionality
724		- // as the select box will not behave as expected because the pro editor's functionality will supercede.
725		- return ! Visualizer_Module::is_pro() || ! Visualizer_Module::is_pro_older_than( '1.9.2' );
726		- }
727		- return false;
728		- }
729		-
730		- /**
731		- * Gets the features for the provided license type.
732		- */
733		- public static final function get_features_for_license( $plan ) {
734		- switch ( $plan ) {
735		- case 1:
736		- return array( 'import-wp', 'db-query', 'import-wc-report' );
737		- case 2:
738		- return array( 'schedule-chart', 'chart-permissions' );
739		- }
740		- }
741		-
742		- /**
743		- * Gets the chart content after common manipulations.
744		- */
745		- public static function get_chart_data( $chart, $type, $run_filter = true ) {
746		- // change HTML entities
747		- $post_content = html_entity_decode( htmlentities( $chart->post_content ) );
748		- $post_content = preg_replace_callback(
749		- '!s:(\d+):"(.*?)";!s',
750		- function ( $matches ) {
751		- if ( isset( $matches[2] ) ) {
752		- return 's:' . strlen( $matches[2] ) . ':"' . $matches[2] . '";';
753		- }
754		- },
755		- $post_content
756		- );
757		- $data = unserialize( $post_content );
758		- $altered = array();
759		- if ( ! empty( $data ) ) {
760		- foreach ( $data as $index => $array ) {
761		- if ( ! is_array( $index ) && is_array( $array ) ) {
762		- foreach ( $array as &$datum ) {
763		- if ( is_string( $datum ) ) {
764		- $datum = stripslashes( $datum );
765		- }
766		- }
767		- $altered[ $index ] = $array;
768		- }
769		- }
770		- }
771		- // if something goes wrong and the end result is empty, be safe and use the original data
772		- if ( empty( $altered ) ) {
773		- $altered = $data;
774		- }
775		- if ( $run_filter ) {
776		- return apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, $altered, $chart->ID, $type );
777		- }
778		- return $altered;
779		- }
780		-
781		- /**
782		- * Get chart image.
783		- *
784		- * @param object $chart Chart data.
785		- * @return string
786		- */
787		- public function _getImage( $chart = null ) {
788		- $image = '';
789		- if ( $chart ) {
790		- $chart_image = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true );
791		- if ( ! empty( $chart_image ) ) {
792		- $image = wp_get_attachment_image( $chart_image, 'full' );
793		- }
794		- }
795		- return array(
796		- 'csv' => $image,
797		- );
798		- }
799		-
800		- /**
801		- * Filter chart title if visualizer post type.
802		- *
803		- * @param object $query WP Query object.
804		- * @return void
805		- */
806		- public function PreGetPosts( $query ) {
807		- if ( ! $query->is_main_query() ) {
808		- $post_type = $query->get( 'post_type' );
809		- if ( 'visualizer' === $post_type ) {
810		- $this->_addFilter( Visualizer_Plugin::FILTER_CHART_TITLE, 'filterChartTitle', 10, 2 );
811		- }
812		- }
813		- }
814		-
815		- /**
816		- * Filter chart title.
817		- *
818		- * @access public
819		- * @param string $post_title Post title.
820		- * @param int $post_id Post ID.
821		- * @return string
822		- */
823		- public function filterChartTitle( $post_title, $post_id ) {
824		- $post_type = get_post_type( $post_id );
825		- $post_title = trim( $post_title );
826		- if ( 'visualizer' === $post_type && 'Visualization' === $post_title ) {
827		- return sprintf( '%s #%d', $post_title, $post_id );
828		- }
829		- return $post_title;
830		- }
831	573	}