← All changes | classes/Visualizer/Module/Chart.php +39 -147 3.10.14 → 3.7.2 View file →

		@@ -134,22 +134,8 @@
134	134	),
135	135	)
136	136	);
137	137
138		- if ( Visualizer_Module::is_pro() ) {
139		- $is_woocommerce_report = filter_input(
140		- INPUT_POST,
141		- 'is_woocommerce_report',
142		- FILTER_VALIDATE_BOOLEAN
143		- );
144		-
145		- if ( $is_woocommerce_report ) {
146		- update_post_meta( $chart_id, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE, true );
147		- } else {
148		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE );
149		- }
150		- }
151		-
152	138	delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
153	139
154	140	if ( -1 < $time ) {
155	141	add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
		@@ -259,16 +245,8 @@
259	245	if ( ! empty( $params['paging'] ) ) {
260	246	add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING, $params['paging'] );
261	247	}
262	248
263		- if ( Visualizer_Module::is_pro() ) {
264		- if ( ! empty( $params['vz_woo_source'] ) ) {
265		- update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_WOOCOMMERCE_SOURCE, $params['vz_woo_source'] );
266		- } else {
267		- delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_WOOCOMMERCE_SOURCE );
268		- }
269		- }
270		-
271	249	$time = filter_input(
272	250	INPUT_POST,
273	251	'time',
274	252	FILTER_VALIDATE_INT,
		@@ -460,22 +438,9 @@
460	438	$success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
461	439	}
462	440	}
463	441	if ( $success ) {
464		- global $sitepress;
465		- if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) {
466		- $trid = $sitepress->get_element_trid( $chart_id, 'post_' . Visualizer_Plugin::CPT_VISUALIZER );
467		- $translations = $sitepress->get_element_translations( $trid );
468		- if ( ! empty( $translations ) ) {
469		- foreach ( $translations as $translated_post ) {
470		- wp_delete_post( $translated_post->element_id, true );
471		- }
472		- } else {
473		- wp_delete_post( $chart_id, true );
474		- }
475		- } else {
476		- wp_delete_post( $chart_id, true );
477		- }
	442	+ wp_delete_post( $chart_id, true );
