Changeset 3403469

Timestamp:

11/26/2025 03:08:53 PM (3 weeks ago)

Author:

RavanH

Message:

commit 5.6

Location:

xml-sitemap-feed/trunk

Files:

• inc/admin/class-fields.php (modified) (5 diffs)
• inc/admin/class-main.php (modified) (2 diffs)
• inc/admin/class-sitemap-news.php (modified) (6 diffs)
• inc/admin/class-sitemap.php (modified) (6 diffs)
• inc/class-xmlsitemapfeed.php (modified) (2 diffs)
• readme.txt (modified) (45 diffs)
• uninstall.php (modified) (2 diffs)
• views/admin/field-meta-box-news.php (modified) (1 diff)
• views/admin/field-meta-box.php (modified) (1 diff)
• views/admin/field-news-categories.php (modified) (1 diff)
• views/admin/field-news-labels.php (deleted)
• views/admin/field-news-notifier.php (modified) (1 diff)
• views/admin/field-sitemap-authors.php (modified) (1 diff)
• views/admin/field-sitemap-post-types.php (modified) (1 diff)
• views/admin/field-sitemap-taxonomies.php (modified) (1 diff)
• views/admin/help-tab-support.php (modified) (1 diff)
• views/admin/page-sitemap-news.php (modified) (6 diffs)
• views/admin/page-sitemap.php (modified) (7 diffs)
• views/admin/sidebar-help.php (modified) (1 diff)
• xml-sitemap.php (modified) (2 diffs)

xml-sitemap-feed/trunk/inc/admin/class-fields.php

@@ -48 +48 @@
 
         $disabled   = (array) \get_option( 'xmlsf_disabled_providers', \XMLSF\get_default_settings( 'disabled_providers' ) );
-        $public_tax = \get_taxonomies( array( 'public' => true ) );
+        $public_tax = \get_taxonomies( array( 'publicly_queryable' => true ) );
         $users_args = array(
             'fields'              => 'ID',
@@ -102 +102 @@
     public static function taxonomies_field() {
         $taxonomies = (array) \get_option( 'xmlsf_taxonomies', array() );
-        $public_tax = (array) \get_taxonomies( array( 'public' => true ) );
+        $public_tax = (array) \get_taxonomies( array( 'publicly_queryable' => true ), 'objects' );
 
         // The actual fields for data entry.
@@ -205 +205 @@
      * Quick edit fields allows to add HTML in Quick Edit.
      *
-     * @since 5.7
+     * @since 5.5
      *
      * @param string $column_name Column name.
@@ -219 +219 @@
      * Bulk edit fields allows to add HTML in Quick Edit.
      *
-     * @since 5.7
+     * @since 5.5
      *
      * @param string $column_name Column name.
@@ -230 +230 @@
         }
     }
+
+    /**
+     * Sitemap notifier field.
+     *
+     * @since 5.6
+     */
+    public static function sitemap_notifier_field() {
+        // The actual fields for data entry.
+        include XMLSF_DIR . '/views/admin/field-sitemap-notifier.php';
+    }
 }

xml-sitemap-feed/trunk/inc/admin/class-main.php

@@ -25 +25 @@
 
         // Shared Admin pages sidebar actions.
-        \add_action( 'xmlsf_admin_sidebar', array( __CLASS__, 'admin_sidebar_help' ) );
-        \add_action( 'xmlsf_admin_sidebar', array( __CLASS__, 'admin_sidebar_contribute' ), 20 );
+        \add_action(
+            'xmlsf_admin_sidebar',
+            function () {
+                include XMLSF_DIR . '/views/admin/sidebar-help.php';
+            }
+        );
+        \add_action(
+            'xmlsf_admin_sidebar',
+            function () {
+                include XMLSF_DIR . '/views/admin/sidebar-contribute.php';
+            },
+            20
+        );
 
         if ( \XMLSF\sitemaps_enabled( 'sitemap' ) ) {
@@ -237 +248 @@
 
     /**
-     * Clear settings
-     */
-    public static function clear_settings() {
-        // TODO reset Settings > Reading options here...
-
-        \add_settings_error(
-            'notice_clear_settings',
-            'notice_clear_settings',
-            __( 'Settings reset to the plugin defaults.', 'xml-sitemap-feed' ),
-            'updated'
-        );
-    }
-
-    /**
-     * Admin sidbar help section
-     */
-    public static function admin_sidebar_help() {
-        include XMLSF_DIR . '/views/admin/sidebar-help.php';
-    }
-
-    /**
-     * Admin sidbar contribute section
-     */
-    public static function admin_sidebar_contribute() {
-        include XMLSF_DIR . '/views/admin/sidebar-contribute.php';
-    }
-
-    /**
      * Admin notices actions
      */

xml-sitemap-feed/trunk/inc/admin/class-sitemap-news.php

@@ -40 +40 @@
 
     /**
-     * Clear settings
-     */
-    public static function clear_settings() {
-        // Update to defaults.
-        \update_option( 'xmlsf_news_tags', \XMLSF\get_default_settings( 'news_tags' ) );
-
-        \do_action( 'xmlsf_clear_news_settings' );
-    }
-
-    /**
-     * Tools actions
-     */
-    public static function tools_actions() {
-        // Skip if doing ajax or no valid nonce.
-        if ( \wp_doing_ajax() || ! isset( $_POST['_xmlsf_help_nonce'] ) || ! \wp_verify_nonce( sanitize_key( $_POST['_xmlsf_help_nonce'] ), XMLSF_BASENAME . '-help' ) ) {
-            return;
-        }
-
-        if ( isset( $_POST['xmlsf-flush-rewrite-rules'] ) ) {
-            // Flush rewrite rules.
-            \flush_rewrite_rules( false );
-            \add_settings_error(
-                'flush_admin_notice',
-                'flush_admin_notice',
-                __( 'WordPress rewrite rules have been flushed.', 'xml-sitemap-feed' ),
-                'success'
-            );
-        }
-
-        if ( isset( $_POST['xmlsf-check-conflicts'] ) ) {
-            // Reset ignored warnings.
-            \delete_user_meta( \get_current_user_id(), 'xmlsf_dismissed' );
-
-            // Check static file.
-            $slug = \is_object( \xmlsf()->sitemap_news ) ? \xmlsf()->sitemap_news->slug() : 'sitemap-news';
-
-            if ( \file_exists( \trailingslashit( \get_home_path() ) . $slug . '.xml' ) ) {
-                \add_settings_error(
-                    'static_files_notice',
-                    'static_file_' . $slug,
-                    \sprintf( /* translators: %1$s file name, %2$s is XML Sitemap (linked to options-reading.php) */
-                        \esc_html__( 'A conflicting static file has been found: %1$s. Either delete it or disable the corresponding %2$s.', 'xml-sitemap-feed' ),
-                        \esc_html( $slug . '.xml' ),
-                        '<a href="' . \esc_url( \admin_url( 'options-reading.php' ) ) . '#xmlsf_sitemaps">' . \esc_html__( 'XML Sitemap', 'xml-sitemap-feed' ) . '</a>'
-                    ),
-                    'warning'
-                );
-            } else {
-                \add_settings_error(
-                    'static_files_notice',
-                    'static_files',
-                    \esc_html__( 'No conflicting static files found.', 'xml-sitemap-feed' ),
-                    'success'
-                );
-            }
-        }
-
-        if ( isset( $_POST['xmlsf-clear-settings'] ) ) {
-            self::clear_settings();
-            \add_settings_error(
-                'notice_clear_settings',
-                'notice_clear_settings',
-                __( 'Settings reset to the plugin defaults.', 'xml-sitemap-feed' ),
-                'updated'
-            );
-        }
-    }
-
-    /**
      * Compare versions to known compatibility.
      */
@@ -132 +63 @@
 
         // Google News Advanced incompatibility notice.
-        if ( ! self::compatible_with_advanced() && ! \in_array( 'xmlsf_advanced_news', (array) get_user_meta( get_current_user_id(), 'xmlsf_dismissed' ), true ) ) {
+        if ( ! self::compatible_with_advanced() && ! \in_array( 'xmlsf_advanced_news', (array) get_user_meta( get_current_user_id(), 'xmlsf_dismissed', false ), true ) ) {
             include XMLSF_DIR . '/views/admin/notice-xmlsf-advanced-news.php';
         }
@@ -162 +93 @@
      */
     public static function meta_box( $post ) {
-        // Use nonce for verification.
-        \wp_nonce_field( XMLSF_BASENAME, '_xmlsf_news_nonce' );
-
-        // Use get_post_meta to retrieve an existing value from the database and use the value for the form.
-        $exclude  = 'private' === $post->post_status || \get_post_meta( $post->ID, '_xmlsf_news_exclude', true );
-        $disabled = 'private' === $post->post_status;
+        $post_id     = $post->ID;
+        $post_status = $post->post_status;
 
         // The actual fields for data entry.
@@ -206 +133 @@
             'manage_options',
             'xmlsf_news',
-            array( __CLASS__, 'settings_page' )
+            array( __NAMESPACE__ . '\Sitemap_News_Settings', 'settings_page' )
         );
 
-        // Settings hooks.
-        \add_action( 'xmlsf_news_add_settings', array( __CLASS__, 'add_settings' ) );
-
-        // Tools actions.
-        \add_action( 'load-' . $screen_id, array( __CLASS__, 'tools_actions' ) );
-
-        // Help tab.
-        \add_action( 'load-' . $screen_id, array( __CLASS__, 'help_tab' ) );
-    }
-
-    /**
-     * Options page callback
-     */
-    public static function settings_page() {
-        global $wp_rewrite;
-
-        $active_tab = isset( $_GET['tab'] ) ? \sanitize_key( $_GET['tab'] ) : 'general'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-        \do_action( 'xmlsf_news_add_settings', $active_tab );
-
-        // Sidebar actions.
-        \add_action(
-            'xmlsf_admin_sidebar',
-            function () {
-                include XMLSF_DIR . '/views/admin/sidebar-news-links.php';
-            },
-            9
-        );
-
-        include XMLSF_DIR . '/views/admin/page-sitemap-news.php';
-    }
-
-    /**
-     * Add settings sections and fields.
-     *
-     * @param string $active_tab The active tab slug.
-     */
-    public static function add_settings( $active_tab = '' ) {
-        switch ( $active_tab ) {
-            case 'advanced':
-                // ADVANCED SECTION.
-                \add_settings_section(
-                    'news_sitemap_advanced_section',
-                    '',
-                    '',
-                    'xmlsf_news_advanced'
-                );
-                // Hierarchical post types.
-                \add_settings_field(
-                    'xmlsf_news_hierarchical',
-                    __( 'Hierarchical post types', 'xml-sitemap-feed' ),
-                    function () {
-                        include XMLSF_DIR . '/views/admin/field-news-hierarchical.php';
-                    },
-                    'xmlsf_news_advanced',
-                    'news_sitemap_advanced_section'
-                );
-                // Keywords.
-                \add_settings_field(
-                    'xmlsf_news_keywords',
-                    __( 'Keywords', 'xml-sitemap-feed' ),
-                    function () {
-                        include XMLSF_DIR . '/views/admin/field-news-keywords.php';
-                    },
-                    'xmlsf_news_advanced',
-                    'news_sitemap_advanced_section'
-                );
-                // Stock tickers.
-                \add_settings_field(
-                    'xmlsf_news_stock_tickers',
-                    __( 'Stock tickers', 'xml-sitemap-feed' ),
-                    function () {
-                        include XMLSF_DIR . '/views/admin/field-news-stocktickers.php';
-                    },
-                    'xmlsf_news_advanced',
-                    'news_sitemap_advanced_section'
-                );
-                // Sitemap notifier.
-                \add_settings_field(
-                    'xmlsf_news_sitemap_notifier',
-                    __( 'Sitemap notifier', 'xml-sitemap-feed' ),
-                    function () {
-                        include XMLSF_DIR . '/views/admin/field-news-notifier.php';
-                    },
-                    'xmlsf_news_advanced',
-                    'news_sitemap_advanced_section'
-                );
-                \add_action( 'xmlsf_news_settings_before', array( __CLASS__, 'section_advanced_intro' ) );
-                break;
-
-            case 'general':
-            default:
-                // GENERAL SECTION.
-                \add_settings_section(
-                    'news_sitemap_general_section',
-                    '',
-                    '',
-                    'xmlsf_news_general'
-                );
-
-                // SETTINGS.
-                \add_settings_field(
-                    'xmlsf_news_name',
-                    '<label for="xmlsf_news_name">' . \__( 'Publication name', 'xml-sitemap-feed' ) . '</label>',
-                    function () {
-                        include XMLSF_DIR . '/views/admin/field-news-name.php';
-                    },
-                    'xmlsf_news_general',
-                    'news_sitemap_general_section'
-                );
-                \add_settings_field(
-                    'xmlsf_news_post_type',
-                    __( 'Post types', 'xml-sitemap-feed' ),
-                    function () {
-                        include XMLSF_DIR . '/views/admin/field-news-post-type.php';
-                    },
-                    'xmlsf_news_general',
-                    'news_sitemap_general_section'
-                );
-
-                global $wp_taxonomies;
-
-                $options        = (array) \get_option( 'xmlsf_news_tags', array() );
-                $news_post_type = isset( $options['post_type'] ) && ! empty( $options['post_type'] ) ? (array) $options['post_type'] : array( 'post' );
-                $post_types     = ( isset( $wp_taxonomies['category'] ) ) ? $wp_taxonomies['category']->object_type : array();
-
-                foreach ( $news_post_type as $post_type ) {
-                    if ( \in_array( $post_type, $post_types, true ) ) {
-                        \add_settings_field(
-                            'xmlsf_news_categories',
-                            \translate( 'Categories' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                            function () {
-                                include XMLSF_DIR . '/views/admin/field-news-categories.php';
-                            },
-                            'xmlsf_news_general',
-                            'news_sitemap_general_section'
-                        );
-                        break;
-                    }
-                }
-
-                // Source labels - deprecated.
-                \add_settings_field(
-                    'xmlsf_news_labels',
-                    __( 'Content labels', 'xml-sitemap-feed' ),
-                    function () {
-                        include XMLSF_DIR . '/views/admin/field-news-labels.php';
-                    },
-                    'xmlsf_news_general',
-                    'news_sitemap_general_section'
-                );
-        }
+        // Load settings.
+        \add_action( 'load-' . $screen_id, array( __NAMESPACE__ . '\Sitemap_News_Settings', 'load' ) );
     }
 
@@ -370 +147 @@
             'xmlsf_news_general',
             'xmlsf_news_tags',
-            array( 'sanitize_callback' => array( __CLASS__, 'sanitize_news_tags' ) )
+            array( 'sanitize_callback' => array( __NAMESPACE__ . '\Sitemap_News_Settings', 'sanitize_news_tags' ) )
         );
 
@@ -379 +156 @@
         );
     }
