| @@ -66,10 +66,10 @@ | ||
| 66 | 66 | |
| 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 | - $this->_addAction( 'pre_get_posts', 'PreGetPosts' ); | |
| 71 | - register_shutdown_function( array( $this, 'onShutdown' ) ); | |
| 70 | + register_shutdown_function( array($this, 'onShutdown') ); | |
| 71 | + | |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
| 75 | 75 | * Register a shutdown hook to catch fatal errors. |
| @@ -112,18 +112,18 @@ | ||
| 112 | 112 | * @access public |
| 113 | 113 | * @param string $tag The name of the AJAX action to which the $method is hooked. |
| 114 | 114 | * @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 | 115 | * @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. | |
| 116 | + * @param boolean $private Optional. Determines if we should register hook for logged in users. | |
| 117 | + * @param boolean $public Optional. Determines if we should register hook for not logged in users. | |
| 118 | 118 | * @return Visualizer_Module |
| 119 | 119 | */ |
| 120 | - protected function _addAjaxAction( $tag, $method = '', $methodClass = null, $logged_in = true, $logged_out = false ) { | |
| 121 | - if ( $logged_in ) { | |
| 120 | + protected function _addAjaxAction( $tag, $method = '', $methodClass = null, $private = true, $public = false ) { | |
| 121 | + if ( $private ) { | |
| 122 | 122 | $this->_addAction( 'wp_ajax_' . $tag, $method, $methodClass ); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - if ( $logged_out ) { | |
| 125 | + if ( $public ) { | |
| 126 | 126 | $this->_addAction( 'wp_ajax_nopriv_' . $tag, $method, $methodClass ); |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | return $this; |
| @@ -136,9 +136,9 @@ | ||
| 136 | 136 | * @uses add_filter() To register filter hook. |
| 137 | 137 | * |
| 138 | 138 | * @access protected |
| 139 | 139 | * @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. | |
| 140 | + * @param type $method The name of the method to be called when the filter is applied. | |
| 141 | 141 | * @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 | 142 | * @param int $accepted_args optional. The number of arguments the function accept (default 1). |
| 143 | 143 | * @return Visualizer_Module |
| 144 | 144 | */ |
| @@ -167,9 +167,9 @@ | ||
| 167 | 167 | * A wrapper around the actual function _getDataAs. This function is invoked as a filter. |
| 168 | 168 | * |
| 169 | 169 | * @since 3.2.0 |
| 170 | 170 | */ |
| 171 | - public function getDataAs( $data, $chart_id, $type ) { | |
| 171 | + public function getDataAs( $final, $chart_id, $type ) { | |
| 172 | 172 | return $this->_getDataAs( $chart_id, $type ); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
| @@ -233,8 +233,9 @@ | ||
| 233 | 233 | $title = 'visualizer#' . $chart_id; |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | $filename = $title; |
| 237 | + | |
| 237 | 238 | switch ( $type ) { |
| 238 | 239 | case 'csv': |
| 239 | 240 | $final = $this->_getCSV( $rows, $filename, false ); |
| 240 | 241 | break; |
| @@ -266,19 +267,9 @@ | ||
| 266 | 267 | private function _getCSV( $rows, $filename, $enclose ) { |
| 267 | 268 | $filename .= '.csv'; |
| 268 | 269 | |
| 269 | 270 | $bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF ); |
| 270 | - // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged | |
| 271 | - $fp = function_exists( 'tmpfile' ) ? @tmpfile() : null; | |
| 272 | - if ( ! $fp ) { | |
| 273 | - if ( ! function_exists( 'wp_tempnam' ) ) { | |
| 274 | - require_once ABSPATH . 'wp-admin/includes/file.php'; | |
| 275 | - } | |
| 276 | - $fp = fopen( wp_tempnam(), 'w+' ); | |
| 277 | - } | |
| 278 | - if ( ! $fp ) { | |
| 279 | - return array( 'csv' => '', 'name' => $filename, 'string' => '' ); | |
| 280 | - } | |
| 271 | + $fp = tmpfile(); | |
| 281 | 272 | if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) { |
| 282 | 273 | unset( $rows[1] ); |
| 283 | 274 | $rows = array_values( $rows ); |
| 284 | 275 | } |
| @@ -288,10 +279,10 @@ | ||
| 288 | 279 | fputcsv( $fp, $row ); |
| 289 | 280 | } |
| 290 | 281 | rewind( $fp ); |
| 291 | 282 | $csv = ''; |
| 292 | - $array = fgetcsv( $fp ); | |
| 293 | - while ( $array !== false ) { | |
| 283 | + // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition | |
| 284 | + while ( ( $array = fgetcsv( $fp ) ) !== false ) { | |
| 294 | 285 | if ( strlen( $csv ) > 0 ) { |
| 295 | 286 | $csv .= PHP_EOL; |
| 296 | 287 | } |
| 297 | 288 | // if enclosure is required, check every item of this line |
| @@ -305,10 +296,9 @@ | ||
| 305 | 296 | $temp_array[] = $item; |
| 306 | 297 | } |
| 307 | 298 | $array = $temp_array; |
| 308 | 299 | } |
| 309 | - $csv .= implode( ',', $array ); | |
| 310 | - $array = fgetcsv( $fp ); | |
| 300 | + $csv .= implode( ',', $array ); | |
| 311 | 301 | } |
| 312 | 302 | fclose( $fp ); |
| 313 | 303 | |
| 314 | 304 | return array( |
| @@ -325,16 +315,16 @@ | ||
| 325 | 315 | * @param array $rows The array of data. |
| 326 | 316 | * @param string $filename The name of the file to use. |
| 327 | 317 | */ |
| 328 | 318 | 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'; | |
| 319 | + // PHPExcel did not like sheet names longer than 31 characters and we will assume the same with PhpSpreadsheet | |
| 320 | + $chart = substr( $filename, 0, 30 ); | |
| 321 | + $filename .= '.xlsx'; | |
| 332 | 322 | if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) { |
| 333 | 323 | unset( $rows[1] ); |
| 334 | 324 | $rows = array_values( $rows ); |
| 335 | 325 | $rows = array_map( |
| 336 | - function ( $r ) { | |
| 326 | + function( $r ) { | |
| 337 | 327 | return array_map( 'strval', $r ); |
| 338 | 328 | }, |
| 339 | 329 | $rows |
| 340 | 330 | ); |
| @@ -340,34 +330,24 @@ | ||
| 340 | 330 | ); |
| 341 | 331 | } |
| 342 | 332 | $vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php'; |
| 343 | 333 | if ( is_readable( $vendor_file ) ) { |
| 344 | - include_once $vendor_file; | |
| 334 | + include_once( $vendor_file ); | |
| 345 | 335 | } |
| 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 | - } | |
| 336 | + $xlsData = ''; | |
| 337 | + if ( class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) ) { | |
| 338 | + $doc = new PhpOffice\PhpSpreadsheet\Spreadsheet(); | |
| 339 | + $doc->getActiveSheet()->fromArray( $rows, null, 'A1' ); | |
| 340 | + $doc->getActiveSheet()->setTitle( sanitize_title( $chart ) ); | |
| 341 | + $doc = apply_filters( 'visualizer_excel_doc', $doc ); | |
| 342 | + $writer = PhpOffice\PhpSpreadsheet\IOFactory::createWriter( $doc, 'Xlsx' ); | |
| 343 | + ob_start(); | |
| 344 | + $writer->save( 'php://output' ); | |
| 345 | + $xlsData = ob_get_contents(); | |
| 346 | + ob_end_clean(); | |
| 367 | 347 | } 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!' ); | |
| 348 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Class PhpOffice\PhpSpreadsheet\Spreadsheet does not exist!', 'error', __FILE__, __LINE__ ); | |
| 349 | + error_log( 'Class PhpOffice\PhpSpreadsheet\Spreadsheet does not exist!' ); | |
| 370 | 350 | } |
| 371 | 351 | return array( |
| 372 | 352 | 'csv' => 'data:application/vnd.ms-excel;base64,' . base64_encode( $xlsData ), |
| 373 | 353 | 'name' => $filename, |
| @@ -404,9 +384,9 @@ | ||
| 404 | 384 | $index = 0; |
| 405 | 385 | foreach ( $rows as $row ) { |
| 406 | 386 | // skip the data type row. |
| 407 | 387 | if ( 1 === $index ) { |
| 408 | - ++$index; | |
| 388 | + $index++; | |
| 409 | 389 | continue; |
| 410 | 390 | } |
| 411 | 391 | |
| 412 | 392 | $table .= '<tr>'; |
| @@ -417,9 +397,9 @@ | ||
| 417 | 397 | $table .= '<td>' . $col . '</td>'; |
| 418 | 398 | } |
| 419 | 399 | } |
| 420 | 400 | $table .= '</tr>'; |
| 421 | - ++$index; | |
| 401 | + $index++; | |
| 422 | 402 | } |
| 423 | 403 | $table .= '</table>'; |
| 424 | 404 | |
| 425 | 405 | $html .= apply_filters( 'visualizer_print_table', $table ) . ' |
| @@ -432,11 +412,11 @@ | ||
| 432 | 412 | |
| 433 | 413 | /** |
| 434 | 414 | * Disable revisions temporarily for visualizer post type. |
| 435 | 415 | */ |
| 436 | - final protected function disableRevisionsTemporarily() { | |
| 416 | + protected final function disableRevisionsTemporarily() { | |
| 437 | 417 | add_filter( |
| 438 | - 'wp_revisions_to_keep', function ( $num, $post ) { | |
| 418 | + 'wp_revisions_to_keep', function( $num, $post ) { | |
| 439 | 419 | if ( $post->post_type === Visualizer_Plugin::CPT_VISUALIZER ) { |
| 440 | 420 | return 0; |
| 441 | 421 | } |
| 442 | 422 | return $num; |
| @@ -448,9 +428,9 @@ | ||
| 448 | 428 | * Undo revisions for the chart, and if necessary, restore the earliest version. |
| 449 | 429 | * |
| 450 | 430 | * @return bool If any revisions were found. |
| 451 | 431 | */ |
| 452 | - final public function undoRevisions( $chart_id, $restore = false ) { | |
| 432 | + public final function undoRevisions( $chart_id, $restore = false ) { | |
| 453 | 433 | do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'undoRevisions for %d with%s restore', $chart_id, ( $restore ? '' : 'out' ) ), 'debug', __FILE__, __LINE__ ); |
| 454 | 434 | if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) { |
| 455 | 435 | return false; |
| 456 | 436 | } |
| @@ -480,19 +460,14 @@ | ||
| 480 | 460 | |
| 481 | 461 | /** |
| 482 | 462 | * If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing. |
| 483 | 463 | */ |
| 484 | - final public function handleExistingRevisions( $chart_id, $chart ) { | |
| 464 | + public final function handleExistingRevisions( $chart_id, $chart ) { | |
| 485 | 465 | |
| 486 | 466 | do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ ); |
| 487 | 467 | if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) { |
| 488 | 468 | return $chart_id; |
| 489 | 469 | } |
| 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 | 470 | // undo revisions. |
| 496 | 471 | $revisions_found = $this->undoRevisions( $chart_id, true ); |
| 497 | 472 | |
| 498 | 473 | // create revision for the edit action. |
| @@ -536,55 +511,48 @@ | ||
| 536 | 511 | if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) { |
| 537 | 512 | return $default; |
| 538 | 513 | } |
| 539 | 514 | |
| 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 | - } | |
| 515 | + require_once( ABSPATH . 'wp-admin/includes/file.php' ); | |
| 516 | + WP_Filesystem(); | |
| 517 | + global $wp_filesystem; | |
| 547 | 518 | |
| 548 | - $multisite_arg = '/'; | |
| 549 | - if ( is_multisite() && ! is_main_site() ) { | |
| 550 | - $multisite_arg = '/sites/' . get_current_blog_id() . '/'; | |
| 551 | - } | |
| 519 | + $multisite_arg = '/'; | |
| 520 | + if ( is_multisite() && ! is_main_site() ) { | |
| 521 | + $multisite_arg = '/sites/' . get_current_blog_id() . '/'; | |
| 522 | + } | |
| 552 | 523 | |
| 553 | - $dir = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer'; | |
| 554 | - $file = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer/customization.js'; | |
| 524 | + $dir = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer'; | |
| 525 | + $file = $wp_filesystem->wp_content_dir() . 'uploads' . $multisite_arg . 'visualizer/customization.js'; | |
| 555 | 526 | |
| 556 | - if ( $wp_filesystem->is_readable( $file ) ) { | |
| 557 | - return $specific; | |
| 558 | - } | |
| 527 | + if ( $wp_filesystem->is_readable( $file ) ) { | |
| 528 | + return $specific; | |
| 529 | + } | |
| 559 | 530 | |
| 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__ ); | |
| 531 | + if ( $wp_filesystem->exists( $file ) && ! $wp_filesystem->is_readable( $file ) ) { | |
| 532 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to read file %s', $file ), 'error', __FILE__, __LINE__ ); | |
| 533 | + return $default; | |
| 534 | + } | |
| 535 | + | |
| 536 | + if ( ! $wp_filesystem->exists( $dir ) ) { | |
| 537 | + // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found | |
| 538 | + if ( ( $done = $wp_filesystem->mkdir( $dir ) ) === false ) { | |
| 539 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to create directory %s', $dir ), 'error', __FILE__, __LINE__ ); | |
| 562 | 540 | return $default; |
| 563 | 541 | } |
| 542 | + } | |
| 564 | 543 | |
| 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 | - } | |
| 544 | + // if file does not exist, copy. | |
| 545 | + if ( ! $wp_filesystem->exists( $file ) ) { | |
| 546 | + $src = str_replace( ABSPATH, $wp_filesystem->abspath(), VISUALIZER_ABSPATH . '/js/customization.js' ); | |
| 547 | + // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found | |
| 548 | + if ( ( $done = $wp_filesystem->copy( $src, $file ) ) === false ) { | |
| 549 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to copy file %s to %s', $src, $file ), 'error', __FILE__, __LINE__ ); | |
| 550 | + return $default; | |
| 571 | 551 | } |
| 552 | + } | |
| 572 | 553 | |
| 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 | - } | |
| 554 | + return $specific; | |
| 587 | 555 | } |
| 588 | 556 | |
| 589 | 557 | /** |
| 590 | 558 | * Load the class for the given chart's chart type so that its assets can be loaded. |
| @@ -589,18 +557,15 @@ | ||
| 589 | 557 | /** |
| 590 | 558 | * Load the class for the given chart's chart type so that its assets can be loaded. |
| 591 | 559 | */ |
| 592 | 560 | 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 | 561 | $name = $this->load_chart_class_name( $chart_id ); |
| 600 | 562 | $class = null; |
| 601 | 563 | if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) { |
| 602 | - $class = new $name(); | |
| 564 | + if ( 'Visualizer_Render_Sidebar_Type_DataTable_DataTable' === $name ) { | |
| 565 | + $name = 'Visualizer_Render_Sidebar_Type_DataTable_Tabular'; | |
| 566 | + } | |
| 567 | + $class = new $name; | |
| 603 | 568 | } |
| 604 | 569 | |
| 605 | 570 | if ( is_null( $class ) && Visualizer_Module::is_pro() ) { |
| 606 | 571 | // lets see if this type exists in pro. New Lite(3.1.0+) & old Pro(1.8.0-). |
| @@ -638,31 +603,32 @@ | ||
| 638 | 603 | */ |
| 639 | 604 | protected function get_inline_custom_css( $id, $settings ) { |
| 640 | 605 | $css = ''; |
| 641 | 606 | |
| 607 | + $arguments = array( '', $settings ); | |
| 608 | + if ( ! isset( $settings['customcss'] ) ) { | |
| 609 | + return $arguments; | |
| 610 | + } | |
| 611 | + | |
| 642 | 612 | $classes = array(); |
| 643 | 613 | $css = '<style type="text/css" name="visualizer-custom-css" id="customcss-' . $id . '">'; |
| 644 | - if ( ! empty( $settings['customcss'] ) ) { | |
| 645 | - foreach ( $settings['customcss'] as $name => $element ) { | |
| 646 | - $attributes = array(); | |
| 647 | - foreach ( $element as $property => $value ) { | |
| 648 | - $attributes[] = $this->handle_css_property( $property, $value ); | |
| 649 | - } | |
| 650 | - $class_name = $id . $name; | |
| 651 | - $properties = implode( ' !important; ', array_filter( $attributes ) ); | |
| 652 | - if ( ! empty( $properties ) ) { | |
| 653 | - $css .= '.' . $class_name . ' {' . $properties . ' !important;}'; | |
| 654 | - $classes[ $name ] = $class_name; | |
| 655 | - } | |
| 614 | + foreach ( $settings['customcss'] as $name => $element ) { | |
| 615 | + $attributes = array(); | |
| 616 | + foreach ( $element as $property => $value ) { | |
| 617 | + $attributes[] = $this->handle_css_property( $property, $value ); | |
| 656 | 618 | } |
| 657 | - $settings['cssClassNames'] = $classes; | |
| 619 | + $class_name = $id . $name; | |
| 620 | + $properties = implode( ' !important; ', array_filter( $attributes ) ); | |
| 621 | + if ( ! empty( $properties ) ) { | |
| 622 | + $css .= '.' . $class_name . ' {' . $properties . ' !important;}'; | |
| 623 | + $classes[ $name ] = $class_name; | |
| 624 | + } | |
| 658 | 625 | } |
| 626 | + $css .= '</style>'; | |
| 659 | 627 | |
| 660 | - $img_path = VISUALIZER_ABSURL . 'images'; | |
| 661 | - $css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}.google-visualization-controls-categoryfilter label.google-visualization-controls-label {vertical-align: middle;}.google-visualization-controls-categoryfilter li.goog-inline-block {margin: 0 0.2em;}.google-visualization-controls-categoryfilter li {padding: 0 0.2em;}.visualizer-front-container .dataTables_scrollHeadInner{margin: 0 auto;}"; | |
| 662 | - $css .= '</style>'; | |
| 628 | + $settings['cssClassNames'] = $classes; | |
| 663 | 629 | |
| 664 | - $arguments = array( $css, $settings ); | |
| 630 | + $arguments = array( $css, $settings ); | |
| 665 | 631 | apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) ); |
| 666 | 632 | |
| 667 | 633 | return $arguments; |
| 668 | 634 | } |
| @@ -759,23 +725,14 @@ | ||
| 759 | 725 | |
| 760 | 726 | /** |
| 761 | 727 | * Gets the features for the provided license type. |
| 762 | 728 | */ |
| 763 | - final public static function get_features_for_license( $plan ) { | |
| 764 | - $is_new_personal = apply_filters( 'visualizer_is_new_personal', false ); | |
| 729 | + public static final function get_features_for_license( $plan ) { | |
| 765 | 730 | switch ( $plan ) { |
| 766 | 731 | case 1: |
| 767 | - $features = array( 'import-wp', 'import-wc-report', 'import-file', 'import-url' ); | |
| 768 | - if ( ! $is_new_personal ) { | |
| 769 | - $features[] = 'db-query'; | |
| 770 | - } | |
| 771 | - return $features; | |
| 732 | + return array( 'import-wp', 'db-query' ); | |
| 772 | 733 | case 2: |
| 773 | - $features = array( 'schedule-chart', 'chart-permissions', 'import-chart', 'data-filter-configuration', 'frontend-actions' ); | |
| 774 | - if ( $is_new_personal ) { | |
| 775 | - $features[] = 'db-query'; | |
| 776 | - } | |
| 777 | - return $features; | |
| 734 | + return array( 'schedule-chart', 'chart-permissions' ); | |
| 778 | 735 | } |
| 779 | 736 | } |
| 780 | 737 | |
| 781 | 738 | /** |
| @@ -782,30 +739,18 @@ | ||
| 782 | 739 | * Gets the chart content after common manipulations. |
| 783 | 740 | */ |
| 784 | 741 | public static function get_chart_data( $chart, $type, $run_filter = true ) { |
| 785 | 742 | // change HTML entities |
| 786 | - $post_content = html_entity_decode( htmlentities( $chart->post_content ) ); | |
| 787 | - $post_content = preg_replace_callback( | |
| 788 | - '!s:(\d+):"(.*?)";!s', | |
| 789 | - function ( $matches ) { | |
| 790 | - if ( isset( $matches[2] ) ) { | |
| 791 | - return 's:' . strlen( $matches[2] ) . ':"' . $matches[2] . '";'; | |
| 792 | - } | |
| 793 | - }, | |
| 794 | - $post_content | |
| 795 | - ); | |
| 796 | - $data = unserialize( $post_content ); | |
| 743 | + $data = unserialize( html_entity_decode( $chart->post_content ) ); | |
| 797 | 744 | $altered = array(); |
| 798 | - if ( ! empty( $data ) ) { | |
| 799 | - foreach ( $data as $index => $array ) { | |
| 800 | - if ( ! is_array( $index ) && is_array( $array ) ) { | |
| 801 | - foreach ( $array as &$datum ) { | |
| 802 | - if ( is_string( $datum ) ) { | |
| 803 | - $datum = stripslashes( $datum ); | |
| 804 | - } | |
| 745 | + foreach ( $data as $index => $array ) { | |
| 746 | + if ( ! is_array( $index ) && is_array( $array ) ) { | |
| 747 | + foreach ( $array as &$datum ) { | |
| 748 | + if ( is_string( $datum ) ) { | |
| 749 | + $datum = stripslashes( $datum ); | |
| 805 | 750 | } |
| 806 | - $altered[ $index ] = $array; | |
| 807 | 751 | } |
| 752 | + $altered[ $index ] = $array; | |
| 808 | 753 | } |
| 809 | 754 | } |
| 810 | 755 | // if something goes wrong and the end result is empty, be safe and use the original data |
| 811 | 756 | if ( empty( $altered ) ) { |
| @@ -833,38 +778,6 @@ | ||
| 833 | 778 | } |
| 834 | 779 | return array( |
| 835 | 780 | 'csv' => $image, |
| 836 | 781 | ); |
| 837 | - } | |
| 838 | - | |
| 839 | - /** | |
| 840 | - * Filter chart title if visualizer post type. | |
| 841 | - * | |
| 842 | - * @param object $query WP Query object. | |
| 843 | - * @return void | |
| 844 | - */ | |
| 845 | - public function PreGetPosts( $query ) { | |
| 846 | - if ( ! $query->is_main_query() ) { | |
| 847 | - $post_type = $query->get( 'post_type' ); | |
| 848 | - if ( 'visualizer' === $post_type ) { | |
| 849 | - $this->_addFilter( Visualizer_Plugin::FILTER_CHART_TITLE, 'filterChartTitle', 10, 2 ); | |
| 850 | - } | |
| 851 | - } | |
| 852 | - } | |
| 853 | - | |
| 854 | - /** | |
| 855 | - * Filter chart title. | |
| 856 | - * | |
| 857 | - * @access public | |
| 858 | - * @param string $post_title Post title. | |
| 859 | - * @param int $post_id Post ID. | |
| 860 | - * @return string | |
| 861 | - */ | |
| 862 | - public function filterChartTitle( $post_title, $post_id ) { | |
| 863 | - $post_type = get_post_type( $post_id ); | |
| 864 | - $post_title = trim( $post_title ); | |
| 865 | - if ( 'visualizer' === $post_type && 'Visualization' === $post_title ) { | |
| 866 | - return sprintf( '%s #%d', $post_title, $post_id ); | |
| 867 | - } | |
| 868 | - return $post_title; | |
| 869 | 782 | } |
| 870 | 783 | } |
