| @@ -66,9 +66,9 @@ | ||
| 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' ); | |
| 70 | + $this->_addFilter( Visualizer_Plugin::FILTER_CHART_TITLE, 'filterChartTitle', 10, 2 ); | |
| 71 | 71 | register_shutdown_function( array($this, 'onShutdown') ); |
| 72 | 72 | |
| 73 | 73 | } |
| 74 | 74 | |
| @@ -268,16 +268,9 @@ | ||
| 268 | 268 | private function _getCSV( $rows, $filename, $enclose ) { |
| 269 | 269 | $filename .= '.csv'; |
| 270 | 270 | |
| 271 | 271 | $bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF ); |
| 272 | - // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged | |
| 273 | - $fp = function_exists( 'tmpfile' ) ? @tmpfile() : null; | |
| 274 | - if ( null === $fp ) { | |
| 275 | - if ( ! function_exists( 'wp_tempnam' ) ) { | |
| 276 | - require_once ABSPATH . 'wp-admin/includes/file.php'; | |
| 277 | - } | |
| 278 | - $fp = fopen( wp_tempnam(), 'w+' ); | |
| 279 | - } | |
| 272 | + $fp = tmpfile(); | |
| 280 | 273 | if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) { |
| 281 | 274 | unset( $rows[1] ); |
| 282 | 275 | $rows = array_values( $rows ); |
| 283 | 276 | } |
| @@ -522,12 +515,8 @@ | ||
| 522 | 515 | |
| 523 | 516 | require_once( ABSPATH . 'wp-admin/includes/file.php' ); |
| 524 | 517 | WP_Filesystem(); |
| 525 | 518 | global $wp_filesystem; |
| 526 | - if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) { | |
| 527 | - $creds = request_filesystem_credentials( site_url() ); | |
| 528 | - wp_filesystem( $creds ); | |
| 529 | - } | |
| 530 | 519 | |
| 531 | 520 | $multisite_arg = '/'; |
| 532 | 521 | if ( is_multisite() && ! is_main_site() ) { |
| 533 | 522 | $multisite_arg = '/sites/' . get_current_blog_id() . '/'; |
| @@ -634,9 +623,9 @@ | ||
| 634 | 623 | $settings['cssClassNames'] = $classes; |
| 635 | 624 | } |
| 636 | 625 | |
| 637 | 626 | $img_path = VISUALIZER_ABSURL . 'images'; |
| 638 | - $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;}"; | |
| 627 | + $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;}"; | |
| 639 | 628 | $css .= '</style>'; |
| 640 | 629 | |
| 641 | 630 | $arguments = array( $css, $settings ); |
| 642 | 631 | apply_filters_ref_array( 'visualizer_inline_css', array( &$arguments ) ); |
| @@ -739,11 +728,11 @@ | ||
| 739 | 728 | */ |
| 740 | 729 | public static final function get_features_for_license( $plan ) { |
| 741 | 730 | switch ( $plan ) { |
| 742 | 731 | case 1: |
| 743 | - return array( 'import-wp', 'db-query', 'import-wc-report' ); | |
| 732 | + return array( 'import-wp', 'db-query' ); | |
| 744 | 733 | case 2: |
| 745 | - return array( 'schedule-chart', 'chart-permissions', 'import-chart', 'manual-data', 'data-filter-configuration', 'frontend-actions' ); | |
| 734 | + return array( 'schedule-chart', 'chart-permissions' ); | |
| 746 | 735 | } |
| 747 | 736 | } |
| 748 | 737 | |
| 749 | 738 | /** |
| @@ -801,23 +790,8 @@ | ||
| 801 | 790 | } |
| 802 | 791 | return array( |
| 803 | 792 | 'csv' => $image, |
| 804 | 793 | ); |
| 805 | - } | |
| 806 | - | |
| 807 | - /** | |
| 808 | - * Filter chart title if visualizer post type. | |
| 809 | - * | |
| 810 | - * @param object $query WP Query object. | |
| 811 | - * @return void | |
| 812 | - */ | |
| 813 | - public function PreGetPosts( $query ) { | |
| 814 | - if ( ! $query->is_main_query() ) { | |
| 815 | - $post_type = $query->get( 'post_type' ); | |
| 816 | - if ( 'visualizer' === $post_type ) { | |
| 817 | - $this->_addFilter( Visualizer_Plugin::FILTER_CHART_TITLE, 'filterChartTitle', 10, 2 ); | |
| 818 | - } | |
| 819 | - } | |
| 820 | 794 | } |
| 821 | 795 | |
| 822 | 796 | /** |
| 823 | 797 | * Filter chart title. |