-
-    /**
-     * Advanced section intro
-     *
-     * @param string $active_tab Active tab.
-     */
-    public static function section_advanced_intro( $active_tab = '' ) {
-        if ( 'advanced' === $active_tab && ! is_plugin_active( 'xml-sitemap-feed-advanced-news/xml-sitemap-advanced-news.php' ) ) {
-            include XMLSF_DIR . '/views/admin/section-advanced-intro.php';
-        }
-    }
-
-    /**
-     * Help tab
-     */
-    public static function help_tab() {
-        $screen     = \get_current_screen();
-        $active_tab = isset( $_GET['tab'] ) ? sanitize_key( $_GET['tab'] ) : 'general'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-        \ob_start();
-        include XMLSF_DIR . '/views/admin/help-tab-news.php';
-        include XMLSF_DIR . '/views/admin/help-tab-support.php';
-        $content = \ob_get_clean();
-
-        $screen->add_help_tab(
-            array(
-                'id'      => 'sitemap-news-settings',
-                'title'   => \__( 'Google News Sitemap', 'xml-sitemap-feed' ),
-                'content' => $content,
-            )
-        );
-
-        switch ( $active_tab ) {
-            case 'general':
-                // Publication name.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-news-name.php';
-                include XMLSF_DIR . '/views/admin/help-tab-support.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-news-name',
-                        'title'   => \__( 'Publication name', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                // Post types.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-news-post-types.php';
-                include XMLSF_DIR . '/views/admin/help-tab-support.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-news-post-types',
-                        'title'   => \__( 'Post types', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                // Categories.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-news-categories.php';
-                include XMLSF_DIR . '/views/admin/help-tab-support.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-news-categories',
-                        'title'   => \translate( 'Categories' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                        'content' => $content,
-                    )
-                );
-                break;
-
-            case 'advanced':
-                // Hierarchical post types.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-news-hierarchical.php';
-                include XMLSF_DIR . '/views/admin/help-tab-support.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-news-post-types',
-                        'title'   => \__( 'Hierarchical post types', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                // Keywords.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-news-keywords.php';
-                include XMLSF_DIR . '/views/admin/help-tab-support.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-news-keywords',
-                        'title'   => \__( 'Keywords', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                // Stock tickers.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-news-stocktickers.php';
-                include XMLSF_DIR . '/views/admin/help-tab-support.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-news-stocktickers',
-                        'title'   => \__( 'Stock tickers', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                // Sitemap notifier.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-news-notifier.php';
-                include XMLSF_DIR . '/views/admin/help-tab-support.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-news-notifier',
-                        'title'   => \__( 'Sitemap notifier', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-        }
-
-        // Hook for additional/advanced help tab.
-        \do_action( 'xmlsf_news_help_tabs', $screen, $active_tab );
-
-        \ob_start();
-        include XMLSF_DIR . '/views/admin/help-tab-news-sidebar.php';
-        $content = \ob_get_clean();
-
-        $screen->set_help_sidebar( $content );
-    }
-
-    /**
-     * Sanitize news tag settings
-     *
-     * @param array $save Settings array.
-     *
-     * @return array
-     */
-    public static function sanitize_news_tags( $save ) {
-        $sanitized = \is_array( $save ) ? $save : array();
-
-        // At least one, default post type.
-        if ( empty( $sanitized['post_type'] ) || ! \is_array( $sanitized['post_type'] ) ) {
-            $sanitized['post_type'] = array( 'post' );
-            // Add settings error.
-            \add_settings_error(
-                'xmlsf_news_tags',
-                'xmlsf_news_post_type_error',
-                __( 'At least one post type must be selected. Defaulting to "Posts".', 'xml-sitemap-feed' ),
-                'error'
-            );
-        }
-
-        // If there are categories selected, then test.
-        // If we have post types selected that do not use the post category taxonomy.
-        if ( ! empty( $sanitized['categories'] ) ) {
-            global $wp_taxonomies;
-            $post_types = ( isset( $wp_taxonomies['category'] ) ) ? $wp_taxonomies['category']->object_type : array();
-
-            $disabled = false;
-            foreach ( $sanitized['post_type'] as $post_type ) {
-                if ( ! \in_array( $post_type, $post_types, true ) ) {
-                    $disabled = true;
-                    break;
-                }
-            }
-            // Suppress category selection.
-            if ( $disabled ) {
-                unset( $sanitized['categories'] );
-            }
-        }
-
-        return $sanitized;
-    }
 }

xml-sitemap-feed/trunk/inc/admin/class-sitemap.php

@@ -100 +100 @@
         // Set transients for flushing.
         set_transient( 'xmlsf_server_updated', true );
-    }
-
-    /**
-     * Maybe server option was updated.
-     *
-     * Checks $_GET['settings-updated'] and transient 'xmlsf_server_updated'. Hooked into settings page load actions.
-     */
-    public static function maybe_server_updated() {
-        if ( ! empty( $_GET['settings-updated'] ) && \delete_transient( 'xmlsf_server_updated' ) ) {
-            // Flush rewrite rules.
-            \flush_rewrite_rules( false );
-
-            // Check static file.
-            $slug = \is_object( \xmlsf()->sitemap ) ? \xmlsf()->sitemap->slug() : 'sitemap';
-
-            if ( \file_exists( \trailingslashit( \get_home_path() ) . $slug . '.xml' ) ) {
-                \add_settings_error(
-                    'static_files_notice',
-                    'static_file_' . $slug,
-                    \sprintf( /* translators: %1$s file name, %2$s is XML Sitemap (linked to options-reading.php) */
-                        \esc_html__( 'A conflicting static file has been found: %1$s. Either delete it or disable the corresponding %2$s.', 'xml-sitemap-feed' ),
-                        \esc_html( $slug . '.xml' ),
-                        '<a href="' . \esc_url( \admin_url( 'options-reading.php' ) ) . '#xmlsf_sitemaps">' . \esc_html__( 'XML Sitemap', 'xml-sitemap-feed' ) . '</a>'
-                    ),
-                    'warning'
-                );
-            }
-        }
     }
 
@@ -213 +185 @@
 
     /**
-     * Tools actions
-     */
-    public static function tools_actions() {
-        if ( ! isset( $_POST['_xmlsf_help_nonce'] ) || ! \wp_verify_nonce( \sanitize_key( $_POST['_xmlsf_help_nonce'] ), XMLSF_BASENAME . '-help' ) ) {
-            return;
-        }
-
-        if ( isset( $_POST['xmlsf-flush-rewrite-rules'] ) ) {
-            // Flush rewrite rules.
-            \flush_rewrite_rules( false );
-            \add_settings_error(
-                'flush_admin_notice',
-                'flush_admin_notice',
-                __( 'WordPress rewrite rules have been flushed.', 'xml-sitemap-feed' ),
-                'success'
-            );
-        }
-
-        if ( isset( $_POST['xmlsf-check-conflicts'] ) ) {
-            // Reset ignored warnings.
-            \delete_user_meta( \get_current_user_id(), 'xmlsf_dismissed' );
-
-            // Check static file.
-            $slug = \is_object( \xmlsf()->sitemap ) ? \xmlsf()->sitemap->slug() : 'sitemap';
-
-            if ( \file_exists( \trailingslashit( \get_home_path() ) . $slug . '.xml' ) ) {
-                \add_settings_error(
-                    'static_files_notice',
-                    'static_file_' . $slug,
-                    \sprintf( /* translators: %1$s file name, %2$s is XML Sitemap (linked to options-reading.php) */
-                        \esc_html__( 'A conflicting static file has been found: %1$s. Either delete it or disable the corresponding %2$s.', 'xml-sitemap-feed' ),
-                        \esc_html( $slug . '.xml' ),
-                        '<a href="' . \esc_url( \admin_url( 'options-reading.php' ) ) . '#xmlsf_sitemaps">' . \esc_html__( 'XML Sitemap', 'xml-sitemap-feed' ) . '</a>'
-                    ),
-                    'warning'
-                );
-            } else {
-                \add_settings_error(
-                    'static_files_notice',
-                    'static_files',
-                    \esc_html__( 'No conflicting static files found.', 'xml-sitemap-feed' ),
-                    'success'
-                );
-            }
-        }
-
-        if ( isset( $_POST['xmlsf-clear-settings'] ) ) {
-            self::clear_settings();
-            \add_settings_error(
-                'notice_clear_settings',
-                'notice_clear_settings',
-                \esc_html__( 'Settings reset to the plugin defaults.', 'xml-sitemap-feed' ),
-                'updated'
-            );
-        }
-
-        if ( isset( $_POST['xmlsf-clear-term-meta'] ) ) {
-            // Remove terms metadata.
-            \delete_metadata( 'term', 0, 'term_modified', '', true );
-
-            \add_settings_error(
-                'clear_meta_notice',
-                'clear_meta_notice',
-                \esc_html__( 'Sitemap term meta cache has been cleared.', 'xml-sitemap-feed' ),
-                'success'
-            );
-        }
-
-        if ( isset( $_POST['xmlsf-clear-user-meta'] ) ) {
-            // Remove terms metadata.
-            \delete_metadata( 'user', 0, 'user_modified', '', true );
-
-            \add_settings_error(
-                'clear_meta_notice',
-                'clear_meta_notice',
-                \esc_html__( 'Sitemap author meta cache has been cleared.', 'xml-sitemap-feed' ),
-                'success'
-            );
-        }
-
-        if ( isset( $_POST['xmlsf-clear-post-meta'] ) ) {
-            // Remove metadata.
-            \delete_metadata( 'post', 0, '_xmlsf_image_attached', '', true );
-            \delete_metadata( 'post', 0, '_xmlsf_image_featured', '', true );
-            \set_transient( 'xmlsf_images_meta_primed', array() );
-
-            \delete_metadata( 'post', 0, '_xmlsf_comment_date_gmt', '', true );
-            \set_transient( 'xmlsf_comments_meta_primed', array() );
-
-            \add_settings_error(
-                'clear_meta_notice',
-                'clear_meta_notice',
-                \esc_html__( 'Sitemap post meta caches have been cleared.', 'xml-sitemap-feed' ),
-                'updated'
-            );
-        }
-    }
-
-    /**
      * Compare versions to known compatibility.
      */
@@ -335 +208 @@
 
         // XML Sitemap Advanced incompatibility notice.
-        if ( ! self::compatible_with_advanced() && ! \in_array( 'xmlsf_advanced', (array) \get_user_meta( \get_current_user_id(), 'xmlsf_dismissed' ), true ) ) {
+        if ( ! self::compatible_with_advanced() && ! \in_array( 'xmlsf_advanced', (array) \get_user_meta( \get_current_user_id(), 'xmlsf_dismissed', false ), true ) ) {
             include XMLSF_DIR . '/views/admin/notice-xmlsf-advanced.php';
         }
@@ -372 +245 @@
      */
     public static function meta_box( $post ) {
-        // Use nonce for verification.
-        \wp_nonce_field( XMLSF_BASENAME, '_xmlsf_nonce' );
-
-        // Use get_post_meta to retrieve an existing value from the database and use the value for the form.
-        $exclude  = \get_post_meta( $post->ID, '_xmlsf_exclude', true );
-        $priority = \get_post_meta( $post->ID, '_xmlsf_priority', true );
-
-        // value prechecks to prevent "invalid form control not focusable" when meta box is hidden.
-        $priority = \is_numeric( $priority ) ? \XMLSF\sanitize_number( $priority ) : '';
-
-        $description = sprintf(
-            /* translators: Settings admin menu name, XML Sitemap admin page name */
-            \esc_html__( 'Leave empty for automatic Priority as configured on %1$s > %2$s.', 'xml-sitemap-feed' ),
-            \esc_html( \translate( 'Settings' ) ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-            '<a href="' . \admin_url( 'options-general.php' ) . '?page=xmlsf">' . \esc_html__( 'XML Sitemap', 'xml-sitemap-feed' ) . '</a>'
-        );
+        $post_id = $post->ID;
 
         // The actual fields for data entry.
@@ -433 +291 @@
             'manage_options',
             'xmlsf',
-            array( __CLASS__, 'settings_page' )
-        );
-
-        // Settings hooks.
-        \add_action( 'xmlsf_add_settings', array( __CLASS__, 'add_settings' ) );
-
-        // Tools actions.
-        \add_action( 'load-' . $screen_id, array( __CLASS__, 'tools_actions' ) );
-
-        // Help tabs.
-        \add_action( 'load-' . $screen_id, array( __CLASS__, 'help_tabs' ) );
-    }
-
-    /**
-     * Options page callback
-     */
-    public static function settings_page() {
-        $active_tab = isset( $_GET['tab'] ) ? \sanitize_key( \wp_unslash( $_GET['tab'] ) ) : 'general'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-        \do_action( 'xmlsf_add_settings', $active_tab );
-
-        // prepare sitemap link url.
-        $sitemap_url = \xmlsf()->sitemap->get_sitemap_url();
-
-        // Sidebar actions.
-        \add_action(
-            'xmlsf_admin_sidebar',
-            function () {
-                include XMLSF_DIR . '/views/admin/sidebar-links.php';
-            },
-            9
-        );
-
-        $disabled = \get_option( 'xmlsf_disabled_providers', \XMLSF\get_default_settings( 'disabled_providers' ) );
-
-        // The actual settings page.
-        include XMLSF_DIR . '/views/admin/page-sitemap.php';
-    }
-
-    /**
-     * Add settings sections and fields.
-     *
-     * @param string $active_tab The active tab slug.
-     */
-    public static function add_settings( $active_tab = '' ) {
-        switch ( $active_tab ) {
-            case 'post_types':
-                /** POST TYPES */
-                \add_settings_section(
-                    'xml_sitemap_post_types_section',
-                    '',
-                    '',
-                    'xmlsf_post_types'
-                );
-
-                \add_settings_field(
-                    'xmlsf_sitemap_post_types_limit',
-                    \translate( 'General' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                    array( __NAMESPACE__ . '\Fields', 'post_types_general_fields' ),
-                    'xmlsf_post_types',
-                    'xml_sitemap_post_types_section'
-                );
-
-                $post_types = \get_post_types( array( 'public' => true ) );
-                // Make sure post types are allowed and publicly viewable.
-                $post_types = \array_diff( $post_types, \xmlsf()->disabled_post_types() );
-                $post_types = \array_filter( $post_types, 'is_post_type_viewable' );
-
-                if ( \is_array( $post_types ) && ! empty( $post_types ) ) {
-                    foreach ( $post_types as $post_type ) {
-                        $obj = \get_post_type_object( $post_type );
-                        if ( ! \is_object( $obj ) ) {
-                            continue;
-                        }
-                        \add_settings_field(
-                            'xmlsf_post_type_' . $obj->name,
-                            $obj->label,
-                            array( __NAMESPACE__ . '\Fields', 'post_type_fields' ),
-                            'xmlsf_post_types',
-                            'xml_sitemap_post_types_section',
-                            $post_type
-                        );
-                        // Note: (ab)using section name parameter to pass post type name.
-                    }
-                }
-                break;
-
-            case 'taxonomies':
-                /** TAXONOMIES */
-                \add_settings_section(
-                    'xml_sitemap_taxonomies_section',
-                    '',
-                    '',
-                    'xmlsf_taxonomies'
-                );
-                \add_settings_field(
-                    'xmlsf_taxonomy_settings',
-                    translate( 'General' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                    array( __NAMESPACE__ . '\Fields', 'taxonomy_settings_field' ),
-                    'xmlsf_taxonomies',
-                    'xml_sitemap_taxonomies_section'
-                );
-                \add_settings_field(
-                    'xmlsf_taxonomies',
-                    __( 'Taxonomies', 'xml-sitemap-feed' ),
-                    array( __NAMESPACE__ . '\Fields', 'taxonomies_field' ),
-                    'xmlsf_taxonomies',
-                    'xml_sitemap_taxonomies_section'
-                );
-                break;
-
-            case 'authors':
-                /** AUTHORS */
-                \add_settings_section(
-                    'xml_sitemap_authors_section',
-                    '',
-                    '',
-                    'xmlsf_authors'
-                );
-                \add_settings_field(
-                    'xmlsf_author_settings',
-                    translate( 'General' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                    array( __NAMESPACE__ . '\Fields', 'author_settings_field' ),
-                    'xmlsf_authors',
-                    'xml_sitemap_authors_section'
-                );
-                \add_settings_field(
-                    'xmlsf_authors',
-                    __( 'Authors', 'xml-sitemap-feed' ),
-                    array( __NAMESPACE__ . '\Fields', 'authors_field' ),
-                    'xmlsf_authors',
-                    'xml_sitemap_authors_section'
-                );
-                break;
-
-            case 'advanced':
-                /** ADVANCED */
-                \add_settings_section(
-                    'xml_sitemap_advanced_section',
-                    '',
-                    '',
-                    'xmlsf_advanced'
-                );
-                // custom name.
-                \add_settings_field(
-                    'xmlsf_sitemap_name',
-                    '<label for="xmlsf_sitemap_name">' . __( 'XML Sitemap URL', 'xml-sitemap-feed' ) . '</label>',
-                    array( __NAMESPACE__ . '\Fields', 'xmlsf_sitemap_slug_field' ),
-                    'xmlsf_advanced',
-                    'xml_sitemap_advanced_section'
-                );
-                // custom urls.
-                \add_settings_field(
-                    'xmlsf_urls',
-                    __( 'External web pages', 'xml-sitemap-feed' ),
-                    array( __NAMESPACE__ . '\Fields', 'urls_settings_field' ),
-                    'xmlsf_advanced',
-                    'xml_sitemap_advanced_section'
-                );
-                // custom sitemaps.
-                \add_settings_field(
-                    'xmlsf_custom_sitemaps',
-                    __( 'External XML Sitemaps', 'xml-sitemap-feed' ),
-                    array( __NAMESPACE__ . '\Fields', 'custom_sitemaps_settings_field' ),
-                    'xmlsf_advanced',
-                    'xml_sitemap_advanced_section'
-                );
-                break;
-
-            case 'general':
-            default:
-                /** GENERAL */
-                // Sections.
-                \add_settings_section(
-                    'general', // Section ID.
-                    '', // Title.
-                    '', // Intro callback.
-                    'xmlsf_general' // Page slug.
-                );
-                // Fields.
-                \add_settings_field(
-                    'server',
-                    \translate( 'Server' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                    array( __NAMESPACE__ . '\Fields', 'server_field' ),
-                    'xmlsf_general',
-                    'general'
-                );
-                \add_settings_field(
-                    'disabled_providers',
-                    \esc_html__( 'Disable sitemaps', 'xml-sitemap-feed' ),
-                    array( __NAMESPACE__ . '\Fields', 'disable_fields' ),
-                    'xmlsf_general',
-                    'general'
-                );
-        }
+            array( __NAMESPACE__ . '\Sitemap_Settings', 'settings_page' )
+        );
+
+        // Load settings.
+        \add_action( 'load-' . $screen_id, array( __NAMESPACE__ . '\Sitemap_Settings', 'load' ) );
     }
 
@@ -696 +364 @@
         \add_action( 'update_option_xmlsf_disabled_providers', array( __CLASS__, 'update_disabled_providers' ), 10, 2 );
         \add_action( 'update_option_xmlsf_post_types', array( __CLASS__, 'update_post_types' ), 10, 2 );
-
-        // Check server updated.
-        \add_action( 'load-settings_page_xmlsf', array( __CLASS__, 'maybe_server_updated' ) );
-    }
-
-    /**
-     * Help tabs
-     */
-    public static function help_tabs() {
-        $screen     = \get_current_screen();
-        $active_tab = isset( $_GET['tab'] ) ? \sanitize_key( $_GET['tab'] ) : 'general'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-        \ob_start();
-        include XMLSF_DIR . '/views/admin/help-tab-sitemaps.php';
-        include XMLSF_DIR . '/views/admin/help-tab-support.php';
-        $content = \ob_get_clean();
-
-        $screen->add_help_tab(
-            array(
-                'id'      => 'sitemap-settings',
-                'title'   => __( 'XML Sitemap', 'xml-sitemap-feed' ),
-                'content' => $content,
-            )
-        );
-
-        switch ( $active_tab ) {
-            case 'general':
-                // Server.
-                $content  = '<p>' . \esc_html__( 'Select your XML Sitemap generator here.', 'xml-sitemap-feed' ) . '</p>';
-                $content .= '<p><strong>' . \esc_html( \translate( 'WordPress' ) ) . '</strong></p>'; // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                $content .= '<p>' . \esc_html__( 'The default sitemap server is light-weight, effective and compatible with most installations. But it is also limited. The XML Sitemaps & Google News plugin adds some essential features and options to the default sitemap generator but if these are not enough, try the plugin sitemap server.', 'xml-sitemap-feed' ) . '</p>';
-                $content .= '<p><strong>' . \esc_html( \translate( 'Plugin' ) ) . '</strong></p>'; // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                $content .= '<p>' . \esc_html__( 'The plugin sitemap server generates the sitemap in a different way, allowing some additional features and configuration options. However, it is not guaranteed to be compatible with your specific WordPress installation.', 'xml-sitemap-feed' ) . '</p>';
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-general-server',
-                        'title'   => \translate( 'Server' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                        'content' => $content,
-                    )
-                );
-                // Disable.
-                $content  = '<p>' . \esc_html__( 'By default, all public content types, taxonomy archives and author archives are included in the XML Sitemap index. If you wish to exclude any content or archive types, you can disable them here.', 'xml-sitemap-feed' ) . '</p>';
-                $content .= '<p>' . sprintf( /* translators: %1$s Taxonomies, %2$s Taxonomies linked to the respective tab */
-                    \esc_html__( 'Select %1$s here to exclude then all taxonomy archives from the sitemap index. To exclude only a particular taxonomy, please go to the %2$s tab.', 'xml-sitemap-feed' ),
-                    '<strong>' . \esc_html__( 'Taxonomies', 'xml-sitemap-feed' ) . '</strong>',
-                    '<a href="?page=xmlsf&tab=taxonomies">' . \esc_html__( 'Taxonomies', 'xml-sitemap-feed' ) . '</a>'
-                ) . '</p>';
-                $content .= '<p>' . sprintf( /* translators: %1$s Authors, %2$s Authors linked to the respective tab  */
-                    \esc_html__( 'Select %1$s here to exclude all author archives from the sitemap index. To exclude only a particular author or user group, please go to the %2$s tab.', 'xml-sitemap-feed' ),
-                    '<strong>' . \esc_html__( 'Authors', 'xml-sitemap-feed' ) . '</strong>',
-                    '<a href="?page=xmlsf&tab=authors">' . \esc_html__( 'Authors', 'xml-sitemap-feed' ) . '</a>'
-                ) . '</p>';
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-general-disable',
-                        'title'   => \esc_html__( 'Disable sitemaps', 'xml-sitemap-feed' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                        'content' => $content,
-                    )
-                );
-                break;
-
-            case 'post_types':
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-post-types-general.php';
-                $content = \ob_get_clean();
-                // General Settings.
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-settings-post-type-general',
-                        'title'   => \translate( 'General' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                        'content' => $content,
-                    )
-                );
-
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-post-types.php';
-                $content = \ob_get_clean();
-                // Post type options.
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-settings-post-types',
-                        'title'   => __( 'Post types', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                break;
-
-            case 'taxonomies':
-                // Settings.
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-taxonomies.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-settings-taxonomies-general',
-                        'title'   => \translate( 'General' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                        'content' => $content,
-                    )
-                );
-                // Taxonomies.
-                $content  = '<p><strong>' . \esc_html__( 'Include these taxonomies', 'xml-sitemap-feed' ) . '</strong></p>';
-                $content .= '<p>' . \esc_html__( 'Select the taxonomies to include in the sitemap index. Select none to automatically include all public taxonomies.', 'xml-sitemap-feed' ) . '</p>';
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-settings-taxonomies',
-                        'title'   => __( 'Taxonomies', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                break;
-
-            case 'authors':
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-authors.php';
-                $content = \ob_get_clean();
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-settings-authors-general',
-                        'title'   => \translate( 'General' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                        'content' => $content,
-                    )
-                );
-                // Authors.
-                $content  = '<p><strong>' . \esc_html__( 'Include these authors', 'xml-sitemap-feed' ) . '</strong></p>';
-                $content .= '<p>' . \esc_html__( 'Select the authors to include in the author sitemap. Select none to automatically include all authors.', 'xml-sitemap-feed' ) . '</p>';
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-settings-authors',
-                        'title'   => __( 'Authors', 'xml-sitemap-feed' ),
-                        'content' => $content,
-                    )
-                );
-                break;
-
-            case 'advanced':
-                \ob_start();
-                include XMLSF_DIR . '/views/admin/help-tab-advanced.php';
-                $content = \ob_get_clean();
-                // Add help tab.
-                $screen->add_help_tab(
-                    array(
-                        'id'      => 'sitemap-settings-advanced',
-                        'title'   => \translate( 'Advanced' ), // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction
-                        'content' => $content,
-                    )
-                );
-                break;
-        }
-
-        // Hook for additional/advanced help tab.
-        \do_action( 'xmlsf_sitemap_help_tabs', $screen, $active_tab );
-
-        \ob_start();
-        include XMLSF_DIR . '/views/admin/help-tab-sidebar.php';
-        $content = \ob_get_clean();
-
-        $screen->set_help_sidebar( $content );
     }
 

xml-sitemap-feed/trunk/inc/class-xmlsitemapfeed.php

@@ -164 +164 @@
         }
 
