← All changes | classes/Visualizer/Module.php +27 -222 3.10.14 → 3.3.2 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'];
		@@ -237,13 +221,10 @@
237	221	$filename = $title;
238	222
239	223	switch ( $type ) {
240	224	case 'csv':
241		- $final = $this->_getCSV( $rows, $filename, false );
	225	+ $final = $this->_getCSV( $rows, $filename );
242	226	break;
243		- case 'csv-display':
244		- $final = $this->_getCSV( $rows, $filename, true );
245		- break;
246	227	case 'xls':
247	228	$final = $this->_getExcel( $rows, $filename );
248	229	break;
249	230	case 'print':
		@@ -248,11 +229,8 @@
248	229	break;
249	230	case 'print':
250	231	$final = $this->_getHTML( $rows );
251	232	break;
252		- case 'image':
253		- $final = $this->_getImage( $chart );
254		- break;
255	233	}
256	234	}
257	235	return $final;
258	236	}
		@@ -262,26 +240,14 @@
262	240	*
263	241	* @access private
264	242	* @param array $rows The array of data.
265	243	* @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	244	*/
268		- private function _getCSV( $rows, $filename, $enclose ) {
	245	+ private function _getCSV( $rows, $filename ) {
269	246	$filename .= '.csv';
270	247
271	248	$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		- }
	249	+ $fp = tmpfile();
284	250	// support for MS Excel
285	251	fprintf( $fp, $bom );
286	252	foreach ( $rows as $row ) {
287	253	fputcsv( $fp, $row );
		@@ -292,20 +258,8 @@
292	258	while ( ( $array = fgetcsv( $fp ) ) !== false ) {
293	259	if ( strlen( $csv ) > 0 ) {
294	260	$csv .= PHP_EOL;
295	261	}
296		- // if enclosure is required, check every item of this line
297		- // if a comma exists in the item, add enclosure.
298		- if ( $enclose ) {
299		- $temp_array = array();
300		- foreach ( $array as $item ) {
301		- if ( strpos( $item, ',' ) !== false ) {
302		- $item = VISUALIZER_CSV_ENCLOSURE . $item . VISUALIZER_CSV_ENCLOSURE;
303		- }
304		- $temp_array[] = $item;
305		- }
306		- $array = $temp_array;
307		- }
308	262	$csv .= implode( ',', $array );
309	263	}
310	264	fclose( $fp );
311	265
		@@ -326,22 +280,14 @@
326	280	private function _getExcel( $rows, $filename ) {
327	281	// PHPExcel did not like sheet names longer than 31 characters and we will assume the same with PhpSpreadsheet
328	282	$chart = substr( $filename, 0, 30 );
329	283	$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		- }
	284	+
340	285	$vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
341	286	if ( is_readable( $vendor_file ) ) {
342	287	include_once( $vendor_file );
343	288	}
	289	+
344	290	$xlsData = '';
345	291	if ( class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) ) {
346	292	$doc = new PhpOffice\PhpSpreadsheet\Spreadsheet();
347	293	$doc->getActiveSheet()->fromArray( $rows, null, 'A1' );
		@@ -418,22 +364,8 @@
418	364	);
419	365	}
420	366
421	367	/**
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	368	* Undo revisions for the chart, and if necessary, restore the earliest version.
437	369	*
438	370	* @return bool If any revisions were found.
439	371	*/
		@@ -438,11 +370,9 @@
438	370	* @return bool If any revisions were found.
439	371	*/
440	372	public final function undoRevisions( $chart_id, $restore = false ) {
441	373	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		- }
	374	+
445	375	$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
446	376	if ( count( $revisions ) > 1 ) {
447	377	$revision_ids = array_keys( $revisions );
448	378
		@@ -448,9 +378,9 @@
448	378
449	379	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'found %d revisions = %s', count( $revisions ), print_r( $revision_ids, true ) ), 'debug', __FILE__, __LINE__ );
450	380
451	381	// when we restore, a new revision is likely to be created. so, let's disable revisions for the time being.
452		- $this->disableRevisionsTemporarily();
	382	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