478	443	}
479	444	if ( $is_post ) {
480	445	self::_sendResponse(
481	446	array(
		@@ -524,93 +489,43 @@
524	489	* @access public
525	490	*/
526	491	public function renderChartPages() {
527	492	defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
528		- if ( ! defined( 'ET_BUILDER_PRODUCT_VERSION' ) && function_exists( 'et_get_theme_version' ) ) {
529		- define( 'ET_BUILDER_PRODUCT_VERSION', et_get_theme_version() );
530		- }
531	493	// Set current screen for the render chart.
532	494	set_current_screen( 'visualizer_render_chart' );
533	495	// check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
534	496	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
535		- if ( ! empty( $_POST ) ) {
536		- $_POST = map_deep( $_POST, 'wp_strip_all_tags' );
537		- }
538	497	if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
539		- if ( empty( $_GET['lang'] ) || empty( $_GET['parent_chart_id'] ) ) {
540		- $this->deleteOldCharts();
541		- $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
542		- $chart_status = Visualizer_Module_Admin::checkChartStatus( $default_type );
543		- if ( ! $chart_status ) {
544		- $default_type = 'line';
545		- }
546		- $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
547		- $source->fetch();
548		- $chart_id = wp_insert_post(
	498	+ $this->deleteOldCharts();
	499	+ $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
	500	+ $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
	501	+ $source->fetch();
	502	+ $chart_id = wp_insert_post(
	503	+ array(
	504	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	505	+ 'post_title' => 'Visualization',
	506	+ 'post_author' => get_current_user_id(),
	507	+ 'post_status' => 'auto-draft',
	508	+ 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
	509	+ )
	510	+ );
	511	+ if ( $chart_id && ! is_wp_error( $chart_id ) ) {
	512	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
	513	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
	514	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
	515	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	516	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
	517	+ add_post_meta(
	518	+ $chart_id,
	519	+ Visualizer_Plugin::CF_SETTINGS,
549	520	array(
550		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
551		- 'post_title' => 'Visualization',
552		- 'post_author' => get_current_user_id(),
553		- 'post_status' => 'auto-draft',
554		- 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
	521	+ 'focusTarget' => 'datum',
555	522	)
556	523	);
557		- if ( $chart_id && ! is_wp_error( $chart_id ) ) {
558		- add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
559		- add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
560		- add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
561		- add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
562		- add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
563		- add_post_meta(
564		- $chart_id,
565		- Visualizer_Plugin::CF_SETTINGS,
566		- array(
567		- 'focusTarget' => 'datum',
568		- )
569		- );
570		-
571		- do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
572		- }
573		- } else {
574		- if ( current_user_can( 'edit_posts' ) ) {
575		- $parent_chart_id = isset( $_GET['parent_chart_id'] ) ? filter_var( $_GET['parent_chart_id'], FILTER_VALIDATE_INT ) : '';
576		- $success = false;
577		- if ( $parent_chart_id ) {
578		- $parent_chart = get_post( $parent_chart_id );
579		- $success = $parent_chart && $parent_chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
580		- }
581		- if ( $success ) {
582		- $new_chart_id = wp_insert_post(
583		- array(
584		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
585		- 'post_title' => 'Visualization',
586		- 'post_author' => get_current_user_id(),
587		- 'post_status' => $parent_chart->post_status,
588		- 'post_content' => $parent_chart->post_content,
589		- )
590		- );
591		-
592		- if ( is_wp_error( $new_chart_id ) ) {
593		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Error while cloning chart %d = %s', $parent_chart_id, print_r( $new_chart_id, true ) ), 'error', __FILE__, __LINE__ );
594		- } else {
595		- $post_meta = get_post_meta( $parent_chart_id );
596		- $chart_id = $new_chart_id;
597		- foreach ( $post_meta as $key => $value ) {
598		- if ( strpos( $key, 'visualizer-' ) !== false ) {
599		- add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
600		- }
601		- }
602		- }
603		- }
604		- }
605	524	do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
606	525	}
607		- wp_redirect( esc_url_raw( add_query_arg( 'chart', (int) $chart_id ) ) );
608		-
609		- if ( defined( 'WP_TESTS_DOMAIN' ) ) {
610		- wp_die();
611		- }
612		- exit();
	526	+ wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
	527	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
613	528	}
614	529
615	530	$_POST['save_chart_image'] = isset( $_POST['save_chart_image'] ) && 'yes' === $_POST['save_chart_image'] ? true : false;
616	531	$_POST['lazy_load_chart'] = isset( $_POST['lazy_load_chart'] ) && 'yes' === $_POST['lazy_load_chart'] ? true : false;
		@@ -717,9 +632,9 @@
717	632
718	633	// data tables assets.
719	634	wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
720	635	wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
721		- wp_register_style( 'visualizer-jquery-ui', sprintf( '//code.jquery.com/ui/%s/themes/smoothness/jquery-ui.css', $wp_scripts->registered['jquery-ui-core']->ver ), array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION );
	636	+ wp_register_style( 'visualizer-jquery-ui', sprintf( '//ajax.googleapis.com/ajax/libs/jqueryui/%s/themes/smoothness/jquery-ui.css', $wp_scripts->registered['jquery-ui-core']->ver ), array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION );
722	637	wp_enqueue_script( 'visualizer-datatables' );
723	638	wp_enqueue_style( 'visualizer-jquery-ui' );
724	639
725	640	if ( ! Visualizer_Module::is_pro() ) {
		@@ -814,14 +729,8 @@
814	729	if ( empty( $title ) ) {
815	730	$title = $this->_chart->ID;
816	731	}
817	732	$settings['internal_title'] = $title;
818		- $settings_label = isset( $settings['pieResidueSliceLabel'] ) ? $settings['pieResidueSliceLabel'] : '';
819		- if ( empty( $settings_label ) ) {
820		- $settings['pieResidueSliceLabel'] = esc_html__( 'Other', 'visualizer' );
821		- } else {
822		- $settings['pieResidueSliceLabel'] = $settings_label;
823		- }
824	733	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
825	734	}
826	735	$render = new Visualizer_Render_Page_Send();
827	736	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
		@@ -909,9 +818,8 @@
909	818	'page_type' => 'chart',
910	819	'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
911	820	'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
912	821	'is_front' => false,
913		- 'rest_base' => get_rest_url( null, 'wc/v3/reports/' ),
914	822	)
915	823	);
916	824
917	825	$render = new Visualizer_Render_Page_Data();
		@@ -952,9 +860,9 @@
952	860	// process post request
953	861	if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
954	862	$type = filter_input( INPUT_POST, 'type' );
955	863	$library = filter_input( INPUT_POST, 'chart-library' );
956		- if ( Visualizer_Module_Admin::checkChartStatus( $type ) ) {
	864	+ if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
957	865	if ( empty( $library ) ) {
958	866	// library cannot be empty.
959	867	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
960	868	return;
		@@ -975,9 +883,9 @@
975	883	Visualizer_Module_Utility::set_defaults( $this->_chart );
976	884
977	885	// redirect to next tab
978	886	// changed by Ash/Upwork
979		- wp_redirect( esc_url_raw( add_query_arg( 'tab', 'settings' ) ) );
	887	+ wp_redirect( add_query_arg( 'tab', 'settings' ) );
980	888
981	889	return;
982	890	}
983	891	}
		@@ -1189,17 +1097,12 @@
1189	1097	delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE );
1190	1098
1191	1099	$source = null;
1192	1100	$render = new Visualizer_Render_Page_Update();
1193		-
1194		- $remote_data = false;
1195		- if ( isset( $_POST['remote_data'] ) && function_exists( 'wp_http_validate_url' ) ) {
1196		- $remote_data = wp_http_validate_url( $_POST['remote_data'] );
1197		- }
1198		- if ( false !== $remote_data ) {
1199		- $source = new Visualizer_Source_Csv_Remote( $remote_data );
	1101	+ if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
	1102	+ $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
1200	1103	if ( isset( $_POST['vz-import-time'] ) ) {
1201		- apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $remote_data, $_POST['vz-import-time'] );
	1104	+ apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
1202	1105	}
1203	1106	// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
1204	1107	} elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
1205	1108	$source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
		@@ -1315,19 +1218,15 @@
1315	1218	if ( strpos( $key, 'visualizer-' ) !== false ) {
1316	1219	add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
1317	1220	}
1318	1221	}
1319		- $redirect = esc_url(
1320		- add_query_arg(
1321		- array(
1322		- 'page' => 'visualizer',
1323		- 'type' => filter_input( INPUT_GET, 'type' ),
1324		- 'vaction' => false,
1325		- ),
1326		- admin_url( 'admin.php' )
	1222	+ $redirect = add_query_arg(
	1223	+ array(
	1224	+ 'page' => 'visualizer',
	1225	+ 'type' => filter_input( INPUT_GET, 'type' ),
	1226	+ 'vaction' => false,
1327	1227	),
1328		- null,
1329		- 'db'
	1228	+ admin_url( 'admin.php' )
1330	1229	);
1331	1230	}
1332	1231	}
1333	1232
		@@ -1333,8 +1232,9 @@
