Changeset 3425008

Timestamp:

12/22/2025 03:16:34 AM (3 months ago)

Author:

mtekk

Message:

Pre-7.5.1 tag commit

Location:

breadcrumb-navxt/trunk

Files:

• breadcrumb-navxt.php (modified) (17 diffs)
• class.bcn_admin.php (modified) (49 diffs)
• class.bcn_breadcrumb.php (modified) (7 diffs)
• class.bcn_breadcrumb_trail.php (modified) (14 diffs)
• class.bcn_network_admin.php (modified) (14 diffs)
• class.bcn_rest_controller.php (modified) (1 diff)
• class.bcn_widget.php (modified) (5 diffs)
• includes/adminKit/class-mtekk_adminkit.php (modified) (63 diffs)
• includes/adminKit/class-mtekk_adminkit_form.php (modified) (11 diffs)
• includes/adminKit/class-mtekk_adminkit_message.php (modified) (4 diffs)
• includes/adminKit/setting/class-mtekk_adminkit_setting_string.php (modified) (1 diff)
• includes/blocks/build/breadcrumb-trail/block.json (modified) (1 diff)
• includes/blocks/build/breadcrumb-trail/render.php (modified) (7 diffs)
• options_upgrade.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

breadcrumb-navxt/trunk/breadcrumb-navxt.php

@@ -4 +4 @@
 Plugin URI: http://mtekk.us/code/breadcrumb-navxt/
 Description: Adds a breadcrumb navigation showing the visitor&#39;s path to their current location. For details on how to use this plugin visit <a href="http://mtekk.us/code/breadcrumb-navxt/">Breadcrumb NavXT</a>. 
-Version: 7.5.0
+Version: 7.5.1
 Author: John Havlik
 Author URI: http://mtekk.us/
