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