+        // Prepare GSC Connector.
+        \add_action( 'init', array( $this, 'gsc_connect' ) );
+
         // Register rewrites.
         \add_action( 'init', array( $this, 'register_rewrites' ) );
@@ -169 +172 @@
         // Sitemap generator msg output.
         \add_action( 'xmlsf_generator', array( $this, 'generator' ) );
+    }
+
+    /**
+     * Prepare GSC Connector.
+     */
+    public function gsc_connect() {
+        $options = (array) get_option( 'xmlsf_gsc_connect', array() );
+
+        // Prepare onboarding if not connected.
+        if ( empty( $options['google_refresh_token'] ) ) {
+            // Prepare onboarding.
+            add_action( 'admin_menu', array( __NAMESPACE__ . '\GSC_Connect', 'add_options_page' ) );
+            add_action( 'admin_init', array( __NAMESPACE__ . '\GSC_Connect', 'register_settings' ) );
+
+            // Prepare for OAuth callback.
+            add_filter( 'query_vars', array( __NAMESPACE__ . '\GSC_Connect', 'query_vars' ) );
+            add_action( 'parse_request', array( __NAMESPACE__ . '\GSC_Connect', 'parse_request' ) );
+        }
     }
 

xml-sitemap-feed/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 5.6
 Tested up to: 6.9
