| @@ -69,8 +69,9 @@ | ||
| 69 | 69 | |
| 70 | 70 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' ); |
| 71 | 71 | |
| 72 | 72 | $this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 ); |
| 73 | + | |
| 73 | 74 | } |
| 74 | 75 | |
| 75 | 76 | /** |
| 76 | 77 | * Generates the HTML of the sidebar for the chart. |
| @@ -295,9 +296,9 @@ | ||
| 295 | 296 | $render->data = json_encode( $source->getRawData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) ); |
| 296 | 297 | $render->series = json_encode( $source->getSeries() ); |
| 297 | 298 | $render->render(); |
| 298 | 299 | |
| 299 | - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit(); | |
| 300 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 300 | 301 | } |
| 301 | 302 | |
| 302 | 303 | |
| 303 | 304 | /** |
| @@ -401,13 +402,8 @@ | ||
| 401 | 402 | } |
| 402 | 403 | |
| 403 | 404 | $date_formats = Visualizer_Source::get_date_formats_if_exists( $series, $data ); |
| 404 | 405 | |
| 405 | - $code = ''; | |
| 406 | - if ( 'd3' === $library ) { | |
| 407 | - $code = get_post_meta( $chart->ID, Visualizer_Module_AIBuilder::CF_D3_CODE, true ); | |
| 408 | - } | |
| 409 | - | |
| 410 | 406 | return array( |
| 411 | 407 | 'type' => $type, |
| 412 | 408 | 'series' => $series, |
| 413 | 409 | 'settings' => $settings, |
| @@ -412,9 +408,8 @@ | ||
| 412 | 408 | 'series' => $series, |
| 413 | 409 | 'settings' => $settings, |
| 414 | 410 | 'data' => $data, |
| 415 | 411 | 'library' => $library, |
| 416 | - 'code' => $code, | |
| 417 | 412 | 'css' => $css, |
| 418 | 413 | 'date_formats' => $date_formats, |
| 419 | 414 | ); |
| 420 | 415 | } |
| @@ -431,9 +426,9 @@ | ||
| 431 | 426 | public static function _sendResponse( $results ) { |
| 432 | 427 | header( 'Content-type: application/json' ); |
| 433 | 428 | nocache_headers(); |
| 434 | 429 | echo json_encode( $results ); |
| 435 | - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit(); | |
| 430 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 436 | 431 | } |
| 437 | 432 | |
| 438 | 433 | /** |
| 439 | 434 | * Deletes a chart from database. |
| @@ -543,10 +538,9 @@ | ||
| 543 | 538 | $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; |
| 544 | 539 | if ( ! empty( $_POST ) ) { |
| 545 | 540 | $_POST = map_deep( $_POST, 'wp_strip_all_tags' ); |
| 546 | 541 | } |
| 547 | - $chart = $chart_id ? get_post( $chart_id ) : null; | |
| 548 | - if ( ! $chart_id || ! $chart || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 542 | + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 549 | 543 | if ( empty( $_GET['lang'] ) || empty( $_GET['parent_chart_id'] ) ) { |
| 550 | 544 | $this->deleteOldCharts(); |
| 551 | 545 | $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line'; |
| 552 | 546 | $chart_status = Visualizer_Module_Admin::checkChartStatus( $default_type ); |
| @@ -580,9 +574,9 @@ | ||
| 580 | 574 | |
| 581 | 575 | do_action( 'visualizer_pro_new_chart_defaults', $chart_id ); |
| 582 | 576 | } |
| 583 | 577 | } else { |
| 584 | - $parent_chart_id = filter_var( $_GET['parent_chart_id'], FILTER_VALIDATE_INT ); | |
| 578 | + $parent_chart_id = isset( $_GET['parent_chart_id'] ) ? filter_var( $_GET['parent_chart_id'], FILTER_VALIDATE_INT ) : ''; | |
| 585 | 579 | $success = false; |
| 586 | 580 | if ( $parent_chart_id ) { |
| 587 | 581 | $parent_chart = get_post( $parent_chart_id ); |
| 588 | 582 | $success = $parent_chart && $parent_chart->post_type === Visualizer_Plugin::CPT_VISUALIZER; |
| @@ -613,9 +607,9 @@ | ||
| 613 | 607 | do_action( 'visualizer_pro_new_chart_defaults', $chart_id ); |
| 614 | 608 | } |
| 615 | 609 | wp_redirect( esc_url_raw( add_query_arg( 'chart', (int) $chart_id ) ) ); |
| 616 | 610 | |
| 617 | - if ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) { | |
| 611 | + if ( defined( 'WP_TESTS_DOMAIN' ) ) { | |
| 618 | 612 | wp_die(); |
| 619 | 613 | } |
| 620 | 614 | exit(); |
| 621 | 615 | } |
| @@ -711,9 +705,9 @@ | ||
| 711 | 705 | default: |
| 712 | 706 | // this should never happen. |
| 713 | 707 | break; |
| 714 | 708 | } |
| 715 | - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit(); | |
| 709 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 716 | 710 | } |
| 717 | 711 | |
| 718 | 712 | /** |
| 719 | 713 | * Load code editor assets. |
| @@ -743,9 +737,9 @@ | ||
| 743 | 737 | wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); |
| 744 | 738 | wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); |
| 745 | 739 | wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); |
| 746 | 740 | wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); |
| 747 | - 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 ); | |
| 741 | + 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 ); | |
| 748 | 742 | wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION ); |
| 749 | 743 | wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); |
| 750 | 744 | |
| 751 | 745 | wp_enqueue_script( 'visualizer-codemirror-hint' ); |
| @@ -809,14 +803,9 @@ | ||
| 809 | 803 | wp_update_post( $this->_chart->to_array() ); |
| 810 | 804 | } |
| 811 | 805 | // save meta data only when it is NOT being canceled. |
| 812 | 806 | if ( ! $is_canceled ) { |
| 813 | - $post_settings = $_POST; | |
| 814 | - $existing = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 815 | - if ( isset( $existing['colors'] ) && is_array( $existing['colors'] ) && ! isset( $post_settings['colors'] ) ) { | |
| 816 | - $post_settings['colors'] = $existing['colors']; | |
| 817 | - } | |
| 818 | - update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $post_settings ); | |
| 807 | + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST ); | |
| 819 | 808 | |
| 820 | 809 | // we will keep a parameter called 'internal_title' that will be set to the given title or, if empty, the chart ID |
| 821 | 810 | // this will help in searching with the chart id. |
| 822 | 811 | $settings = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); |
| @@ -863,9 +852,8 @@ | ||
| 863 | 852 | wp_enqueue_style( 'visualizer-frame' ); |
| 864 | 853 | wp_enqueue_script( 'visualizer-preview' ); |
| 865 | 854 | wp_enqueue_script( 'visualizer-chosen' ); |
| 866 | 855 | wp_enqueue_script( 'visualizer-render' ); |
| 867 | - wp_enqueue_code_editor( array( 'type' => 'application/json' ) ); | |
| 868 | 856 | |
| 869 | 857 | if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) { |
| 870 | 858 | wp_enqueue_script( 'visualizer-editor-simple' ); |
| 871 | 859 | wp_localize_script( |
| @@ -873,10 +861,12 @@ | ||
| 873 | 861 | 'visualizer1', |
| 874 | 862 | array( |
| 875 | 863 | 'ajax' => array( |
| 876 | 864 | 'url' => admin_url( 'admin-ajax.php' ), |
| 877 | - 'nonces' => array(), | |
| 878 | - 'actions' => array(), | |
| 865 | + 'nonces' => array( | |
| 866 | + ), | |
| 867 | + 'actions' => array( | |
| 868 | + ), | |
| 879 | 869 | ), |
| 880 | 870 | ) |
| 881 | 871 | ); |
| 882 | 872 | } |
| @@ -887,15 +877,14 @@ | ||
| 887 | 877 | 'visualizer-render', |
| 888 | 878 | 'visualizer', |
| 889 | 879 | array( |
| 890 | 880 | 'l10n' => array( |
| 891 | - 'invalid_source' => esc_html__( 'The URL you entered is invalid. Please enter a valid URL.', 'visualizer' ), | |
| 892 | - 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 893 | - 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ), | |
| 894 | - 'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ), | |
| 895 | - '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' ), | |
| 896 | - 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ), | |
| 897 | - 'invalid_format' => esc_html__( 'This format pattern is not supported in the series settings field. Use the Manual Configuration option instead.', 'visualizer' ), | |
| 881 | + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ), | |
| 882 | + 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 883 | + 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ), | |
| 884 | + 'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ), | |
| 885 | + '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' ), | |
| 886 | + 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ), | |
| 898 | 887 | ), |
| 899 | 888 | 'charts' => array( |
| 900 | 889 | 'canvas' => $data, |
| 901 | 890 | 'id' => $this->_chart->ID, |
| @@ -1022,80 +1011,8 @@ | ||
| 1022 | 1011 | * Processes the CSV that is sent in the request as a string. |
| 1023 | 1012 | * |
| 1024 | 1013 | * @since 3.2.0 |
| 1025 | 1014 | */ |
| 1026 | - /** | |
| 1027 | - * Determines whether a remote URL serves an XLSX file. | |
| 1028 | - * | |
| 1029 | - * Used as a fallback when the URL path has no recognisable file extension | |
| 1030 | - * (e.g. SharePoint, signed S3 URLs, or "download?id=…" endpoints). | |
| 1031 | - * | |
| 1032 | - * Uses wp_safe_remote_get() to block requests to private/loopback addresses, | |
| 1033 | - * and streams the response to a temp file so no body data is held in memory | |
| 1034 | - * regardless of whether the server honours the Range header. | |
| 1035 | - * | |
| 1036 | - * The check relies on the ZIP magic number (PK\x03\x04) that every XLSX | |
| 1037 | - * file begins with, making it immune to misleading Content-Type headers | |
| 1038 | - * such as application/octet-stream. Content-Type is used as a last-resort | |
| 1039 | - * fallback only when the temp file is empty (e.g. a HEAD-only server). | |
| 1040 | - * | |
| 1041 | - * @access private | |
| 1042 | - * @param string $url The remote URL to probe. | |
| 1043 | - * @return bool TRUE if the file appears to be XLSX, FALSE otherwise. | |
| 1044 | - */ | |
| 1045 | - private static function _url_is_xlsx( $url ) { | |
| 1046 | - $tmpfile = wp_tempnam( 'visualizer_xlsx_probe' ); | |
| 1047 | - if ( ! $tmpfile ) { | |
| 1048 | - return false; | |
| 1049 | - } | |
| 1050 | - | |
| 1051 | - $response = wp_safe_remote_get( | |
| 1052 | - $url, | |
| 1053 | - array( | |
| 1054 | - 'timeout' => 10, | |
| 1055 | - 'user-agent' => 'WordPress/' . get_bloginfo( 'version' ), | |
| 1056 | - 'headers' => array( 'Range' => 'bytes=0-3' ), | |
| 1057 | - 'stream' => true, | |
| 1058 | - 'filename' => $tmpfile, | |
| 1059 | - ) | |
| 1060 | - ); | |
| 1061 | - | |
| 1062 | - if ( is_wp_error( $response ) ) { | |
| 1063 | - @unlink( $tmpfile ); // phpcs:ignore WordPress.PHP.NoSilencedErrors | |
| 1064 | - return false; | |
| 1065 | - } | |
| 1066 | - | |
| 1067 | - $magic = ''; | |
| 1068 | - // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fopen | |
| 1069 | - $fh = @fopen( $tmpfile, 'rb' ); // phpcs:ignore WordPress.PHP.NoSilencedErrors | |
| 1070 | - if ( $fh ) { | |
| 1071 | - $magic = fread( $fh, 4 ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fread | |
| 1072 | - fclose( $fh ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fclose | |
| 1073 | - } | |
| 1074 | - @unlink( $tmpfile ); // phpcs:ignore WordPress.PHP.NoSilencedErrors | |
| 1075 | - | |
| 1076 | - if ( strlen( $magic ) >= 4 ) { | |
| 1077 | - // XLSX (and all ZIP-based Office formats) start with PK\x03\x04. | |
| 1078 | - return $magic === "PK\x03\x04"; | |
| 1079 | - } | |
| 1080 | - | |
| 1081 | - // Last resort: server returned an empty body (e.g. ignored Range and | |
| 1082 | - // returned only headers). Check Content-Type from the same response. | |
| 1083 | - // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet | |
| 1084 | - return false !== strpos( | |
| 1085 | - wp_remote_retrieve_header( $response, 'content-type' ), | |
| 1086 | - 'spreadsheetml' | |
| 1087 | - ); | |
| 1088 | - } | |
| 1089 | - | |
| 1090 | - /** | |
| 1091 | - * Parses a raw CSV string or editor payload and returns a source object. | |
| 1092 | - * | |
| 1093 | - * @access private | |
| 1094 | - * @param string $data The raw CSV data string. | |
| 1095 | - * @param string $editor_type The editor type ('text' or 'tabular'). | |
| 1096 | - * @return Visualizer_Source|null The populated source object, or null on failure. | |
| 1097 | - */ | |
| 1098 | 1015 | private function handleCSVasString( $data, $editor_type ) { |
| 1099 | 1016 | $source = null; |
| 1100 | 1017 | |
| 1101 | 1018 | switch ( $editor_type ) { |
| @@ -1110,9 +1027,9 @@ | ||
| 1110 | 1027 | continue; |
| 1111 | 1028 | } |
| 1112 | 1029 | $row = explode( ',', $row ); |
| 1113 | 1030 | $row = array_map( |
| 1114 | - function ( $r ) { | |
| 1031 | + function( $r ) { | |
| 1115 | 1032 | return '' === $r ? ' ' : $r; |
| 1116 | 1033 | }, |
| 1117 | 1034 | $row |
| 1118 | 1035 | ); |
| @@ -1161,9 +1078,9 @@ | ||
| 1161 | 1078 | foreach ( $types as $type ) { |
| 1162 | 1079 | if ( empty( $type ) ) { |
| 1163 | 1080 | $exclude[] = $index; |
| 1164 | 1081 | } |
| 1165 | - ++$index; | |
| 1082 | + $index++; | |
| 1166 | 1083 | } |
| 1167 | 1084 | |
| 1168 | 1085 | // when N headers are being renamed, the number of headers increases by N |
| 1169 | 1086 | // because of the way datatable duplicates header information |
| @@ -1238,12 +1155,11 @@ | ||
| 1238 | 1155 | |
| 1239 | 1156 | // check chart, if chart exists |
| 1240 | 1157 | // do not use filter_input as it does not work for phpunit test cases, use filter_var instead |
| 1241 | 1158 | $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; |
| 1242 | - $chart = $chart_id ? get_post( $chart_id ) : null; | |
| 1243 | 1159 | if ( |
| 1244 | 1160 | ! $chart_id || |
| 1245 | - ! $chart || | |
| 1161 | + ! ( $chart = get_post( $chart_id ) ) || | |
| 1246 | 1162 | $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER || |
| 1247 | 1163 | ! current_user_can( 'edit_post', $chart_id ) |
| 1248 | 1164 | ) { |
| 1249 | 1165 | if ( ! $can_die ) { |
| @@ -1293,24 +1209,15 @@ | ||
| 1293 | 1209 | if ( isset( $_POST['remote_data'] ) && function_exists( 'wp_http_validate_url' ) ) { |
| 1294 | 1210 | $remote_data = wp_http_validate_url( $_POST['remote_data'] ); |
| 1295 | 1211 | } |
| 1296 | 1212 | if ( false !== $remote_data ) { |
| 1297 | - $remote_ext = strtolower( pathinfo( parse_url( $remote_data, PHP_URL_PATH ), PATHINFO_EXTENSION ) ); | |
| 1298 | - if ( 'xlsx' === $remote_ext || ( 'csv' !== $remote_ext && self::_url_is_xlsx( $remote_data ) ) ) { | |
| 1299 | - $source = new Visualizer_Source_Xlsx_Remote( $remote_data ); | |
| 1300 | - } else { | |
| 1301 | - $source = new Visualizer_Source_Csv_Remote( $remote_data ); | |
| 1302 | - } | |
| 1213 | + $source = new Visualizer_Source_Csv_Remote( $remote_data ); | |
| 1303 | 1214 | if ( isset( $_POST['vz-import-time'] ) ) { |
| 1304 | 1215 | apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $remote_data, $_POST['vz-import-time'] ); |
| 1305 | 1216 | } |
| 1306 | - } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] === 0 ) { | |
| 1307 | - $local_ext = strtolower( pathinfo( isset( $_FILES['local_data']['name'] ) ? $_FILES['local_data']['name'] : '', PATHINFO_EXTENSION ) ); | |
| 1308 | - if ( 'xlsx' === $local_ext ) { | |
| 1309 | - $source = new Visualizer_Source_Xlsx( $_FILES['local_data']['tmp_name'] ); | |
| 1310 | - } else { | |
| 1311 | - $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] ); | |
| 1312 | - } | |
| 1217 | + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison | |
| 1218 | + } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) { | |
| 1219 | + $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] ); | |
| 1313 | 1220 | } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) { |
| 1314 | 1221 | $source = $this->handleCSVasString( $_POST['chart_data'], $_POST['editor-type'] ); |
| 1315 | 1222 | update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] ); |
| 1316 | 1223 | } elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) { |
| @@ -1317,10 +1224,10 @@ | ||
| 1317 | 1224 | $source = $this->handleTabularData(); |
| 1318 | 1225 | update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] ); |
| 1319 | 1226 | } else { |
| 1320 | 1227 | 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__ ); |
| 1321 | - $render->message = esc_html__( 'No CSV file was received. Select a file and try uploading again.', 'visualizer' ); | |
| 1322 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, esc_html__( 'No CSV file was received. Select a file and try uploading again.', 'visualizer' ) ); | |
| 1228 | + $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' ); | |
| 1229 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' ) ); | |
| 1323 | 1230 | } |
| 1324 | 1231 | |
| 1325 | 1232 | 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__ ); |
| 1326 | 1233 | |
| @@ -1368,9 +1275,9 @@ | ||
| 1368 | 1275 | $render->settings = json_encode( $settings ); |
| 1369 | 1276 | } else { |
| 1370 | 1277 | $error = $source->get_error(); |
| 1371 | 1278 | if ( empty( $error ) ) { |
| 1372 | - $error = esc_html__( 'The CSV file couldn\'t be read. Check that it\'s properly formatted and try again.', 'visualizer' ); | |
| 1279 | + $error = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' ); | |
| 1373 | 1280 | } |
| 1374 | 1281 | $render->message = $error; |
| 1375 | 1282 | do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( '%s for chart %d.', $error, $chart_id ), 'error', __FILE__, __LINE__ ); |
| 1376 | 1283 | update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, $error ); |
| @@ -1381,9 +1288,9 @@ | ||
| 1381 | 1288 | $render->render(); |
| 1382 | 1289 | if ( ! $can_die ) { |
| 1383 | 1290 | return; |
| 1384 | 1291 | } |
| 1385 | - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit(); | |
| 1292 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 1386 | 1293 | } |
| 1387 | 1294 | |
| 1388 | 1295 | /** |
| 1389 | 1296 | * Clones the chart. |
| @@ -1437,9 +1344,9 @@ | ||
| 1437 | 1344 | ); |
| 1438 | 1345 | } |
| 1439 | 1346 | } |
| 1440 | 1347 | |
| 1441 | - if ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) { | |
| 1348 | + if ( defined( 'WP_TESTS_DOMAIN' ) ) { | |
| 1442 | 1349 | wp_die(); |
| 1443 | 1350 | } |
| 1444 | 1351 | wp_redirect( $redirect ); |
| 1445 | 1352 | exit; |
| @@ -1472,9 +1379,9 @@ | ||
| 1472 | 1379 | } |
| 1473 | 1380 | } |
| 1474 | 1381 | } |
| 1475 | 1382 | |
| 1476 | - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit(); | |
| 1383 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 1477 | 1384 | } |
| 1478 | 1385 | |
| 1479 | 1386 | /** |
| 1480 | 1387 | * Handles chart data page. |
| @@ -1498,11 +1405,10 @@ | ||
| 1498 | 1405 | 'visualizer-render', |
| 1499 | 1406 | 'visualizer', |
| 1500 | 1407 | array( |
| 1501 | 1408 | 'l10n' => array( |
| 1502 | - 'invalid_source' => esc_html__( 'The URL you entered is invalid. Please enter a valid URL.', 'visualizer' ), | |
| 1503 | - 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 1504 | - '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' ), | |
| 1409 | + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ), | |
| 1410 | + 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 1505 | 1411 | ), |
| 1506 | 1412 | 'charts' => array( |
| 1507 | 1413 | 'canvas' => $data, |
| 1508 | 1414 | ), |
| @@ -1637,9 +1543,9 @@ | ||
| 1637 | 1543 | } |
| 1638 | 1544 | } |
| 1639 | 1545 | $render->render(); |
| 1640 | 1546 | if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) { |
| 1641 | - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit(); | |
| 1547 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 1642 | 1548 | } |
| 1643 | 1549 | } |
| 1644 | 1550 | |
| 1645 | 1551 | |
| @@ -1664,9 +1570,9 @@ | ||
| 1664 | 1570 | |
| 1665 | 1571 | $hours = filter_input( |
| 1666 | 1572 | INPUT_POST, |
| 1667 | 1573 | 'refresh', |
| 1668 | - FILTER_VALIDATE_FLOAT, | |
| 1574 | + FILTER_VALIDATE_INT, | |
| 1669 | 1575 | array( |
| 1670 | 1576 | 'options' => array( |
| 1671 | 1577 | 'min_range' => -1, |
| 1672 | 1578 | 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1, |
| @@ -1673,9 +1579,9 @@ | ||
| 1673 | 1579 | ), |
| 1674 | 1580 | ) |
| 1675 | 1581 | ); |
| 1676 | 1582 | |
| 1677 | - if ( ! is_numeric( $hours ) ) { | |
| 1583 | + if ( 0 !== $hours && empty( $hours ) ) { | |
| 1678 | 1584 | $hours = -1; |
| 1679 | 1585 | } |
| 1680 | 1586 | |
| 1681 | 1587 | do_action( 'visualizer_save_filter', $chart_id, $hours ); |
| @@ -1680,9 +1586,9 @@ | ||
| 1680 | 1586 | |
| 1681 | 1587 | do_action( 'visualizer_save_filter', $chart_id, $hours ); |
| 1682 | 1588 | |
| 1683 | 1589 | if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) { |
| 1684 | - ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit(); | |
| 1590 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 1685 | 1591 | } |
| 1686 | 1592 | } |
| 1687 | 1593 | |
| 1688 | 1594 | /** |