@@ -34 +34 @@
     function bcn_phpold()
     {
-        printf('<div class="notice notice-error"><p>' . esc_html__('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', phpversion(), '5.6.0');
+        /* translators: %1$s: User's version of PHP, %2$s: Breadcrmb NavXT minimuum PHP version */
+        printf('<div class="notice notice-error"><p>' . esc_html__('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', esc_html(phpversion()), '7.0.0');
     }
     //If we are in the admin, let's print a warning then return
@@ -64 +65 @@
 class breadcrumb_navxt
 {
-    const version = '7.5.0';
+    const version = '7.5.1';
     protected $name = 'Breadcrumb NavXT';
     protected $identifier = 'breadcrumb-navxt';
@@ -355 +356 @@
         $settings['Hpaged_template'] = new setting\setting_html(
                 'paged_template',
+                /* translators: %htitle%: The page title which may contain HTML */
                 sprintf('<span class="%%type%%">%1$s</span>', esc_attr__('Page %htitle%', 'breadcrumb-navxt')),
                 _x('Paged Template', 'Paged as in when on an archive or post that is split into multiple pages', 'breadcrumb-navxt'));
@@ -372 +374 @@
                     'post_' . $post_type->name . '_template',
                     bcn_breadcrumb::get_default_template(),
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Template', 'breadcrumb-navxt'), $post_type->labels->singular_name));
             $settings['Hpost_' . $post_type->name . '_template_no_anchor'] = new setting\setting_html(
                     'post_' . $post_type->name . '_template_no_anchor',
                     bcn_breadcrumb::default_template_no_anchor,
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Template (Unlinked)', 'breadcrumb-navxt'), $post_type->labels->singular_name));
             //Root default depends on post type
@@ -393 +397 @@
                     'post_' . $post_type->name . '_root',
                     $default_root,
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Root Page', 'breadcrumb-navxt'), $post_type->labels->singular_name));
             //Archive display default depends on post type
@@ -406 +411 @@
                     'post_' . $post_type->name . '_archive_display',
                     $default_archive_display,
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Archive Display', 'breadcrumb-navxt'), $post_type->labels->singular_name));
             $settings['bpost_' . $post_type->name . '_taxonomy_referer'] = new setting\setting_bool(
                     'post_' . $post_type->name . '_taxonomy_referer',
                     false,
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Hierarchy Referer Influence', 'breadcrumb-navxt'), $post_type->labels->singular_name));
             //Hierarchy use parent first depends on post type
@@ -427 +434 @@
                     'post_' . $post_type->name . '_hierarchy_parent_first',
                     $default_parent_first,
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Hierarchy Use Parent First', 'breadcrumb-navxt'), $post_type->labels->singular_name));
             //Hierarchy depends on post type
@@ -470 +478 @@
                     'post_' . $post_type->name . '_hierarchy_display',
                     $default_hierarchy_display,
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Hierarchy Display', 'breadcrumb-navxt'), $post_type->labels->singular_name));
             $settings['Epost_' . $post_type->name . '_hierarchy_type'] = new setting\setting_enum(
                     'post_' . $post_type->name . '_hierarchy_type',
                     $hierarchy_type_default,
+                    /* translators: %s: The singular name of the post type */
                     sprintf(__('%s Hierarchy Referer Influence', 'breadcrumb-navxt'), $post_type->labels->singular_name),
                     false,
@@ -484 +494 @@
             $settings['Htax_' . $taxonomy->name. '_template'] = new setting\setting_html(
                     'tax_' . $taxonomy->name. '_template',
-                    __(sprintf('<span property="itemListElement" typeof="ListItem"><a property="item" typeof="WebPage" title="Go to the %%title%% %s archives." href="%%link%%" class="%%type%%" bcn-aria-current><span property="name">%%htitle%%</span></a><meta property="position" content="%%position%%"></span>', $taxonomy->labels->singular_name), 'breadcrumb-navxt'),
+                    /* translators: %s: The singular name of the taxonomy */
+                    sprintf('<span property="itemListElement" typeof="ListItem"><a property="item" typeof="WebPage" title="%s" href="%%link%%" class="%%type%%" bcn-aria-current><span property="name">%%htitle%%</span></a><meta property="position" content="%%position%%"></span>', sprintf(esc_attr__('Go to the %%title%% %s archives.', 'breadcrumb-navxt'), $taxonomy->labels->singular_name)),
+                    /* translators: %s: The singular name of the taxonomy */
                     sprintf(__('%s Template', 'breadcrumb-navxt'), $taxonomy->labels->singular_name));
             $settings['Htax_' . $taxonomy->name. '_template_no_anchor'] = new setting\setting_html(
                     'tax_' . $taxonomy->name. '_template_no_anchor',
                     bcn_breadcrumb::default_template_no_anchor,
+                    /* translators: %s: The singular name of the taxonomy */
                     sprintf(__('%s Template (Unlinked)', 'breadcrumb-navxt'), $taxonomy->labels->singular_name));
         }
@@ -503 +516 @@
                 'search_template',
                 sprintf('<span property="itemListElement" typeof="ListItem"><span property="name">%1$s</span><meta property="position" content="%%position%%"></span>',
+                        /* translators: %s: The searched phrase */
                         sprintf(esc_attr__('Search results for &#39;%1$s&#39;', 'breadcrumb-navxt'),
                                 sprintf('<a property="item" typeof="WebPage" title="%1$s" href="%%link%%" class="%%type%%" bcn-aria-current>%%htitle%%</a>', esc_attr__('Go to the first page of search results for %title%.', 'breadcrumb-navxt')))),
@@ -509 +523 @@
                 'search_template_no_anchor',
                 sprintf('<span class="%%type%%">%1$s</span>',
+                        /* translators: %s: The searched phrase */
                         sprintf(esc_attr__('Search results for &#39;%1$s&#39;', 'breadcrumb-navxt'), '%htitle%')),
                 __('Search Template (Unlinked)', 'breadcrumb-navxt'));
@@ -522 +537 @@
                 'author_template',
                 sprintf('<span property="itemListElement" typeof="ListItem"><span property="name">%1$s</span><meta property="position" content="%%position%%"></span>',
+                        /* translators: %s: The post author name the current archive is for */
                         sprintf(esc_attr__('Articles by: %1$s', 'breadcrumb-navxt'),
                                 sprintf('<a title="%1$s" href="%%link%%" class="%%type%%" bcn-aria-current>%%htitle%%</a>', esc_attr__('Go to the first page of posts by %title%.', 'breadcrumb-navxt')))),
@@ -528 +544 @@
                 'author_template_no_anchor',
                 sprintf('<span class="%%type%%">%1$s</span>',
+                        /* translators: %s: The post author name the current archive is for */
                         sprintf(esc_attr__('Articles by: %1$s', 'breadcrumb-navxt'), '%htitle%')),
                 __('Author Template (Unlinked)', 'breadcrumb-navxt'));
@@ -594 +611 @@
             //Generate the breadcrumb trail
             $this->breadcrumb_trail->fill_REST($post);
-            $trail_string = $this->breadcrumb_trail->display($linked, $reverse, $template);
+            $trail_string_safe = $this->breadcrumb_trail->display($linked, $reverse, $template);
             if($return)
             {
-                return $trail_string;
+                return $trail_string_safe;
             }
             else
             {
-                //Helps track issues, please don't remove it
-                $credits = "<!-- Breadcrumb NavXT " . $this::version . " -->\n";
-                echo $credits . $trail_string;
+                echo $trail_string_safe;
             }
         }
@@ -673 +688 @@
         //Generate the breadcrumb trail
         $this->breadcrumb_trail->fill($force);
-        $trail_string = $this->breadcrumb_trail->display($linked, $reverse, $template, $outer_template);
+        $trail_string_safe = $this->breadcrumb_trail->display($linked, $reverse, $template, $outer_template);
         if($return)
         {
-            return $trail_string;
+            return $trail_string_safe;
         }
         else
         {
-            //Helps track issues, please don't remove it
-            $credits = "<!-- Breadcrumb NavXT " . $this::version . " -->\n";
-            echo $credits . $trail_string;
+            echo $trail_string_safe;
         }
     }
@@ -722 +735 @@
         //Generate the breadcrumb trail
         $this->breadcrumb_trail->fill($force);
-        $trail_string = json_encode($this->breadcrumb_trail->display_json_ld($reverse), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+        $trail_string_safe = wp_json_encode($this->breadcrumb_trail->display_json_ld($reverse), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
         if($return)
         {
-            return $trail_string;
+            return $trail_string_safe;
         }
         else
         {
-            echo $trail_string;
+            echo $trail_string_safe;
         }
     }

breadcrumb-navxt/trunk/class.bcn_admin.php

@@ -24 +24 @@
     function bcn_phpold()
     {
-        printf('<div class="notice notice-error"><p>' . __('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', phpversion(), '5.6.0');
+        /* translators: %1$s: User's version of PHP, %2$s: Breadcrmb NavXT minimuum PHP version */
+        printf('<div class="notice notice-error"><p>' . esc_html__('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', esc_html(phpversion()), '7.0.0');
     }
     //If we are in the admin, let's print a warning then return
@@ -60 +61 @@
      * @param array $settings The array of settings objects
      */
-    function __construct(array &$opts, $basename, array &$settings)
+    public function __construct(array &$opts, $basename, array &$settings)
     {
         $this->plugin_basename = $basename;
@@ -69 +70 @@
         parent::__construct();
     }
-    function is_network_admin()
+    public function is_network_admin()
     {
         return false;
@@ -78 +79 @@
      * @param array $opts The opts array
      */
-    function setting_merge($opts)
+    public function setting_merge($opts)
     {
         $unknown = array();
@@ -106 +107 @@
         {
             $this->messages[] = new message(
-                    sprintf(__('Found %u unknown legacy settings: %s','breadcrumb-navxt'), count($unknown), implode(', ', $unknown)),
+                    /* translators: %u: Number of unknown legacy settings found, %s: comma separated list of the setting names */
+                    sprintf(__('Found %1$u unknown legacy settings: %2$s','breadcrumb-navxt'), count($unknown), implode(', ', $unknown)),
                     'warning',
                     true,
@@ -120 +122 @@
      * @return void
      */
-    function init()
+    public function init()
     {
         //We're going to make sure we run the parent's version of this function as well
@@ -132 +134 @@
      * @param string $version the version of the passed in options
      */
-    function opts_upgrade($opts, $version)
+    public function opts_upgrade($opts, $version)
     {
         //If our version is not the same as in the db, time to update
@@ -148 +150 @@
      * @param WP_Screen $screen The screen to add the help tab items to
      */
-    function help_contents(\WP_Screen &$screen)
+    public function help_contents(\WP_Screen &$screen)
     {
         $general_tab = '<p>' . esc_html__('Tips for the settings are located below select options.', 'breadcrumb-navxt') .
@@ -216 +218 @@
      * enqueue's the tab style sheet on the settings page
      */
-    function admin_styles()
+    public function admin_styles()
     {
         wp_enqueue_style('mtekk_adminkit_tabs');
@@ -223 +225 @@
      * enqueue's the tab js and translation js on the settings page
      */
-    function admin_scripts()
+    public function admin_scripts()
     {
         //Enqueue ui-tabs
@@ -242 +244 @@
      * A message function that checks for the BCN_SETTINGS_* define statement
      */
-    function multisite_settings_warn()
+    public function multisite_settings_warn()
     {
         if(is_multisite())
@@ -272 +274 @@
      * A message function that checks for deprecated settings that are set and warns the user
      */
-    function deprecated_settings_warn()
+    public function deprecated_settings_warn()
     {
         //We're deprecating the limit title length setting, let the user know the new method of accomplishing this
@@ -279 +281 @@
             $this->messages[] = new message(
                     sprintf(
+                            /* translators: %1$s: HTML opening tag for link to article, %2$s: HTML closing tag for link to article */
                             esc_html__('Error: The deprecated setting "Title Length" (see Miscellaneous &gt; Deprecated) has no effect in this version Breadcrumb NavXT. Please %1$suse CSS instead%2$s.', 'breadcrumb-navxt'), 
-                            '<a title="' . __('Go to the guide on trimming breadcrumb title lengths with CSS', 'breadcrumb-navxt') . '" href="https://mtekk.us/archives/guides/trimming-breadcrumb-title-lengths-with-css/">', '</a>'),
+                            '<a title="' . esc_attr__('Go to the guide on trimming breadcrumb title lengths with CSS', 'breadcrumb-navxt') . '" href="https://mtekk.us/archives/guides/trimming-breadcrumb-title-lengths-with-css/">', '</a>'),
                     'error');
         }
@@ -306 +309 @@
                     $this->messages[] = new message(
                             sprintf(
+                                    /* translators: %1$s: Name of the deprecated template tag found, %2$s: Recommended replacement tag for the deprecated tag, %3$s: The setting name where the deprecated tag was found */
                                     esc_html__('Error: The deprecated template tag %1$s found in setting %3$s. Please use %2$s instead.', 'breadcrumb-navxt'),
                                     implode(' and ', $deprecated_tags),
@@ -318 +322 @@
      * A message function that checks for post types added after the settings defaults were established
      */
-    function unknown_custom_types_warn()
+    public function unknown_custom_types_warn()
     {
         foreach($GLOBALS['wp_post_types'] as $post_type)
@@ -326 +330 @@
                 $this->messages[] = new message(
                         sprintf(
+                            /* translators: %1$s: Export of the post_type object of the unexpected CPT */
                             esc_html__('Error: WP_Post_Types global contains non WP_Post_Type object. Debug information: %1$s', 'breadcrumb-navxt'),
                             var_export($post_type, true)),
@@ -338 +343 @@
                 $this->messages[] = new message(
                         sprintf(
+                                /* translators: %1$s: Post type singular name, %2$s: Post type name */
                                 esc_html__('Warning: The post type %1$s (%2$s) was registered after the Breadcrumb NavXT default settings. It will not show up in the settings.', 'breadcrumb-navxt'),
                                 $post_type->labels->singular_name,
@@ -353 +359 @@
                 $this->messages[] = new message(
                         sprintf(
+                                /* translators: %1$s: Export of the taxonomy object of the unexpected custom taxonomy */
                                 esc_html__('Error: WP_Taxonomies global contains non WP_Taxonomy object. Debug information: %1$s', 'breadcrumb-navxt'),
                                 var_export($taxonomy, true)),
@@ -365 +372 @@
                 $this->messages[] = new message(
                         sprintf(
+                                /* translators: %1$s: Taxonomy label, %2$s: Taxonomy name */
                                 esc_html__('Warning: The taxonomy %1$s (%2$s) was registered after the Breadcrumb NavXT default settings. It will not show up in the settings.', 'breadcrumb-navxt'),
                                 $taxonomy->label,
@@ -379 +387 @@
      * @return boool Whether or not the blog options should be disabled
      */
-    function maybe_disable_blog_options()
+    public function maybe_disable_blog_options()
     {
         return (get_option('show_on_front') !== 'page' || get_option('page_for_posts') < 1);
@@ -388 +396 @@
      * @return bool Whether or not the mainsite options should be disabled
      */
-    function maybe_disable_mainsite_options()
+    public function maybe_disable_mainsite_options()
     {
         return !is_multisite();
@@ -395 +403 @@
      * The administrative page for Breadcrumb NavXT
      */
-    function admin_page()
+    public function admin_page()
     {
         global $wp_taxonomies, $wp_post_types;
@@ -432 +440 @@
         }
         ?>
-        <div class="wrap"><h1><?php echo $this->full_name; ?></h1>
+        <div class="wrap"><h1><?php echo esc_html($this->full_name); ?></h1>
         <?php
         //We exit after the version check if there is an action the user needs to take before saving settings
@@ -440 +448 @@
         }
         ?>
-        <form action="<?php echo $this->admin_url(); ?>" method="post" id="bcn_admin-options">
+        <form action="<?php echo esc_attr($this->admin_url()); ?>" method="post" id="bcn_admin-options">
             <?php settings_fields('bcn_options');?>
             <div id="hasadmintabs">
             <fieldset id="general" class="bcn_options">
-                <legend class="screen-reader-text" data-title="<?php _e( 'A collection of settings most likely to be modified are located under this tab.', 'breadcrumb-navxt' );?>"><?php _e( 'General', 'breadcrumb-navxt' ); ?></legend>
-                <h2><?php _e('General', 'breadcrumb-navxt'); ?></h2>
+                <legend class="screen-reader-text" data-title="<?php esc_attr_e( 'A collection of settings most likely to be modified are located under this tab.', 'breadcrumb-navxt' );?>"><?php esc_html_e( 'General', 'breadcrumb-navxt' ); ?></legend>
+                <h2><?php esc_html_e('General', 'breadcrumb-navxt'); ?></h2>
                 <table class="form-table">
                     <?php
@@ -452 +460 @@
                     ?>
                 </table>
-                <h2><?php _e('Current Item', 'breadcrumb-navxt'); ?></h2>
+                <h2><?php esc_html_e('Current Item', 'breadcrumb-navxt'); ?></h2>
                 <table class="form-table adminkit-enset-top">
                     <?php
@@ -476 +484 @@
                     ?>
                 </table>
-                <h2><?php _e('Home Breadcrumb', 'breadcrumb-navxt'); ?></h2>
+                <h2><?php esc_html_e('Home Breadcrumb', 'breadcrumb-navxt'); ?></h2>
                 <table class="form-table adminkit-enset-top">
                     <?php
@@ -500 +508 @@
                     ?>
                 </table>
-                <h2><?php _e('Blog Breadcrumb', 'breadcrumb-navxt'); ?></h2>
+                <h2><?php esc_html_e('Blog Breadcrumb', 'breadcrumb-navxt'); ?></h2>
                 <table class="form-table adminkit-enset-top">
                     <?php
@@ -512 +520 @@
                     ?>
                 </table>
-                <h2><?php _e('Mainsite Breadcrumb', 'breadcrumb-navxt'); ?></h2>
+                <h2><?php esc_html_e('Mainsite Breadcrumb', 'breadcrumb-navxt'); ?></h2>
                 <table class="form-table adminkit-enset-top">
                     <?php
@@ -539 +547 @@
             </fieldset>
             <fieldset id="post" class="bcn_options">
-                <legend class="screen-reader-text" data-title="<?php _e( 'The settings for all post types (Posts, Pages, and Custom Post Types) are located under this tab.', 'breadcrumb-navxt' );?>"><?php _e( 'Post Types', 'breadcrumb-navxt' ); ?></legend>
+                <legend class="screen-reader-text" data-title="<?php esc_attr_e( 'The settings for all post types (Posts, Pages, and Custom Post Types) are located under this tab.', 'breadcrumb-navxt' );?>"><?php esc_html_e( 'Post Types', 'breadcrumb-navxt' ); ?></legend>
             <?php
             //Loop through all of the post types in the array
@@ -551 +559 @@
                 $singular_name_lc = mb_strtolower($post_type->labels->singular_name, 'UTF-8');
                 ?>
-                <h2><?php echo $post_type->labels->singular_name; ?></h2>
+                <h2><?php echo esc_html($post_type->labels->singular_name); ?></h2>
                 <table class="form-table adminkit-enset-top">
                     <?php
@@ -558 +566 @@
                                 '6',
                                 false,
+                                /* translators: %s: Singular name for the CPT */
                                 sprintf(__('The template for %s breadcrumbs.', 'breadcrumb-navxt'), $singular_name_lc) . $overridden['Hpost_' . $post_type->name . '_template'],
                                 $overridden_style['Hpost_' . $post_type->name . '_template']);
@@ -564 +573 @@
                                 '4',
                                 false,
+                                /* translators: %s: Singular name for the CPT */
                                 sprintf(__('The template for %s breadcrumbs, used only when the breadcrumb is not linked.', 'breadcrumb-navxt'), $singular_name_lc) . $overridden['Hpost_' . $post_type->name . '_template_no_anchor'],
                                 $overridden_style['Hpost_' . $post_type->name . '_template_no_anchor']);
@@ -571 +581 @@
                     ?>
                     <tr valign="top">
-                        <th scope="row">
-                            <label for="<?php echo $optid;?>"><?php printf(esc_html__('%s Root Page', 'breadcrumb-navxt'), $post_type->labels->singular_name);?></label>
+                        <th scope="row"><?php /* translators: %s: Singular name for the CPT */ ?>
+                            <label for="<?php echo esc_attr($optid);?>"><?php printf(esc_html__('%s Root Page', 'breadcrumb-navxt'), esc_html($post_type->labels->singular_name));?></label>
                         </th>
                         <td>
@@ -580 +590 @@
                                             'id' => $optid,
                                             'echo' => 1,
-                                            'show_option_none' => __( '&mdash; Select &mdash;' ),
+                                            'show_option_none' => esc_attr__('&mdash; Select &mdash;', 'breadcrumb-navxt'),
                                             'option_none_value' => '0',
                                             'selected' => $this->settings['apost_' . $post_type->name . '_root']->get_value(),
@@ -588 +598 @@
                             if(isset($overridden['apost_' . $post_type->name . '_root']) && $overridden['apost_' . $post_type->name . '_root'] !== '')
                             {
-                                printf('<p class="description">%s</p>', $overridden['apost_' . $post_type->name . '_root']);
+                                printf('<p class="description">%s</p>', esc_html($overridden['apost_' . $post_type->name . '_root']));
                             }
                             ?>
@@ -594 +604 @@
                     </tr>
                     <?php
-                            $this->form->input_check(
+                        $this->form->input_check(
                                     $this->settings['bpost_' . $post_type->name . '_archive_display'],
+                                    /* translators: %s: Post type singlar name */
                                     sprintf(__('Show the breadcrumb for the %s post type archives in the breadcrumb trail.', 'breadcrumb-navxt'), $singular_name_lc),
                                     !$post_type->has_archive,
@@ -611 +622 @@
                             $this->form->input_check(
                                     $this->settings['bpost_' . $post_type->name . '_hierarchy_display'],
+                                    /* translators: %s: Singular name for the CPT */
                                     sprintf(__('Show the hierarchy (specified below) leading to a %s in the breadcrumb trail.', 'breadcrumb-navxt'), $singular_name_lc),
                                     false,
@@ -617 +629 @@
                             $this->form->input_check(
                                     $this->settings['bpost_' . $post_type->name . '_hierarchy_parent_first'],
+                                    /* translators: %s: Singular name for the CPT */
                                     sprintf(__('Use the parent of the %s as the primary hierarchy, falling back to the hierarchy selected below when the parent hierarchy is exhausted.', 'breadcrumb-navxt'), $singular_name_lc),
                                     false,
@@ -630 +643 @@
                     <tr valign="top">
                         <th scope="row">
-                            <?php printf(__('%s Hierarchy', 'breadcrumb-navxt'), $post_type->labels->singular_name); ?>
+                            <?php /* translators: %s: Singular name for the CPT */
+                            printf(esc_html__('%s Hierarchy', 'breadcrumb-navxt'), esc_html($post_type->labels->singular_name)); ?>
                         </th>
                         <td>
@@ -662 +676 @@
                                 esc_html_e('The hierarchy which the breadcrumb trail will show. Note that the "Post Parent" option may require an additional plugin to behave as expected since this is a non-hierarchical post type.', 'breadcrumb-navxt');
                             }
-                            echo $overridden['Epost_' . $post_type->name . '_hierarchy_type'];
+                            echo esc_html($overridden['Epost_' . $post_type->name . '_hierarchy_type']);
                             ?>
                             </p>
@@ -677 +691 @@
             </fieldset>
             <fieldset id="tax" class="bcn_options alttab">
-                <legend class="screen-reader-text" data-title="<?php _e( 'The settings for all taxonomies (including Categories, Tags, and custom taxonomies) are located under this tab.', 'breadcrumb-navxt' );?>"><?php _e( 'Taxonomies', 'breadcrumb-navxt' ); ?></legend>
+                <legend class="screen-reader-text" data-title="<?php esc_attr_e( 'The settings for all taxonomies (including Categories, Tags, and custom taxonomies) are located under this tab.', 'breadcrumb-navxt' );?>"><?php esc_html_e( 'Taxonomies', 'breadcrumb-navxt' ); ?></legend>
             <?php
             //Loop through all of the taxonomies in the array
@@ -689 +703 @@
                 $label_lc = mb_strtolower($taxonomy->label, 'UTF-8');
                 ?>
-                <h2><?php echo mb_convert_case($taxonomy->label, MB_CASE_TITLE, 'UTF-8'); ?></h2>
+                <h2><?php echo esc_html(mb_convert_case($taxonomy->label, MB_CASE_TITLE, 'UTF-8')); ?></h2>
                 <table class="form-table">
                     <?php
@@ -696 +710 @@
                                 '6',
                                 false,
+                                /* translators: %s: Taxonomy name*/
                                 sprintf(__('The template for %s breadcrumbs.', 'breadcrumb-navxt') . $overridden['Htax_' . $taxonomy->name . '_template'], $label_lc),
                                 $overridden_style['Htax_' . $taxonomy->name . '_template']);
@@ -702 +717 @@
                                 '4',
                                 false,
+                                /* translators: %s: Taxonomy name */
                                 sprintf(__('The template for %s breadcrumbs, used only when the breadcrumb is not linked.', 'breadcrumb-navxt') . $overridden['Htax_' . $taxonomy->name . '_template_no_anchor'], $label_lc),
                                 $overridden_style['Htax_' . $taxonomy->name . '_template_no_anchor']);
@@ -711 +727 @@
             </fieldset>
             <fieldset id="miscellaneous" class="bcn_options">
-                <legend class="screen-reader-text" data-title="<?php _e( 'The settings for author and date archives, searches, and 404 pages are located under this tab.', 'breadcrumb-navxt' );?>"><?php _e( 'Miscellaneous', 'breadcrumb-navxt' ); ?></legend>
-                <h2><?php _e('Author Archives', 'breadcrumb-navxt'); ?></h2>
+                <legend class="screen-reader-text" data-title="<?php esc_attr_e( 'The settings for author and date archives, searches, and 404 pages are located under this tab.', 'breadcrumb-navxt' );?>"><?php esc_html_e( 'Miscellaneous', 'breadcrumb-navxt' ); ?></legend>
+                <h2><?php esc_html_e('Author Archives', 'breadcrumb-navxt'); ?></h2>
                 <table class="form-table">
                     <?php
@@ -737 +753 @@
                     <tr valign="top">
                         <th scope="row">
-                            <label for="<?php echo $optid;?>"><?php esc_html_e('Author Root Page', 'breadcrumb-navxt');?></label>
+                            <label for="<?php echo esc_attr($optid);?>"><?php esc_html_e('Author Root Page', 'breadcrumb-navxt');?></label>
                         </th>
                         <td>
                             <?php wp_dropdown_pages(array(
                                     'name' => $this->unique_prefix . '_options[aauthor_root]',
-                                    'id' => $optid,
+                                    'id' => esc_attr($optid),
                                     'echo' => 1,
-                                    'show_option_none' => __( '&mdash; Select &mdash;' ),
+                                    'show_option_none' => esc_attr__('&mdash; Select &mdash;', 'breadcrumb-navxt'),
                                     'option_none_value' => '0',
                                     'selected' => $this->settings['aauthor_root']->get_value(),
@@ -751 +767 @@
                             if(isset($overridden['aauthor_root']) && $overridden['aauthor_root'] !== '')
                             {
-                                printf('<p class="description">%s</p>', $overridden['aauthor_root']);
+                                printf('<p class="description">%s</p>', esc_html($overridden['aauthor_root']));
                             }
                             ?>
@@ -757 +773 @@
                     </tr>
                 </table>
-                <h2><?php _e('Miscellaneous', 'breadcrumb-navxt'); ?></h2>
+                <h2><?php esc_html_e('Miscellaneous', 'breadcrumb-navxt'); ?></h2>
                 <table class="form-table">
                     <?php
@@ -797 +813 @@
                     ?>
                 </table>
-                <h2><?php _e('Deprecated', 'breadcrumb-navxt'); ?></h2>
-                <table class="form-table">
-                    <tr valign="top">
-                        <th scope="row">
-                            <?php esc_html_e('Title Length', 'breadcrumb-navxt'); ?>
-                        </th>
-                        <td>
-                            <label>
-                                <input name="bcn_options[blimit_title]" type="checkbox" id="blimit_title" value="true" class="disabled" <?php checked(true, $this->settings['blimit_title']->get_value()); ?> />
-                                <?php printf(esc_html__('Limit the length of the breadcrumb title. (Deprecated, %suse CSS instead%s)', 'breadcrumb-navxt'), '<a title="' . esc_attr__('Go to the guide on trimming breadcrumb title lengths with CSS', 'breadcrumb-navxt') . '" href="https://mtekk.us/archives/guides/trimming-breadcrumb-title-lengths-with-css/">', '</a>');?>
-                            </label><br />
-                            <ul>
-                                <li>
-                                    <label for="amax_title_length">
-                                        <?php esc_html_e('Max Title Length: ','breadcrumb-navxt');?>
-                                        <input type="number" name="bcn_options[amax_title_length]" id="amax_title_length" min="1" step="1" value="<?php echo esc_html($this->settings['amax_title_length']->get_value(), ENT_COMPAT, 'UTF-8'); ?>" class="small-text disabled" />
-                                    </label>
-                                </li>
-                            </ul>
-                        </td>
-                    </tr>
-                </table>
                 <?php do_action($this->unique_prefix . '_after_settings_tab_miscellaneous', $this->settings); ?>
             </fieldset>
             <?php do_action($this->unique_prefix . '_after_settings_tabs', $this->settings); ?>
             </div>
-            <p class="submit"><input type="submit" class="button-primary" name="bcn_admin_options" value="<?php esc_attr_e('Save Changes') ?>" /></p>
+            <p class="submit"><input type="submit" class="button-primary" name="bcn_admin_options" value="<?php esc_attr_e('Save Changes', 'breadcrumb-navxt') ?>" /></p>
         </form>
         </div>

breadcrumb-navxt/trunk/class.bcn_breadcrumb.php

@@ -35 +35 @@
     //The corresponding resource ID
     protected $id = null;
-    private $_title = null;
     //The type of this breadcrumb
     protected $type;
@@ -72 +71 @@
             else
             {
-                $this->template_no_anchor =  $this->run_template_kses(apply_filters('bcn_breadcrumb_template_no_anchor', $template, $this->type, $this->id));
+                $this->template_no_anchor =  $this->kses(apply_filters('bcn_breadcrumb_template_no_anchor', $template, $this->type, $this->id));
                 $this->set_template(bcn_breadcrumb::get_default_template());
             }
@@ -97 +96 @@
         //Set the title
         $this->title = apply_filters('bcn_breadcrumb_title', $title, $this->type, $this->id);
-        $this->_title = $this->title;
     }
     /**
@@ -149 +147 @@
      * A wrapper for wp_kses which handles getting the allowed html
      * 
-     * @param string $template_str The template string to run through kses
-     * @return string The template string post cleaning
-     */
-    protected function run_template_kses($template_str)
-    {
-        return wp_kses($template_str, apply_filters('bcn_allowed_html', wp_kses_allowed_html('post')));
+     * @param string $string The string to run through kses
+     * @return string The string post cleaning
+     */
+    protected function kses($string)
+    {
+        return wp_kses($string, apply_filters('bcn_allowed_html', wp_kses_allowed_html('post')));
     }
     /**
@@ -164 +162 @@
     {
         //Assign the breadcrumb template
-        $this->template = $this->run_template_kses(apply_filters('bcn_breadcrumb_template', $template, $this->type, $this->id));
+        $this->template = $this->kses(apply_filters('bcn_breadcrumb_template', $template, $this->type, $this->id));
     }
     /**
@@ -223 +221 @@
         //Build our replacements array
         $replacements = array(
-            '%title%' => esc_attr(strip_tags($this->title)),
+            '%title%' => esc_attr(wp_strip_all_tags($this->title)),
             '%link%' => esc_url($this->url),
-            '%htitle%' => $this->title,
+            '%htitle%' => $this->kses($this->title), /*TODO: verify if we want to restrict this more*/
             '%type%' => apply_filters('bcn_breadcrumb_types', $this->type, $this->id),
-            '%ftitle%' => esc_attr(strip_tags($this->_title)),
-            '%fhtitle%' => $this->_title,
-            '%position%' => $position,
+            '%ftitle%' => esc_attr(wp_strip_all_tags($this->title)),
+            '%fhtitle%' => $this->kses($this->title), /*TODO: verify if we want to restrict this more*/
+            '%position%' => esc_attr($position),
             'bcn-aria-current' => $aria_current_str
             );
@@ -240 +238 @@
         else
         {
-            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, __('bcn_breadcrumb::type must be an array', 'breadcrumb-navxt'), '6.0.2'); 
+            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, esc_html__('bcn_breadcrumb::type must be an array', 'breadcrumb-navxt'), '6.0.2');
+            //Type wasn't an array, throw it through esc_attr
+            $replacements['%type%'] == esc_attr($replacements['%type%']);
         }
         $replacements = apply_filters('bcn_template_tags', $replacements, $this->type, $this->id);

breadcrumb-navxt/trunk/class.bcn_breadcrumb_trail.php

@@ -31 +31 @@
     public function __construct()
     {
-        //@see https://core.trac.wordpress.org/ticket/10527
-        if(!is_textdomain_loaded('breadcrumb-navxt'))
-        {
-            load_plugin_textdomain('breadcrumb-navxt', false, 'breadcrumb-navxt/languages');
-        }
         $this->trail = &$this->breadcrumbs;
         //Initialize with default option values
@@ -80 +75 @@
             //Paged options
             //The template for paged breadcrumb
+            /* translators: %htitle%: The page title which may contain HTML, in this case it should be a number as it is when on a paginated archive */
             'Hpaged_template' => sprintf('<span class="%%type%%">%1$s</span>', esc_attr__('Page %htitle%', 'breadcrumb-navxt')),
             //Should we try filling out paged information
@@ -121 +117 @@
             //The breadcrumb template for search breadcrumbs
             'Hsearch_template' => sprintf('<span property="itemListElement" typeof="ListItem"><span property="name">%1$s</span><meta property="position" content="%%position%%"></span>',
+                    /* translators: %1$s: The searched phrase */
                     sprintf(esc_attr__('Search results for &#39;%1$s&#39;', 'breadcrumb-navxt'),
+                    /* translators: %title%: The searched phrase */
                     sprintf('<a property="item" typeof="WebPage" title="%1$s" href="%%link%%" class="%%type%%" bcn-aria-current>%%htitle%%</a>', esc_attr__('Go to the first page of search results for %title%.', 'breadcrumb-navxt')))),
             //The breadcrumb template for search breadcrumbs, used when an anchor is not necessary
             'Hsearch_template_no_anchor' => sprintf('<span class="%%type%%">%1$s</span>',
+                    /* translators: %1$s: The searched phrase */
                     sprintf(esc_attr__('Search results for &#39;%1$s&#39;', 'breadcrumb-navxt'), '%htitle%')),
             //Tag related stuff
@@ -139 +138 @@
             //The anchor template for author breadcrumbs
             'Hauthor_template' => sprintf('<span property="itemListElement" typeof="ListItem"><span property="name">%1$s</span><meta property="position" content="%%position%%"></span>',
+                /* translators: %1$s: The post author name the current archive is for */
                 sprintf(esc_attr__('Articles by: %1$s', 'breadcrumb-navxt'),
                 sprintf('<a title="%1$s" href="%%link%%" class="%%type%%" bcn-aria-current>%%htitle%%</a>', esc_attr__('Go to the first page of posts by %title%.', 'breadcrumb-navxt')))),
             //The anchor template for author breadcrumbs, used when anchors are not needed
             'Hauthor_template_no_anchor' => sprintf('<span class="%%type%%">%1$s</span>',
+                /* translators: %1$s: The post author name the current archive is for */
                 sprintf(esc_attr__('Articles by: %1$s', 'breadcrumb-navxt'), '%htitle%')),
             //Which of the various WordPress display types should the author breadcrumb display
@@ -519 +520 @@
         if(!($post instanceof WP_Post))
         {
-            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, __('$post global is not of type WP_Post', 'breadcrumb-navxt'), '5.1.1');
+            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, esc_html__('$post global is not of type WP_Post', 'breadcrumb-navxt'), '5.1.1');
             return;
         }
@@ -574 +575 @@
         if(!($term instanceof WP_Term))
         {
-            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, __('$term global is not of type WP_Term', 'breadcrumb-navxt'), '7.0.3');
+            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, esc_html__('$term global is not of type WP_Term', 'breadcrumb-navxt'), '7.0.3');
             return;
         }
@@ -1228 +1229 @@
         $this->order($reverse);
         //The main compiling loop
-        $trail_str = $this->display_loop($this->breadcrumbs, $linked, $reverse, $template, $outer_template, $this->opt['hseparator']);
-        return $trail_str;
+        $trail_str_escaped = $this->display_loop($this->breadcrumbs, $linked, $reverse, $template, $outer_template, $this->opt['hseparator']);
+        return $trail_str_escaped;
     }
     /**
@@ -1254 +1255 @@
         }
         //Initialize the string which will hold the assembled trail
-        $trail_str = '';
+        $trail_str_escaped = '';
         foreach($breadcrumbs as $key => $breadcrumb)
         {
@@ -1264 +1265 @@
             if(is_array($breadcrumb))
             {
-                $trail_str .= sprintf($outer_template, 
+                $trail_str_escaped .= sprintf($outer_template, 
                         $this->display_loop($breadcrumb, $linked, $reverse, $template, $outer_template, $this->opt['hseparator_higher_dim'], $depth + 1), $separator);
             }
@@ -1280 +1281 @@
                     $attribs .= sprintf(' %1$s="%2$s"', esc_attr($attrib), esc_attr(implode(' ', $value)));
                 }
-                //Filter li_attributes adding attributes to the li element
-                //TODO: Remove the bcn_li_attributes filter
-                $attribs = apply_filters_deprecated('bcn_li_attributes', array($attribs, $breadcrumb->get_types(), $breadcrumb->get_id()), '6.0.0', 'bcn_display_attributes');
-                //TODO: Deprecate this filter in favor of just using bcn_display_attributes_array
-                $attribs = apply_filters('bcn_display_attributes', $attribs, $breadcrumb->get_types(), $breadcrumb->get_id());
+                //TODO: Remove this filter in favor of just using bcn_display_attributes_array
+                $attribs = apply_filters_deprecated('bcn_display_attributes', array($attribs, $breadcrumb->get_types(), $breadcrumb->get_id()), '7.5.1', 'bcn_display_attribute_array');
                 $separator = apply_filters('bcn_display_separator', $separator, $position, $last_position, $depth);
                 //Assemble the breadcrumb
-                $trail_str .= sprintf($template, $breadcrumb->assemble($linked, $position, ($key === 0)), $separator, $attribs);
+                $trail_str_escaped .= sprintf($template, $breadcrumb->assemble($linked, $position, ($key === 0)), wp_kses($separator, apply_filters('bcn_allowed_html', wp_kses_allowed_html('post'))), $attribs);
             }
             if($reverse)
@@ -1298 +1296 @@
             }
         }
-        return $trail_str;
+        return $trail_str_escaped;
     }
     /**
@@ -1312 +1310 @@
         //Set trail order based on reverse flag
         $this->order($reverse);
-        $trail_str = (object)array(
+        $trail_str_escaped = (object)array(
             '@context' => 'http://schema.org',
             '@type' => 'BreadcrumbList',
             'itemListElement' => $this->json_ld_loop($reverse));
-        return $trail_str;
+        return $trail_str_escaped;
     }
     /**
@@ -1331 +1329 @@
             $position = count($this->breadcrumbs);
         }
-        $breadcrumbs = array();
+        $breadcrumbs_escaped= array();
         //Loop around our breadcrumbs, call the JSON-LD assembler
         foreach($this->breadcrumbs as $breadcrumb)
         {
-            $breadcrumbs[] = $breadcrumb->assemble_json_ld($position);
+            $breadcrumbs_escaped[] = $breadcrumb->assemble_json_ld($position);
             if($reverse)
             {
@@ -1345 +1343 @@
             }
         }
-        return $breadcrumbs;
+        return $breadcrumbs_escaped;
     }
     /**

breadcrumb-navxt/trunk/class.bcn_network_admin.php

@@ -38 +38 @@
      * @param string $basename The basename of the plugin
      */
-    function __construct(array &$opts, $basename, array &$settings)
+    public function __construct(array &$opts, $basename, array &$settings)
     {
         //We're going to make sure we load the parent's constructor
@@ -49 +49 @@
         add_action('network_admin_menu', array($this, 'add_page'));
     }
-    function is_network_admin()
+    public function is_network_admin()
     {
         return true;
@@ -61 +61 @@
      * @return void
      */
-    function init()
+    public function init()
     {
         //We're going to make sure we run the parent's version of this function as well
         parent::init();
     }
-    function wp_loaded()
+    public function wp_loaded()
     {
         parent::wp_loaded();
@@ -73 +73 @@
      * Return the URL of the settings page for the plugin
      */
-    function admin_url()
+    public function admin_url()
     {
         return admin_url('network/settings.php?page=' . $this->identifier);
@@ -80 +80 @@
      * Adds the adminpage the menu and the nice little settings link
      */
-    function add_page()
+    public function add_page()
     {
         //Add the submenu page to "settings" menu
@@ -103 +103 @@
      *
      */
-    function help()
+    public function help()
     {
         $screen = get_current_screen();
@@ -123 +123 @@
      * @return mixed The value of the option
      */
-    function get_option($option)
+    public function get_option($option)
     {
         return get_site_option($option);
@@ -134 +134 @@
      * 
      */
-    function update_option($option, $newvalue, $autoload = null)
+    public function update_option($option, $newvalue, $autoload = null)
     {
         return update_site_option($option, $newvalue);
@@ -147 +147 @@
      * 
      */
-    function add_option($option, $value = '', $deprecated = '', $autoload = 'yes')
+    public function add_option($option, $value = '', $deprecated = '', $autoload = 'yes')
     {
         return add_site_option($option, $value);
@@ -156 +156 @@
      * @param string $option The name of the option to delete
      */
-    function delete_option($option)
+    public function delete_option($option)
     {
         return delete_site_option($option);
@@ -163 +163 @@
      * A message function that checks for the BCN_SETTINGS_* define statement
      */
-    function multisite_settings_warn()
+    public function multisite_settings_warn()
     {
         if(is_multisite())
@@ -194 +194 @@
      * A message function that checks for deprecated settings that are set and warns the user
      */
-    function deprecated_settings_warn()
+    public function deprecated_settings_warn()
     {
         parent::deprecated_settings_warn();
@@ -203 +203 @@
      * @return boool Whether or not the blog options should be disabled
      */
-    function maybe_disable_blog_options()
+    public function maybe_disable_blog_options()
     {
         return false;
@@ -212 +212 @@
      * @return bool Whether or not the mainsite options should be disabled
      */
-    function maybe_disable_mainsite_options()
+    public function maybe_disable_mainsite_options()
     {
         return false;

breadcrumb-navxt/trunk/class.bcn_rest_controller.php

@@ -24 +24 @@
     function bcn_phpold()
     {
-        printf('<div class="notice notice-error"><p>' . __('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', phpversion(), '5.3.0');
+        /* translators: %1$s: User's version of PHP, %2$s: Breadcrmb NavXT minimuum PHP version */
+        printf('<div class="notice notice-error"><p>' . esc_html__('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', esc_html(phpversion()), '7.0.0');
     }
     //If we are in the admin, let's print a warning then return

breadcrumb-navxt/trunk/class.bcn_widget.php

@@ -28 +28 @@
         //Filter allowed_html array to allow others to add acceptable tags
         $this->allowed_html = apply_filters('bcn_allowed_html', wp_kses_allowed_html('post'));
-        //@see https://core.trac.wordpress.org/ticket/10527
-        if(!is_textdomain_loaded('breadcrumb-navxt'))
-        {
-            load_plugin_textdomain('breadcrumb-navxt', false, 'breadcrumb-navxt/languages');
-        }
         $ops = array('classname' => 'widget_breadcrumb_navxt', 'description' => __('Adds a breadcrumb trail to your sidebar', 'breadcrumb-navxt'));
         parent::__construct('bcn_widget', 'Breadcrumb NavXT', $ops);
@@ -52 +47 @@
         }
         //Mandatory before widget junk
-        echo $args['before_widget'];
+        echo wp_kses($args['before_widget'], wp_kses_allowed_html('post'));
         if(!empty($title))
         {
-            echo $args['before_title'] . $title . $args['after_title'];
+            echo wp_kses($args['before_title'], wp_kses_allowed_html('post')) . esc_html($title) . wp_kses($args['after_title'], wp_kses_allowed_html('post'));
         }
         //We'll want to switch between the two breadcrumb output types
@@ -99 +94 @@
         }
         //Mandatory after widget junk
-        echo $args['after_widget'];
+        echo wp_kses($args['after_widget'], wp_kses_allowed_html('post'));;
     }
     function update($new_instance, $old_instance)
     {
         //Filter out anything that could be invalid
-        $old_instance['title'] = strip_tags($new_instance['title']);
+        $old_instance['title'] = wp_strip_all_tags($new_instance['title']);
         $old_instance['pretext'] = wp_kses($new_instance['pretext'], $this->allowed_html);
-        $old_instance['type'] = strip_tags($new_instance['type']);
+        $old_instance['type'] = wp_strip_all_tags($new_instance['type']);
         //Have to check more than if it is set as it appears this must effectively run twice since WordPress 5.8
         $old_instance['linked'] = isset($new_instance['linked']) && $new_instance['linked'] !== false;
@@ -119 +114 @@
         ?>
         <p>
-            <label for="<?php echo esc_attr($this->get_field_id('title')); ?>"> <?php _e('Title:', 'breadcrumb-navxt'); ?></label>
+            <label for="<?php echo esc_attr($this->get_field_id('title')); ?>"> <?php esc_html_e('Title:', 'breadcrumb-navxt'); ?></label>
             <input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>" id="<?php echo esc_attr($this->get_field_id('title')); ?>" value="<?php echo esc_attr($instance['title']);?>" />
         </p>
         <p>
-            <label for="<?php echo esc_attr($this->get_field_id('pretext')); ?>"> <?php _e('Text to show before the trail:', 'breadcrumb-navxt'); ?></label>
+            <label for="<?php echo esc_attr($this->get_field_id('pretext')); ?>"> <?php esc_html_e('Text to show before the trail:', 'breadcrumb-navxt'); ?></label>
             <input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('pretext')); ?>" id="<?php echo esc_attr($this->get_field_id('pretext')); ?>" value="<?php echo esc_attr($instance['pretext']);?>" />
         </p>
         <p>
-            <label for="<?php echo esc_attr($this->get_field_id('type')); ?>"> <?php _e('Output trail as:', 'breadcrumb-navxt'); ?></label>
+            <label for="<?php echo esc_attr($this->get_field_id('type')); ?>"> <?php esc_html_e('Output trail as:', 'breadcrumb-navxt'); ?></label>
             <select name="<?php echo esc_attr($this->get_field_name('type')); ?>" id="<?php echo esc_attr($this->get_field_id('type')); ?>">
-                <option value="list" <?php selected('list', $instance['type']);?>><?php _e('List', 'breadcrumb-navxt'); ?></option>
-                <option value="microdata" <?php selected('microdata', $instance['type']);?>><?php _e('Schema.org BreadcrumbList (RDFa)', 'breadcrumb-navxt'); ?></option>
-                <option value="microdata_wai_aria" <?php selected('microdata_wai_aria', $instance['type']);?>><?php _e('Schema.org BreadcrumbList (RDFa) with WAI-ARIA', 'breadcrumb-navxt'); ?></option>
-                <option value="breadcrumblist_microdata" <?php selected('breadcrumblist_microdata', $instance['type']);?>><?php _e('Schema.org BreadcrumbList (microdata)', 'breadcrumb-navxt'); ?></option>
-                <option value="plain" <?php selected('plain', $instance['type']);?>><?php _e('Plain', 'breadcrumb-navxt'); ?></option>
+                <option value="list" <?php selected('list', $instance['type']);?>><?php esc_html_e('List', 'breadcrumb-navxt'); ?></option>
+                <option value="microdata" <?php selected('microdata', $instance['type']);?>><?php esc_html_e('Schema.org BreadcrumbList (RDFa)', 'breadcrumb-navxt'); ?></option>
+                <option value="microdata_wai_aria" <?php selected('microdata_wai_aria', $instance['type']);?>><?php esc_html_e('Schema.org BreadcrumbList (RDFa) with WAI-ARIA', 'breadcrumb-navxt'); ?></option>
+                <option value="breadcrumblist_microdata" <?php selected('breadcrumblist_microdata', $instance['type']);?>><?php esc_html_e('Schema.org BreadcrumbList (microdata)', 'breadcrumb-navxt'); ?></option>
+                <option value="plain" <?php selected('plain', $instance['type']);?>><?php esc_html_e('Plain', 'breadcrumb-navxt'); ?></option>
                 <?php do_action('bcn_widget_display_types', $instance);?>
             </select>
@@ -139 +134 @@
         <p>
             <input class="checkbox" type="checkbox" name="<?php echo esc_attr($this->get_field_name('linked')); ?>" id="<?php echo esc_attr($this->get_field_id('linked')); ?>"<?php checked(true, $instance['linked']);?> />
-            <label for="<?php echo esc_attr($this->get_field_id('linked')); ?>"> <?php _e('Link the breadcrumbs', 'breadcrumb-navxt'); ?></label><br />
+            <label for="<?php echo esc_attr($this->get_field_id('linked')); ?>"> <?php esc_html_e('Link the breadcrumbs', 'breadcrumb-navxt'); ?></label><br />
             <input class="checkbox" type="checkbox" name="<?php echo esc_attr($this->get_field_name('reverse')); ?>" id="<?php echo esc_attr($this->get_field_id('reverse')); ?>"<?php checked(true, $instance['reverse']);?> />
-            <label for="<?php echo esc_attr($this->get_field_id('reverse')); ?>"> <?php _e('Reverse the order of the trail', 'breadcrumb-navxt'); ?></label><br />
+            <label for="<?php echo esc_attr($this->get_field_id('reverse')); ?>"> <?php esc_html_e('Reverse the order of the trail', 'breadcrumb-navxt'); ?></label><br />
             <input class="checkbox" type="checkbox" name="<?php echo esc_attr($this->get_field_name('front')); ?>" id="<?php echo esc_attr($this->get_field_id('front')); ?>"<?php checked(true, $instance['front']);?> />
-            <label for="<?php echo esc_attr($this->get_field_id('front')); ?>"> <?php _e('Hide the trail on the front page', 'breadcrumb-navxt'); ?></label><br />
+            <label for="<?php echo esc_attr($this->get_field_id('front')); ?>"> <?php esc_html_e('Hide the trail on the front page', 'breadcrumb-navxt'); ?></label><br />
             <input class="checkbox" type="checkbox" name="<?php echo esc_attr($this->get_field_name('force')); ?>" id="<?php echo esc_attr($this->get_field_id('force')); ?>"<?php checked(true, $instance['force']);?> />
-            <label for="<?php echo esc_attr($this->get_field_id('force')); ?>"> <?php _e('Ignore breadcrumb cache', 'breadcrumb-navxt'); ?></label><br />
+            <label for="<?php echo esc_attr($this->get_field_id('force')); ?>"> <?php esc_html_e('Ignore breadcrumb cache', 'breadcrumb-navxt'); ?></label><br />
         </p>
         <?php

breadcrumb-navxt/trunk/includes/adminKit/class-mtekk_adminkit.php

@@ -89 +89 @@
 abstract class adminKit
 {
-    const version = '3.1.1';
+    const version = '3.1.2';
     protected $full_name;
     protected $short_name;
@@ -103 +103 @@
     protected $settings = array();
     protected $form;
-    function __construct()
+    public function __construct()
     {
         $this->message = array();
@@ -113 +113 @@
         //Installation Script hook
         add_action('activate_' . $this->plugin_basename, array($this, 'install'));
-        //Initializes l10n domain
-        $this->local();
         add_action('wp_loaded', array($this, 'wp_loaded'));
         $this->form = new form($this->unique_prefix);
@@ -120 +118 @@
         //add_action('add_screen_help_and_options', array($this, 'help'));
     }
-    function wp_loaded()
+    public function wp_loaded()
     {
         //Filter our allowed html tags
@@ -128 +126 @@
      * Returns the internal mtekk_admin_class version
      */
-    function get_admin_class_version()
+    public function get_admin_class_version()
     {
         return adminKit::version;
@@ -135 +133 @@
      * Checks if the administrator has the access capability, and adds it if they don't
      */
-    function add_cap()
+    public function add_cap()
     {
         $role = get_role('administrator');
@@ -146 +144 @@
      * Return the URL of the settings page for the plugin
      */
-    function admin_url()
+    public function admin_url()
     {
         return admin_url('options-general.php?page=' . $this->identifier);
@@ -158 +156 @@
      * @return string the assembled anchor
      */
-    function admin_anchor($mode, $title = '', $text = '')
+    public function admin_anchor($mode, $title = '', $text = '')
     {
         return $this->nonced_anchor($this->admin_url(), 'admin_' . $mode, 'true', $title, $text);
@@ -173 +171 @@
      * @return string the assembled anchor
      */
-    function nonced_anchor($uri, $mode, $value = 'true', $title = '', $text = '', $anchor_extras = '')
+    public function nonced_anchor($uri, $mode, $value = 'true', $title = '', $text = '', $anchor_extras = '')
     {
         //Assemble our url, nonce and all
         $url = wp_nonce_url(add_query_arg($this->unique_prefix . '_' . $mode, $value, $uri), $this->unique_prefix . '_' . $mode);
         //Return a valid anchor
-        return ' <a title="' . esc_attr($title) . '" href="' . $url . '" '. $anchor_extras . '>' . esc_html($text) . '</a>';
+        return ' <a title="' . esc_attr($title) . '" href="' . esc_url($url) . '" '. $anchor_extras . '>' . esc_html($text) . '</a>';
     }
     /**
@@ -185 +183 @@
      * @param string $mode The specific nonce "mode" (see nonced_anchor) that is being checked
      */
-    function check_nonce($mode)
-    {
-        check_admin_referer($this->unique_prefix . '_' . $mode);
+    public function check_nonce($mode)
+    {
+        return check_admin_referer($this->unique_prefix . '_' . $mode);
     }
     /**
      * Makes sure the current user can manage options to proceed
      */
-    function security()
+    protected function security()
     {
         //If the user can not manage options we will die on them
         if(!current_user_can($this->access_level))
         {
-            wp_die(__('Insufficient privileges to proceed.', $this->identifier));
-        }
-    }
-    function init()
+            wp_die(esc_html__('Insufficient privileges to proceed.', $this->identifier));
+        }
+    }
+    public function init()
     {
         $this->add_cap();
@@ -262 +260 @@
         wp_register_script('mtekk_adminkit_tabs', plugins_url('/mtekk_adminkit_tabs' . $suffix . '.js', dirname(__FILE__) . '/assets/mtekk_adminkit_tabs' . $suffix . '.js'), array('jquery-ui-tabs'), self::version, true);
         //Register CSS for tabs
-        wp_register_style('mtekk_adminkit_tabs', plugins_url('/mtekk_adminkit_tabs' . $suffix . '.css', dirname(__FILE__) . '/assets/mtekk_adminkit_tabs' . $suffix . '.css'));
+        wp_register_style('mtekk_adminkit_tabs', plugins_url('/mtekk_adminkit_tabs' . $suffix . '.css', dirname(__FILE__) . '/assets/mtekk_adminkit_tabs' . $suffix . '.css'), array(), self::version);
         //Register options
         register_setting($this->unique_prefix . '_options', $this->unique_prefix . '_options', '');
@@ -273 +271 @@
      * TODO: make this more generic for easier extension
      */
-    function add_page()
+    public function add_page()
     {
         //Add the submenu page to "settings" menu
@@ -291 +289 @@
     }
     /**
-     * Initializes localization textdomain for translations (if applicable)
-     * 
-     * Will conditionally load the textdomain for translations. This is here for
-     * plugins that span multiple files and have localization in more than one file
-     * 
-     * @return void
-     */
-    function local()
-    {
-        global $l10n;
-        // the global and the check might become obsolete in
-        // further wordpress versions
-        // @see https://core.trac.wordpress.org/ticket/10527        
-        if(!isset($l10n[$this->identifier]))
-        {
-            load_plugin_textdomain($this->identifier, false, $this->identifier . '/languages');
-        }
-    }
-    /**
      * Places in a link to the settings page in the plugins listing entry
      * 
@@ -316 +295 @@
      * @return array  Array of links that are output in the listing.
      */
-    function filter_plugin_actions($links, $file)
+    public function filter_plugin_actions($links, $file)
     {
         //Make sure we are adding only for the current plugin
@@ -322 +301 @@
         { 
             //Add our link to the end of the array to better integrate into the WP 2.8 plugins page
-            $links[] = '<a href="' . $this->admin_url() . '">' . esc_html__('Settings') . '</a>';
+            $links[] = '<a href="' . esc_url($this->admin_url()) . '">' . esc_html__('Settings', $this->identifier) . '</a>';
         }
         return $links;
@@ -331 +310 @@
      * @return bool whether or not the plugin has been installed
      */
-    function is_installed()
+    public function is_installed()
     {
         $opts = $this->get_option($this->unique_prefix . '_options');
@@ -341 +320 @@
      * FIXME: seems there is a lot of very similar code in opts_upgrade_wrapper
      */
-    function install()
+    public function install()
     {
         //Call our little security function
@@ -374 +353 @@
      * This removes database settings upon deletion of the plugin from WordPress
      */
-    function uninstall()
+    public function uninstall()
     {
         //Remove the option array setting
@@ -387 +366 @@
      * TODO: change this to being auto called in admin_init action
      */
-    function version_check($version)
+    public function version_check($version)
     {
         //If we didn't get a version, setup
@@ -441 +420 @@
      * @return boolean
      */
-    function settings_validate(array &$settings)
+    public function settings_validate(array &$settings)
     {
         foreach($settings as $setting)
@@ -452 +431 @@
                 }
             }
-            else if($setting instanceof setting && $setting->get_value() !== $setting->validate($setting->get_value()))
+            else if($setting instanceof setting && $setting->get_value() !== $setting->validate($setting->get_value())) //FIXME: not sure I like this
             {
                 return false;
             }
         }
-        return true;
+        return true; //FIXME: Shouldn't the default to be false?
     }
     /**
      * Synchronizes the backup options entry with the current options entry
      */
-    function opts_backup()
+    protected function opts_backup()
     {
         //Set the backup options in the DB to the current options
@@ -599 +578 @@
      * @return number
      */
-    function setting_equal_check($a, $b)
+    public function setting_equal_check($a, $b)
     {
         if(is_array($a) || is_array($b))
@@ -641 +620 @@
     }
     /**
-     * Generates array of the new non-default settings based off of form input
+     * Generates array of the new non-default settings based off of form $input
      * 
      * @param array $input The form input array of setting values
@@ -668 +647 @@
      * 4) Save to database the difference generated in #4
      */
-    function opts_update()
+    protected function opts_update()
     {
         //Do some security related things as we are not using the normal WP settings API
@@ -680 +659 @@
         $this->update_option($this->unique_prefix . '_options_bk', $this->opt, false);
         $opt_prev = $this->opt;
+        //While this should never happen, if the settings are missing, exit early
+        if(!isset($_POST[$this->unique_prefix . '_options']))
+        {
+            return;
+        }
         //Grab our incoming array (the data is dirty)
         $input = $_POST[$this->unique_prefix . '_options'];
@@ -714 +698 @@
                 $temp .= '<br />' . $setting;
             }
-            $this->messages[] = new message($temp . '<br />' . sprintf(esc_html__('Please include this message in your %sbug report%s.', $this->identifier), '<a title="' . sprintf(esc_attr__('Go to the %s support forum.', $this->identifier), $this->short_name) . '" href="' . $this->support_url . '">', '</a>'), 'info');
+            /* translators: %1$s: HTML opening tag for link to the support forums, %2$s: HTML closing tag for link to support forums */
+            $this->messages[] = new message($temp . '<br />' . sprintf(esc_html__('Please include this message in your %1$sbug report%2$s.', $this->identifier), '<a title="' . sprintf(esc_attr__('Go to the %s support forum.', $this->identifier), $this->short_name) . '" href="' . $this->support_url . '">', '</a>'), 'info');
         }
         add_action('admin_notices', array($this, 'messages'));
@@ -721 +706 @@
      * Retrieves the settings from database and exports as JSON
      */
-    function settings_export()
-    {
+    public function settings_export()
+    {
+        //Check if the user has permissions to do this
+        $this->security();
         //Do a nonce check, prevent malicious link/form problems
-        check_admin_referer($this->unique_prefix . '_admin_import_export');
-        //Must clone the defaults since PHP normally shallow copies
-        $default_settings = array_map('mtekk\adminKit\adminKit::setting_cloner', $this->settings);
-        //Get the database options, and load
-        //FIXME: This changes once we save settings to the db instead of opts
-        adminKit::load_opts_into_settings($this->get_option($this->unique_prefix . '_options'), $this->settings);
-        //Get the unique settings
-        $export_settings = apply_filters($this->unique_prefix . '_settings_to_export', array_udiff_assoc($this->settings, $default_settings, array($this, 'setting_equal_check')));
-        //Change our header to application/json for direct save
-        header('Cache-Control: public');
-        //The next two will cause good browsers to download instead of displaying the file
-        header('Content-Description: File Transfer');
-        header('Content-disposition: attachment; filename=' . $this->unique_prefix . '_settings.json');
-        header('Content-Type: application/json');
-        //JSON encode our settings array
-        $output = json_encode(
-                (object)array(
-                        'plugin' => $this->short_name,
-                        'version' => $this::version,
-                        'settings' => $export_settings)
-                , JSON_UNESCAPED_SLASHES, 32);
-        //Let the browser know how long the file is
-        header('Content-Length: ' . strlen($output)); // binary length
-        //Output the file
-        echo $output;
-        //Prevent WordPress from continuing on
-        die();
+        if(check_admin_referer($this->unique_prefix . '_admin_import_export'))
+        {
+            //Must clone the defaults since PHP normally shallow copies
+            $default_settings = array_map('mtekk\adminKit\adminKit::setting_cloner', $this->settings);
+            //Get the database options, and load
+            //FIXME: This changes once we save settings to the db instead of opts
+            adminKit::load_opts_into_settings($this->get_option($this->unique_prefix . '_options'), $this->settings);
+            //Get the unique settings
+            $export_settings = apply_filters($this->unique_prefix . '_settings_to_export', array_udiff_assoc($this->settings, $default_settings, array($this, 'setting_equal_check')));
+            //Change our header to application/json for direct save
+            header('Cache-Control: public');
+            //The next two will cause good browsers to download instead of displaying the file
+            header('Content-Description: File Transfer');
+            header('Content-disposition: attachment; filename=' . $this->unique_prefix . '_settings.json');
+            header('Content-Type: application/json');
+            //JSON encode our settings array
+            $output_escaped= wp_json_encode(
+                    (object)array(
+                            'plugin' => $this->short_name,
+                            'version' => $this::version,
+                            'settings' => $export_settings)
+                    , JSON_UNESCAPED_SLASHES, 32);
+            //Let the browser know how long the file is
+            header('Content-Length: ' . strlen($output_escaped)); // binary length
+            //Output the file
+            echo $output_escaped;
+            //Prevent WordPress from continuing on
+            die();
+        }
     }
     /**
      * Imports JSON settings into database
-     */
-    function settings_import()
-    {
+     * 
+     */
+    public function settings_import()
+    {
+        //Check if the user has permissions to do this
+        $this->security();
         //Do a nonce check, prevent malicious link/form problems
-        check_admin_referer($this->unique_prefix . '_admin_import_export');
-        //Set the backup options in the DB to the current options
-        $this->opts_backup();
-        //Load the user uploaded file, handle failure gracefully
-        if(is_uploaded_file($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']))
-        {
-            //Grab the json settings from the temp file, treat as associative array so we can just throw the settings subfield at the update loop
-            $settings_upload = json_decode(file_get_contents($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']), true);
-            //Only continue if we have a JSON object that is for this plugin (the the WP rest_is_object() function is handy here as the REST API passes JSON)
-            if(rest_is_object($settings_upload) && isset($settings_upload['plugin']) && $settings_upload['plugin'] === $this->short_name)
-            {
+        if(check_admin_referer($this->unique_prefix . '_admin_import_export'))
+        {
+            //Set the backup options in the DB to the current options
+            $this->opts_backup();
+            //Load the user uploaded file, handle failure gracefully
+            if(isset($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']) && is_uploaded_file($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']))
+            {
+                //Grab the json settings from the temp file, treat as associative array so we can just throw the settings subfield at the update loop
+                $settings_upload = json_decode(file_get_contents($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']), true);
+                //Only continue if we have a JSON object that is for this plugin (the the WP rest_is_object() function is handy here as the REST API passes JSON)
+                if(rest_is_object($settings_upload) && isset($settings_upload['plugin']) && $settings_upload['plugin'] === $this->short_name)
+                {
+                    //Act as if the JSON file was just a bunch of POST entries for a settings save
+                    //Run through the loop and get the diff from defaults
+                    //this isn't obvious but calls adminkit::settings_update_loop() which calls setting::maybe_update_from_form_input which performs sanitization on a per setting basis
+                    $new_settings = $this->get_settings_diff($settings_upload['settings'], true);
+                    //FIXME: Eventually we'll save the object array, but not today
+                    //Convert to opts array for saving
+                    $this->opt = adminKit::settings_to_opts($new_settings);
+                    //Run opts through update script
+                    //Make sure we safely import and upgrade settings if needed
+                    $this->opts_upgrade($this->opt, $settings_upload['version']);
+                    //Commit the option changes
+                    $updated = $this->update_option($this->unique_prefix . '_options', $this->opt, true);
+                    //Check if known settings match attempted save
+                    if($updated && count(array_diff_key($settings_upload['settings'], $this->settings)) == 0)
+                    {
+                        //Let the user know everything went ok
+                        $this->messages[] = new message(esc_html__('Settings successfully imported from the uploaded file.', $this->identifier)
+                                . $this->admin_anchor('undo', __('Undo the options import.', $this->identifier), __('Undo', $this->identifier)), 'success');
+                    }
+                    else
+                    {
+                        $this->messages[] = new message(esc_html__('No settings were imported. Settings from uploaded file matched existing settings.', $this->identifier), 'info');
+                    }
+                    //Output any messages that there may be
+                    add_action('admin_notices', array($this, 'messages'));
+                    //And return as we're successful
+                    return;
+                }
+                //If it wasn't JSON, try XML
+                else
+                {
+                    return $this->opts_import();
+                }
+            }
+            //Throw an error since we could not load the file for various reasons
+            $this->messages[] = new message(esc_html__('Importing settings from file failed.', $this->identifier), 'error');
+        }
+    }
+    /**
+     * Exports a XML options document
+     * @deprecated 7.5.0
+     */
+    public function opts_export()
+    {
+        _deprecated_function( __FUNCTION__, '7.5.0', '\mtekk\adminKit::settings_export');
+        //Check if the user has permissions to do this
+        $this->security();
+        //Do a nonce check, prevent malicious link/form problems 
+        if(check_admin_referer($this->unique_prefix . '_admin_import_export'))
+        {
+            //Update our internal settings
+            $this->opt = $this->get_option($this->unique_prefix . '_options');
+            //Create a DOM document
+            $dom = new \DOMDocument('1.0', 'UTF-8');
+            //Adds in newlines and tabs to the output
+            $dom->formatOutput = true;
+            //We're not using a DTD therefore we need to specify it as a standalone document
+            $dom->xmlStandalone = true;
+            //Add an element called options
+            $node = $dom->createElement('options');
+            $parnode = $dom->appendChild($node);
+            //Add a child element named plugin
+            $node = $dom->createElement('plugin');
+            $plugnode = $parnode->appendChild($node);
+            //Add some attributes that identify the plugin and version for the options export
+            $plugnode->setAttribute('name', $this->short_name);
+            $plugnode->setAttribute('version', $this::version);
+            //Change our header to text/xml for direct save
+            header('Cache-Control: public');
+            //The next two will cause good browsers to download instead of displaying the file
+            header('Content-Description: File Transfer');
+            header('Content-disposition: attachment; filename=' . $this->unique_prefix . '_settings.xml');
+            header('Content-Type: text/xml');
+            //Loop through the options array
+            foreach($this->opt as $key=>$option)
+            {
+                if(is_array($option))
+                {
+                    continue;
+                }
+                //Add a option tag under the options tag, store the option value
+                $node = $dom->createElement('option', htmlentities($option, ENT_COMPAT | ENT_XML1, 'UTF-8'));
+                $newnode = $plugnode->appendChild($node);
+                //Change the tag's name to that of the stored option
+                $newnode->setAttribute('name', $key);
+            }
+            //Prepare the XML for output
+            $output_escaped = $dom->saveXML();
+            //Let the browser know how long the file is
+            header('Content-Length: ' . strlen($output_escaped)); // binary length
+            //Output the file
+            echo $output_escaped;
+            //Prevent WordPress from continuing on
+            die();
+        }
+    }
+    /**
+     * Imports a XML options document
+     * 
+     * FIXME: Where is the input sanitization/validation?
+     */
+    public function opts_import()
+    {
+        //Check if the user has permissions to do this
+        $this->security();
+        //Our quick and dirty error suppressor
+        $error_handler = function($errno, $errstr, $eerfile, $errline, $errcontext)
+        {
+            return true;
+        };
+        //Do a nonce check, prevent malicious link/form problems
+        if(check_admin_referer($this->unique_prefix . '_admin_import_export'))
+        {
+            //Set the backup options in the DB to the current options
+            $this->opts_backup();
+            //Create a DOM document
+            $dom = new \DOMDocument('1.0', 'UTF-8');
+            //We want to catch errors ourselves
+            set_error_handler($error_handler);
+            //Load the user uploaded file, handle failure gracefully
+            if(isset($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']) && is_uploaded_file($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']) && $dom->load($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']))
+            {
+                $opts_temp = array();
+                $version = '';
+                //Have to use an xpath query otherwise we run into problems
+                $xpath = new \DOMXPath($dom);  
+                $option_sets = $xpath->query('plugin');
+                //Loop through all of the xpath query results
+                foreach($option_sets as $options)
+                {
+                    //We only want to import options for only this plugin
+                    if($options->getAttribute('name') === $this->short_name)
+                    {
+                        //Grab the file version
+                        $version = $options->getAttribute('version');
+                        //Loop around all of the options
+                        foreach($options->getelementsByTagName('option') as $child)
+                        {
+                            //Place the option into the option array, DOMDocument decodes html entities for us
+                            $opts_temp[$child->getAttribute('name')] = $child->nodeValue;
+                        }
+                    }
+                }
                 //Act as if the JSON file was just a bunch of POST entries for a settings save
                 //Run through the loop and get the diff from defaults
-                $new_settings = $this->get_settings_diff($settings_upload['settings'], true);
+                //this isn't obvious but calls adminkit::settings_update_loop() which calls setting::maybe_update_from_form_input which performs sanitization on a per setting basis
+                $new_settings = $this->get_settings_diff($opts_temp, true);
                 //FIXME: Eventually we'll save the object array, but not today
                 //Convert to opts array for saving
@@ -778 +915 @@
                 //Make sure we safely import and upgrade settings if needed
                 $this->opts_upgrade($this->opt, $settings_upload['version']);
-                //Commit the option changes
-                $updated = $this->update_option($this->unique_prefix . '_options', $this->opt, true);
-                //Check if known settings match attempted save
-                if($updated && count(array_diff_key($settings_upload['settings'], $this->settings)) == 0)
-                {
-                    //Let the user know everything went ok
-                    $this->messages[] = new message(esc_html__('Settings successfully imported from the uploaded file.', $this->identifier)
-                            . $this->admin_anchor('undo', __('Undo the options import.', $this->identifier), __('Undo', $this->identifier)), 'success');
-                }
-                else
-                {
-                    $this->messages[] = new message(esc_html__('No settings were imported. Settings from uploaded file matched existing settings.', $this->identifier), 'info');
-                }
-                //Output any messages that there may be
-                add_action('admin_notices', array($this, 'messages'));
-                //And return as we're successful
-                return;
-            }
-            //If it wasn't JSON, try XML
+                
+                //Commit the loaded options to the database
+                $this->update_option($this->unique_prefix . '_options', $this->opt, true);
+                //Everything was successful, let the user know
+                $this->messages[] = new message(esc_html__('Settings successfully imported from the uploaded file.', $this->identifier)
+                    . $this->admin_anchor('undo', __('Undo the options import.', $this->identifier), __('Undo', $this->identifier)), 'success');
+            }
             else
             {
-                return $this->opts_import();
-            }
-        }
-        //Throw an error since we could not load the file for various reasons
-        $this->messages[] = new message(esc_html__('Importing settings from file failed.', $this->identifier), 'error');
-    }
-    /**
-     * Exports a XML options document
-     * @deprecated 7.5.0
-     */
-    function opts_export()
-    {
-        _deprecated_function( __FUNCTION__, '7.5.0', '\mtekk\adminKit::settings_export');
-        //Do a nonce check, prevent malicious link/form problems 
-        check_admin_referer($this->unique_prefix . '_admin_import_export');
-        //Update our internal settings
-        $this->opt = $this->get_option($this->unique_prefix . '_options');
-        //Create a DOM document
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        //Adds in newlines and tabs to the output
-        $dom->formatOutput = true;
-        //We're not using a DTD therefore we need to specify it as a standalone document
-        $dom->xmlStandalone = true;
-        //Add an element called options
-        $node = $dom->createElement('options');
-        $parnode = $dom->appendChild($node);
-        //Add a child element named plugin
-        $node = $dom->createElement('plugin');
-        $plugnode = $parnode->appendChild($node);
-        //Add some attributes that identify the plugin and version for the options export
-        $plugnode->setAttribute('name', $this->short_name);
-        $plugnode->setAttribute('version', $this::version);
-        //Change our header to text/xml for direct save
-        header('Cache-Control: public');
-        //The next two will cause good browsers to download instead of displaying the file
-        header('Content-Description: File Transfer');
-        header('Content-disposition: attachment; filename=' . $this->unique_prefix . '_settings.xml');
-        header('Content-Type: text/xml');
-        //Loop through the options array
-        foreach($this->opt as $key=>$option)
-        {
-            if(is_array($option))
-            {
-                continue;
-            }
-            //Add a option tag under the options tag, store the option value
-            $node = $dom->createElement('option', htmlentities($option, ENT_COMPAT | ENT_XML1, 'UTF-8'));
-            $newnode = $plugnode->appendChild($node);
-            //Change the tag's name to that of the stored option
-            $newnode->setAttribute('name', $key);
-        }
-        //Prepare the XML for output
-        $output = $dom->saveXML();
-        //Let the browser know how long the file is
-        header('Content-Length: ' . strlen($output)); // binary length
-        //Output the file
-        echo $output;
-        //Prevent WordPress from continuing on
-        die();
-    }
-    /**
-     * Imports a XML options document
-     */
-    function opts_import()
-    {
-        //Our quick and dirty error suppressor
-        $error_handler = function($errno, $errstr, $eerfile, $errline, $errcontext)
-        {
-            return true;
-        };
+                //Throw an error since we could not load the file for various reasons
+                $this->messages[] = new message(esc_html__('Importing settings from file failed.', $this->identifier), 'error');
+            }
+            //Reset to the default error handler after we're done
+            restore_error_handler();
+            //Output any messages that there may be
+            add_action('admin_notices', array($this, 'messages'));
+        }
+    }
+    /**
+     * Resets the database settings array to the default set in opt
+     */
+    public function opts_reset()
+    {
+        //Check if the user has permissions to do this
+        $this->security();
         //Do a nonce check, prevent malicious link/form problems
-        check_admin_referer($this->unique_prefix . '_admin_import_export');
-        //Set the backup options in the DB to the current options
-        $this->opts_backup();
-        //Create a DOM document
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        //We want to catch errors ourselves
-        set_error_handler($error_handler);
-        //Load the user uploaded file, handle failure gracefully
-        if(is_uploaded_file($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']) && $dom->load($_FILES[$this->unique_prefix . '_admin_import_file']['tmp_name']))
-        {
-            $opts_temp = array();
-            $version = '';
-            //Have to use an xpath query otherwise we run into problems
-            $xpath = new \DOMXPath($dom);  
-            $option_sets = $xpath->query('plugin');
-            //Loop through all of the xpath query results
-            foreach($option_sets as $options)
-            {
-                //We only want to import options for only this plugin
-                if($options->getAttribute('name') === $this->short_name)
-                {
-                    //Grab the file version
-                    $version = $options->getAttribute('version');
-                    //Loop around all of the options
-                    foreach($options->getelementsByTagName('option') as $child)
-                    {
-                        //Place the option into the option array, DOMDocument decodes html entities for us
-                        $opts_temp[$child->getAttribute('name')] = $child->nodeValue;
-                    }
-                }
-            }
-            //Make sure we safely import and upgrade settings if needed
-            $this->opts_upgrade($opts_temp, $version);
-            //Commit the loaded options to the database
-            $this->update_option($this->unique_prefix . '_options', $this->opt, true);
-            //Everything was successful, let the user know
-            $this->messages[] = new message(esc_html__('Settings successfully imported from the uploaded file.', $this->identifier)
-                . $this->admin_anchor('undo', __('Undo the options import.', $this->identifier), __('Undo', $this->identifier)), 'success');
-        }
-        else
-        {
-            //Throw an error since we could not load the file for various reasons
-            $this->messages[] = new message(esc_html__('Importing settings from file failed.', $this->identifier), 'error');
-        }
-        //Reset to the default error handler after we're done
-        restore_error_handler();
-        //Output any messages that there may be
-        add_action('admin_notices', array($this, 'messages'));
-    }
-    /**
-     * Resets the database settings array to the default set in opt
-     */
-    function opts_reset()
-    {
+        if(check_admin_referer($this->unique_prefix . '_admin_import_export'))
+        {
+            //Set the backup options in the DB to the current options
+            $this->opts_backup();
+            //Load in the hard coded default option values
+            $this->update_option($this->unique_prefix . '_options', array(), true);
+            //Reset successful, let the user know
+            $this->messages[] = new message(esc_html__('Settings successfully reset to the default values.', $this->identifier)
+                . $this->admin_anchor('undo', __('Undo the options reset.', $this->identifier), __('Undo', $this->identifier)), 'success');
+            add_action('admin_notices', array($this, 'messages'));
+        }
+    }
+    /**
+     * Undos the last settings save/reset/import
+     */
+    public function opts_undo()
+    {
+        //Check if the user has permissions to do this
+        $this->security();
         //Do a nonce check, prevent malicious link/form problems
-        check_admin_referer($this->unique_prefix . '_admin_import_export');
-        //Set the backup options in the DB to the current options
-        $this->opts_backup();
-        //Load in the hard coded default option values
-        $this->update_option($this->unique_prefix . '_options', array(), true);
-        //Reset successful, let the user know
-        $this->messages[] = new message(esc_html__('Settings successfully reset to the default values.', $this->identifier)
-            . $this->admin_anchor('undo', __('Undo the options reset.', $this->identifier), __('Undo', $this->identifier)), 'success');
-        add_action('admin_notices', array($this, 'messages'));
-    }
-    /**
-     * Undos the last settings save/reset/import
-     */
-    function opts_undo()
-    {
-        //Do a nonce check, prevent malicious link/form problems
-        check_admin_referer($this->unique_prefix . '_admin_undo');
-        //Set the options array to the current options
-        $opt = $this->get_option($this->unique_prefix . '_options');
-        //Set the options in the DB to the backup options
-        $this->update_option($this->unique_prefix . '_options', $this->get_option($this->unique_prefix . '_options_bk'), true);
-        //Set the backup options to the undone options
-        $this->update_option($this->unique_prefix . '_options_bk', $opt, false);
-        //Send the success/undo message
-        $this->messages[] = new message(esc_html__('Settings successfully undid the last operation.', $this->identifier)
-            . $this->admin_anchor('undo', __('Undo the last undo operation.', $this->identifier), __('Undo', $this->identifier)), 'success');
-        add_action('admin_notices', array($this, 'messages'));
+        if(check_admin_referer($this->unique_prefix . '_admin_undo'))
+        {
+            //Set the options array to the current options
+            $opt = $this->get_option($this->unique_prefix . '_options');
+            //Set the options in the DB to the backup options
+            $this->update_option($this->unique_prefix . '_options', $this->get_option($this->unique_prefix . '_options_bk'), true);
+            //Set the backup options to the undone options
+            $this->update_option($this->unique_prefix . '_options_bk', $opt, false);
+            //Send the success/undo message
+            $this->messages[] = new message(esc_html__('Settings successfully undid the last operation.', $this->identifier)
+                . $this->admin_anchor('undo', __('Undo the last undo operation.', $this->identifier), __('Undo', $this->identifier)), 'success');
+            add_action('admin_notices', array($this, 'messages'));
+        }
     }
     /**
@@ -959 +981 @@
      * @param string $version the version of the passed in options
      */
-    function opts_upgrade($opts, $version)
+    public function opts_upgrade($opts, $version)
     {
         //We don't support using newer versioned option files in older releases
@@ -972 +994 @@
      * FIXME: seems there is a lot of very similar code in install
      */
-    function opts_upgrade_wrapper()
-    {
+    public function opts_upgrade_wrapper()
+    {
+        //Check if the user has permissions to do this
+        $this->security();
         //Do a nonce check, prevent malicious link/form problems
-        check_admin_referer($this->unique_prefix . '_admin_upgrade');
-        //Grab the database options
-        $opts = $this->get_option($this->unique_prefix . '_options');
-        if(is_array($opts))
-        {
-            //Feed the just read options into the upgrade function
-            $this->opts_upgrade($opts, $this->get_option($this->unique_prefix . '_version'));
-            //Always have to update the version
-            $this->update_option($this->unique_prefix . '_version', $this::version, false);
-            //Store the options
-            $this->update_option($this->unique_prefix . '_options', $this->opt, true);
-            //Send the success message
-            $this->messages[] = new message(esc_html__('Settings successfully migrated.', $this->identifier), 'success');
-        }
-        else
-        {
-            //Run the install script
-            $this->install();
-            //Send the success message
-            $this->messages[] = new message(esc_html__('Default settings successfully installed.', $this->identifier), 'success');
-        }
-        add_action('admin_notices', array($this, 'messages'));
+        if(check_admin_referer($this->unique_prefix . '_admin_upgrade'))
+        {
+            //Grab the database options
+            $opts = $this->get_option($this->unique_prefix . '_options');
+            if(is_array($opts))
+            {
+                //Feed the just read options into the upgrade function
+                $this->opts_upgrade($opts, $this->get_option($this->unique_prefix . '_version'));
+                //Always have to update the version
+                $this->update_option($this->unique_prefix . '_version', $this::version, false);
+                //Store the options
+                $this->update_option($this->unique_prefix . '_options', $this->opt, true);
+                //Send the success message
+                $this->messages[] = new message(esc_html__('Settings successfully migrated.', $this->identifier), 'success');
+            }
+            else
+            {
+                //Run the install script
+                $this->install();
+                //Send the success message
+                $this->messages[] = new message(esc_html__('Default settings successfully installed.', $this->identifier), 'success');
+            }
+            add_action('admin_notices', array($this, 'messages'));
+        }
     }
     /**
@@ -1004 +1030 @@
      *
      */
-    function help()
+    public function help()
     {
         $screen = get_current_screen();
@@ -1018 +1044 @@
         }
     }
-    function help_contents(\WP_Screen &$screen)
+    public function help_contents(\WP_Screen &$screen)
     {
         
     }
-    function dismiss_message()
-    {
+    //FIXME: There just has to be a better way...
+    public function dismiss_message()
+    {
+        $this->security();
         //Grab the submitted UID
-        $uid = esc_attr($_POST['uid']);
+        $uid = sanitize_html_class(wp_unslash($_POST['uid']));
         //Create a dummy message, with the discovered UID
         $message = new message('', '', true, $uid);
@@ -1035 +1063 @@
      * Prints to screen all of the messages stored in the message member variable
      */
-    function messages()
+    public function messages()
     {
         foreach($this->messages as $message)
@@ -1044 +1072 @@
         if(is_array($this->message) && count($this->message))
         {
-            _deprecated_function( __FUNCTION__, '2.0.0', __('adminKit::message is deprecated, use new adminkit_messages instead.', $this->identifier) );
+            _deprecated_function( __FUNCTION__, '2.0.0', esc_html__('adminKit::message is deprecated, use new adminkit_messages instead.', $this->identifier) );
             //Loop through our message classes
             foreach($this->message as $key => $class)
@@ -1051 +1079 @@
                 foreach($class as $message)
                 {
-                    printf('<div class="%s"><p>%s</p></div>', esc_attr($key), $message);    
+                    printf('<div class="%s"><p>%s</p></div>', esc_attr($key), wp_kses($message, wp_kses_allowed_html('post'))); 
                 }
             }
@@ -1061 +1089 @@
      * Function prototype to prevent errors
      */
-    function admin_styles()
+    public function admin_styles()
     {
 
@@ -1068 +1096 @@
      * Function prototype to prevent errors
      */
-    function admin_scripts()
+    public function admin_scripts()
     {
 
@@ -1075 +1103 @@
      * Function prototype to prevent errors
      */
-    function admin_head()
+    public function admin_head()
     {
 
@@ -1082 +1110 @@
      * Function prototype to prevent errors
      */
-    function admin_page()
+    public function admin_page()
     {
 
@@ -1112 +1140 @@
         }
     }
-    function import_form()
+    public function import_form()
     {
         $form = '<div id="mtekk_admin_import_export_relocate">';
@@ -1127 +1155 @@
         $form .= esc_html__('Select a JSON or XML settings file to upload and import settings from.', $this->identifier);
         $form .= '</p></td></tr></table><p class="submit">';
-        $form .= sprintf('<input type="submit" class="button" name="%1$s_admin_settings_import" value="%2$s"/>', $this->unique_prefix, esc_attr__('Import', $this->identifier));
-        $form .= sprintf('<input type="submit" class="button" name="%1$s_admin_settings_export" value="%2$s"/>', $this->unique_prefix, esc_attr__('Export', $this->identifier));
-        $form .= sprintf('<input type="submit" class="button" name="%1$s_admin_reset" value="%2$s"/>', $this->unique_prefix, esc_attr__('Reset', $this->identifier));
+        $form .= sprintf('<input type="submit" class="button" name="%1$s_admin_settings_import" value="%2$s"/>', esc_attr($this->unique_prefix), esc_attr__('Import', $this->identifier));
+        $form .= sprintf('<input type="submit" class="button" name="%1$s_admin_settings_export" value="%2$s"/>', esc_attr($this->unique_prefix), esc_attr__('Export', $this->identifier));
+        $form .= sprintf('<input type="submit" class="button" name="%1$s_admin_reset" value="%2$s"/>', esc_attr($this->unique_prefix), esc_attr__('Reset', $this->identifier));
         $form .= '</p></fieldset></form></div>';
         return $form;
@@ -1140 +1168 @@
      * @deprecated 7.0.0
      */
-    function input_hidden($option)
+    public function input_hidden($option)
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::input_hidden');
@@ -1155 +1183 @@
      * @deprecated 7.0.0
      */
-    function label($opt_id, $label)
+    public function label($opt_id, $label)
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::label');
-        printf('<label for="%1$s">%2$s</label>', esc_attr($opt_id), $label);
+        printf('<label for="%1$s">%2$s</label>', esc_attr($opt_id), esc_html($label));
     }
     /**
@@ -1171 +1199 @@
      * @deprecated 7.0.0
      */
-    function input_text($label, $option, $class = 'regular-text', $disable = false, $description = '')
+    public function input_text($label, $option, $class = 'regular-text', $disable = false, $description = '')
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::input_text');
@@ -1187 +1215 @@
             <td>
                 <?php printf('<input type="text" name="%1$s" id="%2$s" value="%3$s" class="%4$s" %5$s/><br />', esc_attr($opt_name), esc_attr($opt_id), esc_attr($this->opt[$option]), esc_attr($class), disabled($disable, true, false));?>
-                <?php if($description !== ''){?><p class="description"><?php echo $description;?></p><?php }?>
+                <?php if($description !== ''){?><p class="description"><?php echo esc_html($description);?></p><?php }?>
             </td>
         </tr>
@@ -1206 +1234 @@
      * @deprecated 7.0.0
      */
-    function input_number($label, $option, $class = 'small-text', $disable = false, $description = '', $min = '', $max = '', $step = '')
+    public function input_number($label, $option, $class = 'small-text', $disable = false, $description = '', $min = '', $max = '', $step = '')
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::input_number');
         $opt_id = adminKit::get_valid_id($option);
         $opt_name = $this->unique_prefix . '_options[' . $option . ']';
-        $extras = '';
+        $extras_escaped = '';
         if($min !== '')
         {
-            $extras .= 'min="' . esc_attr($min) . '" ';
+            $extras_escaped .= 'min="' . esc_attr($min) . '" ';
         }
         if($max !== '')
         {
-            $extras .= 'max="' . esc_attr($max) . '" ';
+            $extras_escaped .= 'max="' . esc_attr($max) . '" ';
         }
         if($step !== '')
         {
-            $extras .= 'step="' . esc_attr($step) . '" ';
+            $extras_escaped .= 'step="' . esc_attr($step) . '" ';
         }
         if($disable)
@@ -1234 +1262 @@
             </th>
             <td>
-                <?php printf('<input type="number" name="%1$s" id="%2$s" value="%3$s" class="%4$s" %6$s%5$s/><br />', esc_attr($opt_name), esc_attr($opt_id), esc_attr($this->opt[$option]), esc_attr($class), disabled($disable, true, false), $extras);?>
-                <?php if($description !== ''){?><p class="description"><?php echo $description;?></p><?php }?>
+                <?php printf('<input type="number" name="%1$s" id="%2$s" value="%3$s" class="%4$s" %6$s%5$s/><br />', esc_attr($opt_name), esc_attr($opt_id), esc_attr($this->opt[$option]), esc_attr($class), disabled($disable, true, false), $extras_escaped);?>
+                <?php if($description !== ''){?><p class="description"><?php echo esc_html($description);?></p><?php }?>
             </td>
         </tr>
@@ -1251 +1279 @@
      * @deprecated 7.0.0
      */
-    function textbox($label, $option, $height = '3', $disable = false, $description = '', $class = '')
+    public function textbox($label, $option, $height = '3', $disable = false, $description = '', $class = '')
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::textbox');
@@ -1268 +1296 @@
             <td>
                 <?php printf('<textarea rows="%6$s" name="%1$s" id="%2$s" class="%4$s" %5$s/>%3$s</textarea><br />', esc_attr($opt_name), esc_attr($opt_id), esc_textarea($this->opt[$option]), esc_attr($class), disabled($disable, true, false), esc_attr($height));?>
-                    <?php if($description !== ''){?><p class="description"><?php echo $description;?></p><?php }?>
+                    <?php if($description !== ''){?><p class="description"><?php echo esc_html($description);?></p><?php }?>
             </td>
         </tr>
@@ -1284 +1312 @@
      * @deprecated 7.0.0
      */
-    function tinymce($label, $option, $height = '3', $disable = false, $description = '')
+    public function tinymce($label, $option, $height = '3', $disable = false, $description = '')
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::tinymce');
@@ -1300 +1328 @@
             <td>
                 <?php printf('<textarea rows="%6$s" name="%1$s" id="%2$s" class="%4$s" %5$s/>%3$s</textarea><br />', esc_attr($opt_name), esc_attr($opt_id), esc_textarea($this->opt[$option]), esc_attr($class), disabled($disable, true, false), esc_attr($height));?>
-                <?php if($description !== ''){?><p class="description"><?php echo $description;?></p><?php }?>
+                <?php if($description !== ''){?><p class="description"><?php echo esc_html($description);?></p><?php }?>
             </td>
         </tr>
@@ -1317 +1345 @@
      * @deprecated 7.0.0
      */
-    function input_check($label, $option, $instruction, $disable = false, $description = '', $class = '')
+    public function input_check($label, $option, $instruction, $disable = false, $description = '', $class = '')
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::input_check');
@@ -1334 +1362 @@
                 <label for="<?php echo esc_attr( $opt_id ); ?>">
                     <?php printf('<input type="checkbox" name="%1$s" id="%2$s" value="%3$s" class="%4$s" %5$s %6$s/>', esc_attr($opt_name), esc_attr($opt_id), esc_attr($this->opt[$option]), esc_attr($class), disabled($disable, true, false), checked($this->opt[$option], true, false));?>
-                    <?php echo $instruction; ?>
+                    <?php echo esc_html($instruction); ?>
                 </label><br />
-                <?php if($description !== ''){?><p class="description"><?php echo $description;?></p><?php }?>
+                <?php if($description !== ''){?><p class="description"><?php echo esc_html($description);?></p><?php }?>
             </td>
         </tr>
@@ -1352 +1380 @@
      * @deprecated 7.0.0
      */
-    function input_radio($option, $value, $instruction, $disable = false, $class = '')
+    public function input_radio($option, $value, $instruction, $disable = false, $class = '')
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::input_radio');
@@ -1365 +1393 @@
         <label>
             <?php printf('<input type="radio" name="%1$s" id="%2$s" value="%3$s" class="%4$s" %5$s %6$s/>', esc_attr($opt_name), esc_attr($opt_id), esc_attr($value), esc_attr($class), disabled($disable, true, false), checked($value, $this->opt[$option], false));?>
-            <?php echo $instruction; ?>
+            <?php echo esc_html($instruction); ?>
         </label><br/>
     <?php
@@ -1382 +1410 @@
      * @deprecated 7.0.0
      */
-    function input_select($label, $option, $values, $disable = false, $description = '', $titles = false, $class = '')
+    public function input_select($label, $option, $values, $disable = false, $description = '', $titles = false, $class = '')
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::input_select');
@@ -1403 +1431 @@
             <td>
                 <?php printf('<select name="%1$s" id="%2$s" class="%4$s" %5$s>%3$s</select><br />', esc_attr($opt_name), esc_attr($opt_id), $this->select_options($option, $titles, $values), esc_attr($class), disabled($disable, true, false));?>
-                <?php if($description !== ''){?><p class="description"><?php echo $description;?></p><?php }?>
+                <?php if($description !== ''){?><p class="description"><?php echo esc_html($description);?></p><?php }?>
             </td>
         </tr>
@@ -1420 +1448 @@
      * @deprecated 7.0.0
      */
-    function select_options($optionname, $options, $values, $exclude = array())
+    public function select_options($optionname, $options, $values, $exclude = array())
     {
         _deprecated_function( __FUNCTION__, '7.0', '\mtekk\adminKit\form::select_options');
@@ -1430 +1458 @@
             if(!in_array($option, $exclude))
             {
-                $options_html .= sprintf('<option value="%1$s" %2$s>%3$s</option>', esc_attr($values[$key]), selected($value, $values[$key], false), $option);
+                $options_html .= sprintf('<option value="%1$s" %2$s>%3$s</option>', esc_attr($values[$key]), selected($value, $values[$key], false), esc_html($option));
             }
         }
@@ -1441 +1469 @@
      * @return mixed The value of the option
      */
-    function get_option($option)
+    public function get_option($option)
     {
         return get_option($option);
@@ -1451 +1479 @@
      * @param mixed $newvalue The new value to set the option to
      */
-    function update_option($option, $newvalue, $autoload = null)
+    public function update_option($option, $newvalue, $autoload = null)
     {
         return update_option($option, $newvalue, $autoload);
@@ -1463 +1491 @@
      * @param string $autoload Whether or not to autoload the option, it's a string because WP is special
      */
-    function add_option($option, $value = '', $deprecated = '', $autoload = 'yes')
-    {
-        return add_option($option, $value, null, $autoload);
+    public function add_option($option, $value = '', $deprecated = '', $autoload = 'yes')
+    {
+        return add_option($option, $value, '', $autoload);
     }
     /**
@@ -1472 +1500 @@
      * @param string $option The name of the option to delete
      */
-    function delete_option($option)
+    public function delete_option($option)
     {
         return delete_option($option);
     }
+    /**
+     * Initializes localization textdomain for translations (if applicable)
+     *
+     * Will conditionally load the textdomain for translations. This is here for
+     * plugins that span multiple files and have localization in more than one file
+     *
+     * @return void
+     *
+     * @deprecated 7.5.1
+     */
+    public function local()
+    {
+        //Nothing to see here now that it's deprecated
+    }
 }

breadcrumb-navxt/trunk/includes/adminKit/class-mtekk_adminkit_form.php

@@ -1 +1 @@
 <?php
 /*
-    Copyright 2015-2023  John Havlik  (email : john.havlik@mtekk.us)
+    Copyright 2015-2025  John Havlik  (email : john.havlik@mtekk.us)
 
     This program is free software; you can redistribute it and/or modify
@@ -76 +76 @@
     public function label($opt_id, $label)
     {
-        printf('<label for="%1$s">%2$s</label>', esc_attr($opt_id), $label);
+        printf('<label for="%1$s">%2$s</label>', esc_attr($opt_id), esc_html($label));
     }
     /**
@@ -111 +111 @@
                 if($description !== '')
                 {
-                    printf('<p class="description">%s</p>', $description);
+                    printf('<p class="description">%s</p>', esc_html($description));
                 }?>
             </td>
@@ -134 +134 @@
         $opt_id = form::get_valid_id($option->get_name());
         $opt_name = $this->unique_prefix . '_options[' . $option->get_opt_name(). ']';
-        $extras = '';
+        $extras_escaped = '';
         if($min !== '')
         {
-            $extras .= 'min="' . esc_attr($min) . '" ';
+            $extras_escaped.= 'min="' . esc_attr($min) . '" ';
         }
         if($max !== '')
         {
-            $extras .= 'max="' . esc_attr($max) . '" ';
+            $extras_escaped.= 'max="' . esc_attr($max) . '" ';
         }
         if($step !== '')
         {
-            $extras .= 'step="' . esc_attr($step) . '" ';
+            $extras_escaped.= 'step="' . esc_attr($step) . '" ';
         }?>
         <tr valign="top">
@@ -164 +164 @@
                         esc_attr($class),
                         disabled($disable, true, false),
-                        $extras);
-                if($description !== '')
-                {
-                            printf('<p class="description">%s</p>', $description);
+                        $extras_escaped);
+                if($description !== '')
+                {
+                            printf('<p class="description">%s</p>', esc_html($description));
                 }?>
             </td>
@@ -206 +206 @@
                 if($description !== '')
                 {
-                    printf('<p class="description">%s</p>', $description);
+                    printf('<p class="description">%s</p>', esc_html($description));
                 }?>
             </td>
@@ -245 +245 @@
                 if($description !== '')
                 {
-                    printf('<p class="description">%s</p>', $description);
+                    printf('<p class="description">%s</p>', esc_html($description));
                 }?>
             </td>
@@ -283 +283 @@
                             disabled($disable, true, false),
                             checked($option->get_value(), true, false));
-                    echo $instruction;?>
+                    echo esc_html($instruction);?>
                 </label><br />
                 <?php
                 if($description !== '')
                 {
-                    printf('<p class="description">%s</p>', $description);
+                    printf('<p class="description">%s</p>', esc_html($description));
                 }?>
             </td>
@@ -322 +322 @@
                     disabled($disable, true, false),
                     checked($value, $option->get_value(), false));
-            echo $instruction; ?>
+            echo esc_html($instruction); ?>
         </label><br/>
     <?php
@@ -364 +364 @@
                 if($description !== '')
                 {
-                    printf('<p class="description">%s</p>', $description);
+                    printf('<p class="description">%s</p>', esc_html($description));
                 }?>
             </td>
@@ -391 +391 @@
                         esc_attr($values[$key]),
                         selected($current_value, $values[$key], false),
-                        $option);
+                        esc_html($option));
             }
         }

breadcrumb-navxt/trunk/includes/adminKit/class-mtekk_adminkit_message.php

@@ -1 +1 @@
 <?php
 /*
-    Copyright 2015-2023  John Havlik  (email : john.havlik@mtekk.us)
+    Copyright 2015-2025  John Havlik  (email : john.havlik@mtekk.us)
 
     This program is free software; you can redistribute it and/or modify
@@ -42 +42 @@
         {
             //Let the user know they're doing it wrong
-            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, __('$uid must not be null if message is dismissible', 'mtekk_adminKit'), '1.0.0');
+            _doing_it_wrong(__CLASS__ . '::' . __FUNCTION__, esc_html__('$uid must not be null if message is dismissible', 'mtekk_adminKit'), '1.0.0');
             //Treat the message as non-dismissible
             $dismissible = false;
@@ -70 +70 @@
     public function dismiss()
     {
-        if($this->dismissible && isset($_POST['uid']) && esc_attr($_POST['uid']) === $this->uid)
+        if($this->dismissible && isset($_POST['uid']) && sanitize_html_class($_POST['uid']) === $this->uid && check_ajax_referer($this->uid . '_dismiss', 'nonce'))
         {
-            check_ajax_referer($this->uid . '_dismiss', 'nonce');
             $this->dismissed = true;
             //If the message was dismissed, update the transient for 30 days
@@ -91 +90 @@
             }
             wp_enqueue_script('mtekk_adminkit_messages');
-            printf('<div class="notice notice-%1$s is-dismissible"><p>%2$s</p><meta property="uid" content="%3$s"><meta property="nonce" content="%4$s"></div>', esc_attr($this->type), $this->contents, esc_attr($this->uid), wp_create_nonce($this->uid . '_dismiss'));
+            printf('<div class="notice notice-%1$s is-dismissible"><p>%2$s</p><meta property="uid" content="%3$s"><meta property="nonce" content="%4$s"></div>', esc_attr($this->type),  wp_kses_post($this->contents), esc_attr($this->uid), esc_attr(wp_create_nonce($this->uid . '_dismiss')));
         }
         else
         {
-            printf('<div class="notice notice-%1$s"><p>%2$s</p></div>', esc_attr($this->type), $this->contents);
+            printf('<div class="notice notice-%1$s"><p>%2$s</p></div>', esc_attr($this->type), wp_kses_post($this->contents));
         }
     }

breadcrumb-navxt/trunk/includes/adminKit/setting/class-mtekk_adminkit_setting_string.php

@@ -48 +48 @@
             return $this->value;
         }
-        return esc_html($new_value);
+        return sanitize_text_field($new_value);
     }
     /**

breadcrumb-navxt/trunk/includes/blocks/build/breadcrumb-trail/block.json

@@ -75 +75 @@
   },
   "usesContext": [
-    "groupId"
+    "postId"
   ],
   "selectors": {

breadcrumb-navxt/trunk/includes/blocks/build/breadcrumb-trail/render.php

@@ -14 +14 @@
     return;
 }
-//Handle previews
-if(isset($_REQUEST['post_id']))
+//Handle in-editor previews, function check to prevent requiring WP6.5
+if(function_exists('wp_is_serving_rest_request') && wp_is_serving_rest_request() && current_user_can('read_post', absint($block->context['postId'])))
 {
-    $post_id = $_REQUEST['post_id'];
-    $preview_post = get_post($post_id);
+    $preview_post = get_post(absint($block->context['postId']));
     if($attributes['format'] === 'list')
     {
@@ -29 +28 @@
         $outer_template = '%1$s';
     }
-    $trail_string = $GLOBALS['breadcrumb_navxt']->_display_post($preview_post, true, $attributes['link'], $attributes['reverseOrder'], $attributes['ignoreCache'], $template, $outer_template);
+    $trail_string_safe = $GLOBALS['breadcrumb_navxt']->_display_post($preview_post, true, $attributes['link'], $attributes['reverseOrder'], $attributes['ignoreCache'], $template, $outer_template);
 }
 else if($attributes['format'] === 'list')
 {
-    $trail_string = bcn_display_list(true, $attributes['link'], $attributes['reverseOrder'], $attributes['ignoreCache']);
+    $trail_string_safe = bcn_display_list(true, $attributes['link'], $attributes['reverseOrder'], $attributes['ignoreCache']);
 }
 else
 {
-    $trail_string = bcn_display(true, $attributes['link'], $attributes['reverseOrder'], $attributes['ignoreCache']);
+    $trail_string_safe = bcn_display(true, $attributes['link'], $attributes['reverseOrder'], $attributes['ignoreCache']);
 }
 if($attributes['format'] === 'list')
@@ -44 +43 @@
 <span><?php echo wp_kses_post($attributes['pretext']);?></span>
 <ol <?php echo wp_kses_data( get_block_wrapper_attributes( array('class' => 'breadcrumbs') ) );?>>
-    <?php echo $trail_string; ?>
+    <?php echo $trail_string_safe; ?>
 </ol>
 <?php 
@@ -60 +59 @@
 );?>>
     <span><?php echo wp_kses_post($attributes['pretext']);?></span>
-    <?php echo $trail_string;?>
+    <?php echo $trail_string_safe;?>
 </nav>
 <?php
@@ -77 +76 @@
 );?>>
     <span><?php echo wp_kses_post($attributes['pretext']);?></span>
-    <?php echo $trail_string;?>
+    <?php echo $trail_string_safe;?>
 </div>
 <?php
@@ -91 +90 @@
 );?>>
     <span><?php echo wp_kses_post($attributes['pretext']);?></span>
-    <?php echo $trail_string; ?>
+    <?php echo $trail_string_safe; ?>
 </div>
 <?php
@@ -104 +103 @@
 );?>>
     <span><?php echo wp_kses_post($attributes['pretext']);?></span>
-    <?php echo $trail_string; ?>
+    <?php echo $trail_string_safe; ?>
 </div>
 <?php

breadcrumb-navxt/trunk/options_upgrade.php

@@ -24 +24 @@
     function bcn_phpold()
     {
-        printf('<div class="notice notice-error"><p>' . __('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', phpversion(), '5.3.0');
+        /* translators: %1$s: User's version of PHP, %2$s: Breadcrmb NavXT minimuum PHP version */
+        printf('<div class="notice notice-error"><p>' . esc_html__('Your PHP version is too old, please upgrade to a newer version. Your version is %1$s, Breadcrumb NavXT requires %2$s', 'breadcrumb-navxt') . '</p></div>', esc_html(phpversion()), '7.0.0');
     }
     //If we are in the admin, let's print a warning then return

breadcrumb-navxt/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 5.8
 Tested up to: 6.9
-Stable tag: 7.5.0
+Stable tag: 7.5.1
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -50 +50 @@
 
 == Changelog ==
+= 7.5.1 =
+Release date: December, 21st 2025
+
+* Behavior change: Removed deprecated `bcn_li_attributes` filter.
+* Bug fix: Fixed issue where the block could be used to generate breadcrumb trails that were not for the current resource.
+* Bug fix: Removed deprecated title length setting from settings page.
+* Bug fix: Fixed issue where XML settings import did not properly validate imported settings.
+
 = 7.5.0 =
 Release date: December, 4th 2025