453	383
454	384	if ( $restore ) {
455	385	// restore to the oldest one i.e. the first one.
456	386	wp_restore_post_revision( array_shift( $revision_ids ) );
		@@ -469,13 +399,10 @@
469	399	/**
470	400	* If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing.
471	401	*/
472	402	public final function handleExistingRevisions( $chart_id, $chart ) {
	403	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
473	404
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	405	// undo revisions.
479	406	$revisions_found = $this->undoRevisions( $chart_id, true );
480	407
481	408	// create revision for the edit action.
		@@ -522,12 +449,8 @@
522	449
523	450	require_once( ABSPATH . 'wp-admin/includes/file.php' );
524	451	WP_Filesystem();
525	452	global $wp_filesystem;
526		- if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) {
527		- $creds = request_filesystem_credentials( site_url() );
528		- wp_filesystem( $creds );
529		- }
530	453
531	454	$multisite_arg = '/';
532	455	if ( is_multisite() && ! is_main_site() ) {
533	456	$multisite_arg = '/sites/' . get_current_blog_id() . '/';
		@@ -572,11 +495,8 @@
572	495	protected function load_chart_type( $chart_id ) {
573	496	$name = $this->load_chart_class_name( $chart_id );
574	497	$class = null;
575	498	if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
576		- if ( 'Visualizer_Render_Sidebar_Type_DataTable_DataTable' === $name ) {
577		- $name = 'Visualizer_Render_Sidebar_Type_DataTable_Tabular';
578		- }
579	499	$class = new $name;
580	500	}
581	501
582	502	if ( is_null( $class ) && Visualizer_Module::is_pro() ) {
		@@ -615,31 +535,32 @@
615	535	*/
616	536	protected function get_inline_custom_css( $id, $settings ) {
617	537	$css = '';
618	538
	539	+ $arguments = array( '', $settings );
	540	+ if ( ! isset( $settings['customcss'] ) ) {
	541	+ return $arguments;
	542	+ }
	543	+
619	544	$classes = array();
620	545	$css = '<style type="text/css" name="visualizer-custom-css" id="customcss-' . $id . '">';
621		- if ( ! empty( $settings['customcss'] ) ) {
622		- foreach ( $settings['customcss'] as $name => $element ) {
623		- $attributes = array();
624		- foreach ( $element as $property => $value ) {
625		- $attributes[] = $this->handle_css_property( $property, $value );
626		- }
627		- $class_name = $id . $name;
628		- $properties = implode( ' !important; ', array_filter( $attributes ) );
629		- if ( ! empty( $properties ) ) {
630		- $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
631		- $classes[ $name ] = $class_name;
632		- }
	546	+ foreach ( $settings['customcss'] as $name => $element ) {
	547	+ $attributes = array();
	548	+ foreach ( $element as $property => $value ) {
	549	+ $attributes[] = $this->handle_css_property( $property, $value );
633	550	}
634		- $settings['cssClassNames'] = $classes;
	551	+ $class_name = $id . $name;
	552	+ $properties = implode( ' !important; ', array_filter( $attributes ) );
	553	+ if ( ! empty( $properties ) ) {
	554	+ $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
	555	+ $classes[ $name ] = $class_name;
	556	+ }
635	557	}
	558	+ $css .= '</style>';
636	559
637		- $img_path = VISUALIZER_ABSURL . 'images';
638		- $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;}";
639		- $css .= '</style>';
	560	+ $settings['cssClassNames'] = $classes;
640	561
641		- $arguments = array( $css, $settings );
	562	+ $arguments = array( $css, $settings );
642	563	apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) );
643	564
644	565	return $arguments;
645	566	}
		@@ -718,121 +639,5 @@
718	639	public static function is_pro_older_than( $version ) {
719	640	return version_compare( VISUALIZER_PRO_VERSION, $version, '<' );
720	641	}
721	642
722		- /**
723		- * Should we show some specific feature on the basis of the version?
724		- *
725		- * @since 3.4.0
726		- */
727		- public static function can_show_feature( $feature ) {
728		- switch ( $feature ) {
729		- case 'simple-editor':
730		- // if user has pro but an older version, then don't load the simple editor functionality
731		- // as the select box will not behave as expected because the pro editor's functionality will supercede.
732		- return ! Visualizer_Module::is_pro() || ! Visualizer_Module::is_pro_older_than( '1.9.2' );
733		- }
734		- return false;
735		- }
736		-
737		- /**
738		- * Gets the features for the provided license type.
739		- */
740		- public static final function get_features_for_license( $plan ) {
741		- switch ( $plan ) {
742		- case 1:
743		- return array( 'import-wp', 'db-query', 'import-wc-report' );
744		- case 2:
745		- return array( 'schedule-chart', 'chart-permissions', 'import-chart', 'manual-data', 'data-filter-configuration', 'frontend-actions' );
746		- }
747		- }
748		-
749		- /**
750		- * Gets the chart content after common manipulations.
751		- */
752		- public static function get_chart_data( $chart, $type, $run_filter = true ) {
753		- // change HTML entities
754		- $post_content = html_entity_decode( htmlentities( $chart->post_content ) );
755		- $post_content = preg_replace_callback(
756		- '!s:(\d+):"(.*?)";!s',
757		- function ( $matches ) {
758		- if ( isset( $matches[2] ) ) {
759		- return 's:' . strlen( $matches[2] ) . ':"' . $matches[2] . '";';
760		- }
761		- },
762		- $post_content
763		- );
764		- $data = unserialize( $post_content );
765		- $altered = array();
766		- if ( ! empty( $data ) ) {
767		- foreach ( $data as $index => $array ) {
768		- if ( ! is_array( $index ) && is_array( $array ) ) {
769		- foreach ( $array as &$datum ) {
770		- if ( is_string( $datum ) ) {
771		- $datum = stripslashes( $datum );
772		- }
773		- }
774		- $altered[ $index ] = $array;
775		- }
776		- }
777		- }
778		- // if something goes wrong and the end result is empty, be safe and use the original data
779		- if ( empty( $altered ) ) {
780		- $altered = $data;
781		- }
782		- if ( $run_filter ) {
783		- return apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, $altered, $chart->ID, $type );
784		- }
785		- return $altered;
786		- }
787		-
788		- /**
789		- * Get chart image.
790		- *
791		- * @param object $chart Chart data.
792		- * @return string
793		- */
794		- public function _getImage( $chart = null ) {
795		- $image = '';
796		- if ( $chart ) {
797		- $chart_image = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true );
798		- if ( ! empty( $chart_image ) ) {
799		- $image = wp_get_attachment_image( $chart_image, 'full' );
800		- }
801		- }
802		- return array(
803		- 'csv' => $image,
804		- );
805		- }
806		-
807		- /**
808		- * Filter chart title if visualizer post type.
809		- *
810		- * @param object $query WP Query object.
811		- * @return void
812		- */
813		- public function PreGetPosts( $query ) {
814		- if ( ! $query->is_main_query() ) {
815		- $post_type = $query->get( 'post_type' );
816		- if ( 'visualizer' === $post_type ) {
817		- $this->_addFilter( Visualizer_Plugin::FILTER_CHART_TITLE, 'filterChartTitle', 10, 2 );
818		- }
819		- }
820		- }
821		-
822		- /**
823		- * Filter chart title.
824		- *
825		- * @access public
826		- * @param string $post_title Post title.
827		- * @param int $post_id Post ID.
828		- * @return string
829		- */
830		- public function filterChartTitle( $post_title, $post_id ) {
831		- $post_type = get_post_type( $post_id );
832		- $post_title = trim( $post_title );
833		- if ( 'visualizer' === $post_type && 'Visualization' === $post_title ) {
834		- return sprintf( '%s #%d', $post_title, $post_id );
835		- }
836		- return $post_title;
837		- }
838	643	}