1333	1232
1334	1233	if ( defined( 'WP_TESTS_DOMAIN' ) ) {
1335	1234	wp_die();
1336	1235	}
	1236	+
1337	1237	wp_redirect( $redirect );
1338	1238	exit;
1339	1239	}
1340	1240
		@@ -1420,12 +1320,8 @@
1420	1320	*/
1421	1321	public function getQueryData() {
1422	1322	check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
1423	1323
1424		- if ( ! current_user_can( 'administrator' ) ) {
1425		- wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1426		- }
1427		-
1428	1324	$params = wp_parse_args( $_POST['params'] );
1429	1325	$chart_id = filter_var( $params['chart_id'], FILTER_VALIDATE_INT );
1430	1326
1431	1327	$source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
		@@ -1590,12 +1486,8 @@
1590	1486	// Save the image in the uploads directory.
1591	1487	require_once ABSPATH . '/wp-admin/includes/file.php';
1592	1488	\WP_Filesystem();
1593	1489	global $wp_filesystem;
1594		- if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) {
1595		- $creds = request_filesystem_credentials( site_url() );
1596		- wp_filesystem( $creds );
1597		- }
1598	1490	$upload_file = $wp_filesystem->put_contents( $upload_path . $hashed_filename, $decoded );
1599	1491
1600	1492	// Insert new chart image.
1601	1493	$attachment = array(