| @@ -56,19 +56,16 @@ | ||
| 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 | |
| 60 | 61 | $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' ); | |
| 62 | + // Added by Ash/Upwork | |
| 64 | 63 | } |
| 65 | 64 | |
| 66 | 65 | /** |
| 67 | 66 | * Fetches charts from database. |
| 68 | 67 | * |
| 69 | - * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content). | |
| 70 | - * | |
| 71 | 68 | * @since 1.0.0 |
| 72 | 69 | * |
| 73 | 70 | * @access public |
| 74 | 71 | */ |
| @@ -76,12 +73,9 @@ | ||
| 76 | 73 | $query_args = array( |
| 77 | 74 | 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, |
| 78 | 75 | 'posts_per_page' => 9, |
| 79 | 76 | 'paged' => filter_input( |
| 80 | - INPUT_GET, | |
| 81 | - 'page', | |
| 82 | - FILTER_VALIDATE_INT, | |
| 83 | - array( | |
| 77 | + INPUT_GET, 'page', FILTER_VALIDATE_INT, array( | |
| 84 | 78 | 'options' => array( |
| 85 | 79 | 'min_range' => 1, |
| 86 | 80 | 'default' => 1, |
| 87 | 81 | ), |
| @@ -88,13 +82,8 @@ | ||
| 88 | 82 | ) |
| 89 | 83 | ), |
| 90 | 84 | ); |
| 91 | 85 | $filter = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING ); |
| 92 | - if ( empty( $filter ) ) { | |
| 93 | - // 'filter' is from the modal from the add media button. | |
| 94 | - $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING ); | |
| 95 | - } | |
| 96 | - | |
| 97 | 86 | if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) { |
| 98 | 87 | $query_args['meta_query'] = array( |
| 99 | 88 | array( |
| 100 | 89 | 'key' => Visualizer_Plugin::CF_CHART_TYPE, |
| @@ -108,18 +97,8 @@ | ||
| 108 | 97 | while ( $query->have_posts() ) { |
| 109 | 98 | $chart = $query->next_post(); |
| 110 | 99 | $chart_data = $this->_getChartArray( $chart ); |
| 111 | 100 | $chart_data['id'] = $chart->ID; |
| 112 | - $chart_data['library'] = $this->load_chart_type( $chart->ID ); | |
| 113 | - $css = ''; | |
| 114 | - $settings = $chart_data['settings']; | |
| 115 | - $arguments = $this->get_inline_custom_css( 'visualizer-chart-' . $chart->ID, $settings ); | |
| 116 | - if ( ! empty( $arguments ) ) { | |
| 117 | - $css = $arguments[0]; | |
| 118 | - $settings = $arguments[1]; | |
| 119 | - } | |
| 120 | - $chart_data['settings'] = $settings; | |
| 121 | - $chart_data['css'] = $css; | |
| 122 | 101 | $charts[] = $chart_data; |
| 123 | 102 | } |
| 124 | 103 | self::_sendResponse( |
| 125 | 104 | array( |
| @@ -147,30 +126,14 @@ | ||
| 147 | 126 | } |
| 148 | 127 | $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 149 | 128 | $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type ); |
| 150 | 129 | $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type ); |
| 151 | - $library = $this->load_chart_type( $chart->ID ); | |
| 152 | 130 | |
| 153 | - $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 154 | - $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type ); | |
| 155 | - if ( ! empty( $atts['settings'] ) ) { | |
| 156 | - $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type ); | |
| 157 | - } | |
| 158 | - | |
| 159 | - $css = ''; | |
| 160 | - $arguments = $this->get_inline_custom_css( 'visualizer-' . $chart->ID, $settings ); | |
| 161 | - if ( ! empty( $arguments ) ) { | |
| 162 | - $css = $arguments[0]; | |
| 163 | - $settings = $arguments[1]; | |
| 164 | - } | |
| 165 | - | |
| 166 | 131 | return array( |
| 167 | 132 | 'type' => $type, |
| 168 | 133 | 'series' => $series, |
| 169 | - 'settings' => $settings, | |
| 134 | + 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ), | |
| 170 | 135 | 'data' => $data, |
| 171 | - 'library' => $library, | |
| 172 | - 'css' => $css, | |
| 173 | 136 | ); |
| 174 | 137 | } |
| 175 | 138 | |
| 176 | 139 | /** |
| @@ -204,12 +167,9 @@ | ||
| 204 | 167 | $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) ); |
| 205 | 168 | $capable = current_user_can( 'delete_posts' ); |
| 206 | 169 | if ( $nonce && $capable ) { |
| 207 | 170 | $chart_id = filter_input( |
| 208 | - $input_method, | |
| 209 | - 'chart', | |
| 210 | - FILTER_VALIDATE_INT, | |
| 211 | - array( | |
| 171 | + $input_method, 'chart', FILTER_VALIDATE_INT, array( | |
| 212 | 172 | 'options' => array( |
| 213 | 173 | 'min_range' => 1, |
| 214 | 174 | ), |
| 215 | 175 | ) |
| @@ -245,9 +205,9 @@ | ||
| 245 | 205 | defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 ); |
| 246 | 206 | // check chart, if chart not exists, will create new one and redirects to the same page with proper chart id |
| 247 | 207 | $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; |
| 248 | 208 | if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { |
| 249 | - $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line'; | |
| 209 | + $default_type = 'line'; | |
| 250 | 210 | $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' ); |
| 251 | 211 | $source->fetch(); |
| 252 | 212 | $chart_id = wp_insert_post( |
| 253 | 213 | array( |
| @@ -263,11 +223,9 @@ | ||
| 263 | 223 | add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 ); |
| 264 | 224 | add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); |
| 265 | 225 | add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 266 | 226 | add_post_meta( |
| 267 | - $chart_id, | |
| 268 | - Visualizer_Plugin::CF_SETTINGS, | |
| 269 | - array( | |
| 227 | + $chart_id, Visualizer_Plugin::CF_SETTINGS, array( | |
| 270 | 228 | 'focusTarget' => 'datum', |
| 271 | 229 | ) |
| 272 | 230 | ); |
| 273 | 231 | do_action( 'visualizer_pro_new_chart_defaults', $chart_id ); |
| @@ -274,11 +232,8 @@ | ||
| 274 | 232 | } |
| 275 | 233 | wp_redirect( add_query_arg( 'chart', (int) $chart_id ) ); |
| 276 | 234 | defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); |
| 277 | 235 | } |
| 278 | - | |
| 279 | - $this->load_chart_type( $chart_id ); | |
| 280 | - | |
| 281 | 236 | // enqueue and register scripts and styles |
| 282 | 237 | wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION ); |
| 283 | 238 | wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION ); |
| 284 | 239 | |
| @@ -283,25 +238,22 @@ | ||
| 283 | 238 | wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION ); |
| 284 | 239 | |
| 285 | 240 | wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION ); |
| 286 | 241 | wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true ); |
| 287 | - wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true ); | |
| 242 | + wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); | |
| 243 | + wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true ); | |
| 288 | 244 | wp_register_script( |
| 289 | - 'visualizer-render', | |
| 290 | - VISUALIZER_ABSURL . 'js/render-facade.js', | |
| 291 | - apply_filters( 'visualizer_assets_render', array( 'visualizer-frame', 'visualizer-customization' ), false ), | |
| 292 | - Visualizer_Plugin::VERSION, | |
| 293 | - true | |
| 245 | + 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( | |
| 246 | + 'google-jsapi-old', | |
| 247 | + 'google-jsapi-new', | |
| 248 | + 'visualizer-frame', | |
| 249 | + ), Visualizer_Plugin::VERSION, true | |
| 294 | 250 | ); |
| 295 | 251 | wp_register_script( |
| 296 | - 'visualizer-preview', | |
| 297 | - VISUALIZER_ABSURL . 'js/preview.js', | |
| 298 | - array( | |
| 252 | + 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array( | |
| 299 | 253 | 'wp-color-picker', |
| 300 | 254 | 'visualizer-render', |
| 301 | - ), | |
| 302 | - Visualizer_Plugin::VERSION, | |
| 303 | - true | |
| 255 | + ), Visualizer_Plugin::VERSION, true | |
| 304 | 256 | ); |
| 305 | 257 | // added by Ash/Upwork |
| 306 | 258 | if ( VISUALIZER_PRO ) { |
| 307 | 259 | global $Visualizer_Pro; |
| @@ -309,27 +261,11 @@ | ||
| 309 | 261 | } |
| 310 | 262 | // dispatch pages |
| 311 | 263 | $this->_chart = get_post( $chart_id ); |
| 312 | 264 | $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer'; |
| 313 | - | |
| 314 | - // skip chart type pages only for existing charts. | |
| 315 | - if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status && ( ! empty( $_GET['tab'] ) && 'visualizer' === $_GET['tab'] ) ) { | |
| 316 | - $tab = 'settings'; | |
| 317 | - } | |
| 318 | - | |
| 319 | - if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) { | |
| 320 | - // if the cancel button is clicked. | |
| 321 | - $this->undoRevisions( $chart_id, true ); | |
| 322 | - } elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) { | |
| 323 | - // if the save button is clicked. | |
| 324 | - $this->undoRevisions( $chart_id, false ); | |
| 325 | - } else { | |
| 326 | - // if the edit button is clicked. | |
| 327 | - $this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart ); | |
| 328 | - } | |
| 329 | - | |
| 330 | 265 | switch ( $tab ) { |
| 331 | 266 | case 'settings': |
| 267 | + // changed by Ash/Upwork | |
| 332 | 268 | $this->_handleDataAndSettingsPage(); |
| 333 | 269 | break; |
| 334 | 270 | case 'type': // fall through. |
| 335 | 271 | case 'visualizer': // fall through. |
| @@ -342,62 +278,8 @@ | ||
| 342 | 278 | defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); |
| 343 | 279 | } |
| 344 | 280 | |
| 345 | 281 | /** |
| 346 | - * Load code editor assets. | |
| 347 | - */ | |
| 348 | - private function loadCodeEditorAssets() { | |
| 349 | - global $wp_version; | |
| 350 | - | |
| 351 | - if ( ! VISUALIZER_PRO ) { | |
| 352 | - return; | |
| 353 | - } | |
| 354 | - | |
| 355 | - $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping(); | |
| 356 | - | |
| 357 | - // data tables assets. | |
| 358 | - wp_register_script( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION ); | |
| 359 | - wp_register_style( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css', array(), Visualizer_Plugin::VERSION ); | |
| 360 | - wp_register_style( 'visualizer-datatables-ui', '//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css', array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION ); | |
| 361 | - | |
| 362 | - wp_enqueue_script( 'visualizer-datatables' ); | |
| 363 | - wp_enqueue_style( 'visualizer-datatables-ui' ); | |
| 364 | - | |
| 365 | - if ( version_compare( $wp_version, '4.9.0', '<' ) ) { | |
| 366 | - // code mirror assets. | |
| 367 | - wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION ); | |
| 368 | - wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 369 | - wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 370 | - wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 371 | - wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 372 | - wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 373 | - 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 ); | |
| 374 | - wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION ); | |
| 375 | - wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION ); | |
| 376 | - | |
| 377 | - wp_enqueue_script( 'visualizer-codemirror-hint' ); | |
| 378 | - wp_enqueue_style( 'visualizer-codemirror-hint' ); | |
| 379 | - } else { | |
| 380 | - wp_enqueue_code_editor( | |
| 381 | - array( | |
| 382 | - 'type' => 'sql', | |
| 383 | - 'codemirror' => array( | |
| 384 | - 'autofocus' => true, | |
| 385 | - 'lineWrapping' => true, | |
| 386 | - 'dragDrop' => false, | |
| 387 | - 'matchBrackets' => true, | |
| 388 | - 'autoCloseBrackets' => true, | |
| 389 | - 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ), | |
| 390 | - 'hintOptions' => array( 'tables' => $table_col_mapping ), | |
| 391 | - ), | |
| 392 | - ) | |
| 393 | - ); | |
| 394 | - } | |
| 395 | - | |
| 396 | - return $table_col_mapping; | |
| 397 | - } | |
| 398 | - | |
| 399 | - /** | |
| 400 | 282 | * Handle data and settings page |
| 401 | 283 | */ |
| 402 | 284 | private function _handleDataAndSettingsPage() { |
| 403 | 285 | if ( isset( $_POST['map_api_key'] ) ) { |
| @@ -405,18 +287,11 @@ | ||
| 405 | 287 | } |
| 406 | 288 | if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) { |
| 407 | 289 | if ( $this->_chart->post_status == 'auto-draft' ) { |
| 408 | 290 | $this->_chart->post_status = 'publish'; |
| 409 | - | |
| 410 | - // 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. | |
| 411 | - // we do not want any difference in data so disable revisions temporarily. | |
| 412 | - add_filter( 'wp_revisions_to_keep', '__return_false' ); | |
| 413 | 291 | wp_update_post( $this->_chart->to_array() ); |
| 414 | 292 | } |
| 415 | - // save meta data only when it is NOT being canceled. | |
| 416 | - if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) { | |
| 417 | - update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST ); | |
| 418 | - } | |
| 293 | + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST ); | |
| 419 | 294 | $render = new Visualizer_Render_Page_Send(); |
| 420 | 295 | $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID ); |
| 421 | 296 | wp_iframe( array( $render, 'render' ) ); |
| 422 | 297 | |
| @@ -436,20 +311,15 @@ | ||
| 436 | 311 | $sidebar->__data = $data['data']; |
| 437 | 312 | } |
| 438 | 313 | } |
| 439 | 314 | unset( $data['settings']['width'], $data['settings']['height'] ); |
| 315 | + wp_enqueue_style( 'visualizer-frame' ); | |
| 440 | 316 | wp_enqueue_style( 'wp-color-picker' ); |
| 441 | 317 | wp_enqueue_style( 'visualizer-frame' ); |
| 442 | 318 | wp_enqueue_script( 'visualizer-preview' ); |
| 443 | - wp_enqueue_script( 'visualizer-chosen' ); | |
| 444 | 319 | wp_enqueue_script( 'visualizer-render' ); |
| 445 | - | |
| 446 | - $table_col_mapping = $this->loadCodeEditorAssets(); | |
| 447 | - | |
| 448 | 320 | wp_localize_script( |
| 449 | - 'visualizer-render', | |
| 450 | - 'visualizer', | |
| 451 | - array( | |
| 321 | + 'visualizer-render', 'visualizer', array( | |
| 452 | 322 | 'l10n' => array( |
| 453 | 323 | 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), |
| 454 | 324 | 'loading' => esc_html__( 'Loading...', 'visualizer' ), |
| 455 | 325 | ), |
| @@ -454,43 +324,29 @@ | ||
| 454 | 324 | 'loading' => esc_html__( 'Loading...', 'visualizer' ), |
| 455 | 325 | ), |
| 456 | 326 | 'charts' => array( |
| 457 | 327 | 'canvas' => $data, |
| 458 | - 'id' => $this->_chart->ID, | |
| 459 | 328 | ), |
| 460 | - 'language' => $this->get_language(), | |
| 461 | 329 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 462 | - 'ajax' => array( | |
| 330 | + 'ajax' => array( | |
| 463 | 331 | 'url' => admin_url( 'admin-ajax.php' ), |
| 464 | 332 | 'nonces' => array( |
| 465 | 333 | 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ), |
| 466 | - 'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ), | |
| 467 | 334 | ), |
| 468 | 335 | 'actions' => array( |
| 469 | 336 | 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA, |
| 470 | - 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA, | |
| 471 | 337 | ), |
| 472 | 338 | ), |
| 473 | - 'db_query' => array( | |
| 474 | - 'tables' => $table_col_mapping, | |
| 475 | - ), | |
| 476 | - 'is_pro' => VISUALIZER_PRO, | |
| 477 | - 'page_type' => 'chart', | |
| 478 | 339 | ) |
| 479 | 340 | ); |
| 480 | - | |
| 481 | 341 | $render = new Visualizer_Render_Page_Data(); |
| 482 | 342 | $render->chart = $this->_chart; |
| 483 | 343 | $render->type = $data['type']; |
| 484 | - $render->custom_css = $data['css']; | |
| 485 | 344 | $render->sidebar = $sidebar; |
| 486 | 345 | if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) { |
| 487 | 346 | $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART |
| 488 | 347 | ? esc_html__( 'Save Chart', 'visualizer' ) |
| 489 | 348 | : esc_html__( 'Create Chart', 'visualizer' ); |
| 490 | - if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) { | |
| 491 | - $render->cancel_button = esc_html__( 'Cancel', 'visualizer' ); | |
| 492 | - } | |
| 493 | 349 | } else { |
| 494 | 350 | $render->button = esc_attr__( 'Insert Chart', 'visualizer' ); |
| 495 | 351 | } |
| 496 | 352 | if ( VISUALIZER_PRO ) { |
| @@ -558,32 +414,20 @@ | ||
| 558 | 414 | * |
| 559 | 415 | * @access public |
| 560 | 416 | */ |
| 561 | 417 | public function uploadData() { |
| 562 | - // if this is being called internally from pro and VISUALIZER_DO_NOT_DIE is set. | |
| 563 | - // otherwise, assume this is a normal web request. | |
| 564 | - $can_die = ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ); | |
| 565 | - | |
| 566 | 418 | // validate nonce |
| 419 | + // do not use filter_input as it does not work for phpunit test cases, use filter_var instead | |
| 567 | 420 | if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) { |
| 568 | - if ( ! $can_die ) { | |
| 569 | - return; | |
| 570 | - } | |
| 571 | 421 | status_header( 403 ); |
| 572 | 422 | exit; |
| 573 | 423 | } |
| 574 | - | |
| 575 | 424 | // check chart, if chart exists |
| 576 | - // do not use filter_input as it does not work for phpunit test cases, use filter_var instead | |
| 577 | 425 | $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; |
| 578 | 426 | if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { |
| 579 | - if ( ! $can_die ) { | |
| 580 | - return; | |
| 581 | - } | |
| 582 | 427 | status_header( 400 ); |
| 583 | 428 | exit; |
| 584 | 429 | } |
| 585 | - | |
| 586 | 430 | if ( ! isset( $_POST['vz-import-time'] ) ) { |
| 587 | 431 | apply_filters( 'visualizer_pro_remove_schedule', $chart_id ); |
| 588 | 432 | } |
| 589 | 433 | |
| @@ -589,12 +433,8 @@ | ||
| 589 | 433 | |
| 590 | 434 | if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) { |
| 591 | 435 | // delete the filters in case this chart is being uploaded from other data sources |
| 592 | 436 | delete_post_meta( $chart_id, 'visualizer-filter-config' ); |
| 593 | - | |
| 594 | - // delete "import from db" specific parameters. | |
| 595 | - delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY ); | |
| 596 | - delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE ); | |
| 597 | 437 | } |
| 598 | 438 | |
| 599 | 439 | $source = null; |
| 600 | 440 | $render = new Visualizer_Render_Page_Update(); |
| @@ -604,34 +444,22 @@ | ||
| 604 | 444 | apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] ); |
| 605 | 445 | } |
| 606 | 446 | } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) { |
| 607 | 447 | $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] ); |
| 448 | + // Added by Ash/Upwork | |
| 608 | 449 | } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) { |
| 609 | 450 | $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' ); |
| 451 | + // Added by Ash/Upwork | |
| 610 | 452 | } else { |
| 611 | 453 | $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' ); |
| 612 | 454 | } |
| 613 | 455 | if ( $source ) { |
| 614 | 456 | if ( $source->fetch() ) { |
| 615 | - $content = $source->getData(); | |
| 616 | - $populate = true; | |
| 617 | - if ( is_string( $content ) && is_array( unserialize( $content ) ) ) { | |
| 618 | - $json = unserialize( $content ); | |
| 619 | - // if source exists, so should data. if source exists but data is blank, do not populate the chart. | |
| 620 | - // if we populate the data even if it is empty, the chart will show "Table has no columns". | |
| 621 | - if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) { | |
| 622 | - 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__ ); | |
| 623 | - $populate = false; | |
| 624 | - } | |
| 625 | - } | |
| 626 | - if ( $populate ) { | |
| 627 | - $chart->post_content = $content; | |
| 628 | - } | |
| 457 | + $chart->post_content = $source->getData(); | |
| 629 | 458 | wp_update_post( $chart->to_array() ); |
| 630 | 459 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 631 | 460 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); |
| 632 | 461 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 ); |
| 633 | - $render->id = $chart->ID; | |
| 634 | 462 | $render->data = json_encode( $source->getRawData() ); |
| 635 | 463 | $render->series = json_encode( $source->getSeries() ); |
| 636 | 464 | } else { |
| 637 | 465 | $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' ); |
| @@ -637,12 +465,11 @@ | ||
| 637 | 465 | $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' ); |
| 638 | 466 | } |
| 639 | 467 | } |
| 640 | 468 | $render->render(); |
| 641 | - if ( ! $can_die ) { | |
| 642 | - return; | |
| 469 | + if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) { | |
| 470 | + defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 643 | 471 | } |
| 644 | - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 645 | 472 | } |
| 646 | 473 | |
| 647 | 474 | /** |
| 648 | 475 | * Clones the chart. |
| @@ -656,12 +483,9 @@ | ||
| 656 | 483 | $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART ); |
| 657 | 484 | $capable = current_user_can( 'edit_posts' ); |
| 658 | 485 | if ( $nonce && $capable ) { |
| 659 | 486 | $chart_id = filter_input( |
| 660 | - INPUT_GET, | |
| 661 | - 'chart', | |
| 662 | - FILTER_VALIDATE_INT, | |
| 663 | - array( | |
| 487 | + INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( | |
| 664 | 488 | 'options' => array( |
| 665 | 489 | 'min_range' => 1, |
| 666 | 490 | ), |
| 667 | 491 | ) |
| @@ -691,10 +515,9 @@ | ||
| 691 | 515 | $redirect = add_query_arg( |
| 692 | 516 | array( |
| 693 | 517 | 'page' => 'visualizer', |
| 694 | 518 | 'type' => filter_input( INPUT_GET, 'type' ), |
| 695 | - ), | |
| 696 | - admin_url( 'upload.php' ) | |
| 519 | + ), admin_url( 'upload.php' ) | |
| 697 | 520 | ); |
| 698 | 521 | } |
| 699 | 522 | } |
| 700 | 523 | wp_redirect( $redirect ); |
| @@ -712,11 +535,9 @@ | ||
| 712 | 535 | check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' ); |
| 713 | 536 | $capable = current_user_can( 'edit_posts' ); |
| 714 | 537 | if ( $capable ) { |
| 715 | 538 | $chart_id = isset( $_GET['chart'] ) ? filter_var( |
| 716 | - $_GET['chart'], | |
| 717 | - FILTER_VALIDATE_INT, | |
| 718 | - array( | |
| 539 | + $_GET['chart'], FILTER_VALIDATE_INT, array( | |
| 719 | 540 | 'options' => array( |
| 720 | 541 | 'min_range' => 1, |
| 721 | 542 | ), |
| 722 | 543 | ) |
| @@ -747,11 +568,9 @@ | ||
| 747 | 568 | unset( $data['settings']['width'], $data['settings']['height'] ); |
| 748 | 569 | wp_enqueue_style( 'visualizer-frame' ); |
| 749 | 570 | wp_enqueue_script( 'visualizer-render' ); |
| 750 | 571 | wp_localize_script( |
| 751 | - 'visualizer-render', | |
| 752 | - 'visualizer', | |
| 753 | - array( | |
| 572 | + 'visualizer-render', 'visualizer', array( | |
| 754 | 573 | 'l10n' => array( |
| 755 | 574 | 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), |
| 756 | 575 | 'loading' => esc_html__( 'Loading...', 'visualizer' ), |
| 757 | 576 | ), |
| @@ -767,80 +586,6 @@ | ||
| 767 | 586 | } |
| 768 | 587 | // Added by Ash/Upwork |
| 769 | 588 | $this->_addAction( 'admin_head', 'renderFlattrScript' ); |
| 770 | 589 | wp_iframe( array( $render, 'render' ) ); |
| 771 | - } | |
| 772 | - | |
| 773 | - /** | |
| 774 | - * Returns the data for the query. | |
| 775 | - * | |
| 776 | - * @access public | |
| 777 | - */ | |
| 778 | - public function getQueryData() { | |
| 779 | - check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' ); | |
| 780 | - | |
| 781 | - $params = wp_parse_args( $_POST['params'] ); | |
| 782 | - $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) ); | |
| 783 | - $html = $source->fetch( true ); | |
| 784 | - $error = ''; | |
| 785 | - if ( empty( $html ) ) { | |
| 786 | - $error = $source->get_error(); | |
| 787 | - wp_send_json_error( array( 'msg' => $error ) ); | |
| 788 | - } | |
| 789 | - wp_send_json_success( array( 'table' => $html ) ); | |
| 790 | - } | |
| 791 | - | |
| 792 | - /** | |
| 793 | - * Saves the query and the schedule. | |
| 794 | - * | |
| 795 | - * @access public | |
| 796 | - */ | |
| 797 | - public function saveQuery() { | |
| 798 | - check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' ); | |
| 799 | - | |
| 800 | - $chart_id = filter_input( | |
| 801 | - INPUT_GET, | |
| 802 | - 'chart', | |
| 803 | - FILTER_VALIDATE_INT, | |
| 804 | - array( | |
| 805 | - 'options' => array( | |
| 806 | - 'min_range' => 1, | |
| 807 | - ), | |
| 808 | - ) | |
| 809 | - ); | |
| 810 | - | |
| 811 | - $render = new Visualizer_Render_Page_Update(); | |
| 812 | - if ( $chart_id ) { | |
| 813 | - $params = wp_parse_args( $_POST['params'] ); | |
| 814 | - $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) ); | |
| 815 | - $source->fetch( false ); | |
| 816 | - $error = $source->get_error(); | |
| 817 | - if ( empty( $error ) ) { | |
| 818 | - $hours = $_POST['refresh']; | |
| 819 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) ); | |
| 820 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); | |
| 821 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); | |
| 822 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours ); | |
| 823 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 ); | |
| 824 | - | |
| 825 | - $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() ); | |
| 826 | - $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS; | |
| 827 | - update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules ); | |
| 828 | - | |
| 829 | - wp_update_post( | |
| 830 | - array( | |
| 831 | - 'ID' => $chart_id, | |
| 832 | - 'post_content' => $source->getData(), | |
| 833 | - ) | |
| 834 | - ); | |
| 835 | - $render->data = json_encode( $source->getRawData() ); | |
| 836 | - $render->series = json_encode( $source->getSeries() ); | |
| 837 | - } else { | |
| 838 | - $render->message = $error; | |
| 839 | - } | |
| 840 | - } | |
| 841 | - $render->render(); | |
| 842 | - if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) { | |
| 843 | - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 844 | - } | |
| 845 | 590 | } |
| 846 | 591 | } |
