← All changes | classes/Visualizer/Module.php +27 -157 3.10.0 → 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,17 +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		- $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		- }
	268	+ $fp = tmpfile();
281	269	// support for MS Excel
282	270	fprintf( $fp, $bom );
283	271	foreach ( $rows as $row ) {
284	272	fputcsv( $fp, $row );
		@@ -323,22 +311,14 @@
323	311	private function _getExcel( $rows, $filename ) {
324	312	// PHPExcel did not like sheet names longer than 31 characters and we will assume the same with PhpSpreadsheet
325	313	$chart = substr( $filename, 0, 30 );
326	314	$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		- }
	315	+
337	316	$vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
338	317	if ( is_readable( $vendor_file ) ) {
339	318	include_once( $vendor_file );
340	319	}
	320	+
341	321	$xlsData = '';
342	322	if ( class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) ) {
343	323	$doc = new PhpOffice\PhpSpreadsheet\Spreadsheet();
344	324	$doc->getActiveSheet()->fromArray( $rows, null, 'A1' );
		@@ -415,22 +395,8 @@
415	395	);
416	396	}
417	397
418	398	/**
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	399	* Undo revisions for the chart, and if necessary, restore the earliest version.
434	400	*
435	401	* @return bool If any revisions were found.
436	402	*/
		@@ -435,11 +401,9 @@
435	401	* @return bool If any revisions were found.
436	402	*/
437	403	public final function undoRevisions( $chart_id, $restore = false ) {
438	404	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		- }
	405	+
442	406	$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
443	407	if ( count( $revisions ) > 1 ) {
444	408	$revision_ids = array_keys( $revisions );
445	409
		@@ -445,9 +409,9 @@
445	409
446	410	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'found %d revisions = %s', count( $revisions ), print_r( $revision_ids, true ) ), 'debug', __FILE__, __LINE__ );
447	411
448	412	// when we restore, a new revision is likely to be created. so, let's disable revisions for the time being.
449		- $this->disableRevisionsTemporarily();
	413	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
450	414
451	415	if ( $restore ) {
452	416	// restore to the oldest one i.e. the first one.
453	417	wp_restore_post_revision( array_shift( $revision_ids ) );
		@@ -466,13 +430,10 @@
466	430	/**
467	431	* If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing.
468	432	*/
469	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__ );
470	435
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	436	// undo revisions.
476	437	$revisions_found = $this->undoRevisions( $chart_id, true );
477	438
478	439	// create revision for the edit action.
		@@ -565,11 +526,8 @@
565	526	protected function load_chart_type( $chart_id ) {
566	527	$name = $this->load_chart_class_name( $chart_id );
567	528	$class = null;
568	529	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	530	$class = new $name;
573	531	}
574	532
575	533	if ( is_null( $class ) && Visualizer_Module::is_pro() ) {
		@@ -608,31 +566,32 @@
608	566	*/
609	567	protected function get_inline_custom_css( $id, $settings ) {
610	568	$css = '';
611	569
	570	+ $arguments = array( '', $settings );
	571	+ if ( ! isset( $settings['customcss'] ) ) {
	572	+ return $arguments;
	573	+ }
	574	+
612	575	$classes = array();
613	576	$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		- }
	577	+ foreach ( $settings['customcss'] as $name => $element ) {
	578	+ $attributes = array();
	579	+ foreach ( $element as $property => $value ) {
	580	+ $attributes[] = $this->handle_css_property( $property, $value );
626	581	}
627		- $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	+ }
628	588	}
	589	+ $css .= '</style>';
629	590
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>';
	591	+ $settings['cssClassNames'] = $classes;
633	592
634		- $arguments = array( $css, $settings );
	593	+ $arguments = array( $css, $settings );
635	594	apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) );
636	595
637	596	return $arguments;
638	597	}
		@@ -732,100 +691,11 @@
732	691	*/
733	692	public static final function get_features_for_license( $plan ) {
734	693	switch ( $plan ) {
735	694	case 1:
736		- return array( 'import-wp', 'db-query', 'import-wc-report' );
	695	+ return array( 'import-wp', 'db-query' );
737	696	case 2:
738	697	return array( 'schedule-chart', 'chart-permissions' );
739	698	}
740	699	}
741	700
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	701	}