-Stable tag: 5.5.9
+Stable tag: 5.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -143 +143 @@
 == Upgrade Notice ==
 
+= 5.6 =
+Google Search Console connection with sitemap reports and submission.
+
+== Changelog ==
+
+= 5.6 =
+
+Date: 202511
+* Google Search Console sitemap reports
+* Sitemap submission from admin
+* Knowledge base link in admin help sections
+
 = 5.5.9 =
-Prepare advanced sitemap notification feature.
-
-== Changelog ==
-
-= 5.5.9 =
+
 Date: 20251118
 * Prepare advanced sitemap notification feature.
 
 = 5.5.8 =
+
 Date: 20251014
 * Drop unused news tags & stylesheet columns
@@ -159 +168 @@
 
 = 5.5.7 =
+
 Date: 20250915
 * FIX: WPML Compatibility missing valid callback, thanks @linusbenknerkk
 
 = 5.5.6 =
+
 Date: 20250717
 * FIX: Possible excessively long URL on admin post search, thanks @leedxw
@@ -168 +179 @@
 
 = 5.5.5 =
+
 Date: 20250625
 * Polylang index lastmods per language in core sitemap
@@ -176 +188 @@
 
 = 5.5.4 =
+
 Date: 20250427
 * Improved WPML compatibility
