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