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