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 +889 -81 3.0.7 → 3.4.4 View file →
@@ -56,16 +56,230 @@
56 56 $this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' );
57 57 $this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
58 58 $this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' );
59 59 $this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' );
60 - // Added by Ash/Upwork
61 60 $this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
62 - // Added by Ash/Upwork
61 +
62 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_FETCH_DB_DATA, 'getQueryData' );
63 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_DB_QUERY, 'saveQuery' );
64 +
65 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_ROOTS, 'getJsonRoots' );
66 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_DATA, 'getJsonData' );
67 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_DATA, 'setJsonData' );
68 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE, 'setJsonSchedule' );
69 +
70 + $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
71 +
72 + $this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 );
73 +
63 74 }
64 75
65 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 + /**
66 278 * Fetches charts from database.
67 279 *
280 + * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content).
281 + *
68 282 * @since 1.0.0
69 283 *
70 284 * @access public
71 285 */
@@ -73,9 +287,12 @@
73 287 $query_args = array(
74 288 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
75 289 'posts_per_page' => 9,
76 290 'paged' => filter_input(
77 - INPUT_GET, 'page', FILTER_VALIDATE_INT, array(
291 + INPUT_GET,
292 + 'page',
293 + FILTER_VALIDATE_INT,
294 + array(
78 295 'options' => array(
79 296 'min_range' => 1,
80 297 'default' => 1,
81 298 ),
@@ -87,9 +304,9 @@
87 304 // 'filter' is from the modal from the add media button.
88 305 $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
89 306 }
90 307
91 - if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
308 + if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
92 309 $query_args['meta_query'] = array(
93 310 array(
94 311 'key' => Visualizer_Plugin::CF_CHART_TYPE,
95 312 'value' => $filter,
@@ -102,8 +319,18 @@
102 319 while ( $query->have_posts() ) {
103 320 $chart = $query->next_post();
104 321 $chart_data = $this->_getChartArray( $chart );
105 322 $chart_data['id'] = $chart->ID;
323 + $chart_data['library'] = $this->load_chart_type( $chart->ID );
324 + $css = '';
325 + $settings = $chart_data['settings'];
326 + $arguments = $this->get_inline_custom_css( 'visualizer-chart-' . $chart->ID, $settings );
327 + if ( ! empty( $arguments ) ) {
328 + $css = $arguments[0];
329 + $settings = $arguments[1];
330 + }
331 + $chart_data['settings'] = $settings;
332 + $chart_data['css'] = $css;
106 333 $charts[] = $chart_data;
107 334 }
108 335 self::_sendResponse(
109 336 array(
@@ -130,15 +357,34 @@
130 357 $chart = $this->_chart;
131 358 }
132 359 $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
133 360 $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
134 - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
361 + $data = self::get_chart_data( $chart, $type );
362 + $library = $this->load_chart_type( $chart->ID );
135 363
364 + $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
365 + $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
366 + if ( ! empty( $atts['settings'] ) ) {
367 + $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
368 + }
369 +
370 + $css = '';
371 + $arguments = $this->get_inline_custom_css( 'visualizer-' . $chart->ID, $settings );
372 + if ( ! empty( $arguments ) ) {
373 + $css = $arguments[0];
374 + $settings = $arguments[1];
375 + }
376 +
377 + $date_formats = Visualizer_Source::get_date_formats_if_exists( $series, $data );
378 +
136 379 return array(
137 380 'type' => $type,
138 381 'series' => $series,
139 - 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ),
382 + 'settings' => $settings,
140 383 'data' => $data,
384 + 'library' => $library,
385 + 'css' => $css,
386 + 'date_formats' => $date_formats,
141 387 );
142 388 }
143 389
144 390 /**
@@ -165,9 +411,9 @@
165 411 *
166 412 * @access public
167 413 */
168 414 public function deleteChart() {
169 - $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
415 + $is_post = $_SERVER['REQUEST_METHOD'] === 'POST';
170 416 $input_method = $is_post ? INPUT_POST : INPUT_GET;
171 417 $chart_id = $success = false;
172 418 $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
173 419 $capable = current_user_can( 'delete_posts' );
@@ -172,9 +418,12 @@
172 418 $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
173 419 $capable = current_user_can( 'delete_posts' );
174 420 if ( $nonce && $capable ) {
175 421 $chart_id = filter_input(
176 - $input_method, 'chart', FILTER_VALIDATE_INT, array(
422 + $input_method,
423 + 'chart',
424 + FILTER_VALIDATE_INT,
425 + array(
177 426 'options' => array(
178 427 'min_range' => 1,
179 428 ),
180 429 )
@@ -180,9 +429,9 @@
180 429 )
181 430 );
182 431 if ( $chart_id ) {
183 432 $chart = get_post( $chart_id );
184 - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
433 + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
185 434 }
186 435 }
187 436 if ( $success ) {
188 437 wp_delete_post( $chart_id, true );
@@ -193,13 +442,41 @@
193 442 'success' => $success,
194 443 )
195 444 );
196 445 }
197 - wp_redirect( wp_get_referer() );
446 + wp_redirect( remove_query_arg( 'vaction', wp_get_referer() ) );
198 447 exit;
199 448 }
200 449
201 450 /**
451 + * Delete charts that are still in auto-draft mode.
452 + */
453 + private function deleteOldCharts() {
454 + $query = new WP_Query(
455 + array(
456 + 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
457 + 'post_status' => 'auto-draft',
458 + 'fields' => 'ids',
459 + 'update_post_meta_cache' => false,
460 + 'update_post_term_cache' => false,
461 + 'posts_per_page' => 50,
462 + 'date_query' => array(
463 + array(
464 + 'before' => 'today',
465 + ),
466 + ),
467 + )
468 + );
469 +
470 + if ( $query->have_posts() ) {
471 + $ids = array();
472 + while ( $query->have_posts() ) {
473 + wp_delete_post( $query->next_post(), true );
474 + }
475 + }
476 + }
477 +
478 + /**
202 479 * Renders appropriate page for chart builder. Creates new auto draft chart
203 480 * if no chart has been specified.
204 481 *
205 482 * @since 1.0.0
@@ -209,10 +486,11 @@
209 486 public function renderChartPages() {
210 487 defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
211 488 // check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
212 489 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
213 - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
214 - $default_type = 'line';
490 + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
491 + $this->deleteOldCharts();
492 + $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
215 493 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
216 494 $source->fetch();
217 495 $chart_id = wp_insert_post(
218 496 array(
@@ -227,10 +505,13 @@
227 505 add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
228 506 add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
229 507 add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
230 508 add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
509 + add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
231 510 add_post_meta(
232 - $chart_id, Visualizer_Plugin::CF_SETTINGS, array(
511 + $chart_id,
512 + Visualizer_Plugin::CF_SETTINGS,
513 + array(
233 514 'focusTarget' => 'datum',
234 515 )
235 516 );
236 517 do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
@@ -237,43 +518,72 @@
237 518 }
238 519 wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
239 520 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
240 521 }
522 +
523 + $lib = $this->load_chart_type( $chart_id );
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 +
241 532 // enqueue and register scripts and styles
242 533 wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
243 534 wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
244 535
245 536 wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
246 - wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
247 - wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
248 - wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, 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 );
538 + wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
249 539 wp_register_script(
250 - 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
251 - 'google-jsapi-old',
252 - 'google-jsapi-new',
253 - 'visualizer-frame',
254 - ), Visualizer_Plugin::VERSION, true
540 + 'visualizer-render',
541 + VISUALIZER_ABSURL . 'js/render-facade.js',
542 + apply_filters( 'visualizer_assets_render', array( 'visualizer-frame', 'visualizer-customization' ), false ),
543 + Visualizer_Plugin::VERSION,
544 + true
255 545 );
256 546 wp_register_script(
257 - 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array(
258 - 'wp-color-picker',
547 + 'visualizer-preview',
548 + VISUALIZER_ABSURL . 'js/preview.js',
549 + array(
550 + $color_picker_dep,
259 551 'visualizer-render',
260 - ), Visualizer_Plugin::VERSION, true
552 + ),
553 + Visualizer_Plugin::VERSION,
554 + true
261 555 );
262 - // added by Ash/Upwork
263 - 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' ) ) {
264 561 global $Visualizer_Pro;
265 562 $Visualizer_Pro->_addScriptsAndStyles();
266 563 }
564 +
267 565 // dispatch pages
268 566 $this->_chart = get_post( $chart_id );
269 567 $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
270 568
271 569 // skip chart type pages only for existing charts.
272 - if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status ) {
570 + if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status && ( ! empty( $_GET['tab'] ) && 'visualizer' === $_GET['tab'] ) ) {
273 571 $tab = 'settings';
274 572 }
275 573
574 + if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) {
575 + // if the cancel button is clicked.
576 + $this->undoRevisions( $chart_id, true );
577 + } elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
578 + $this->handlePermissions();
579 + // if the save button is clicked.
580 + $this->undoRevisions( $chart_id, false );
581 + } else {
582 + // if the edit button is clicked.
583 + $this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
584 + }
585 +
276 586 switch ( $tab ) {
277 587 case 'settings':
278 588 $this->_handleDataAndSettingsPage();
279 589 break;
@@ -281,9 +591,9 @@
281 591 case 'visualizer': // fall through.
282 592 $this->_handleTypesPage();
283 593 break;
284 594 default:
285 - do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
595 + // this should never happen.
286 596 break;
287 597 }
288 598 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
289 599 }
@@ -288,8 +598,80 @@
288 598 defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
289 599 }
290 600
291 601 /**
602 + * Load code editor assets.
603 + */
604 + private function loadCodeEditorAssets( $chart_id ) {
605 + global $wp_version;
606 +
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() ) {
617 + return;
618 + }
619 +
620 + $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( $chart_id );
621 +
622 + if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
623 + // code mirror assets.
624 + wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
625 + wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
626 + wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
627 + wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
628 + wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
629 + wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
630 + wp_register_script( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.js', array( 'visualizer-codemirror-sql', 'visualizer-codemirror-sql-hint', 'visualizer-codemirror-placeholder', 'visualizer-codemirror-matchbrackets', 'visualizer-codemirror-closebrackets' ), Visualizer_Plugin::VERSION );
631 + wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION );
632 + wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
633 +
634 + wp_enqueue_script( 'visualizer-codemirror-hint' );
635 + wp_enqueue_style( 'visualizer-codemirror-hint' );
636 + } else {
637 + wp_enqueue_code_editor(
638 + array(
639 + 'type' => 'sql',
640 + 'codemirror' => array(
641 + 'autofocus' => true,
642 + 'lineWrapping' => true,
643 + 'dragDrop' => false,
644 + 'matchBrackets' => true,
645 + 'autoCloseBrackets' => true,
646 + 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
647 + 'hintOptions' => array( 'tables' => $table_col_mapping ),
648 + ),
649 + )
650 + );
651 + }
652 +
653 + return $table_col_mapping;
654 + }
655 +
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 + /**
292 674 * Handle data and settings page
293 675 */
294 676 private function _handleDataAndSettingsPage() {
295 677 if ( isset( $_POST['map_api_key'] ) ) {
@@ -294,23 +676,47 @@
294 676 private function _handleDataAndSettingsPage() {
295 677 if ( isset( $_POST['map_api_key'] ) ) {
296 678 update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
297 679 }
298 - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
299 - 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' ) {
300 683 $this->_chart->post_status = 'publish';
684 +
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.
686 + // we do not want any difference in data so disable revisions temporarily.
687 + $this->disableRevisionsTemporarily();
688 +
301 689 wp_update_post( $this->_chart->to_array() );
302 690 }
303 - update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
691 + // save meta data only when it is NOT being canceled.
692 + if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
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 );
710 + }
304 711 $render = new Visualizer_Render_Page_Send();
305 712 $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
306 713 wp_iframe( array( $render, 'render' ) );
307 -
308 714 return;
309 715 }
310 716 $data = $this->_getChartArray();
311 717 $sidebar = '';
312 - $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
718 + $sidebar_class = $this->load_chart_class_name( $this->_chart->ID );
313 719 if ( class_exists( $sidebar_class, true ) ) {
314 720 $sidebar = new $sidebar_class( $data['settings'] );
315 721 $sidebar->__series = $data['series'];
316 722 $sidebar->__data = $data['data'];
@@ -315,56 +721,107 @@
315 721 $sidebar->__series = $data['series'];
316 722 $sidebar->__data = $data['data'];
317 723 } else {
318 724 $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
319 - if ( $sidebar != '' ) {
725 + if ( $sidebar !== '' ) {
320 726 $sidebar->__series = $data['series'];
321 727 $sidebar->__data = $data['data'];
322 728 }
323 729 }
324 - unset( $data['settings']['width'], $data['settings']['height'] );
325 - wp_enqueue_style( 'visualizer-frame' );
730 + unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
326 731 wp_enqueue_style( 'wp-color-picker' );
327 732 wp_enqueue_style( 'visualizer-frame' );
328 733 wp_enqueue_script( 'visualizer-preview' );
734 + wp_enqueue_script( 'visualizer-chosen' );
329 735 wp_enqueue_script( 'visualizer-render' );
736 +
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 + }
753 +
754 + $table_col_mapping = $this->loadCodeEditorAssets( $this->_chart->ID );
755 +
330 756 wp_localize_script(
331 - 'visualizer-render', 'visualizer', array(
757 + 'visualizer-render',
758 + 'visualizer',
759 + array(
332 760 'l10n' => array(
333 - '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' ),
334 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' ),
335 766 ),
336 767 'charts' => array(
337 768 'canvas' => $data,
769 + 'id' => $this->_chart->ID,
338 770 ),
339 771 'language' => $this->get_language(),
340 772 'map_api_key' => get_option( 'visualizer-map-api-key' ),
341 - 'ajax' => array(
773 + 'ajax' => array(
342 774 'url' => admin_url( 'admin-ajax.php' ),
343 775 'nonces' => array(
344 776 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
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 ),
345 781 ),
346 782 'actions' => array(
347 783 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
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,
348 788 ),
349 789 ),
790 + 'db_query' => array(
791 + 'tables' => $table_col_mapping,
792 + ),
793 + 'is_pro' => Visualizer_Module::is_pro(),
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,
350 798 )
351 799 );
800 +
352 801 $render = new Visualizer_Render_Page_Data();
353 802 $render->chart = $this->_chart;
354 803 $render->type = $data['type'];
804 + $render->custom_css = $data['css'];
355 805 $render->sidebar = $sidebar;
356 806 if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
357 - $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
358 808 ? esc_html__( 'Save Chart', 'visualizer' )
359 809 : esc_html__( 'Create Chart', 'visualizer' );
810 + if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
811 + $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
812 + }
360 813 } else {
361 814 $render->button = esc_attr__( 'Insert Chart', 'visualizer' );
362 815 }
363 - 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' ) ) {
364 820 global $Visualizer_Pro;
365 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
821 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
366 822 }
823 +
367 824 $this->_addAction( 'admin_head', 'renderFlattrScript' );
368 825 wp_iframe( array( $render, 'render' ) );
369 826 }
370 827
@@ -376,13 +833,21 @@
376 833 * @access private
377 834 */
378 835 private function _handleTypesPage() {
379 836 // process post request
380 - 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' ) ) ) {
381 838 $type = filter_input( INPUT_POST, 'type' );
382 - 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 +
383 847 // save new chart type
384 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 );
385 850 // if the chart has default data, update it with appropriate default data for new type
386 851 if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
387 852 $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
388 853 $source->fetch();
@@ -389,8 +854,11 @@
389 854 $this->_chart->post_content = $source->getData();
390 855 wp_update_post( $this->_chart->to_array() );
391 856 update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
392 857 }
858 +
859 + Visualizer_Module_Utility::set_defaults( $this->_chart );
860 +
393 861 // redirect to next tab
394 862 // changed by Ash/Upwork
395 863 wp_redirect( add_query_arg( 'tab', 'settings' ) );
396 864
@@ -398,9 +866,9 @@
398 866 }
399 867 }
400 868 $render = new Visualizer_Render_Page_Types();
401 869 $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
402 - $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
870 + $render->types = Visualizer_Module_Admin::_getChartTypesLocalized( false, false, false, 'types' );
403 871 $render->chart = $this->_chart;
404 872 wp_enqueue_style( 'visualizer-frame' );
405 873 wp_enqueue_script( 'visualizer-frame' );
406 874 wp_iframe( array( $render, 'render' ) );
@@ -416,10 +884,123 @@
416 884 */
417 885 public function renderFlattrScript() {
418 886 echo '';
419 887 }
420 - // changed by Ash/Upwork
888 +
421 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 + /**
422 1003 * Parses uploaded CSV file and saves new data for the chart.
423 1004 *
424 1005 * @since 1.0.0
425 1006 *
@@ -425,20 +1006,34 @@
425 1006 *
426 1007 * @access public
427 1008 */
428 1009 public function uploadData() {
1010 + // if this is being called internally from pro and VISUALIZER_DO_NOT_DIE is set.
1011 + // otherwise, assume this is a normal web request.
1012 + $can_die = ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE );
1013 +
429 1014 // validate nonce
430 - // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
431 1015 if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
1016 + if ( ! $can_die ) {
1017 + return;
1018 + }
432 1019 status_header( 403 );
433 1020 exit;
434 1021 }
1022 +
435 1023 // check chart, if chart exists
1024 + // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
436 1025 $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
437 - 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 ) {
1027 + if ( ! $can_die ) {
1028 + return;
1029 + }
438 1030 status_header( 400 );
439 1031 exit;
440 1032 }
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 +
441 1036 if ( ! isset( $_POST['vz-import-time'] ) ) {
442 1037 apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
443 1038 }
444 1039
@@ -443,11 +1038,30 @@
443 1038 }
444 1039
445 1040 if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
446 1041 // delete the filters in case this chart is being uploaded from other data sources
447 - delete_post_meta( $chart_id, 'visualizer-filter-config' );
1042 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_FILTER_CONFIG );
1043 + delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_FILTER_CONFIG );
1044 + delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_DB_QUERY );
1045 +
1046 + // delete "import from db" specific parameters.
1047 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
1048 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
1049 + delete_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS );
448 1050 }
449 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 +
450 1064 $source = null;
451 1065 $render = new Visualizer_Render_Page_Update();
452 1066 if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
453 1067 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
@@ -453,34 +1067,74 @@
453 1067 $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
454 1068 if ( isset( $_POST['vz-import-time'] ) ) {
455 1069 apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
456 1070 }
1071 + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
457 1072 } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
458 1073 $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
459 - // Added by Ash/Upwork
460 1074 } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
461 - $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' );
462 - // Added by Ash/Upwork
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'] );
463 1080 } else {
464 - $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' ) );
465 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 +
466 1088 if ( $source ) {
467 1089 if ( $source->fetch() ) {
468 - $chart->post_content = $source->getData();
1090 + $content = $source->getData();
1091 + $populate = true;
1092 + if ( is_string( $content ) && is_array( unserialize( $content ) ) ) {
1093 + $json = unserialize( $content );
1094 + // if source exists, so should data. if source exists but data is blank, do not populate the chart.
1095 + // if we populate the data even if it is empty, the chart will show "Table has no columns".
1096 + if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
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'] ) );
1099 + $populate = false;
1100 + }
1101 + }
1102 + if ( $populate ) {
1103 + $chart->post_content = $content;
1104 + }
469 1105 wp_update_post( $chart->to_array() );
470 1106 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
471 1107 update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
472 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 +
1116 + $render->id = $chart->ID;
473 1117 $render->data = json_encode( $source->getRawData() );
474 1118 $render->series = json_encode( $source->getSeries() );
1119 + $render->settings = json_encode( $settings );
475 1120 } else {
476 - $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 );
477 1128 }
1129 + } else {
1130 + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unknown internal error for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
478 1131 }
479 1132 $render->render();
480 - if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
481 - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1133 + if ( ! $can_die ) {
1134 + return;
482 1135 }
1136 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
483 1137 }
484 1138
485 1139 /**
486 1140 * Clones the chart.
@@ -490,24 +1144,18 @@
490 1144 * @access public
491 1145 */
492 1146 public function cloneChart() {
493 1147 $chart_id = $success = false;
494 - $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 );
495 1149 $capable = current_user_can( 'edit_posts' );
496 1150 if ( $nonce && $capable ) {
497 - $chart_id = filter_input(
498 - INPUT_GET, 'chart', FILTER_VALIDATE_INT, array(
499 - 'options' => array(
500 - 'min_range' => 1,
501 - ),
502 - )
503 - );
1151 + $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
504 1152 if ( $chart_id ) {
505 1153 $chart = get_post( $chart_id );
506 - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
1154 + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
507 1155 }
508 1156 }
509 - $redirect = wp_get_referer();
1157 + $redirect = remove_query_arg( 'vaction', wp_get_referer() );
510 1158 if ( $success ) {
511 1159 $new_chart_id = wp_insert_post(
512 1160 array(
513 1161 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
@@ -516,22 +1164,32 @@
516 1164 'post_status' => $chart->post_status,
517 1165 'post_content' => $chart->post_content,
518 1166 )
519 1167 );
520 - if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
521 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
522 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
523 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
524 - add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
525 - 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 + }
526 1177 $redirect = add_query_arg(
527 1178 array(
528 1179 'page' => 'visualizer',
529 1180 'type' => filter_input( INPUT_GET, 'type' ),
530 - ), admin_url( 'upload.php' )
1181 + 'vaction' => false,
1182 + ),
1183 + admin_url( 'admin.php' )
531 1184 );
532 1185 }
533 1186 }
1187 +
1188 + if ( defined( 'WP_TESTS_DOMAIN' ) ) {
1189 + wp_die();
1190 + }
1191 +
534 1192 wp_redirect( $redirect );
535 1193 exit;
536 1194 }
537 1195
@@ -546,9 +1204,11 @@
546 1204 check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
547 1205 $capable = current_user_can( 'edit_posts' );
548 1206 if ( $capable ) {
549 1207 $chart_id = isset( $_GET['chart'] ) ? filter_var(
550 - $_GET['chart'], FILTER_VALIDATE_INT, array(
1208 + $_GET['chart'],
1209 + FILTER_VALIDATE_INT,
1210 + array(
551 1211 'options' => array(
552 1212 'min_range' => 1,
553 1213 ),
554 1214 )
@@ -575,15 +1235,20 @@
575 1235 $data = $this->_getChartArray();
576 1236 $render = new Visualizer_Render_Page_Data();
577 1237 $render->chart = $this->_chart;
578 1238 $render->type = $data['type'];
579 - 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 + }
580 1243 wp_enqueue_style( 'visualizer-frame' );
581 1244 wp_enqueue_script( 'visualizer-render' );
582 1245 wp_localize_script(
583 - 'visualizer-render', 'visualizer', array(
1246 + 'visualizer-render',
1247 + 'visualizer',
1248 + array(
584 1249 'l10n' => array(
585 - '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' ),
586 1251 'loading' => esc_html__( 'Loading...', 'visualizer' ),
587 1252 ),
588 1253 'charts' => array(
589 1254 'canvas' => $data,
@@ -589,14 +1254,157 @@
589 1254 'canvas' => $data,
590 1255 ),
591 1256 )
592 1257 );
593 - // Added by Ash/Upwork
594 - 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' ) ) {
595 1262 global $Visualizer_Pro;
596 - $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
1263 + $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
597 1264 }
1265 +
598 1266 // Added by Ash/Upwork
599 1267 $this->_addAction( 'admin_head', 'renderFlattrScript' );
600 1268 wp_iframe( array( $render, 'render' ) );
1269 + }
1270 +
1271 + /**
1272 + * Returns the data for the query.
1273 + *
1274 + * @access public
1275 + */
1276 + public function getQueryData() {
1277 + check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
1278 +
1279 + $params = wp_parse_args( $_POST['params'] );
1280 + $chart_id = filter_var( $params['chart_id'], FILTER_VALIDATE_INT );
1281 +
1282 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
1283 + $html = $source->fetch( true );
1284 + $error = $source->get_error();
1285 + if ( ! empty( $error ) ) {
1286 + wp_send_json_error( array( 'msg' => $error ) );
1287 + }
1288 + wp_send_json_success( array( 'table' => $html ) );
1289 + }
1290 +
1291 + /**
1292 + * Saves the query and the schedule.
1293 + *
1294 + * @access public
1295 + */
1296 + public function saveQuery() {
1297 + check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' );
1298 +
1299 + $chart_id = filter_input(
1300 + INPUT_GET,
1301 + 'chart',
1302 + FILTER_VALIDATE_INT,
1303 + array(
1304 + 'options' => array(
1305 + 'min_range' => 1,
1306 + ),
1307 + )
1308 + );
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 +
1326 + $render = new Visualizer_Render_Page_Update();
1327 + if ( $chart_id ) {
1328 + $params = wp_parse_args( $_POST['params'] );
1329 + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ), $chart_id, $params );
1330 + $source->fetch( false );
1331 + $error = $source->get_error();
1332 + if ( empty( $error ) ) {
1333 + update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
1334 + update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
1335 + update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
1336 + update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
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 + }
1344 +
1345 + $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
1346 + $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
1347 + update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
1348 +
1349 + wp_update_post(
1350 + array(
1351 + 'ID' => $chart_id,
1352 + 'post_content' => $source->getData(),
1353 + )
1354 + );
1355 + $render->data = json_encode( $source->getRawData() );
1356 + $render->series = json_encode( $source->getSeries() );
1357 + $render->id = $chart_id;
1358 + } else {
1359 + $render->message = $error;
1360 + }
1361 + }
1362 + $render->render();
1363 + if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1364 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1365 + }
1366 + }
1367 +
1368 +
1369 + /**
1370 + * Saves the filter query and the schedule.
1371 + *
1372 + * @access public
1373 + */
1374 + public function saveFilter() {
1375 + check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY . Visualizer_Plugin::VERSION, 'security' );
1376 +
1377 + $chart_id = filter_input(
1378 + INPUT_GET,
1379 + 'chart',
1380 + FILTER_VALIDATE_INT,
1381 + array(
1382 + 'options' => array(
1383 + 'min_range' => 1,
1384 + ),
1385 + )
1386 + );
1387 +
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 + }
1403 +
1404 + do_action( 'visualizer_save_filter', $chart_id, $hours );
1405 +
1406 + if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1407 + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1408 + }
601 1409 }
602 1410 }