| @@ -66,9 +66,9 @@ | ||
| 66 | 66 | /** |
| 67 | 67 | * Enqueue front end and editor JavaScript and CSS |
| 68 | 68 | */ |
| 69 | 69 | public function enqueue_gutenberg_scripts() { |
| 70 | - global $wp_version, $pagenow; | |
| 70 | + global $wp_version; | |
| 71 | 71 | |
| 72 | 72 | $blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js'; |
| 73 | 73 | $handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js'; |
| 74 | 74 | $stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css'; |
| @@ -104,9 +104,9 @@ | ||
| 104 | 104 | $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( null, false ); |
| 105 | 105 | |
| 106 | 106 | $translation_array = array( |
| 107 | 107 | 'isPro' => $type, |
| 108 | - 'proTeaser' => tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'blockupsell'), | |
| 108 | + 'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL, | |
| 109 | 109 | 'absurl' => VISUALIZER_ABSURL, |
| 110 | 110 | 'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(), |
| 111 | 111 | 'adminPage' => menu_page_url( 'visualizer', false ), |
| 112 | 112 | 'sqlTable' => $table_col_mapping, |
| @@ -111,9 +111,8 @@ | ||
| 111 | 111 | 'adminPage' => menu_page_url( 'visualizer', false ), |
| 112 | 112 | 'sqlTable' => $table_col_mapping, |
| 113 | 113 | 'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6, |
| 114 | 114 | 'proFeaturesLocked' => Visualizer_Module_Admin::proFeaturesLocked(), |
| 115 | - 'isFullSiteEditor' => 'site-editor.php' === $pagenow, | |
| 116 | 115 | ); |
| 117 | 116 | wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array ); |
| 118 | 117 | |
| 119 | 118 | // Enqueue frontend and editor block styles |
| @@ -351,11 +350,9 @@ | ||
| 351 | 350 | $data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ); |
| 352 | 351 | |
| 353 | 352 | // faetch and update settings |
| 354 | 353 | $data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true ); |
| 355 | - if ( empty( $data['visualizer-settings']['pagination'] ) ) { | |
| 356 | - $data['visualizer-settings']['pageSize'] = ''; | |
| 357 | - } | |
| 354 | + | |
| 358 | 355 | // handle series filter hooks |
| 359 | 356 | $data['visualizer-series'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $post_id, Visualizer_Plugin::CF_SERIES, true ), $post_id, $data['visualizer-chart-type'] ); |
| 360 | 357 | |
| 361 | 358 | // handle settings filter hooks |
| @@ -369,12 +366,8 @@ | ||
| 369 | 366 | if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) { |
| 370 | 367 | $data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); |
| 371 | 368 | } |
| 372 | 369 | |
| 373 | - if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) { | |
| 374 | - $data['visualizer-settings']['hAxis']['format'] = ''; | |
| 375 | - } | |
| 376 | - | |
| 377 | 370 | $data['visualizer-data-exploded'] = ''; |
| 378 | 371 | // handle annotations for google charts |
| 379 | 372 | if ( 'GoogleCharts' === $library ) { |
| 380 | 373 | // this will contain the data of both axis. |
| @@ -756,14 +749,10 @@ | ||
| 756 | 749 | if ( ! current_user_can( 'edit_posts' ) ) { |
| 757 | 750 | return false; |
| 758 | 751 | } |
| 759 | 752 | |
| 760 | - $remote_data = false; | |
| 761 | - if ( isset( $data['url'] ) && function_exists( 'wp_http_validate_url' ) ) { | |
| 762 | - $remote_data = wp_http_validate_url( $data['url'] ); | |
| 763 | - } | |
| 764 | - if ( false !== $remote_data && ! is_wp_error( $remote_data ) ) { | |
| 765 | - $source = new Visualizer_Source_Csv_Remote( $remote_data ); | |
| 753 | + if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) { | |
| 754 | + $source = new Visualizer_Source_Csv_Remote( $data['url'] ); | |
| 766 | 755 | if ( $source->fetch() ) { |
| 767 | 756 | $temp = $source->getData(); |
| 768 | 757 | if ( is_string( $temp ) && is_array( unserialize( $temp ) ) ) { |
| 769 | 758 | $content['series'] = $source->getSeries(); |
