PluginProbe
Visualizer – Tables & Charts Manager with Built-in AI Generator / 3.3.0
Visualizer – Tables & Charts Manager with Built-in AI Generator v3.3.0
4.0.8 4.0.7 4.0.6 4.0.5 4.0.4 4.0.3 3.0.5 3.0.6 3.0.7 3.0.8 3.0.9 3.1.0 3.1.1 3.1.2 3.1.3 3.10.0 3.10.1 3.10.10 3.10.11 3.10.12 3.10.13 3.10.14 3.10.15 3.10.2 3.10.3 All 149 releases
← All changes | classes/Visualizer/Module/Chart.php +143 -643 4.0.5 → 3.3.0 View file →
@@ -68,38 +68,11 @@
68 68 $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE, 'setJsonSchedule' );
69 69
70 70 $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
71 71
72 - $this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 );
73 72 }
74 73
75 74 /**
76 - * Generates the HTML of the sidebar for the chart.
77 - *
78 - * @since ?
79 - *
80 - * @access public
81 - */
82 - public function getSidebar( $sidebar, $chart_id ) {
83 - $chart = get_post( $chart_id );
84 - $data = $this->_getChartArray( $chart );
85 - $sidebar = '';
86 - $sidebar_class = $this->load_chart_class_name( $chart_id );
87 - if ( class_exists( $sidebar_class, true ) ) {
88 - $sidebar = new $sidebar_class( $data['settings'] );
89 - $sidebar->__series = $data['series'];
90 - $sidebar->__data = $data['data'];
91 - } else {
92 - $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
93 - if ( $sidebar !== '' ) {
94 - $sidebar->__series = $data['series'];
95 - $sidebar->__data = $data['data'];
96 - }
97 - }
98 - return str_replace( "'", '"', $sidebar->__toString() );
99 - }
100 -
101 - /**
102 75 * Sets the schedule for how JSON-endpoint charts should be updated.
103 76 *
104 77 * @since ?
105 78 *
@@ -133,30 +106,12 @@
133 106 ),
134 107 )
135 108 );
136 109
137 - if ( Visualizer_Module::is_pro() ) {
138 - $is_woocommerce_report = filter_input(
139 - INPUT_POST,
140 - 'is_woocommerce_report',
141 - FILTER_VALIDATE_BOOLEAN
142 - );
143 -
144 - if ( $is_woocommerce_report ) {
145 - update_post_meta( $chart_id, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE, true );
146 - } else {
147 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE );
148 - }
149 - }
150 -
151 110 delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
152 111
153 112 if ( -1 < $time ) {
154 113 add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
155 - // Update schedules.
156 - $schedules = get_option( Visualizer_Plugin::CF_JSON_SCHEDULE, array() );
157 - $schedules[ $chart_id ] = time() + $time * HOUR_IN_SECONDS;
158 - update_option( Visualizer_Plugin::CF_JSON_SCHEDULE, $schedules );
159 114 }
160 115 wp_send_json_success();
161 116 }
162 117
@@ -169,12 +124,8 @@
169 124 */
170 125 public function getJsonRoots() {
171 126 check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION, 'security' );
172 127
173 - if ( ! current_user_can( 'edit_posts' ) ) {
174 - wp_send_json_error( array( 'msg' => esc_html__( 'You do not have permission to perform this action.', 'visualizer' ) ) );
175 - }
176 -
177 128 $params = wp_parse_args( $_POST['params'] );
178 129
179 130 $source = new Visualizer_Source_Json( $params );
180 131
@@ -195,12 +146,8 @@
195 146 */
196 147 public function getJsonData() {
197 148 check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION, 'security' );
198 149
199 - if ( ! current_user_can( 'edit_posts' ) ) {
200 - wp_send_json_error( array( 'msg' => esc_html__( 'You do not have permission to perform this action.', 'visualizer' ) ) );
201 - }
202 -
203 150 $params = wp_parse_args( $_POST['params'] );
204 151
205 152 $chart_id = $params['chart'];
206 153
@@ -208,11 +155,10 @@
208 155 wp_die();
209 156 }
210 157
211 158 $source = new Visualizer_Source_Json( $params );
212 - $source->fetch();
213 - $data = $source->getRawData();
214 159
160 + $data = $source->parse();
215 161 if ( empty( $data ) ) {
216 162 wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
217 163 }
218 164
@@ -239,12 +185,11 @@
239 185
240 186 $chart = get_post( $chart_id );
241 187
242 188 $source = new Visualizer_Source_Json( $params );
243 - update_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true );
244 - $source->fetchFromEditableTable();
189 + $source->fetch();
245 190
246 - $content = $source->getData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
191 + $content = $source->getData();
247 192 $chart->post_content = $content;
248 193 wp_update_post( $chart->to_array() );
249 194 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
250 195 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
@@ -250,62 +195,20 @@
250 195 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
251 196 update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
252 197 update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_URL, $params['url'] );
253 198 update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_ROOT, $params['root'] );
254 -
255 - delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS );
256 - $headers = array( 'method' => $params['method'] );
257 - if ( ! empty( $params['auth'] ) ) {
258 - $headers['auth'] = $params['auth'];
259 - } elseif ( ! empty( $params['username'] ) && ! empty( $params['password'] ) ) {
260 - $headers['auth'] = array( 'username' => $params['username'], 'password' => $params['password'] );
261 - }
262 -
263 - add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS, $headers );
264 -
265 199 delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING );
266 200 if ( ! empty( $params['paging'] ) ) {
267 201 add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING, $params['paging'] );
268 202 }
269 203
270 - if ( Visualizer_Module::is_pro() ) {
271 - if ( ! empty( $params['vz_woo_source'] ) ) {
272 - update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_WOOCOMMERCE_SOURCE, $params['vz_woo_source'] );
273 - } else {
274 - delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_WOOCOMMERCE_SOURCE );
275 - }
276 - }
277 -
278 - $time = filter_input(
279 - INPUT_POST,
280 - 'time',
281 - FILTER_VALIDATE_INT,
282 - array(
283 - 'options' => array(
284 - 'min_range' => -1,
285 - ),
286 - )
287 - );
288 -
289 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
290 -
291 - if ( -1 < $time ) {
292 - add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
293 - }
294 -
295 - // delete other source specific parameters.
296 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
297 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
298 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_URL );
299 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE );
300 -
301 204 $render = new Visualizer_Render_Page_Update();
302 205 $render->id = $chart->ID;
303 - $render->data = json_encode( $source->getRawData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
206 + $render->data = json_encode( $source->getRawData() );
304 207 $render->series = json_encode( $source->getSeries() );
305 208 $render->render();
306 209
307 - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
210 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
308 211 }
309 212
310 213
311 214 /**
@@ -381,19 +284,19 @@
381 284 * @since 1.0.0
382 285 *
383 286 * @access private
384 287 *
385 - * @param WP_Post|null $chart The chart object.
288 + * @param WP_Post $chart The chart object.
386 289 *
387 290 * @return array The array of chart data.
388 291 */
389 - private function _getChartArray( $chart = null ) {
292 + private function _getChartArray( WP_Post $chart = null ) {
390 293 if ( is_null( $chart ) ) {
391 294 $chart = $this->_chart;
392 295 }
393 296 $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
394 297 $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
395 - $data = self::get_chart_data( $chart, $type );
298 + $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
396 299 $library = $this->load_chart_type( $chart->ID );
397 300
398 301 $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
399 302 $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
@@ -409,13 +312,8 @@
409 312 }
410 313
411 314 $date_formats = Visualizer_Source::get_date_formats_if_exists( $series, $data );
412 315
413 - $code = '';
414 - if ( 'd3' === $library ) {
415 - $code = get_post_meta( $chart->ID, Visualizer_Module_AIBuilder::CF_D3_CODE, true );
416 - }
417 -
418 316 return array(
419 317 'type' => $type,
420 318 'series' => $series,
421 319 'settings' => $settings,
@@ -420,9 +318,8 @@
420 318 'series' => $series,
421 319 'settings' => $settings,
422 320 'data' => $data,
423 321 'library' => $library,
424 - 'code' => $code,
425 322 'css' => $css,
426 323 'date_formats' => $date_formats,
427 324 );
428 325 }
@@ -439,9 +336,9 @@
439 336 public static function _sendResponse( $results ) {
440 337 header( 'Content-type: application/json' );
441 338 nocache_headers();
442 339 echo json_encode( $results );
443 - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
340 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
444 341 }
445 342
446 343 /**
447 344 * Deletes a chart from database.
@@ -473,22 +370,9 @@
473 370 $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
474 371 }
475 372 }
476 373 if ( $success ) {
477 - global $sitepress;
478 - if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) {
479 - $trid = $sitepress->get_element_trid( $chart_id, 'post_' . Visualizer_Plugin::CPT_VISUALIZER );
480 - $translations = $sitepress->get_element_translations( $trid );
481 - if ( ! empty( $translations ) ) {
482 - foreach ( $translations as $translated_post ) {
483 - wp_delete_post( $translated_post->element_id, true );
484 - }
485 - } else {
486 - wp_delete_post( $chart_id, true );
487 - }
488 - } else {
489 - wp_delete_post( $chart_id, true );
490 - }
374 + wp_delete_post( $chart_id, true );
491 375 }
492 376 if ( $is_post ) {
493 377 self::_sendResponse(
494 378 array(
@@ -536,108 +420,43 @@
536 420 *
537 421 * @access public
538 422 */
539 423 public function renderChartPages() {
540 - if ( ! current_user_can( 'edit_posts' ) ) {
541 - wp_die( __( 'You do not have permission to access this page.', 'visualizer' ) );
542 - }
543 -
544 424 defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
545 - if ( ! defined( 'ET_BUILDER_PRODUCT_VERSION' ) && function_exists( 'et_get_theme_version' ) ) {
546 - define( 'ET_BUILDER_PRODUCT_VERSION', et_get_theme_version() );
547 - }
548 - // Set current screen for the render chart.
549 - set_current_screen( 'visualizer_render_chart' );
550 425 // check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
551 426 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
552 - if ( ! empty( $_POST ) ) {
553 - $_POST = map_deep( $_POST, 'wp_strip_all_tags' );
554 - }
555 - $chart = $chart_id ? get_post( $chart_id ) : null;
556 - if ( ! $chart_id || ! $chart || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
557 - if ( empty( $_GET['lang'] ) || empty( $_GET['parent_chart_id'] ) ) {
558 - $this->deleteOldCharts();
559 - $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
560 - $chart_status = Visualizer_Module_Admin::checkChartStatus( $default_type );
561 - if ( ! $chart_status ) {
562 - $default_type = 'line';
563 - }
564 - $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
565 - $source->fetch();
566 - $chart_id = wp_insert_post(
427 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
428 + $this->deleteOldCharts();
429 + $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
430 + $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
431 + $source->fetch();
432 + $chart_id = wp_insert_post(
433 + array(
434 + 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
435 + 'post_title' => 'Visualization',
436 + 'post_author' => get_current_user_id(),
437 + 'post_status' => 'auto-draft',
438 + 'post_content' => $source->getData(),
439 + )
440 + );
441 + if ( $chart_id && ! is_wp_error( $chart_id ) ) {
442 + add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
443 + add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
444 + add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
445 + add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
446 + add_post_meta(
447 + $chart_id,
448 + Visualizer_Plugin::CF_SETTINGS,
567 449 array(
568 - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
569 - 'post_title' => 'Visualization',
570 - 'post_author' => get_current_user_id(),
571 - 'post_status' => 'auto-draft',
572 - 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
450 + 'focusTarget' => 'datum',
573 451 )
574 452 );
575 - if ( $chart_id && ! is_wp_error( $chart_id ) ) {
576 - add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
577 - add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
578 - add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
579 - add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
580 - add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
581 - add_post_meta(
582 - $chart_id,
583 - Visualizer_Plugin::CF_SETTINGS,
584 - array(
585 - 'focusTarget' => 'datum',
586 - )
587 - );
588 -
589 - do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
590 - }
591 - } else {
592 - $parent_chart_id = filter_var( $_GET['parent_chart_id'], FILTER_VALIDATE_INT );
593 - $success = false;
594 - if ( $parent_chart_id ) {
595 - $parent_chart = get_post( $parent_chart_id );
596 - $success = $parent_chart && $parent_chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
597 - }
598 - if ( $success ) {
599 - $new_chart_id = wp_insert_post(
600 - array(
601 - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
602 - 'post_title' => 'Visualization',
603 - 'post_author' => get_current_user_id(),
604 - 'post_status' => $parent_chart->post_status,
605 - 'post_content' => $parent_chart->post_content,
606 - )
607 - );
608 -
609 - if ( is_wp_error( $new_chart_id ) ) {
610 - 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__ );
611 - } else {
612 - $post_meta = get_post_meta( $parent_chart_id );
613 - $chart_id = $new_chart_id;
614 - foreach ( $post_meta as $key => $value ) {
615 - if ( strpos( $key, 'visualizer-' ) !== false ) {
616 - add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
617 - }
618 - }
619 - }
620 - }
621 453 do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
622 454 }
623 - wp_redirect( esc_url_raw( add_query_arg( 'chart', (int) $chart_id ) ) );
624 -
625 - if ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) {
626 - wp_die();
627 - }
628 - exit();
455 + wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
456 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
629 457 }
630 458
631 - $_POST['save_chart_image'] = isset( $_POST['save_chart_image'] ) && 'yes' === $_POST['save_chart_image'] ? true : false;
632 - $_POST['lazy_load_chart'] = isset( $_POST['lazy_load_chart'] ) && 'yes' === $_POST['lazy_load_chart'] ? true : false;
633 -
634 - if ( isset( $_POST['chart-img'] ) && ! empty( $_POST['chart-img'] ) ) {
635 - $attachment_id = $this->save_chart_image( $_POST['chart-img'], $chart_id, $_POST['save_chart_image'] );
636 - if ( $attachment_id ) {
637 - update_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, $attachment_id );
638 - }
639 - }
640 459 $lib = $this->load_chart_type( $chart_id );
641 460
642 461 // the alpha color picker (RGBA) is not supported by google.
643 462 $color_picker_dep = 'wp-color-picker';
@@ -650,9 +469,9 @@
650 469 wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
651 470 wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
652 471
653 472 wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
654 - wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion', 'jquery-ui-tabs' ), Visualizer_Plugin::VERSION, true );
473 + wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion' ), Visualizer_Plugin::VERSION, true );
655 474 wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
656 475 wp_register_script(
657 476 'visualizer-render',
658 477 VISUALIZER_ABSURL . 'js/render-facade.js',
@@ -691,9 +510,8 @@
691 510 if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) {
692 511 // if the cancel button is clicked.
693 512 $this->undoRevisions( $chart_id, true );
694 513 } elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
695 - $this->handlePermissions();
696 514 // if the save button is clicked.
697 515 $this->undoRevisions( $chart_id, false );
698 516 } else {
699 517 // if the edit button is clicked.
@@ -699,16 +517,8 @@
699 517 // if the edit button is clicked.
700 518 $this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
701 519 }
702 520
703 - // Clear existing chart cache.
704 - if ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
705 - $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id;
706 - if ( get_transient( $cache_key ) ) {
707 - delete_transient( $cache_key );
708 - }
709 - }
710 -
711 521 switch ( $tab ) {
712 522 case 'settings':
713 523 $this->_handleDataAndSettingsPage();
714 524 break;
@@ -716,18 +526,18 @@
716 526 case 'visualizer': // fall through.
717 527 $this->_handleTypesPage();
718 528 break;
719 529 default:
720 - // this should never happen.
530 + do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
721 531 break;
722 532 }
723 - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
533 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
724 534 }
725 535
726 536 /**
727 537 * Load code editor assets.
728 538 */
729 - private function loadCodeEditorAssets( $chart_id ) {
539 + private function loadCodeEditorAssets() {
730 540 global $wp_version;
731 541
732 542 $wp_scripts = wp_scripts();
733 543
@@ -733,9 +543,9 @@
733 543
734 544 // data tables assets.
735 545 wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
736 546 wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
737 - 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 );
547 + 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 );
738 548 wp_enqueue_script( 'visualizer-datatables' );
739 549 wp_enqueue_style( 'visualizer-jquery-ui' );
740 550
741 551 if ( ! Visualizer_Module::is_pro() ) {
@@ -741,9 +551,9 @@
741 551 if ( ! Visualizer_Module::is_pro() ) {
742 552 return;
743 553 }
744 554
745 - $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( $chart_id );
555 + $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
746 556
747 557 if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
748 558 // code mirror assets.
749 559 wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
@@ -751,9 +561,9 @@
751 561 wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
752 562 wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
753 563 wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
754 564 wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
755 - wp_register_script( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.js', array( 'visualizer-codemirror-sql', 'visualizer-codemirror-sql-hint', 'visualizer-codemirror-placeholder', 'visualizer-codemirror-matchbrackets', 'visualizer-codemirror-closebrackets' ), Visualizer_Plugin::VERSION );
565 + wp_register_script( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.js', array( 'visualizer-codemirror-sql', 'visualizer-codemirror-sql-hint', 'visualizer-codemirror-placeholder', 'visualizer-codemirror-matchbrackets', 'visualizer-codemirror-closebrackets' ), Visualizer_Plugin::VERSION );
756 566 wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION );
757 567 wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
758 568
759 569 wp_enqueue_script( 'visualizer-codemirror-hint' );
@@ -767,9 +577,9 @@
767 577 'lineWrapping' => true,
768 578 'dragDrop' => false,
769 579 'matchBrackets' => true,
770 580 'autoCloseBrackets' => true,
771 - 'extraKeys' => array( 'Shift-Space' => 'autocomplete' ),
581 + 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
772 582 'hintOptions' => array( 'tables' => $table_col_mapping ),
773 583 ),
774 584 )
775 585 );
@@ -778,25 +588,8 @@
778 588 return $table_col_mapping;
779 589 }
780 590
781 591 /**
782 - * Handle permissions from the new conslidated settings sidebar.
783 - */
784 - private function handlePermissions() {
785 - if ( ! Visualizer_Module::is_pro() ) {
786 - return;
787 - }
788 -
789 - // we will not support old free and new pro.
790 - // handling new free and old pro.
791 - if ( has_action( 'visualizer_pro_handle_tab' ) ) {
792 - do_action( 'visualizer_pro_handle_tab', 'permissions', $this->_chart );
793 - } else {
794 - do_action( 'visualizer_handle_permissions', $this->_chart );
795 - }
796 - }
797 -
798 - /**
799 592 * Handle data and settings page
800 593 */
801 594 private function _handleDataAndSettingsPage() {
802 595 if ( isset( $_POST['map_api_key'] ) ) {
@@ -801,30 +594,20 @@
801 594 private function _handleDataAndSettingsPage() {
802 595 if ( isset( $_POST['map_api_key'] ) ) {
803 596 update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
804 597 }
805 -
806 598 if ( $_SERVER['REQUEST_METHOD'] === 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
807 - $is_canceled = isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] );
808 - $is_newly_created = $this->_chart->post_status === 'auto-draft';
809 -
810 - if ( $is_newly_created && ! $is_canceled ) {
599 + if ( $this->_chart->post_status === 'auto-draft' ) {
811 600 $this->_chart->post_status = 'publish';
812 601
813 602 // ensure that a revision is not created. If a revision is created it will have the proper data and the parent of the revision will have default data.
814 603 // we do not want any difference in data so disable revisions temporarily.
815 - $this->disableRevisionsTemporarily();
816 -
604 + add_filter( 'wp_revisions_to_keep', '__return_false' );
817 605 wp_update_post( $this->_chart->to_array() );
818 606 }
819 607 // save meta data only when it is NOT being canceled.
820 - if ( ! $is_canceled ) {
821 - $post_settings = $_POST;
822 - $existing = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
823 - if ( isset( $existing['colors'] ) && is_array( $existing['colors'] ) && ! isset( $post_settings['colors'] ) ) {
824 - $post_settings['colors'] = $existing['colors'];
825 - }
826 - update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $post_settings );
608 + if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
609 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
827 610
828 611 // we will keep a parameter called 'internal_title' that will be set to the given title or, if empty, the chart ID
829 612 // this will help in searching with the chart id.
830 613 $settings = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
@@ -838,19 +621,14 @@
838 621 if ( empty( $title ) ) {
839 622 $title = $this->_chart->ID;
840 623 }
841 624 $settings['internal_title'] = $title;
842 - $settings_label = isset( $settings['pieResidueSliceLabel'] ) ? $settings['pieResidueSliceLabel'] : '';
843 - if ( empty( $settings_label ) ) {
844 - $settings['pieResidueSliceLabel'] = esc_html__( 'Other', 'visualizer' );
845 - } else {
846 - $settings['pieResidueSliceLabel'] = $settings_label;
847 - }
848 625 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
849 626 }
850 627 $render = new Visualizer_Render_Page_Send();
851 628 $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
852 629 wp_iframe( array( $render, 'render' ) );
630 +
853 631 return;
854 632 }
855 633 $data = $this->_getChartArray();
856 634 $sidebar = '';
@@ -871,11 +649,10 @@
871 649 wp_enqueue_style( 'visualizer-frame' );
872 650 wp_enqueue_script( 'visualizer-preview' );
873 651 wp_enqueue_script( 'visualizer-chosen' );
874 652 wp_enqueue_script( 'visualizer-render' );
875 - wp_enqueue_code_editor( array( 'type' => 'application/json' ) );
876 653
877 - if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
654 + if ( ! Visualizer_Module::is_pro() ) {
878 655 wp_enqueue_script( 'visualizer-editor-simple' );
879 656 wp_localize_script(
880 657 'visualizer-editor-simple',
881 658 'visualizer1',
@@ -881,16 +658,18 @@
881 658 'visualizer1',
882 659 array(
883 660 'ajax' => array(
884 661 'url' => admin_url( 'admin-ajax.php' ),
885 - 'nonces' => array(),
886 - 'actions' => array(),
662 + 'nonces' => array(
663 + ),
664 + 'actions' => array(
665 + ),
887 666 ),
888 667 )
889 668 );
890 669 }
891 670
892 - $table_col_mapping = $this->loadCodeEditorAssets( $this->_chart->ID );
671 + $table_col_mapping = $this->loadCodeEditorAssets();
893 672
894 673 wp_localize_script(
895 674 'visualizer-render',
896 675 'visualizer',
@@ -895,15 +674,11 @@
895 674 'visualizer-render',
896 675 'visualizer',
897 676 array(
898 677 'l10n' => array(
899 - 'invalid_source' => esc_html__( 'The URL you entered is invalid. Please enter a valid URL.', 'visualizer' ),
900 - 'loading' => esc_html__( 'Loading...', 'visualizer' ),
901 - 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
902 - 'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
903 - 'save_settings' => __( 'You have modified the chart\'s settings. To modify the source/data again, you must save this chart and reopen it for editing. If you continue without saving the chart, you may lose your changes.', 'visualizer' ),
904 - 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
905 - 'invalid_format' => esc_html__( 'This format pattern is not supported in the series settings field. Use the Manual Configuration option instead.', 'visualizer' ),
678 + 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
679 + 'loading' => esc_html__( 'Loading...', 'visualizer' ),
680 + 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
906 681 ),
907 682 'charts' => array(
908 683 'canvas' => $data,
909 684 'id' => $this->_chart->ID,
@@ -934,9 +709,8 @@
934 709 'page_type' => 'chart',
935 710 'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
936 711 'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
937 712 'is_front' => false,
938 - 'rest_base' => get_rest_url( null, 'wc/v3/reports/' ),
939 713 )
940 714 );
941 715
942 716 $render = new Visualizer_Render_Page_Data();
@@ -947,19 +721,20 @@
947 721 if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
948 722 $render->button = filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART
949 723 ? esc_html__( 'Save Chart', 'visualizer' )
950 724 : esc_html__( 'Create Chart', 'visualizer' );
951 -
952 - $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
725 + if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
726 + $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
727 + }
953 728 } else {
954 729 $render->button = esc_attr__( 'Insert Chart', 'visualizer' );
955 730 }
956 731
957 - do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
732 + do_action( 'visualizer_enqueue_scripts_and_styles', $data );
958 733
959 734 if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
960 735 global $Visualizer_Pro;
961 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
736 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
962 737 }
963 738
964 739 $this->_addAction( 'admin_head', 'renderFlattrScript' );
965 740 wp_iframe( array( $render, 'render' ) );
@@ -973,12 +748,12 @@
973 748 * @access private
974 749 */
975 750 private function _handleTypesPage() {
976 751 // process post request
977 - if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ), 'visualizer-upload-data' ) ) {
752 + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
978 753 $type = filter_input( INPUT_POST, 'type' );
979 754 $library = filter_input( INPUT_POST, 'chart-library' );
980 - if ( Visualizer_Module_Admin::checkChartStatus( $type ) ) {
755 + if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
981 756 if ( empty( $library ) ) {
982 757 // library cannot be empty.
983 758 do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
984 759 return;
@@ -990,9 +765,9 @@
990 765 // if the chart has default data, update it with appropriate default data for new type
991 766 if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
992 767 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
993 768 $source->fetch();
994 - $this->_chart->post_content = $source->getData( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
769 + $this->_chart->post_content = $source->getData();
995 770 wp_update_post( $this->_chart->to_array() );
996 771 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
997 772 }
998 773
@@ -999,9 +774,9 @@
999 774 Visualizer_Module_Utility::set_defaults( $this->_chart );
1000 775
1001 776 // redirect to next tab
1002 777 // changed by Ash/Upwork
1003 - wp_redirect( esc_url_raw( add_query_arg( 'tab', 'settings' ) ) );
778 + wp_redirect( add_query_arg( 'tab', 'settings' ) );
1004 779
1005 780 return;
1006 781 }
1007 782 }
@@ -1030,123 +805,30 @@
1030 805 * Processes the CSV that is sent in the request as a string.
1031 806 *
1032 807 * @since 3.2.0
1033 808 */
1034 - /**
1035 - * Determines whether a remote URL serves an XLSX file.
1036 - *
1037 - * Used as a fallback when the URL path has no recognisable file extension
1038 - * (e.g. SharePoint, signed S3 URLs, or "download?id=…" endpoints).
1039 - *
1040 - * Uses wp_safe_remote_get() to block requests to private/loopback addresses,
1041 - * and streams the response to a temp file so no body data is held in memory
1042 - * regardless of whether the server honours the Range header.
1043 - *
1044 - * The check relies on the ZIP magic number (PK\x03\x04) that every XLSX
1045 - * file begins with, making it immune to misleading Content-Type headers
1046 - * such as application/octet-stream. Content-Type is used as a last-resort
1047 - * fallback only when the temp file is empty (e.g. a HEAD-only server).
1048 - *
1049 - * @access private
1050 - * @param string $url The remote URL to probe.
1051 - * @return bool TRUE if the file appears to be XLSX, FALSE otherwise.
1052 - */
1053 - private static function _url_is_xlsx( $url ) {
1054 - $tmpfile = wp_tempnam( 'visualizer_xlsx_probe' );
1055 - if ( ! $tmpfile ) {
1056 - return false;
1057 - }
1058 -
1059 - $response = wp_safe_remote_get(
1060 - $url,
1061 - array(
1062 - 'timeout' => 10,
1063 - 'user-agent' => 'WordPress/' . get_bloginfo( 'version' ),
1064 - 'headers' => array( 'Range' => 'bytes=0-3' ),
1065 - 'stream' => true,
1066 - 'filename' => $tmpfile,
1067 - )
1068 - );
1069 -
1070 - if ( is_wp_error( $response ) ) {
1071 - @unlink( $tmpfile ); // phpcs:ignore WordPress.PHP.NoSilencedErrors
1072 - return false;
1073 - }
1074 -
1075 - $magic = '';
1076 - // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fopen
1077 - $fh = @fopen( $tmpfile, 'rb' ); // phpcs:ignore WordPress.PHP.NoSilencedErrors
1078 - if ( $fh ) {
1079 - $magic = fread( $fh, 4 ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fread
1080 - fclose( $fh ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fclose
1081 - }
1082 - @unlink( $tmpfile ); // phpcs:ignore WordPress.PHP.NoSilencedErrors
1083 -
1084 - if ( strlen( $magic ) >= 4 ) {
1085 - // XLSX (and all ZIP-based Office formats) start with PK\x03\x04.
1086 - return $magic === "PK\x03\x04";
1087 - }
1088 -
1089 - // Last resort: server returned an empty body (e.g. ignored Range and
1090 - // returned only headers). Check Content-Type from the same response.
1091 - // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
1092 - return false !== strpos(
1093 - wp_remote_retrieve_header( $response, 'content-type' ),
1094 - 'spreadsheetml'
1095 - );
1096 - }
1097 -
1098 - /**
1099 - * Parses a raw CSV string or editor payload and returns a source object.
1100 - *
1101 - * @access private
1102 - * @param string $data The raw CSV data string.
1103 - * @param string $editor_type The editor type ('text' or 'tabular').
1104 - * @return Visualizer_Source|null The populated source object, or null on failure.
1105 - */
1106 - private function handleCSVasString( $data, $editor_type ) {
809 + private function handleCSVasString( $data ) {
1107 810 $source = null;
1108 811
1109 - switch ( $editor_type ) {
1110 - case 'text':
1111 - // data coming in from the text editor.
1112 - $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
1113 - $handle = fopen( $tmpfile, 'w' );
1114 - $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
1115 - if ( $values ) {
1116 - foreach ( $values as $row ) {
1117 - if ( empty( $row ) ) {
1118 - continue;
1119 - }
1120 - $row = explode( ',', $row );
1121 - $row = array_map(
1122 - function ( $r ) {
1123 - return '' === $r ? ' ' : $r;
1124 - },
1125 - $row
1126 - );
1127 - $row = implode( ',', $row );
1128 - // don't use fpucsv here because we need to just dump the data
1129 - // minus the empty rows
1130 - // because fputcsv needs to tokenize
1131 - // we can standardize the CSV enclosure here and replace all ' with "
1132 - // we can assume that if there are an even number of ' they should be changed to "
1133 - // but that will screw up words like fo'c'sle
1134 - // so here let's just assume ' will NOT be used for enclosures
1135 - fwrite( $handle, $row );
1136 - fwrite( $handle, PHP_EOL );
812 + // @issue https://github.com/Codeinwp/visualizer/issues/412
813 + if ( has_filter( 'visualizer_pro_handle_chart_data' ) ) {
814 + $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
815 + } else {
816 + // data coming in from the text editor.
817 + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
818 + $handle = fopen( $tmpfile, 'w' );
819 + $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
820 + if ( $values ) {
821 + foreach ( $values as $row ) {
822 + if ( empty( $row ) ) {
823 + continue;
1137 824 }
825 + $columns = explode( ',', $row );
826 + fputcsv( $handle, $columns );
1138 827 }
1139 - $source = new Visualizer_Source_Csv( $tmpfile );
1140 - fclose( $handle );
1141 - break;
1142 - case 'table':
1143 - // Import from Chart
1144 - // fall-through.
1145 - case 'excel':
1146 - // data coming in from the excel editor.
1147 - $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
1148 - break;
828 + }
829 + $source = new Visualizer_Source_Csv( $tmpfile );
830 + fclose( $handle );
1149 831 }
1150 832 return $source;
1151 833 }
1152 834
@@ -1169,9 +851,9 @@
1169 851 foreach ( $types as $type ) {
1170 852 if ( empty( $type ) ) {
1171 853 $exclude[] = $index;
1172 854 }
1173 - ++$index;
855 + $index++;
1174 856 }
1175 857
1176 858 // when N headers are being renamed, the number of headers increases by N
1177 859 // because of the way datatable duplicates header information
@@ -1195,9 +877,9 @@
1195 877 $csv[] = $types;
1196 878 for ( $j = 0; $j < count( $columns[0] ); $j++ ) {
1197 879 $row = array();
1198 880 for ( $i = 0; $i < count( $headers ); $i++ ) {
1199 - $row[] = sanitize_text_field( $columns[ $i ][ $j ] );
881 + $row[] = $columns[ $i ][ $j ];
1200 882 }
1201 883 $csv[] = $row;
1202 884 }
1203 885
@@ -1231,13 +913,9 @@
1231 913 // otherwise, assume this is a normal web request.
1232 914 $can_die = ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE );
1233 915
1234 916 // validate nonce
1235 - if (
1236 - ! isset( $_GET['nonce'] ) ||
1237 - ! wp_verify_nonce( $_GET['nonce'], 'visualizer-upload-data' ) ||
1238 - ! current_user_can( 'edit_posts' )
1239 - ) {
917 + if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
1240 918 if ( ! $can_die ) {
1241 919 return;
1242 920 }
1243 921 status_header( 403 );
@@ -1246,15 +924,9 @@
1246 924
1247 925 // check chart, if chart exists
1248 926 // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
1249 927 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
1250 - $chart = $chart_id ? get_post( $chart_id ) : null;
1251 - if (
1252 - ! $chart_id ||
1253 - ! $chart ||
1254 - $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ||
1255 - ! current_user_can( 'edit_post', $chart_id )
1256 - ) {
928 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
1257 929 if ( ! $can_die ) {
1258 930 return;
1259 931 }
1260 932 status_header( 400 );
@@ -1260,10 +932,8 @@
1260 932 status_header( 400 );
1261 933 exit;
1262 934 }
1263 935
1264 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Uploading data for chart %d with POST = %s and GET = %s', $chart_id, print_r( $_POST, true ), print_r( $_GET, true ) ), 'debug', __FILE__, __LINE__ );
1265 -
1266 936 if ( ! isset( $_POST['vz-import-time'] ) ) {
1267 937 apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
1268 938 }
1269 939
@@ -1275,9 +945,8 @@
1275 945
1276 946 // delete "import from db" specific parameters.
1277 947 delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
1278 948 delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
1279 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS );
1280 949 }
1281 950
1282 951 // delete json related data.
1283 952 delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
@@ -1282,60 +951,29 @@
1282 951 // delete json related data.
1283 952 delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
1284 953 delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT );
1285 954 delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING );
1286 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_HEADERS );
1287 955
1288 - // delete last error
1289 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
1290 -
1291 - // delete editor related data.
1292 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR );
1293 -
1294 - // delete this so that a JSON import can be later edited manually without a problem.
1295 - delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE );
1296 -
1297 956 $source = null;
1298 957 $render = new Visualizer_Render_Page_Update();
1299 -
1300 - $remote_data = false;
1301 - if ( isset( $_POST['remote_data'] ) && function_exists( 'wp_http_validate_url' ) ) {
1302 - $remote_data = wp_http_validate_url( $_POST['remote_data'] );
1303 - }
1304 - if ( false !== $remote_data ) {
1305 - $remote_ext = strtolower( pathinfo( parse_url( $remote_data, PHP_URL_PATH ), PATHINFO_EXTENSION ) );
1306 - if ( 'xlsx' === $remote_ext || ( 'csv' !== $remote_ext && self::_url_is_xlsx( $remote_data ) ) ) {
1307 - $source = new Visualizer_Source_Xlsx_Remote( $remote_data );
1308 - } else {
1309 - $source = new Visualizer_Source_Csv_Remote( $remote_data );
1310 - }
958 + if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
959 + $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
1311 960 if ( isset( $_POST['vz-import-time'] ) ) {
1312 - apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $remote_data, $_POST['vz-import-time'] );
961 + apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
1313 962 }
1314 - } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] === 0 ) {
1315 - $local_ext = strtolower( pathinfo( isset( $_FILES['local_data']['name'] ) ? $_FILES['local_data']['name'] : '', PATHINFO_EXTENSION ) );
1316 - if ( 'xlsx' === $local_ext ) {
1317 - $source = new Visualizer_Source_Xlsx( $_FILES['local_data']['tmp_name'] );
1318 - } else {
1319 - $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
1320 - }
963 + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
964 + } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
965 + $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
1321 966 } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
1322 - $source = $this->handleCSVasString( $_POST['chart_data'], $_POST['editor-type'] );
1323 - update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
967 + $source = $this->handleCSVasString( $_POST['chart_data'] );
1324 968 } elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
1325 969 $source = $this->handleTabularData();
1326 - update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
1327 970 } else {
1328 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'CSV file with chart data was not uploaded for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
1329 - $render->message = esc_html__( 'No CSV file was received. Select a file and try uploading again.', 'visualizer' );
1330 - update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, esc_html__( 'No CSV file was received. Select a file and try uploading again.', 'visualizer' ) );
971 + $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' );
1331 972 }
1332 -
1333 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Uploaded data for chart %d with source %s', $chart_id, print_r( $source, true ) ), 'debug', __FILE__, __LINE__ );
1334 -
1335 973 if ( $source ) {
1336 974 if ( $source->fetch() ) {
1337 - $content = $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
975 + $content = $source->getData();
1338 976 $populate = true;
1339 977 if ( is_string( $content ) && is_array( unserialize( $content ) ) ) {
1340 978 $json = unserialize( $content );
1341 979 // if source exists, so should data. if source exists but data is blank, do not populate the chart.
@@ -1341,9 +979,8 @@
1341 979 // if source exists, so should data. if source exists but data is blank, do not populate the chart.
1342 980 // if we populate the data even if it is empty, the chart will show "Table has no columns".
1343 981 if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
1344 982 do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Not populating chart data as source exists (%s) but data is empty!', $json['source'] ), 'warn', __FILE__, __LINE__ );
1345 - update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Not populating chart data as source exists (%s) but data is empty!', $json['source'] ) );
1346 983 $populate = false;
1347 984 }
1348 985 }
1349 986 if ( $populate ) {
@@ -1349,49 +986,32 @@
1349 986 if ( $populate ) {
1350 987 $chart->post_content = $content;
1351 988 }
1352 989 wp_update_post( $chart->to_array() );
1353 -
1354 990 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
1355 991 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
1356 992 update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1357 993
1358 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Updated post for chart %d', $chart_id ), 'debug', __FILE__, __LINE__ );
1359 -
1360 994 Visualizer_Module_Utility::set_defaults( $chart, null );
1361 995
1362 996 $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
1363 - if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $source->getSeries() ) > 1 ) ) {
1364 - $diff_total_series = abs( count( $settings['series'] ) - count( $source->getSeries() ) );
1365 - if ( $diff_total_series ) {
1366 - foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
1367 - $settings['series'][] = end( $settings['series'] );
1368 - }
1369 - update_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
1370 - }
1371 - }
1372 997
1373 998 $render->id = $chart->ID;
1374 - $render->data = json_encode( $source->getRawData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
999 + $render->data = json_encode( $source->getRawData() );
1375 1000 $render->series = json_encode( $source->getSeries() );
1376 1001 $render->settings = json_encode( $settings );
1377 1002 } else {
1378 - $error = $source->get_error();
1379 - if ( empty( $error ) ) {
1380 - $error = esc_html__( 'The CSV file couldn\'t be read. Check that it\'s properly formatted and try again.', 'visualizer' );
1003 + $render->message = $source->get_error();
1004 + if ( empty( $render->message ) ) {
1005 + $render->message = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' );
1381 1006 }
1382 - $render->message = $error;
1383 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( '%s for chart %d.', $error, $chart_id ), 'error', __FILE__, __LINE__ );
1384 - update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, $error );
1385 1007 }
1386 - } else {
1387 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unknown internal error for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
1388 1008 }
1389 1009 $render->render();
1390 1010 if ( ! $can_die ) {
1391 1011 return;
1392 1012 }
1393 - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
1013 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1394 1014 }
1395 1015
1396 1016 /**
1397 1017 * Clones the chart.
@@ -1401,12 +1021,21 @@
1401 1021 * @access public
1402 1022 */
1403 1023 public function cloneChart() {
1404 1024 $chart_id = $success = false;
1405 - $nonce = isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'], Visualizer_Plugin::ACTION_CLONE_CHART );
1025 + $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
1406 1026 $capable = current_user_can( 'edit_posts' );
1407 1027 if ( $nonce && $capable ) {
1408 - $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
1028 + $chart_id = filter_input(
1029 + INPUT_GET,
1030 + 'chart',
1031 + FILTER_VALIDATE_INT,
1032 + array(
1033 + 'options' => array(
1034 + 'min_range' => 1,
1035 + ),
1036 + )
1037 + );
1409 1038 if ( $chart_id ) {
1410 1039 $chart = get_post( $chart_id );
1411 1040 $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
1412 1041 }
@@ -1421,35 +1050,24 @@
1421 1050 'post_status' => $chart->post_status,
1422 1051 'post_content' => $chart->post_content,
1423 1052 )
1424 1053 );
1425 - if ( is_wp_error( $new_chart_id ) ) {
1426 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Error while cloning chart %d = %s', $chart_id, print_r( $new_chart_id, true ) ), 'error', __FILE__, __LINE__ );
1427 - } else {
1428 - $post_meta = get_post_meta( $chart_id );
1429 - foreach ( $post_meta as $key => $value ) {
1430 - if ( strpos( $key, 'visualizer-' ) !== false ) {
1431 - add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
1432 - }
1433 - }
1434 - $redirect = esc_url(
1435 - add_query_arg(
1436 - array(
1437 - 'page' => 'visualizer',
1438 - 'type' => filter_input( INPUT_GET, 'type' ),
1439 - 'vaction' => false,
1440 - ),
1441 - admin_url( 'admin.php' )
1054 + if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
1055 + add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
1056 + add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
1057 + add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
1058 + add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
1059 + add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) );
1060 + $redirect = add_query_arg(
1061 + array(
1062 + 'page' => 'visualizer',
1063 + 'type' => filter_input( INPUT_GET, 'type' ),
1064 + 'vaction' => false,
1442 1065 ),
1443 - null,
1444 - 'db'
1066 + admin_url( 'admin.php' )
1445 1067 );
1446 1068 }
1447 1069 }
1448 -
1449 - if ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) {
1450 - wp_die();
1451 - }
1452 1070 wp_redirect( $redirect );
1453 1071 exit;
1454 1072 }
1455 1073
@@ -1480,9 +1098,9 @@
1480 1098 }
1481 1099 }
1482 1100 }
1483 1101
1484 - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
1102 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1485 1103 }
1486 1104
1487 1105 /**
1488 1106 * Handles chart data page.
@@ -1495,12 +1113,9 @@
1495 1113 $data = $this->_getChartArray();
1496 1114 $render = new Visualizer_Render_Page_Data();
1497 1115 $render->chart = $this->_chart;
1498 1116 $render->type = $data['type'];
1499 -
1500 - if ( $data && $data['settings'] ) {
1501 - unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
1502 - }
1117 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
1503 1118 wp_enqueue_style( 'visualizer-frame' );
1504 1119 wp_enqueue_script( 'visualizer-render' );
1505 1120 wp_localize_script(
1506 1121 'visualizer-render',
@@ -1506,11 +1121,10 @@
1506 1121 'visualizer-render',
1507 1122 'visualizer',
1508 1123 array(
1509 1124 'l10n' => array(
1510 - 'invalid_source' => esc_html__( 'The URL you entered is invalid. Please enter a valid URL.', 'visualizer' ),
1511 - 'loading' => esc_html__( 'Loading...', 'visualizer' ),
1512 - 'invalid_format' => esc_html__( 'This format pattern is not supported in the series settings field. To display percentages, use the Manual Configuration option instead.', 'visualizer' ),
1125 + 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
1126 + 'loading' => esc_html__( 'Loading...', 'visualizer' ),
1513 1127 ),
1514 1128 'charts' => array(
1515 1129 'canvas' => $data,
1516 1130 ),
@@ -1516,13 +1130,13 @@
1516 1130 ),
1517 1131 )
1518 1132 );
1519 1133
1520 - do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
1134 + do_action( 'visualizer_enqueue_scripts_and_styles', $data );
1521 1135
1522 1136 if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
1523 1137 global $Visualizer_Pro;
1524 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
1138 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
1525 1139 }
1526 1140
1527 1141 // Added by Ash/Upwork
1528 1142 $this->_addAction( 'admin_head', 'renderFlattrScript' );
@@ -1536,27 +1150,14 @@
1536 1150 */
1537 1151 public function getQueryData() {
1538 1152 check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
1539 1153
1540 - if ( ! current_user_can( 'administrator' ) ) {
1541 - wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1542 - }
1543 - if ( ! is_super_admin() ) {
1544 - wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1545 - }
1546 -
1547 - if ( ! Visualizer_Module::is_pro() ) {
1548 - wp_send_json_error( array( 'msg' => __( 'Feature is not available.', 'visualizer' ) ) );
1549 - }
1550 -
1551 1154 $params = wp_parse_args( $_POST['params'] );
1552 - $chart_id = filter_var( $params['chart_id'], FILTER_VALIDATE_INT );
1553 - $query = trim( $params['query'], ';' );
1554 -
1555 - $source = new Visualizer_Source_Query( stripslashes( $query ), $chart_id, $params );
1155 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1556 1156 $html = $source->fetch( true );
1557 - $error = $source->get_error();
1558 - if ( ! empty( $error ) ) {
1157 + $error = '';
1158 + if ( empty( $html ) ) {
1159 + $error = $source->get_error();
1559 1160 wp_send_json_error( array( 'msg' => $error ) );
1560 1161 }
1561 1162 wp_send_json_success( array( 'table' => $html ) );
1562 1163 }
@@ -1568,19 +1169,8 @@
1568 1169 */
1569 1170 public function saveQuery() {
1570 1171 check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' );
1571 1172
1572 - if ( ! current_user_can( 'administrator' ) ) {
1573 - wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1574 - }
1575 - if ( ! is_super_admin() ) {
1576 - wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1577 - }
1578 -
1579 - if ( ! Visualizer_Module::is_pro() ) {
1580 - wp_send_json_error( array( 'msg' => __( 'Feature is not available.', 'visualizer' ) ) );
1581 - }
1582 -
1583 1173 $chart_id = filter_input(
1584 1174 INPUT_GET,
1585 1175 'chart',
1586 1176 FILTER_VALIDATE_INT,
@@ -1590,43 +1180,21 @@
1590 1180 ),
1591 1181 )
1592 1182 );
1593 1183
1594 - $hours = filter_input(
1595 - INPUT_POST,
1596 - 'refresh',
1597 - FILTER_VALIDATE_FLOAT,
1598 - array(
1599 - 'options' => array(
1600 - 'min_range' => -1,
1601 - 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1602 - ),
1603 - )
1604 - );
1605 -
1606 - if ( ! is_numeric( $hours ) ) {
1607 - $hours = -1;
1608 - }
1609 -
1610 1184 $render = new Visualizer_Render_Page_Update();
1611 1185 if ( $chart_id ) {
1612 1186 $params = wp_parse_args( $_POST['params'] );
1613 - $query = trim( $params['query'], ';' );
1614 - $source = new Visualizer_Source_Query( stripslashes( $query ), $chart_id, $params );
1187 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1615 1188 $source->fetch( false );
1616 1189 $error = $source->get_error();
1617 1190 if ( empty( $error ) ) {
1618 - update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $query ) );
1191 + $hours = $_POST['refresh'];
1192 + update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
1619 1193 update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
1620 1194 update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
1621 1195 update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
1622 1196 update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1623 - if ( isset( $params['db_type'] ) && $params['db_type'] !== Visualizer_Plugin::WP_DB_NAME ) {
1624 - $remote_db_params = $params;
1625 - unset( $remote_db_params['query'] );
1626 - unset( $remote_db_params['chart_id'] );
1627 - update_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS, $remote_db_params );
1628 - }
1629 1197
1630 1198 $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
1631 1199 $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
1632 1200 update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
@@ -1633,14 +1201,13 @@
1633 1201
1634 1202 wp_update_post(
1635 1203 array(
1636 1204 'ID' => $chart_id,
1637 - 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
1205 + 'post_content' => $source->getData(),
1638 1206 )
1639 1207 );
1640 - $render->data = json_encode( $source->getRawData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
1208 + $render->data = json_encode( $source->getRawData() );
1641 1209 $render->series = json_encode( $source->getSeries() );
1642 - $render->id = $chart_id;
1643 1210 } else {
1644 1211 $render->message = $error;
1645 1212 }
1646 1213 }
@@ -1645,9 +1212,9 @@
1645 1212 }
1646 1213 }
1647 1214 $render->render();
1648 1215 if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1649 - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
1216 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1650 1217 }
1651 1218 }
1652 1219
1653 1220
@@ -1669,80 +1236,13 @@
1669 1236 ),
1670 1237 )
1671 1238 );
1672 1239
1673 - $hours = filter_input(
1674 - INPUT_POST,
1675 - 'refresh',
1676 - FILTER_VALIDATE_FLOAT,
1677 - array(
1678 - 'options' => array(
1679 - 'min_range' => -1,
1680 - 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1681 - ),
1682 - )
1683 - );
1240 + $hours = $_POST['refresh'];
1684 1241
1685 - if ( ! is_numeric( $hours ) ) {
1686 - $hours = -1;
1687 - }
1688 -
1689 1242 do_action( 'visualizer_save_filter', $chart_id, $hours );
1690 1243
1691 1244 if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1692 - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
1245 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1693 1246 }
1694 - }
1695 -
1696 - /**
1697 - * Save chart image.
1698 - *
1699 - * @param string $base64_img Chart image.
1700 - * @param int $chart_id Chart ID.
1701 - * @param bool $save_attachment Save attachment.
1702 - * @return attachment ID
1703 - */
1704 - public function save_chart_image( $base64_img, $chart_id, $save_attachment = true ) {
1705 - // Delete old chart image.
1706 - $old_attachment_id = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, true );
1707 - if ( $old_attachment_id ) {
1708 - wp_delete_attachment( $old_attachment_id, true );
1709 - }
1710 -
1711 - if ( ! $save_attachment ) {
1712 - return 0;
1713 - }
1714 -
1715 - // Upload dir.
1716 - $upload_dir = wp_upload_dir();
1717 - $upload_path = str_replace( '/', DIRECTORY_SEPARATOR, $upload_dir['path'] ) . DIRECTORY_SEPARATOR;
1718 -
1719 - $img = str_replace( 'data:image/png;base64,', '', $base64_img );
1720 - $img = str_replace( ' ', '+', $img );
1721 - $decoded = base64_decode( $img );
1722 - $filename = 'visualization-' . $chart_id . '.png';
1723 - $file_type = 'image/png';
1724 - $hashed_filename = $filename;
1725 -
1726 - // Save the image in the uploads directory.
1727 - require_once ABSPATH . '/wp-admin/includes/file.php';
1728 - \WP_Filesystem();
1729 - global $wp_filesystem;
1730 - if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) {
1731 - $creds = request_filesystem_credentials( site_url() );
1732 - wp_filesystem( $creds );
1733 - }
1734 - $upload_file = $wp_filesystem->put_contents( $upload_path . $hashed_filename, $decoded );
1735 -
1736 - // Insert new chart image.
1737 - $attachment = array(
1738 - 'post_mime_type' => $file_type,
1739 - 'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $hashed_filename ) ),
1740 - 'post_content' => '',
1741 - 'post_status' => 'inherit',
1742 - 'guid' => $upload_dir['url'] . '/' . basename( $hashed_filename ),
1743 - );
1744 -
1745 - $attach_id = wp_insert_attachment( $attachment, $upload_dir['path'] . '/' . $hashed_filename );
1746 - return $attach_id;
1747 1247 }
1748 1248 }