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