← All changes | classes/Visualizer/Module/Chart.php +49 -175 3.10.4 → 3.6.1 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,100 +489,47 @@
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		- $_POST['save_chart_image'] = isset( $_POST['save_chart_image'] ) && 'yes' === $_POST['save_chart_image'] ? true : false;
616		- $_POST['lazy_load_chart'] = isset( $_POST['lazy_load_chart'] ) && 'yes' === $_POST['lazy_load_chart'] ? true : false;
617		-
618	530	if ( isset( $_POST['chart-img'] ) && ! empty( $_POST['chart-img'] ) ) {
619		- $attachment_id = $this->save_chart_image( $_POST['chart-img'], $chart_id, $_POST['save_chart_image'] );
	531	+ $attachment_id = $this->save_chart_image( $_POST['chart-img'], $chart_id );
620	532	if ( $attachment_id ) {
621	533	update_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, $attachment_id );
622	534	}
623	535	}
		@@ -683,16 +595,8 @@
683	595	// if the edit button is clicked.
684	596	$this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
685	597	}
686	598
687		- // Clear existing chart cache.
688		- if ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
689		- $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id;
690		- if ( get_transient( $cache_key ) ) {
691		- delete_transient( $cache_key );
692		- }
693		- }
694		-
695	599	switch ( $tab ) {
696	600	case 'settings':
697	601	$this->_handleDataAndSettingsPage();
698	602	break;
		@@ -717,9 +621,9 @@
717	621
718	622	// data tables assets.
719	623	wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
720	624	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 );
	625	+ 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	626	wp_enqueue_script( 'visualizer-datatables' );
723	627	wp_enqueue_style( 'visualizer-jquery-ui' );
724	628
725	629	if ( ! Visualizer_Module::is_pro() ) {
		@@ -814,14 +718,8 @@
814	718	if ( empty( $title ) ) {
815	719	$title = $this->_chart->ID;
816	720	}
817	721	$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	722	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
825	723	}
826	724	$render = new Visualizer_Render_Page_Send();
827	725	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
		@@ -909,9 +807,8 @@
909	807	'page_type' => 'chart',
910	808	'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
911	809	'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
912	810	'is_front' => false,
913		- 'rest_base' => get_rest_url( null, 'wc/v3/reports/' ),
914	811	)
915	812	);
916	813
917	814	$render = new Visualizer_Render_Page_Data();
		@@ -952,9 +849,9 @@
952	849	// process post request
953	850	if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
954	851	$type = filter_input( INPUT_POST, 'type' );
955	852	$library = filter_input( INPUT_POST, 'chart-library' );
956		- if ( Visualizer_Module_Admin::checkChartStatus( $type ) ) {
	853	+ if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
957	854	if ( empty( $library ) ) {
958	855	// library cannot be empty.
959	856	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
960	857	return;
		@@ -975,9 +872,9 @@
975	872	Visualizer_Module_Utility::set_defaults( $this->_chart );
976	873
977	874	// redirect to next tab
978	875	// changed by Ash/Upwork
979		- wp_redirect( esc_url_raw( add_query_arg( 'tab', 'settings' ) ) );
	876	+ wp_redirect( add_query_arg( 'tab', 'settings' ) );
980	877
981	878	return;
982	879	}
983	880	}
		@@ -1189,17 +1086,12 @@
1189	1086	delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE );
1190	1087
1191	1088	$source = null;
1192	1089	$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 );
	1090	+ if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
	1091	+ $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
1200	1092	if ( isset( $_POST['vz-import-time'] ) ) {
1201		- apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $remote_data, $_POST['vz-import-time'] );
	1093	+ apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
1202	1094	}
1203	1095	// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
1204	1096	} elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
1205	1097	$source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
		@@ -1234,9 +1126,8 @@
1234	1126	if ( $populate ) {
1235	1127	$chart->post_content = $content;
1236	1128	}
1237	1129	wp_update_post( $chart->to_array() );
1238		-
1239	1130	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
1240	1131	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
1241	1132	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1242	1133
		@@ -1244,17 +1135,8 @@
