| @@ -57,13 +57,166 @@ | ||
| 57 | 57 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' ); |
| 58 | 58 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' ); |
| 59 | 59 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' ); |
| 60 | 60 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' ); |
| 61 | + | |
| 62 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_FETCH_DB_DATA, 'getQueryData' ); | |
| 63 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_DB_QUERY, 'saveQuery' ); | |
| 64 | + | |
| 65 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_ROOTS, 'getJsonRoots' ); | |
| 66 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_DATA, 'getJsonData' ); | |
| 67 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_DATA, 'setJsonData' ); | |
| 68 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE, 'setJsonSchedule' ); | |
| 69 | + | |
| 70 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' ); | |
| 71 | + | |
| 61 | 72 | } |
| 62 | 73 | |
| 63 | 74 | /** |
| 75 | + * Sets the schedule for how JSON-endpoint charts should be updated. | |
| 76 | + * | |
| 77 | + * @since ? | |
| 78 | + * | |
| 79 | + * @access public | |
| 80 | + */ | |
| 81 | + public function setJsonSchedule() { | |
| 82 | + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION, 'security' ); | |
| 83 | + | |
| 84 | + $chart_id = filter_input( | |
| 85 | + INPUT_POST, | |
| 86 | + 'chart', | |
| 87 | + FILTER_VALIDATE_INT, | |
| 88 | + array( | |
| 89 | + 'options' => array( | |
| 90 | + 'min_range' => 1, | |
| 91 | + ), | |
| 92 | + ) | |
| 93 | + ); | |
| 94 | + | |
| 95 | + if ( ! $chart_id ) { | |
| 96 | + wp_send_json_error(); | |
| 97 | + } | |
| 98 | + | |
| 99 | + $time = filter_input( | |
| 100 | + INPUT_POST, | |
| 101 | + 'time', | |
| 102 | + FILTER_VALIDATE_INT, | |
| 103 | + array( | |
| 104 | + 'options' => array( | |
| 105 | + 'min_range' => -1, | |
| 106 | + ), | |
| 107 | + ) | |
| 108 | + ); | |
| 109 | + | |
| 110 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE ); | |
| 111 | + | |
| 112 | + if ( -1 < $time ) { | |
| 113 | + add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time ); | |
| 114 | + } | |
| 115 | + wp_send_json_success(); | |
| 116 | + } | |
| 117 | + | |
| 118 | + /** | |
| 119 | + * Get the root elements for JSON-endpoint. | |
| 120 | + * | |
| 121 | + * @since ? | |
| 122 | + * | |
| 123 | + * @access public | |
| 124 | + */ | |
| 125 | + public function getJsonRoots() { | |
| 126 | + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION, 'security' ); | |
| 127 | + | |
| 128 | + $params = wp_parse_args( $_POST['params'] ); | |
| 129 | + | |
| 130 | + $source = new Visualizer_Source_Json( $params ); | |
| 131 | + | |
| 132 | + $roots = $source->fetchRoots(); | |
| 133 | + if ( empty( $roots ) ) { | |
| 134 | + wp_send_json_error(); | |
| 135 | + } | |
| 136 | + | |
| 137 | + wp_send_json_success( array( 'url' => $params['url'], 'roots' => $roots ) ); | |
| 138 | + } | |
| 139 | + | |
| 140 | + /** | |
| 141 | + * Get the data for the JSON-endpoint corresponding to the chosen root. | |
| 142 | + * | |
| 143 | + * @since ? | |
| 144 | + * | |
| 145 | + * @access public | |
| 146 | + */ | |
| 147 | + public function getJsonData() { | |
| 148 | + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION, 'security' ); | |
| 149 | + | |
| 150 | + $params = wp_parse_args( $_POST['params'] ); | |
| 151 | + | |
| 152 | + $chart_id = $params['chart']; | |
| 153 | + | |
| 154 | + if ( empty( $chart_id ) ) { | |
| 155 | + wp_die(); | |
| 156 | + } | |
| 157 | + | |
| 158 | + $source = new Visualizer_Source_Json( $params ); | |
| 159 | + | |
| 160 | + $data = $source->parse(); | |
| 161 | + if ( empty( $data ) ) { | |
| 162 | + wp_send_json_error(); | |
| 163 | + } | |
| 164 | + | |
| 165 | + $data = Visualizer_Render_Layout::show( 'editor-table', $data, $chart_id, 'viz-json-table', false, false ); | |
| 166 | + wp_send_json_success( array( 'table' => $data, 'root' => $params['root'], 'url' => $params['url'], 'paging' => $source->getPaginationElements() ) ); | |
| 167 | + } | |
| 168 | + | |
| 169 | + /** | |
| 170 | + * Updates the database with the correct post parameters for JSON-endpoint charts. | |
| 171 | + * | |
| 172 | + * @since ? | |
| 173 | + * | |
| 174 | + * @access public | |
| 175 | + */ | |
| 176 | + public function setJsonData() { | |
| 177 | + check_ajax_referer( Visualizer_Plugin::ACTION_JSON_SET_DATA . Visualizer_Plugin::VERSION, 'security' ); | |
| 178 | + | |
| 179 | + $params = $_POST; | |
| 180 | + $chart_id = $_GET['chart']; | |
| 181 | + | |
| 182 | + if ( empty( $chart_id ) ) { | |
| 183 | + wp_die(); | |
| 184 | + } | |
| 185 | + | |
| 186 | + $chart = get_post( $chart_id ); | |
| 187 | + | |
| 188 | + $source = new Visualizer_Source_Json( $params ); | |
| 189 | + $source->fetch(); | |
| 190 | + | |
| 191 | + $content = $source->getData(); | |
| 192 | + $chart->post_content = $content; | |
| 193 | + wp_update_post( $chart->to_array() ); | |
| 194 | + update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); | |
| 195 | + update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); | |
| 196 | + update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 ); | |
| 197 | + update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_URL, $params['url'] ); | |
| 198 | + update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_ROOT, $params['root'] ); | |
| 199 | + delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING ); | |
| 200 | + if ( ! empty( $params['paging'] ) ) { | |
| 201 | + add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING, $params['paging'] ); | |
| 202 | + } | |
| 203 | + | |
| 204 | + $render = new Visualizer_Render_Page_Update(); | |
| 205 | + $render->id = $chart->ID; | |
| 206 | + $render->data = json_encode( $source->getRawData() ); | |
| 207 | + $render->series = json_encode( $source->getSeries() ); | |
| 208 | + $render->render(); | |
| 209 | + | |
| 210 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 211 | + } | |
| 212 | + | |
| 213 | + | |
| 214 | + /** | |
| 64 | 215 | * Fetches charts from database. |
| 65 | 216 | * |
| 217 | + * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content). | |
| 218 | + * | |
| 66 | 219 | * @since 1.0.0 |
| 67 | 220 | * |
| 68 | 221 | * @access public |
| 69 | 222 | */ |
| @@ -71,9 +224,12 @@ | ||
| 71 | 224 | $query_args = array( |
| 72 | 225 | 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, |
| 73 | 226 | 'posts_per_page' => 9, |
| 74 | 227 | 'paged' => filter_input( |
| 75 | - INPUT_GET, 'page', FILTER_VALIDATE_INT, array( | |
| 228 | + INPUT_GET, | |
| 229 | + 'page', | |
| 230 | + FILTER_VALIDATE_INT, | |
| 231 | + array( | |
| 76 | 232 | 'options' => array( |
| 77 | 233 | 'min_range' => 1, |
| 78 | 234 | 'default' => 1, |
| 79 | 235 | ), |
| @@ -85,9 +241,9 @@ | ||
| 85 | 241 | // 'filter' is from the modal from the add media button. |
| 86 | 242 | $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING ); |
| 87 | 243 | } |
| 88 | 244 | |
| 89 | - if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) { | |
| 245 | + if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) { | |
| 90 | 246 | $query_args['meta_query'] = array( |
| 91 | 247 | array( |
| 92 | 248 | 'key' => Visualizer_Plugin::CF_CHART_TYPE, |
| 93 | 249 | 'value' => $filter, |
| @@ -100,8 +256,18 @@ | ||
| 100 | 256 | while ( $query->have_posts() ) { |
| 101 | 257 | $chart = $query->next_post(); |
| 102 | 258 | $chart_data = $this->_getChartArray( $chart ); |
| 103 | 259 | $chart_data['id'] = $chart->ID; |
| 260 | + $chart_data['library'] = $this->load_chart_type( $chart->ID ); | |
| 261 | + $css = ''; | |
| 262 | + $settings = $chart_data['settings']; | |
| 263 | + $arguments = $this->get_inline_custom_css( 'visualizer-chart-' . $chart->ID, $settings ); | |
| 264 | + if ( ! empty( $arguments ) ) { | |
| 265 | + $css = $arguments[0]; | |
| 266 | + $settings = $arguments[1]; | |
| 267 | + } | |
| 268 | + $chart_data['settings'] = $settings; | |
| 269 | + $chart_data['css'] = $css; | |
| 104 | 270 | $charts[] = $chart_data; |
| 105 | 271 | } |
| 106 | 272 | self::_sendResponse( |
| 107 | 273 | array( |
| @@ -129,14 +295,33 @@ | ||
| 129 | 295 | } |
| 130 | 296 | $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 131 | 297 | $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type ); |
| 132 | 298 | $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type ); |
| 299 | + $library = $this->load_chart_type( $chart->ID ); | |
| 133 | 300 | |
| 301 | + $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 302 | + $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type ); | |
| 303 | + if ( ! empty( $atts['settings'] ) ) { | |
| 304 | + $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type ); | |
| 305 | + } | |
| 306 | + | |
| 307 | + $css = ''; | |
| 308 | + $arguments = $this->get_inline_custom_css( 'visualizer-' . $chart->ID, $settings ); | |
| 309 | + if ( ! empty( $arguments ) ) { | |
| 310 | + $css = $arguments[0]; | |
| 311 | + $settings = $arguments[1]; | |
| 312 | + } | |
| 313 | + | |
| 314 | + $date_formats = Visualizer_Source::get_date_formats_if_exists( $series, $data ); | |
| 315 | + | |
| 134 | 316 | return array( |
| 135 | 317 | 'type' => $type, |
| 136 | 318 | 'series' => $series, |
| 137 | - 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ), | |
| 319 | + 'settings' => $settings, | |
| 138 | 320 | 'data' => $data, |
| 321 | + 'library' => $library, | |
| 322 | + 'css' => $css, | |
| 323 | + 'date_formats' => $date_formats, | |
| 139 | 324 | ); |
| 140 | 325 | } |
| 141 | 326 | |
| 142 | 327 | /** |
| @@ -163,9 +348,9 @@ | ||
| 163 | 348 | * |
| 164 | 349 | * @access public |
| 165 | 350 | */ |
| 166 | 351 | public function deleteChart() { |
| 167 | - $is_post = $_SERVER['REQUEST_METHOD'] == 'POST'; | |
| 352 | + $is_post = $_SERVER['REQUEST_METHOD'] === 'POST'; | |
| 168 | 353 | $input_method = $is_post ? INPUT_POST : INPUT_GET; |
| 169 | 354 | $chart_id = $success = false; |
| 170 | 355 | $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) ); |
| 171 | 356 | $capable = current_user_can( 'delete_posts' ); |
| @@ -170,9 +355,12 @@ | ||
| 170 | 355 | $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) ); |
| 171 | 356 | $capable = current_user_can( 'delete_posts' ); |
| 172 | 357 | if ( $nonce && $capable ) { |
| 173 | 358 | $chart_id = filter_input( |
| 174 | - $input_method, 'chart', FILTER_VALIDATE_INT, array( | |
| 359 | + $input_method, | |
| 360 | + 'chart', | |
| 361 | + FILTER_VALIDATE_INT, | |
| 362 | + array( | |
| 175 | 363 | 'options' => array( |
| 176 | 364 | 'min_range' => 1, |
| 177 | 365 | ), |
| 178 | 366 | ) |
| @@ -178,9 +366,9 @@ | ||
| 178 | 366 | ) |
| 179 | 367 | ); |
| 180 | 368 | if ( $chart_id ) { |
| 181 | 369 | $chart = get_post( $chart_id ); |
| 182 | - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER; | |
| 370 | + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER; | |
| 183 | 371 | } |
| 184 | 372 | } |
| 185 | 373 | if ( $success ) { |
| 186 | 374 | wp_delete_post( $chart_id, true ); |
| @@ -196,8 +384,36 @@ | ||
| 196 | 384 | exit; |
| 197 | 385 | } |
| 198 | 386 | |
| 199 | 387 | /** |
| 388 | + * Delete charts that are still in auto-draft mode. | |
| 389 | + */ | |
| 390 | + private function deleteOldCharts() { | |
| 391 | + $query = new WP_Query( | |
| 392 | + array( | |
| 393 | + 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 394 | + 'post_status' => 'auto-draft', | |
| 395 | + 'fields' => 'ids', | |
| 396 | + 'update_post_meta_cache' => false, | |
| 397 | + 'update_post_term_cache' => false, | |
| 398 | + 'posts_per_page' => 50, | |
| 399 | + 'date_query' => array( | |
| 400 | + array( | |
| 401 | + 'before' => 'today', | |
| 402 | + ), | |
| 403 | + ), | |
| 404 | + ) | |
| 405 | + ); | |
| 406 | + | |
| 407 | + if ( $query->have_posts() ) { | |
| 408 | + $ids = array(); | |
| 409 | + while ( $query->have_posts() ) { | |
| 410 | + wp_delete_post( $query->next_post(), true ); | |
| 411 | + } | |
| 412 | + } | |
| 413 | + } | |
| 414 | + | |
| 415 | + /** | |
| 200 | 416 | * Renders appropriate page for chart builder. Creates new auto draft chart |
| 201 | 417 | * if no chart has been specified. |
| 202 | 418 | * |
| 203 | 419 | * @since 1.0.0 |
| @@ -207,9 +423,10 @@ | ||
| 207 | 423 | public function renderChartPages() { |
| 208 | 424 | defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 ); |
| 209 | 425 | // check chart, if chart not exists, will create new one and redirects to the same page with proper chart id |
| 210 | 426 | $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; |
| 211 | - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 427 | + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 428 | + $this->deleteOldCharts(); | |
| 212 | 429 | $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line'; |
| 213 | 430 | $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' ); |
| 214 | 431 | $source->fetch(); |
| 215 | 432 | $chart_id = wp_insert_post( |
| @@ -226,9 +443,11 @@ | ||
| 226 | 443 | add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 ); |
| 227 | 444 | add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); |
| 228 | 445 | add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 229 | 446 | add_post_meta( |
| 230 | - $chart_id, Visualizer_Plugin::CF_SETTINGS, array( | |
| 447 | + $chart_id, | |
| 448 | + Visualizer_Plugin::CF_SETTINGS, | |
| 449 | + array( | |
| 231 | 450 | 'focusTarget' => 'datum', |
| 232 | 451 | ) |
| 233 | 452 | ); |
| 234 | 453 | do_action( 'visualizer_pro_new_chart_defaults', $chart_id ); |
| @@ -235,34 +454,43 @@ | ||
| 235 | 454 | } |
| 236 | 455 | wp_redirect( add_query_arg( 'chart', (int) $chart_id ) ); |
| 237 | 456 | defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); |
| 238 | 457 | } |
| 458 | + | |
| 459 | + $this->load_chart_type( $chart_id ); | |
| 460 | + | |
| 239 | 461 | // enqueue and register scripts and styles |
| 240 | 462 | wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION ); |
| 241 | 463 | wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION ); |
| 242 | 464 | |
| 243 | 465 | wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION ); |
| 244 | - wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true ); | |
| 245 | - wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); | |
| 246 | - wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true ); | |
| 466 | + wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion' ), Visualizer_Plugin::VERSION, true ); | |
| 467 | + wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true ); | |
| 247 | 468 | wp_register_script( |
| 248 | - 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( | |
| 249 | - 'google-jsapi-old', | |
| 250 | - 'google-jsapi-new', | |
| 251 | - 'visualizer-frame', | |
| 252 | - ), Visualizer_Plugin::VERSION, true | |
| 469 | + 'visualizer-render', | |
| 470 | + VISUALIZER_ABSURL . 'js/render-facade.js', | |
| 471 | + apply_filters( 'visualizer_assets_render', array( 'visualizer-frame', 'visualizer-customization' ), false ), | |
| 472 | + Visualizer_Plugin::VERSION, | |
| 473 | + true | |
| 253 | 474 | ); |
| 254 | 475 | wp_register_script( |
| 255 | - 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array( | |
| 476 | + 'visualizer-preview', | |
| 477 | + VISUALIZER_ABSURL . 'js/preview.js', | |
| 478 | + array( | |
| 256 | 479 | 'wp-color-picker', |
| 257 | 480 | 'visualizer-render', |
| 258 | - ), Visualizer_Plugin::VERSION, true | |
| 481 | + ), | |
| 482 | + Visualizer_Plugin::VERSION, | |
| 483 | + true | |
| 259 | 484 | ); |
| 485 | + wp_register_script( 'visualizer-editor-simple', VISUALIZER_ABSURL . 'js/simple-editor.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true ); | |
| 486 | + | |
| 260 | 487 | // added by Ash/Upwork |
| 261 | 488 | if ( VISUALIZER_PRO ) { |
| 262 | 489 | global $Visualizer_Pro; |
| 263 | 490 | $Visualizer_Pro->_addScriptsAndStyles(); |
| 264 | 491 | } |
| 492 | + | |
| 265 | 493 | // dispatch pages |
| 266 | 494 | $this->_chart = get_post( $chart_id ); |
| 267 | 495 | $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer'; |
| 268 | 496 | |
| @@ -297,8 +525,63 @@ | ||
| 297 | 525 | defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); |
| 298 | 526 | } |
| 299 | 527 | |
| 300 | 528 | /** |
| 529 | + * Load code editor assets. | |
| 530 | + */ | |
| 531 | + private function loadCodeEditorAssets() { | |
| 532 | + global $wp_version; | |
| 533 | + | |
| 534 | + $wp_scripts = wp_scripts(); | |
| 535 | + | |
| 536 | + // data tables assets. | |
| 537 | + wp_register_script( 'visualizer-datatables', '//cdn.datatables.net/v/dt/dt-1.10.18/b-1.5.6/b-colvis-1.5.6/cr-1.5.0/fc-3.2.5/fh-3.1.4/r-2.2.2/sc-2.0.0/sl-1.3.0/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION ); | |
| 538 | + wp_register_style( 'visualizer-datatables', '//cdn.datatables.net/v/dt/dt-1.10.18/b-1.5.6/b-colvis-1.5.6/cr-1.5.0/fc-3.2.5/fh-3.1.4/r-2.2.2/sc-2.0.0/sl-1.3.0/datatables.min.css', array(), Visualizer_Plugin::VERSION ); | |
| 539 | + 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 ); | |
| 540 | + wp_enqueue_script( 'visualizer-datatables' ); | |
| 541 | + wp_enqueue_style( 'visualizer-jquery-ui' ); | |
| 542 | + | |
| 543 | + if ( ! VISUALIZER_PRO ) { | |
| 544 | + return; | |
| 545 | + } | |
| 546 | + | |
| 547 | + $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping(); | |
| 548 | + | |
| 549 | + if ( version_compare( $wp_version, '4.9.0', '<' ) ) { | |
| 550 | + // code mirror assets. | |
| 551 | + wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION ); | |
| 552 | + wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 553 | + wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 554 | + wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 555 | + wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 556 | + wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 557 | + 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 ); | |
| 558 | + wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION ); | |
| 559 | + wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 560 | + | |
| 561 | + wp_enqueue_script( 'visualizer-codemirror-hint' ); | |
| 562 | + wp_enqueue_style( 'visualizer-codemirror-hint' ); | |
| 563 | + } else { | |
| 564 | + wp_enqueue_code_editor( | |
| 565 | + array( | |
| 566 | + 'type' => 'sql', | |
| 567 | + 'codemirror' => array( | |
| 568 | + 'autofocus' => true, | |
| 569 | + 'lineWrapping' => true, | |
| 570 | + 'dragDrop' => false, | |
| 571 | + 'matchBrackets' => true, | |
| 572 | + 'autoCloseBrackets' => true, | |
| 573 | + 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ), | |
| 574 | + 'hintOptions' => array( 'tables' => $table_col_mapping ), | |
| 575 | + ), | |
| 576 | + ) | |
| 577 | + ); | |
| 578 | + } | |
| 579 | + | |
| 580 | + return $table_col_mapping; | |
| 581 | + } | |
| 582 | + | |
| 583 | + /** | |
| 301 | 584 | * Handle data and settings page |
| 302 | 585 | */ |
| 303 | 586 | private function _handleDataAndSettingsPage() { |
| 304 | 587 | if ( isset( $_POST['map_api_key'] ) ) { |
| @@ -303,14 +586,21 @@ | ||
| 303 | 586 | private function _handleDataAndSettingsPage() { |
| 304 | 587 | if ( isset( $_POST['map_api_key'] ) ) { |
| 305 | 588 | update_option( 'visualizer-map-api-key', $_POST['map_api_key'] ); |
| 306 | 589 | } |
| 307 | - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) { | |
| 308 | - if ( $this->_chart->post_status == 'auto-draft' ) { | |
| 590 | + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) { | |
| 591 | + if ( $this->_chart->post_status === 'auto-draft' ) { | |
| 309 | 592 | $this->_chart->post_status = 'publish'; |
| 593 | + | |
| 594 | + // 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. | |
| 595 | + // we do not want any difference in data so disable revisions temporarily. | |
| 596 | + add_filter( 'wp_revisions_to_keep', '__return_false' ); | |
| 310 | 597 | wp_update_post( $this->_chart->to_array() ); |
| 311 | 598 | } |
| 312 | - update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST ); | |
| 599 | + // save meta data only when it is NOT being canceled. | |
| 600 | + if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) { | |
| 601 | + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST ); | |
| 602 | + } | |
| 313 | 603 | $render = new Visualizer_Render_Page_Send(); |
| 314 | 604 | $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID ); |
| 315 | 605 | wp_iframe( array( $render, 'render' ) ); |
| 316 | 606 | |
| @@ -324,50 +614,92 @@ | ||
| 324 | 614 | $sidebar->__series = $data['series']; |
| 325 | 615 | $sidebar->__data = $data['data']; |
| 326 | 616 | } else { |
| 327 | 617 | $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data ); |
| 328 | - if ( $sidebar != '' ) { | |
| 618 | + if ( $sidebar !== '' ) { | |
| 329 | 619 | $sidebar->__series = $data['series']; |
| 330 | 620 | $sidebar->__data = $data['data']; |
| 331 | 621 | } |
| 332 | 622 | } |
| 333 | 623 | unset( $data['settings']['width'], $data['settings']['height'] ); |
| 334 | - wp_enqueue_style( 'visualizer-frame' ); | |
| 335 | 624 | wp_enqueue_style( 'wp-color-picker' ); |
| 336 | 625 | wp_enqueue_style( 'visualizer-frame' ); |
| 337 | 626 | wp_enqueue_script( 'visualizer-preview' ); |
| 627 | + wp_enqueue_script( 'visualizer-chosen' ); | |
| 338 | 628 | wp_enqueue_script( 'visualizer-render' ); |
| 629 | + | |
| 630 | + if ( ! VISUALIZER_PRO ) { | |
| 631 | + wp_enqueue_script( 'visualizer-editor-simple' ); | |
| 632 | + wp_localize_script( | |
| 633 | + 'visualizer-editor-simple', | |
| 634 | + 'visualizer1', | |
| 635 | + array( | |
| 636 | + 'ajax' => array( | |
| 637 | + 'url' => admin_url( 'admin-ajax.php' ), | |
| 638 | + 'nonces' => array( | |
| 639 | + ), | |
| 640 | + 'actions' => array( | |
| 641 | + ), | |
| 642 | + ), | |
| 643 | + ) | |
| 644 | + ); | |
| 645 | + } | |
| 646 | + | |
| 647 | + $table_col_mapping = $this->loadCodeEditorAssets(); | |
| 648 | + | |
| 339 | 649 | wp_localize_script( |
| 340 | - 'visualizer-render', 'visualizer', array( | |
| 650 | + 'visualizer-render', | |
| 651 | + 'visualizer', | |
| 652 | + array( | |
| 341 | 653 | 'l10n' => array( |
| 342 | 654 | 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), |
| 343 | 655 | 'loading' => esc_html__( 'Loading...', 'visualizer' ), |
| 656 | + 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ), | |
| 344 | 657 | ), |
| 345 | 658 | 'charts' => array( |
| 346 | 659 | 'canvas' => $data, |
| 660 | + 'id' => $this->_chart->ID, | |
| 347 | 661 | ), |
| 348 | 662 | 'language' => $this->get_language(), |
| 349 | 663 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 350 | - 'ajax' => array( | |
| 664 | + 'ajax' => array( | |
| 351 | 665 | 'url' => admin_url( 'admin-ajax.php' ), |
| 352 | 666 | 'nonces' => array( |
| 353 | 667 | 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ), |
| 668 | + 'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ), | |
| 669 | + 'json_get_roots' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION ), | |
| 670 | + 'json_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION ), | |
| 671 | + 'json_set_schedule' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION ), | |
| 354 | 672 | ), |
| 355 | 673 | 'actions' => array( |
| 356 | 674 | 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA, |
| 675 | + 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA, | |
| 676 | + 'json_get_roots' => Visualizer_Plugin::ACTION_JSON_GET_ROOTS, | |
| 677 | + 'json_get_data' => Visualizer_Plugin::ACTION_JSON_GET_DATA, | |
| 678 | + 'json_set_schedule' => Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE, | |
| 357 | 679 | ), |
| 358 | 680 | ), |
| 681 | + 'db_query' => array( | |
| 682 | + 'tables' => $table_col_mapping, | |
| 683 | + ), | |
| 684 | + 'is_pro' => VISUALIZER_PRO, | |
| 685 | + 'page_type' => 'chart', | |
| 686 | + 'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR, | |
| 687 | + 'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW, | |
| 688 | + 'is_front' => false, | |
| 359 | 689 | ) |
| 360 | 690 | ); |
| 691 | + | |
| 361 | 692 | $render = new Visualizer_Render_Page_Data(); |
| 362 | 693 | $render->chart = $this->_chart; |
| 363 | 694 | $render->type = $data['type']; |
| 695 | + $render->custom_css = $data['css']; | |
| 364 | 696 | $render->sidebar = $sidebar; |
| 365 | 697 | if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) { |
| 366 | - $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART | |
| 698 | + $render->button = filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART | |
| 367 | 699 | ? esc_html__( 'Save Chart', 'visualizer' ) |
| 368 | 700 | : esc_html__( 'Create Chart', 'visualizer' ); |
| 369 | - if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) { | |
| 701 | + if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) { | |
| 370 | 702 | $render->cancel_button = esc_html__( 'Cancel', 'visualizer' ); |
| 371 | 703 | } |
| 372 | 704 | } else { |
| 373 | 705 | $render->button = esc_attr__( 'Insert Chart', 'visualizer' ); |
| @@ -388,11 +720,11 @@ | ||
| 388 | 720 | * @access private |
| 389 | 721 | */ |
| 390 | 722 | private function _handleTypesPage() { |
| 391 | 723 | // process post request |
| 392 | - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) { | |
| 724 | + if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) { | |
| 393 | 725 | $type = filter_input( INPUT_POST, 'type' ); |
| 394 | - if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) { | |
| 726 | + if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) { | |
| 395 | 727 | // save new chart type |
| 396 | 728 | update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type ); |
| 397 | 729 | // if the chart has default data, update it with appropriate default data for new type |
| 398 | 730 | if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) { |
| @@ -428,10 +760,108 @@ | ||
| 428 | 760 | */ |
| 429 | 761 | public function renderFlattrScript() { |
| 430 | 762 | echo ''; |
| 431 | 763 | } |
| 432 | - // changed by Ash/Upwork | |
| 764 | + | |
| 433 | 765 | /** |
| 766 | + * Processes the CSV that is sent in the request as a string. | |
| 767 | + * | |
| 768 | + * @since 3.2.0 | |
| 769 | + */ | |
| 770 | + private function handleCSVasString( $data ) { | |
| 771 | + $source = null; | |
| 772 | + if ( VISUALIZER_PRO ) { | |
| 773 | + $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' ); | |
| 774 | + } else { | |
| 775 | + // data coming in from the text editor. | |
| 776 | + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME ); | |
| 777 | + $handle = fopen( $tmpfile, 'w' ); | |
| 778 | + $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) ); | |
| 779 | + if ( $values ) { | |
| 780 | + foreach ( $values as $row ) { | |
| 781 | + if ( empty( $row ) ) { | |
| 782 | + continue; | |
| 783 | + } | |
| 784 | + $columns = explode( ',', $row ); | |
| 785 | + fputcsv( $handle, $columns ); | |
| 786 | + } | |
| 787 | + } | |
| 788 | + $source = new Visualizer_Source_Csv( $tmpfile ); | |
| 789 | + fclose( $handle ); | |
| 790 | + } | |
| 791 | + return $source; | |
| 792 | + } | |
| 793 | + | |
| 794 | + /** | |
| 795 | + * Parses the data uploaded as an HTML table. | |
| 796 | + * | |
| 797 | + * @since 3.2.0 | |
| 798 | + * | |
| 799 | + * @access private | |
| 800 | + */ | |
| 801 | + private function handleTabularData() { | |
| 802 | + $csv = array(); | |
| 803 | + // the datatable mentions the headers twice, so lets remove the duplicates. | |
| 804 | + $headers = array_unique( array_filter( $_POST['header'] ) ); | |
| 805 | + $types = $_POST['type']; | |
| 806 | + | |
| 807 | + // capture all the indexes that correspond to excluded columns. | |
| 808 | + $exclude = array(); | |
| 809 | + $index = 0; | |
| 810 | + foreach ( $types as $type ) { | |
| 811 | + if ( empty( $type ) ) { | |
| 812 | + $exclude[] = $index; | |
| 813 | + } | |
| 814 | + $index++; | |
| 815 | + } | |
| 816 | + | |
| 817 | + // when N headers are being renamed, the number of headers increases by N | |
| 818 | + // because of the way datatable duplicates header information | |
| 819 | + // so unset the headers that have been renamed. | |
| 820 | + if ( count( $headers ) !== count( $types ) ) { | |
| 821 | + $to = count( $headers ); | |
| 822 | + for ( $i = count( $types ); $i < $to; $i++ ) { | |
| 823 | + unset( $headers[ $i + 1 ] ); | |
| 824 | + } | |
| 825 | + } | |
| 826 | + | |
| 827 | + $columns = array(); | |
| 828 | + for ( $i = 0; $i < count( $headers ); $i++ ) { | |
| 829 | + if ( ! isset( $_POST[ 'data' . $i ] ) ) { | |
| 830 | + continue; | |
| 831 | + } | |
| 832 | + $columns[ $i ] = $_POST[ 'data' . $i ]; | |
| 833 | + } | |
| 834 | + | |
| 835 | + $csv[] = $headers; | |
| 836 | + $csv[] = $types; | |
| 837 | + for ( $j = 0; $j < count( $columns[0] ); $j++ ) { | |
| 838 | + $row = array(); | |
| 839 | + for ( $i = 0; $i < count( $headers ); $i++ ) { | |
| 840 | + $row[] = $columns[ $i ][ $j ]; | |
| 841 | + } | |
| 842 | + $csv[] = $row; | |
| 843 | + } | |
| 844 | + | |
| 845 | + $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME ); | |
| 846 | + $handle = fopen( $tmpfile, 'w' ); | |
| 847 | + | |
| 848 | + if ( $csv ) { | |
| 849 | + $index = 0; | |
| 850 | + foreach ( $csv as $row ) { | |
| 851 | + // remove all the cells corresponding to the excluded headers. | |
| 852 | + foreach ( $exclude as $j ) { | |
| 853 | + unset( $row[ $j ] ); | |
| 854 | + } | |
| 855 | + fputcsv( $handle, $row ); | |
| 856 | + } | |
| 857 | + } | |
| 858 | + $source = new Visualizer_Source_Csv( $tmpfile ); | |
| 859 | + fclose( $handle ); | |
| 860 | + return $source; | |
| 861 | + } | |
| 862 | + | |
| 863 | + /** | |
| 434 | 864 | * Parses uploaded CSV file and saves new data for the chart. |
| 435 | 865 | * |
| 436 | 866 | * @since 1.0.0 |
| 437 | 867 | * |
| @@ -453,9 +883,9 @@ | ||
| 453 | 883 | |
| 454 | 884 | // check chart, if chart exists |
| 455 | 885 | // do not use filter_input as it does not work for phpunit test cases, use filter_var instead |
| 456 | 886 | $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; |
| 457 | - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 887 | + if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 458 | 888 | if ( ! $can_die ) { |
| 459 | 889 | return; |
| 460 | 890 | } |
| 461 | 891 | status_header( 400 ); |
| @@ -467,11 +897,22 @@ | ||
| 467 | 897 | } |
| 468 | 898 | |
| 469 | 899 | if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) { |
| 470 | 900 | // delete the filters in case this chart is being uploaded from other data sources |
| 471 | - delete_post_meta( $chart_id, 'visualizer-filter-config' ); | |
| 901 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_FILTER_CONFIG ); | |
| 902 | + delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_FILTER_CONFIG ); | |
| 903 | + delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_DB_QUERY ); | |
| 904 | + | |
| 905 | + // delete "import from db" specific parameters. | |
| 906 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY ); | |
| 907 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE ); | |
| 472 | 908 | } |
| 473 | 909 | |
| 910 | + // delete json related data. | |
| 911 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL ); | |
| 912 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT ); | |
| 913 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING ); | |
| 914 | + | |
| 474 | 915 | $source = null; |
| 475 | 916 | $render = new Visualizer_Render_Page_Update(); |
| 476 | 917 | if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) { |
| 477 | 918 | $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] ); |
| @@ -477,22 +918,39 @@ | ||
| 477 | 918 | $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] ); |
| 478 | 919 | if ( isset( $_POST['vz-import-time'] ) ) { |
| 479 | 920 | apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] ); |
| 480 | 921 | } |
| 922 | + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison | |
| 481 | 923 | } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) { |
| 482 | 924 | $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] ); |
| 483 | 925 | } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) { |
| 484 | - $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' ); | |
| 926 | + $source = $this->handleCSVasString( $_POST['chart_data'] ); | |
| 927 | + } elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) { | |
| 928 | + $source = $this->handleTabularData(); | |
| 485 | 929 | } else { |
| 486 | 930 | $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' ); |
| 487 | 931 | } |
| 488 | 932 | if ( $source ) { |
| 489 | 933 | if ( $source->fetch() ) { |
| 490 | - $chart->post_content = $source->getData(); | |
| 934 | + $content = $source->getData(); | |
| 935 | + $populate = true; | |
| 936 | + if ( is_string( $content ) && is_array( unserialize( $content ) ) ) { | |
| 937 | + $json = unserialize( $content ); | |
| 938 | + // if source exists, so should data. if source exists but data is blank, do not populate the chart. | |
| 939 | + // if we populate the data even if it is empty, the chart will show "Table has no columns". | |
| 940 | + if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) { | |
| 941 | + 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__ ); | |
| 942 | + $populate = false; | |
| 943 | + } | |
| 944 | + } | |
| 945 | + if ( $populate ) { | |
| 946 | + $chart->post_content = $content; | |
| 947 | + } | |
| 491 | 948 | wp_update_post( $chart->to_array() ); |
| 492 | 949 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 493 | 950 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); |
| 494 | 951 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 ); |
| 952 | + $render->id = $chart->ID; | |
| 495 | 953 | $render->data = json_encode( $source->getRawData() ); |
| 496 | 954 | $render->series = json_encode( $source->getSeries() ); |
| 497 | 955 | } else { |
| 498 | 956 | $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' ); |
| @@ -517,9 +975,12 @@ | ||
| 517 | 975 | $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART ); |
| 518 | 976 | $capable = current_user_can( 'edit_posts' ); |
| 519 | 977 | if ( $nonce && $capable ) { |
| 520 | 978 | $chart_id = filter_input( |
| 521 | - INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( | |
| 979 | + INPUT_GET, | |
| 980 | + 'chart', | |
| 981 | + FILTER_VALIDATE_INT, | |
| 982 | + array( | |
| 522 | 983 | 'options' => array( |
| 523 | 984 | 'min_range' => 1, |
| 524 | 985 | ), |
| 525 | 986 | ) |
| @@ -525,9 +986,9 @@ | ||
| 525 | 986 | ) |
| 526 | 987 | ); |
| 527 | 988 | if ( $chart_id ) { |
| 528 | 989 | $chart = get_post( $chart_id ); |
| 529 | - $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER; | |
| 990 | + $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER; | |
| 530 | 991 | } |
| 531 | 992 | } |
| 532 | 993 | $redirect = wp_get_referer(); |
| 533 | 994 | if ( $success ) { |
| @@ -549,9 +1010,10 @@ | ||
| 549 | 1010 | $redirect = add_query_arg( |
| 550 | 1011 | array( |
| 551 | 1012 | 'page' => 'visualizer', |
| 552 | 1013 | 'type' => filter_input( INPUT_GET, 'type' ), |
| 553 | - ), admin_url( 'upload.php' ) | |
| 1014 | + ), | |
| 1015 | + admin_url( 'upload.php' ) | |
| 554 | 1016 | ); |
| 555 | 1017 | } |
| 556 | 1018 | } |
| 557 | 1019 | wp_redirect( $redirect ); |
| @@ -569,9 +1031,11 @@ | ||
| 569 | 1031 | check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' ); |
| 570 | 1032 | $capable = current_user_can( 'edit_posts' ); |
| 571 | 1033 | if ( $capable ) { |
| 572 | 1034 | $chart_id = isset( $_GET['chart'] ) ? filter_var( |
| 573 | - $_GET['chart'], FILTER_VALIDATE_INT, array( | |
| 1035 | + $_GET['chart'], | |
| 1036 | + FILTER_VALIDATE_INT, | |
| 1037 | + array( | |
| 574 | 1038 | 'options' => array( |
| 575 | 1039 | 'min_range' => 1, |
| 576 | 1040 | ), |
| 577 | 1041 | ) |
| @@ -602,9 +1066,11 @@ | ||
| 602 | 1066 | unset( $data['settings']['width'], $data['settings']['height'] ); |
| 603 | 1067 | wp_enqueue_style( 'visualizer-frame' ); |
| 604 | 1068 | wp_enqueue_script( 'visualizer-render' ); |
| 605 | 1069 | wp_localize_script( |
| 606 | - 'visualizer-render', 'visualizer', array( | |
| 1070 | + 'visualizer-render', | |
| 1071 | + 'visualizer', | |
| 1072 | + array( | |
| 607 | 1073 | 'l10n' => array( |
| 608 | 1074 | 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), |
| 609 | 1075 | 'loading' => esc_html__( 'Loading...', 'visualizer' ), |
| 610 | 1076 | ), |
| @@ -622,5 +1088,107 @@ | ||
| 622 | 1088 | $this->_addAction( 'admin_head', 'renderFlattrScript' ); |
| 623 | 1089 | wp_iframe( array( $render, 'render' ) ); |
| 624 | 1090 | } |
| 625 | 1091 | |
| 1092 | + /** | |
| 1093 | + * Returns the data for the query. | |
| 1094 | + * | |
| 1095 | + * @access public | |
| 1096 | + */ | |
| 1097 | + public function getQueryData() { | |
| 1098 | + check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' ); | |
| 1099 | + | |
| 1100 | + $params = wp_parse_args( $_POST['params'] ); | |
| 1101 | + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) ); | |
| 1102 | + $html = $source->fetch( true ); | |
| 1103 | + $error = ''; | |
| 1104 | + if ( empty( $html ) ) { | |
| 1105 | + $error = $source->get_error(); | |
| 1106 | + wp_send_json_error( array( 'msg' => $error ) ); | |
| 1107 | + } | |
| 1108 | + wp_send_json_success( array( 'table' => $html ) ); | |
| 1109 | + } | |
| 1110 | + | |
| 1111 | + /** | |
| 1112 | + * Saves the query and the schedule. | |
| 1113 | + * | |
| 1114 | + * @access public | |
| 1115 | + */ | |
| 1116 | + public function saveQuery() { | |
| 1117 | + check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' ); | |
| 1118 | + | |
| 1119 | + $chart_id = filter_input( | |
| 1120 | + INPUT_GET, | |
| 1121 | + 'chart', | |
| 1122 | + FILTER_VALIDATE_INT, | |
| 1123 | + array( | |
| 1124 | + 'options' => array( | |
| 1125 | + 'min_range' => 1, | |
| 1126 | + ), | |
| 1127 | + ) | |
| 1128 | + ); | |
| 1129 | + | |
| 1130 | + $render = new Visualizer_Render_Page_Update(); | |
| 1131 | + if ( $chart_id ) { | |
| 1132 | + $params = wp_parse_args( $_POST['params'] ); | |
| 1133 | + $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) ); | |
| 1134 | + $source->fetch( false ); | |
| 1135 | + $error = $source->get_error(); | |
| 1136 | + if ( empty( $error ) ) { | |
| 1137 | + $hours = $_POST['refresh']; | |
| 1138 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) ); | |
| 1139 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); | |
| 1140 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); | |
| 1141 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours ); | |
| 1142 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 ); | |
| 1143 | + | |
| 1144 | + $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() ); | |
| 1145 | + $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS; | |
| 1146 | + update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules ); | |
| 1147 | + | |
| 1148 | + wp_update_post( | |
| 1149 | + array( | |
| 1150 | + 'ID' => $chart_id, | |
| 1151 | + 'post_content' => $source->getData(), | |
| 1152 | + ) | |
| 1153 | + ); | |
| 1154 | + $render->data = json_encode( $source->getRawData() ); | |
| 1155 | + $render->series = json_encode( $source->getSeries() ); | |
| 1156 | + } else { | |
| 1157 | + $render->message = $error; | |
| 1158 | + } | |
| 1159 | + } | |
| 1160 | + $render->render(); | |
| 1161 | + if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) { | |
| 1162 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 1163 | + } | |
| 1164 | + } | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + /** | |
| 1168 | + * Saves the filter query and the schedule. | |
| 1169 | + * | |
| 1170 | + * @access public | |
| 1171 | + */ | |
| 1172 | + public function saveFilter() { | |
| 1173 | + check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY . Visualizer_Plugin::VERSION, 'security' ); | |
| 1174 | + | |
| 1175 | + $chart_id = filter_input( | |
| 1176 | + INPUT_GET, | |
| 1177 | + 'chart', | |
| 1178 | + FILTER_VALIDATE_INT, | |
| 1179 | + array( | |
| 1180 | + 'options' => array( | |
| 1181 | + 'min_range' => 1, | |
| 1182 | + ), | |
| 1183 | + ) | |
| 1184 | + ); | |
| 1185 | + | |
| 1186 | + $hours = $_POST['refresh']; | |
| 1187 | + | |
| 1188 | + do_action( 'visualizer_save_filter', $chart_id, $hours ); | |
| 1189 | + | |
| 1190 | + if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) { | |
| 1191 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 1192 | + } | |
| 1193 | + } | |
| 626 | 1194 | } |