PluginProbe
Visualizer – Tables & Charts Manager with Built-in AI Generator / 3.4.4
Visualizer – Tables & Charts Manager with Built-in AI Generator v3.4.4
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 +577 -77 3.1.3 → 3.4.4 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,30 +676,47 @@
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.
445 - add_filter( 'wp_revisions_to_keep', '__return_false' );
687 + $this->disableRevisionsTemporarily();
688 +
446 689 wp_update_post( $this->_chart->to_array() );
447 690 }
448 691 // save meta data only when it is NOT being canceled.
449 692 if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
450 693 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
694 +
695 + // we will keep a parameter called 'internal_title' that will be set to the given title or, if empty, the chart ID
696 + // this will help in searching with the chart id.
697 + $settings = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
698 + $title = null;
699 + if ( isset( $settings['title'] ) && ! empty( $settings['title'] ) ) {
700 + $title = $settings['title'];
701 + if ( is_array( $title ) ) {
702 + $title = $settings['title']['text'];
703 + }
704 + }
705 + if ( empty( $title ) ) {
706 + $title = $this->_chart->ID;
707 + }
708 + $settings['internal_title'] = $title;
709 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
451 710 }
452 711 $render = new Visualizer_Render_Page_Send();
453 712 $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
454 713 wp_iframe( array( $render, 'render' ) );
455 -
456 714 return;
457 715 }
458 716 $data = $this->_getChartArray();
459 717 $sidebar = '';
460 - $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
718 + $sidebar_class = $this->load_chart_class_name( $this->_chart->ID );
461 719 if ( class_exists( $sidebar_class, true ) ) {
462 720 $sidebar = new $sidebar_class( $data['settings'] );
463 721 $sidebar->__series = $data['series'];
464 722 $sidebar->__data = $data['data'];
@@ -463,14 +721,14 @@
463 721 $sidebar->__series = $data['series'];
464 722 $sidebar->__data = $data['data'];
465 723 } else {
466 724 $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
467 - if ( $sidebar != '' ) {
725 + if ( $sidebar !== '' ) {
468 726 $sidebar->__series = $data['series'];
469 727 $sidebar->__data = $data['data'];
470 728 }
471 729 }
472 - unset( $data['settings']['width'], $data['settings']['height'] );
730 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
473 731 wp_enqueue_style( 'wp-color-picker' );
474 732 wp_enqueue_style( 'visualizer-frame' );
475 733 wp_enqueue_script( 'visualizer-preview' );
476 734 wp_enqueue_script( 'visualizer-chosen' );
@@ -475,17 +733,37 @@
475 733 wp_enqueue_script( 'visualizer-preview' );
476 734 wp_enqueue_script( 'visualizer-chosen' );
477 735 wp_enqueue_script( 'visualizer-render' );
478 736
479 - $table_col_mapping = $this->loadCodeEditorAssets();
737 + if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
738 + wp_enqueue_script( 'visualizer-editor-simple' );
739 + wp_localize_script(
740 + 'visualizer-editor-simple',
741 + 'visualizer1',
742 + array(
743 + 'ajax' => array(
744 + 'url' => admin_url( 'admin-ajax.php' ),
745 + 'nonces' => array(
746 + ),
747 + 'actions' => array(
748 + ),
749 + ),
750 + )
751 + );
752 + }
480 753
754 + $table_col_mapping = $this->loadCodeEditorAssets( $this->_chart->ID );
755 +
481 756 wp_localize_script(
482 757 'visualizer-render',
483 758 'visualizer',
484 759 array(
485 760 'l10n' => array(
486 - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
761 + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
487 762 'loading' => esc_html__( 'Loading...', 'visualizer' ),
763 + 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
764 + 'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
765 + '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 766 ),
489 767 'charts' => array(
490 768 'canvas' => $data,
491 769 'id' => $this->_chart->ID,
@@ -496,19 +774,28 @@
496 774 'url' => admin_url( 'admin-ajax.php' ),
497 775 'nonces' => array(
498 776 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
499 777 'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ),
778 + 'json_get_roots' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION ),
779 + 'json_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION ),
780 + 'json_set_schedule' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION ),
500 781 ),
501 782 'actions' => array(
502 783 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
503 784 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA,
785 + 'json_get_roots' => Visualizer_Plugin::ACTION_JSON_GET_ROOTS,
786 + 'json_get_data' => Visualizer_Plugin::ACTION_JSON_GET_DATA,
787 + 'json_set_schedule' => Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE,
504 788 ),
505 789 ),
506 790 'db_query' => array(
507 791 'tables' => $table_col_mapping,
508 792 ),
509 - 'is_pro' => VISUALIZER_PRO,
793 + 'is_pro' => Visualizer_Module::is_pro(),
510 794 'page_type' => 'chart',
795 + 'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
796 + 'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
797 + 'is_front' => false,
511 798 )
512 799 );
513 800
514 801 $render = new Visualizer_Render_Page_Data();
@@ -516,21 +803,25 @@
516 803 $render->type = $data['type'];
517 804 $render->custom_css = $data['css'];
518 805 $render->sidebar = $sidebar;
519 806 if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
520 - $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
807 + $render->button = filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART
521 808 ? esc_html__( 'Save Chart', 'visualizer' )
522 809 : esc_html__( 'Create Chart', 'visualizer' );
523 - if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) {
810 + if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
524 811 $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
525 812 }
526 813 } else {
527 814 $render->button = esc_attr__( 'Insert Chart', 'visualizer' );
528 815 }
529 - if ( VISUALIZER_PRO ) {
816 +
817 + do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
818 +
819 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
530 820 global $Visualizer_Pro;
531 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
821 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
532 822 }
823 +
533 824 $this->_addAction( 'admin_head', 'renderFlattrScript' );
534 825 wp_iframe( array( $render, 'render' ) );
535 826 }
536 827
@@ -542,13 +833,21 @@
542 833 * @access private
543 834 */
544 835 private function _handleTypesPage() {
545 836 // process post request
546 - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
837 + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
547 838 $type = filter_input( INPUT_POST, 'type' );
548 - if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
839 + $library = filter_input( INPUT_POST, 'chart-library' );
840 + if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
841 + if ( empty( $library ) ) {
842 + // library cannot be empty.
843 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
844 + return;
845 + }
846 +
549 847 // save new chart type
550 848 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
849 + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, $library );
551 850 // if the chart has default data, update it with appropriate default data for new type
552 851 if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
553 852 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
554 853 $source->fetch();
@@ -555,8 +854,11 @@
555 854 $this->_chart->post_content = $source->getData();
556 855 wp_update_post( $this->_chart->to_array() );
557 856 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
558 857 }
858 +
859 + Visualizer_Module_Utility::set_defaults( $this->_chart );
860 +
559 861 // redirect to next tab
560 862 // changed by Ash/Upwork
561 863 wp_redirect( add_query_arg( 'tab', 'settings' ) );
562 864
@@ -564,9 +866,9 @@
564 866 }
565 867 }
566 868 $render = new Visualizer_Render_Page_Types();
567 869 $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
568 - $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
870 + $render->types = Visualizer_Module_Admin::_getChartTypesLocalized( false, false, false, 'types' );
569 871 $render->chart = $this->_chart;
570 872 wp_enqueue_style( 'visualizer-frame' );
571 873 wp_enqueue_script( 'visualizer-frame' );
572 874 wp_iframe( array( $render, 'render' ) );
@@ -582,10 +884,123 @@
582 884 */
583 885 public function renderFlattrScript() {
584 886 echo '';
585 887 }
586 - // changed by Ash/Upwork
888 +
587 889 /**
890 + * Processes the CSV that is sent in the request as a string.
891 + *
892 + * @since 3.2.0
893 + */
894 + private function handleCSVasString( $data, $editor_type ) {
895 + $source = null;
896 +
897 + switch ( $editor_type ) {
898 + case 'text':
899 + // data coming in from the text editor.
900 + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
901 + $handle = fopen( $tmpfile, 'w' );
902 + $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
903 + if ( $values ) {
904 + foreach ( $values as $row ) {
905 + if ( empty( $row ) ) {
906 + continue;
907 + }
908 + // don't use fpucsv here because we need to just dump the data
909 + // minus the empty rows
910 + // because fputcsv needs to tokenize
911 + // we can standardize the CSV enclosure here and replace all ' with "
912 + // we can assume that if there are an even number of ' they should be changed to "
913 + // but that will screw up words like fo'c'sle
914 + // so here let's just assume ' will NOT be used for enclosures
915 + fwrite( $handle, $row );
916 + fwrite( $handle, PHP_EOL );
917 + }
918 + }
919 + $source = new Visualizer_Source_Csv( $tmpfile );
920 + fclose( $handle );
921 + break;
922 + case 'table':
923 + // Import from Chart
924 + // fall-through.
925 + case 'excel':
926 + // data coming in from the excel editor.
927 + $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
928 + break;
929 + }
930 + return $source;
931 + }
932 +
933 + /**
934 + * Parses the data uploaded as an HTML table.
935 + *
936 + * @since 3.2.0
937 + *
938 + * @access private
939 + */
940 + private function handleTabularData() {
941 + $csv = array();
942 + // the datatable mentions the headers twice, so lets remove the duplicates.
943 + $headers = array_unique( array_filter( $_POST['header'] ) );
944 + $types = $_POST['type'];
945 +
946 + // capture all the indexes that correspond to excluded columns.
947 + $exclude = array();
948 + $index = 0;
949 + foreach ( $types as $type ) {
950 + if ( empty( $type ) ) {
951 + $exclude[] = $index;
952 + }
953 + $index++;
954 + }
955 +
956 + // when N headers are being renamed, the number of headers increases by N
957 + // because of the way datatable duplicates header information
958 + // so unset the headers that have been renamed.
959 + if ( count( $headers ) !== count( $types ) ) {
960 + $to = count( $headers );
961 + for ( $i = count( $types ); $i < $to; $i++ ) {
962 + unset( $headers[ $i + 1 ] );
963 + }
964 + }
965 +
966 + $columns = array();
967 + for ( $i = 0; $i < count( $headers ); $i++ ) {
968 + if ( ! isset( $_POST[ 'data' . $i ] ) ) {
969 + continue;
970 + }
971 + $columns[ $i ] = $_POST[ 'data' . $i ];
972 + }
973 +
974 + $csv[] = $headers;
975 + $csv[] = $types;
976 + for ( $j = 0; $j < count( $columns[0] ); $j++ ) {
977 + $row = array();
978 + for ( $i = 0; $i < count( $headers ); $i++ ) {
979 + $row[] = sanitize_text_field( $columns[ $i ][ $j ] );
980 + }
981 + $csv[] = $row;
982 + }
983 +
984 + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
985 + $handle = fopen( $tmpfile, 'w' );
986 +
987 + if ( $csv ) {
988 + $index = 0;
989 + foreach ( $csv as $row ) {
990 + // remove all the cells corresponding to the excluded headers.
991 + foreach ( $exclude as $j ) {
992 + unset( $row[ $j ] );
993 + }
994 + fputcsv( $handle, $row );
995 + }
996 + }
997 + $source = new Visualizer_Source_Csv( $tmpfile );
998 + fclose( $handle );
999 + return $source;
1000 + }
1001 +
1002 + /**
588 1003 * Parses uploaded CSV file and saves new data for the chart.
589 1004 *
590 1005 * @since 1.0.0
591 1006 *
@@ -607,9 +1022,9 @@
607 1022
608 1023 // check chart, if chart exists
609 1024 // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
610 1025 $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 ) {
1026 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
612 1027 if ( ! $can_die ) {
613 1028 return;
614 1029 }
615 1030 status_header( 400 );
@@ -615,8 +1030,10 @@
615 1030 status_header( 400 );
616 1031 exit;
617 1032 }
618 1033
1034 + 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__ );
1035 +
619 1036 if ( ! isset( $_POST['vz-import-time'] ) ) {
620 1037 apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
621 1038 }
622 1039
@@ -628,10 +1045,23 @@
628 1045
629 1046 // delete "import from db" specific parameters.
630 1047 delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
631 1048 delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
1049 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS );
632 1050 }
633 1051
1052 + // delete json related data.
1053 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
1054 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT );
1055 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING );
1056 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_HEADERS );
1057 +
1058 + // delete last error
1059 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
1060 +
1061 + // delete editor related data.
1062 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR );
1063 +
634 1064 $source = null;
635 1065 $render = new Visualizer_Render_Page_Update();
636 1066 if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
637 1067 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
@@ -637,15 +1067,25 @@
637 1067 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
638 1068 if ( isset( $_POST['vz-import-time'] ) ) {
639 1069 apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
640 1070 }
1071 + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
641 1072 } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
642 1073 $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
643 1074 } 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 );
1075 + $source = $this->handleCSVasString( $_POST['chart_data'], $_POST['editor-type'] );
1076 + update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
1077 + } elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
1078 + $source = $this->handleTabularData();
1079 + update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
645 1080 } else {
646 - $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
1081 + 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__ );
1082 + $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' );
1083 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' ) );
647 1084 }
1085 +
1086 + 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__ );
1087 +
648 1088 if ( $source ) {
649 1089 if ( $source->fetch() ) {
650 1090 $content = $source->getData();
651 1091 $populate = true;
@@ -654,8 +1094,9 @@
654 1094 // if source exists, so should data. if source exists but data is blank, do not populate the chart.
655 1095 // if we populate the data even if it is empty, the chart will show "Table has no columns".
656 1096 if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
657 1097 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__ );
1098 + 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 1099 $populate = false;
659 1100 }
660 1101 }
661 1102 if ( $populate ) {
@@ -664,14 +1105,30 @@
664 1105 wp_update_post( $chart->to_array() );
665 1106 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
666 1107 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
667 1108 update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1109 +
1110 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Updated post for chart %d', $chart_id ), 'debug', __FILE__, __LINE__ );
1111 +
1112 + Visualizer_Module_Utility::set_defaults( $chart, null );
1113 +
1114 + $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
1115 +
668 1116 $render->id = $chart->ID;
669 1117 $render->data = json_encode( $source->getRawData() );
670 1118 $render->series = json_encode( $source->getSeries() );
1119 + $render->settings = json_encode( $settings );
671 1120 } else {
672 - $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
1121 + $error = $source->get_error();
1122 + if ( empty( $error ) ) {
1123 + $error = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' );
1124 + }
1125 + $render->message = $error;
1126 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( '%s for chart %d.', $error, $chart_id ), 'error', __FILE__, __LINE__ );
1127 + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, $error );
673 1128 }
1129 + } else {
1130 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unknown internal error for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
674 1131 }
675 1132 $render->render();
676 1133 if ( ! $can_die ) {
677 1134 return;
@@ -687,27 +1144,18 @@
687 1144 * @access public
688 1145 */
689 1146 public function cloneChart() {
690 1147 $chart_id = $success = false;
691 - $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
1148 + $nonce = isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'], Visualizer_Plugin::ACTION_CLONE_CHART );
692 1149 $capable = current_user_can( 'edit_posts' );
693 1150 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 - );
1151 + $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
704 1152 if ( $chart_id ) {
705 1153 $chart = get_post( $chart_id );
706 - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
1154 + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
707 1155 }
708 1156 }
709 - $redirect = wp_get_referer();
1157 + $redirect = remove_query_arg( 'vaction', wp_get_referer() );
710 1158 if ( $success ) {
711 1159 $new_chart_id = wp_insert_post(
712 1160 array(
713 1161 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
@@ -716,23 +1164,32 @@
716 1164 'post_status' => $chart->post_status,
717 1165 'post_content' => $chart->post_content,
718 1166 )
719 1167 );
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 ) );
1168 + if ( is_wp_error( $new_chart_id ) ) {
1169 + 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__ );
1170 + } else {
1171 + $post_meta = get_post_meta( $chart_id );
1172 + foreach ( $post_meta as $key => $value ) {
1173 + if ( strpos( $key, 'visualizer-' ) !== false ) {
1174 + add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
1175 + }
1176 + }
726 1177 $redirect = add_query_arg(
727 1178 array(
728 1179 'page' => 'visualizer',
729 1180 'type' => filter_input( INPUT_GET, 'type' ),
1181 + 'vaction' => false,
730 1182 ),
731 - admin_url( 'upload.php' )
1183 + admin_url( 'admin.php' )
732 1184 );
733 1185 }
734 1186 }
1187 +
1188 + if ( defined( 'WP_TESTS_DOMAIN' ) ) {
1189 + wp_die();
1190 + }
1191 +
735 1192 wp_redirect( $redirect );
736 1193 exit;
737 1194 }
738 1195
@@ -778,9 +1235,12 @@
778 1235 $data = $this->_getChartArray();
779 1236 $render = new Visualizer_Render_Page_Data();
780 1237 $render->chart = $this->_chart;
781 1238 $render->type = $data['type'];
782 - unset( $data['settings']['width'], $data['settings']['height'] );
1239 +
1240 + if ( $data && $data['settings'] ) {
1241 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
1242 + }
783 1243 wp_enqueue_style( 'visualizer-frame' );
784 1244 wp_enqueue_script( 'visualizer-render' );
785 1245 wp_localize_script(
786 1246 'visualizer-render',
@@ -786,9 +1246,9 @@
786 1246 'visualizer-render',
787 1247 'visualizer',
788 1248 array(
789 1249 'l10n' => array(
790 - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
1250 + 'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
791 1251 'loading' => esc_html__( 'Loading...', 'visualizer' ),
792 1252 ),
793 1253 'charts' => array(
794 1254 'canvas' => $data,
@@ -794,13 +1254,16 @@
794 1254 'canvas' => $data,
795 1255 ),
796 1256 )
797 1257 );
798 - // Added by Ash/Upwork
799 - if ( VISUALIZER_PRO ) {
1258 +
1259 + do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
1260 +
1261 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
800 1262 global $Visualizer_Pro;
801 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
1263 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
802 1264 }
1265 +
803 1266 // Added by Ash/Upwork
804 1267 $this->_addAction( 'admin_head', 'renderFlattrScript' );
805 1268 wp_iframe( array( $render, 'render' ) );
806 1269 }
@@ -813,13 +1276,14 @@
813 1276 public function getQueryData() {
814 1277 check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
815 1278
816 1279 $params = wp_parse_args( $_POST['params'] );
817 - $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1280 + $chart_id = filter_var( $params['chart_id'], FILTER_VALIDATE_INT );
1281 +
1282 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
818 1283 $html = $source->fetch( true );
819 - $error = '';
820 - if ( empty( $html ) ) {
821 - $error = $source->get_error();
1284 + $error = $source->get_error();
1285 + if ( ! empty( $error ) ) {
822 1286 wp_send_json_error( array( 'msg' => $error ) );
823 1287 }
824 1288 wp_send_json_success( array( 'table' => $html ) );
825 1289 }
@@ -842,21 +1306,42 @@
842 1306 ),
843 1307 )
844 1308 );
845 1309
1310 + $hours = filter_input(
1311 + INPUT_POST,
1312 + 'refresh',
1313 + FILTER_VALIDATE_INT,
1314 + array(
1315 + 'options' => array(
1316 + 'min_range' => -1,
1317 + 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1318 + ),
1319 + )
1320 + );
1321 +
1322 + if ( ! is_int( $hours ) ) {
1323 + $hours = -1;
1324 + }
1325 +
846 1326 $render = new Visualizer_Render_Page_Update();
847 1327 if ( $chart_id ) {
848 1328 $params = wp_parse_args( $_POST['params'] );
849 - $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1329 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
850 1330 $source->fetch( false );
851 1331 $error = $source->get_error();
852 1332 if ( empty( $error ) ) {
853 - $hours = $_POST['refresh'];
854 1333 update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
855 1334 update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
856 1335 update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
857 1336 update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
858 1337 update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1338 + if ( isset( $params['db_type'] ) && $params['db_type'] !== Visualizer_Plugin::WP_DB_NAME ) {
1339 + $remote_db_params = $params;
1340 + unset( $remote_db_params['query'] );
1341 + unset( $remote_db_params['chart_id'] );
1342 + update_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS, $remote_db_params );
1343 + }
859 1344
860 1345 $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
861 1346 $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
862 1347 update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
@@ -868,8 +1353,9 @@
868 1353 )
869 1354 );
870 1355 $render->data = json_encode( $source->getRawData() );
871 1356 $render->series = json_encode( $source->getSeries() );
1357 + $render->id = $chart_id;
872 1358 } else {
873 1359 $render->message = $error;
874 1360 }
875 1361 }
@@ -898,9 +1384,23 @@
898 1384 ),
899 1385 )
900 1386 );
901 1387
902 - $hours = $_POST['refresh'];
1388 + $hours = filter_input(
1389 + INPUT_POST,
1390 + 'refresh',
1391 + FILTER_VALIDATE_INT,
1392 + array(
1393 + 'options' => array(
1394 + 'min_range' => -1,
1395 + 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1396 + ),
1397 + )
1398 + );
1399 +
1400 + if ( ! $hours ) {
1401 + $hours = -1;
1402 + }
903 1403
904 1404 do_action( 'visualizer_save_filter', $chart_id, $hours );
905 1405
906 1406 if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {