| @@ -53,9 +53,9 @@ | ||
| 53 | 53 | parent::__construct( $plugin ); |
| 54 | 54 | $this->_addAction( 'load-post.php', 'enqueueMediaScripts' ); |
| 55 | 55 | $this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' ); |
| 56 | 56 | $this->_addAction( 'admin_footer', 'renderTemplates' ); |
| 57 | - $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 0 ); | |
| 57 | + $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 ); | |
| 58 | 58 | $this->_addAction( 'admin_menu', 'registerAdminMenu' ); |
| 59 | 59 | $this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' ); |
| 60 | 60 | $this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 ); |
| 61 | 61 | $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 ); |
| @@ -73,10 +73,8 @@ | ||
| 73 | 73 | $this->_addAction( 'visualizer_chart_schedules_spl', 'addSplChartSchedules', null, 10, 3 ); |
| 74 | 74 | |
| 75 | 75 | $this->_addAction( 'admin_init', 'init' ); |
| 76 | 76 | |
| 77 | - $this->_addAction( 'visualizer_chart_languages', 'addMultilingualSupport' ); | |
| 78 | - | |
| 79 | 77 | if ( defined( 'TI_CYPRESS_TESTING' ) ) { |
| 80 | 78 | $this->load_cypress_hooks(); |
| 81 | 79 | } |
| 82 | 80 | |
| @@ -366,9 +364,9 @@ | ||
| 366 | 364 | 'filters' => $chart_types, |
| 367 | 365 | 'types' => array_keys( $chart_types ), |
| 368 | 366 | ), |
| 369 | 367 | 'nonce' => wp_create_nonce(), |
| 370 | - 'buildurl' => esc_url( add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ) ), | |
| 368 | + 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ), | |
| 371 | 369 | ); |
| 372 | 370 | |
| 373 | 371 | return $strings; |
| 374 | 372 | } |
| @@ -390,10 +388,8 @@ | ||
| 390 | 388 | 'enabled' => true, |
| 391 | 389 | ); |
| 392 | 390 | } |
| 393 | 391 | |
| 394 | - $enabled = self::proFeaturesLocked(); | |
| 395 | - | |
| 396 | 392 | $types = array_merge( |
| 397 | 393 | $additional, |
| 398 | 394 | array( |
| 399 | 395 | 'tabular' => array( |
| @@ -398,60 +394,60 @@ | ||
| 398 | 394 | array( |
| 399 | 395 | 'tabular' => array( |
| 400 | 396 | 'name' => esc_html__( 'Table', 'visualizer' ), |
| 401 | 397 | 'enabled' => true, |
| 402 | - 'supports' => $enabled ? array( 'Google Charts', 'DataTable' ) : array( 'DataTable' ), | |
| 398 | + 'supports' => array( 'Google Charts', 'DataTable' ), | |
| 403 | 399 | ), |
| 404 | 400 | 'pie' => array( |
| 405 | 401 | 'name' => esc_html__( 'Pie/Donut', 'visualizer' ), |
| 406 | 402 | 'enabled' => true, |
| 407 | - 'supports' => $enabled ? array( 'Google Charts', 'ChartJS' ) : array( 'Google Charts' ), | |
| 403 | + 'supports' => array( 'Google Charts', 'ChartJS' ), | |
| 408 | 404 | ), |
| 409 | 405 | 'line' => array( |
| 410 | 406 | 'name' => esc_html__( 'Line', 'visualizer' ), |
| 411 | 407 | 'enabled' => true, |
| 412 | - 'supports' => $enabled ? array( 'Google Charts', 'ChartJS' ) : array( 'Google Charts' ), | |
| 408 | + 'supports' => array( 'Google Charts', 'ChartJS' ), | |
| 413 | 409 | ), |
| 414 | - 'bar' => array( | |
| 415 | - 'name' => esc_html__( 'Bar', 'visualizer' ), | |
| 416 | - 'enabled' => true, | |
| 417 | - 'supports' => $enabled ? array( 'Google Charts', 'ChartJS' ) : array( 'Google Charts' ), | |
| 418 | - ), | |
| 419 | 410 | 'area' => array( |
| 420 | 411 | 'name' => esc_html__( 'Area', 'visualizer' ), |
| 421 | - 'enabled' => $enabled, | |
| 412 | + 'enabled' => true, | |
| 422 | 413 | // in ChartJS, the fill option is used to make Line chart an area: https://www.chartjs.org/docs/latest/charts/area.html |
| 423 | 414 | 'supports' => array( 'Google Charts' ), |
| 424 | 415 | ), |
| 425 | 416 | 'geo' => array( |
| 426 | 417 | 'name' => esc_html__( 'Geo', 'visualizer' ), |
| 427 | - 'enabled' => $enabled, | |
| 418 | + 'enabled' => true, | |
| 428 | 419 | 'supports' => array( 'Google Charts' ), |
| 429 | 420 | ), |
| 421 | + 'bar' => array( | |
| 422 | + 'name' => esc_html__( 'Bar', 'visualizer' ), | |
| 423 | + 'enabled' => true, | |
| 424 | + 'supports' => array( 'Google Charts', 'ChartJS' ), | |
| 425 | + ), | |
| 430 | 426 | 'column' => array( |
| 431 | 427 | 'name' => esc_html__( 'Column', 'visualizer' ), |
| 432 | - 'enabled' => $enabled, | |
| 428 | + 'enabled' => true, | |
| 433 | 429 | 'supports' => array( 'Google Charts', 'ChartJS' ), |
| 434 | 430 | ), |
| 435 | 431 | 'bubble' => array( |
| 436 | 432 | 'name' => esc_html__( 'Bubble', 'visualizer' ), |
| 437 | - 'enabled' => $enabled, | |
| 433 | + 'enabled' => true, | |
| 438 | 434 | // chartjs' bubble is ugly looking (and it won't work off the default bubble.csv) so it is being excluded for the time being. |
| 439 | 435 | 'supports' => array( 'Google Charts' ), |
| 440 | 436 | ), |
| 441 | 437 | 'scatter' => array( |
| 442 | 438 | 'name' => esc_html__( 'Scatter', 'visualizer' ), |
| 443 | - 'enabled' => $enabled, | |
| 439 | + 'enabled' => true, | |
| 444 | 440 | 'supports' => array( 'Google Charts' ), |
| 445 | 441 | ), |
| 446 | 442 | 'gauge' => array( |
| 447 | 443 | 'name' => esc_html__( 'Gauge', 'visualizer' ), |
| 448 | - 'enabled' => $enabled, | |
| 444 | + 'enabled' => true, | |
| 449 | 445 | 'supports' => array( 'Google Charts' ), |
| 450 | 446 | ), |
| 451 | 447 | 'candlestick' => array( |
| 452 | 448 | 'name' => esc_html__( 'Candlestick', 'visualizer' ), |
| 453 | - 'enabled' => $enabled, | |
| 449 | + 'enabled' => true, | |
| 454 | 450 | 'supports' => array( 'Google Charts' ), |
| 455 | 451 | ), |
| 456 | 452 | // pro types |
| 457 | 453 | 'timeline' => array( |
| @@ -687,20 +683,8 @@ | ||
| 687 | 683 | 'edit_posts', |
| 688 | 684 | 'viz-support', |
| 689 | 685 | array( $this, 'renderSupportPage' ) |
| 690 | 686 | ); |
| 691 | - | |
| 692 | - if ( ! Visualizer_Module::is_pro() ) { | |
| 693 | - add_submenu_page( | |
| 694 | - Visualizer_Plugin::NAME, | |
| 695 | - __( 'Get Visualizer Pro', 'visualizer' ), | |
| 696 | - __( 'Get Visualizer Pro', 'visualizer' ), | |
| 697 | - 'edit_posts', | |
| 698 | - 'viz-get-pro', | |
| 699 | - '__return_null' | |
| 700 | - ); | |
| 701 | - add_action( 'admin_footer', array( $this, 'handleGetProSubMenu' ) ); | |
| 702 | - } | |
| 703 | 687 | remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME ); |
| 704 | 688 | |
| 705 | 689 | add_action( "load-{$this->_libraryPage}", array( $this, 'addScreenOptions' ) ); |
| 706 | 690 | } |
| @@ -705,41 +689,8 @@ | ||
| 705 | 689 | add_action( "load-{$this->_libraryPage}", array( $this, 'addScreenOptions' ) ); |
| 706 | 690 | } |
| 707 | 691 | |
| 708 | 692 | /** |
| 709 | - * Handle get pro plugin submenu. | |
| 710 | - */ | |
| 711 | - public function handleGetProSubMenu() { | |
| 712 | - ?> | |
| 713 | - <style type="text/css"> | |
| 714 | - #toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li { | |
| 715 | - background: #FF7E65; | |
| 716 | - font-size: 14px; | |
| 717 | - font-weight: 600; | |
| 718 | - color: #fff; | |
| 719 | - } | |
| 720 | - #toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a { | |
| 721 | - color: #fff !important; | |
| 722 | - } | |
| 723 | - #toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a:hover { | |
| 724 | - box-shadow: inherit; | |
| 725 | - } | |
| 726 | - #toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li + li { | |
| 727 | - display: none; | |
| 728 | - } | |
| 729 | - </style> | |
| 730 | - <script type="text/javascript"> | |
| 731 | - jQuery( document ).ready( function() { | |
| 732 | - jQuery( '#toplevel_page_visualizer' ).on( 'click', 'li:not(.wp-submenu-head, .wp-first-item):eq(2)', function( e ) { | |
| 733 | - e.preventDefault(); | |
| 734 | - window.open( '<?php echo tsdk_utmify( 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/', 'toplevel' ); ?>', '_blank' ); | |
| 735 | - } ); | |
| 736 | - } ); | |
| 737 | - </script> | |
| 738 | - <?php | |
| 739 | - } | |
| 740 | - | |
| 741 | - /** | |
| 742 | 693 | * Adds the screen options for pagination. |
| 743 | 694 | */ |
| 744 | 695 | function addScreenOptions() { |
| 745 | 696 | $screen = get_current_screen(); |
| @@ -751,9 +702,9 @@ | ||
| 751 | 702 | |
| 752 | 703 | $args = array( |
| 753 | 704 | 'label' => __( 'Number of charts per page:', 'visualizer' ), |
| 754 | 705 | 'default' => 6, |
| 755 | - 'option' => 'visualizer_library_per_page', | |
| 706 | + 'option' => 'visualizer_per_page_library', | |
| 756 | 707 | ); |
| 757 | 708 | add_screen_option( 'per_page', $args ); |
| 758 | 709 | } |
| 759 | 710 | |
| @@ -760,9 +711,9 @@ | ||
| 760 | 711 | /** |
| 761 | 712 | * Returns the screen option for pagination. |
| 762 | 713 | */ |
| 763 | 714 | function setScreenOptions( $status, $option, $value ) { |
| 764 | - if ( 'visualizer_library_per_page' === $option ) { | |
| 715 | + if ( 'visualizer_per_page_library' === $option ) { | |
| 765 | 716 | return $value; |
| 766 | 717 | } |
| 767 | 718 | } |
| 768 | 719 | |
| @@ -770,24 +721,8 @@ | ||
| 770 | 721 | * Adds the display filters to be used in the meta_query while displaying the charts. |
| 771 | 722 | */ |
| 772 | 723 | private function getDisplayFilters( &$query_args ) { |
| 773 | 724 | $query = array(); |
| 774 | - global $sitepress; | |
| 775 | - if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) { | |
| 776 | - $current_lang = icl_get_current_language(); | |
| 777 | - if ( in_array( $current_lang, array( 'all', icl_get_default_language() ), true ) ) { | |
| 778 | - $query[] = array( | |
| 779 | - 'key' => 'chart_lang', | |
| 780 | - 'compare' => 'NOT EXISTS', | |
| 781 | - ); | |
| 782 | - } else { | |
| 783 | - $query[] = array( | |
| 784 | - 'key' => 'chart_lang', | |
| 785 | - 'value' => $current_lang, | |
| 786 | - 'compare' => '=', | |
| 787 | - ); | |
| 788 | - } | |
| 789 | - } | |
| 790 | 725 | |
| 791 | 726 | // add chart type filter to the query arguments |
| 792 | 727 | $type = filter_input( INPUT_GET, 'type' ); |
| 793 | 728 | if ( $type && in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) { |
| @@ -885,9 +820,9 @@ | ||
| 885 | 820 | |
| 886 | 821 | $this->getDisplayFilters( $query_args ); |
| 887 | 822 | |
| 888 | 823 | // Added by Ash/Upwork |
| 889 | - $filterByMeta = ! empty( $_GET['s'] ) ? sanitize_text_field( wp_unslash( $_GET['s'] ) ) : null; // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 824 | + $filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING ); | |
| 890 | 825 | if ( $filterByMeta ) { |
| 891 | 826 | $query = array( |
| 892 | 827 | 'key' => Visualizer_Plugin::CF_SETTINGS, |
| 893 | 828 | 'value' => $filterByMeta, |
| @@ -967,20 +902,8 @@ | ||
| 967 | 902 | |
| 968 | 903 | $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type ); |
| 969 | 904 | $data = self::get_chart_data( $chart, $type ); |
| 970 | 905 | |
| 971 | - // Set default setting series when add manual chart data - Only during first creation. | |
| 972 | - if ( isset( $settings['series'] ) && ! empty( $series ) ) { | |
| 973 | - $count_series = count( $series ) - count( $settings['series'] ); | |
| 974 | - if ( $count_series > 1 ) { | |
| 975 | - $clone_last_series = end( $settings['series'] ); | |
| 976 | - $clone_last_series = array_fill_keys( array_keys( $clone_last_series ), '' ); | |
| 977 | - foreach ( range( 1, $count_series ) as $item ) { | |
| 978 | - $settings['series'][] = $clone_last_series; | |
| 979 | - } | |
| 980 | - } | |
| 981 | - } | |
| 982 | - | |
| 983 | 906 | $library = $this->load_chart_type( $chart->ID ); |
| 984 | 907 | |
| 985 | 908 | $id = 'visualizer-' . $chart->ID; |
| 986 | 909 | $arguments = $this->get_inline_custom_css( $id, $settings ); |
| @@ -988,15 +911,8 @@ | ||
| 988 | 911 | $css .= $arguments[0]; |
| 989 | 912 | $settings = $arguments[1]; |
| 990 | 913 | } |
| 991 | 914 | |
| 992 | - if ( isset( $settings['controls']['ui']['labelStacking'] ) ) { | |
| 993 | - unset( $settings['controls']['ui']['labelStacking'] ); | |
| 994 | - } | |
| 995 | - if ( isset( $settings['controls']['ui']['orientation'] ) ) { | |
| 996 | - unset( $settings['controls']['ui']['orientation'] ); | |
| 997 | - } | |
| 998 | - | |
| 999 | 915 | // add chart to the array |
| 1000 | 916 | $charts[ $id ] = array( |
| 1001 | 917 | 'id' => $chart->ID, |
| 1002 | 918 | 'type' => $type, |
| @@ -1015,30 +931,26 @@ | ||
| 1015 | 931 | 'language' => $this->get_language(), |
| 1016 | 932 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 1017 | 933 | 'charts' => $charts, |
| 1018 | 934 | 'urls' => array( |
| 1019 | - 'base' => esc_url( add_query_arg( array( 'vpage' => false, 'vaction' => false ) ) ), | |
| 1020 | - 'create' => esc_url( | |
| 1021 | - add_query_arg( | |
| 1022 | - array( | |
| 1023 | - 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, | |
| 1024 | - 'library' => 'yes', | |
| 1025 | - 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '', | |
| 1026 | - 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '', | |
| 1027 | - 'vaction' => false, | |
| 1028 | - ), | |
| 1029 | - $ajaxurl | |
| 1030 | - ) | |
| 935 | + 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ), | |
| 936 | + 'create' => add_query_arg( | |
| 937 | + array( | |
| 938 | + 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, | |
| 939 | + 'library' => 'yes', | |
| 940 | + 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '', | |
| 941 | + 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '', | |
| 942 | + 'vaction' => false, | |
| 943 | + ), | |
| 944 | + $ajaxurl | |
| 1031 | 945 | ), |
| 1032 | - 'edit' => esc_url( | |
| 1033 | - add_query_arg( | |
| 1034 | - array( | |
| 1035 | - 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, | |
| 1036 | - 'library' => 'yes', | |
| 1037 | - 'vaction' => false, | |
| 1038 | - ), | |
| 1039 | - $ajaxurl | |
| 1040 | - ) | |
| 946 | + 'edit' => add_query_arg( | |
| 947 | + array( | |
| 948 | + 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, | |
| 949 | + 'library' => 'yes', | |
| 950 | + 'vaction' => false, | |
| 951 | + ), | |
| 952 | + $ajaxurl | |
| 1041 | 953 | ), |
| 1042 | 954 | ), |
| 1043 | 955 | 'page_type' => 'library', |
| 1044 | 956 | 'is_front' => false, |
| @@ -1113,9 +1025,9 @@ | ||
| 1113 | 1025 | esc_html__( 'Docs', 'visualizer' ) |
| 1114 | 1026 | ); |
| 1115 | 1027 | // flattr link |
| 1116 | 1028 | $plugin_meta[] = sprintf( |
| 1117 | - '<a style="color:red" href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'pluginrow' ) . '" target="_blank">%s</a>', | |
| 1029 | + '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>', | |
| 1118 | 1030 | esc_html__( 'Pro Addon', 'visualizer' ) |
| 1119 | 1031 | ); |
| 1120 | 1032 | } |
| 1121 | 1033 | |
| @@ -1121,75 +1033,5 @@ | ||
| 1121 | 1033 | |
| 1122 | 1034 | return $plugin_meta; |
| 1123 | 1035 | } |
| 1124 | 1036 | |
| 1125 | - /** | |
| 1126 | - * If check is existing user. | |
| 1127 | - * | |
| 1128 | - * @return bool Default false | |
| 1129 | - */ | |
| 1130 | - public static function proFeaturesLocked() { | |
| 1131 | - if ( Visualizer_Module::is_pro() ) { | |
| 1132 | - return true; | |
| 1133 | - } | |
| 1134 | - return 'yes' === get_option( 'visualizer-new-user', 'yes' ) ? false : true; | |
| 1135 | - } | |
| 1136 | - | |
| 1137 | - /** | |
| 1138 | - * Multilingual Support. | |
| 1139 | - * | |
| 1140 | - * @param int $chart_id Chart ID. | |
| 1141 | - * @return bool Default false | |
| 1142 | - */ | |
| 1143 | - public function addMultilingualSupport( $chart_id ) { | |
| 1144 | - global $sitepress; | |
| 1145 | - if ( Visualizer_Module::is_pro() ) { | |
| 1146 | - return; | |
| 1147 | - } | |
| 1148 | - if ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) { | |
| 1149 | - $language = icl_get_languages(); | |
| 1150 | - $current_lang = icl_get_current_language(); | |
| 1151 | - $default_lang = icl_get_default_language(); | |
| 1152 | - $post_info = wpml_get_language_information( null, $chart_id ); | |
| 1153 | - $translations = array(); | |
| 1154 | - if ( ! empty( $post_info ) && ( $default_lang === $post_info['language_code'] ) ) { | |
| 1155 | - $trid = $sitepress->get_element_trid( $chart_id, 'post_' . Visualizer_Plugin::CPT_VISUALIZER ); | |
| 1156 | - $translations = $sitepress->get_element_translations( $trid ); | |
| 1157 | - } | |
| 1158 | - if ( empty( $translations ) ) { | |
| 1159 | - return; | |
| 1160 | - } | |
| 1161 | - ?> | |
| 1162 | - <hr><div class="visualizer-languages-list only-pro"> | |
| 1163 | - <?php | |
| 1164 | - foreach ( $language as $lang ) { | |
| 1165 | - $lang_code = $lang['code']; | |
| 1166 | - if ( $current_lang !== $lang_code ) { | |
| 1167 | - ?> | |
| 1168 | - <a href="javascript:;"> | |
| 1169 | - <img src="<?php echo esc_url( $lang['country_flag_url'] ); ?>" alt="<?php echo esc_attr( $lang['translated_name'] ); ?>"> | |
| 1170 | - </a> | |
| 1171 | - <?php | |
| 1172 | - } | |
| 1173 | - } | |
| 1174 | - ?> | |
| 1175 | - <a href="<?php echo tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'wpml-support', 'visualizer_render_char' ); ?>"target="_blank"><?php esc_html_e( 'Upgrade to PRO to active this translation for charts', 'visualizer' ); ?></a> | |
| 1176 | - </div> | |
| 1177 | - <?php | |
| 1178 | - } | |
| 1179 | - } | |
| 1180 | - | |
| 1181 | - /** | |
| 1182 | - * Check chart is enabled or not. | |
| 1183 | - * | |
| 1184 | - * @param string $type Chart ID. | |
| 1185 | - * | |
| 1186 | - * @return bool Default false | |
| 1187 | - */ | |
| 1188 | - public static function checkChartStatus( $type ) { | |
| 1189 | - $types = self::_getChartTypesLocalized( false, false, false, true ); | |
| 1190 | - if ( isset( $types[ $type ] ) ) { | |
| 1191 | - return ! empty( $types[ $type ]['enabled'] ); | |
| 1192 | - } | |
| 1193 | - return false; | |
| 1194 | - } | |
| 1195 | 1037 | } |
