← All changes | classes/Visualizer/Module.php +27 -160 3.10.1 → 3.4.2 View file →

		@@ -66,9 +66,8 @@
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	70	register_shutdown_function( array($this, 'onShutdown') );
72	71
73	72	}
74	73
		@@ -80,9 +79,9 @@
80	79	* @access public
81	80	*/
82	81	public function onShutdown() {
83	82	$error = error_get_last();
84		- if ( $error && $error['type'] === E_ERROR && false !== strpos( $error['file'], 'Visualizer/' ) ) {
	83	+ if ( $error['type'] === E_ERROR && false !== strpos( $error['file'], 'Visualizer/' ) ) {
85	84	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Critical error %s', print_r( $error, true ) ), 'error', __FILE__, __LINE__ );
86	85	}
87	86	}
88	87
		@@ -190,9 +189,9 @@
190	189	if ( $success ) {
191	190	$settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
192	191	$rows = array();
193	192	$series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
194		- $data = self::get_chart_data( $chart, $type, false );
	193	+ $data = unserialize( $chart->post_content );
195	194	if ( ! empty( $series ) ) {
196	195	$row = array();
197	196	foreach ( $series as $array ) {
198	197	$row[] = $array['label'];
		@@ -248,11 +247,8 @@
248	247	break;
249	248	case 'print':
250	249	$final = $this->_getHTML( $rows );
251	250	break;
252		- case 'image':
253		- $final = $this->_getImage( $chart );
254		- break;
255	251	}
256	252	}
257	253	return $final;
258	254	}
		@@ -268,20 +264,9 @@
268	264	private function _getCSV( $rows, $filename, $enclose ) {
269	265	$filename .= '.csv';
270	266
271	267	$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		- if ( ! function_exists( 'wp_tempnam' ) ) {
276		- require_once ABSPATH . 'wp-admin/includes/file.php';
277		- }
278		- $fp = fopen( wp_tempnam(), 'w+' );
279		- }
280		- if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
281		- unset( $rows[1] );
282		- $rows = array_values( $rows );
283		- }
	268	+ $fp = tmpfile();
284	269	// support for MS Excel
285	270	fprintf( $fp, $bom );
286	271	foreach ( $rows as $row ) {
287	272	fputcsv( $fp, $row );
		@@ -326,22 +311,14 @@
326	311	private function _getExcel( $rows, $filename ) {
327	312	// PHPExcel did not like sheet names longer than 31 characters and we will assume the same with PhpSpreadsheet
328	313	$chart = substr( $filename, 0, 30 );
329	314	$filename .= '.xlsx';
330		- if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
331		- unset( $rows[1] );
332		- $rows = array_values( $rows );
333		- $rows = array_map(
334		- function( $r ) {
335		- return array_map( 'strval', $r );
336		- },
337		- $rows
338		- );
339		- }
	315	+
340	316	$vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
341	317	if ( is_readable( $vendor_file ) ) {
342	318	include_once( $vendor_file );
343	319	}
	320	+
344	321	$xlsData = '';
345	322	if ( class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) ) {
346	323	$doc = new PhpOffice\PhpSpreadsheet\Spreadsheet();
347	324	$doc->getActiveSheet()->fromArray( $rows, null, 'A1' );
		@@ -418,22 +395,8 @@
418	395	);
419	396	}
420	397
421	398	/**
422		- * Disable revisions temporarily for visualizer post type.
423		- */
424		- protected final function disableRevisionsTemporarily() {
425		- add_filter(
426		- 'wp_revisions_to_keep', function( $num, $post ) {
427		- if ( $post->post_type === Visualizer_Plugin::CPT_VISUALIZER ) {
428		- return 0;
429		- }
430		- return $num;
431		- }, 10, 2
432		- );
433		- }
434		-
435		- /**
436	399	* Undo revisions for the chart, and if necessary, restore the earliest version.
437	400	*
438	401	* @return bool If any revisions were found.
439	402	*/
		@@ -438,11 +401,9 @@
438	401	* @return bool If any revisions were found.
439	402	*/
440	403	public final function undoRevisions( $chart_id, $restore = false ) {
441	404	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'undoRevisions for %d with%s restore', $chart_id, ( $restore ? '' : 'out' ) ), 'debug', __FILE__, __LINE__ );
442		- if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
443		- return false;
444		- }
	405	+
445	406	$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
446	407	if ( count( $revisions ) > 1 ) {
447	408	$revision_ids = array_keys( $revisions );
448	409
		@@ -448,9 +409,9 @@
448	409
449	410	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'found %d revisions = %s', count( $revisions ), print_r( $revision_ids, true ) ), 'debug', __FILE__, __LINE__ );
450	411
451	412	// when we restore, a new revision is likely to be created. so, let's disable revisions for the time being.
452		- $this->disableRevisionsTemporarily();
	413	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
