| @@ -364,9 +364,9 @@ | ||
| 364 | 364 | 'filters' => $chart_types, |
| 365 | 365 | 'types' => array_keys( $chart_types ), |
| 366 | 366 | ), |
| 367 | 367 | 'nonce' => wp_create_nonce(), |
| 368 | - 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ), | |
| 368 | + 'buildurl' => esc_url( add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ) ), | |
| 369 | 369 | ); |
| 370 | 370 | |
| 371 | 371 | return $strings; |
| 372 | 372 | } |
| @@ -987,26 +987,30 @@ | ||
| 987 | 987 | 'language' => $this->get_language(), |
| 988 | 988 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 989 | 989 | 'charts' => $charts, |
| 990 | 990 | 'urls' => array( |
| 991 | - 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ), | |
| 992 | - 'create' => add_query_arg( | |
| 993 | - array( | |
| 994 | - 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, | |
| 995 | - 'library' => 'yes', | |
| 996 | - 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '', | |
| 997 | - 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '', | |
| 998 | - 'vaction' => false, | |
| 999 | - ), | |
| 1000 | - $ajaxurl | |
| 991 | + 'base' => esc_url( add_query_arg( array( 'vpage' => false, 'vaction' => false ) ) ), | |
| 992 | + 'create' => esc_url( | |
| 993 | + add_query_arg( | |
| 994 | + array( | |
| 995 | + 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, | |
| 996 | + 'library' => 'yes', | |
| 997 | + 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '', | |
| 998 | + 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '', | |
| 999 | + 'vaction' => false, | |
| 1000 | + ), | |
| 1001 | + $ajaxurl | |
| 1002 | + ) | |
| 1001 | 1003 | ), |
| 1002 | - 'edit' => add_query_arg( | |
| 1003 | - array( | |
| 1004 | - 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, | |
| 1005 | - 'library' => 'yes', | |
| 1006 | - 'vaction' => false, | |
| 1007 | - ), | |
| 1008 | - $ajaxurl | |
| 1004 | + 'edit' => esc_url( | |
| 1005 | + add_query_arg( | |
| 1006 | + array( | |
| 1007 | + 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, | |
| 1008 | + 'library' => 'yes', | |
| 1009 | + 'vaction' => false, | |
| 1010 | + ), | |
| 1011 | + $ajaxurl | |
| 1012 | + ) | |
| 1009 | 1013 | ), |
| 1010 | 1014 | ), |
| 1011 | 1015 | 'page_type' => 'library', |
| 1012 | 1016 | 'is_front' => false, |
| @@ -1023,9 +1027,9 @@ | ||
| 1023 | 1027 | $render->types = self::_getChartTypesLocalized( false, false, false, true ); |
| 1024 | 1028 | $render->custom_css = $css; |
| 1025 | 1029 | $render->pagination = paginate_links( |
| 1026 | 1030 | array( |
| 1027 | - 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ), | |
| 1031 | + 'base' => esc_url( add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ) ), | |
| 1028 | 1032 | 'format' => '', |
| 1029 | 1033 | 'current' => $page, |
| 1030 | 1034 | 'total' => $query->max_num_pages, |
| 1031 | 1035 | 'type' => 'array', |