@@ -183 +196 @@
 
 = 5.5.3 =
+
 Date: 20250402
 * FIX: missing exclude/priority meta box
@@ -190 +204 @@
 
 = 5.5 =
+
 Date: 20250331
-* NEW: Exclude option in Quick Editor
-* NEW: Filter xmlsf_taxonomies_query_args
-* NEW: Filter xmlsf_news_hours_old
-* NEW: custom urls sitemap for core server
-* NEW: external sitemaps for core server
+* Exclude option in Quick Editor
+* Filter xmlsf_taxonomies_query_args
+* Filter xmlsf_news_hours_old
+* custom urls sitemap for core server
+* external sitemaps for core server
 * Namespacing & autoloading
 * Admin notices for Slim SEO, Squirrly SEO, Jetpack Sitemaps & XML Sitemaps Manager
@@ -209 +224 @@
 
 = 5.4.9 =
+
 Date: 20240506
 * FIX: Unauthenticated file inclusion - CVE-2024-4441 reported by Foxyyy
 
 = 5.4.8 =
+
 Date: 20240329
-* NEW: post types max number
+* post types max number
 * FIX: blog_public can be integer when object cache is used
 * FIX: compatibility date redirect warning when using core server
@@ -221 +238 @@
 
 = 5.4.5 =
+
 Date: 20240221
 * FIX: wp-cli disable plugin incompatibility
@@ -231 +249 @@
 
 = 5.4 =
+
 Date: 20240219
-* NEW: Switch between Plugin or WP core sitemap server for sitemap generation
-* NEW: xmlsf_generator action hook
-* NEW: xmlsf_sitemap_index_pre and xmlsf_sitemap_index_post action hooks
-* NEW: xmlsf_author_has_published_posts filter
+* Switch between Plugin or WP core sitemap server for sitemap generation
+* xmlsf_generator action hook
+* xmlsf_sitemap_index_pre and xmlsf_sitemap_index_post action hooks
+* xmlsf_author_has_published_posts filter
 * Dropping all Ping Services (no longer supported)
 * Dropping allowed domains filtering
@@ -246 +265 @@
 
 = 5.3.6 =
+
 Date: 20230810
 * FIX: Work around get_users() fatal error in WP 6.3
@@ -251 +271 @@
 
 = 5.3.5 =
+
 Date: 20230629
 * FIX: Forced Status 200 response conflict with Etag/If-None-Match headers, thanks @revolutionnaire
 
 = 5.3.4 =
+
 Date: 20230530
 * FIX: File not found error on invalid sitemap requests
@@ -260 +282 @@
 
 = 5.3.3 =
+
 Date: 20230528
 * FIX: Undefined variable + Invalid argument supplied for foreach(), thanks @yankyaw09
 
 = 5.3.2 =
+
 * FIX: Bing ping 410 error response
 * FIX: Outdated help & forum links
 
 = 5.3.1 =
+
 * FIX: Restore wp-sitemap.xml rewrite rules after deactivation
 * FIX: Call to undefined function xmlsf_get_archives()
@@ -273 +298 @@
 
 = 5.3 =
-* NEW: Author sitemap
-* NEW: allow custom theme templates and stylesheets
-* NEW: request filters `xmlsf_request` and `xmlsf_news_request`
-* NEW: news template filters `xmlsf_news_publication_name` and `xmlsf_news_title`
-* NEW: sitemap template action hook `xmlsf_url`
-* NEW: sitemap template action hooks `xmlsf_news_url` and `xmlsf_news_tags_inner`
-* NEW: `xmlsf_index_url_args` filter
-* NEW: All in One SEO Pack incompatibility message and instructions
-* NEW: The SEO Framework incompatibility message and instructions
+
+* Author sitemap
+* allow custom theme templates and stylesheets
+* request filters `xmlsf_request` and `xmlsf_news_request`
+* news template filters `xmlsf_news_publication_name` and `xmlsf_news_title`
+* sitemap template action hook `xmlsf_url`
+* sitemap template action hooks `xmlsf_news_url` and `xmlsf_news_tags_inner`
+* `xmlsf_index_url_args` filter
+* All in One SEO Pack incompatibility message and instructions
+* The SEO Framework incompatibility message and instructions
 * Moved news template action hook `xmlsf_news_tags_after` to after closing </news:news> tag
 * Less DB queries, smaller memory footprint
@@ -294 +320 @@
 
 = 5.2.7 =
-20191111
-* NEW: Ad Inserter compatibility check
-* NEW: xmlsf_urlset and xmlsf_news_urlset action hooks, thanks to Stanislav Khromov (@khromov)
+
+Date: 20191111
+* Ad Inserter compatibility check
+* xmlsf_urlset and xmlsf_news_urlset action hooks, thanks to Stanislav Khromov (@khromov)
 * Exclude hierarchical post types from news sitemap
 
 = 5.2.6 =
-20191009
-* NEW: xmlsf_tags_after, xmlsf_url_after and xmlsf_news_url_after action hooks
+
+Date: 20191009
+* xmlsf_tags_after, xmlsf_url_after and xmlsf_news_url_after action hooks
 * Make stylesheet paths relative to prevent exclusion when using different language domains
 * FIX: Taxonomy selection not available to new installs
 
 = 5.2.4 =
-20190917
+
+Date: 20190917
 * NEW Rank Math incompatibility admin warnings
 * FIX undefined index
@@ -312 +341 @@
 
 = 5.2.3 =
+
 * FIX Cannot use return value in write context
 * FIX issue #30 for sql_mode=ONLY_FULL_GROUP_BY, thanks @silvios
@@ -317 +347 @@
 
 = 5.2.2 =
+
 * FIX invalid date format on some PHP versions
 * FIX Can't use function return value in write context
@@ -323 +354 @@
 
 = 5.2 =
-20190429
+
+Date: 20190429
 * Image query optimization and meta caching
 * Last comment date meta caching
@@ -340 +372 @@
 
 = 5.1.2 =
+
 * FIX: admin notice dismiss button failing
 * FIX: date archive redirect notice showing for inactive post types
@@ -345 +378 @@
 
 = 5.1.1 =
+
 * FIX options page not found
 * FIX news sitemap only ping
 
 = 5.1 =
-20190313
+
+Date: 20190313
 * SEOPress and Catch Box incompatibility admin messages
 * FIX bbPress incompatibility
