← All changes | classes/Visualizer/Module.php +30 -115 3.10.0 → 3.4.4 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
		@@ -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' );
		@@ -565,11 +545,8 @@
565	545	protected function load_chart_type( $chart_id ) {
566	546	$name = $this->load_chart_class_name( $chart_id );
567	547	$class = null;
568	548	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	549	$class = new $name;
573	550	}
574	551
575	552	if ( is_null( $class ) && Visualizer_Module::is_pro() ) {
		@@ -608,31 +585,32 @@
608	585	*/
609	586	protected function get_inline_custom_css( $id, $settings ) {
610	587	$css = '';
611	588
	589	+ $arguments = array( '', $settings );
	590	+ if ( ! isset( $settings['customcss'] ) ) {
	591	+ return $arguments;
	592	+ }
	593	+
612	594	$classes = array();
613	595	$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		- }
	596	+ foreach ( $settings['customcss'] as $name => $element ) {
	597	+ $attributes = array();
	598	+ foreach ( $element as $property => $value ) {
	599	+ $attributes[] = $this->handle_css_property( $property, $value );
626	600	}
627		- $settings['cssClassNames'] = $classes;
	601	+ $class_name = $id . $name;
	602	+ $properties = implode( ' !important; ', array_filter( $attributes ) );
	603	+ if ( ! empty( $properties ) ) {
	604	+ $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
	605	+ $classes[ $name ] = $class_name;
	606	+ }
628	607	}
	608	+ $css .= '</style>';
629	609
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>';
	610	+ $settings['cssClassNames'] = $classes;
633	611
634		- $arguments = array( $css, $settings );
	612	+ $arguments = array( $css, $settings );
635	613	apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) );
636	614
637	615	return $arguments;
638	616	}
		@@ -732,9 +710,9 @@
732	710	*/
733	711	public static final function get_features_for_license( $plan ) {
734	712	switch ( $plan ) {
735	713	case 1:
736		- return array( 'import-wp', 'db-query', 'import-wc-report' );
	714	+ return array( 'import-wp', 'db-query' );
737	715	case 2:
738	716	return array( 'schedule-chart', 'chart-permissions' );
739	717	}
740	718	}
		@@ -743,30 +721,18 @@
743	721	* Gets the chart content after common manipulations.
744	722	*/
745	723	public static function get_chart_data( $chart, $type, $run_filter = true ) {
746	724	// 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 );
	725	+ $data = unserialize( html_entity_decode( $chart->post_content ) );
758	726	$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		- }
	727	+ foreach ( $data as $index => $array ) {
	728	+ if ( ! is_array( $index ) && is_array( $array ) ) {
	729	+ foreach ( $array as &$datum ) {
	730	+ if ( is_string( $datum ) ) {
	731	+ $datum = stripslashes( $datum );
766	732	}
767		- $altered[ $index ] = $array;
768	733	}
	734	+ $altered[ $index ] = $array;
769	735	}
770	736	}
771	737	// if something goes wrong and the end result is empty, be safe and use the original data
772	738	if ( empty( $altered ) ) {
		@@ -775,57 +741,6 @@
775	741	if ( $run_filter ) {
776	742	return apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, $altered, $chart->ID, $type );
777	743	}
778	744	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	745	}
831	746	}