Stabilize sub-menus

Author: otrok7

admin/class-bmltenabled-admin.php

@@ -10,17 +10,19 @@
 class BmltEnabled_Admin
 {
     private bool $menu_created = false;
+    private string $slug;
     /**
      * Initialize the class and set its properties.
      *
      * @since 2.8.0
      * @param string    $plugin_name       The name of this plugin.
      * @param string    $version    The version of this plugin.
      */
-    public function __construct()
+    public function __construct($slug)
     {
+        $this->slug = $slug;
     }
-    public function createdMenu()
+    public function createMenu()
     {
         $this->menu_created = true;
     }
@@ -33,18 +35,16 @@ function admin_menu_link()
         if (!current_user_can($cap)) {
             $cap = 'manage_bread';
         }
-        $slugs = apply_filters('BmltEnabled_Slugs', []);
         $icon = apply_filters("BmltEnabled_IconSVG", 'dashicons-location-alt');
-        $slug = $slugs[0];
         add_menu_page(
             'Meeting Lists',
             'Meeting Lists',
             $cap,
-            $slug,
+            $this->slug,
             '',
             $icon,
             null
         );
-        do_action('BmltEnabled_Submenu', $slug);
+        do_action('BmltEnabled_Submenu', $this->slug);
     }
 }

admin/class-bread-admin.php

@@ -44,6 +44,7 @@ class Bread_Admin
      */
     var $bmltEnabled_admin;
     private Bread $bread;
+    private string $hook;
     public function __construct($plugin_name, $version, $bmltEnabled_admin, $bread)
     {
         $this->plugin_name = $plugin_name;
@@ -62,7 +63,7 @@ public function get_bread_instance(): Bread
      */
     public function enqueue_styles($hook)
     {
-        if (!str_ends_with($hook, 'page_class-bread-admin')) {
+        if (!str_ends_with($hook, $this->hook)) {
             return;
         }
         wp_enqueue_style("jquery-ui", plugin_dir_url(__FILE__) . "css/jquery-ui.min.css", false, "1.2", 'all');
@@ -81,7 +82,7 @@ public function enqueue_styles($hook)
      */
     public function enqueue_scripts($hook)
     {
-        if (!str_ends_with($hook, 'page_class-bread-admin')) {
+        if (!str_ends_with($hook, $this->hook)) {
             return;
         }
         wp_enqueue_script('common');
@@ -431,28 +432,20 @@ function get($url, $cookies = array())
         }
         return wp_remote_get($url, $args);
     }
-    function submenu_slug($slugs)
-    {
-        $this->bmltEnabled_admin->createdMenu();
-        if (!is_array($slugs)) {
-            $slugs = array();
-        }
-        $slugs[] = basename(__FILE__);
-        return $slugs;
-    }
     /**
      * @desc Adds the options sub-panel
      */
     function admin_submenu_link($parent_slug)
     {
         activate_bread();
-        global $my_admin_page;
-        $my_admin_page = add_submenu_page(
+        $this->bmltEnabled_admin->createMenu();
+
+        $this->hook = add_submenu_page(
             $parent_slug,
             'Printable Meeting Lists',
             'Printable Meeting Lists',
             'manage_bread',
-            basename(__FILE__),
+            'bmlt-enabled-bread',
             array(&$this, 'admin_options_page'),
             2
         );

includes/class-bread.php

@@ -485,15 +485,14 @@ private function set_locale()
      */
     private function define_admin_hooks()
     {
-        $bmltenabled_admin = new BmltEnabled_Admin();
+        $bmltenabled_admin = new BmltEnabled_Admin('bmlt-enabled-bread');
         $plugin_admin = new Bread_Admin($this->get_plugin_name(), $this->get_version(), $bmltenabled_admin, $this);
 
         $this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
         $this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
         $this->loader->add_action("admin_menu", $bmltenabled_admin, "admin_menu_link");
         $this->loader->add_action("BmltEnabled_Submenu", $plugin_admin, "admin_submenu_link");
-        $this->loader->add_filter("BmltEnabled_Slugs", $plugin_admin, "submenu_slug");
         $this->loader->add_filter('tiny_mce_before_init', $plugin_admin, 'tiny_tweaks');
         $this->loader->add_filter('mce_external_plugins', $plugin_admin, 'my_custom_plugins');
         $this->loader->add_filter('mce_buttons', $plugin_admin, 'my_register_mce_button');