@@ -364 +399 @@
 
 = 5.0.7 =
-20181025
+
+Date: 20181025
 * Allowed domains back to Settings > Reading
 * FIX static files check on activation
@@ -378 +414 @@
 
 = 5.0 =
-20180908
+
+Date: 20180908
 * Complete code restructure and cleanup: MVC and JIT inclusion
 * Fewer DB queries, much smaller memory footprint on normal queries
@@ -398 +435 @@
 
 = 4.9.4 =
+
 * FIX: missing featured images, thanks @flyerua
 * FIX: double content type response header filtering
 
 = 4.9.3 =
+
 * Reinstate filter_no_news_limits, allowing post type array
 * Improved language handling and new language filter xmlsf_post_language
@@ -407 +446 @@
 
 = 4.9.2 =
+
 * FactCheck genre causes error in Search Console
 
 = 4.9.1 =
+
 * FIX: double genre terms on upgrade from 4.4,  thanks @mouhalves
 * FIX: wp_count_posts uncached and too heavy on large sites, thanks @carlalexander
@@ -416 +457 @@
 
 = 4.9 =
-20180507
+
+Date: 20180507
 * Code cleanup
-* NEW: FactCheck genre
+* FactCheck genre
 * Changefreq tag dropped
-* NEW: translation strings for genres
+* translation strings for genres
 * FIX: zlib.output_compression compatibility, thanks @alicewondermiscreations
 * FIX: permalink issue with Woocommerce account page endpoints
@@ -426 +468 @@
 
 = 4.8.3 =
+
 * fix get_lastpostdate array/string
 * restore pre PHP 5.4 compatibility (popular request)
 
 = 4.8 =
-20180316
-* NEW: Conditional functions is_sitemap() and is_news()
+
+Date: 20180316
+* Conditional functions is_sitemap() and is_news()
 * code cleanup and annotation
 * new google ping URL
@@ -439 +483 @@
 
 = 4.7.6 =
+
 * FIX Open_BaseDir issue on IIS server
 
 = 4.7.5 =
-20161207
+
+Date: 20161207
 * FIX: On cache_flush purge also the respective time_key cache entry,
 props @e2robert https://wordpress.org/support/topic/object-cache-issue-results-in-outdated-last-modified-values-on-index-sitemap/
@@ -449 +495 @@
 
 = 4.7.4 =
+
 * Another WPML compat issue fixed, special thanks to hermes3por3
 
 = 4.7.3 =
-* NEW: xmlsf_excluded filter
+
+* xmlsf_excluded filter
 * IMPROVEMENT: Polylang and WPML compatibility issues
 * FIX: "Only variables should be passed by reference" strict warning
@@ -458 +506 @@
 
 = 4.7 =
-20160506
+
+Date: 20160506
 * WPML compatibility
 * FIX: News Sitemap chinese language tag
@@ -464 +513 @@
 
 = 4.6.3 =
-* NEW: filter xmlsf_custom_sitemaps
+
+* filter xmlsf_custom_sitemaps
 * BUGFIX: empty custom urls sitemap
 
 = 4.6.2 =
-* NEW: filter xmlsf_custom_urls
+
+* filter xmlsf_custom_urls
 * More cleanup
 * BUGFIX: broken Polylang compatibility reported by @zesseb
 
 = 4.6.1 =
-20160407
+
+Date: 20160407
 * Code cleanup
 * POT file update
@@ -479 +531 @@
 
 = 4.6 =
-* NEW: xmlsf_news_tags_after action hook
+
+* xmlsf_news_tags_after action hook
 * Attempt to remove static sitemap files left over by other sitemap plugins
 
 = 4.5.1 =
+
 * fix Persistent/Stored XSS vulnerability on admin page, thanks to Sneha Rajguru @Sneharajguru
 
 = 4.5 =
+
 * Set Google News access tag per post
 * Exclude posts from Google News sitemap
 * News Sitemap stylesheet text/links update
 * FIX: cache_delete cached key instead of cache_flush as suggested by Jeremy Clarke https://wordpress.org/support/topic/please-stop-running-wp_cache_flush-whenever-posts-are-edited
-* NEW: Nginx Helper compatibility to purge cache sitemap URLs from FastCGI Cache or Redis
+* Nginx Helper compatibility to purge cache sitemap URLs from FastCGI Cache or Redis
 
 = 4.4.1 =
+
 * BUGFIX contribution by alejandra.aranibar: multiple news post types makes get_lastdate return oldest instead of newest date
 * BUGFIX plugins_url filter not working, reported by Michael
@@ -500 +556 @@
 
 = 4.4 =
+
 * Pings max once per hour (5 minutes for news sitemap)
 * Seperate ping for Google News Sitemap
@@ -514 +571 @@
 
 = 4.3.2 =
+
 * Italian translation
 * BUGFIX: html esc / filter image title and caption tags
@@ -520 +578 @@
 
 = 4.3 =
+
 * Google News sitemap settings section
 * Google News tags: access, genres, keywords, geo_locations
@@ -536 +595 @@
 
 = 4.2.4 =
-* NEW: Image tags
+
+* Image tags
 * Rearranged settings section
 * FIX: replace permalink, title and bloginfo rss filter hooks with own
 
 = 4.2.3 =
+
 * BUGFIX: Empty ping options after disabling the main sitemap
 * BUGFIX: Empty language tag for Google News tags in posts sitemap
 * Small back end changes
-* NEW: Custom post types split by year/month
+* Custom post types split by year/month
 
 = 4.2 =
-* NEW: Image & News tags
-* NEW: Exclude pages/posts
+
+* Image & News tags
+* Exclude pages/posts
 
 = 4.1.4 =
+
 * BUGFIX: Pass by reference fatal error in PHP 5.4
 * BUGFIX: issue with Polylang language code in pretty permalinks setting
@@ -558 +621 @@
 
 = 4.1 =
-* NEW: Ping Google and Bing on new publications
-* NEW: Set priority per post
-* NEW: Priority calculation options
-* NEW: Option to split posts by year or month for faster generation of each sitemap
+
+* Ping Google and Bing on new publications
+* Set priority per post
+* Priority calculation options
+* Option to split posts by year or month for faster generation of each sitemap
 * Reduced queries to increase performance
 * Improved Lastmod and Changefreq calculations
@@ -570 +634 @@
 
 = 4.0.1 =
-* NEW: Dutch and French translations
+
+* Dutch and French translations
 * BUGFIX: Non public sites still have sitemap by default
 * BUGFIX: Invalid argument supplied for foreach() when all post types are off
@@ -576 +641 @@
 
 = 4.0.0 =
+
 * Moved to sitemap index and seperated post/page sitemaps
-* NEW: options to dswitch off sitemap and news sitemap
-* NEW: select which post types to include
-* NEW: select which taxonomies to include
-* NEW: set additional robots.txt rules
-* NEW: Translation POT catalogue
+* options to dswitch off sitemap and news sitemap
+* select which post types to include
+* select which taxonomies to include
+* set additional robots.txt rules
+* Translation POT catalogue
 * Improved Polylang support
 * Dropped xLanguage support
@@ -587 +653 @@
 
 = 3.9.2 =
+
 * Basic Google News feed stylesheet
 * improvement on XSS vulnerability fix
@@ -592 +659 @@
 
 = 3.9.1 =
+
 * SECURITY: XSS vulnerability in sitemap.xsl.php
 
 = 3.9 =
+
 * Google News Sitemap
 * Memory limit error workaround (for most sites)
 
 = 3.8.8 =
+
 * BUGFIX: PHP4 compatibility
 * BUGFIX: stylesheet URL when installed in mu-plugins
@@ -605 +675 @@
 
 = 3.8.5 =
+
 * **xLanguage support** based on code and testing by **Daniele Pelagatti**
 * new FILTER HOOK `robotstxt_sitemap_url` for any translate and url changing plugins.
@@ -610 +681 @@
 
 = 3.8.3 =
+
 * filter out external URLs inserted by plugins like Page Links To (thanks, Francois)
 * minify sitemap and stylesheet output
@@ -615 +687 @@
 
 = 3.8 =
+
 * **qTranslate support**
 * no more Sitemap reference in robots.txt on non-public blogs
 
 = 3.7.4 =
+
 * switch from `add_feed` (on init) to the `do_feed_$feed` hook
 * BUGFIX: `is_404()` condition TRUE and Response Header 404 on sites without posts
@@ -626 +700 @@
 
 = 3.7 =
+
 * massive changefreq calculation improvement
 * further priority calulation improvement taking last comment date into account
 
 = 3.6.1 =
+
 * BUGFIX: wrong date calculation on blogs less than 1 year old
 
 = 3.6 =
+
 * massive priority calculation improvement
 
 = 3.5 =
+
 * complete rewrite of plugin internals
 * speed improvements
@@ -641 +719 @@
 
 = 3.4 =
+
 * BUGFIX: use home instead of siteurl for blog url for sitemap reference in robots.txt
 * code streamline and cleanup
 
 = 3.3 =
+
 * automatic exclusion of tags blog in wpmu
 
 = 3.2 =
+
 * rewrite and add_feed calls improvements
 * BUGFIX: double entry when static page is frontpage
 
 = 3.0 =
+
 * added styling to the xml feed to make it human readable
 
 = 2.1 =
+
 * BUGFIX: lastmod timezone offset displayed wrong (extra space and missing double-colon)
 
 = 2.0 =
+
 * priority calculation based on comments and age
 * changefreq based on comments
 
 = 1.0 =
+
 * changed feed template location to avoid the need to relocate files outside the plugins folder
 * BUGFIX: `get_post_modified_time` instead of `get_post_time`
 
 = 0.1 =
+
 * rework from Patrick Chia's [Standard XML Sitemaps](http://wordpress.org/plugins/standard-xml-sitemap/)
 * increased post urls limit from 100 to 1000 (of max. 50,000 allowed by the Sitemap protocol)

xml-sitemap-feed/trunk/uninstall.php