1244	1135
1245	1136	Visualizer_Module_Utility::set_defaults( $chart, null );
1246	1137
1247	1138	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
1248		- if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $source->getSeries() ) > 1 ) ) {
1249		- $diff_total_series = abs( count( $settings['series'] ) - count( $source->getSeries() ) );
1250		- if ( $diff_total_series ) {
1251		- foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
1252		- $settings['series'][] = end( $settings['series'] );
1253		- }
1254		- update_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
1255		- }
1256		- }
1257	1139
1258	1140	$render->id = $chart->ID;
1259	1141	$render->data = json_encode( $source->getRawData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
1260	1142	$render->series = json_encode( $source->getSeries() );
		@@ -1315,19 +1197,15 @@
1315	1197	if ( strpos( $key, 'visualizer-' ) !== false ) {
1316	1198	add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
1317	1199	}
1318	1200	}
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' )
	1201	+ $redirect = add_query_arg(
	1202	+ array(
	1203	+ 'page' => 'visualizer',
	1204	+ 'type' => filter_input( INPUT_GET, 'type' ),
	1205	+ 'vaction' => false,
1327	1206	),
1328		- null,
1329		- 'db'
	1207	+ admin_url( 'admin.php' )
1330	1208	);
1331	1209	}
1332	1210	}
1333	1211
		@@ -1333,8 +1211,9 @@
1333	1211
1334	1212	if ( defined( 'WP_TESTS_DOMAIN' ) ) {
1335	1213	wp_die();
1336	1214	}
	1215	+
1337	1216	wp_redirect( $redirect );
1338	1217	exit;
1339	1218	}
1340	1219
		@@ -1454,9 +1333,9 @@
1454	1333
1455	1334	$hours = filter_input(
1456	1335	INPUT_POST,
1457	1336	'refresh',
1458		- FILTER_VALIDATE_FLOAT,
	1337	+ FILTER_VALIDATE_INT,
1459	1338	array(
1460	1339	'options' => array(
1461	1340	'min_range' => -1,
1462	1341	'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
		@@ -1463,9 +1342,9 @@
1463	1342	),
1464	1343	)
1465	1344	);
1466	1345
1467		- if ( ! is_numeric( $hours ) ) {
	1346	+ if ( ! is_int( $hours ) ) {
1468	1347	$hours = -1;
1469	1348	}
1470	1349
1471	1350	$render = new Visualizer_Render_Page_Update();
		@@ -1557,22 +1436,11 @@
1557	1436	* Save chart image.
1558	1437	*
1559	1438	* @param string $base64_img Chart image.
1560	1439	* @param int $chart_id Chart ID.
1561		- * @param bool $save_attachment Save attachment.
1562	1440	* @return attachment ID
1563	1441	*/
1564		- public function save_chart_image( $base64_img, $chart_id, $save_attachment = true ) {
1565		- // Delete old chart image.
1566		- $old_attachment_id = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, true );
1567		- if ( $old_attachment_id ) {
1568		- wp_delete_attachment( $old_attachment_id, true );
1569		- }
1570		-
1571		- if ( ! $save_attachment ) {
1572		- return 0;
1573		- }
1574		-
	1442	+ public function save_chart_image( $base64_img, $chart_id ) {
1575	1443	// Upload dir.
1576	1444	$upload_dir = wp_upload_dir();
1577	1445	$upload_path = str_replace( '/', DIRECTORY_SEPARATOR, $upload_dir['path'] ) . DIRECTORY_SEPARATOR;
1578	1446
		@@ -1581,8 +1449,14 @@
1581	1449	$decoded = base64_decode( $img );
1582	1450	$filename = 'visualization-' . $chart_id . '.png';
1583	1451	$file_type = 'image/png';
1584	1452	$hashed_filename = $filename;
	1453	+
	1454	+ // Delete old chart image.
	1455	+ $old_attachment_id = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, true );
	1456	+ if ( $old_attachment_id ) {
	1457	+ wp_delete_attachment( $old_attachment_id, true );
	1458	+ }
1585	1459
1586	1460	// Save the image in the uploads directory.
1587	1461	require_once ABSPATH . '/wp-admin/includes/file.php';
1588	1462	\WP_Filesystem();