PluginProbe
Visualizer – Tables & Charts Manager with Built-in AI Generator / 3.7.1
Visualizer – Tables & Charts Manager with Built-in AI Generator v3.7.1
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 +953 -76 3.0.8 → 3.7.1 View file →
@@ -57,13 +57,234 @@
57 57 $this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
58 58 $this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' );
59 59 $this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' );
60 60 $this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
61 +
62 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_FETCH_DB_DATA, 'getQueryData' );
63 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_DB_QUERY, 'saveQuery' );
64 +
65 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_ROOTS, 'getJsonRoots' );
66 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_DATA, 'getJsonData' );
67 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_DATA, 'setJsonData' );
68 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE, 'setJsonSchedule' );
69 +
70 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
71 +
72 + $this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 );
73 +
61 74 }
62 75
63 76 /**
77 + * Generates the HTML of the sidebar for the chart.
78 + *
79 + * @since ?
80 + *
81 + * @access public
82 + */
83 + public function getSidebar( $sidebar, $chart_id ) {
84 + $chart = get_post( $chart_id );
85 + $data = $this->_getChartArray( $chart );
86 + $sidebar = '';
87 + $sidebar_class = $this->load_chart_class_name( $chart_id );
88 + if ( class_exists( $sidebar_class, true ) ) {
89 + $sidebar = new $sidebar_class( $data['settings'] );
90 + $sidebar->__series = $data['series'];
91 + $sidebar->__data = $data['data'];
92 + } else {
93 + $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
94 + if ( $sidebar !== '' ) {
95 + $sidebar->__series = $data['series'];
96 + $sidebar->__data = $data['data'];
97 + }
98 + }
99 + return str_replace( "'", '"', $sidebar->__toString() );
100 + }
101 +
102 + /**
103 + * Sets the schedule for how JSON-endpoint charts should be updated.
104 + *
105 + * @since ?
106 + *
107 + * @access public
108 + */
109 + public function setJsonSchedule() {
110 + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION, 'security' );
111 +
112 + $chart_id = filter_input(
113 + INPUT_POST,
114 + 'chart',
115 + FILTER_VALIDATE_INT,
116 + array(
117 + 'options' => array(
118 + 'min_range' => 1,
119 + ),
120 + )
121 + );
122 +
123 + if ( ! $chart_id ) {
124 + wp_send_json_error();
125 + }
126 +
127 + $time = filter_input(
128 + INPUT_POST,
129 + 'time',
130 + FILTER_VALIDATE_INT,
131 + array(
132 + 'options' => array(
133 + 'min_range' => -1,
134 + ),
135 + )
136 + );
137 +
138 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
139 +
140 + if ( -1 < $time ) {
141 + add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
142 + // Update schedules.
143 + $schedules = get_option( Visualizer_Plugin::CF_JSON_SCHEDULE, array() );
144 + $schedules[ $chart_id ] = time() + $time * HOUR_IN_SECONDS;
145 + update_option( Visualizer_Plugin::CF_JSON_SCHEDULE, $schedules );
146 + }
147 + wp_send_json_success();
148 + }
149 +
150 + /**
151 + * Get the root elements for JSON-endpoint.
152 + *
153 + * @since ?
154 + *
155 + * @access public
156 + */
157 + public function getJsonRoots() {
158 + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION, 'security' );
159 +
160 + $params = wp_parse_args( $_POST['params'] );
161 +
162 + $source = new Visualizer_Source_Json( $params );
163 +
164 + $roots = $source->fetchRoots();
165 + if ( empty( $roots ) ) {
166 + wp_send_json_error( array( 'msg' => $source->get_error() ) );
167 + }
168 +
169 + wp_send_json_success( array( 'url' => $params['url'], 'roots' => $roots ) );
170 + }
171 +
172 + /**
173 + * Get the data for the JSON-endpoint corresponding to the chosen root.
174 + *
175 + * @since ?
176 + *
177 + * @access public
178 + */
179 + public function getJsonData() {
180 + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION, 'security' );
181 +
182 + $params = wp_parse_args( $_POST['params'] );
183 +
184 + $chart_id = $params['chart'];
185 +
186 + if ( empty( $chart_id ) ) {
187 + wp_die();
188 + }
189 +
190 + $source = new Visualizer_Source_Json( $params );
191 + $source->fetch();
192 + $data = $source->getRawData();
193 +
194 + if ( empty( $data ) ) {
195 + wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
196 + }
197 +
198 + $data = Visualizer_Render_Layout::show( 'editor-table', $data, $chart_id, 'viz-json-table', false, false );
199 + wp_send_json_success( array( 'table' => $data, 'root' => $params['root'], 'url' => $params['url'], 'paging' => $source->getPaginationElements() ) );
200 + }
201 +
202 + /**
203 + * Updates the database with the correct post parameters for JSON-endpoint charts.
204 + *
205 + * @since ?
206 + *
207 + * @access public
208 + */
209 + public function setJsonData() {
210 + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_SET_DATA . Visualizer_Plugin::VERSION, 'security' );
211 +
212 + $params = $_POST;
213 + $chart_id = $_GET['chart'];
214 +
215 + if ( empty( $chart_id ) ) {
216 + wp_die();
217 + }
218 +
219 + $chart = get_post( $chart_id );
220 +
221 + $source = new Visualizer_Source_Json( $params );
222 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true );
223 + $source->fetchFromEditableTable();
224 +
225 + $content = $source->getData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
226 + $chart->post_content = $content;
227 + wp_update_post( $chart->to_array() );
228 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
229 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
230 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
231 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_URL, $params['url'] );
232 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_ROOT, $params['root'] );
233 +
234 + delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS );
235 + $headers = array( 'method' => $params['method'] );
236 + if ( ! empty( $params['auth'] ) ) {
237 + $headers['auth'] = $params['auth'];
238 + } elseif ( ! empty( $params['username'] ) && ! empty( $params['password'] ) ) {
239 + $headers['auth'] = array( 'username' => $params['username'], 'password' => $params['password'] );
240 + }
241 +
242 + add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS, $headers );
243 +
244 + delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING );
245 + if ( ! empty( $params['paging'] ) ) {
246 + add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING, $params['paging'] );
247 + }
248 +
249 + $time = filter_input(
250 + INPUT_POST,
251 + 'time',
252 + FILTER_VALIDATE_INT,
253 + array(
254 + 'options' => array(
255 + 'min_range' => -1,
256 + ),
257 + )
258 + );
259 +
260 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
261 +
262 + if ( -1 < $time ) {
263 + add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
264 + }
265 +
266 + // delete other source specific parameters.
267 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
268 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
269 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_URL );
270 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE );
271 +
272 + $render = new Visualizer_Render_Page_Update();
273 + $render->id = $chart->ID;
274 + $render->data = json_encode( $source->getRawData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
275 + $render->series = json_encode( $source->getSeries() );
276 + $render->render();
277 +
278 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
279 + }
280 +
281 +
282 + /**
64 283 * Fetches charts from database.
65 284 *
285 + * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content).
286 + *
66 287 * @since 1.0.0
67 288 *
68 289 * @access public
69 290 */
@@ -71,9 +292,12 @@
71 292 $query_args = array(
72 293 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
73 294 'posts_per_page' => 9,
74 295 'paged' => filter_input(
75 - INPUT_GET, 'page', FILTER_VALIDATE_INT, array(
296 + INPUT_GET,
297 + 'page',
298 + FILTER_VALIDATE_INT,
299 + array(
76 300 'options' => array(
77 301 'min_range' => 1,
78 302 'default' => 1,
79 303 ),
@@ -85,9 +309,9 @@
85 309 // 'filter' is from the modal from the add media button.
86 310 $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
87 311 }
88 312
89 - if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
313 + if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
90 314 $query_args['meta_query'] = array(
91 315 array(
92 316 'key' => Visualizer_Plugin::CF_CHART_TYPE,
93 317 'value' => $filter,
@@ -100,8 +324,18 @@
100 324 while ( $query->have_posts() ) {
101 325 $chart = $query->next_post();
102 326 $chart_data = $this->_getChartArray( $chart );
103 327 $chart_data['id'] = $chart->ID;
328 + $chart_data['library'] = $this->load_chart_type( $chart->ID );
329 + $css = '';
330 + $settings = $chart_data['settings'];
331 + $arguments = $this->get_inline_custom_css( 'visualizer-chart-' . $chart->ID, $settings );
332 + if ( ! empty( $arguments ) ) {
333 + $css = $arguments[0];
334 + $settings = $arguments[1];
335 + }
336 + $chart_data['settings'] = $settings;
337 + $chart_data['css'] = $css;
104 338 $charts[] = $chart_data;
105 339 }
106 340 self::_sendResponse(
107 341 array(
@@ -128,15 +362,34 @@
128 362 $chart = $this->_chart;
129 363 }
130 364 $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
131 365 $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
132 - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
366 + $data = self::get_chart_data( $chart, $type );
367 + $library = $this->load_chart_type( $chart->ID );
133 368
369 + $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
370 + $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
371 + if ( ! empty( $atts['settings'] ) ) {
372 + $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
373 + }
374 +
375 + $css = '';
376 + $arguments = $this->get_inline_custom_css( 'visualizer-' . $chart->ID, $settings );
377 + if ( ! empty( $arguments ) ) {
378 + $css = $arguments[0];
379 + $settings = $arguments[1];
380 + }
381 +
382 + $date_formats = Visualizer_Source::get_date_formats_if_exists( $series, $data );
383 +
134 384 return array(
135 385 'type' => $type,
136 386 'series' => $series,
137 - 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ),
387 + 'settings' => $settings,
138 388 'data' => $data,
389 + 'library' => $library,
390 + 'css' => $css,
391 + 'date_formats' => $date_formats,
139 392 );
140 393 }
141 394
142 395 /**
@@ -163,9 +416,9 @@
163 416 *
164 417 * @access public
165 418 */
166 419 public function deleteChart() {
167 - $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
420 + $is_post = $_SERVER['REQUEST_METHOD'] === 'POST';
168 421 $input_method = $is_post ? INPUT_POST : INPUT_GET;
169 422 $chart_id = $success = false;
170 423 $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
171 424 $capable = current_user_can( 'delete_posts' );
@@ -170,9 +423,12 @@
170 423 $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
171 424 $capable = current_user_can( 'delete_posts' );
172 425 if ( $nonce && $capable ) {
173 426 $chart_id = filter_input(
174 - $input_method, 'chart', FILTER_VALIDATE_INT, array(
427 + $input_method,
428 + 'chart',
429 + FILTER_VALIDATE_INT,
430 + array(
175 431 'options' => array(
176 432 'min_range' => 1,
177 433 ),
178 434 )
@@ -178,9 +434,9 @@
178 434 )
179 435 );
180 436 if ( $chart_id ) {
181 437 $chart = get_post( $chart_id );
182 - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
438 + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
183 439 }
184 440 }
185 441 if ( $success ) {
186 442 wp_delete_post( $chart_id, true );
@@ -191,13 +447,41 @@
191 447 'success' => $success,
192 448 )
193 449 );
194 450 }
195 - wp_redirect( wp_get_referer() );
451 + wp_redirect( remove_query_arg( 'vaction', wp_get_referer() ) );
196 452 exit;
197 453 }
198 454
199 455 /**
456 + * Delete charts that are still in auto-draft mode.
457 + */
458 + private function deleteOldCharts() {
459 + $query = new WP_Query(
460 + array(
461 + 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
462 + 'post_status' => 'auto-draft',
463 + 'fields' => 'ids',
464 + 'update_post_meta_cache' => false,
465 + 'update_post_term_cache' => false,
466 + 'posts_per_page' => 50,
467 + 'date_query' => array(
468 + array(
469 + 'before' => 'today',
470 + ),
471 + ),
472 + )
473 + );
474 +
475 + if ( $query->have_posts() ) {
476 + $ids = array();
477 + while ( $query->have_posts() ) {
478 + wp_delete_post( $query->next_post(), true );
479 + }
480 + }
481 + }
482 +
483 + /**
200 484 * Renders appropriate page for chart builder. Creates new auto draft chart
201 485 * if no chart has been specified.
202 486 *
203 487 * @since 1.0.0
@@ -205,11 +489,14 @@
205 489 * @access public
206 490 */
207 491 public function renderChartPages() {
208 492 defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
493 + // Set current screen for the render chart.
494 + set_current_screen( 'visualizer_render_chart' );
209 495 // check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
210 496 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
211 - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
497 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
498 + $this->deleteOldCharts();
212 499 $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
213 500 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
214 501 $source->fetch();
215 502 $chart_id = wp_insert_post(
@@ -217,9 +504,9 @@
217 504 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
218 505 'post_title' => 'Visualization',
219 506 'post_author' => get_current_user_id(),
220 507 'post_status' => 'auto-draft',
221 - 'post_content' => $source->getData(),
508 + 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
222 509 )
223 510 );
224 511 if ( $chart_id && ! is_wp_error( $chart_id ) ) {
225 512 add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
@@ -225,10 +512,13 @@
225 512 add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
226 513 add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
227 514 add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
228 515 add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
516 + add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
229 517 add_post_meta(
230 - $chart_id, Visualizer_Plugin::CF_SETTINGS, array(
518 + $chart_id,
519 + Visualizer_Plugin::CF_SETTINGS,
520 + array(
231 521 'focusTarget' => 'datum',
232 522 )
233 523 );
234 524 do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
@@ -235,34 +525,59 @@
235 525 }
236 526 wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
237 527 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
238 528 }
529 +
530 + $_POST['save_chart_image'] = isset( $_POST['save_chart_image'] ) && 'yes' === $_POST['save_chart_image'] ? true : false;
531 +
532 + if ( isset( $_POST['chart-img'] ) && ! empty( $_POST['chart-img'] ) ) {
533 + $attachment_id = $this->save_chart_image( $_POST['chart-img'], $chart_id, $_POST['save_chart_image'] );
534 + if ( $attachment_id ) {
535 + update_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, $attachment_id );
536 + }
537 + }
538 + $lib = $this->load_chart_type( $chart_id );
539 +
540 + // the alpha color picker (RGBA) is not supported by google.
541 + $color_picker_dep = 'wp-color-picker';
542 + if ( in_array( $lib, array( 'chartjs', 'datatables' ), true ) && ! wp_script_is( 'wp-color-picker-alpha', 'registered' ) ) {
543 + wp_register_script( 'wp-color-picker-alpha', VISUALIZER_ABSURL . 'js/lib/wp-color-picker-alpha.min.js', array( 'wp-color-picker' ), Visualizer_Plugin::VERSION );
544 + $color_picker_dep = 'wp-color-picker-alpha';
545 + }
546 +
239 547 // enqueue and register scripts and styles
240 548 wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
241 549 wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
242 550
243 551 wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
244 - wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
245 - wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
246 - wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
552 + wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion', 'jquery-ui-tabs' ), Visualizer_Plugin::VERSION, true );
553 + wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
247 554 wp_register_script(
248 - 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
249 - 'google-jsapi-old',
250 - 'google-jsapi-new',
251 - 'visualizer-frame',
252 - ), Visualizer_Plugin::VERSION, true
555 + 'visualizer-render',
556 + VISUALIZER_ABSURL . 'js/render-facade.js',
557 + apply_filters( 'visualizer_assets_render', array( 'visualizer-frame', 'visualizer-customization' ), false ),
558 + Visualizer_Plugin::VERSION,
559 + true
253 560 );
254 561 wp_register_script(
255 - 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array(
256 - 'wp-color-picker',
562 + 'visualizer-preview',
563 + VISUALIZER_ABSURL . 'js/preview.js',
564 + array(
565 + $color_picker_dep,
257 566 'visualizer-render',
258 - ), Visualizer_Plugin::VERSION, true
567 + ),
568 + Visualizer_Plugin::VERSION,
569 + true
259 570 );
260 - // added by Ash/Upwork
261 - if ( VISUALIZER_PRO ) {
571 + wp_register_script( 'visualizer-editor-simple', VISUALIZER_ABSURL . 'js/simple-editor.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
572 +
573 + do_action( 'visualizer_add_scripts' );
574 +
575 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
262 576 global $Visualizer_Pro;
263 577 $Visualizer_Pro->_addScriptsAndStyles();
264 578 }
579 +
265 580 // dispatch pages
266 581 $this->_chart = get_post( $chart_id );
267 582 $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
268 583
@@ -274,8 +589,9 @@
274 589 if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) {
275 590 // if the cancel button is clicked.
276 591 $this->undoRevisions( $chart_id, true );
277 592 } elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
593 + $this->handlePermissions();
278 594 // if the save button is clicked.
279 595 $this->undoRevisions( $chart_id, false );
280 596 } else {
281 597 // if the edit button is clicked.
@@ -281,8 +597,16 @@
281 597 // if the edit button is clicked.
282 598 $this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
283 599 }
284 600
601 + // Clear existing chart cache.
602 + if ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
603 + $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id;
604 + if ( get_transient( $cache_key ) ) {
605 + delete_transient( $cache_key );
606 + }
607 + }
608 +
285 609 switch ( $tab ) {
286 610 case 'settings':
287 611 $this->_handleDataAndSettingsPage();
288 612 break;
@@ -290,9 +614,9 @@
290 614 case 'visualizer': // fall through.
291 615 $this->_handleTypesPage();
292 616 break;
293 617 default:
294 - do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
618 + // this should never happen.
295 619 break;
296 620 }
297 621 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
298 622 }
@@ -297,8 +621,80 @@
297 621 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
298 622 }
299 623
300 624 /**
625 + * Load code editor assets.
626 + */
627 + private function loadCodeEditorAssets( $chart_id ) {
628 + global $wp_version;
629 +
630 + $wp_scripts = wp_scripts();
631 +
632 + // data tables assets.
633 + wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
634 + wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
635 + 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 );
636 + wp_enqueue_script( 'visualizer-datatables' );
637 + wp_enqueue_style( 'visualizer-jquery-ui' );
638 +
639 + if ( ! Visualizer_Module::is_pro() ) {
640 + return;
641 + }
642 +
643 + $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( $chart_id );
644 +
645 + if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
646 + // code mirror assets.
647 + wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
648 + wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
649 + wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
650 + wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
651 + wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
652 + wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
653 + 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 );
654 + wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION );
655 + wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
656 +
657 + wp_enqueue_script( 'visualizer-codemirror-hint' );
658 + wp_enqueue_style( 'visualizer-codemirror-hint' );
659 + } else {
660 + wp_enqueue_code_editor(
661 + array(
662 + 'type' => 'sql',
663 + 'codemirror' => array(
664 + 'autofocus' => true,
665 + 'lineWrapping' => true,
666 + 'dragDrop' => false,
667 + 'matchBrackets' => true,
668 + 'autoCloseBrackets' => true,
669 + 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
670 + 'hintOptions' => array( 'tables' => $table_col_mapping ),
671 + ),
672 + )
673 + );
674 + }
675 +
676 + return $table_col_mapping;
677 + }
678 +
679 + /**
680 + * Handle permissions from the new conslidated settings sidebar.
681 + */
682 + private function handlePermissions() {
683 + if ( ! Visualizer_Module::is_pro() ) {
684 + return;
685 + }
686 +
687 + // we will not support old free and new pro.
688 + // handling new free and old pro.
689 + if ( has_action( 'visualizer_pro_handle_tab' ) ) {
690 + do_action( 'visualizer_pro_handle_tab', 'permissions', $this->_chart );
691 + } else {
692 + do_action( 'visualizer_handle_permissions', $this->_chart );
693 + }
694 + }
695 +
696 + /**
301 697 * Handle data and settings page
302 698 */
303 699 private function _handleDataAndSettingsPage() {
304 700 if ( isset( $_POST['map_api_key'] ) ) {
@@ -303,23 +699,47 @@
303 699 private function _handleDataAndSettingsPage() {
304 700 if ( isset( $_POST['map_api_key'] ) ) {
305 701 update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
306 702 }
307 - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
308 - if ( $this->_chart->post_status == 'auto-draft' ) {
703 +
704 + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
705 + if ( $this->_chart->post_status === 'auto-draft' ) {
309 706 $this->_chart->post_status = 'publish';
707 +
708 + // 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.
709 + // we do not want any difference in data so disable revisions temporarily.
710 + $this->disableRevisionsTemporarily();
711 +
310 712 wp_update_post( $this->_chart->to_array() );
311 713 }
312 - update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
714 + // save meta data only when it is NOT being canceled.
715 + if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
716 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
717 +
718 + // we will keep a parameter called 'internal_title' that will be set to the given title or, if empty, the chart ID
719 + // this will help in searching with the chart id.
720 + $settings = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
721 + $title = null;
722 + if ( isset( $settings['title'] ) && ! empty( $settings['title'] ) ) {
723 + $title = $settings['title'];
724 + if ( is_array( $title ) ) {
725 + $title = $settings['title']['text'];
726 + }
727 + }
728 + if ( empty( $title ) ) {
729 + $title = $this->_chart->ID;
730 + }
731 + $settings['internal_title'] = $title;
732 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
733 + }
313 734 $render = new Visualizer_Render_Page_Send();
314 735 $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
315 736 wp_iframe( array( $render, 'render' ) );
316 -
317 737 return;
318 738 }
319 739 $data = $this->_getChartArray();
320 740 $sidebar = '';
321 - $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
741 + $sidebar_class = $this->load_chart_class_name( $this->_chart->ID );
322 742 if ( class_exists( $sidebar_class, true ) ) {
323 743 $sidebar = new $sidebar_class( $data['settings'] );
324 744 $sidebar->__series = $data['series'];
325 745 $sidebar->__data = $data['data'];
@@ -324,59 +744,107 @@
324 744 $sidebar->__series = $data['series'];
325 745 $sidebar->__data = $data['data'];
326 746 } else {
327 747 $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
328 - if ( $sidebar != '' ) {
748 + if ( $sidebar !== '' ) {
329 749 $sidebar->__series = $data['series'];
330 750 $sidebar->__data = $data['data'];
331 751 }
332 752 }
333 - unset( $data['settings']['width'], $data['settings']['height'] );
334 - wp_enqueue_style( 'visualizer-frame' );
753 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
335 754 wp_enqueue_style( 'wp-color-picker' );
336 755 wp_enqueue_style( 'visualizer-frame' );
337 756 wp_enqueue_script( 'visualizer-preview' );
757 + wp_enqueue_script( 'visualizer-chosen' );
338 758 wp_enqueue_script( 'visualizer-render' );
759 +
760 + if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
761 + wp_enqueue_script( 'visualizer-editor-simple' );
762 + wp_localize_script(
763 + 'visualizer-editor-simple',
764 + 'visualizer1',
765 + array(
766 + 'ajax' => array(
767 + 'url' => admin_url( 'admin-ajax.php' ),
768 + 'nonces' => array(
769 + ),
770 + 'actions' => array(
771 + ),
772 + ),
773 + )
774 + );
775 + }
776 +
777 + $table_col_mapping = $this->loadCodeEditorAssets( $this->_chart->ID );
778 +
339 779 wp_localize_script(
340 - 'visualizer-render', 'visualizer', array(
780 + 'visualizer-render',
781 + 'visualizer',
782 + array(
341 783 'l10n' => array(
342 - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
784 + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
343 785 'loading' => esc_html__( 'Loading...', 'visualizer' ),
786 + 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
787 + 'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
788 + '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' ),
344 789 ),
345 790 'charts' => array(
346 791 'canvas' => $data,
792 + 'id' => $this->_chart->ID,
347 793 ),
348 794 'language' => $this->get_language(),
349 795 'map_api_key' => get_option( 'visualizer-map-api-key' ),
350 - 'ajax' => array(
796 + 'ajax' => array(
351 797 'url' => admin_url( 'admin-ajax.php' ),
352 798 'nonces' => array(
353 799 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
800 + 'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ),
801 + 'json_get_roots' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION ),
802 + 'json_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION ),
803 + 'json_set_schedule' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION ),
354 804 ),
355 805 'actions' => array(
356 806 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
807 + 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA,
808 + 'json_get_roots' => Visualizer_Plugin::ACTION_JSON_GET_ROOTS,
809 + 'json_get_data' => Visualizer_Plugin::ACTION_JSON_GET_DATA,
810 + 'json_set_schedule' => Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE,
357 811 ),
358 812 ),
813 + 'db_query' => array(
814 + 'tables' => $table_col_mapping,
815 + ),
816 + 'is_pro' => Visualizer_Module::is_pro(),
817 + 'page_type' => 'chart',
818 + 'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
819 + 'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
820 + 'is_front' => false,
359 821 )
360 822 );
823 +
361 824 $render = new Visualizer_Render_Page_Data();
362 825 $render->chart = $this->_chart;
363 826 $render->type = $data['type'];
827 + $render->custom_css = $data['css'];
364 828 $render->sidebar = $sidebar;
365 829 if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
366 - $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
830 + $render->button = filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART
367 831 ? esc_html__( 'Save Chart', 'visualizer' )
368 832 : esc_html__( 'Create Chart', 'visualizer' );
369 - if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) {
833 + if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
370 834 $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
371 835 }
372 836 } else {
373 837 $render->button = esc_attr__( 'Insert Chart', 'visualizer' );
374 838 }
375 - if ( VISUALIZER_PRO ) {
839 +
840 + do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
841 +
842 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
376 843 global $Visualizer_Pro;
377 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
844 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
378 845 }
846 +
379 847 $this->_addAction( 'admin_head', 'renderFlattrScript' );
380 848 wp_iframe( array( $render, 'render' ) );
381 849 }
382 850
@@ -388,21 +856,32 @@
388 856 * @access private
389 857 */
390 858 private function _handleTypesPage() {
391 859 // process post request
392 - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
860 + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
393 861 $type = filter_input( INPUT_POST, 'type' );
394 - if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
862 + $library = filter_input( INPUT_POST, 'chart-library' );
863 + if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
864 + if ( empty( $library ) ) {
865 + // library cannot be empty.
866 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
867 + return;
868 + }
869 +
395 870 // save new chart type
396 871 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
872 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, $library );
397 873 // if the chart has default data, update it with appropriate default data for new type
398 874 if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
399 875 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
400 876 $source->fetch();
401 - $this->_chart->post_content = $source->getData();
877 + $this->_chart->post_content = $source->getData( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
402 878 wp_update_post( $this->_chart->to_array() );
403 879 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
404 880 }
881 +
882 + Visualizer_Module_Utility::set_defaults( $this->_chart );
883 +
405 884 // redirect to next tab
406 885 // changed by Ash/Upwork
407 886 wp_redirect( add_query_arg( 'tab', 'settings' ) );
408 887
@@ -410,9 +889,9 @@
410 889 }
411 890 }
412 891 $render = new Visualizer_Render_Page_Types();
413 892 $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
414 - $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
893 + $render->types = Visualizer_Module_Admin::_getChartTypesLocalized( false, false, false, 'types' );
415 894 $render->chart = $this->_chart;
416 895 wp_enqueue_style( 'visualizer-frame' );
417 896 wp_enqueue_script( 'visualizer-frame' );
418 897 wp_iframe( array( $render, 'render' ) );
@@ -428,10 +907,131 @@
428 907 */
429 908 public function renderFlattrScript() {
430 909 echo '';
431 910 }
432 - // changed by Ash/Upwork
911 +
433 912 /**
913 + * Processes the CSV that is sent in the request as a string.
914 + *
915 + * @since 3.2.0
916 + */
917 + private function handleCSVasString( $data, $editor_type ) {
918 + $source = null;
919 +
920 + switch ( $editor_type ) {
921 + case 'text':
922 + // data coming in from the text editor.
923 + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
924 + $handle = fopen( $tmpfile, 'w' );
925 + $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
926 + if ( $values ) {
927 + foreach ( $values as $row ) {
928 + if ( empty( $row ) ) {
929 + continue;
930 + }
931 + $row = explode( ',', $row );
932 + $row = array_map(
933 + function( $r ) {
934 + return '' === $r ? ' ' : $r;
935 + },
936 + $row
937 + );
938 + $row = implode( ',', $row );
939 + // don't use fpucsv here because we need to just dump the data
940 + // minus the empty rows
941 + // because fputcsv needs to tokenize
942 + // we can standardize the CSV enclosure here and replace all ' with "
943 + // we can assume that if there are an even number of ' they should be changed to "
944 + // but that will screw up words like fo'c'sle
945 + // so here let's just assume ' will NOT be used for enclosures
946 + fwrite( $handle, $row );
947 + fwrite( $handle, PHP_EOL );
948 + }
949 + }
950 + $source = new Visualizer_Source_Csv( $tmpfile );
951 + fclose( $handle );
952 + break;
953 + case 'table':
954 + // Import from Chart
955 + // fall-through.
956 + case 'excel':
957 + // data coming in from the excel editor.
958 + $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
959 + break;
960 + }
961 + return $source;
962 + }
963 +
964 + /**
965 + * Parses the data uploaded as an HTML table.
966 + *
967 + * @since 3.2.0
968 + *
969 + * @access private
970 + */
971 + private function handleTabularData() {
972 + $csv = array();
973 + // the datatable mentions the headers twice, so lets remove the duplicates.
974 + $headers = array_unique( array_filter( $_POST['header'] ) );
975 + $types = $_POST['type'];
976 +
977 + // capture all the indexes that correspond to excluded columns.
978 + $exclude = array();
979 + $index = 0;
980 + foreach ( $types as $type ) {
981 + if ( empty( $type ) ) {
982 + $exclude[] = $index;
983 + }
984 + $index++;
985 + }
986 +
987 + // when N headers are being renamed, the number of headers increases by N
988 + // because of the way datatable duplicates header information
989 + // so unset the headers that have been renamed.
990 + if ( count( $headers ) !== count( $types ) ) {
991 + $to = count( $headers );
992 + for ( $i = count( $types ); $i < $to; $i++ ) {
993 + unset( $headers[ $i + 1 ] );
994 + }
995 + }
996 +
997 + $columns = array();
998 + for ( $i = 0; $i < count( $headers ); $i++ ) {
999 + if ( ! isset( $_POST[ 'data' . $i ] ) ) {
1000 + continue;
1001 + }
1002 + $columns[ $i ] = $_POST[ 'data' . $i ];
1003 + }
1004 +
1005 + $csv[] = $headers;
1006 + $csv[] = $types;
1007 + for ( $j = 0; $j < count( $columns[0] ); $j++ ) {
1008 + $row = array();
1009 + for ( $i = 0; $i < count( $headers ); $i++ ) {
1010 + $row[] = sanitize_text_field( $columns[ $i ][ $j ] );
1011 + }
1012 + $csv[] = $row;
1013 + }
1014 +
1015 + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
1016 + $handle = fopen( $tmpfile, 'w' );
1017 +
1018 + if ( $csv ) {
1019 + $index = 0;
1020 + foreach ( $csv as $row ) {
1021 + // remove all the cells corresponding to the excluded headers.
1022 + foreach ( $exclude as $j ) {
1023 + unset( $row[ $j ] );
1024 + }
1025 + fputcsv( $handle, $row );
1026 + }
1027 + }
1028 + $source = new Visualizer_Source_Csv( $tmpfile );
1029 + fclose( $handle );
1030 + return $source;
1031 + }
1032 +
1033 + /**
434 1034 * Parses uploaded CSV file and saves new data for the chart.
435 1035 *
436 1036 * @since 1.0.0
437 1037 *
@@ -453,9 +1053,9 @@
453 1053
454 1054 // check chart, if chart exists
455 1055 // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
456 1056 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
457 - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
1057 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
458 1058 if ( ! $can_die ) {
459 1059 return;
460 1060 }
461 1061 status_header( 400 );
@@ -461,8 +1061,10 @@
461 1061 status_header( 400 );
462 1062 exit;
463 1063 }
464 1064
1065 + 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__ );
1066 +
465 1067 if ( ! isset( $_POST['vz-import-time'] ) ) {
466 1068 apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
467 1069 }
468 1070
@@ -467,11 +1069,33 @@
467 1069 }
468 1070
469 1071 if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
470 1072 // delete the filters in case this chart is being uploaded from other data sources
471 - delete_post_meta( $chart_id, 'visualizer-filter-config' );
1073 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_FILTER_CONFIG );
1074 + delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_FILTER_CONFIG );
1075 + delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_DB_QUERY );
1076 +
1077 + // delete "import from db" specific parameters.
1078 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
1079 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
1080 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS );
472 1081 }
473 1082
1083 + // delete json related data.
1084 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
1085 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT );
1086 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING );
1087 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_HEADERS );
1088 +
1089 + // delete last error
1090 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
1091 +
1092 + // delete editor related data.
1093 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR );
1094 +
1095 + // delete this so that a JSON import can be later edited manually without a problem.
1096 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE );
1097 +
474 1098 $source = null;
475 1099 $render = new Visualizer_Render_Page_Update();
476 1100 if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
477 1101 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
@@ -477,27 +1101,78 @@
477 1101 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
478 1102 if ( isset( $_POST['vz-import-time'] ) ) {
479 1103 apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
480 1104 }
1105 + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
481 1106 } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
482 1107 $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
483 1108 } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
484 - $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' );
1109 + $source = $this->handleCSVasString( $_POST['chart_data'], $_POST['editor-type'] );
1110 + update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
1111 + } elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
1112 + $source = $this->handleTabularData();
1113 + update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
485 1114 } else {
486 - $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
1115 + 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__ );
1116 + $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' );
1117 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' ) );
487 1118 }
1119 +
1120 + 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__ );
1121 +
488 1122 if ( $source ) {
489 1123 if ( $source->fetch() ) {
490 - $chart->post_content = $source->getData();
1124 + $content = $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
1125 + $populate = true;
1126 + if ( is_string( $content ) && is_array( unserialize( $content ) ) ) {
1127 + $json = unserialize( $content );
1128 + // if source exists, so should data. if source exists but data is blank, do not populate the chart.
1129 + // if we populate the data even if it is empty, the chart will show "Table has no columns".
1130 + if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
1131 + 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__ );
1132 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Not populating chart data as source exists (%s) but data is empty!', $json['source'] ) );
1133 + $populate = false;
1134 + }
1135 + }
1136 + if ( $populate ) {
1137 + $chart->post_content = $content;
1138 + }
491 1139 wp_update_post( $chart->to_array() );
1140 +
492 1141 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
493 1142 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
494 1143 update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
495 - $render->data = json_encode( $source->getRawData() );
1144 +
1145 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Updated post for chart %d', $chart_id ), 'debug', __FILE__, __LINE__ );
1146 +
1147 + Visualizer_Module_Utility::set_defaults( $chart, null );
1148 +
1149 + $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
1150 + if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $source->getSeries() ) > 1 ) ) {
1151 + $diff_total_series = abs( count( $settings['series'] ) - count( $source->getSeries() ) );
1152 + if ( $diff_total_series ) {
1153 + foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
1154 + $settings['series'][] = end( $settings['series'] );
1155 + }
1156 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
1157 + }
1158 + }
1159 +
1160 + $render->id = $chart->ID;
1161 + $render->data = json_encode( $source->getRawData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
496 1162 $render->series = json_encode( $source->getSeries() );
1163 + $render->settings = json_encode( $settings );
497 1164 } else {
498 - $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
1165 + $error = $source->get_error();
1166 + if ( empty( $error ) ) {
1167 + $error = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' );
1168 + }
1169 + $render->message = $error;
1170 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( '%s for chart %d.', $error, $chart_id ), 'error', __FILE__, __LINE__ );
1171 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, $error );
499 1172 }
1173 + } else {
1174 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unknown internal error for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
500 1175 }
501 1176 $render->render();
502 1177 if ( ! $can_die ) {
503 1178 return;
@@ -513,24 +1188,18 @@
513 1188 * @access public
514 1189 */
515 1190 public function cloneChart() {
516 1191 $chart_id = $success = false;
517 - $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
1192 + $nonce = isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'], Visualizer_Plugin::ACTION_CLONE_CHART );
518 1193 $capable = current_user_can( 'edit_posts' );
519 1194 if ( $nonce && $capable ) {
520 - $chart_id = filter_input(
521 - INPUT_GET, 'chart', FILTER_VALIDATE_INT, array(
522 - 'options' => array(
523 - 'min_range' => 1,
524 - ),
525 - )
526 - );
1195 + $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
527 1196 if ( $chart_id ) {
528 1197 $chart = get_post( $chart_id );
529 - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
1198 + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
530 1199 }
531 1200 }
532 - $redirect = wp_get_referer();
1201 + $redirect = remove_query_arg( 'vaction', wp_get_referer() );
533 1202 if ( $success ) {
534 1203 $new_chart_id = wp_insert_post(
535 1204 array(
536 1205 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
@@ -539,22 +1208,32 @@
539 1208 'post_status' => $chart->post_status,
540 1209 'post_content' => $chart->post_content,
541 1210 )
542 1211 );
543 - if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
544 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
545 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
546 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
547 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
548 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) );
1212 + if ( is_wp_error( $new_chart_id ) ) {
1213 + 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__ );
1214 + } else {
1215 + $post_meta = get_post_meta( $chart_id );
1216 + foreach ( $post_meta as $key => $value ) {
1217 + if ( strpos( $key, 'visualizer-' ) !== false ) {
1218 + add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
1219 + }
1220 + }
549 1221 $redirect = add_query_arg(
550 1222 array(
551 1223 'page' => 'visualizer',
552 1224 'type' => filter_input( INPUT_GET, 'type' ),
553 - ), admin_url( 'upload.php' )
1225 + 'vaction' => false,
1226 + ),
1227 + admin_url( 'admin.php' )
554 1228 );
555 1229 }
556 1230 }
1231 +
1232 + if ( defined( 'WP_TESTS_DOMAIN' ) ) {
1233 + wp_die();
1234 + }
1235 +
557 1236 wp_redirect( $redirect );
558 1237 exit;
559 1238 }
560 1239
@@ -569,9 +1248,11 @@
569 1248 check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
570 1249 $capable = current_user_can( 'edit_posts' );
571 1250 if ( $capable ) {
572 1251 $chart_id = isset( $_GET['chart'] ) ? filter_var(
573 - $_GET['chart'], FILTER_VALIDATE_INT, array(
1252 + $_GET['chart'],
1253 + FILTER_VALIDATE_INT,
1254 + array(
574 1255 'options' => array(
575 1256 'min_range' => 1,
576 1257 ),
577 1258 )
@@ -598,15 +1279,20 @@
598 1279 $data = $this->_getChartArray();
599 1280 $render = new Visualizer_Render_Page_Data();
600 1281 $render->chart = $this->_chart;
601 1282 $render->type = $data['type'];
602 - unset( $data['settings']['width'], $data['settings']['height'] );
1283 +
1284 + if ( $data && $data['settings'] ) {
1285 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
1286 + }
603 1287 wp_enqueue_style( 'visualizer-frame' );
604 1288 wp_enqueue_script( 'visualizer-render' );
605 1289 wp_localize_script(
606 - 'visualizer-render', 'visualizer', array(
1290 + 'visualizer-render',
1291 + 'visualizer',
1292 + array(
607 1293 'l10n' => array(
608 - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
1294 + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
609 1295 'loading' => esc_html__( 'Loading...', 'visualizer' ),
610 1296 ),
611 1297 'charts' => array(
612 1298 'canvas' => $data,
@@ -612,15 +1298,206 @@
612 1298 'canvas' => $data,
613 1299 ),
614 1300 )
615 1301 );
616 - // Added by Ash/Upwork
617 - if ( VISUALIZER_PRO ) {
1302 +
1303 + do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
1304 +
1305 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
618 1306 global $Visualizer_Pro;
619 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
1307 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
620 1308 }
1309 +
621 1310 // Added by Ash/Upwork
622 1311 $this->_addAction( 'admin_head', 'renderFlattrScript' );
623 1312 wp_iframe( array( $render, 'render' ) );
624 1313 }
625 1314
1315 + /**
1316 + * Returns the data for the query.
1317 + *
1318 + * @access public
1319 + */
1320 + public function getQueryData() {
1321 + check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
1322 +
1323 + $params = wp_parse_args( $_POST['params'] );
1324 + $chart_id = filter_var( $params['chart_id'], FILTER_VALIDATE_INT );
1325 +
1326 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
1327 + $html = $source->fetch( true );
1328 + $error = $source->get_error();
1329 + if ( ! empty( $error ) ) {
1330 + wp_send_json_error( array( 'msg' => $error ) );
1331 + }
1332 + wp_send_json_success( array( 'table' => $html ) );
1333 + }
1334 +
1335 + /**
1336 + * Saves the query and the schedule.
1337 + *
1338 + * @access public
1339 + */
1340 + public function saveQuery() {
1341 + check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' );
1342 +
1343 + $chart_id = filter_input(
1344 + INPUT_GET,
1345 + 'chart',
1346 + FILTER_VALIDATE_INT,
1347 + array(
1348 + 'options' => array(
1349 + 'min_range' => 1,
1350 + ),
1351 + )
1352 + );
1353 +
1354 + $hours = filter_input(
1355 + INPUT_POST,
1356 + 'refresh',
1357 + FILTER_VALIDATE_FLOAT,
1358 + array(
1359 + 'options' => array(
1360 + 'min_range' => -1,
1361 + 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1362 + ),
1363 + )
1364 + );
1365 +
1366 + if ( ! is_numeric( $hours ) ) {
1367 + $hours = -1;
1368 + }
1369 +
1370 + $render = new Visualizer_Render_Page_Update();
1371 + if ( $chart_id ) {
1372 + $params = wp_parse_args( $_POST['params'] );
1373 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
1374 + $source->fetch( false );
1375 + $error = $source->get_error();
1376 + if ( empty( $error ) ) {
1377 + update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
1378 + update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
1379 + update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
1380 + update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
1381 + update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1382 + if ( isset( $params['db_type'] ) && $params['db_type'] !== Visualizer_Plugin::WP_DB_NAME ) {
1383 + $remote_db_params = $params;
1384 + unset( $remote_db_params['query'] );
1385 + unset( $remote_db_params['chart_id'] );
1386 + update_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS, $remote_db_params );
1387 + }
1388 +
1389 + $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
1390 + $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
1391 + update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
1392 +
1393 + wp_update_post(
1394 + array(
1395 + 'ID' => $chart_id,
1396 + 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
1397 + )
1398 + );
1399 + $render->data = json_encode( $source->getRawData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
1400 + $render->series = json_encode( $source->getSeries() );
1401 + $render->id = $chart_id;
1402 + } else {
1403 + $render->message = $error;
1404 + }
1405 + }
1406 + $render->render();
1407 + if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1408 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1409 + }
1410 + }
1411 +
1412 +
1413 + /**
1414 + * Saves the filter query and the schedule.
1415 + *
1416 + * @access public
1417 + */
1418 + public function saveFilter() {
1419 + check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY . Visualizer_Plugin::VERSION, 'security' );
1420 +
1421 + $chart_id = filter_input(
1422 + INPUT_GET,
1423 + 'chart',
1424 + FILTER_VALIDATE_INT,
1425 + array(
1426 + 'options' => array(
1427 + 'min_range' => 1,
1428 + ),
1429 + )
1430 + );
1431 +
1432 + $hours = filter_input(
1433 + INPUT_POST,
1434 + 'refresh',
1435 + FILTER_VALIDATE_INT,
1436 + array(
1437 + 'options' => array(
1438 + 'min_range' => -1,
1439 + 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1440 + ),
1441 + )
1442 + );
1443 +
1444 + if ( 0 !== $hours && empty( $hours ) ) {
1445 + $hours = -1;
1446 + }
1447 +
1448 + do_action( 'visualizer_save_filter', $chart_id, $hours );
1449 +
1450 + if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1451 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1452 + }
1453 + }
1454 +
1455 + /**
1456 + * Save chart image.
1457 + *
1458 + * @param string $base64_img Chart image.
1459 + * @param int $chart_id Chart ID.
1460 + * @param bool $save_attachment Save attachment.
1461 + * @return attachment ID
1462 + */
1463 + public function save_chart_image( $base64_img, $chart_id, $save_attachment = true ) {
1464 + // Delete old chart image.
1465 + $old_attachment_id = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, true );
1466 + if ( $old_attachment_id ) {
1467 + wp_delete_attachment( $old_attachment_id, true );
1468 + }
1469 +
1470 + if ( ! $save_attachment ) {
1471 + return 0;
1472 + }
1473 +
1474 + // Upload dir.
1475 + $upload_dir = wp_upload_dir();
1476 + $upload_path = str_replace( '/', DIRECTORY_SEPARATOR, $upload_dir['path'] ) . DIRECTORY_SEPARATOR;
1477 +
1478 + $img = str_replace( 'data:image/png;base64,', '', $base64_img );
1479 + $img = str_replace( ' ', '+', $img );
1480 + $decoded = base64_decode( $img );
1481 + $filename = 'visualization-' . $chart_id . '.png';
1482 + $file_type = 'image/png';
1483 + $hashed_filename = $filename;
1484 +
1485 + // Save the image in the uploads directory.
1486 + require_once ABSPATH . '/wp-admin/includes/file.php';
1487 + \WP_Filesystem();
1488 + global $wp_filesystem;
1489 + $upload_file = $wp_filesystem->put_contents( $upload_path . $hashed_filename, $decoded );
1490 +
1491 + // Insert new chart image.
1492 + $attachment = array(
1493 + 'post_mime_type' => $file_type,
1494 + 'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $hashed_filename ) ),
1495 + 'post_content' => '',
1496 + 'post_status' => 'inherit',
1497 + 'guid' => $upload_dir['url'] . '/' . basename( $hashed_filename ),
1498 + );
1499 +
1500 + $attach_id = wp_insert_attachment( $attachment, $upload_dir['path'] . '/' . $hashed_filename );
1501 + return $attach_id;
1502 + }
626 1503 }