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