@@ -85 +85 @@
     delete_option( 'xmlsf_authors' );
     delete_option( 'xmlsf_post_type_settings' );
+    delete_option( 'xmlsf_gsc_connect' );
 
     // Remove old transient.
@@ -90 +91 @@
     delete_transient( 'xmlsf_comments_meta_primed' );
     delete_transient( 'xmlsf_static_files' );
+    delete_transient( 'gsc_connect_origin' );
+    delete_transient( 'sitemap_notifier_access_token' );
+    delete_transient( 'sitemap_notifier_submission' );
+    delete_transient( 'sitemap_notifier_submission_news' );
 
     // Flush rules.

xml-sitemap-feed/trunk/views/admin/field-meta-box-news.php

@@ -6 +6 @@
  */
 
+// Use nonce for verification.
+\wp_nonce_field( XMLSF_BASENAME, '_xmlsf_news_nonce' );
+
+// Use get_post_meta to retrieve an existing value from the database and use the value for the form.
+$exclude  = 'private' === $post_status || \get_post_meta( $post_id, '_xmlsf_news_exclude', true );
+$disabled = 'private' === $post_status;
 ?>
 <p>

xml-sitemap-feed/trunk/views/admin/field-meta-box.php

@@ -5 +5 @@
  * @package XML Sitemap & Google News
  */
+
+// Use nonce for verification.
+\wp_nonce_field( XMLSF_BASENAME, '_xmlsf_nonce' );
+
+// Use get_post_meta to retrieve an existing value from the database and use the value for the form.
+$exclude  = \get_post_meta( $post_id, '_xmlsf_exclude', true );
+$priority = \get_post_meta( $post_id, '_xmlsf_priority', true );
+
+// value prechecks to prevent "invalid form control not focusable" when meta box is hidden.
+$priority = \is_numeric( $priority ) ? \XMLSF\sanitize_number( $priority ) : '';
 
 ?>

xml-sitemap-feed/trunk/views/admin/field-news-categories.php

@@ -44 +44 @@
     </legend>
     <p>
-        <?php esc_html_e( 'Limit to posts in these post categories:', 'xml-sitemap-feed' ); ?>
+        <?php esc_html_e( 'Include posts from these categories, or select none to automaticly include posts from all categories:', 'xml-sitemap-feed' ); ?>
     </p>
-    <style>ul.cat-checklist{height:auto;max-height:48em}ul.children{padding-left:1em}</style>
+    <style>ul.cat-checklist{height:auto;max-height:24em}ul.children{padding-left:1em}</style>
     <ul class="cat-checklist">
         <?php echo $cat_list; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>

xml-sitemap-feed/trunk/views/admin/field-news-notifier.php

@@ -17 +17 @@
 
     <p class="description">
-        <?php esc_html_e( 'Notify Google by automaticly resubmitting your news sitemap to Google Search Console upon each new publication.', 'xml-sitemap-feed' ); ?>
+        <?php printf( /* translators: %s: Google New Sitemap */ esc_html__( 'Notify Google by automaticly resubmitting your %s to Google Search Console upon each new publication.', 'xml-sitemap-feed' ), esc_html__( 'Google News Sitemap', 'xml-sitemap-feed' ) ); ?>
         <?php printf( /* Translators: %s: Google News Advanced (with link) */ esc_html__( 'Available in %s.', 'xml-sitemap-feed' ), '<a href="https://premium.status301.com/downloads/google-news-advanced/" target="_blank">' . esc_html__( 'Google News Advanced', 'xml-sitemap-feed' ) . '</a>' ); ?>
     </p>

xml-sitemap-feed/trunk/views/admin/field-sitemap-authors.php

@@ -14 +14 @@
         <?php esc_html_e( 'Include these authors, or select none to automaticly include all authors with published posts:', 'xml-sitemap-feed' ); ?>
     </p>
-    <style>ul.cat-checklist{height:auto;max-height:48em}ul.children{padding-left:1em}</style>
+    <style>ul.cat-checklist{height:auto;max-height:24em}ul.children{padding-left:1em}</style>
     <ul class="cat-checklist">
             <?php

xml-sitemap-feed/trunk/views/admin/field-sitemap-post-types.php

@@ -14 +14 @@
         <?php esc_html_e( 'Include these post types, or select none to automaticly include all public post types:', 'xml-sitemap-feed' ); ?>
     </p>
-    <!--<style>ul.cat-checklist{height:auto;max-height:48em}ul.children{padding-left:1em}</style>-->
     <ul>
         <?php

xml-sitemap-feed/trunk/views/admin/field-sitemap-taxonomies.php

@@ -16 +16 @@
     <style>ul.cat-checklist{height:auto;max-height:48em}ul.children{padding-left:1em}</style>
     <ul class="cat-checklist">
-            <?php
-            foreach ( $public_tax as $name ) {
-                $label = get_taxonomy( $name )->label;
-                ?>
+    <?php
+    foreach ( $public_tax as $obj ) {
+        $count = wp_count_terms( $obj->name );
+        // Adjust the count for Post Formats (to exclude the Standard type).
+        if ( 'post_format' === $obj->name ) {
+            --$count;
+        }
+        ?>
         <li>
             <label>
-                <input type="checkbox" name="xmlsf_taxonomies[]" id="xmlsf_taxonomies_<?php echo esc_attr( $name ); ?>" value="<?php echo esc_attr( $name ); ?>" <?php checked( in_array( $name, (array) $taxonomies, true ) ); ?>/>
-                <?php echo esc_html( $label ); ?> (<?php echo esc_html( wp_count_terms( $name ) ); ?>)
+                <input type="checkbox" name="xmlsf_taxonomies[]" id="xmlsf_taxonomies_<?php echo esc_attr( $obj->name ); ?>" value="<?php echo esc_attr( $obj->name ); ?>" <?php checked( in_array( $obj->name, (array) $taxonomies, true ) ); ?>/>
+                <?php echo esc_html( $obj->label ); ?> (<?php echo esc_html( $count ); ?>)
             </label>
         </li>
-        <?php } ?>
+        <?php
+    }
+    ?>
     </ul>
 </fieldset>

xml-sitemap-feed/trunk/views/admin/help-tab-support.php