453	414
454	415	if ( $restore ) {
455	416	// restore to the oldest one i.e. the first one.
456	417	wp_restore_post_revision( array_shift( $revision_ids ) );
		@@ -469,13 +430,10 @@
469	430	/**
470	431	* If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing.
471	432	*/
472	433	public final function handleExistingRevisions( $chart_id, $chart ) {
	434	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
473	435
474		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
475		- if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
476		- return $chart_id;
477		- }
478	436	// undo revisions.
479	437	$revisions_found = $this->undoRevisions( $chart_id, true );
480	438
481	439	// create revision for the edit action.
		@@ -568,11 +526,8 @@
568	526	protected function load_chart_type( $chart_id ) {
569	527	$name = $this->load_chart_class_name( $chart_id );
570	528	$class = null;
571	529	if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
572		- if ( 'Visualizer_Render_Sidebar_Type_DataTable_DataTable' === $name ) {
573		- $name = 'Visualizer_Render_Sidebar_Type_DataTable_Tabular';
574		- }
575	530	$class = new $name;
576	531	}
577	532
578	533	if ( is_null( $class ) && Visualizer_Module::is_pro() ) {
		@@ -611,31 +566,32 @@
611	566	*/
612	567	protected function get_inline_custom_css( $id, $settings ) {
613	568	$css = '';
614	569
	570	+ $arguments = array( '', $settings );
	571	+ if ( ! isset( $settings['customcss'] ) ) {
	572	+ return $arguments;
	573	+ }
	574	+
615	575	$classes = array();
616	576	$css = '<style type="text/css" name="visualizer-custom-css" id="customcss-' . $id . '">';
617		- if ( ! empty( $settings['customcss'] ) ) {
618		- foreach ( $settings['customcss'] as $name => $element ) {
619		- $attributes = array();
620		- foreach ( $element as $property => $value ) {
621		- $attributes[] = $this->handle_css_property( $property, $value );
622		- }
623		- $class_name = $id . $name;
624		- $properties = implode( ' !important; ', array_filter( $attributes ) );
625		- if ( ! empty( $properties ) ) {
626		- $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
627		- $classes[ $name ] = $class_name;
628		- }
	577	+ foreach ( $settings['customcss'] as $name => $element ) {
	578	+ $attributes = array();
	579	+ foreach ( $element as $property => $value ) {
	580	+ $attributes[] = $this->handle_css_property( $property, $value );
629	581	}
630		- $settings['cssClassNames'] = $classes;
	582	+ $class_name = $id . $name;
	583	+ $properties = implode( ' !important; ', array_filter( $attributes ) );
	584	+ if ( ! empty( $properties ) ) {
	585	+ $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
	586	+ $classes[ $name ] = $class_name;
	587	+ }
631	588	}
	589	+ $css .= '</style>';
632	590
633		- $img_path = VISUALIZER_ABSURL . 'images';
634		- $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;}.visualizer-front-container .dataTables_scrollHeadInner{margin: 0 auto;}";
635		- $css .= '</style>';
	591	+ $settings['cssClassNames'] = $classes;
636	592
637		- $arguments = array( $css, $settings );
	593	+ $arguments = array( $css, $settings );
638	594	apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) );
639	595
640	596	return $arguments;
641	597	}
		@@ -735,100 +691,11 @@
735	691	*/
736	692	public static final function get_features_for_license( $plan ) {
737	693	switch ( $plan ) {
738	694	case 1:
739		- return array( 'import-wp', 'db-query', 'import-wc-report' );
	695	+ return array( 'import-wp', 'db-query' );
740	696	case 2:
741	697	return array( 'schedule-chart', 'chart-permissions' );
742	698	}
743	699	}
744	700
745		- /**
746		- * Gets the chart content after common manipulations.
747		- */
748		- public static function get_chart_data( $chart, $type, $run_filter = true ) {
749		- // change HTML entities
750		- $post_content = html_entity_decode( htmlentities( $chart->post_content ) );
751		- $post_content = preg_replace_callback(
752		- '!s:(\d+):"(.*?)";!s',
753		- function ( $matches ) {
754		- if ( isset( $matches[2] ) ) {
755		- return 's:' . strlen( $matches[2] ) . ':"' . $matches[2] . '";';
756		- }
757		- },
758		- $post_content
759		- );
760		- $data = unserialize( $post_content );
761		- $altered = array();
762		- if ( ! empty( $data ) ) {
763		- foreach ( $data as $index => $array ) {
764		- if ( ! is_array( $index ) && is_array( $array ) ) {
765		- foreach ( $array as &$datum ) {
766		- if ( is_string( $datum ) ) {
767		- $datum = stripslashes( $datum );
768		- }
769		- }
770		- $altered[ $index ] = $array;
771		- }
772		- }
773		- }
774		- // if something goes wrong and the end result is empty, be safe and use the original data
775		- if ( empty( $altered ) ) {
776		- $altered = $data;
777		- }
778		- if ( $run_filter ) {
779		- return apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, $altered, $chart->ID, $type );
780		- }
781		- return $altered;
782		- }
783		-
784		- /**
785		- * Get chart image.
786		- *
787		- * @param object $chart Chart data.
788		- * @return string
789		- */
790		- public function _getImage( $chart = null ) {
791		- $image = '';
792		- if ( $chart ) {
793		- $chart_image = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true );
794		- if ( ! empty( $chart_image ) ) {
795		- $image = wp_get_attachment_image( $chart_image, 'full' );
796		- }
797		- }
798		- return array(
799		- 'csv' => $image,
800		- );
801		- }
802		-
803		- /**
804		- * Filter chart title if visualizer post type.
805		- *
806		- * @param object $query WP Query object.
807		- * @return void
808		- */
809		- public function PreGetPosts( $query ) {
810		- if ( ! $query->is_main_query() ) {
811		- $post_type = $query->get( 'post_type' );
812		- if ( 'visualizer' === $post_type ) {
813		- $this->_addFilter( Visualizer_Plugin::FILTER_CHART_TITLE, 'filterChartTitle', 10, 2 );
814		- }
815		- }
816		- }
817		-
818		- /**
819		- * Filter chart title.
820		- *
821		- * @access public
822		- * @param string $post_title Post title.
823		- * @param int $post_id Post ID.
824		- * @return string
825		- */
826		- public function filterChartTitle( $post_title, $post_id ) {
827		- $post_type = get_post_type( $post_id );
828		- $post_title = trim( $post_title );
829		- if ( 'visualizer' === $post_type && 'Visualization' === $post_title ) {
830		- return sprintf( '%s #%d', $post_title, $post_id );
831		- }
832		- return $post_title;
833		- }
834	701	}