← All changes | classes/Visualizer/Module.php +27 -75 3.10.0 → 3.6.1 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
		@@ -268,13 +267,9 @@
268	267	private function _getCSV( $rows, $filename, $enclose ) {
269	268	$filename .= '.csv';
270	269
271	270	$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		- }
	271	+ $fp = tmpfile();
277	272	if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
278	273	unset( $rows[1] );
279	274	$rows = array_values( $rows );
280	275	}
		@@ -608,31 +603,32 @@
608	603	*/
609	604	protected function get_inline_custom_css( $id, $settings ) {
610	605	$css = '';
611	606
	607	+ $arguments = array( '', $settings );
	608	+ if ( ! isset( $settings['customcss'] ) ) {
	609	+ return $arguments;
	610	+ }
	611	+
612	612	$classes = array();
613	613	$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		- }
	614	+ foreach ( $settings['customcss'] as $name => $element ) {
	615	+ $attributes = array();
	616	+ foreach ( $element as $property => $value ) {
	617	+ $attributes[] = $this->handle_css_property( $property, $value );
626	618	}
627		- $settings['cssClassNames'] = $classes;
	619	+ $class_name = $id . $name;
	620	+ $properties = implode( ' !important; ', array_filter( $attributes ) );
	621	+ if ( ! empty( $properties ) ) {
	622	+ $css .= '.' . $class_name . ' {' . $properties . ' !important;}';
	623	+ $classes[ $name ] = $class_name;
	624	+ }
628	625	}
	626	+ $css .= '</style>';
629	627
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>';
	628	+ $settings['cssClassNames'] = $classes;
633	629
634		- $arguments = array( $css, $settings );
	630	+ $arguments = array( $css, $settings );
635	631	apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) );
636	632
637	633	return $arguments;
638	634	}
		@@ -732,9 +728,9 @@
732	728	*/
733	729	public static final function get_features_for_license( $plan ) {
734	730	switch ( $plan ) {
735	731	case 1:
736		- return array( 'import-wp', 'db-query', 'import-wc-report' );
	732	+ return array( 'import-wp', 'db-query' );
737	733	case 2:
738	734	return array( 'schedule-chart', 'chart-permissions' );
739	735	}
740	736	}
		@@ -743,30 +739,18 @@
743	739	* Gets the chart content after common manipulations.
744	740	*/
745	741	public static function get_chart_data( $chart, $type, $run_filter = true ) {
746	742	// 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 );
	743	+ $data = unserialize( html_entity_decode( $chart->post_content ) );
758	744	$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		- }
	745	+ foreach ( $data as $index => $array ) {
	746	+ if ( ! is_array( $index ) && is_array( $array ) ) {
	747	+ foreach ( $array as &$datum ) {
	748	+ if ( is_string( $datum ) ) {
	749	+ $datum = stripslashes( $datum );
766	750	}
767		- $altered[ $index ] = $array;
768	751	}
	752	+ $altered[ $index ] = $array;
769	753	}
770	754	}
771	755	// if something goes wrong and the end result is empty, be safe and use the original data
772	756	if ( empty( $altered ) ) {
		@@ -794,38 +778,6 @@
794	778	}
795	779	return array(
796	780	'csv' => $image,
797	781	);
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	782	}
831	783	}