@@ -19 +19 @@
     <?php
     printf(
+        /* translators: %s Knowledge Base (linked to https://premium.status301.com/knowledge-base/xml-sitemap-google-news/) */
+        esc_html__( 'Documentation on various related subjects can be found in our %s.', 'xml-sitemap-feed' ),
+        '<a href="https://premium.status301.com/knowledge-base/xml-sitemap-google-news/" target="_blank">' . esc_html__( 'Knowledge Base', 'xml-sitemap-feed' ) . '</a>'
+    );
+    ?>
+    <?php
+    printf(
         /* translators: Review page and Translation page on WordPress.org */
         esc_html__( 'If you would like to contribute and share with the rest of the WordPress community, please consider writing a quick %1$s or help out with %2$s!', 'xml-sitemap-feed' ),

xml-sitemap-feed/trunk/views/admin/page-sitemap-news.php

@@ -8 +8 @@
 ?>
 <style type="text/css">
-<?php include XMLSF_DIR . '/assets/admin.css'; ?>
+<?php require XMLSF_DIR . '/assets/admin.css'; ?>
 </style>
 <div class="wrap">
@@ -19 +19 @@
 
     <nav class="nav-tab-wrapper">
-        <a href="?page=xmlsf_news&tab=general" class="nav-tab <?php echo 'general' === $active_tab ? 'nav-tab-active' : ''; ?>"><?php echo esc_html( translate( 'General' ) ); ?></a>
-        <a href="?page=xmlsf_news&tab=advanced" class="nav-tab <?php echo 'advanced' === $active_tab ? 'nav-tab-active' : ''; ?>"><?php echo esc_html( translate( 'Advanced' ) ); ?></a>
+        <a href="?page=xmlsf_news&tab=general" class="nav-tab <?php echo 'general' === $active_tab ? 'nav-tab-active' : ''; ?>"><?php echo esc_html( translate( 'General' ) ); // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction ?></a>
+        <a href="?page=xmlsf_news&tab=advanced" class="nav-tab <?php echo 'advanced' === $active_tab ? 'nav-tab-active' : ''; ?>"><?php echo esc_html( translate( 'Advanced' ) ); // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction ?></a>
         <?php do_action( 'xmlsf_news_nav_tabs', $active_tab ); ?>
     </nav>
@@ -42 +42 @@
     <div class="sidebar">
         <?php
-        if ( ! self::compatible_with_advanced() ) {
+        if ( ! XMLSF\Admin\Sitemap_News::compatible_with_advanced() ) {
             echo '<div style="background:rgb(252, 229, 231); margin-left: -14px; padding: 5px 10px; border: 4px solid rgb(214, 73, 54); border-radius: 3px; margin-bottom: 20px; font-weight: bold;">';
             include XMLSF_DIR . '/views/admin/section-advanced-news-compat-message.php';
@@ -49 +49 @@
         ?>
 
-        <h3><span class="dashicons dashicons-welcome-view-site"></span> <?php echo esc_html( translate( 'View' ) ); ?></h3>
+        <h3><span class="dashicons dashicons-welcome-view-site"></span> <?php echo esc_html( translate( 'View' ) ); // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction ?></h3>
         <p>
             <?php
@@ -60 +60 @@
         </p>
 
-        <h3><span class="dashicons dashicons-admin-tools"></span> <?php echo esc_html( translate( 'Tools' ) ); ?></h3>
-        <form action="" method="post">
-            <?php wp_nonce_field( XMLSF_BASENAME . '-help', '_xmlsf_help_nonce' ); ?>
-            <p>
-                <input type="submit" name="xmlsf-flush-rewrite-rules" class="button button-small" value="<?php esc_html_e( 'Flush rewrite rules', 'xml-sitemap-feed' ); ?>" />
-            </p>
-            <p>
-                <input type="submit" name="xmlsf-check-conflicts" class="button button-small" value="<?php esc_html_e( 'Check for conflicts', 'xml-sitemap-feed' ); ?>" />
-            </p>
-            <p>
-                <input type="submit" name="xmlsf-clear-settings" class="button button-small button-link-delete" value="<?php esc_attr_e( 'Reset settings', 'xml-sitemap-feed' ); ?>" onclick="javascript:return confirm( '<?php echo esc_js( __( 'This will revert ALL your Google News sitemap settings to the plugin defaults.', 'xml-sitemap-feed' ) ); ?>\n\n<?php echo esc_js( translate( 'Are you sure you want to do this?' ) ); ?>' )" />
-            </p>
-        </form>
-
         <?php do_action( 'xmlsf_admin_sidebar', 'news' ); ?>
 
@@ -80 +66 @@
 </div>
 <script>
-document.addEventListener('DOMContentLoaded', function () {
-    var mainform, isSubmitting = false;
-    jQuery(document).ready(function () {
-        mainform = jQuery('#xmlsf-settings-form');
-        mainform.submit(function(){
-            isSubmitting = true
-        })
-        mainform.data('initial-state', mainform.serialize());
-        jQuery(window).on('beforeunload', function(event) {
-            if (!isSubmitting && mainform.length && mainform.serialize() != mainform.data('initial-state')){
-                event.preventDefault();
-                return "<?php esc_html_e( 'The changes you made will be lost if you navigate away from this page.' ); ?>";
-            }
-        });
-    });
-}, false );
+<?php require XMLSF_DIR . '/assets/admin.js'; ?>
 </script>

xml-sitemap-feed/trunk/views/admin/page-sitemap.php

@@ -8 +8 @@
 ?>
 <style type="text/css">
-<?php include XMLSF_DIR . '/assets/admin.css'; ?>
+<?php require XMLSF_DIR . '/assets/admin.css'; ?>
 </style>
 <div class="wrap">
@@ -19 +19 @@
 
     <nav class="nav-tab-wrapper">
-        <a class="nav-tab<?php echo 'general' === $active_tab ? ' nav-tab-active' : '" href="?page=xmlsf&tab=general'; ?>"><?php echo esc_html( translate( 'General' ) ); ?></a>
+        <a class="nav-tab<?php echo 'general' === $active_tab ? ' nav-tab-active' : '" href="?page=xmlsf&tab=general'; ?>"><?php echo esc_html( translate( 'General' ) ); // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction ?></a>
         <a class="nav-tab<?php echo 'post_types' === $active_tab ? ' nav-tab-active' : '" href="?page=xmlsf&tab=post_types'; ?>"><?php esc_attr_e( 'Post types', 'xml-sitemap-feed' ); ?></a>
         <?php
@@ -33 +33 @@
         }
         ?>
-        <a class="nav-tab<?php echo 'advanced' === $active_tab ? ' nav-tab-active' : '" href="?page=xmlsf&tab=advanced'; ?>"><?php echo esc_html( translate( 'Advanced' ) ); ?></a>
+        <a class="nav-tab<?php echo 'advanced' === $active_tab ? ' nav-tab-active' : '" href="?page=xmlsf&tab=advanced'; ?>"><?php echo esc_html( translate( 'Advanced' ) ); // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction ?></a>
         <?php do_action( 'xmlsf_sitemap_nav_tabs', $active_tab ); ?>
     </nav>
@@ -55 +55 @@
     <div class="sidebar">
         <?php
-        if ( ! self::compatible_with_advanced() ) {
+        if ( ! \XMLSF\Admin\Sitemap::compatible_with_advanced() ) {
             echo '<div style="background:rgb(252, 229, 231); margin-left: -14px; padding: 5px 10px; border: 4px solid rgb(214, 73, 54); border-radius: 3px; margin-bottom: 20px; font-weight: bold;">';
             include XMLSF_DIR . '/views/admin/section-advanced-compat-message.php';
@@ -62 +62 @@
         ?>
 
-        <h3><span class="dashicons dashicons-welcome-view-site"></span> <?php echo esc_html( translate( 'View' ) ); ?></h3>
+        <h3><span class="dashicons dashicons-welcome-view-site"></span> <?php echo esc_html( translate( 'View' ) ); // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction ?></h3>
         <p>
             <?php
@@ -73 +73 @@
         </p>
 
-        <h3><span class="dashicons dashicons-admin-tools"></span> <?php echo esc_html( translate( 'Tools' ) ); ?></h3>
-        <form action="" method="post">
-            <?php wp_nonce_field( XMLSF_BASENAME . '-help', '_xmlsf_help_nonce' ); ?>
-            <p>
-                <input type="submit" name="xmlsf-flush-rewrite-rules" class="button button-small" value="<?php esc_attr_e( 'Flush rewrite rules', 'xml-sitemap-feed' ); ?>" />
-                <input type="submit" name="xmlsf-check-conflicts" class="button button-small" value="<?php esc_attr_e( 'Check for conflicts', 'xml-sitemap-feed' ); ?>" />
-            </p>
-            <p>
-                <?php // TODO add button(s) to prime medadata. ?>
-                <input type="submit" name="xmlsf-clear-post-meta" class="button button-small" value="<?php esc_attr_e( 'Clear post cache', 'xml-sitemap-feed' ); ?>" />
-                <input type="submit" name="xmlsf-clear-term-meta" class="button button-small" value="<?php esc_attr_e( 'Clear term cache', 'xml-sitemap-feed' ); ?>" />
-                <input type="submit" name="xmlsf-clear-user-meta" class="button button-small" value="<?php esc_attr_e( 'Clear user cache', 'xml-sitemap-feed' ); ?>" />
-            </p>
-            <p>
-                <input type="submit" name="xmlsf-clear-settings" class="button button-small button-link-delete" value="<?php esc_attr_e( 'Reset settings', 'xml-sitemap-feed' ); ?>" onclick="javascript:return confirm('<?php echo esc_js( __( 'This will revert ALL your sitemap settings to the plugin defaults.', 'xml-sitemap-feed' ) ); ?>\n\n<?php echo esc_js( translate( 'Are you sure you want to do this?' ) ); ?>')" />
-            </p>
-        </form>
-
         <?php do_action( 'xmlsf_admin_sidebar' ); ?>
 
@@ -97 +79 @@
 </div>
 <script>
-document.addEventListener('DOMContentLoaded', function () {
-    var mainform, isSubmitting = false;
-    jQuery(document).ready(function () {
-        mainform = jQuery('#xmlsf-settings-form');
-        mainform.submit(function(){
-            isSubmitting = true
-        })
-        mainform.data('initial-state', mainform.serialize());
-        jQuery(window).on('beforeunload', function(event) {
-            if (!isSubmitting && mainform.length && mainform.serialize() != mainform.data('initial-state')){
-                event.preventDefault();
-                return "<?php esc_html_e( 'The changes you made will be lost if you navigate away from this page.' ); ?>";
-            }
-        });
-    });
-}, false );
+<?php require XMLSF_DIR . '/assets/admin.js'; ?>
 </script>

xml-sitemap-feed/trunk/views/admin/sidebar-help.php

@@ -7 +7 @@
 
 ?>
-<h3><span class="dashicons dashicons-sos"></span> <?php echo esc_html( translate( 'Help' ) ); ?></h3>
+<h3><span class="dashicons dashicons-sos"></span> <?php echo esc_html( translate( 'Help' ) ); // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction ?></h3>
 <p>
     <?php
     printf(
-        /* translators: %1$s Help tab, %2$s Support forum (linked to https://wordpress.org/support/plugin/xml-sitemap-feed) */
-        esc_html__( 'You can find instructions on the %1$s above. If you still have questions, please go to the %2$s.', 'xml-sitemap-feed' ),
-        '<strong>' . esc_html__( 'Help tab', 'xml-sitemap-feed' ) . '</strong>',
+        /* translators: %s: Help tab */
+        esc_html__( 'For help on the plugin options, open the %s above.', 'xml-sitemap-feed' ),
+        '<a href="#wpbody-content" onclick="javascript:jQuery(\'#contextual-help-link\').trigger(\'click\');">' . esc_html__( 'Help tab', 'xml-sitemap-feed' ) . '</a>'
+    );
+    ?>
+    <?php
+    printf(
+        /* translators: %s Knowledge Base (linked to https://premium.status301.com/knowledge-base/xml-sitemap-google-news/) */
+        esc_html__( 'Documentation on various related subjects can be found in our %s.', 'xml-sitemap-feed' ),
+        '<a href="https://premium.status301.com/knowledge-base/xml-sitemap-google-news/" target="_blank">' . esc_html__( 'Knowledge Base', 'xml-sitemap-feed' ) . '</a>'
+    );
+    ?>
+    <?php
+    printf(
+        /* translators: %s Support forum (linked to https://wordpress.org/support/plugin/xml-sitemap-feed) */
+        esc_html__( 'If you still have questions, please refer to the %s.', 'xml-sitemap-feed' ),
         '<a href="https://wordpress.org/support/plugin/xml-sitemap-feed" target="_blank">' . esc_html__( 'Support forum', 'xml-sitemap-feed' ) . '</a>'
     );

xml-sitemap-feed/trunk/xml-sitemap.php

@@ -4 +4 @@
  * Plugin URI: https://status301.net/wordpress-plugins/xml-sitemap-feed/
  * Description: Feed the hungry spiders in compliance with the XML Sitemap and Google News protocols.
- * Version: 5.5.9
+ * Version: 5.6-alpha20
  * Text Domain: xml-sitemap-feed
  * Requires at least: 4.4
@@ -47 +47 @@
 defined( 'WPINC' ) || die;
 
-define( 'XMLSF_VERSION', '5.5.9' );
+define( 'XMLSF_VERSION', '5.6' );
 define( 'XMLSF_ADV_MIN_VERSION', '0.1' );
 define( 'XMLSF_NEWS_ADV_MIN_VERSION', '1.4' );