PluginProbe
Visualizer – Tables & Charts Manager with Built-in AI Generator / 3.4.3
Visualizer – Tables & Charts Manager with Built-in AI Generator v3.4.3
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 +575 -76 3.1.3 → 3.4.3 View file →
@@ -60,12 +60,222 @@
60 60 $this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
61 61
62 62 $this->_addAjaxAction( Visualizer_Plugin::ACTION_FETCH_DB_DATA, 'getQueryData' );
63 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 +
64 70 $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
71 +
72 + $this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 );
73 +
65 74 }
66 75
67 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 + }
143 + wp_send_json_success();
144 + }
145 +
146 + /**
147 + * Get the root elements for JSON-endpoint.
148 + *
149 + * @since ?
150 + *
151 + * @access public
152 + */
153 + public function getJsonRoots() {
154 + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION, 'security' );
155 +
156 + $params = wp_parse_args( $_POST['params'] );
157 +
158 + $source = new Visualizer_Source_Json( $params );
159 +
160 + $roots = $source->fetchRoots();
161 + if ( empty( $roots ) ) {
162 + wp_send_json_error( array( 'msg' => $source->get_error() ) );
163 + }
164 +
165 + wp_send_json_success( array( 'url' => $params['url'], 'roots' => $roots ) );
166 + }
167 +
168 + /**
169 + * Get the data for the JSON-endpoint corresponding to the chosen root.
170 + *
171 + * @since ?
172 + *
173 + * @access public
174 + */
175 + public function getJsonData() {
176 + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION, 'security' );
177 +
178 + $params = wp_parse_args( $_POST['params'] );
179 +
180 + $chart_id = $params['chart'];
181 +
182 + if ( empty( $chart_id ) ) {
183 + wp_die();
184 + }
185 +
186 + $source = new Visualizer_Source_Json( $params );
187 + $source->fetch();
188 + $data = $source->getRawData();
189 +
190 + if ( empty( $data ) ) {
191 + wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
192 + }
193 +
194 + $data = Visualizer_Render_Layout::show( 'editor-table', $data, $chart_id, 'viz-json-table', false, false );
195 + wp_send_json_success( array( 'table' => $data, 'root' => $params['root'], 'url' => $params['url'], 'paging' => $source->getPaginationElements() ) );
196 + }
197 +
198 + /**
199 + * Updates the database with the correct post parameters for JSON-endpoint charts.
200 + *
201 + * @since ?
202 + *
203 + * @access public
204 + */
205 + public function setJsonData() {
206 + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_SET_DATA . Visualizer_Plugin::VERSION, 'security' );
207 +
208 + $params = $_POST;
209 + $chart_id = $_GET['chart'];
210 +
211 + if ( empty( $chart_id ) ) {
212 + wp_die();
213 + }
214 +
215 + $chart = get_post( $chart_id );
216 +
217 + $source = new Visualizer_Source_Json( $params );
218 + $source->fetchFromEditableTable();
219 +
220 + $content = $source->getData();
221 + $chart->post_content = $content;
222 + wp_update_post( $chart->to_array() );
223 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
224 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
225 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
226 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_URL, $params['url'] );
227 + update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_ROOT, $params['root'] );
228 +
229 + delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS );
230 + $headers = array( 'method' => $params['method'] );
231 + if ( ! empty( $params['auth'] ) ) {
232 + $headers['auth'] = $params['auth'];
233 + } elseif ( ! empty( $params['username'] ) && ! empty( $params['password'] ) ) {
234 + $headers['auth'] = array( 'username' => $params['username'], 'password' => $params['password'] );
235 + }
236 +
237 + add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS, $headers );
238 +
239 + delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING );
240 + if ( ! empty( $params['paging'] ) ) {
241 + add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING, $params['paging'] );
242 + }
243 +
244 + $time = filter_input(
245 + INPUT_POST,
246 + 'time',
247 + FILTER_VALIDATE_INT,
248 + array(
249 + 'options' => array(
250 + 'min_range' => -1,
251 + ),
252 + )
253 + );
254 +
255 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
256 +
257 + if ( -1 < $time ) {
258 + add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
259 + }
260 +
261 + // delete other source specific parameters.
262 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
263 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
264 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_URL );
265 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE );
266 +
267 + $render = new Visualizer_Render_Page_Update();
268 + $render->id = $chart->ID;
269 + $render->data = json_encode( $source->getRawData() );
270 + $render->series = json_encode( $source->getSeries() );
271 + $render->render();
272 +
273 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
274 + }
275 +
276 +
277 + /**
68 278 * Fetches charts from database.
69 279 *
70 280 * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content).
71 281 *
@@ -94,9 +304,9 @@
94 304 // 'filter' is from the modal from the add media button.
95 305 $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
96 306 }
97 307
98 - if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
308 + if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
99 309 $query_args['meta_query'] = array(
100 310 array(
101 311 'key' => Visualizer_Plugin::CF_CHART_TYPE,
102 312 'value' => $filter,
@@ -147,9 +357,9 @@
147 357 $chart = $this->_chart;
148 358 }
149 359 $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
150 360 $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
151 - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
361 + $data = self::get_chart_data( $chart, $type );
152 362 $library = $this->load_chart_type( $chart->ID );
153 363
154 364 $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
155 365 $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
@@ -201,9 +411,9 @@
201 411 *
202 412 * @access public
203 413 */
204 414 public function deleteChart() {
205 - $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
415 + $is_post = $_SERVER['REQUEST_METHOD'] === 'POST';
206 416 $input_method = $is_post ? INPUT_POST : INPUT_GET;
207 417 $chart_id = $success = false;
208 418 $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
209 419 $capable = current_user_can( 'delete_posts' );
@@ -219,9 +429,9 @@
219 429 )
220 430 );
221 431 if ( $chart_id ) {
222 432 $chart = get_post( $chart_id );
223 - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
433 + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
224 434 }
225 435 }
226 436 if ( $success ) {
227 437 wp_delete_post( $chart_id, true );
@@ -232,9 +442,9 @@
232 442 'success' => $success,
233 443 )
234 444 );
235 445 }
236 - wp_redirect( wp_get_referer() );
446 + wp_redirect( remove_query_arg( 'vaction', wp_get_referer() ) );
237 447 exit;
238 448 }
239 449
240 450 /**
@@ -276,9 +486,9 @@
276 486 public function renderChartPages() {
277 487 defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
278 488 // check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
279 489 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
280 - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
490 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
281 491 $this->deleteOldCharts();
282 492 $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
283 493 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
284 494 $source->fetch();
@@ -295,8 +505,9 @@
295 505 add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
296 506 add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
297 507 add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
298 508 add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
509 + add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
299 510 add_post_meta(
300 511 $chart_id,
301 512 Visualizer_Plugin::CF_SETTINGS,
302 513 array(
@@ -308,16 +519,23 @@
308 519 wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
309 520 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
310 521 }
311 522
312 - $this->load_chart_type( $chart_id );
523 + $lib = $this->load_chart_type( $chart_id );
313 524
525 + // the alpha color picker (RGBA) is not supported by google.
526 + $color_picker_dep = 'wp-color-picker';
527 + if ( in_array( $lib, array( 'chartjs', 'datatables' ), true ) && ! wp_script_is( 'wp-color-picker-alpha', 'registered' ) ) {
528 + wp_register_script( 'wp-color-picker-alpha', VISUALIZER_ABSURL . 'js/lib/wp-color-picker-alpha.min.js', array( 'wp-color-picker' ), Visualizer_Plugin::VERSION );
529 + $color_picker_dep = 'wp-color-picker-alpha';
530 + }
531 +
314 532 // enqueue and register scripts and styles
315 533 wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
316 534 wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
317 535
318 536 wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
319 - wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
537 + wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion', 'jquery-ui-tabs' ), Visualizer_Plugin::VERSION, true );
320 538 wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
321 539 wp_register_script(
322 540 'visualizer-render',
323 541 VISUALIZER_ABSURL . 'js/render-facade.js',
@@ -328,19 +546,23 @@
328 546 wp_register_script(
329 547 'visualizer-preview',
330 548 VISUALIZER_ABSURL . 'js/preview.js',
331 549 array(
332 - 'wp-color-picker',
550 + $color_picker_dep,
333 551 'visualizer-render',
334 552 ),
335 553 Visualizer_Plugin::VERSION,
336 554 true
337 555 );
338 - // added by Ash/Upwork
339 - if ( VISUALIZER_PRO ) {
556 + wp_register_script( 'visualizer-editor-simple', VISUALIZER_ABSURL . 'js/simple-editor.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
557 +
558 + do_action( 'visualizer_add_scripts' );
559 +
560 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
340 561 global $Visualizer_Pro;
341 562 $Visualizer_Pro->_addScriptsAndStyles();
342 563 }
564 +
343 565 // dispatch pages
344 566 $this->_chart = get_post( $chart_id );
345 567 $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
346 568
@@ -352,8 +574,9 @@
352 574 if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) {
353 575 // if the cancel button is clicked.
354 576 $this->undoRevisions( $chart_id, true );
355 577 } elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
578 + $this->handlePermissions();
356 579 // if the save button is clicked.
357 580 $this->undoRevisions( $chart_id, false );
358 581 } else {
359 582 // if the edit button is clicked.
@@ -368,9 +591,9 @@
368 591 case 'visualizer': // fall through.
369 592 $this->_handleTypesPage();
370 593 break;
371 594 default:
372 - do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
595 + // this should never happen.
373 596 break;
374 597 }
375 598 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
376 599 }
@@ -377,25 +600,26 @@
377 600
378 601 /**
379 602 * Load code editor assets.
380 603 */
381 - private function loadCodeEditorAssets() {
604 + private function loadCodeEditorAssets( $chart_id ) {
382 605 global $wp_version;
383 606
384 - if ( ! VISUALIZER_PRO ) {
607 + $wp_scripts = wp_scripts();
608 +
609 + // data tables assets.
610 + wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
611 + wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
612 + 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 );
613 + wp_enqueue_script( 'visualizer-datatables' );
614 + wp_enqueue_style( 'visualizer-jquery-ui' );
615 +
616 + if ( ! Visualizer_Module::is_pro() ) {
385 617 return;
386 618 }
387 619
388 - $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
620 + $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( $chart_id );
389 621
390 - // data tables assets.
391 - wp_register_script( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
392 - wp_register_style( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css', array(), Visualizer_Plugin::VERSION );
393 - wp_register_style( 'visualizer-datatables-ui', '//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css', array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION );
394 -
395 - wp_enqueue_script( 'visualizer-datatables' );
396 - wp_enqueue_style( 'visualizer-datatables-ui' );
397 -
398 622 if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
399 623 // code mirror assets.
400 624 wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
401 625 wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
@@ -429,8 +653,25 @@
429 653 return $table_col_mapping;
430 654 }
431 655
432 656 /**
657 + * Handle permissions from the new conslidated settings sidebar.
658 + */
659 + private function handlePermissions() {
660 + if ( ! Visualizer_Module::is_pro() ) {
661 + return;
662 + }
663 +
664 + // we will not support old free and new pro.
665 + // handling new free and old pro.
666 + if ( has_action( 'visualizer_pro_handle_tab' ) ) {
667 + do_action( 'visualizer_pro_handle_tab', 'permissions', $this->_chart );
668 + } else {
669 + do_action( 'visualizer_handle_permissions', $this->_chart );
670 + }
671 + }
672 +
673 + /**
433 674 * Handle data and settings page
434 675 */
435 676 private function _handleDataAndSettingsPage() {
436 677 if ( isset( $_POST['map_api_key'] ) ) {
@@ -435,10 +676,11 @@
435 676 private function _handleDataAndSettingsPage() {
436 677 if ( isset( $_POST['map_api_key'] ) ) {
437 678 update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
438 679 }
439 - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
440 - if ( $this->_chart->post_status == 'auto-draft' ) {
680 +
681 + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
682 + if ( $this->_chart->post_status === 'auto-draft' ) {
441 683 $this->_chart->post_status = 'publish';
442 684
443 685 // 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.
444 686 // we do not want any difference in data so disable revisions temporarily.
@@ -447,18 +689,33 @@
447 689 }
448 690 // save meta data only when it is NOT being canceled.
449 691 if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
450 692 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
693 +
694 + // we will keep a parameter called 'internal_title' that will be set to the given title or, if empty, the chart ID
695 + // this will help in searching with the chart id.
696 + $settings = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
697 + $title = null;
698 + if ( isset( $settings['title'] ) && ! empty( $settings['title'] ) ) {
699 + $title = $settings['title'];
700 + if ( is_array( $title ) ) {
701 + $title = $settings['title']['text'];
702 + }
703 + }
704 + if ( empty( $title ) ) {
705 + $title = $this->_chart->ID;
706 + }
707 + $settings['internal_title'] = $title;
708 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
451 709 }
452 710 $render = new Visualizer_Render_Page_Send();
453 711 $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
454 712 wp_iframe( array( $render, 'render' ) );
455 -
456 713 return;
457 714 }
458 715 $data = $this->_getChartArray();
459 716 $sidebar = '';
460 - $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
717 + $sidebar_class = $this->load_chart_class_name( $this->_chart->ID );
461 718 if ( class_exists( $sidebar_class, true ) ) {
462 719 $sidebar = new $sidebar_class( $data['settings'] );
463 720 $sidebar->__series = $data['series'];
464 721 $sidebar->__data = $data['data'];
@@ -463,14 +720,14 @@
463 720 $sidebar->__series = $data['series'];
464 721 $sidebar->__data = $data['data'];
465 722 } else {
466 723 $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
467 - if ( $sidebar != '' ) {
724 + if ( $sidebar !== '' ) {
468 725 $sidebar->__series = $data['series'];
469 726 $sidebar->__data = $data['data'];
470 727 }
471 728 }
472 - unset( $data['settings']['width'], $data['settings']['height'] );
729 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
473 730 wp_enqueue_style( 'wp-color-picker' );
474 731 wp_enqueue_style( 'visualizer-frame' );
475 732 wp_enqueue_script( 'visualizer-preview' );
476 733 wp_enqueue_script( 'visualizer-chosen' );
@@ -475,17 +732,37 @@
475 732 wp_enqueue_script( 'visualizer-preview' );
476 733 wp_enqueue_script( 'visualizer-chosen' );
477 734 wp_enqueue_script( 'visualizer-render' );
478 735
479 - $table_col_mapping = $this->loadCodeEditorAssets();
736 + if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
737 + wp_enqueue_script( 'visualizer-editor-simple' );
738 + wp_localize_script(
739 + 'visualizer-editor-simple',
740 + 'visualizer1',
741 + array(
742 + 'ajax' => array(
743 + 'url' => admin_url( 'admin-ajax.php' ),
744 + 'nonces' => array(
745 + ),
746 + 'actions' => array(
747 + ),
748 + ),
749 + )
750 + );
751 + }
480 752
753 + $table_col_mapping = $this->loadCodeEditorAssets( $this->_chart->ID );
754 +
481 755 wp_localize_script(
482 756 'visualizer-render',
483 757 'visualizer',
484 758 array(
485 759 'l10n' => array(
486 - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
760 + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
487 761 'loading' => esc_html__( 'Loading...', 'visualizer' ),
762 + 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
763 + 'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
764 + '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' ),
488 765 ),
489 766 'charts' => array(
490 767 'canvas' => $data,
491 768 'id' => $this->_chart->ID,
@@ -496,19 +773,28 @@
496 773 'url' => admin_url( 'admin-ajax.php' ),
497 774 'nonces' => array(
498 775 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
499 776 'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ),
777 + 'json_get_roots' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION ),
778 + 'json_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION ),
779 + 'json_set_schedule' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION ),
500 780 ),
501 781 'actions' => array(
502 782 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
503 783 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA,
784 + 'json_get_roots' => Visualizer_Plugin::ACTION_JSON_GET_ROOTS,
785 + 'json_get_data' => Visualizer_Plugin::ACTION_JSON_GET_DATA,
786 + 'json_set_schedule' => Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE,
504 787 ),
505 788 ),
506 789 'db_query' => array(
507 790 'tables' => $table_col_mapping,
508 791 ),
509 - 'is_pro' => VISUALIZER_PRO,
792 + 'is_pro' => Visualizer_Module::is_pro(),
510 793 'page_type' => 'chart',
794 + 'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
795 + 'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
796 + 'is_front' => false,
511 797 )
512 798 );
513 799
514 800 $render = new Visualizer_Render_Page_Data();
@@ -516,21 +802,25 @@
516 802 $render->type = $data['type'];
517 803 $render->custom_css = $data['css'];
518 804 $render->sidebar = $sidebar;
519 805 if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
520 - $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
806 + $render->button = filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART
521 807 ? esc_html__( 'Save Chart', 'visualizer' )
522 808 : esc_html__( 'Create Chart', 'visualizer' );
523 - if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) {
809 + if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
524 810 $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
525 811 }
526 812 } else {
527 813 $render->button = esc_attr__( 'Insert Chart', 'visualizer' );
528 814 }
529 - if ( VISUALIZER_PRO ) {
815 +
816 + do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
817 +
818 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
530 819 global $Visualizer_Pro;
531 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
820 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
532 821 }
822 +
533 823 $this->_addAction( 'admin_head', 'renderFlattrScript' );
534 824 wp_iframe( array( $render, 'render' ) );
535 825 }
536 826
@@ -542,13 +832,21 @@
542 832 * @access private
543 833 */
544 834 private function _handleTypesPage() {
545 835 // process post request
546 - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
836 + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
547 837 $type = filter_input( INPUT_POST, 'type' );
548 - if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
838 + $library = filter_input( INPUT_POST, 'chart-library' );
839 + if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
840 + if ( empty( $library ) ) {
841 + // library cannot be empty.
842 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
843 + return;
844 + }
845 +
549 846 // save new chart type
550 847 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
848 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, $library );
551 849 // if the chart has default data, update it with appropriate default data for new type
552 850 if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
553 851 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
554 852 $source->fetch();
@@ -555,8 +853,11 @@
555 853 $this->_chart->post_content = $source->getData();
556 854 wp_update_post( $this->_chart->to_array() );
557 855 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
558 856 }
857 +
858 + Visualizer_Module_Utility::set_defaults( $this->_chart );
859 +
559 860 // redirect to next tab
560 861 // changed by Ash/Upwork
561 862 wp_redirect( add_query_arg( 'tab', 'settings' ) );
562 863
@@ -564,9 +865,9 @@
564 865 }
565 866 }
566 867 $render = new Visualizer_Render_Page_Types();
567 868 $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
568 - $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
869 + $render->types = Visualizer_Module_Admin::_getChartTypesLocalized( false, false, false, 'types' );
569 870 $render->chart = $this->_chart;
570 871 wp_enqueue_style( 'visualizer-frame' );
571 872 wp_enqueue_script( 'visualizer-frame' );
572 873 wp_iframe( array( $render, 'render' ) );
@@ -582,10 +883,123 @@
582 883 */
583 884 public function renderFlattrScript() {
584 885 echo '';
585 886 }
586 - // changed by Ash/Upwork
887 +
587 888 /**
889 + * Processes the CSV that is sent in the request as a string.
890 + *
891 + * @since 3.2.0
892 + */
893 + private function handleCSVasString( $data, $editor_type ) {
894 + $source = null;
895 +
896 + switch ( $editor_type ) {
897 + case 'text':
898 + // data coming in from the text editor.
899 + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
900 + $handle = fopen( $tmpfile, 'w' );
901 + $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
902 + if ( $values ) {
903 + foreach ( $values as $row ) {
904 + if ( empty( $row ) ) {
905 + continue;
906 + }
907 + // don't use fpucsv here because we need to just dump the data
908 + // minus the empty rows
909 + // because fputcsv needs to tokenize
910 + // we can standardize the CSV enclosure here and replace all ' with "
911 + // we can assume that if there are an even number of ' they should be changed to "
912 + // but that will screw up words like fo'c'sle
913 + // so here let's just assume ' will NOT be used for enclosures
914 + fwrite( $handle, $row );
915 + fwrite( $handle, PHP_EOL );
916 + }
917 + }
918 + $source = new Visualizer_Source_Csv( $tmpfile );
919 + fclose( $handle );
920 + break;
921 + case 'table':
922 + // Import from Chart
923 + // fall-through.
924 + case 'excel':
925 + // data coming in from the excel editor.
926 + $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
927 + break;
928 + }
929 + return $source;
930 + }
931 +
932 + /**
933 + * Parses the data uploaded as an HTML table.
934 + *
935 + * @since 3.2.0
936 + *
937 + * @access private
938 + */
939 + private function handleTabularData() {
940 + $csv = array();
941 + // the datatable mentions the headers twice, so lets remove the duplicates.
942 + $headers = array_unique( array_filter( $_POST['header'] ) );
943 + $types = $_POST['type'];
944 +
945 + // capture all the indexes that correspond to excluded columns.
946 + $exclude = array();
947 + $index = 0;
948 + foreach ( $types as $type ) {
949 + if ( empty( $type ) ) {
950 + $exclude[] = $index;
951 + }
952 + $index++;
953 + }
954 +
955 + // when N headers are being renamed, the number of headers increases by N
956 + // because of the way datatable duplicates header information
957 + // so unset the headers that have been renamed.
958 + if ( count( $headers ) !== count( $types ) ) {
959 + $to = count( $headers );
960 + for ( $i = count( $types ); $i < $to; $i++ ) {
961 + unset( $headers[ $i + 1 ] );
962 + }
963 + }
964 +
965 + $columns = array();
966 + for ( $i = 0; $i < count( $headers ); $i++ ) {
967 + if ( ! isset( $_POST[ 'data' . $i ] ) ) {
968 + continue;
969 + }
970 + $columns[ $i ] = $_POST[ 'data' . $i ];
971 + }
972 +
973 + $csv[] = $headers;
974 + $csv[] = $types;
975 + for ( $j = 0; $j < count( $columns[0] ); $j++ ) {
976 + $row = array();
977 + for ( $i = 0; $i < count( $headers ); $i++ ) {
978 + $row[] = sanitize_text_field( $columns[ $i ][ $j ] );
979 + }
980 + $csv[] = $row;
981 + }
982 +
983 + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
984 + $handle = fopen( $tmpfile, 'w' );
985 +
986 + if ( $csv ) {
987 + $index = 0;
988 + foreach ( $csv as $row ) {
989 + // remove all the cells corresponding to the excluded headers.
990 + foreach ( $exclude as $j ) {
991 + unset( $row[ $j ] );
992 + }
993 + fputcsv( $handle, $row );
994 + }
995 + }
996 + $source = new Visualizer_Source_Csv( $tmpfile );
997 + fclose( $handle );
998 + return $source;
999 + }
1000 +
1001 + /**
588 1002 * Parses uploaded CSV file and saves new data for the chart.
589 1003 *
590 1004 * @since 1.0.0
591 1005 *
@@ -607,9 +1021,9 @@
607 1021
608 1022 // check chart, if chart exists
609 1023 // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
610 1024 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
611 - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
1025 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
612 1026 if ( ! $can_die ) {
613 1027 return;
614 1028 }
615 1029 status_header( 400 );
@@ -615,8 +1029,10 @@
615 1029 status_header( 400 );
616 1030 exit;
617 1031 }
618 1032
1033 + 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__ );
1034 +
619 1035 if ( ! isset( $_POST['vz-import-time'] ) ) {
620 1036 apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
621 1037 }
622 1038
@@ -628,10 +1044,23 @@
628 1044
629 1045 // delete "import from db" specific parameters.
630 1046 delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
631 1047 delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
1048 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS );
632 1049 }
633 1050
1051 + // delete json related data.
1052 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
1053 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT );
1054 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING );
1055 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_HEADERS );
1056 +
1057 + // delete last error
1058 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
1059 +
1060 + // delete editor related data.
1061 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR );
1062 +
634 1063 $source = null;
635 1064 $render = new Visualizer_Render_Page_Update();
636 1065 if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
637 1066 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
@@ -637,15 +1066,25 @@
637 1066 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
638 1067 if ( isset( $_POST['vz-import-time'] ) ) {
639 1068 apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
640 1069 }
1070 + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
641 1071 } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
642 1072 $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
643 1073 } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
644 - $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '', $chart_id, $_POST );
1074 + $source = $this->handleCSVasString( $_POST['chart_data'], $_POST['editor-type'] );
1075 + update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
1076 + } elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
1077 + $source = $this->handleTabularData();
1078 + update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
645 1079 } else {
646 - $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
1080 + 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__ );
1081 + $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' );
1082 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' ) );
647 1083 }
1084 +
1085 + 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__ );
1086 +
648 1087 if ( $source ) {
649 1088 if ( $source->fetch() ) {
650 1089 $content = $source->getData();
651 1090 $populate = true;
@@ -654,8 +1093,9 @@
654 1093 // if source exists, so should data. if source exists but data is blank, do not populate the chart.
655 1094 // if we populate the data even if it is empty, the chart will show "Table has no columns".
656 1095 if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
657 1096 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__ );
1097 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Not populating chart data as source exists (%s) but data is empty!', $json['source'] ) );
658 1098 $populate = false;
659 1099 }
660 1100 }
661 1101 if ( $populate ) {
@@ -664,14 +1104,30 @@
664 1104 wp_update_post( $chart->to_array() );
665 1105 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
666 1106 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
667 1107 update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1108 +
1109 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Updated post for chart %d', $chart_id ), 'debug', __FILE__, __LINE__ );
1110 +
1111 + Visualizer_Module_Utility::set_defaults( $chart, null );
1112 +
1113 + $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
1114 +
668 1115 $render->id = $chart->ID;
669 1116 $render->data = json_encode( $source->getRawData() );
670 1117 $render->series = json_encode( $source->getSeries() );
1118 + $render->settings = json_encode( $settings );
671 1119 } else {
672 - $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
1120 + $error = $source->get_error();
1121 + if ( empty( $error ) ) {
1122 + $error = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' );
1123 + }
1124 + $render->message = $error;
1125 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( '%s for chart %d.', $error, $chart_id ), 'error', __FILE__, __LINE__ );
1126 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, $error );
673 1127 }
1128 + } else {
1129 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unknown internal error for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
674 1130 }
675 1131 $render->render();
676 1132 if ( ! $can_die ) {
677 1133 return;
@@ -687,27 +1143,18 @@
687 1143 * @access public
688 1144 */
689 1145 public function cloneChart() {
690 1146 $chart_id = $success = false;
691 - $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
1147 + $nonce = isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'], Visualizer_Plugin::ACTION_CLONE_CHART );
692 1148 $capable = current_user_can( 'edit_posts' );
693 1149 if ( $nonce && $capable ) {
694 - $chart_id = filter_input(
695 - INPUT_GET,
696 - 'chart',
697 - FILTER_VALIDATE_INT,
698 - array(
699 - 'options' => array(
700 - 'min_range' => 1,
701 - ),
702 - )
703 - );
1150 + $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
704 1151 if ( $chart_id ) {
705 1152 $chart = get_post( $chart_id );
706 - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
1153 + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
707 1154 }
708 1155 }
709 - $redirect = wp_get_referer();
1156 + $redirect = remove_query_arg( 'vaction', wp_get_referer() );
710 1157 if ( $success ) {
711 1158 $new_chart_id = wp_insert_post(
712 1159 array(
713 1160 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
@@ -716,23 +1163,32 @@
716 1163 'post_status' => $chart->post_status,
717 1164 'post_content' => $chart->post_content,
718 1165 )
719 1166 );
720 - if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
721 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
722 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
723 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
724 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
725 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) );
1167 + if ( is_wp_error( $new_chart_id ) ) {
1168 + 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__ );
1169 + } else {
1170 + $post_meta = get_post_meta( $chart_id );
1171 + foreach ( $post_meta as $key => $value ) {
1172 + if ( strpos( $key, 'visualizer-' ) !== false ) {
1173 + add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
1174 + }
1175 + }
726 1176 $redirect = add_query_arg(
727 1177 array(
728 1178 'page' => 'visualizer',
729 1179 'type' => filter_input( INPUT_GET, 'type' ),
1180 + 'vaction' => false,
730 1181 ),
731 - admin_url( 'upload.php' )
1182 + admin_url( 'admin.php' )
732 1183 );
733 1184 }
734 1185 }
1186 +
1187 + if ( defined( 'WP_TESTS_DOMAIN' ) ) {
1188 + wp_die();
1189 + }
1190 +
735 1191 wp_redirect( $redirect );
736 1192 exit;
737 1193 }
738 1194
@@ -778,9 +1234,12 @@
778 1234 $data = $this->_getChartArray();
779 1235 $render = new Visualizer_Render_Page_Data();
780 1236 $render->chart = $this->_chart;
781 1237 $render->type = $data['type'];
782 - unset( $data['settings']['width'], $data['settings']['height'] );
1238 +
1239 + if ( $data && $data['settings'] ) {
1240 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
1241 + }
783 1242 wp_enqueue_style( 'visualizer-frame' );
784 1243 wp_enqueue_script( 'visualizer-render' );
785 1244 wp_localize_script(
786 1245 'visualizer-render',
@@ -786,9 +1245,9 @@
786 1245 'visualizer-render',
787 1246 'visualizer',
788 1247 array(
789 1248 'l10n' => array(
790 - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
1249 + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
791 1250 'loading' => esc_html__( 'Loading...', 'visualizer' ),
792 1251 ),
793 1252 'charts' => array(
794 1253 'canvas' => $data,
@@ -794,13 +1253,16 @@
794 1253 'canvas' => $data,
795 1254 ),
796 1255 )
797 1256 );
798 - // Added by Ash/Upwork
799 - if ( VISUALIZER_PRO ) {
1257 +
1258 + do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
1259 +
1260 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
800 1261 global $Visualizer_Pro;
801 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
1262 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
802 1263 }
1264 +
803 1265 // Added by Ash/Upwork
804 1266 $this->_addAction( 'admin_head', 'renderFlattrScript' );
805 1267 wp_iframe( array( $render, 'render' ) );
806 1268 }
@@ -813,13 +1275,14 @@
813 1275 public function getQueryData() {
814 1276 check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
815 1277
816 1278 $params = wp_parse_args( $_POST['params'] );
817 - $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1279 + $chart_id = filter_var( $params['chart_id'], FILTER_VALIDATE_INT );
1280 +
1281 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
818 1282 $html = $source->fetch( true );
819 - $error = '';
820 - if ( empty( $html ) ) {
821 - $error = $source->get_error();
1283 + $error = $source->get_error();
1284 + if ( ! empty( $error ) ) {
822 1285 wp_send_json_error( array( 'msg' => $error ) );
823 1286 }
824 1287 wp_send_json_success( array( 'table' => $html ) );
825 1288 }
@@ -842,21 +1305,42 @@
842 1305 ),
843 1306 )
844 1307 );
845 1308
1309 + $hours = filter_input(
1310 + INPUT_POST,
1311 + 'refresh',
1312 + FILTER_VALIDATE_INT,
1313 + array(
1314 + 'options' => array(
1315 + 'min_range' => -1,
1316 + 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1317 + ),
1318 + )
1319 + );
1320 +
1321 + if ( ! is_int( $hours ) ) {
1322 + $hours = -1;
1323 + }
1324 +
846 1325 $render = new Visualizer_Render_Page_Update();
847 1326 if ( $chart_id ) {
848 1327 $params = wp_parse_args( $_POST['params'] );
849 - $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1328 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
850 1329 $source->fetch( false );
851 1330 $error = $source->get_error();
852 1331 if ( empty( $error ) ) {
853 - $hours = $_POST['refresh'];
854 1332 update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
855 1333 update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
856 1334 update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
857 1335 update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
858 1336 update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1337 + if ( isset( $params['db_type'] ) && $params['db_type'] !== Visualizer_Plugin::WP_DB_NAME ) {
1338 + $remote_db_params = $params;
1339 + unset( $remote_db_params['query'] );
1340 + unset( $remote_db_params['chart_id'] );
1341 + update_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS, $remote_db_params );
1342 + }
859 1343
860 1344 $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
861 1345 $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
862 1346 update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
@@ -868,8 +1352,9 @@
868 1352 )
869 1353 );
870 1354 $render->data = json_encode( $source->getRawData() );
871 1355 $render->series = json_encode( $source->getSeries() );
1356 + $render->id = $chart_id;
872 1357 } else {
873 1358 $render->message = $error;
874 1359 }
875 1360 }
@@ -898,9 +1383,23 @@
898 1383 ),
899 1384 )
900 1385 );
901 1386
902 - $hours = $_POST['refresh'];
1387 + $hours = filter_input(
1388 + INPUT_POST,
1389 + 'refresh',
1390 + FILTER_VALIDATE_INT,
1391 + array(
1392 + 'options' => array(
1393 + 'min_range' => -1,
1394 + 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1395 + ),
1396 + )
1397 + );
1398 +
1399 + if ( ! $hours ) {
1400 + $hours = -1;
1401 + }
903 1402
904 1403 do_action( 'visualizer_save_filter', $chart_id, $hours );
905 1404
906 1405 if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {