← All changes | classes/Visualizer/Module.php +28 -105 3.10.13 → 3.5.0 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,16 +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		- if ( ! function_exists( 'wp_tempnam' ) ) {
276		- require_once ABSPATH . 'wp-admin/includes/file.php';
277		- }
278		- $fp = fopen( wp_tempnam(), 'w+' );
279		- }
	268	+ $fp = tmpfile();
280	269	if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
281	270	unset( $rows[1] );
282	271	$rows = array_values( $rows );
283	272	}
		@@ -522,12 +511,8 @@
522	511
523	512	require_once( ABSPATH . 'wp-admin/includes/file.php' );
524	513	WP_Filesystem();
525	514	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	515
531	516	$multisite_arg = '/';
532	517	if ( is_multisite() && ! is_main_site() ) {
533	518	$multisite_arg = '/sites/' . get_current_blog_id() . '/';
		@@ -615,31 +600,32 @@
615	600	*/
616	601	protected function get_inline_custom_css( $id, $settings ) {
617	602	$css = '';
618	603
	604	+ $arguments = array( '', $settings );
	605	+ if ( ! isset( $settings['customcss'] ) ) {
	606	+ return $arguments;
	607	+ }
	608	+
619	609	$classes = array();
620	610	$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		- }
	611	+ foreach ( $settings['customcss'] as $name => $element ) {
	612	+ $attributes = array();
	613	+ foreach ( $element as $property => $value ) {
	614	+ $attributes[] = $this->handle_css_property( $property, $value );
633	615	}
634		- $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	+ }
635	622	}
	623	+ $css .= '</style>';
636	624
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>';
	625	+ $settings['cssClassNames'] = $classes;
640	626
641		- $arguments = array( $css, $settings );
	627	+ $arguments = array( $css, $settings );
642	628	apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) );
643	629
644	630	return $arguments;
645	631	}
		@@ -739,11 +725,11 @@
739	725	*/
740	726	public static final function get_features_for_license( $plan ) {
741	727	switch ( $plan ) {
742	728	case 1:
743		- return array( 'import-wp', 'db-query', 'import-wc-report' );
	729	+ return array( 'import-wp', 'db-query' );
744	730	case 2:
745		- return array( 'schedule-chart', 'chart-permissions', 'import-chart', 'manual-data', 'data-filter-configuration', 'frontend-actions' );
	731	+ return array( 'schedule-chart', 'chart-permissions' );
746	732	}
747	733	}
748	734
749	735	/**
		@@ -750,30 +736,18 @@
750	736	* Gets the chart content after common manipulations.
751	737	*/
752	738	public static function get_chart_data( $chart, $type, $run_filter = true ) {
753	739	// 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 );
	740	+ $data = unserialize( html_entity_decode( $chart->post_content ) );
765	741	$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		- }
	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 );
773	747	}
774		- $altered[ $index ] = $array;
775	748	}
	749	+ $altered[ $index ] = $array;
776	750	}
777	751	}
778	752	// if something goes wrong and the end result is empty, be safe and use the original data
779	753	if ( empty( $altered ) ) {
		@@ -782,57 +756,6 @@
782	756	if ( $run_filter ) {
783	757	return apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, $altered, $chart->ID, $type );
784	758	}
785	759	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	760	}
838	761	}