| @@ -1,22 +1,16 @@ | ||
| 1 | 1 | <?php |
| 2 | + | |
| 2 | 3 | namespace WPDeveloper\BetterDocs\Core; |
| 3 | 4 | |
| 4 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 5 | - exit; | |
| 6 | -} | |
| 7 | - | |
| 8 | - | |
| 9 | 5 | use Exception; |
| 10 | 6 | use PriyoMukul\WPNotice\Notices; |
| 11 | -use WPDeveloper\BetterDocs\Admin\NoticePointers; | |
| 12 | 7 | use WPDeveloper\BetterDocs\Utils\Base; |
| 13 | 8 | use PriyoMukul\WPNotice\Utils\CacheBank; |
| 14 | 9 | use WPDeveloper\BetterDocs\Utils\Helper; |
| 15 | 10 | use WPDeveloper\BetterDocs\Utils\Enqueue; |
| 16 | -use WPDeveloper\BetterDocs\Insights\Insights; | |
| 11 | +use WPDeveloper\BetterDocs\Utils\Insights; | |
| 17 | 12 | use PriyoMukul\WPNotice\Utils\NoticeRemover; |
| 18 | -use WPDeveloper\BetterDocs\Core\PluginInstaller; | |
| 19 | 13 | use WPDeveloper\BetterDocs\Dependencies\DI\Container; |
| 20 | 14 | |
| 21 | 15 | class Admin extends Base { |
| 22 | 16 | /** |
| @@ -24,12 +18,11 @@ | ||
| 24 | 18 | */ |
| 25 | 19 | private static $cache_bank; |
| 26 | 20 | /** |
| 27 | 21 | * Admin Root Menu Slug |
| 28 | - * | |
| 29 | 22 | * @var string |
| 30 | 23 | */ |
| 31 | - private $slug = 'betterdocs-dashboard'; | |
| 24 | + private $slug = 'betterdocs-admin'; | |
| 32 | 25 | /** |
| 33 | 26 | * Insights |
| 34 | 27 | * |
| 35 | 28 | * @var Insights |
| @@ -58,19 +51,14 @@ | ||
| 58 | 51 | private $kbmigration; |
| 59 | 52 | |
| 60 | 53 | /** |
| 61 | 54 | * Enqueue |
| 62 | - * | |
| 63 | 55 | * @var Enqueue |
| 64 | 56 | */ |
| 65 | 57 | private $assets; |
| 66 | 58 | |
| 67 | - // modules | |
| 68 | - protected $installer; | |
| 69 | - | |
| 70 | 59 | /** |
| 71 | 60 | * FAQBuilder |
| 72 | - * | |
| 73 | 61 | * @var FAQBuilder |
| 74 | 62 | */ |
| 75 | 63 | private $faq_builder; |
| 76 | 64 | private $glossaries; |
| @@ -79,12 +67,11 @@ | ||
| 79 | 67 | $this->container = $container; |
| 80 | 68 | $this->assets = $assets; |
| 81 | 69 | $this->settings = $settings; |
| 82 | 70 | $this->kbmigration = $kbmigration; |
| 83 | - $this->slug = 'betterdocs-dashboard'; | |
| 71 | + $this->slug = 'betterdocs-admin'; | |
| 84 | 72 | |
| 85 | - add_action( 'init', array( $type, 'register' ), 9 ); | |
| 86 | - add_action( 'rest_api_init', array( $this, 'order_terms_in_wp_terms_admin_table' ) ); | |
| 73 | + add_action( 'init', [ $type, 'register' ], 9 ); | |
| 87 | 74 | |
| 88 | 75 | $type->init(); |
| 89 | 76 | $type->admin_init(); |
| 90 | 77 | |
| @@ -90,73 +77,51 @@ | ||
| 90 | 77 | |
| 91 | 78 | $this->faq_builder = $this->container->get( FAQBuilder::class ); |
| 92 | 79 | $this->glossaries = $this->container->get( Glossaries::class ); |
| 93 | 80 | |
| 94 | - /** | |
| 95 | - * Register usage tracking (including the daily `put_do_weekly_action` cron | |
| 96 | - * handler) on every request — WP-Cron runs with is_admin() === false, so | |
| 97 | - * this MUST sit above the admin guard or the cron send never fires. The | |
| 98 | - * admin-only UI hooks inside Insights::init() (deactivation form, footer | |
| 99 | - * scripts, plugin_action_links) are context-specific and simply never run | |
| 100 | - * outside wp-admin. | |
| 101 | - */ | |
| 102 | - $this->plugin_insights(); | |
| 103 | - | |
| 104 | 81 | if ( ! is_admin() ) { |
| 105 | 82 | return; |
| 106 | 83 | } |
| 107 | 84 | |
| 108 | - $this->installer = new PluginInstaller(); | |
| 109 | - | |
| 110 | - add_action( 'admin_notices', array( $this, 'compatibility_notices' ) ); | |
| 111 | - // The WPNotice CacheBank wipes all admin_notices at priority 10 on BetterDocs | |
| 112 | - // screens, so the hook above never renders inside the BetterDocs panels. | |
| 113 | - // Re-add the compatibility notice after that wipe (in_admin_header, priority | |
| 114 | - // 999) so it shows on the panels like the review / license notices. | |
| 115 | - add_action( 'in_admin_header', function () { | |
| 116 | - $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null; | |
| 117 | - if ( $screen && betterdocs()->is_betterdocs_screen( $screen->id ) ) { | |
| 118 | - add_action( 'admin_notices', array( $this, 'compatibility_notices' ) ); | |
| 119 | - } | |
| 120 | - }, 999 ); | |
| 85 | + $this->plugin_insights(); | |
| 86 | + add_action( 'admin_notices', [ $this, 'compatibility_notices' ] ); | |
| 121 | 87 | // add_action( 'admin_init', [$this, 'notices'], 9 ); |
| 122 | - add_filter( 'admin_init', array( $this, 'save_admin_page' ), 99 ); | |
| 88 | + add_filter( 'admin_init', [ $this, 'save_admin_page' ], 99 ); | |
| 123 | 89 | |
| 124 | - add_action( 'admin_menu', array( $this, 'menus' ) ); | |
| 125 | - add_action( 'admin_menu', array( $this, 'reset_submenu' ) ); | |
| 126 | - add_action( 'admin_head', array( $this, 'add_custom_classes_to_menu_items' ) ); | |
| 127 | - add_filter( 'plugin_action_links_' . BETTERDOCS_PLUGIN_BASENAME, array( $this, 'insert_plugin_links' ) ); | |
| 90 | + add_action( 'admin_menu', [ $this, 'menus' ] ); | |
| 91 | + add_action( 'admin_menu', [ $this, 'reset_submenu' ] ); | |
| 92 | + add_action( 'admin_head', [ $this, 'add_custom_classes_to_menu_items' ] ); | |
| 93 | + add_filter( 'plugin_action_links_' . BETTERDOCS_PLUGIN_BASENAME, [ $this, 'insert_plugin_links' ] ); | |
| 128 | 94 | |
| 129 | 95 | // $this->container->get( SetupWizard::class )->init(); |
| 130 | 96 | |
| 131 | - add_action( 'admin_enqueue_scripts', array( $this, 'styles' ) ); | |
| 132 | - add_action( 'admin_enqueue_scripts', array( $this, 'scripts' ) ); | |
| 133 | - // add_action( 'betterdocs_listing_header', [ $this, 'header' ], 10, 1 ); | |
| 134 | - add_action( 'admin_bar_menu', array( $this, 'toolbar_menu' ), 32 ); | |
| 97 | + add_action( 'admin_enqueue_scripts', [ $this, 'styles' ] ); | |
| 98 | + add_action( 'admin_enqueue_scripts', [ $this, 'scripts' ] ); | |
| 99 | + //add_action( 'betterdocs_listing_header', [ $this, 'header' ], 10, 1 ); | |
| 100 | + add_action( 'admin_bar_menu', [ $this, 'toolbar_menu' ], 32 ); | |
| 135 | 101 | |
| 136 | - add_filter( 'admin_body_class', array( $this, 'body_classes' ) ); | |
| 137 | - add_filter( 'parent_file', array( $type, 'highlight_admin_menu' ) ); | |
| 138 | - add_filter( 'submenu_file', array( $type, 'highlight_admin_submenu' ), 10, 2 ); | |
| 139 | - add_filter( 'betterdocs_admin_menu', array( $this, 'quick_setup_menu' ), 10, 1 ); | |
| 102 | + add_filter( 'admin_body_class', [ $this, 'body_classes' ] ); | |
| 103 | + add_filter( 'parent_file', [ $type, 'highlight_admin_menu' ] ); | |
| 104 | + add_filter( 'submenu_file', [ $type, 'highlight_admin_submenu' ], 10, 2 ); | |
| 105 | + add_filter( 'betterdocs_admin_menu', [ $this, 'quick_setup_menu' ], 10, 1 ); | |
| 140 | 106 | |
| 141 | 107 | /** |
| 142 | 108 | * Remove Comments Column from List Table. |
| 143 | 109 | */ |
| 144 | - add_filter( 'manage_docs_posts_columns', array( $this, 'set_custom_edit_action_columns' ) ); | |
| 145 | - add_filter( 'manage_docs_posts_custom_column', array( $this, 'manage_custom_columns' ), 10, 2 ); | |
| 110 | + add_filter( 'manage_docs_posts_columns', [ $this, 'set_custom_edit_action_columns' ] ); | |
| 111 | + add_filter( 'manage_docs_posts_custom_column', [ $this, 'manage_custom_columns' ], 10, 2 ); | |
| 146 | 112 | |
| 147 | 113 | /** |
| 148 | 114 | * Add New Column |
| 149 | 115 | */ |
| 150 | - add_filter( 'manage_users_columns', array( $this, 'add_users_total_docs_column' ), 10, 1 ); | |
| 151 | - add_filter( 'manage_users_custom_column', array( $this, 'popular_users_docs_data' ), 10, 3 ); | |
| 116 | + add_filter( 'manage_users_columns', [ $this, 'add_users_total_docs_column' ], 10, 1 ); | |
| 117 | + add_filter( 'manage_users_custom_column', [ $this, 'popular_users_docs_data' ], 10, 3 ); | |
| 152 | 118 | if ( is_plugin_active( 'betterdocs-pro/betterdocs-pro.php' ) ) { |
| 153 | 119 | add_action( 'admin_footer-plugins.php', array( $this, 'disable_deactivation' ) ); |
| 154 | 120 | } |
| 155 | 121 | |
| 156 | 122 | if ( $this->settings->get( 'enable_estimated_reading_time' ) ) { |
| 157 | - // Hook into unified metabox instead of creating separate metabox | |
| 158 | - add_action( 'betterdocs_reading_time_tab_content', array( $this, 'render_estimated_time_markup' ) ); | |
| 123 | + add_action( 'add_meta_boxes', [ $this, 'reading_meta_box_' ], 10 ); | |
| 159 | 124 | } |
| 160 | 125 | |
| 161 | 126 | self::$cache_bank = CacheBank::get_instance(); |
| 162 | 127 | |
| @@ -167,30 +132,10 @@ | ||
| 167 | 132 | $this->notices(); |
| 168 | 133 | } catch ( Exception $e ) { |
| 169 | 134 | unset( $e ); |
| 170 | 135 | } |
| 171 | - | |
| 172 | - // Initialize Black Friday Pointer | |
| 173 | - $this->init_black_friday_pointer(); | |
| 174 | - | |
| 175 | - // Register AJAX handler for pointer dismissal | |
| 176 | - add_action( 'wp_ajax_betterdocs_dismiss_black_friday_pointer', array( $this, 'ajax_dismiss_black_friday_pointer' ) ); | |
| 177 | 136 | } |
| 178 | 137 | |
| 179 | - public function order_terms_in_wp_terms_admin_table() { | |
| 180 | - // order the terms correctly to be shown on the admin panel categories menu with betterdocs order | |
| 181 | - add_action( | |
| 182 | - 'rest_insert_doc_category', | |
| 183 | - function ( $term, $request, $bool ) { | |
| 184 | - $max_order = Helper::get_max_doc_category_order_from_term_meta() ?? 0; | |
| 185 | - $next_order = $max_order + 1; | |
| 186 | - update_term_meta( $term->term_id, 'doc_category_order', $next_order ); | |
| 187 | - }, | |
| 188 | - 10, | |
| 189 | - 3 | |
| 190 | - ); | |
| 191 | - } | |
| 192 | - | |
| 193 | 138 | public function disable_deactivation() { |
| 194 | 139 | $tooltip_text = esc_html__( 'Deactivate BetterDocs Pro First', 'betterdocs' ); |
| 195 | 140 | ?> |
| 196 | 141 | <style type="text/css"> |
| @@ -235,17 +180,17 @@ | ||
| 235 | 180 | <?php |
| 236 | 181 | } |
| 237 | 182 | |
| 238 | 183 | public function add_users_total_docs_column( $columns ) { |
| 239 | - $new_column = array( | |
| 240 | - 'docs' => __( 'Docs', 'betterdocs' ), | |
| 241 | - ); | |
| 184 | + $new_column = [ | |
| 185 | + 'docs' => __( 'Docs', 'betterdocs' ) | |
| 186 | + ]; | |
| 242 | 187 | $columns = array_merge( $columns, $new_column ); |
| 243 | 188 | return $columns; |
| 244 | 189 | } |
| 245 | 190 | |
| 246 | 191 | public function popular_users_docs_data( $output, $column_name, $user_id ) { |
| 247 | - if ( 'docs' == $column_name ) { | |
| 192 | + if ( $column_name == 'docs' ) { | |
| 248 | 193 | $total_count = count_user_posts( $user_id, 'docs', true ); |
| 249 | 194 | return '<a href="edit.php?post_type=docs&author=' . $user_id . '" class="edit"><span aria-hidden="true">' . $total_count . '</span></a>'; |
| 250 | 195 | } |
| 251 | 196 | return $output; |
| @@ -250,8 +195,20 @@ | ||
| 250 | 195 | } |
| 251 | 196 | return $output; |
| 252 | 197 | } |
| 253 | 198 | |
| 199 | + public function reading_meta_box_() { | |
| 200 | + add_meta_box( | |
| 201 | + 'betterdocs_estimated_time_metabox', | |
| 202 | + __( 'Estimated Reading Time', 'betterdocs' ), | |
| 203 | + [ | |
| 204 | + $this, | |
| 205 | + 'render_estimated_time_markup' | |
| 206 | + ], | |
| 207 | + 'docs' | |
| 208 | + ); | |
| 209 | + } | |
| 210 | + | |
| 254 | 211 | public function render_estimated_time_markup() { |
| 255 | 212 | betterdocs()->views->get( 'admin/metabox/estimated-reading-box' ); |
| 256 | 213 | } |
| 257 | 214 | |
| @@ -259,15 +216,13 @@ | ||
| 259 | 216 | if ( betterdocs()->is_pro_active() ) { |
| 260 | 217 | $plugins = Helper::get_plugins(); |
| 261 | 218 | $plugin_data = $plugins['betterdocs-pro/betterdocs-pro.php']; |
| 262 | 219 | |
| 263 | - // Require the paired Pro release: the Analytics UI is version-coupled to | |
| 264 | - // Pro's advanced modules, so an older Pro renders a broken/partial panel. | |
| 265 | - if ( isset( $plugin_data['Version'] ) && version_compare( $plugin_data['Version'], '4.0.0', '>=' ) ) { | |
| 220 | + if ( isset( $plugin_data['Version'] ) && version_compare( $plugin_data['Version'], '2.5.0', '>=' ) ) { | |
| 266 | 221 | return; |
| 267 | 222 | } |
| 268 | 223 | |
| 269 | - betterdocs()->views->get( 'admin/notices/compatibility', array( 'version' => $plugin_data['Version'] ) ); | |
| 224 | + betterdocs()->views->get( 'admin/notices/compatibility', [ 'version' => $plugin_data['Version'] ] ); | |
| 270 | 225 | } |
| 271 | 226 | } |
| 272 | 227 | |
| 273 | 228 | public function plugin_insights( $prevent_init = false ) { |
| @@ -272,20 +227,20 @@ | ||
| 272 | 227 | |
| 273 | 228 | public function plugin_insights( $prevent_init = false ) { |
| 274 | 229 | $this->insights = Insights::get_instance( |
| 275 | 230 | BETTERDOCS_PLUGIN_FILE, |
| 276 | - array( | |
| 231 | + [ | |
| 277 | 232 | 'opt_in' => true, |
| 278 | 233 | 'goodbye_form' => true, |
| 279 | - 'item_id' => 'c7b16777b4f1b83f6083', | |
| 280 | - ) | |
| 234 | + 'item_id' => 'c7b16777b4f1b83f6083' | |
| 235 | + ] | |
| 281 | 236 | ); |
| 282 | 237 | |
| 283 | 238 | $this->insights->set_notice_options( |
| 284 | - array( | |
| 239 | + [ | |
| 285 | 240 | 'notice' => __( 'Want to help make <strong>BetterDocs</strong> even more awesome? You can get a <strong>10% discount coupon</strong> for Premium extensions if you allow us to track the usage.', 'betterdocs' ), |
| 286 | - 'extra_notice' => __( 'We collect non-sensitive diagnostic data and plugin usage information. Your site URL, WordPress & PHP version, plugins & themes and email address to send you the discount coupon. This data lets us make sure this plugin always stays compatible with the most popular plugins and themes. No spam, I promise.', 'betterdocs' ), | |
| 287 | - ) | |
| 241 | + 'extra_notice' => __( 'We collect non-sensitive diagnostic data and plugin usage information. Your site URL, WordPress & PHP version, plugins & themes and email address to send you the discount coupon. This data lets us make sure this plugin always stays compatible with the most popular plugins and themes. No spam, I promise.', 'betterdocs' ) | |
| 242 | + ] | |
| 288 | 243 | ); |
| 289 | 244 | |
| 290 | 245 | if ( ! $prevent_init ) { |
| 291 | 246 | $this->insights->init(); |
| @@ -301,77 +256,76 @@ | ||
| 301 | 256 | * @throws Exception |
| 302 | 257 | */ |
| 303 | 258 | public function notices() { |
| 304 | 259 | $notices = new Notices( |
| 305 | - array( | |
| 260 | + [ | |
| 306 | 261 | 'id' => 'betterdocs', |
| 307 | 262 | 'storage_key' => 'notices', |
| 308 | 263 | 'lifetime' => 3, |
| 309 | 264 | 'stylesheet_url' => $this->assets->asset_url( 'admin/css/notices.css' ), |
| 310 | 265 | 'styles' => $this->assets->asset_url( 'admin/css/notices.css' ), |
| 311 | - 'priority' => 4, | |
| 312 | - ) | |
| 266 | + 'priority' => 4 | |
| 267 | + ] | |
| 313 | 268 | ); |
| 314 | 269 | |
| 315 | 270 | /** |
| 316 | - * Review Notice | |
| 317 | - * | |
| 318 | - * @var mixed $message | |
| 319 | - */ | |
| 271 | + * Review Notice | |
| 272 | + * @var mixed $message | |
| 273 | + */ | |
| 320 | 274 | |
| 321 | 275 | $message = __( 'We hope you\'re enjoying BetterDocs! Could you please do us a BIG favor and give it a 5-star rating on WordPress to help us spread the word and boost our motivation?', 'betterdocs' ); |
| 322 | 276 | |
| 323 | - $_review_notice = array( | |
| 277 | + $_review_notice = [ | |
| 324 | 278 | 'thumbnail' => $this->assets->icon( 'betterdocs-logo.svg', true ), |
| 325 | 279 | 'html' => '<p>' . $message . '</p>', |
| 326 | - 'links' => array( | |
| 327 | - 'later' => array( | |
| 280 | + 'links' => [ | |
| 281 | + 'later' => [ | |
| 328 | 282 | 'link' => 'https://wordpress.org/plugins/betterdocs/#reviews', |
| 329 | 283 | 'target' => '_blank', |
| 330 | 284 | 'label' => __( 'Sure, you deserve it!', 'betterdocs' ), |
| 331 | - 'icon_class' => 'dashicons dashicons-external', | |
| 332 | - ), | |
| 333 | - 'allready' => array( | |
| 285 | + 'icon_class' => 'dashicons dashicons-external' | |
| 286 | + ], | |
| 287 | + 'allready' => [ | |
| 334 | 288 | 'label' => __( 'I already did', 'betterdocs' ), |
| 335 | 289 | 'icon_class' => 'dashicons dashicons-smiley', |
| 336 | - 'attributes' => array( | |
| 337 | - 'data-dismiss' => true, | |
| 338 | - ), | |
| 339 | - ), | |
| 340 | - 'maybe_later' => array( | |
| 290 | + 'attributes' => [ | |
| 291 | + 'data-dismiss' => true | |
| 292 | + ] | |
| 293 | + ], | |
| 294 | + 'maybe_later' => [ | |
| 341 | 295 | 'label' => __( 'Maybe Later', 'betterdocs' ), |
| 342 | 296 | 'icon_class' => 'dashicons dashicons-calendar-alt', |
| 343 | - 'attributes' => array( | |
| 297 | + 'attributes' => [ | |
| 344 | 298 | 'data-later' => true, |
| 345 | - 'class' => 'dismiss-btn', | |
| 346 | - ), | |
| 347 | - ), | |
| 348 | - 'support' => array( | |
| 299 | + 'class' => 'dismiss-btn' | |
| 300 | + ] | |
| 301 | + ], | |
| 302 | + 'support' => [ | |
| 349 | 303 | 'link' => 'https://wpdeveloper.com/support', |
| 350 | - 'attributes' => array( | |
| 351 | - 'target' => '_blank', | |
| 352 | - ), | |
| 304 | + 'attributes' => [ | |
| 305 | + 'target' => '_blank' | |
| 306 | + ], | |
| 353 | 307 | 'label' => __( 'I need help', 'betterdocs' ), |
| 354 | - 'icon_class' => 'dashicons dashicons-sos', | |
| 355 | - ), | |
| 356 | - 'never_show_again' => array( | |
| 308 | + 'icon_class' => 'dashicons dashicons-sos' | |
| 309 | + ], | |
| 310 | + 'never_show_again' => [ | |
| 357 | 311 | 'label' => __( 'Never show again', 'betterdocs' ), |
| 358 | 312 | 'icon_class' => 'dashicons dashicons-dismiss', |
| 359 | - 'attributes' => array( | |
| 360 | - 'data-dismiss' => true, | |
| 361 | - ), | |
| 362 | - ), | |
| 363 | - ), | |
| 364 | - ); | |
| 313 | + 'attributes' => [ | |
| 314 | + 'data-dismiss' => true | |
| 315 | + ] | |
| 316 | + ] | |
| 317 | + ] | |
| 318 | + ]; | |
| 365 | 319 | |
| 366 | 320 | $notices->add( |
| 367 | 321 | 'review', |
| 368 | 322 | $_review_notice, |
| 369 | - array( | |
| 323 | + [ | |
| 370 | 324 | 'start' => $notices->strtotime( '+10 days' ), |
| 371 | 325 | 'recurrence' => 30, |
| 372 | - 'dismissible' => true, | |
| 373 | - ) | |
| 326 | + 'dismissible' => true | |
| 327 | + ] | |
| 374 | 328 | ); |
| 375 | 329 | |
| 376 | 330 | if ( $this->kbmigration->existing_plugins && ! in_array( $this->kbmigration->existing_plugins[0][0], $this->kbmigration->migrated_plugins ) ) { |
| 377 | 331 | $plugin_name = '<strong>' . esc_html( $this->kbmigration->existing_plugins[0][1] ) . '</strong>'; |
| @@ -376,9 +330,9 @@ | ||
| 376 | 330 | if ( $this->kbmigration->existing_plugins && ! in_array( $this->kbmigration->existing_plugins[0][0], $this->kbmigration->migrated_plugins ) ) { |
| 377 | 331 | $plugin_name = '<strong>' . esc_html( $this->kbmigration->existing_plugins[0][1] ) . '</strong>'; |
| 378 | 332 | |
| 379 | 333 | $message = sprintf( |
| 380 | - /* translators: %s is the name of the existing knowledge base plugin. */ | |
| 334 | + /* translators: %s is the name of the existing knowledge base plugin. */ | |
| 381 | 335 | __( 'Already using %s? Power up your Knowledge Base by migrating all your docs and settings to BetterDocs with just 1 click.', 'betterdocs' ), |
| 382 | 336 | esc_html( $plugin_name ) |
| 383 | 337 | ); |
| 384 | 338 | |
| @@ -388,51 +342,50 @@ | ||
| 388 | 342 | esc_url( admin_url( 'admin.php?page=betterdocs-settings&tab=tab-migration' ) ), |
| 389 | 343 | esc_html__( 'Start Migration', 'betterdocs' ) |
| 390 | 344 | ); |
| 391 | 345 | |
| 392 | - $_migration_notice = array( | |
| 346 | + $_migration_notice = [ | |
| 393 | 347 | 'thumbnail' => '', |
| 394 | 348 | 'html' => $migration_message, |
| 395 | - 'links' => array( | |
| 396 | - 'maybe_later' => array( | |
| 349 | + 'links' => [ | |
| 350 | + 'maybe_later' => [ | |
| 397 | 351 | 'label' => __( 'Maybe Later', 'betterdocs' ), |
| 398 | 352 | 'icon_class' => 'dashicons dashicons-calendar-alt', |
| 399 | - 'attributes' => array( | |
| 353 | + 'attributes' => [ | |
| 400 | 354 | 'data-later' => true, |
| 401 | - 'class' => 'dismiss-btn', | |
| 402 | - ), | |
| 403 | - ), | |
| 404 | - 'never_show_again' => array( | |
| 355 | + 'class' => 'dismiss-btn' | |
| 356 | + ] | |
| 357 | + ], | |
| 358 | + 'never_show_again' => [ | |
| 405 | 359 | 'label' => __( 'Never show again', 'betterdocs' ), |
| 406 | 360 | 'icon_class' => 'dashicons dashicons-dismiss', |
| 407 | - 'attributes' => array( | |
| 408 | - 'data-dismiss' => true, | |
| 409 | - ), | |
| 410 | - ), | |
| 411 | - ), | |
| 412 | - ); | |
| 361 | + 'attributes' => [ | |
| 362 | + 'data-dismiss' => true | |
| 363 | + ] | |
| 364 | + ] | |
| 365 | + ] | |
| 366 | + ]; | |
| 413 | 367 | |
| 414 | 368 | $notices->add( |
| 415 | 369 | 'migration', |
| 416 | 370 | $_migration_notice, |
| 417 | - array( | |
| 371 | + [ | |
| 418 | 372 | 'start' => $notices->time(), |
| 419 | 373 | 'recurrence' => false, |
| 420 | - 'dismissible' => true, | |
| 421 | - ) | |
| 374 | + 'dismissible' => true | |
| 375 | + ] | |
| 422 | 376 | ); |
| 423 | 377 | } |
| 424 | 378 | |
| 425 | 379 | /** |
| 426 | - * | |
| 427 | 380 | * Opt-In Notice |
| 428 | 381 | */ |
| 429 | 382 | $allow_tracking = get_option( 'wpins_allow_tracking' ); |
| 430 | - if ( null != $this->insights && ! isset( $allow_tracking['betterdocs'] ) ) { | |
| 383 | + if ( $this->insights != null && ! isset( $allow_tracking['betterdocs'] ) ) { | |
| 431 | 384 | $notices->add( |
| 432 | 385 | 'opt_in', |
| 433 | - array( $this->insights, 'notice' ), | |
| 434 | - array( | |
| 386 | + [ $this->insights, 'notice' ], | |
| 387 | + [ | |
| 435 | 388 | 'classes' => 'updated put-dismiss-notice', |
| 436 | 389 | 'start' => $notices->time(), |
| 437 | 390 | 'refresh' => BETTERDOCS_VERSION, |
| 438 | 391 | 'dismissible' => true, |
| @@ -437,57 +390,19 @@ | ||
| 437 | 390 | 'refresh' => BETTERDOCS_VERSION, |
| 438 | 391 | 'dismissible' => true, |
| 439 | 392 | 'do_action' => 'wpdeveloper_notice_clicked_for_betterdocs', |
| 440 | 393 | 'display_if' => ! function_exists( 'betterdocs_pro' ), |
| 441 | - 'screens' => array( 'dashboard' ), | |
| 442 | - ) | |
| 394 | + 'screens' => [ 'dashboard' ] | |
| 395 | + ] | |
| 443 | 396 | ); |
| 444 | 397 | } |
| 445 | 398 | |
| 446 | - $summer_campaign_message = '<div class="betterdocs-summer-notice-body"><p style="margin-top: 0; margin-bottom: 0;">🏖️ <strong>Summer Savings:</strong> Build AI-powered Knowledge Bases & FAQs to cut support tickets and improve user experience – now <strong>up to $100 OFF!</strong></p></div>'; | |
| 447 | - $_summer_campaign_notice = array( | |
| 448 | - 'thumbnail' => $this->assets->icon( 'betterdocs-logo.svg', true ), | |
| 449 | - 'html' => $summer_campaign_message, | |
| 450 | - 'links' => array( | |
| 451 | - 'support' => array( | |
| 452 | - 'link' => 'https://betterdocs.co/summer2026-admin-notice', | |
| 453 | - 'attributes' => array( | |
| 454 | - 'target' => '_blank', | |
| 455 | - 'class' => 'offer-button', | |
| 456 | - ), | |
| 457 | - 'label' => __( 'Upgrade To PRO Now', 'betterdocs' ), | |
| 458 | - ), | |
| 459 | - 'maybe_later' => array( | |
| 460 | - 'label' => __( 'I’ll Grab It Later', 'betterdocs' ), | |
| 461 | - 'attributes' => array( | |
| 462 | - 'target' => '_blank', | |
| 463 | - 'data-later' => true, | |
| 464 | - 'class' => 'dismiss-btn', | |
| 465 | - ), | |
| 466 | - ), | |
| 467 | - ), | |
| 468 | - ); | |
| 469 | - | |
| 470 | - $notices->add( | |
| 471 | - 'summer-campaign-26', | |
| 472 | - $_summer_campaign_notice, | |
| 473 | - array( | |
| 474 | - 'start' => $notices->time(), | |
| 475 | - 'recurrence' => false, | |
| 476 | - 'dismissible' => true, | |
| 477 | - 'refresh' => BETTERDOCS_VERSION, | |
| 478 | - 'expire' => strtotime( '11:59:59pm June 25, 2026' ), | |
| 479 | - 'display_if' => ! is_plugin_active( 'betterdocs-pro/betterdocs-pro.php' ), | |
| 480 | - ) | |
| 481 | - ); | |
| 482 | - | |
| 483 | 399 | self::$cache_bank->create_account( $notices ); |
| 484 | 400 | self::$cache_bank->calculate_deposits( $notices ); |
| 485 | 401 | if ( method_exists( self::$cache_bank, 'clear_notices_in_' ) ) { |
| 486 | 402 | self::$cache_bank->clear_notices_in_( |
| 487 | - array( | |
| 488 | - 'toplevel_page_betterdocs-dashboard', | |
| 489 | - 'admin_page_betterdocs-admin', | |
| 403 | + [ | |
| 404 | + 'toplevel_page_betterdocs-admin', | |
| 490 | 405 | 'betterdocs_page_betterdocs-admin', |
| 491 | 406 | 'betterdocs_page_betterdocs-settings', |
| 492 | 407 | 'betterdocs_page_betterdocs-faq', |
| 493 | 408 | 'betterdocs_page_betterdocs-analytics', |
| @@ -492,14 +407,11 @@ | ||
| 492 | 407 | 'betterdocs_page_betterdocs-faq', |
| 493 | 408 | 'betterdocs_page_betterdocs-analytics', |
| 494 | 409 | 'betterdocs_page_betterdocs-glossaries', |
| 495 | 410 | 'betterdocs_page_betterdocs-ai-chatbot', |
| 496 | - 'betterdocs_page_betterdocs-api-docs', | |
| 497 | - 'betterdocs_page_betterdocs-doc-categories', | |
| 498 | - 'betterdocs_page_betterdocs-doc-tags', | |
| 499 | 411 | 'edit-doc_category', |
| 500 | - 'edit-doc_tag', | |
| 501 | - ), | |
| 412 | + 'edit-doc_tag' | |
| 413 | + ], | |
| 502 | 414 | $notices, |
| 503 | 415 | true |
| 504 | 416 | ); |
| 505 | 417 | } |
| @@ -504,86 +416,30 @@ | ||
| 504 | 416 | ); |
| 505 | 417 | } |
| 506 | 418 | } |
| 507 | 419 | |
| 508 | - /** | |
| 509 | - * Resolve the admin dark-mode preference. | |
| 510 | - * | |
| 511 | - * The mode switcher stores the choice in a client cookie (no DB write, shared | |
| 512 | - * across every admin screen). Fall back to the legacy | |
| 513 | - * `betterdocs_settings['dark_mode']` value for installs that set it before this | |
| 514 | - * change and haven't toggled since. | |
| 515 | - * | |
| 516 | - * @return bool | |
| 517 | - */ | |
| 518 | - public function is_dark_mode() { | |
| 519 | - if ( isset( $_COOKIE['betterdocs_admin_dark_mode'] ) ) { | |
| 520 | - return '1' === $_COOKIE['betterdocs_admin_dark_mode']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 521 | - } | |
| 522 | - | |
| 523 | - $saved = get_option( 'betterdocs_settings', array() ); | |
| 524 | - return ! empty( $saved['dark_mode'] ); | |
| 525 | - } | |
| 526 | - | |
| 527 | - /** | |
| 528 | - * Whether the knowledge base is genuinely empty (no doc categories and no | |
| 529 | - * non-trash docs). Localized to the admin so the All Docs panel can render a | |
| 530 | - * skeleton shaped like the "No Category Found" empty card on first paint — | |
| 531 | - * instead of a category/docs skeleton it would immediately replace — without | |
| 532 | - * waiting for the REST fetch to reveal the count. | |
| 533 | - * | |
| 534 | - * @return bool | |
| 535 | - */ | |
| 536 | - public function kb_is_empty() { | |
| 537 | - $cats = wp_count_terms( array( 'taxonomy' => 'doc_category', 'hide_empty' => false ) ); | |
| 538 | - $cats = is_wp_error( $cats ) ? 0 : (int) $cats; | |
| 539 | - if ( $cats > 0 ) { | |
| 540 | - return false; | |
| 541 | - } | |
| 542 | - | |
| 543 | - $counts = (array) wp_count_posts( 'docs' ); | |
| 544 | - $total = 0; | |
| 545 | - foreach ( array( 'publish', 'future', 'draft', 'pending', 'private' ) as $status ) { | |
| 546 | - $total += isset( $counts[ $status ] ) ? (int) $counts[ $status ] : 0; | |
| 547 | - } | |
| 548 | - | |
| 549 | - return 0 === $total; | |
| 550 | - } | |
| 551 | - | |
| 552 | 420 | public function body_classes( $classes ) { |
| 553 | - $dark_mode = $this->is_dark_mode(); | |
| 554 | - $current_screen_id = get_current_screen() != null ? str_replace( 'betterdocs_page_', '', str_replace( 'toplevel_page_', '', str_replace( 'admin_page_', '', get_current_screen()->id ) ) ) : ''; | |
| 555 | - /** | |
| 556 | - * Filter the list of (prefix-stripped) screen ids that receive the | |
| 557 | - * `betterdocs-admin` body class (and dark-mode class). Pro/add-ons can | |
| 558 | - * register their own React admin pages, e.g. the Knowledge Base page. | |
| 559 | - * | |
| 560 | - * @param string[] $registered_screens Screen ids with the page prefix removed. | |
| 561 | - */ | |
| 562 | - $registered_screens = apply_filters( 'betterdocs_admin_screen_slugs', array( | |
| 563 | - 'betterdocs-settings', | |
| 564 | - 'betterdocs-admin', | |
| 565 | - 'betterdocs-dashboard', | |
| 566 | - 'betterdocs-analytics', | |
| 567 | - 'betterdocs-glossaries', | |
| 568 | - 'betterdocs-faq', | |
| 569 | - 'betterdocs-doc-categories', | |
| 570 | - 'betterdocs-doc-tags', | |
| 571 | - 'edit-doc_category', | |
| 572 | - 'edit-doc_tag', | |
| 573 | - 'edit-knowledge_base', | |
| 574 | - 'betterdocs-ai-chatbot', | |
| 575 | - 'betterdocs-api-docs', | |
| 576 | - ) ); | |
| 421 | + $saved_settings = get_option( 'betterdocs_settings', false ); | |
| 422 | + $dark_mode = isset( $saved_settings['dark_mode'] ) ? $saved_settings['dark_mode'] : false; | |
| 423 | + $dark_mode = ! empty( $dark_mode ) ? boolval( $dark_mode ) : false; | |
| 424 | + $current_screen_id = get_current_screen() != null ? str_replace( 'betterdocs_page_', '', str_replace( 'toplevel_page_', '', get_current_screen()->id ) ) : ''; | |
| 425 | + $registered_screens = [ | |
| 426 | + 'betterdocs-settings', | |
| 427 | + 'betterdocs-admin', | |
| 428 | + 'betterdocs-analytics', | |
| 429 | + 'betterdocs-glossaries', | |
| 430 | + 'betterdocs-faq', | |
| 431 | + 'edit-doc_category', | |
| 432 | + 'edit-doc_tag', | |
| 433 | + 'edit-knowledge_base', | |
| 434 | + 'betterdocs-ai-chatbot' | |
| 435 | + ]; | |
| 577 | 436 | |
| 578 | - if ( in_array( $current_screen_id, $registered_screens ) ) { | |
| 579 | - $classes .= ' betterdocs-admin '; | |
| 580 | - } | |
| 437 | + if( in_array( $current_screen_id, $registered_screens ) ) { | |
| 438 | + $classes .= ' betterdocs-admin '; | |
| 439 | + } | |
| 581 | 440 | |
| 582 | - // Dark mode also applies on the Quick Setup wizard, whose self-scoped chrome | |
| 583 | - // keys off `.betterdocs_page_betterdocs-setup.betterdocs-dark-mode`. | |
| 584 | - $dark_screens = array_merge( $registered_screens, array( 'betterdocs-setup' ) ); | |
| 585 | - if ( $dark_mode && in_array( $current_screen_id, $dark_screens, true ) ) { | |
| 441 | + if ( $dark_mode === true && in_array( $current_screen_id, $registered_screens ) ) { | |
| 586 | 442 | $classes .= ' betterdocs-dark-mode '; |
| 587 | 443 | } |
| 588 | 444 | |
| 589 | 445 | return $classes; |
| @@ -598,11 +454,11 @@ | ||
| 598 | 454 | * @since 1.0.0 |
| 599 | 455 | */ |
| 600 | 456 | public function set_custom_edit_action_columns( $columns ) { |
| 601 | 457 | unset( $columns['comments'] ); |
| 602 | - $new_columns = array(); | |
| 458 | + $new_columns = []; | |
| 603 | 459 | foreach ( $columns as $key => $value ) { |
| 604 | - if ( 'date' == $key ) { | |
| 460 | + if ( $key == 'date' ) { | |
| 605 | 461 | $new_columns['betterdocs_word_count'] = __( 'Word Count', 'betterdocs' ); // put the tags column before it |
| 606 | 462 | $new_columns['betterdocs_reaction'] = __( 'Reactions', 'betterdocs' ); |
| 607 | 463 | } |
| 608 | 464 | $new_columns[ $key ] = $value; |
| @@ -614,29 +470,26 @@ | ||
| 614 | 470 | public function manage_custom_columns( $column, $post_id ) { |
| 615 | 471 | global $wpdb; |
| 616 | 472 | switch ( $column ) { |
| 617 | 473 | case 'betterdocs_word_count': |
| 618 | - $content_without_html_tags = trim( wp_strip_all_tags( get_post_field( 'post_content', $post_id ) ) ); | |
| 474 | + $content_without_html_tags = trim( strip_tags( get_post_field( 'post_content', $post_id ) ) ); | |
| 619 | 475 | preg_match_all( '/<[^>]*>|[\p{L}\p{M}]+/u', $content_without_html_tags, $matches ); |
| 620 | - $total_words = ! empty( $matches[0] ) ? count( $matches[0] ) : count( array() ); | |
| 476 | + $total_words = ! empty( $matches[0] ) ? count( $matches[0] ) : count( [] ); | |
| 621 | 477 | $word_count = $total_words; |
| 622 | 478 | echo '<span>' . esc_html( intval( $word_count ) ) . '</span>'; |
| 623 | 479 | break; |
| 624 | 480 | case 'betterdocs_reaction': |
| 625 | - // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching -- per-post analytics aggregation rendered in admin list table; cache would mask live reactions. | |
| 481 | + $where = "WHERE post_id='" . esc_sql( $post_id ) . "'"; | |
| 626 | 482 | $analytics = $wpdb->get_results( |
| 627 | - $wpdb->prepare( | |
| 628 | - "SELECT | |
| 629 | - sum(impressions) as totalViews, | |
| 630 | - sum(unique_visit) as totalUniqueViews, | |
| 631 | - sum(happy + sad + normal) as totalReactions, | |
| 632 | - sum(happy) as totalHappy, | |
| 633 | - sum(normal) as totalNormal, | |
| 634 | - sum(sad) as totalSad | |
| 635 | - FROM {$wpdb->prefix}betterdocs_analytics | |
| 636 | - WHERE post_id = %d", | |
| 637 | - $post_id | |
| 638 | - ) | |
| 483 | + "SELECT | |
| 484 | + sum(impressions) as totalViews, | |
| 485 | + sum(unique_visit) as totalUniqueViews, | |
| 486 | + sum(happy + sad + normal) as totalReactions, | |
| 487 | + sum(happy) as totalHappy, | |
| 488 | + sum(normal) as totalNormal, | |
| 489 | + sum(sad) as totalSad | |
| 490 | + FROM {$wpdb->prefix}betterdocs_analytics | |
| 491 | + $where" | |
| 639 | 492 | ); |
| 640 | 493 | |
| 641 | 494 | echo '<ul class="reactions-count"> |
| 642 | 495 | <li> |
| @@ -692,22 +545,22 @@ | ||
| 692 | 545 | * @return void |
| 693 | 546 | * @since 1.0.0 |
| 694 | 547 | */ |
| 695 | 548 | public function styles( $hook ) { |
| 696 | - $this->assets->enqueue( 'betterdocs-global', 'admin/css/global.css', array(), 'all' ); | |
| 549 | + $this->assets->enqueue( 'betterdocs-global', 'admin/css/global.css', [], 'all' ); | |
| 697 | 550 | |
| 698 | 551 | if ( ! betterdocs()->is_betterdocs_screen( $hook ) ) { |
| 699 | 552 | return; |
| 700 | 553 | } |
| 701 | 554 | |
| 702 | - $this->assets->enqueue( 'betterdocs-select2', 'vendor/css/select2.min.css', array(), 'all' ); | |
| 703 | - $this->assets->enqueue( 'betterdocs-daterangepicker', 'vendor/css/daterangepicker.css', array(), 'all' ); | |
| 704 | - $this->assets->enqueue( 'betterdocs-old', 'admin/css/betterdocs.css', array(), 'all' ); | |
| 555 | + $this->assets->enqueue( 'betterdocs-select2', 'vendor/css/select2.min.css', [], 'all' ); | |
| 556 | + $this->assets->enqueue( 'betterdocs-daterangepicker', 'vendor/css/daterangepicker.css', [], 'all' ); | |
| 557 | + $this->assets->enqueue( 'betterdocs-old', 'admin/css/betterdocs.css', [], 'all' ); | |
| 705 | 558 | |
| 706 | 559 | /** |
| 707 | - * This scripts enqueued for Dashboard App. | |
| 708 | - */ | |
| 709 | - $this->assets->enqueue( 'betterdocs', 'admin/css/dashboard.css', array( 'betterdocs-old' ), '', BETTERDOCS_VERSION ); | |
| 560 | + * This scripts enqueued for Dashboard App. | |
| 561 | + */ | |
| 562 | + $this->assets->enqueue( 'betterdocs', 'admin/css/dashboard.css', [ 'betterdocs-old' ] ); | |
| 710 | 563 | $this->assets->enqueue( 'betterdocs-icons', 'admin/btd-icon/style.css' ); |
| 711 | 564 | } |
| 712 | 565 | |
| 713 | 566 | /** |
| @@ -718,70 +571,26 @@ | ||
| 718 | 571 | * @return void |
| 719 | 572 | * @since 1.0.0 |
| 720 | 573 | */ |
| 721 | 574 | public function scripts( $hook ) { |
| 722 | - // Classic-UI screens that should offer a "Switch to BetterDocs UI" | |
| 723 | - // button: All Docs, FAQ list, FAQ groups, Product FAQ groups, | |
| 724 | - // Doc Categories, Doc Tags. Maps each to the React admin page to | |
| 725 | - // return to; $switch_args carries extra query args (e.g. the FAQ | |
| 726 | - // Builder tab) appended to the React page URL. | |
| 727 | - $switch_page = ''; | |
| 728 | - $switch_args = array(); | |
| 729 | - if ( 'edit.php' === $hook && 'docs' === get_post_type() ) { | |
| 730 | - $switch_page = 'betterdocs-admin'; | |
| 731 | - } elseif ( 'edit.php' === $hook && 'betterdocs_faq' === get_post_type() ) { | |
| 732 | - $switch_page = 'betterdocs-faq'; | |
| 733 | - } elseif ( 'edit-tags.php' === $hook ) { | |
| 734 | - $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null; | |
| 735 | - $taxonomy = $screen && ! empty( $screen->taxonomy ) | |
| 736 | - ? $screen->taxonomy | |
| 737 | - : ( isset( $_GET['taxonomy'] ) ? sanitize_key( wp_unslash( $_GET['taxonomy'] ) ) : '' ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 738 | - if ( 'betterdocs_faq_category' === $taxonomy ) { | |
| 739 | - $switch_page = 'betterdocs-faq'; | |
| 740 | - } elseif ( 'betterdocs_product_faq_category' === $taxonomy ) { | |
| 741 | - // Product FAQ groups live on the FAQ Builder's WooCommerce tab. | |
| 742 | - $switch_page = 'betterdocs-faq'; | |
| 743 | - $switch_args = array( 'faq_tab' => 'woocommerce' ); | |
| 744 | - } elseif ( 'doc_category' === $taxonomy ) { | |
| 745 | - $switch_page = 'betterdocs-doc-categories'; | |
| 746 | - } elseif ( 'doc_tag' === $taxonomy ) { | |
| 747 | - $switch_page = 'betterdocs-doc-tags'; | |
| 748 | - } | |
| 749 | - } | |
| 750 | - | |
| 751 | - /** | |
| 752 | - * Allow Pro/add-ons to map their own classic-UI taxonomy screens to a | |
| 753 | - * React admin page for the "Switch to BetterDocs UI" button — e.g. the | |
| 754 | - * Knowledge Base taxonomy, which only exists when Pro is active. | |
| 755 | - * | |
| 756 | - * @param string $switch_page React page slug, or '' for no switcher. | |
| 757 | - * @param string $hook Current admin page hook. | |
| 758 | - */ | |
| 759 | - $switch_page = apply_filters( 'betterdocs_classic_switch_page', $switch_page, $hook ); | |
| 760 | - | |
| 761 | - if ( $switch_page ) { | |
| 575 | + if ( ( $hook === 'edit.php' ) && get_post_type() == 'docs' ) { | |
| 762 | 576 | $this->assets->enqueue( |
| 763 | 577 | 'betterdocs-switcher', |
| 764 | 578 | 'admin/js/switcher.js', |
| 765 | - array( | |
| 766 | - 'jquery', | |
| 767 | - ) | |
| 579 | + [ | |
| 580 | + 'jquery' | |
| 581 | + ] | |
| 768 | 582 | ); |
| 769 | 583 | |
| 770 | 584 | $this->assets->localize( |
| 771 | 585 | 'betterdocs-switcher', |
| 772 | 586 | 'betterdocsSwitcher', |
| 773 | - array( | |
| 587 | + [ | |
| 774 | 588 | 'menu_title' => __( 'Switch to BetterDocs UI', 'betterdocs' ), |
| 775 | - 'page' => $switch_page, | |
| 776 | - 'url' => add_query_arg( | |
| 777 | - array_merge( array( 'page' => $switch_page ), $switch_args ), | |
| 778 | - admin_url( 'admin.php' ) | |
| 779 | - ), | |
| 780 | 589 | 'site_address' => get_bloginfo( 'url' ), |
| 781 | 590 | 'betterdocs_pro_plugin' => betterdocs()->is_pro_active(), |
| 782 | - 'betterdocs_pro_version' => betterdocs()->pro_version(), | |
| 783 | - ) | |
| 591 | + 'betterdocs_pro_version' => betterdocs()->pro_version() | |
| 592 | + ] | |
| 784 | 593 | ); |
| 785 | 594 | |
| 786 | 595 | return; |
| 787 | 596 | } |
| @@ -791,107 +600,78 @@ | ||
| 791 | 600 | if ( ! betterdocs()->is_betterdocs_screen( $hook ) ) { |
| 792 | 601 | return; |
| 793 | 602 | } |
| 794 | 603 | |
| 795 | - wp_enqueue_media(); // load early to fix problems with media upload issues on settings for WordPress 6.0.9 | |
| 796 | 604 | $this->assets->register( 'betterdocs-admin', 'admin/js/dashboard.js' ); |
| 797 | 605 | |
| 798 | 606 | $saved_settings = get_option( 'betterdocs_settings', false ); |
| 799 | - $dark_mode = $this->is_dark_mode(); | |
| 607 | + $dark_mode = $saved_settings['dark_mode'] ?? false; | |
| 608 | + $dark_mode = ! empty( $dark_mode ) && boolval( $dark_mode ); | |
| 800 | 609 | $this->assets->localize( |
| 801 | 610 | 'betterdocs-admin', |
| 802 | 611 | 'betterdocs_admin', |
| 803 | - array( | |
| 612 | + [ | |
| 804 | 613 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
| 805 | 614 | 'doc_cat_order_nonce' => wp_create_nonce( 'doc_cat_order_nonce' ), |
| 806 | 615 | 'knowledge_base_order_nonce' => wp_create_nonce( 'knowledge_base_order_nonce' ), |
| 807 | - 'paged' => isset( $_GET['paged'] ) ? absint( wp_unslash( $_GET['paged'] ) ) : 0, // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- pagination read from URL. | |
| 808 | - 'per_page_id' => 'edit_doc_category_per_page', | |
| 809 | - 'menu_title' => __( 'Switch to BetterDocs UI', 'betterdocs' ), | |
| 810 | - 'dark_mode' => $dark_mode, | |
| 811 | - 'kb_is_empty' => $this->kb_is_empty(), | |
| 812 | - 'text' => __( 'Copied!', 'betterdocs' ), | |
| 813 | - 'test_report' => __( 'Test Report!', 'betterdocs' ), | |
| 814 | - 'sending' => __( 'Sending...', 'betterdocs' ), | |
| 815 | - 'dir_url' => BETTERDOCS_ABSURL, | |
| 816 | - 'rest_url' => esc_url_raw( rest_url() ), | |
| 817 | - 'free_version' => betterdocs()->version, | |
| 818 | - 'generate_data_url' => get_rest_url( null, '/betterdocs/v1/create-sample-docs' ), | |
| 819 | - 'ai_sample_docs' => array( | |
| 820 | - 'enabled' => (bool) betterdocs()->settings->get( 'enable_ai_sample_docs', true ), | |
| 821 | - 'rest_base' => esc_url_raw( get_rest_url( null, '/betterdocs/v1/sample-docs' ) ), | |
| 822 | - ), | |
| 823 | - 'nonce' => wp_create_nonce( 'wp_rest' ), | |
| 824 | - 'sync_nonce' => wp_create_nonce( 'ai_chatbot_embed' ), | |
| 825 | - 'count_all_docs' => array_sum( (array) wp_count_posts( 'docs' ) ), | |
| 826 | - 'count_all_faq' => array_sum( (array) wp_count_posts( 'betterdocs_faq' ) ), | |
| 827 | - 'faq_order' => get_option( 'betterdocs_faq_order', 'default' ), | |
| 828 | - 'count_new_docs' => $this->get_not_synced_docs_count(), | |
| 829 | - 'admin_url' => admin_url(), | |
| 830 | - 'ia_preview' => betterdocs()->settings->get( 'ia_enable_preview', false ), | |
| 831 | - 'multiple_kb' => betterdocs()->settings->get( 'multiple_kb' ), | |
| 832 | - 'previewMode' => betterdocs()->settings->get( 'ia_enable_preview', false ), | |
| 833 | - 'dashboard_mode' => get_option( 'dashboard_mode' ), | |
| 834 | - 'betterdocs_pro_plugin' => betterdocs()->is_pro_active(), | |
| 835 | - 'betterdocs_pro_version' => betterdocs()->pro_version(), | |
| 836 | - 'analytics_older' => version_compare( betterdocs()->pro_version(), '3.3.4', '<=' ), | |
| 837 | - 'betterdocs_ChatBot_plugin' => is_plugin_active( 'betterdocs-ai-chatbot/betterdocs-ai-chatbot.php' ), | |
| 838 | - 'api_docs_teaser' => betterdocs()->show_api_docs_teaser(), | |
| 839 | - 'is_woocommerce_active' => class_exists( 'WooCommerce' ), | |
| 840 | - 'total_doc_category_terms' => wp_count_terms( 'doc_category' ), | |
| 841 | - 'current_admin_language' => Helper::get_current_admin_language(), | |
| 842 | - 'is_multilingual' => Helper::is_multilingual_active(), | |
| 843 | - 'languages' => Helper::get_admin_languages(), | |
| 844 | - ) | |
| 616 | + 'paged' => isset( $_GET['paged'] ) ? absint( wp_unslash( $_GET['paged'] ) ) : 0, // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 617 | + 'per_page_id' => 'edit_doc_category_per_page', | |
| 618 | + 'menu_title' => __( 'Switch to BetterDocs UI', 'betterdocs' ), | |
| 619 | + 'dark_mode' => $dark_mode, | |
| 620 | + 'text' => __( 'Copied!', 'betterdocs' ), | |
| 621 | + 'test_report' => __( 'Test Report!', 'betterdocs' ), | |
| 622 | + 'sending' => __( 'Sending...', 'betterdocs' ), | |
| 623 | + 'dir_url' => BETTERDOCS_ABSURL, | |
| 624 | + 'rest_url' => esc_url_raw( rest_url() ), | |
| 625 | + 'free_version' => betterdocs()->version, | |
| 626 | + 'generate_data_url' => get_rest_url( null, '/betterdocs/v1/create-sample-docs' ), | |
| 627 | + 'nonce' => wp_create_nonce( 'wp_rest' ), | |
| 628 | + 'sync_nonce' => wp_create_nonce( 'ai_chatbot_embed' ), | |
| 629 | + 'count_all_docs' => wp_count_posts('docs')->publish, | |
| 630 | + 'count_new_docs' => count(get_option('saved_docs_post_ids', [])), | |
| 631 | + 'admin_url' => admin_url(), | |
| 632 | + 'ia_preview' => betterdocs()->settings->get( 'ia_enable_preview', false ), | |
| 633 | + 'multiple_kb' => betterdocs()->settings->get( 'multiple_kb' ), | |
| 634 | + 'previewMode' => betterdocs()->settings->get( 'ia_enable_preview', false ), | |
| 635 | + 'dashboard_mode' => get_option( 'dashboard_mode' ), | |
| 636 | + 'betterdocs_pro_plugin' => betterdocs()->is_pro_active(), | |
| 637 | + 'betterdocs_pro_version' => betterdocs()->pro_version(), | |
| 638 | + 'analytics_older' => version_compare( betterdocs()->pro_version(), '3.3.4', '<=' ), | |
| 639 | + 'disabled_embed_model_option'=> get_option('disabled_embed_model_option'), | |
| 640 | + ] | |
| 845 | 641 | ); |
| 846 | 642 | |
| 847 | 643 | // If wp-date (which includes moment.js) is not registered, enqueue your custom moment.js |
| 848 | 644 | if ( ! wp_script_is( 'wp-date', 'registered' ) ) { |
| 849 | - $this->assets->enqueue( 'moment', 'vendor/js/moment.min.js', array() ); | |
| 645 | + $this->assets->enqueue( 'moment', 'vendor/js/moment.min.js', [] ); | |
| 850 | 646 | } |
| 851 | 647 | wp_enqueue_script( 'betterdocs-admin' ); |
| 852 | 648 | |
| 853 | 649 | /** |
| 854 | - * Duplicate Codes Need to Be Removed From Here Onwards | |
| 855 | - */ | |
| 650 | + * Duplicate Codes Need to Be Removed From Here Onwards | |
| 651 | + */ | |
| 856 | 652 | |
| 857 | - // FAQ Builder Related Localization | |
| 653 | + //FAQ Builder Related Localization | |
| 858 | 654 | betterdocs()->assets->enqueue( 'betterdocs-admin-faq', 'admin/css/faq.css' ); |
| 859 | 655 | betterdocs()->assets->enqueue( 'betterdocs-admin-faq', 'admin/js/faq.js' ); |
| 860 | 656 | |
| 861 | - // Load the classic editor (TinyMCE + QuickTags) so the FAQ rich-text editor can mount via wp.editor.initialize(). | |
| 862 | - if ( function_exists( 'wp_enqueue_editor' ) ) { | |
| 863 | - wp_enqueue_editor(); | |
| 864 | - } | |
| 865 | - if ( function_exists( 'wp_enqueue_media' ) ) { | |
| 866 | - wp_enqueue_media(); | |
| 867 | - } | |
| 868 | - | |
| 869 | 657 | // removing emoji support |
| 870 | 658 | remove_action( 'wp_head', 'print_emoji_detection_script', 7 ); |
| 871 | 659 | remove_action( 'admin_print_scripts', 'print_emoji_detection_script' ); |
| 872 | 660 | |
| 873 | - // Get settings and remove unnecessary keys | |
| 874 | - $betterdocs_settings = get_option( 'betterdocs_settings', false ); | |
| 875 | - if ( is_array( $betterdocs_settings ) && ! current_user_can( 'edit_docs_settings' ) ) { | |
| 876 | - foreach ( Settings::sensitive_api_key_fields() as $sensitive_key ) { | |
| 877 | - unset( $betterdocs_settings[ $sensitive_key ] ); | |
| 878 | - } | |
| 879 | - } | |
| 880 | - | |
| 881 | 661 | betterdocs()->assets->localize( |
| 882 | 662 | 'betterdocs-admin-faq', |
| 883 | 663 | 'betterdocsFaq', |
| 884 | - array( | |
| 664 | + [ | |
| 885 | 665 | 'dir_url' => BETTERDOCS_ABSURL, |
| 886 | 666 | 'rest_url' => esc_url_raw( rest_url() ), |
| 887 | 667 | 'free_version' => betterdocs()->version, |
| 888 | 668 | 'nonce' => wp_create_nonce( 'wp_rest' ), |
| 889 | - 'betterdocs_settings' => $betterdocs_settings, | |
| 890 | - ) | |
| 669 | + 'betterdocs_settings' => get_option( 'betterdocs_settings', false ) | |
| 670 | + ] | |
| 891 | 671 | ); |
| 892 | 672 | |
| 893 | - // Glossaries Related Localization | |
| 673 | + //Glossaries Related Localization | |
| 894 | 674 | betterdocs()->assets->enqueue( 'betterdocs-admin-glossaries', 'admin/css/faq.css' ); |
| 895 | 675 | |
| 896 | 676 | betterdocs()->assets->enqueue( 'betterdocs-admin-glossaries', 'admin/js/glossaries.js' ); |
| 897 | 677 | |
| @@ -897,15 +677,15 @@ | ||
| 897 | 677 | |
| 898 | 678 | betterdocs()->assets->localize( |
| 899 | 679 | 'betterdocs-admin-glossaries', |
| 900 | 680 | 'betterdocsGlossary', |
| 901 | - array( | |
| 681 | + [ | |
| 902 | 682 | 'dir_url' => BETTERDOCS_ABSURL, |
| 903 | 683 | 'rest_url' => esc_url_raw( rest_url() ), |
| 904 | 684 | 'free_version' => betterdocs()->version, |
| 905 | 685 | 'nonce' => wp_create_nonce( 'wp_rest' ), |
| 906 | - 'betterdocs_settings' => $betterdocs_settings, | |
| 907 | - ) | |
| 686 | + 'betterdocs_settings' => get_option( 'betterdocs_settings', false ) | |
| 687 | + ] | |
| 908 | 688 | ); |
| 909 | 689 | } |
| 910 | 690 | |
| 911 | 691 | /** |
| @@ -914,31 +694,31 @@ | ||
| 914 | 694 | * @return void |
| 915 | 695 | * @since 1.0.0 |
| 916 | 696 | */ |
| 917 | 697 | public function header( $admin_tab_name ) { |
| 918 | - $quick_links = array( | |
| 698 | + $quick_links = [ | |
| 919 | 699 | 'switch_view' => sprintf( |
| 920 | 700 | '<a href="%s" class="betterdocs-button betterdocs-button-secondary">%s</a>', |
| 921 | 701 | add_query_arg( |
| 922 | - array( | |
| 702 | + [ | |
| 923 | 703 | 'post_type' => 'docs', |
| 924 | - 'bdocs_view' => 'classic', | |
| 925 | - ), | |
| 704 | + 'bdocs_view' => 'classic' | |
| 705 | + ], | |
| 926 | 706 | 'edit.php' |
| 927 | 707 | ), |
| 928 | 708 | __( 'Switch to Classic UI', 'betterdocs' ) |
| 929 | 709 | ), |
| 930 | - 'add_new_doc' => sprintf( '<a href="%s" class="betterdocs-button betterdocs-button-primary">%s</a>', add_query_arg( array( 'post_type' => 'docs' ), 'post-new.php' ), __( 'Add New Doc', 'betterdocs' ) ), | |
| 931 | - ); | |
| 710 | + 'add_new_doc' => sprintf( '<a href="%s" class="betterdocs-button betterdocs-button-primary">%s</a>', add_query_arg( [ 'post_type' => 'docs' ], 'post-new.php' ), __( 'Add New Doc', 'betterdocs' ) ) | |
| 711 | + ]; | |
| 932 | 712 | |
| 933 | 713 | $quick_links = apply_filters( 'betterdocs_quick_links', $quick_links ); |
| 934 | 714 | |
| 935 | 715 | betterdocs()->views->get( |
| 936 | 716 | 'admin/header', |
| 937 | - array( | |
| 717 | + [ | |
| 938 | 718 | 'quick_links' => $quick_links, |
| 939 | - 'active_tab' => $admin_tab_name, | |
| 940 | - ) | |
| 719 | + 'active_tab' => $admin_tab_name | |
| 720 | + ] | |
| 941 | 721 | ); |
| 942 | 722 | } |
| 943 | 723 | |
| 944 | 724 | /** |
| @@ -946,77 +726,37 @@ | ||
| 946 | 726 | * |
| 947 | 727 | * @return void |
| 948 | 728 | * @since 1.0.0 |
| 949 | 729 | */ |
| 730 | + | |
| 950 | 731 | public function menus() { |
| 951 | - $default_args = array( | |
| 732 | + $default_args = [ | |
| 952 | 733 | 'page_title' => 'BetterDocs', |
| 953 | 734 | 'menu_title' => 'BetterDocs', |
| 954 | - 'capability' => 'edit_docs', // Unified capability | |
| 735 | + 'capability' => 'edit_posts', | |
| 955 | 736 | 'menu_slug' => $this->slug, |
| 956 | - 'callback' => array( $this, 'output' ), | |
| 737 | + 'callback' => [ $this, 'output' ], | |
| 957 | 738 | 'icon_url' => betterdocs()->assets->icon( 'betterdocs-icon-white.svg', true ), |
| 958 | - 'position' => 5, | |
| 959 | - ); | |
| 739 | + 'position' => 5 | |
| 740 | + ]; | |
| 960 | 741 | |
| 961 | 742 | $_menu_position = 5; |
| 962 | - global $submenu; | |
| 963 | 743 | |
| 964 | - // Always register both UI endpoints | |
| 965 | - $this->register_modern_ui_fallback(); | |
| 966 | - | |
| 967 | 744 | foreach ( $this->menu_list() as $key => $value ) { |
| 968 | - if ( 'betterdocs' === $key ) { | |
| 745 | + if ( $key === 'betterdocs' ) { | |
| 969 | 746 | $callable = 'add_menu_page'; |
| 970 | 747 | $value = wp_parse_args( $value, $default_args ); |
| 971 | - call_user_func_array( $callable, $value ); | |
| 972 | 748 | } else { |
| 973 | - $is_core_page = strpos( $value['menu_slug'], '?' ) !== false; | |
| 974 | - | |
| 975 | - if ( $is_core_page ) { | |
| 976 | - // Add classic UI directly | |
| 977 | - $submenu[ $this->slug ][] = array( | |
| 978 | - $value['menu_title'], | |
| 979 | - $value['capability'], | |
| 980 | - $value['menu_slug'], | |
| 981 | - $value['page_title'], | |
| 982 | - ); | |
| 983 | - } else { | |
| 984 | - // Add modern UI through WordPress API | |
| 985 | - add_submenu_page( | |
| 986 | - $this->slug, | |
| 987 | - $value['page_title'], | |
| 988 | - $value['menu_title'], | |
| 989 | - $value['capability'], | |
| 990 | - $value['menu_slug'], | |
| 991 | - $value['callback'] | |
| 992 | - ); | |
| 993 | - } | |
| 994 | - ++$_menu_position; | |
| 749 | + $callable = 'add_submenu_page'; | |
| 750 | + $default_args['callback'] = ''; | |
| 751 | + $default_args['position'] = $_menu_position; | |
| 752 | + unset( $default_args['icon_url'] ); | |
| 753 | + $value = wp_parse_args( $value, array_merge( [ 'parent_slug' => $this->slug ], $default_args ) ); | |
| 995 | 754 | } |
| 996 | - } | |
| 997 | - } | |
| 998 | 755 | |
| 999 | - private function register_modern_ui_fallback() { | |
| 1000 | - // Add the submenu with valid parent slug | |
| 1001 | - add_submenu_page( | |
| 1002 | - 'betterdocs', // Valid parent slug | |
| 1003 | - __( 'All Docs', 'betterdocs' ), | |
| 1004 | - '', // Empty menu title hides it | |
| 1005 | - 'edit_docs', | |
| 1006 | - 'betterdocs-admin', | |
| 1007 | - array( $this, 'output' ) | |
| 1008 | - ); | |
| 756 | + ++$_menu_position; | |
| 1009 | 757 | |
| 1010 | - // Hide the menu item from appearing in the admin sidebar | |
| 1011 | - global $submenu; | |
| 1012 | - if ( isset( $submenu['betterdocs'] ) ) { | |
| 1013 | - foreach ( $submenu['betterdocs'] as $key => $item ) { | |
| 1014 | - if ( 'betterdocs-admin' === $item[2] ) { | |
| 1015 | - unset( $submenu['betterdocs'][ $key ] ); | |
| 1016 | - break; | |
| 1017 | - } | |
| 1018 | - } | |
| 758 | + call_user_func_array( $callable, $value ); | |
| 1019 | 759 | } |
| 1020 | 760 | } |
| 1021 | 761 | |
| 1022 | 762 | /** |
| @@ -1026,17 +766,17 @@ | ||
| 1026 | 766 | * @since 1.0.0 |
| 1027 | 767 | */ |
| 1028 | 768 | public function output() { |
| 1029 | 769 | if ( betterdocs()->is_pro_active() |
| 1030 | - && version_compare( betterdocs()->pro_version(), '3.3.4', '<=' ) | |
| 1031 | - && get_current_screen()->id == 'betterdocs_page_betterdocs-analytics' ) { | |
| 770 | + && version_compare( betterdocs()->pro_version(), '3.3.4', '<=' ) | |
| 771 | + && get_current_screen()->id == 'betterdocs_page_betterdocs-analytics' ) { | |
| 1032 | 772 | betterdocs_pro()->views->get( 'admin/analytics-pro' ); |
| 1033 | 773 | } else { |
| 1034 | 774 | betterdocs()->views->get( |
| 1035 | 775 | 'admin/main', |
| 1036 | - array( | |
| 1037 | - 'admin_ui' => 'dnd', | |
| 1038 | - ) | |
| 776 | + [ | |
| 777 | + 'admin_ui' => 'dnd' | |
| 778 | + ] | |
| 1039 | 779 | ); |
| 1040 | 780 | } |
| 1041 | 781 | } |
| 1042 | 782 | |
| @@ -1049,10 +789,11 @@ | ||
| 1049 | 789 | * @param array $callback |
| 1050 | 790 | * |
| 1051 | 791 | * @return array |
| 1052 | 792 | * @since 2.5.0 |
| 793 | + * | |
| 1053 | 794 | */ |
| 1054 | - private function normalize_menu( $title, $slug, $cap = 'edit_docs', $callback = null, $optional = array() ) { | |
| 795 | + private function normalize_menu( $title, $slug, $cap = 'edit_docs', $callback = null, $optional = [] ) { | |
| 1055 | 796 | return Helper::normalize_menu( $title, $slug, $cap, $callback, $optional ); |
| 1056 | 797 | } |
| 1057 | 798 | |
| 1058 | 799 | /** |
| @@ -1061,62 +802,32 @@ | ||
| 1061 | 802 | * @return array |
| 1062 | 803 | * @since 1.0.0 |
| 1063 | 804 | */ |
| 1064 | 805 | private function menu_list() { |
| 1065 | - $parent_slug = array(); | |
| 806 | + $parent_slug = []; | |
| 1066 | 807 | |
| 1067 | - $betterdocs_admin_pages = array( | |
| 1068 | - 'betterdocs' => array( | |
| 808 | + $betterdocs_admin_pages = [ | |
| 809 | + 'betterdocs' => [ | |
| 1069 | 810 | 'menu_slug' => $this->slug, |
| 1070 | 811 | 'page_title' => 'BetterDocs', |
| 1071 | 812 | 'menu_title' => 'BetterDocs', |
| 1072 | 813 | 'capability' => 'edit_docs', |
| 1073 | - 'callback' => array( $this, 'output' ), | |
| 814 | + 'callback' => [ $this, 'output' ], | |
| 1074 | 815 | 'icon_url' => betterdocs()->assets->icon( 'betterdocs-icon-white.svg', true ), |
| 1075 | - 'position' => 5, | |
| 1076 | - ), | |
| 1077 | - 'dashboard' => $this->normalize_menu( | |
| 1078 | - __( 'Dashboard', 'betterdocs' ), | |
| 1079 | - 'betterdocs-dashboard', | |
| 1080 | - 'edit_docs', | |
| 1081 | - array( | |
| 1082 | - $this, | |
| 1083 | - 'output', | |
| 1084 | - ) | |
| 1085 | - ), | |
| 1086 | - 'all_docs' => $this->normalize_menu( | |
| 1087 | - __( 'All Docs', 'betterdocs' ), | |
| 1088 | - $this->ui_slug(), | |
| 1089 | - 'edit_docs', | |
| 1090 | - array( $this, 'output' ), | |
| 1091 | - $parent_slug | |
| 1092 | - ), | |
| 1093 | - 'add_new' => $this->normalize_menu( | |
| 1094 | - __( 'Add New', 'betterdocs' ), | |
| 1095 | - 'post-new.php?post_type=docs' | |
| 1096 | - ), | |
| 1097 | - 'categories' => $this->normalize_menu( | |
| 1098 | - __( 'Categories', 'betterdocs' ), | |
| 1099 | - 'betterdocs-doc-categories', | |
| 1100 | - 'manage_doc_terms', | |
| 1101 | - array( $this, 'output' ), | |
| 1102 | - $parent_slug | |
| 1103 | - ), | |
| 1104 | - 'tags' => $this->normalize_menu( | |
| 1105 | - __( 'Tags', 'betterdocs' ), | |
| 1106 | - 'betterdocs-doc-tags', | |
| 1107 | - 'manage_doc_terms', | |
| 1108 | - array( $this, 'output' ), | |
| 1109 | - $parent_slug | |
| 1110 | - ), | |
| 816 | + 'position' => 5 | |
| 817 | + ], | |
| 818 | + 'all_docs' => $this->normalize_menu( __( 'All Docs', 'betterdocs' ), $this->ui_slug() ), | |
| 819 | + 'add_new' => $this->normalize_menu( __( 'Add New', 'betterdocs' ), 'post-new.php?post_type=docs' ), | |
| 820 | + 'categories' => $this->normalize_menu( __( 'Categories', 'betterdocs' ), 'edit-tags.php?taxonomy=doc_category&post_type=docs', 'manage_doc_terms' ), | |
| 821 | + 'tags' => $this->normalize_menu( __( 'Tags', 'betterdocs' ), 'edit-tags.php?taxonomy=doc_tag&post_type=docs', 'manage_doc_terms' ), | |
| 1111 | 822 | 'settings' => $this->normalize_menu( |
| 1112 | 823 | __( 'Settings', 'betterdocs' ), |
| 1113 | 824 | 'betterdocs-settings', |
| 1114 | 825 | 'edit_docs_settings', |
| 1115 | - array( | |
| 826 | + [ | |
| 1116 | 827 | $this, |
| 1117 | - 'output', | |
| 1118 | - ), | |
| 828 | + 'output' | |
| 829 | + ], | |
| 1119 | 830 | $parent_slug |
| 1120 | 831 | ), |
| 1121 | 832 | 'analytics' => $this->normalize_menu( |
| 1122 | 833 | __( 'Analytics', 'betterdocs' ), |
| @@ -1121,25 +832,25 @@ | ||
| 1121 | 832 | 'analytics' => $this->normalize_menu( |
| 1122 | 833 | __( 'Analytics', 'betterdocs' ), |
| 1123 | 834 | 'betterdocs-analytics', |
| 1124 | 835 | 'read_docs_analytics', |
| 1125 | - array( | |
| 836 | + [ | |
| 1126 | 837 | $this, |
| 1127 | - 'output', | |
| 1128 | - ), | |
| 838 | + 'output' | |
| 839 | + ], | |
| 1129 | 840 | $parent_slug |
| 1130 | 841 | ), |
| 1131 | 842 | 'faq' => $this->normalize_menu( |
| 1132 | 843 | __( 'FAQ Builder', 'betterdocs' ), |
| 1133 | 844 | 'betterdocs-faq', |
| 1134 | - 'read_faq_builder', | |
| 1135 | - array( | |
| 845 | + 'read_docs_analytics', | |
| 846 | + [ | |
| 1136 | 847 | $this, |
| 1137 | - 'output', | |
| 1138 | - ), | |
| 848 | + 'output' | |
| 849 | + ], | |
| 1139 | 850 | $parent_slug |
| 1140 | - ), | |
| 1141 | - ); | |
| 851 | + ) | |
| 852 | + ]; | |
| 1142 | 853 | |
| 1143 | 854 | if ( betterdocs()->is_pro_active() && betterdocs()->settings->get( 'enable_glossaries' ) == true ) { |
| 1144 | 855 | $betterdocs_admin_pages['glossaries'] = $this->normalize_menu( |
| 1145 | 856 | __( 'Glossaries', 'betterdocs' ), |
| @@ -1144,65 +855,36 @@ | ||
| 1144 | 855 | $betterdocs_admin_pages['glossaries'] = $this->normalize_menu( |
| 1145 | 856 | __( 'Glossaries', 'betterdocs' ), |
| 1146 | 857 | 'betterdocs-glossaries', |
| 1147 | 858 | 'read_docs_analytics', |
| 1148 | - array( | |
| 859 | + [ | |
| 1149 | 860 | $this, |
| 1150 | - 'output', | |
| 1151 | - ), | |
| 861 | + 'output' | |
| 862 | + ], | |
| 1152 | 863 | $parent_slug |
| 1153 | 864 | ); |
| 1154 | 865 | } |
| 1155 | 866 | |
| 1156 | - // API Docs ships in Pro, which overwrites this same key in place — declaring | |
| 1157 | - // the slot here is what keeps the item in this position. Without Pro it | |
| 1158 | - // holds Free's locked teaser instead. | |
| 1159 | - if ( betterdocs()->show_api_docs_teaser() || betterdocs()->has_api_docs() ) { | |
| 1160 | - $betterdocs_admin_pages['api_docs'] = $this->normalize_menu( | |
| 1161 | - __( 'API Docs', 'betterdocs' ), | |
| 1162 | - 'betterdocs-api-docs', | |
| 1163 | - apply_filters( 'betterdocs_api_ref_capability', 'manage_options' ), | |
| 1164 | - array( | |
| 1165 | - $this, | |
| 1166 | - 'output', | |
| 1167 | - ), | |
| 1168 | - $parent_slug | |
| 1169 | - ); | |
| 1170 | - } | |
| 867 | + return apply_filters( 'betterdocs_admin_menu', $betterdocs_admin_pages, [$this, 'output'], $parent_slug); | |
| 1171 | 868 | |
| 1172 | - if ( ! betterdocs()->is_chatbot_active() ) { | |
| 1173 | - $betterdocs_admin_pages['ai_chatbot'] = $this->normalize_menu( | |
| 1174 | - __( 'AI Chatbot', 'betterdocs' ), | |
| 1175 | - 'betterdocs-ai-chatbot', | |
| 1176 | - 'edit_docs_settings', | |
| 1177 | - array( | |
| 1178 | - $this, | |
| 1179 | - 'output', | |
| 1180 | - ), | |
| 1181 | - $parent_slug | |
| 1182 | - ); | |
| 1183 | - } | |
| 869 | + } | |
| 1184 | 870 | |
| 1185 | - return apply_filters( 'betterdocs_admin_menu', $betterdocs_admin_pages, array( $this, 'output' ), $parent_slug ); | |
| 1186 | - } | |
| 1187 | - | |
| 1188 | 871 | public function add_custom_classes_to_menu_items() { |
| 1189 | 872 | global $menu, $submenu; |
| 1190 | 873 | |
| 1191 | - $menu_items = array( | |
| 874 | + $menu_items = [ | |
| 1192 | 875 | 'betterdocs' => 'betterdocs', |
| 1193 | 876 | 'betterdocs_page_all_docs' => 'betterdocs-all-docs', |
| 1194 | 877 | 'betterdocs_page_add_new' => 'betterdocs-add-new', |
| 1195 | - 'betterdocs-doc-categories' => 'betterdocs-categories', | |
| 1196 | - 'betterdocs-doc-tags' => 'betterdocs-tags', | |
| 878 | + 'edit-tags.php?taxonomy=doc_category&post_type=docs' => 'betterdocs-categories', | |
| 879 | + 'edit-tags.php?taxonomy=doc_tag&post_type=docs' => 'betterdocs-tags', | |
| 1197 | 880 | 'betterdocs-settings' => 'betterdocs-settings', |
| 1198 | 881 | 'betterdocs-analytics' => 'betterdocs-analytics', |
| 1199 | 882 | 'betterdocs-faq' => 'betterdocs-faq', |
| 1200 | 883 | 'betterdocs-glossaries' => 'betterdocs-glossaries', |
| 1201 | 884 | 'betterdocs-ai-chatbot' => 'betterdocs-ai-chatbot', |
| 1202 | - 'betterdocs-api-docs' => 'betterdocs-api-docs', | |
| 1203 | - 'edit-tags.php?taxonomy=knowledge_base&post_type=docs' => 'betterdocs-multiplekb', | |
| 1204 | - ); | |
| 885 | + 'edit-tags.php?taxonomy=knowledge_base&post_type=docs' => 'betterdocs-multiplekb' | |
| 886 | + ]; | |
| 1205 | 887 | |
| 1206 | 888 | foreach ( $menu as &$item ) { |
| 1207 | 889 | if ( isset( $menu_items[ $item[2] ] ) ) { |
| 1208 | 890 | if ( ! isset( $item[4] ) ) { |
| @@ -1232,12 +914,12 @@ | ||
| 1232 | 914 | $menus['quick_setup'] = $this->normalize_menu( |
| 1233 | 915 | __( 'Quick Setup', 'betterdocs' ), |
| 1234 | 916 | 'betterdocs-setup', |
| 1235 | 917 | 'delete_users', |
| 1236 | - array( | |
| 918 | + [ | |
| 1237 | 919 | $this->container->get( SetupWizard::class ), |
| 1238 | - 'views', | |
| 1239 | - ) | |
| 920 | + 'views' | |
| 921 | + ] | |
| 1240 | 922 | ); |
| 1241 | 923 | } |
| 1242 | 924 | |
| 1243 | 925 | return $menus; |
| @@ -1245,12 +927,8 @@ | ||
| 1245 | 927 | |
| 1246 | 928 | public function insert_plugin_links( $links ) { |
| 1247 | 929 | $links[] = '<a href="admin.php?page=betterdocs-settings">' . __( 'Settings', 'betterdocs' ) . '</a>'; |
| 1248 | 930 | |
| 1249 | - if ( ! is_plugin_active( 'betterdocs-pro/betterdocs-pro.php' ) ) { | |
| 1250 | - $links[] = '<a href="https://betterdocs.co/upgrade-to-pro-plugins-wp" target="_blank" style="color: #000; font-weight: bold;">' . __( 'Upgrade to Pro', 'betterdocs' ) . '</a>'; | |
| 1251 | - } | |
| 1252 | - | |
| 1253 | 931 | return $links; |
| 1254 | 932 | } |
| 1255 | 933 | |
| 1256 | 934 | public function toolbar_menu( $admin_bar ) { |
| @@ -1277,22 +955,17 @@ | ||
| 1277 | 955 | } |
| 1278 | 956 | |
| 1279 | 957 | $slug = $this->settings->get( 'encyclopedia_root_slug' ); |
| 1280 | 958 | |
| 1281 | - global $wp_rewrite; | |
| 1282 | - if ( $wp_rewrite->using_index_permalinks() ) { | |
| 1283 | - $slug = $wp_rewrite->index . '/' . $slug; | |
| 1284 | - } | |
| 1285 | - | |
| 1286 | 959 | $encyclopedia_url = home_url( $slug ); |
| 1287 | 960 | |
| 1288 | 961 | $admin_bar->add_node( |
| 1289 | - array( | |
| 962 | + [ | |
| 1290 | 963 | 'parent' => 'site-name', |
| 1291 | 964 | 'id' => 'view-docs', |
| 1292 | 965 | 'title' => __( 'Visit Documentation', 'betterdocs' ), |
| 1293 | - 'href' => $docs_url, | |
| 1294 | - ) | |
| 966 | + 'href' => $docs_url | |
| 967 | + ] | |
| 1295 | 968 | ); |
| 1296 | 969 | |
| 1297 | 970 | $is_enable_encyclopedia = betterdocs()->settings->get( 'enable_encyclopedia' ); |
| 1298 | 971 | |
| @@ -1297,14 +970,14 @@ | ||
| 1297 | 970 | $is_enable_encyclopedia = betterdocs()->settings->get( 'enable_encyclopedia' ); |
| 1298 | 971 | |
| 1299 | 972 | if ( $is_enable_encyclopedia && betterdocs()->is_pro_active() ) { |
| 1300 | 973 | $admin_bar->add_node( |
| 1301 | - array( | |
| 974 | + [ | |
| 1302 | 975 | 'parent' => 'site-name', |
| 1303 | 976 | 'id' => 'view-encyclopedia', |
| 1304 | 977 | 'title' => __( 'Visit Encyclopedia', 'betterdocs' ), |
| 1305 | - 'href' => $encyclopedia_url, | |
| 1306 | - ) | |
| 978 | + 'href' => $encyclopedia_url | |
| 979 | + ] | |
| 1307 | 980 | ); |
| 1308 | 981 | } |
| 1309 | 982 | } |
| 1310 | 983 | |
| @@ -1311,20 +984,14 @@ | ||
| 1311 | 984 | /** |
| 1312 | 985 | * Save last visited admin ui |
| 1313 | 986 | * |
| 1314 | 987 | * @since 3.0.1 |
| 988 | + * | |
| 1315 | 989 | */ |
| 1316 | 990 | public function save_admin_page() { |
| 1317 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only screen detection. | |
| 1318 | - $post_type = isset( $_GET['post_type'] ) ? sanitize_text_field( wp_unslash( $_GET['post_type'] ) ) : ''; | |
| 1319 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only screen detection. | |
| 1320 | - $bdocs_view = isset( $_GET['bdocs_view'] ) ? sanitize_text_field( wp_unslash( $_GET['bdocs_view'] ) ) : ''; | |
| 1321 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only screen detection. | |
| 1322 | - $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : ''; | |
| 1323 | - | |
| 1324 | - if ( 'docs' === $post_type && 'classic' === $bdocs_view ) { | |
| 991 | + if ( isset( $_GET['post_type'] ) && $_GET['post_type'] === 'docs' && isset( $_GET['bdocs_view'] ) && $_GET['bdocs_view'] === 'classic' ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 1325 | 992 | update_user_meta( get_current_user_id(), 'last_visited_docs_admin_page', 'classic_ui' ); |
| 1326 | - } elseif ( 'betterdocs-admin' === $page ) { | |
| 993 | + } elseif ( isset( $_GET['page'] ) && $_GET['page'] === 'betterdocs-admin' ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 1327 | 994 | update_user_meta( get_current_user_id(), 'last_visited_docs_admin_page', 'modern_ui' ); |
| 1328 | 995 | } |
| 1329 | 996 | } |
| 1330 | 997 | |
| @@ -1335,19 +1002,23 @@ | ||
| 1335 | 1002 | * @since 3.0.1 |
| 1336 | 1003 | */ |
| 1337 | 1004 | public function ui_slug() { |
| 1338 | 1005 | $last_visited = get_user_meta( get_current_user_id(), 'last_visited_docs_admin_page', true ); |
| 1339 | - $docs_exist = get_posts( | |
| 1340 | - array( | |
| 1006 | + $docs = get_posts( | |
| 1007 | + [ | |
| 1341 | 1008 | 'post_type' => 'docs', |
| 1342 | 1009 | 'post_status' => 'any', |
| 1343 | - 'numberposts' => 1, | |
| 1344 | - ) | |
| 1010 | + 'numberposts' => 2 | |
| 1011 | + ] | |
| 1345 | 1012 | ); |
| 1346 | 1013 | |
| 1347 | - return ( 'modern_ui' === $last_visited || empty( $docs_exist ) ) | |
| 1348 | - ? 'betterdocs-admin' | |
| 1349 | - : 'edit.php?post_type=docs&bdocs_view=classic'; | |
| 1014 | + if ( $last_visited === 'modern_ui' || count( $docs ) == 0 ) { | |
| 1015 | + $slug = 'betterdocs-admin'; | |
| 1016 | + } else { | |
| 1017 | + $slug = admin_url( 'edit.php?post_type=docs&bdocs_view=classic' ); | |
| 1018 | + } | |
| 1019 | + | |
| 1020 | + return $slug; | |
| 1350 | 1021 | } |
| 1351 | 1022 | |
| 1352 | 1023 | /** |
| 1353 | 1024 | * Resets a duplicate submenu in WordPress if the parent main menu and the first submenu permalink are not the same. |
| @@ -1357,9 +1028,9 @@ | ||
| 1357 | 1028 | */ |
| 1358 | 1029 | public function reset_submenu() { |
| 1359 | 1030 | global $submenu; |
| 1360 | 1031 | |
| 1361 | - $docs = get_posts( array( 'post_type' => 'docs' ) ); | |
| 1032 | + $docs = get_posts( [ 'post_type' => 'docs' ] ); | |
| 1362 | 1033 | if ( count( $docs ) == 0 ) { |
| 1363 | 1034 | return; |
| 1364 | 1035 | } |
| 1365 | 1036 | |
| @@ -1364,89 +1035,10 @@ | ||
| 1364 | 1035 | } |
| 1365 | 1036 | |
| 1366 | 1037 | $last_visited = get_user_meta( get_current_user_id(), 'last_visited_docs_admin_page', true ); |
| 1367 | 1038 | |
| 1368 | - if ( 'classic_ui' === $last_visited && isset( $submenu['betterdocs-admin'] ) && in_array( 'betterdocs-admin', $submenu['betterdocs-admin'][0] ) ) { | |
| 1039 | + if ( $last_visited === 'classic_ui' && isset( $submenu['betterdocs-admin'] ) && in_array( 'betterdocs-admin', $submenu['betterdocs-admin'][0] ) ) { | |
| 1369 | 1040 | unset( $submenu['betterdocs-admin'][0] ); |
| 1370 | 1041 | $submenu['betterdocs-admin'] = array_values( $submenu['betterdocs-admin'] ); |
| 1371 | 1042 | } |
| 1372 | - } | |
| 1373 | - | |
| 1374 | - /** | |
| 1375 | - * Initialize Black Friday Pointer | |
| 1376 | - * | |
| 1377 | - * @return void | |
| 1378 | - * @since 3.7.0 | |
| 1379 | - */ | |
| 1380 | - private function init_black_friday_pointer() { | |
| 1381 | - // Only initialize if conditions are met | |
| 1382 | - if ( NoticePointers::should_display_notice() ) { | |
| 1383 | - new NoticePointers(); | |
| 1384 | - } | |
| 1385 | - } | |
| 1386 | - | |
| 1387 | - /** | |
| 1388 | - * AJAX handler for dismissing Black Friday pointer | |
| 1389 | - * | |
| 1390 | - * @return void | |
| 1391 | - * @since 3.7.0 | |
| 1392 | - */ | |
| 1393 | - public function ajax_dismiss_black_friday_pointer() { | |
| 1394 | - // Verify nonce | |
| 1395 | - $nonce = isset( $_POST['nonce'] ) ? sanitize_text_field( wp_unslash( $_POST['nonce'] ) ) : ''; | |
| 1396 | - if ( ! wp_verify_nonce( $nonce, 'betterdocs_dismiss_pointer' ) ) { | |
| 1397 | - wp_send_json_error( array( 'message' => __( 'Invalid nonce', 'betterdocs' ) ) ); | |
| 1398 | - } | |
| 1399 | - | |
| 1400 | - // Check if user has permission | |
| 1401 | - if ( ! current_user_can( 'manage_options' ) && ! current_user_can( 'edit_docs' ) ) { | |
| 1402 | - wp_send_json_error( array( 'message' => __( 'Permission denied', 'betterdocs' ) ) ); | |
| 1403 | - } | |
| 1404 | - | |
| 1405 | - // Get the introduction key | |
| 1406 | - $introduction_key = isset( $_POST['introduction_key'] ) ? sanitize_text_field( wp_unslash( $_POST['introduction_key'] ) ) : ''; | |
| 1407 | - | |
| 1408 | - if ( empty( $introduction_key ) ) { | |
| 1409 | - wp_send_json_error( array( 'message' => __( 'Invalid introduction key', 'betterdocs' ) ) ); | |
| 1410 | - } | |
| 1411 | - | |
| 1412 | - // Set the introduction as viewed | |
| 1413 | - NoticePointers::set_introduction_viewed( $introduction_key ); | |
| 1414 | - | |
| 1415 | - // Clear the priority option so other plugins can set their priority | |
| 1416 | - delete_option( '_wpdeveloper_plugin_pointer_priority' ); | |
| 1417 | - | |
| 1418 | - wp_send_json_success( array( 'message' => __( 'Pointer dismissed successfully', 'betterdocs' ) ) ); | |
| 1419 | - } | |
| 1420 | - | |
| 1421 | - /** | |
| 1422 | - * Get count of docs that are not yet synced | |
| 1423 | - * Similar to Helper::get_not_synced_post_ids() in betterdocs-ai-chatbot plugin | |
| 1424 | - * | |
| 1425 | - * @return int | |
| 1426 | - * @since 3.7.0 | |
| 1427 | - */ | |
| 1428 | - private function get_not_synced_docs_count() { | |
| 1429 | - $new_post_ids = get_option( 'saved_docs_post_ids', array() ); | |
| 1430 | - $error_posts_data = get_option( 'betterdocs_ai_chatbot_error_posts', array() ); | |
| 1431 | - | |
| 1432 | - // Extract post IDs from error posts (handle both old and new formats) | |
| 1433 | - $error_post_ids = array(); | |
| 1434 | - if ( is_array( $error_posts_data ) && ! empty( $error_posts_data ) ) { | |
| 1435 | - foreach ( $error_posts_data as $key => $value ) { | |
| 1436 | - if ( is_numeric( $key ) && is_numeric( $value ) ) { | |
| 1437 | - // Old format: numeric key with post ID as value | |
| 1438 | - $error_post_ids[] = $value; | |
| 1439 | - } elseif ( is_numeric( $key ) && is_array( $value ) && isset( $value['post_id'] ) ) { | |
| 1440 | - // New format: post ID as key with structured data | |
| 1441 | - $error_post_ids[] = $key; | |
| 1442 | - } elseif ( is_numeric( $key ) ) { | |
| 1443 | - // New format: post ID as key | |
| 1444 | - $error_post_ids[] = $key; | |
| 1445 | - } | |
| 1446 | - } | |
| 1447 | - } | |
| 1448 | - | |
| 1449 | - // Merge both arrays and remove duplicates, then count | |
| 1450 | - return count( array_unique( array_merge( $new_post_ids, $error_post_ids ) ) ); | |
| 1451 | 1043 | } |
| 1452 | 1044 | } |
