| @@ -67,9 +67,10 @@ | ||
| 67 | 67 | $this->_addFilter( Visualizer_Plugin::FILTER_UNDO_REVISIONS, 'undoRevisions', 10, 2 ); |
| 68 | 68 | $this->_addFilter( Visualizer_Plugin::FILTER_HANDLE_REVISIONS, 'handleExistingRevisions', 10, 2 ); |
| 69 | 69 | $this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, 'getDataAs', 10, 3 ); |
| 70 | 70 | $this->_addAction( 'pre_get_posts', 'PreGetPosts' ); |
| 71 | - register_shutdown_function( array( $this, 'onShutdown' ) ); | |
| 71 | + register_shutdown_function( array($this, 'onShutdown') ); | |
| 72 | + | |
| 72 | 73 | } |
| 73 | 74 | |
| 74 | 75 | /** |
| 75 | 76 | * Register a shutdown hook to catch fatal errors. |
| @@ -112,18 +113,18 @@ | ||
| 112 | 113 | * @access public |
| 113 | 114 | * @param string $tag The name of the AJAX action to which the $method is hooked. |
| 114 | 115 | * @param string $method Optional. The name of the method to be called. If the name of the method is not provided, tag name will be used as method name. |
| 115 | 116 | * @param bool $methodClass The root of the method. |
| 116 | - * @param boolean $logged_in Optional. Determines if we should register hook for logged in users. | |
| 117 | - * @param boolean $logged_out Optional. Determines if we should register hook for not logged in users. | |
| 117 | + * @param boolean $private Optional. Determines if we should register hook for logged in users. | |
| 118 | + * @param boolean $public Optional. Determines if we should register hook for not logged in users. | |
| 118 | 119 | * @return Visualizer_Module |
| 119 | 120 | */ |
| 120 | - protected function _addAjaxAction( $tag, $method = '', $methodClass = null, $logged_in = true, $logged_out = false ) { | |
| 121 | - if ( $logged_in ) { | |
| 121 | + protected function _addAjaxAction( $tag, $method = '', $methodClass = null, $private = true, $public = false ) { | |
| 122 | + if ( $private ) { | |
| 122 | 123 | $this->_addAction( 'wp_ajax_' . $tag, $method, $methodClass ); |
| 123 | 124 | } |
| 124 | 125 | |
| 125 | - if ( $logged_out ) { | |
| 126 | + if ( $public ) { | |
| 126 | 127 | $this->_addAction( 'wp_ajax_nopriv_' . $tag, $method, $methodClass ); |
| 127 | 128 | } |
| 128 | 129 | |
| 129 | 130 | return $this; |
| @@ -136,9 +137,9 @@ | ||
| 136 | 137 | * @uses add_filter() To register filter hook. |
| 137 | 138 | * |
| 138 | 139 | * @access protected |
| 139 | 140 | * @param string $tag The name of the filter to hook the $method to. |
| 140 | - * @param string $method The name of the method to be called when the filter is applied. | |
| 141 | + * @param type $method The name of the method to be called when the filter is applied. | |
| 141 | 142 | * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action. |
| 142 | 143 | * @param int $accepted_args optional. The number of arguments the function accept (default 1). |
| 143 | 144 | * @return Visualizer_Module |
| 144 | 145 | */ |
| @@ -167,9 +168,9 @@ | ||
| 167 | 168 | * A wrapper around the actual function _getDataAs. This function is invoked as a filter. |
| 168 | 169 | * |
| 169 | 170 | * @since 3.2.0 |
| 170 | 171 | */ |
| 171 | - public function getDataAs( $data, $chart_id, $type ) { | |
| 172 | + public function getDataAs( $final, $chart_id, $type ) { | |
| 172 | 173 | return $this->_getDataAs( $chart_id, $type ); |
| 173 | 174 | } |
| 174 | 175 | |
| 175 | 176 | /** |
| @@ -233,8 +234,9 @@ | ||
| 233 | 234 | $title = 'visualizer#' . $chart_id; |
| 234 | 235 | } |
| 235 | 236 | |
| 236 | 237 | $filename = $title; |
| 238 | + | |
| 237 | 239 | switch ( $type ) { |
| 238 | 240 | case 'csv': |
| 239 | 241 | $final = $this->_getCSV( $rows, $filename, false ); |
| 240 | 242 | break; |
| @@ -268,17 +270,14 @@ | ||
| 268 | 270 | |
| 269 | 271 | $bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF ); |
| 270 | 272 | // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged |
| 271 | 273 | $fp = function_exists( 'tmpfile' ) ? @tmpfile() : null; |
| 272 | - if ( ! $fp ) { | |
| 274 | + if ( null === $fp ) { | |
| 273 | 275 | if ( ! function_exists( 'wp_tempnam' ) ) { |
| 274 | 276 | require_once ABSPATH . 'wp-admin/includes/file.php'; |
| 275 | 277 | } |
| 276 | 278 | $fp = fopen( wp_tempnam(), 'w+' ); |
| 277 | 279 | } |
| 278 | - if ( ! $fp ) { | |
| 279 | - return array( 'csv' => '', 'name' => $filename, 'string' => '' ); | |
| 280 | - } | |
| 281 | 280 | if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) { |
| 282 | 281 | unset( $rows[1] ); |
| 283 | 282 | $rows = array_values( $rows ); |
| 284 | 283 | } |
| @@ -288,10 +287,10 @@ | ||
| 288 | 287 | fputcsv( $fp, $row ); |
| 289 | 288 | } |
| 290 | 289 | rewind( $fp ); |
| 291 | 290 | $csv = ''; |
| 292 | - $array = fgetcsv( $fp ); | |
| 293 | - while ( $array !== false ) { | |
| 291 | + // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition | |
| 292 | + while ( ( $array = fgetcsv( $fp ) ) !== false ) { | |
| 294 | 293 | if ( strlen( $csv ) > 0 ) { |
| 295 | 294 | $csv .= PHP_EOL; |
| 296 | 295 | } |
| 297 | 296 | // if enclosure is required, check every item of this line |
| @@ -305,10 +304,9 @@ | ||
| 305 | 304 | $temp_array[] = $item; |
| 306 | 305 | } |
| 307 | 306 | $array = $temp_array; |
| 308 | 307 | } |
| 309 | - $csv .= implode( ',', $array ); | |
| 310 | - $array = fgetcsv( $fp ); | |
| 308 | + $csv .= implode( ',', $array ); | |
| 311 | 309 | } |
| 312 | 310 | fclose( $fp ); |
| 313 | 311 | |
| 314 | 312 | return array( |
| @@ -325,16 +323,16 @@ | ||
| 325 | 323 | * @param array $rows The array of data. |
| 326 | 324 | * @param string $filename The name of the file to use. |
| 327 | 325 | */ |
| 328 | 326 | private function _getExcel( $rows, $filename ) { |
| 329 | - // OpenSpout allows for long sheet names, but let's keep the same limit for compatibility. | |
| 330 | - $chart = substr( $filename, 0, 30 ); | |
| 331 | - $filename .= '.xlsx'; | |
| 327 | + // PHPExcel did not like sheet names longer than 31 characters and we will assume the same with PhpSpreadsheet | |
| 328 | + $chart = substr( $filename, 0, 30 ); | |
| 329 | + $filename .= '.xlsx'; | |
| 332 | 330 | if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) { |
| 333 | 331 | unset( $rows[1] ); |
| 334 | 332 | $rows = array_values( $rows ); |
| 335 | 333 | $rows = array_map( |
| 336 | - function ( $r ) { | |
| 334 | + function( $r ) { | |
| 337 | 335 | return array_map( 'strval', $r ); |
| 338 | 336 | }, |
| 339 | 337 | $rows |
| 340 | 338 | ); |
| @@ -340,34 +338,24 @@ | ||
| 340 | 338 | ); |
| 341 | 339 | } |
| 342 | 340 | $vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php'; |
| 343 | 341 | if ( is_readable( $vendor_file ) ) { |
| 344 | - include_once $vendor_file; | |
| 342 | + include_once( $vendor_file ); | |
| 345 | 343 | } |
| 346 | - $xlsData = ''; | |
| 347 | - if ( class_exists( 'OpenSpout\Writer\Common\Creator\WriterEntityFactory' ) ) { | |
| 348 | - try { | |
| 349 | - // Use OpenSpout to create the XLSX file in memory. | |
| 350 | - $writer = \OpenSpout\Writer\Common\Creator\WriterEntityFactory::createXLSXWriter(); | |
| 351 | - $writer->openToFile( 'php://output' ); // Open to output instead of a file. | |
| 352 | - $writer->getCurrentSheet()->setName( sanitize_title( $chart ) ); | |
| 353 | - | |
| 354 | - // Write rows. | |
| 355 | - foreach ( $rows as $row ) { | |
| 356 | - $rowFromValues = \OpenSpout\Writer\Common\Creator\WriterEntityFactory::createRowFromArray( $row ); | |
| 357 | - $writer->addRow( $rowFromValues ); | |
| 358 | - } | |
| 359 | - | |
| 360 | - ob_start(); | |
| 361 | - $writer->close(); // Saves and closes the file in the output buffer. | |
| 362 | - $xlsData = ob_get_clean(); | |
| 363 | - } catch ( Exception $e ) { | |
| 364 | - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'OpenSpout writer error: ' . $e->getMessage(), 'error', __FILE__, __LINE__ ); | |
| 365 | - error_log( 'OpenSpout writer error: ' . $e->getMessage() ); | |
| 366 | - } | |
| 344 | + $xlsData = ''; | |
| 345 | + if ( class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) ) { | |
| 346 | + $doc = new PhpOffice\PhpSpreadsheet\Spreadsheet(); | |
| 347 | + $doc->getActiveSheet()->fromArray( $rows, null, 'A1' ); | |
| 348 | + $doc->getActiveSheet()->setTitle( sanitize_title( $chart ) ); | |
| 349 | + $doc = apply_filters( 'visualizer_excel_doc', $doc ); | |
| 350 | + $writer = PhpOffice\PhpSpreadsheet\IOFactory::createWriter( $doc, 'Xlsx' ); | |
| 351 | + ob_start(); | |
| 352 | + $writer->save( 'php://output' ); | |
| 353 | + $xlsData = ob_get_contents(); | |
| 354 | + ob_end_clean(); | |
| 367 | 355 | } else { |
| 368 | - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Class OpenSpout\Writer\Common\Creator\WriterEntityFactory does not exist!', 'error', __FILE__, __LINE__ ); | |
| 369 | - error_log( 'Class OpenSpout\Writer\Common\Creator\WriterEntityFactory does not exist!' ); | |
| 356 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Class PhpOffice\PhpSpreadsheet\Spreadsheet does not exist!', 'error', __FILE__, __LINE__ ); | |
| 357 | + error_log( 'Class PhpOffice\PhpSpreadsheet\Spreadsheet does not exist!' ); | |
| 370 | 358 | } |
| 371 | 359 | return array( |
| 372 | 360 | 'csv' => 'data:application/vnd.ms-excel;base64,' . base64_encode( $xlsData ), |
| 373 | 361 | 'name' => $filename, |
| @@ -404,9 +392,9 @@ | ||
| 404 | 392 | $index = 0; |
| 405 | 393 | foreach ( $rows as $row ) { |
| 406 | 394 | // skip the data type row. |
| 407 | 395 | if ( 1 === $index ) { |
| 408 | - ++$index; | |
| 396 | + $index++; | |
| 409 | 397 | continue; |
| 410 | 398 | } |
| 411 | 399 | |
| 412 | 400 | $table .= '<tr>'; |
| @@ -417,9 +405,9 @@ | ||
| 417 | 405 | $table .= '<td>' . $col . '</td>'; |
| 418 | 406 | } |
| 419 | 407 | } |
| 420 | 408 | $table .= '</tr>'; |
| 421 | - ++$index; | |
| 409 | + $index++; | |
| 422 | 410 | } |
| 423 | 411 | $table .= '</table>'; |
| 424 | 412 | |
| 425 | 413 | $html .= apply_filters( 'visualizer_print_table', $table ) . ' |
| @@ -432,11 +420,11 @@ | ||
| 432 | 420 | |
| 433 | 421 | /** |
| 434 | 422 | * Disable revisions temporarily for visualizer post type. |
| 435 | 423 | */ |
| 436 | - final protected function disableRevisionsTemporarily() { | |
| 424 | + protected final function disableRevisionsTemporarily() { | |
| 437 | 425 | add_filter( |
| 438 | - 'wp_revisions_to_keep', function ( $num, $post ) { | |
| 426 | + 'wp_revisions_to_keep', function( $num, $post ) { | |
| 439 | 427 | if ( $post->post_type === Visualizer_Plugin::CPT_VISUALIZER ) { |
| 440 | 428 | return 0; |
| 441 | 429 | } |
| 442 | 430 | return $num; |
| @@ -448,9 +436,9 @@ | ||
| 448 | 436 | * Undo revisions for the chart, and if necessary, restore the earliest version. |
| 449 | 437 | * |
| 450 | 438 | * @return bool If any revisions were found. |
| 451 | 439 | */ |
| 452 | - final public function undoRevisions( $chart_id, $restore = false ) { | |
| 440 | + public final function undoRevisions( $chart_id, $restore = false ) { | |
| 453 | 441 | do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'undoRevisions for %d with%s restore', $chart_id, ( $restore ? '' : 'out' ) ), 'debug', __FILE__, __LINE__ ); |
| 454 | 442 | if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) { |
| 455 | 443 | return false; |
| 456 | 444 | } |
| @@ -480,19 +468,14 @@ | ||
| 480 | 468 | |
| 481 | 469 | /** |
| 482 | 470 | * If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing. |
| 483 | 471 | */ |
| 484 | - final public function handleExistingRevisions( $chart_id, $chart ) { | |
| 472 | + public final function handleExistingRevisions( $chart_id, $chart ) { | |
| 485 | 473 | |
| 486 | 474 | do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ ); |
| 487 | 475 | if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) { |
| 488 | 476 | return $chart_id; |
| 489 | 477 | } |
| 490 | - // AI Builder (D3) charts use their own publish flow — skip the classic revision-restore | |
| 491 | - // mechanism, which would otherwise overwrite the saved title and settings. | |
| 492 | - if ( 'd3' === get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true ) ) { | |
| 493 | - return $chart; | |
| 494 | - } | |
| 495 | 478 | // undo revisions. |
| 496 | 479 | $revisions_found = $this->undoRevisions( $chart_id, true ); |
| 497 | 480 | |
| 498 | 481 | // create revision for the edit action. |
| @@ -536,55 +519,52 @@ | ||
| 536 | 519 | if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) { |
| 537 | 520 | return $default; |
| 538 | 521 | } |
| 539 | 522 | |
| 540 | - try { | |
| 541 | - require_once ABSPATH . 'wp-admin/includes/file.php'; | |
| 542 | - WP_Filesystem(); | |
| 543 | - global $wp_filesystem; | |
| 544 | - if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) { | |
| 545 | - return $default; | |
| 546 | - } | |
| 523 | + require_once( ABSPATH . 'wp-admin/includes/file.php' ); | |
| 524 | + WP_Filesystem(); | |
| 525 | + global $wp_filesystem; | |
| 526 | + if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) { | |
| 527 | + $creds = request_filesystem_credentials( site_url() ); | |
| 528 | + wp_filesystem( $creds ); | |
| 529 | + } | |
| 547 | 530 | |
| 548 | - $multisite_arg = '/'; | |
| 549 | - if ( is_multisite() && ! is_main_site() ) { | |
| 550 | - $multisite_arg = '/sites/' . get_current_blog_id() . '/'; | |
| 551 | - } | |
| 531 | + $multisite_arg = '/'; | |
| 532 | + if ( is_multisite() && ! is_main_site() ) { | |
| 533 | + $multisite_arg = '/sites/' . get_current_blog_id() . '/'; | |
| 534 | + } | |
| 552 | 535 | |
| 553 | - $dir = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer'; | |
| 554 | - $file = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer/customization.js'; | |
| 536 | + $dir = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer'; | |
| 537 | + $file = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer/customization.js'; | |
| 555 | 538 | |
| 556 | - if ( $wp_filesystem->is_readable( $file ) ) { | |
| 557 | - return $specific; | |
| 558 | - } | |
| 539 | + if ( $wp_filesystem->is_readable( $file ) ) { | |
| 540 | + return $specific; | |
| 541 | + } | |
| 559 | 542 | |
| 560 | - if ( $wp_filesystem->exists( $file ) && ! $wp_filesystem->is_readable( $file ) ) { | |
| 561 | - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to read file %s', $file ), 'error', __FILE__, __LINE__ ); | |
| 543 | + if ( $wp_filesystem->exists( $file ) && ! $wp_filesystem->is_readable( $file ) ) { | |
| 544 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to read file %s', $file ), 'error', __FILE__, __LINE__ ); | |
| 545 | + return $default; | |
| 546 | + } | |
| 547 | + | |
| 548 | + if ( ! $wp_filesystem->exists( $dir ) ) { | |
| 549 | + // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found | |
| 550 | + if ( ( $done = $wp_filesystem->mkdir( $dir ) ) === false ) { | |
| 551 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to create directory %s', $dir ), 'error', __FILE__, __LINE__ ); | |
| 562 | 552 | return $default; |
| 563 | 553 | } |
| 554 | + } | |
| 564 | 555 | |
| 565 | - if ( ! $wp_filesystem->exists( $dir ) ) { | |
| 566 | - $done = $wp_filesystem->mkdir( $dir ); | |
| 567 | - if ( $done === false ) { | |
| 568 | - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to create directory %s', $dir ), 'error', __FILE__, __LINE__ ); | |
| 569 | - return $default; | |
| 570 | - } | |
| 556 | + // if file does not exist, copy. | |
| 557 | + if ( ! $wp_filesystem->exists( $file ) ) { | |
| 558 | + $src = str_replace( ABSPATH, $wp_filesystem->abspath(), VISUALIZER_ABSPATH . '/js/customization.js' ); | |
| 559 | + // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found | |
| 560 | + if ( ( $done = $wp_filesystem->copy( $src, $file ) ) === false ) { | |
| 561 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to copy file %s to %s', $src, $file ), 'error', __FILE__, __LINE__ ); | |
| 562 | + return $default; | |
| 571 | 563 | } |
| 564 | + } | |
| 572 | 565 | |
| 573 | - // if file does not exist, copy. | |
| 574 | - if ( ! $wp_filesystem->exists( $file ) ) { | |
| 575 | - $src = str_replace( ABSPATH, $wp_filesystem->abspath(), VISUALIZER_ABSPATH . '/js/customization.js' ); | |
| 576 | - $done = $wp_filesystem->copy( $src, $file ); | |
| 577 | - if ( $done === false ) { | |
| 578 | - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to copy file %s to %s', $src, $file ), 'error', __FILE__, __LINE__ ); | |
| 579 | - return $default; | |
| 580 | - } | |
| 581 | - } | |
| 582 | - | |
| 583 | - return $specific; | |
| 584 | - } catch ( \Throwable $e ) { | |
| 585 | - return $default; | |
| 586 | - } | |
| 566 | + return $specific; | |
| 587 | 567 | } |
| 588 | 568 | |
| 589 | 569 | /** |
| 590 | 570 | * Load the class for the given chart's chart type so that its assets can be loaded. |
| @@ -589,18 +569,15 @@ | ||
| 589 | 569 | /** |
| 590 | 570 | * Load the class for the given chart's chart type so that its assets can be loaded. |
| 591 | 571 | */ |
| 592 | 572 | protected function load_chart_type( $chart_id ) { |
| 593 | - // D3/AI charts have no traditional type class — return the library string directly. | |
| 594 | - $lib = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true ); | |
| 595 | - if ( 'd3' === $lib ) { | |
| 596 | - return 'd3'; | |
| 597 | - } | |
| 598 | - | |
| 599 | 573 | $name = $this->load_chart_class_name( $chart_id ); |
| 600 | 574 | $class = null; |
| 601 | 575 | if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) { |
| 602 | - $class = new $name(); | |
| 576 | + if ( 'Visualizer_Render_Sidebar_Type_DataTable_DataTable' === $name ) { | |
| 577 | + $name = 'Visualizer_Render_Sidebar_Type_DataTable_Tabular'; | |
| 578 | + } | |
| 579 | + $class = new $name; | |
| 603 | 580 | } |
| 604 | 581 | |
| 605 | 582 | if ( is_null( $class ) && Visualizer_Module::is_pro() ) { |
| 606 | 583 | // lets see if this type exists in pro. New Lite(3.1.0+) & old Pro(1.8.0-). |
| @@ -722,29 +699,8 @@ | ||
| 722 | 699 | return $q->found_posts; |
| 723 | 700 | } |
| 724 | 701 | |
| 725 | 702 | /** |
| 726 | - * Checks whether the current user may edit a specific chart. | |
| 727 | - * | |
| 728 | - * @param int $chart_id Chart ID. | |
| 729 | - * @return bool | |
| 730 | - */ | |
| 731 | - public static function can_edit_chart( $chart_id ) { | |
| 732 | - $chart_id = absint( $chart_id ); | |
| 733 | - if ( ! $chart_id ) { | |
| 734 | - return false; | |
| 735 | - } | |
| 736 | - | |
| 737 | - $chart = get_post( $chart_id ); | |
| 738 | - return $chart | |
| 739 | - && Visualizer_Plugin::CPT_VISUALIZER === $chart->post_type | |
| 740 | - && ( | |
| 741 | - current_user_can( 'edit_post', $chart_id ) | |
| 742 | - || ( (int) $chart->post_author === get_current_user_id() && current_user_can( 'edit_posts' ) ) | |
| 743 | - ); | |
| 744 | - } | |
| 745 | - | |
| 746 | - /** | |
| 747 | 703 | * Checks if the PRO version is active. |
| 748 | 704 | * |
| 749 | 705 | * @since 3.3.0 |
| 750 | 706 | */ |
| @@ -780,106 +736,18 @@ | ||
| 780 | 736 | |
| 781 | 737 | /** |
| 782 | 738 | * Gets the features for the provided license type. |
| 783 | 739 | */ |
| 784 | - final public static function get_features_for_license( $plan ) { | |
| 785 | - $is_new_personal = apply_filters( 'visualizer_is_new_personal', false ); | |
| 740 | + public static final function get_features_for_license( $plan ) { | |
| 786 | 741 | switch ( $plan ) { |
| 787 | 742 | case 1: |
| 788 | - $features = array( 'import-wp', 'import-wc-report', 'import-file', 'import-url' ); | |
| 789 | - if ( ! $is_new_personal ) { | |
| 790 | - $features[] = 'db-query'; | |
| 791 | - } | |
| 792 | - return $features; | |
| 743 | + return array( 'import-wp', 'db-query', 'import-wc-report' ); | |
| 793 | 744 | case 2: |
| 794 | - $features = array( 'schedule-chart', 'chart-permissions', 'import-chart', 'data-filter-configuration', 'frontend-actions' ); | |
| 795 | - if ( $is_new_personal ) { | |
| 796 | - $features[] = 'db-query'; | |
| 797 | - } | |
| 798 | - return $features; | |
| 745 | + return array( 'schedule-chart', 'chart-permissions', 'import-chart', 'manual-data', 'data-filter-configuration', 'frontend-actions' ); | |
| 799 | 746 | } |
| 800 | 747 | } |
| 801 | 748 | |
| 802 | 749 | /** |
| 803 | - * Safely unserialize chart/source content, blocking PHP object injection. | |
| 804 | - * | |
| 805 | - * Single guarded chokepoint shared by chart/source content sinks so the | |
| 806 | - * allowed_classes guard cannot be dropped from one call site independently. | |
| 807 | - * | |
| 808 | - * @param mixed $content The serialized content (only strings are decoded). | |
| 809 | - * @return mixed The decoded value (array for valid chart data), or false. | |
| 810 | - */ | |
| 811 | - public static function decode_content( $content ) { | |
| 812 | - if ( ! is_string( $content ) ) { | |
| 813 | - return false; | |
| 814 | - } | |
| 815 | - $value = unserialize( trim( $content ), array( 'allowed_classes' => false ) ); | |
| 816 | - if ( self::contains_references( $value ) ) { | |
| 817 | - return false; | |
| 818 | - } | |
| 819 | - return self::strip_incomplete_objects( $value ); | |
| 820 | - } | |
| 821 | - | |
| 822 | - /** | |
| 823 | - * Check decoded arrays for references before recursively processing them. | |
| 824 | - * | |
| 825 | - * Cyclic serialized arrays necessarily contain a reference. Rejecting all | |
| 826 | - * references also prevents shared references from becoming cycles later, | |
| 827 | - * so strip_incomplete_objects() cannot recurse without terminating. | |
| 828 | - * | |
| 829 | - * @param mixed $value The decoded value. | |
| 830 | - * @return bool Whether the value contains an array reference. | |
| 831 | - */ | |
| 832 | - private static function contains_references( $value ) { | |
| 833 | - if ( ! is_array( $value ) ) { | |
| 834 | - return false; | |
| 835 | - } | |
| 836 | - foreach ( array_keys( $value ) as $key ) { | |
| 837 | - if ( null !== ReflectionReference::fromArrayElement( $value, $key ) ) { | |
| 838 | - return true; | |
| 839 | - } | |
| 840 | - if ( is_array( $value[ $key ] ) && self::contains_references( $value[ $key ] ) ) { | |
| 841 | - return true; | |
| 842 | - } | |
| 843 | - } | |
| 844 | - return false; | |
| 845 | - } | |
| 846 | - | |
| 847 | - /** | |
| 848 | - * Remove the __PHP_Incomplete_Class stubs the allowed_classes guard leaves | |
| 849 | - * behind; they crash map_deep() when the decoded value is written back to | |
| 850 | - * post meta. Legitimate chart content is nested arrays/scalars only. | |
| 851 | - * | |
| 852 | - * @param mixed $value The decoded value. | |
| 853 | - * @return mixed The value without object stubs; false for a top-level stub. | |
| 854 | - */ | |
| 855 | - private static function strip_incomplete_objects( $value ) { | |
| 856 | - if ( $value instanceof __PHP_Incomplete_Class ) { | |
| 857 | - return false; | |
| 858 | - } | |
| 859 | - if ( is_array( $value ) ) { | |
| 860 | - foreach ( $value as $key => $item ) { | |
| 861 | - if ( $item instanceof __PHP_Incomplete_Class ) { | |
| 862 | - unset( $value[ $key ] ); | |
| 863 | - } elseif ( is_array( $item ) ) { | |
| 864 | - $value[ $key ] = self::strip_incomplete_objects( $item ); | |
| 865 | - } | |
| 866 | - } | |
| 867 | - } | |
| 868 | - return $value; | |
| 869 | - } | |
| 870 | - | |
| 871 | - /** | |
| 872 | - * Object-injection-safe drop-in for maybe_unserialize(). | |
| 873 | - * | |
| 874 | - * @param mixed $value Raw meta/content value. | |
| 875 | - * @return mixed The decoded value for serialized input, the value unchanged otherwise. | |
| 876 | - */ | |
| 877 | - public static function maybe_decode_content( $value ) { | |
| 878 | - return is_serialized( $value ) ? self::decode_content( $value ) : $value; | |
| 879 | - } | |
| 880 | - | |
| 881 | - /** | |
| 882 | 750 | * Gets the chart content after common manipulations. |
| 883 | 751 | */ |
| 884 | 752 | public static function get_chart_data( $chart, $type, $run_filter = true ) { |
| 885 | 753 | // change HTML entities |
| @@ -892,9 +760,9 @@ | ||
| 892 | 760 | } |
| 893 | 761 | }, |
| 894 | 762 | $post_content |
| 895 | 763 | ); |
| 896 | - $data = self::decode_content( $post_content ); | |
| 764 | + $data = unserialize( $post_content ); | |
| 897 | 765 | $altered = array(); |
| 898 | 766 | if ( ! empty( $data ) ) { |
| 899 | 767 | foreach ( $data as $index => $array ) { |
| 900 | 768 | if ( ! is_array( $index ) && is_array( $array ) ) { |
