Changeset 3115930

Timestamp:

07/10/2024 11:15:36 PM (17 months ago)

Author:

majick

Message:

trunk release commit

Location:

adminsanity/trunk

Files:

• adminsanity.php (modified) (1 diff)
• adminsanity/adminsanity-bar.php (modified) (9 diffs)
• adminsanity/adminsanity-menu.php (modified) (26 diffs)
• adminsanity/adminsanity-notices.php (modified) (8 diffs)
• loader.php (modified) (78 diffs)
• readme.md (added)
• readme.txt (modified) (2 diffs)

adminsanity/trunk/adminsanity.php

@@ -5 +5 @@
 Plugin URI: https://wpmedic.tech/adminsanity/
 Description: Add Sanity back to your WordPress Admin Area.
-Version: 1.0.2
+Version: 1.0.3
 Author: Tony Hayes
 Author URI: https://wpmedic.tech

adminsanity/trunk/adminsanity/adminsanity-bar.php

@@ -59 +59 @@
 }
 
+// 1.0.3: bug out if on WordPress.Com (custom/no admin bar)
+if ( defined( 'WPCOMSH_VERSION' ) ) {
+    return;
+}
+
 // --- get frontend override setting ---
 // 0.9.9: added frontend override setting
 if ( !is_admin() ) {
     $frontend = true;
-    // 1.0.1: fix to frontent constant (remove CYCLER_)
+    // 1.0.1: fix to frontend constant (remove CYCLER_)
     if ( defined( 'ADMINSANITY_BAR_FRONTEND' ) ) {
         $frontend = (bool) ADMINSANITY_BAR_FRONTEND;
@@ -86 +91 @@
 // 1.0.1: use return instead of function wrapper
 if ( !function_exists( 'adminsanity_bar_default' ) ) {
+
+// note: unlike menu/notices, loader is not needed for scripts/styles
+// as they are already hooked to admin bar rendering actions
 
 
@@ -156 +164 @@
 // Current Screen Fix
 // ------------------
-// since admin_bar_init is hooked to admin_init, current screen object is not loaded
+// since admin_bar_init is hooked to admin_init, current screen object is not yet loaded
 // which gives current_screen->base property not exists errors in wp_admin_bar_edit_menu (/wp-includes/admin-bar.php)
 // ...so this duplicates admin.php current screen initialization to fix that (yeesh)
@@ -171 +179 @@
     $current_screen = get_current_screen();
     if ( $adminsanity['bar-debug'] ) {
-        echo '<span id="current-screen-test" style="display:none;">Current Screen A:' . esc_html( print_r( $current_screen, true ) ) . '</span>' . "\n";
+        echo '<span class="current-screen-test" style="display:none;">Current Screen A:' . esc_html( print_r( $current_screen, true ) ) . '</span>' . "\n";
     }
     if ( !is_object( $current_screen ) || !property_exists( $current_screen, 'base' ) ) {
-        global $pagenow;
+        
+        global $pagenow, $page_hook, $typenow;
+        // 1.0.3: fix to set global for plugin_page and hook_suffix ?
+        // global $plugin_page, $hook_suffix;
         if ( isset( $_GET['page'] ) ) {
             // 1.0.0: use sanitize_title on GET value
@@ -192 +203 @@
             $typenow = '';
         }
+
         if ( isset( $plugin_page ) ) {
             if ( !empty( $typenow ) ) {
@@ -198 +210 @@
                 $the_parent = $pagenow;
             }
-            if ( ! $page_hook = get_plugin_page_hook( $plugin_page, $the_parent ) ) {
+            if ( !$page_hook = get_plugin_page_hook( $plugin_page, $the_parent ) ) {
                 $page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );
             }
             unset( $the_parent );
         }
+
         $hook_suffix = '';
         if ( isset( $page_hook ) ) {
@@ -212 +225 @@
         }
 
+        if ( $adminsanity['bar-debug'] ) {
+            echo '<span style="display:none;">Hook Suffix: ' . $hook_suffix . '</span>' . "\n";
+            echo '<span style="display:none;">Pagenow: ' . $pagenow . '</span>' . "\n";
+            echo '<span style="display:none;">Plugin Page: ' . $plugin_page . '</span>' . "\n";
+            echo '<span style="display:none;">Page Hook: ' . $page_hook . '</span>' . "\n";
+        }
+    
         // --- set current screen ---
         // we cannot use function set_current_screen directly as this calls set_current_screen action
@@ -218 +238 @@
         // set_current_screen( $pagenow );
         // so instead we duplicate function WP_Screen->set_current_screen but without firing the action
-        global $current_screen, $taxnow, $typenow, $post;
-        $current_screen = WP_Screen::get( $pagenow );
-        $taxnow = $current_screen->taxonomy;
-        $typenow = $current_screen->post_type;
+        global $current_screen; // $taxnow, $typenow;
+        $current_screen = WP_Screen::get( $hook_suffix );
+        // 1.0.3: disabled these as causing some template editor problems
+        // $taxnow = $current_screen->taxonomy;
+        // $typenow = $current_screen->post_type;
+
+        if ( $adminsanity['bar-debug'] ) {
+            echo '<span style="display:none;">Taxonomy: ' . $current_screen->taxonomy . '</span>' . "\n";
+            echo '<span style="display:none;">Post Type: ' . $current_screen->post_type . '</span>' . "\n";
+        }
 
         // 1.0.2: fix for undefined post->post_type, also in wp_admin_bar_edit_menu
         // (base is now set, but post object may not yet be set on post edit pages)
         if ( 'post' == $current_screen->base ) {
+            global $post;
             $post = get_post();
             if ( !is_object( $post ) && isset( $_REQUEST['post'] ) ) {
@@ -233 +260 @@
             
     }
+
     if ( $adminsanity['bar-debug'] ) {
-        $current_screen = get_current_screen();
-        $post = get_post();
-        echo '<span id="current-screen-test" style="display:none;">Current Screen B: ' . esc_html( print_r( $current_screen, true ) ) .  '</span>' . "\n";
+        // $current_screen = get_current_screen();
+        echo '<span class="current-screen-test" style="display:none;">Current Screen B: ' . esc_html( print_r( $current_screen, true ) ) .  '</span>' . "\n";
     }
 }

adminsanity/trunk/adminsanity/adminsanity-menu.php

@@ -67 +67 @@
 // --- allow for use as an mu-plugin ---
 // 0.9.9: attempt to prevent double load conflicts
-if ( !function_exists( 'adminsanity_menu_store_default' ) ) {
+if ( !function_exists( 'adminsanity_menu_loader' ) ) {
+
+// ------------------
+// Menu Loader Action
+// ------------------
+// 1.0.3: added loader action to avoid block editor conflicts
+add_action( 'admin_menu', 'adminsanity_menu_loader', 9 );
+function adminsanity_menu_loader() {
+
+    // --- check for block editor or gutenberg plugin page ---
+    if ( function_exists( 'get_current_screen' ) ) {
+        $current_screen = get_current_screen();
+        if ( is_object( $current_screen ) && method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            return;
+        }
+    } elseif ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+        return;
+    }
+
+    // 1.0.3: enqueue scripts/styles only if admin_menu action called
+    add_action( 'admin_footer', 'adminsanity_menu_scripts', 99 );
+    add_action( 'admin_print_styles', 'adminsanity_menu_styles');
+
+    // 1.0.3: custom menu order only if admin menu action called
+    add_action( 'custom_menu_order', '__return_true', 11 );
+    add_filter( 'menu_order', 'adminsanity_menu_split_order', 20 );
+    
+}
 
 // ------------------------
@@ -76 +103 @@
 add_action( '_admin_menu', 'adminsanity_menu_store_default', 0 );
 function adminsanity_menu_store_default() {
-    global $menu, $submenu, $adminsanity;
+    global $adminsanity, $menu, $submenu;
     $adminsanity['default_menu'] = $menu;
     $adminsanity['default_submenu'] = $submenu;
@@ -84 +111 @@
 // Ordered Split Admin Menu
 // ------------------------
-add_action( 'custom_menu_order', '__return_true', 11 );
-add_filter( 'menu_order', 'adminsanity_menu_split_order', 20 );
 function adminsanity_menu_split_order( $menu_order ) {
 
@@ -191 +216 @@
     // -----------------
 
+    // --- filter menu items to move to top ---
+    // 1.0.3: added for top menu items (above mega menus)
+    $top = apply_filters( 'adminsanity_menu_top_positions', array() );
+
+    // --- filter menu items whose position to keep ---
+    $keep = apply_filters( 'adminsanity_menu_keep_positions', array() );
+
     // --- set empty split menu arrays ---
-    $menua = $menua2 = $menub = $menuc = array();
+    $menutop = $menua = $menua2 = $menub = $menuc = array();
 
     // --- loop the menu items ---
@@ -203 +235 @@
         }
 
-        // 0.9.6: remove some separators from menu order temporarily
-        // 0.9.6: check for explicit content items for menu a
-        $separators = array( 'separator1', 'separator2', 'separator-last' );
-        $contentitems = array( 'upload.php', 'link-manager.php', 'edit-comments.php' );
-        if ( $item[2] == 'separator1' ) {
-            $separator1 = array( $i => 'separator1' );
-        } elseif ( !in_array( $item[2], $separators ) ) {
-            if ( ( 'index.php' == $item[2] ) || ( strpos( $item[2], 'edit.php' ) === 0 ) ) {
-                $menua[$i] = $item[2];
-            } elseif ( in_array( $item[2], $contentitems ) ) {
-                $menua2[$i] = $item[2];
-            } elseif ( $item[2] == 'options.php' ) {
-                $menub[$i] = $item[2];
-            } elseif ( !$found ) {
-                $menuc[$i] = $item[2];
-            } else {
-                $menub[$i] = $item[2];
-            }
+        // 1.0.3: check for top menu position Items
+        if ( in_array( $item[2], $top ) ) {
+            $menutop[] = $item[2];
+        } else {
+
+            // 0.9.6: remove some separators from menu order temporarily
+            // 0.9.6: check for explicit content items for menu a
+            $separators = array( 'separator1', 'separator2', 'separator-last' );
+            $contentitems = array( 'upload.php', 'link-manager.php', 'edit-comments.php' );
+            if ( $item[2] == 'separator1' ) {
+                $separator1 = array( $i => 'separator1' );
+            } elseif ( !in_array( $item[2], $separators ) ) {
+                if ( ( 'index.php' == $item[2] ) || ( strpos( $item[2], 'edit.php' ) === 0 ) ) {
+                    $menua[$i] = $item[2];
+                } elseif ( in_array( $item[2], $contentitems ) ) {
+                    $menua2[$i] = $item[2];
+                } elseif ( $item[2] == 'options.php' ) {
+                    $menub[$i] = $item[2];
+                } elseif ( !$found ) {
+                    $menuc[$i] = $item[2];
+                } else {
+                    $menub[$i] = $item[2];
+                }
+            }
+
         }
     }
@@ -229 +268 @@
     }
     unset( $menua2 );
-
-    // --- filter menu items whose position to keep ---
-    $keep = apply_filters( 'adminsanity_menu_keep_positions', array() );
 
     // --- exception - move Settings item to top of section! ---
@@ -315 +351 @@
     if ( isset( $_GET['as-debug'] ) && in_array( $_GET['as-debug'], array( 'all', 'menu' ) ) ) {
         echo '<span style="display:none;">[AdminSanity]';
-        echo 'Menu Items A: ' . esc_html( print_r( $menua_keep, true ) ) . "\n";
-        echo 'Menu Items B: ' . esc_html( print_r( $menub_keep, true ) ) . "\n";
-        echo 'Menu Items C: ' . esc_html( print_r( $menuc_keep, true ) ) . "\n";
+        echo 'Keep Menu Items A: ' . esc_html( print_r( $menua_keep, true ) ) . "\n";
+        echo 'Keep Menu Items B: ' . esc_html( print_r( $menub_keep, true ) ) . "\n";
+        echo 'Keep Menu Items C: ' . esc_html( print_r( $menuc_keep, true ) ) . "\n";
         echo '</span>';
     }
@@ -333 +369 @@
     }
 
+    // --- debug point ---
+    // 1.0.3: update debug point output
+    if ( isset( $_GET['as-debug'] ) && in_array( $_GET['as-debug'], array( 'all', 'menu' ) ) ) {
+        echo '<span style="display:none;">[AdminSanity]';
+        echo 'Top Menu Items: ' . esc_html( print_r( $menutop, true ) ) . "\n";
+        echo 'Menu Items A: ' . esc_html( print_r( $menua, true ) ) . "\n";
+        echo 'Menu Items B: ' . esc_html( print_r( $menub, true ) ) . "\n";
+        echo 'Menu Items C: ' . esc_html( print_r( $menuc, true ) ) . "\n";
+        echo '</span>';
+    }
+    
     // --- resort split menus and merge to final menu order ---
     // 0.9.9: use single keyed array for menu items
@@ -350 +397 @@
 
     // --- debug point ---
-    // print_r( $menu_items );
+    // 1.0.3: update debug point output
+    if ( isset( $_GET['as-debug'] ) && in_array( $_GET['as-debug'], array( 'all', 'menu' ) ) ) {
+        echo '<span style="display:none;">[AdminSanity]';
+        echo 'Sorted Menu Items A: ' . esc_html( print_r( $menu_items['a'], true ) ) . "\n";
+        echo 'Sorted Menu Items B: ' . esc_html( print_r( $menu_items['b'], true ) ) . "\n";
+        echo 'Sorted Menu Items C: ' . esc_html( print_r( $menu_items['c'], true ) ) . "\n";
+        echo '</span>';
+    }
 
     // --- get meta menu setting ---
@@ -388 +442 @@
     $meta_menu_order = apply_filters( 'adminsanity_menu_meta_order', $meta_menu_order );
     if ( $meta_menu_order && is_array( $meta_menu_order ) ) {
-        $new_menu_order = array();
+        // 1.0.3: insert top menu items first
+        // $new_menu_order = array();
+        $new_menu_order = $menutop;
         foreach ( $meta_menu_order as $i => $key ) {
             $key = strtolower( $key );
@@ -409 +465 @@
         if ( isset( $_GET['as-debug'] ) && in_array( $_GET['as-debug'], array( 'all', 'menu' ) ) ) {
             echo '<span style="display:none;">[AdminSanity] Menu Order:' . esc_html( print_r( $menu_order, true ) ) . '</span>' . "\n";
+            print_r( get_defined_constants() );
         }
     }
@@ -418 +475 @@
 // Admin Menu Styles
 // -----------------
-add_action( 'admin_print_styles', 'adminsanity_menu_styles');
 function adminsanity_menu_styles() {
 
@@ -560 +616 @@
         // 0.9.9 copy other color scheme rules explicitly via javascript
         if ( 'fresh' == $scheme ) {
-            // #444444
-            $css .= '.adminsanity-menu-heading {color: #FFF;}' . "\n";
+            // 1.0.3: set background color explicitly for non-current menu heading
+            $css .= '.adminsanity-menu-heading {background-color: #1d2327; color: #FFF;}' . "\n";
             $css .= '.adminsanity-menu-wrapper.current-meta .adminsanity-menu-heading {background-color: #0073aa !important;}' . "\n";
         }
@@ -620 +676 @@
 // 0.9.6: add meta menu creation script
 // 0.9.9: add full page expanded menu creation script
-add_action( 'admin_footer', 'adminsanity_menu_scripts', 99 );
 function adminsanity_menu_scripts() {
 
@@ -770 +825 @@
         $js .= "var as_expand_menu = '" . esc_js( __( 'Expand Menu', 'adminsanity' ) ) . "'; ";
         $js .= "var as_collapse_menu = '" . esc_js( __( 'Collapse Menu', 'adminsanity' ) ) . "'; ";
-        $js .= "var as_menu_added = false; " . "\n";
+        $js .= "var as_menu_added = false; var as_menu_adding = false; var as_delayed_menu = false;" . "\n";
 
         // --- add expand menu item to admin menu ---
@@ -781 +836 @@
 
             // --- create button to expand menu page ---
-            // TODO: aria-label, aria-expanded ?
-            // <button type="button" id="expand-button" aria-label="Collapse Main menu" aria-expanded="true"
             $js .= "button = document.createElement('button');
-            button.setAttribute('type', 'button');
-            button.setAttribute('id', 'expand-button');" . "\n";
+            button.setAttribute('id', 'expand-button');
+            button.setAttribute('aria-label', as_expand_menu);
+            button.setAttribute('aria-expanded', 'false');" . "\n";
 
             // --- button icon ---
@@ -806 +860 @@
         // --- add expanded toggle function ---
         $js .= "function adminsanity_menu_toggle() {
-            if (!as_menu_added) {adminsanity_menu_load();}
+            if (!as_menu_added) {
+                if (as_menu_adding) {var as_delayed_menu = setInterval(adminsanity_menu_delayed_toggle, 500); return;}
+                else {adminsanity_menu_load();}
+            }
             if (document.getElementById('adminsanity-menu-page').style.display == 'none') {
                 document.getElementById('wpbody-content').style.display = 'none';
                 document.getElementById('adminsanity-menu-page').style.display = '';
                 document.getElementById('adminsanity-toggle-label').innerHTML = as_collapse_menu; /* 'Collapse Menu' */
+                document.getElementById('expand-button').setAttribute('aria-expanded','true');
                 /* if (jQuery('#collapse-menu').attr('aria-expanded') == 'true') {jQuery('#collapse-menu').click();} */
                 jQuery('body').addClass('folded'); jQuery('#expand-button').addClass('expanded');
-                jQuery('#adminsanity-notices-clear').prependTo('#adminsanity-menu-page');
+                /* jQuery('#adminsanity-notices-clear').prependTo('#adminsanity-menu-page');
                 jQuery('#adminsanity-notices-wrap').prependTo('#adminsanity-menu-page');
-                jQuery('#adminsanity-notices-menu').prependTo('#adminsanity-menu-page');
+                jQuery('#adminsanity-notices-menu').prependTo('#adminsanity-menu-page'); */
             } else {
                 document.getElementById('adminsanity-menu-page').style.display = 'none';
@@ -822 +880 @@
                 /* if (jQuery('#collapse-menu').attr('aria-expanded') == 'false') {jQuery('#collapse-menu').click();} */
                 jQuery('body').removeClass('folded'); jQuery('#expand-button').removeClass('expanded');
-                jQuery('#adminsanity-notices-wrap').insertAfter('#admin-top-general-notices');
+                /* jQuery('#adminsanity-notices-wrap').insertAfter('#admin-top-general-notices');
                 jQuery('#adminsanity-notices-clear').insertAfter('#admin-top-general-notices');
-                jQuery('#adminsanity-notices-menu').insertAfter('#admin-top-general-notices');
-            }
+                jQuery('#adminsanity-notices-menu').insertAfter('#admin-top-general-notices'); */
+            }
+        }" . "\n";
+
+        // --- delayed toggle cycler ---
+        // 1.0.3: added to catch delayed menu load
+        $js .= "function adminsanity_menu_delayed_toggle() {
+            if (as_menu_debug) {console.log('Waiting for expanded menu page to load...');}
+            if (as_menu_added) {clearInterval(as_delayed_menu); adminsanity_menu_toggle();}
         }" . "\n";
 
@@ -874 +939 @@
         $js .= "function adminsanity_menu_load() {" . "\n";
 
+            // 1.0.3: added check of menu added/adding flags
+            $js .= "if (as_menu_added || as_menu_adding) {return;}" . "\n";
+            $js .= "as_menu_adding = true;" . "\n";
+
             // --- set menu added flag ---
-            $js .= "as_menu_added = true;" . "\n";
             $js .= "as_menu_background = jQuery('#adminmenuwrap').css('background-color'); " . "\n";
 
             // --- create new page div ---
-            // TODO: optimize by using jQuery ?
-            $js .= "pagediv = document.createElement('div');
+            // 1.0.3: optimized page adding using jQuery
+            $js .= "menupage = jQuery('<div>').attr('id', 'adminsanity-menu-page').css('display','none');
+            menupage.prependTo('#wpbody');" . "\n";
+            // jQuery('#wpbody').append(menupage);" . "\n";
+            /* $js .= "pagediv = document.createElement('div');
             pagediv.setAttribute('id', 'adminsanity-menu-page');
             pagediv.setAttribute('style', 'display:none;');
             el = document.getElementById('wpbody');
-            el.insertBefore(pagediv, el.childNodes[0] || null);" . "\n";
+            el.insertBefore(pagediv, el.childNodes[0] || null);" . "\n"; */
 
             // --- dynamic creation of menu wrappers ---
-            // TODO: optimize menu creation using jQuery
+            // TODO: optimize menu creation using jQuery ?
             // 0.9.9: loop using key/label javascript array instead of PHP
             // $i = 0;
@@ -992 +1063 @@
             // --- fix hover styles ---
             // (color, background-color)
-            // note: ## used for exact selector match
+            // note: ## is used for exact selector match
             $selectors = array(
                 '##adminmenu li>a.menu-top:focus',
                 '##adminmenu .wp-submenu a:focus',
                 '##adminmenu .wp-submenu a:hover',
-
                 '##adminmenu a:hover',
                 '##adminmenu li.menu-top:hover',
@@ -1039 +1109 @@
             // }
 
+            // 1.0.3: move flag set to end of function
+            $js .= "as_menu_added = true; as_menu_adding = false;" . "\n";
+
         // --- close load menu function ---
         $js .= '}' . "\n";
@@ -1047 +1120 @@
     // ---------------------
     
-    $readyjs = '';
+    // --- open document ready function ---
+    $readyjs = "jQuery(document).ready(function() {" . "\n";
 
     if ( $meta_menus ) {
@@ -1100 +1174 @@
     if ( $expander ) {
 
-        // --- open document ready function ---
-        $readyjs .= "jQuery(document).ready(function() {" . "\n";
-
-
         // --- delayed auto-load of menu ---
-        $readyjs .= "setTimeout(adminsanity_menu_load, 1000);" . "\n";
+        // 1.0.3: remove autoload of expanded menu for speed (loads fine on click)
+        // $readyjs .= "setTimeout(adminsanity_menu_load, 1000);" . "\n";
 
         // --- clone admin menu item  ---
@@ -1111 +1182 @@
         $readyjs .= ".attr('id','wp-admin-bar-expand-toggle').attr('class','admin-bar-extra-menu')" . "\n";
         $readyjs .= ".attr('onclick','adminsanity_menu_toggle();').insertAfter('#wp-admin-bar-menu-toggle');" . "\n";
-
-        // --- close document ready functions ---
-        $readyjs .= "});" . "\n";
-    }
+        $readyjs .= "jQuery('#expand-button').on('mouseover', function() {adminsanity_menu_load();});" . "\n";
+
+        // 1.0.3: test collapse button remains working?
+        $readyjs .= "jQuery('#collapse-button').on('click',function(e) {
+            console.log(e);
+            /* e.preventDefault();
+            setTimeout(function() {
+                if (jQuery('body').hasClass('folded')) {
+                    jQuery('body').removeClass('folded');
+                    jQuery('#collapse-button').attr('aria-expanded','true');
+                } else {
+                    jQuery('body').addClass('folded');
+                    jQuery('#collapse-button').attr('aria-expanded','false');
+                }
+            }, 500); */
+        });" . "\n";
+
+    }
+
+    // --- close document ready functions ---
+    $readyjs .= "});" . "\n";
 
 
@@ -1315 +1403 @@
 }
 
+// -------------------------
+// Top Menu Positions Filter
+// -------------------------
+// (array of menu item names to move above megamenus automatically)
+add_filter( 'adminsanity_menu_top_positions', 'adminsanity_menu_top_positions_test', 9 );
+function adminsanity_menu_top_positions_test( $top ) {
+
+    // 1.0.3: merge in top level items for WordPress.Com
+    return array_merge( $top, array( 'https://wordpress.com/sites', site_url() ) );
+}
+
 // ---------------------------
 // Test Keep Menu Order Filter
@@ -1321 +1420 @@
 add_filter( 'adminsanity_menu_keep_positions', 'adminsanity_menu_keep_position_test', 9 );
 function adminsanity_menu_keep_position_test( $keep ) {
+    
     // note: prototasq slug is used as an example here to maintain first position (for project management)
     return array_merge( $keep, array( 'prototasq' ) );
+
 }
 

adminsanity/trunk/adminsanity/adminsanity-notices.php

@@ -44 +44 @@
 // 0.9.9: attempt to prevent double load conflicts
 // 1.0.1: use return instead of function wrapper
-if ( !function_exists( 'adminsanity_notices_message_levels' ) ) {
-
+if ( !function_exists( 'adminsanity_notices_loader' ) ) {
+
+// ---------------------
+// Notices Loader Action
+// ---------------------
+// 1.0.3: added loader action to avoid block editor conflicts
+add_action( 'admin_init', 'adminsanity_notices_loader' );
+function adminsanity_notices_loader() {
+
+    // --- check for block editor page ---
+    // 1.0.3: moved internally as flag may note have been set before admin_init
+
+    // --- enqueue scripts and styles ---
+    add_action( 'admin_print_styles', 'adminsanity_notices_styles' );
+    add_action( 'admin_footer', 'adminsanity_notices_scripts' );
+    
+}
 
 // ------------------
@@ -71 +86 @@
     // 0.9.9: added notice-error message class
     // 0.9.9: added woocmmerce message type
+    // 1.0.3: added e-notice class for elementor notices
+    // 1.0.3: change notice info label from Notice to Info
+    // 1.0.3: added woocommerce-store-alerts class
+    // 1.0.3: added amp-admin-notice class to warnings
     $mtypes = array(
         'error'          => array( 'classes' => 'notice-error error', 'label' => __( 'Errors', 'adminsanity' ) ),
         'update-nag'     => array( 'classes' => 'update-nag', 'label' => __( 'Updates', 'adminsanity' ) ),
-        'notice-warning' => array( 'classes' => 'notice-warning', 'label' => __( 'Warnings', 'adminsanity' ) ),
+        'notice-warning' => array( 'classes' => 'notice-warning amp-admin-notice', 'label' => __( 'Warnings', 'adminsanity' ) ),
         'updated'        => array( 'classes' => 'notice-success updated', 'label' => __( 'Messages', 'adminsanity' ) ),
-        'notice-info'    => array( 'classes' => 'notice-info', 'label' => __( 'Notices', 'adminsanity' ) ),
-        'commerce'       => array( 'classes' => 'woocommerce-message', 'label' => __( 'Commerce', 'adminsanity') ),
+        'notice-info'    => array( 'classes' => 'notice-info e-notice', 'label' => __( 'Info', 'adminsanity' ) ),
+        'commerce'       => array( 'classes' => 'woocommerce-message woocommerce-store-alerts', 'label' => __( 'Commerce', 'adminsanity') ),
     );
     $mtypes = apply_filters( 'adminsanity_notices_message_types', $mtypes );
@@ -138 +157 @@
     // --- notices menu ---
     // 0.9.9: add initial collapsed class
-    echo '<div id="adminsanity-notices-menu" class="postbox collapsed">';
+    // 1.0.3: change possibly conflicting postbox class
+    echo '<div id="adminsanity-notices-menu" class="adminsanity-postbox collapsed">';
 
     // --- notices menu title ---
     echo '<h3 class="adminsanity-notices-title" onclick="adminsanity_notices_toggle();">';
+        echo '<div id="adminsanity-notices-arrow">&#9662;</div>';
         echo '<div id="adminsanity-notices-label">' . esc_html( __( 'Notices', 'adminsanity' ) ) . ' &nbsp;</div>';
         echo '<div id="adminsanity-notices-count" class="adminsanity-notices-count"></div>';
-        echo '<div id="adminsanity-notices-arrow">&#9662;</div>';
     echo '</h3>';
 
@@ -201 +221 @@
 // Notices Styles
 // --------------
-add_action( 'admin_print_styles', 'adminsanity_notices_styles' );
 function adminsanity_notices_styles() {
+
+    // --- check for block editor page ---
+    // 1.0.3: moved internally as flag may note have been set by admin_init
+    if ( function_exists( 'get_current_screen' ) ) {
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            return;
+        }
+    } elseif ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+        return;
+    }
 
     // TODO: get count bubble styles for colour scheme ?
@@ -212 +242 @@
     // 0.9.9: added commerce message type tab styles
     // 0.9.9: style/float notices box like screen options/help
+    // 1.0.3: move left and re-centered vertical arrow position
     $css = "#adminsanity-notices-menu {float: left; margin-bottom: 0; min-width: auto; border-radius: 0 0 4px 4px;}
+    .adminsanity-postbox {position: relative; min-width: 255px; border: 1px solid #c3c4c7; box-shadow: 0 1px 1px rgba(0, 0, 0, .04); background: #fff;}
     #wpbody h3.adminsanity-notices-title {
-        cursor:pointer; margin: 0; padding: 2px 14px; display: inline-block; vertical-align:top;
-        color: #72777c; font-size: 14px; font-weight: normal;}
+        display: inline-block; vertical-align: top; margin: 0; padding: 2px 10px; margin-top: -3px;
+        color: #72777c; font-size: 14px; font-weight: normal; cursor: pointer;}
     #wpbody h3.adminsanity-notices-title:hover {color: #32373c;}
     #adminsanity-notices-label, #adminsanity-notices-count, #adminsanity-notices-arrow {display: inline-block; vertical-align: middle;}
-    #adminsanity-notices-arrow {font-size: 24px; line-height: 28px; color: #72777c; margin-top: -3px;}
-    #adminsanity-notices-menu.expanded #adminsanity-notices-arrow {margin-bottom: 3px;}
-    .adminsanity-notices-menu {display: none; margin: 2px 7px 0px 7px; padding: 0 1px 4px 1px; min-width: 65px; 
+    #adminsanity-notices-arrow {font-size: 24px; line-height: 28px; color: #72777c; margin-right: 5px;}
+    .adminsanity-notices-menu {display: none; margin: 2px 7px 0px 7px; padding: 0 1px 4px 1px; min-width: 75px; 
         text-align: center; font-size: 12px; line-height: 16px; border-left: 1px solid transparent; border-right: 1px solid transparent;}
-    .adminsanity-notices-menu.level {min-width: 45px; margin-top: 0px; padding-top: 4px;}
+    .adminsanity-notices-menu.level {margin-top: 0px; min-width: 55px;}
     .adminsanity-notices-menu.active {background-color: #F7F7F7; border-left: 1px solid #ccc; border-right: 1px solid #ccc;}
-    .adminsanity-notices-menu.level.active {border-top: 1px solid #ccc;}
+    .adminsanity-notices-menu.level.active {border-top: 3px solid #ccc;}
     .adminsanity-notices-menu:hover {background-color: #FAFAFA;}
     .adminsanity-notices-menu a {cursor: pointer; vertical-align: middle;}
@@ -254 +285 @@
 // Notices Scripts
 // ---------------
-add_action( 'admin_footer', 'adminsanity_notices_scripts' );
 function adminsanity_notices_scripts() {
+
+    // --- check for block editor or gutenberg plugin page ---
+    // 1.0.3: moved internally as flag may note have been set before admin_init
+    if ( function_exists( 'get_current_screen' ) ) {
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            return;
+        }
+    } elseif ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+        return;
+    }
 
     $js = '';
@@ -322 +363 @@
     // 0.9.8: fix for extra notice-success class
     // 0.9.9: fix to handle multiple classes dynamically
+    // 1.0.3: do not float right on collapse click
+    // 1.0.3: style fix to centralize up/down arrow
     $js .= "for (i = 0; i < as_notice_levels.length; i++) {
         if (as_notice_levels[i] != 'all') {
@@ -353 +396 @@
         if (jQuery('#adminsanity-notices-menu').hasClass('expanded')) {
             jQuery('#adminsanity-notices-menu').removeClass('expanded').addClass('collapsed');
-            jQuery('#adminsanity-notices-menu').css('float','right');
+            /* jQuery('#adminsanity-notices-menu').css('float','right'); */
             jQuery('#adminsanity-notices-count').show();
             jQuery('#adminsanity-notices-wrap').animate({'height':'0px'},750);
             as_notices_height = 0;
             jQuery('#adminsanity-notices-arrow').html('&#9662;');
-            jQuery('.adminsanity-notices-menu, .adminsanity-notices-menu-spacer').hide();
+            /* jQuery('.adminsanity-notices-menu, .adminsanity-notices-menu-spacer').hide(); */
+            jQuery('.adminsanity-notices-menu.level').hide();
         } else {
             jQuery('#adminsanity-notices-menu').removeClass('collapsed').addClass('expanded');
-            jQuery('#adminsanity-notices-menu').css('float','left');
+            /* jQuery('#adminsanity-notices-menu').css('float','left'); */
             jQuery('#adminsanity-notices-count').hide();
             adminsanity_notices_height(1500);
             jQuery('#adminsanity-notices-arrow').html('&#9652;');
-            jQuery('.adminsanity-notices-menu, .adminsanity-notices-menu-spacer').css('display','inline-block');
+            /* jQuery('.adminsanity-notices-menu, .adminsanity-notices-menu-spacer').css('display','inline-block'); */
+            jQuery('.adminsanity-notices-menu.level').css('display','inline-block');
         }
     }

adminsanity/trunk/loader.php

@@ -4 +4 @@
 // === Plugin Panel Loader Class ===
 // =================================
-//
+
+if ( !defined( 'ABSPATH' ) ) exit;
+
 // --------------
-// Version: 1.2.8
+// Version: 1.3.0
 // --------------
 // Note: Changelog and structure at end of file.
@@ -228 +230 @@
             if ( !isset( $args['proslug'] ) ) {
                 $proslug = $this->plugin_data( '@fs_premium_only' );
-                // 1.0.1: if more than one file, extract pro slug based on the first filename
-                if ( !strstr( $proslug, ',' ) ) {
-                    $profiles = array( $proslug );
-                    $proslug = trim( $proslug );
-                } else {
-                    $profiles = explode( ',', $proslug );
-                    $proslug = trim( $profiles[0] );
-                }
-                $args['proslug'] = substr( $proslug, 0, - 4 ); // strips .php extension
-                $args['profiles'] = $profiles;
+                // 1.3.0: check for pro slug string
+                if ( is_string( $proslug ) ) {
+                    // 1.0.1: if more than one file, extract pro slug based on the first filename
+                    if ( !strstr( $proslug, ',' ) ) {
+                        $profiles = array( $proslug );
+                        $proslug = trim( $proslug );
+                    } else {
+                        $profiles = explode( ',', $proslug );
+                        $proslug = trim( $profiles[0] );
+                    }
+                    $args['proslug'] = substr( $proslug, 0, - 4 ); // strips .php extension
+                    $args['profiles'] = $profiles;
+                }
             }
 
@@ -434 +439 @@
             // 1.0.5: use sanitize_title on request variables
             // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-            if ( sanitize_title( $_REQUEST['page'] ) != $args['slug'] ) {
+            if ( sanitize_text_field( $_REQUEST['page'] ) != $args['slug'] ) {
                 return;
             }
@@ -441 +446 @@
             }
             // phpcs:ignore WordPress.Security.NonceVerification.Missing
-            if ( 'reset' != sanitize_title( $_POST[$args['namespace'] . '_update_settings'] ) ) {
+            if ( 'reset' != sanitize_text_field( $_POST[$args['namespace'] . '_update_settings'] ) ) {
                 return;
             }
@@ -452 +457 @@
 
             // --- verify nonce ---
-            // $noncecheck = wp_verify_nonce( $_POST['_wpnonce', $args['slug'].'_update_settings' );
+            // $noncecheck = wp_verify_nonce( sanitize_text_field( $_POST['_wpnonce'] ), $args['slug'] . '_update_settings' );
             check_admin_referer( $args['slug'] . '_update_settings' );
 
@@ -482 +487 @@
             // 1.0.3: only use namespace not settings key
             // 1.0.9: check page is set and matches slug
-            if ( !isset( $_REQUEST['page'] ) || ( $_REQUEST['page'] != $args['slug'] ) ) {
+            if ( !isset( $_REQUEST['page'] ) || ( sanitize_text_field( $_REQUEST['page'] != $args['slug'] ) ) ) {
                 return;
             }
             $updatekey = $args['namespace'] . '_update_settings';
-            if ( !isset( $_POST[$updatekey] ) || ( 'yes' != $_POST[$args['namespace'] . '_update_settings'] ) ) {
+            // phpcs:ignore WordPress.Security.NonceVerification.Missing
+            if ( !isset( $_POST[$updatekey] ) || ( 'yes' != sanitize_text_field( $_POST[$args['namespace'] . '_update_settings'] ) ) ) {
                 return;
             }
@@ -497 +503 @@
 
             // --- verify nonce ---
-            // $noncecheck = wp_verify_nonce( $_POST['_wpnonce', $args['slug'].'_update_settings' );
+            // $noncecheck = wp_verify_nonce( sanitize_text_field( $_POST['_wpnonce'] ), $args['slug'] . '_update_settings' );
             check_admin_referer( $args['slug'] . '_update_settings' );
 
@@ -619 +625 @@
                         // --- text area ---
                         // 1.2.5: use sanitize_textarea_field with stripslashes
-                        $posted = isset( $_POST[$postkey] ) ? sanitize_textarea_field( stripslashes( $_POST[$postkey] ) ) : null;
+                        $posted = isset( $_POST[$postkey] ) ? sanitize_textarea_field( $_POST[$postkey] ) : null;
+                        // 1.3.0: move use of stripslashes to separate line
+                        if ( !is_null( $posted ) ) {
+                            $posted = stripslashes( $posted );
+                        }
                         $settings[$key] = $posted;
 
@@ -629 +639 @@
                         if ( !is_string( $valid ) ) {
                             $valid = 'TEXT';
+                        }
+                        $newsettings = $posted;
+
+                    } elseif ( 'email' == $type ) {
+
+                        // --- email field ---
+                        // 1.3.0: added explicitly for email field type
+                        $posted = isset( $_POST[$postkey] ) ? sanitize_text_field( $_POST[$postkey] ) : null;
+                        if ( !is_string( $valid ) ) {
+                            $valid = 'EMAIL';
                         }
                         $newsettings = $posted;
@@ -783 +803 @@
                         $settings[$key] = $posted;
 
+                    } else {
+                        
+                        // --- fallback to text type ---
+                        // 1.3.0: added for unspecified option field type
+                        $posted = isset( $_POST[$postkey] ) ? sanitize_text_field( $_POST[$postkey] ) : null;
+                        if ( !is_string( $valid ) ) {
+                            $valid = 'TEXT';
+                        }
+                        $newsettings = $posted;                     
+                        
                     }
 
@@ -795 +825 @@
                             if ( isset( $settings[$key] ) ) {
                                 // phpcs:ignore WordPress.PHP.DevelopmentFunctions
-                                echo '(Validated) ' . esc_html( print_r( $settings[$key], true ) ) . '<br>' . PHP_EOL;
+                                echo '(Validated) ' . esc_html( print_r( $settings[$key], true ) ) . '<br>' . "\n";
                             } else {
                                 echo 'No setting yet for key ' . esc_html( $key ) . '<br>' . "\n";
@@ -913 +943 @@
                     if ( count( $tabs ) > 0 ) {
                         // 1.2.5: sanitize current tab value before validating
-                        $currenttab = sanitize_title( $_POST['settingstab'] );
+                        $currenttab = sanitize_text_field( $_POST['settingstab'] );
                         if ( in_array( $currenttab, $tabs ) ) {
                             $settings['settingstab'] = $currenttab;
@@ -1353 +1383 @@
 
                 // --- output plugin info ---
-                echo '<b>' . esc_html( __( 'Plugin Name' ) ) . '</b>: ' . esc_html( $parsed['name'] ) . '<br>' . PHP_EOL;
-                // echo '<b>' . esc_html( __( 'Tags' ) ) . '</b>: ' . esc_html( implode( ', ', $parsed['tags'] ) ) . '<br>' . PHP_EOL;
-                echo '<b>' . esc_html( __( 'Requires at least' ) ) . '</b>: ' . esc_html( __( 'WordPress' ) ) . ' v' . esc_html( $parsed['requires_at_least'] ) . '<br>' . PHP_EOL;
-                echo '<b>' . esc_html( __( 'Tested up to' ) ) . '</b>: ' . esc_html( __( 'WordPress' ) ) . ' v' . esc_html( $parsed['tested_up_to'] ) . '<br>' . PHP_EOL;
+                echo '<b>' . esc_html( __( 'Plugin Name' ) ) . '</b>: ' . esc_html( $parsed['name'] ) . '<br>' . "\n";
+                // echo '<b>' . esc_html( __( 'Tags' ) ) . '</b>: ' . esc_html( implode( ', ', $parsed['tags'] ) ) . '<br>' . "\n";
+                echo '<b>' . esc_html( __( 'Requires at least' ) ) . '</b>: ' . esc_html( __( 'WordPress' ) ) . ' v' . esc_html( $parsed['requires_at_least'] ) . '<br>' . "\n";
+                echo '<b>' . esc_html( __( 'Tested up to' ) ) . '</b>: ' . esc_html( __( 'WordPress' ) ) . ' v' . esc_html( $parsed['tested_up_to'] ) . '<br>' . "\n";
                 if ( isset( $parsed['stable_tag'] ) ) {
-                    echo '<b>' . esc_html( __( 'Stable Tag' ) ) . '</b>: ' . esc_html( $parsed['stable_tag'] ) . '<br>' . PHP_EOL;
-                }
-                echo '<b>' . esc_html( __( 'Contributors' ) ) . '</b>: ' . esc_html( implode( ', ', $parsed['contributors'] ) ) . '<br>' . PHP_EOL;
+                    echo '<b>' . esc_html( __( 'Stable Tag' ) ) . '</b>: ' . esc_html( $parsed['stable_tag'] ) . '<br>' . "\n";
+                }
+                echo '<b>' . esc_html( __( 'Contributors' ) ) . '</b>: ' . esc_html( implode( ', ', $parsed['contributors'] ) ) . '<br>' . "\n";
                 // echo '<b>Donate Link</b>: <a href="' . esc_url( $parsed['donate_link'] ) . '" target="_blank">' . esc_html( $parsed['donate_link'] ) . '</a><br>';
                 // 1.2.5: use wp_kses_post on plugin short description markup
-                echo '<br>' . wp_kses_post( $parsed['short_description'] ) . '<br><br>' . PHP_EOL;
+                echo '<br>' . wp_kses_post( $parsed['short_description'] ) . '<br><br>' . "\n";
 
                 // --- output sections ---
@@ -1380 +1410 @@
                         }
                         $title = implode( ' ', $parts );
-                        echo '<h3>' . esc_html( $title ) . '</h3>' . PHP_EOL;
+                        echo '<h3>' . esc_html( $title ) . '</h3>' . "\n";
                         // 1.2.5: use wp_kses_post on readme section output
                         echo wp_kses_post( $section );
@@ -1386 +1416 @@
                 }
                 if ( isset( $parsed['remaining_content'] ) && !empty( $remaining_content ) ) {
-                    echo '<h3>' . esc_html( __( 'Extra Notes' ) ) . '</h3>' . PHP_EOL;
+                    echo '<h3>' . esc_html( __( 'Extra Notes' ) ) . '</h3>' . "\n";
                     // 1.2.5: use wp_kses_post on readme extra notes output
                     echo wp_kses_post( $parsed['remaining_content'] );
@@ -1515 +1545 @@
                     $args['contact'] = $premium;
                 }
+                if ( !isset( $args['affiliation'] ) ) {
+                    $args['affiliaation'] = false;
+                }
 
                 // --- set Freemius settings from plugin settings ---
+                // ref: https://freemius.com/help/documentation/wordpress-sdk/integrating-freemius-sdk/
                 // 1.1.1: remove admin_url wrapper on Freemius first-path value
+                // 1.3.0: added has_affiliation argument key
                 // TODO: further possible args for Freemius init (eg. bundle_id)
-                // ref: https://freemius.com/help/documentation/wordpress-sdk/integrating-freemius-sdk/
                 $first_path = add_query_arg( 'page', $args['slug'], 'admin.php' );
                 $first_path = add_query_arg( 'welcome', 'true', $first_path );
@@ -1531 +1565 @@
                     'is_org_compliant' => $args['wporg'],
                     'is_premium'       => $premium,
+                    'has_affiliation'  => $args['affiliation'],
                     'menu'             => array(
                         'slug'       => $args['slug'],
@@ -1549 +1584 @@
                 if ( $this->debug ) {
                     // phpcs:ignore WordPress.PHP.DevelopmentFunctions
-                    echo '<span style="display:none;">Freemius Settings: ' . esc_html( print_r( $settings, true ) ) . '</span>' . PHP_EOL;
+                    echo '<span style="display:none;">Freemius Settings: ' . esc_html( print_r( $settings, true ) ) . '</span>' . "\n";
                 }
                 if ( !$settings || !is_array( $settings ) ) {
@@ -1557 +1592 @@
                 // --- initialize Freemius now ---
                 $freemius = $GLOBALS[$namespace . '_freemius'] = fs_dynamic_init( $settings );
-                if ( $this->debug ) {
-                    // phpcs:ignore WordPress.PHP.DevelopmentFunctions
-                    echo '<span style="display:none;">Freemius Object: ' . esc_html( print_r( $freemius, true ) ) . '</span>' . PHP_EOL;
-                }
 
                 // --- set plugin basename ---
@@ -1571 +1602 @@
                 $this->freemius_connect();
 
+                // --- Freemius Object Debug ---
+                if ( $this->debug && current_user_can( 'manage_options' ) ) {
+                    // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+                    echo '<span style="display:none;">Freemius Object: ' . esc_html( print_r( $freemius, true ) ) . '</span>' . "\n";
+                }
+                
                 // --- fire Freemius loaded action ---
                 do_action( $args['namespace'] . '_loaded' );
@@ -1658 +1695 @@
                 // 1.0.8: check settingsmenu switch that disables automatic settings menu adding
                 if ( !isset( $args['settingsmenu'] ) || ( false !== $args['settingsmenu'] ) ) {
-                    add_options_page( $args['pagetitle'], $args['menutitle'], $args['capability'], $args['slug'], $args['namespace'] . '_settings_page' );
+                    // 1.3.0: use filtered pagetitle and menutitle
+                    add_options_page( $pagetitle, $menutitle, $args['capability'], $args['slug'], $args['namespace'] . '_settings_page' );
                 }
             }
@@ -1728 +1766 @@
                 if ( $this->debug ) {
                     // phpcs:ignore WordPress.PHP.DevelopmentFunctions
-                    echo '<span style="display:none;">Plugin Links for ' . esc_html( $file ) . ': ' . esc_html( print_r( $links, true ) ) . '</span>' . PHP_EOL;
+                    echo '<span style="display:none;">Plugin Links for ' . esc_html( $file ) . ': ' . esc_html( print_r( $links, true ) ) . '</span>' . "\n";
                 }
             }
@@ -1745 +1783 @@
             }
 
-            echo '<table style="background-color: lightYellow; border-style:solid; border-width:1px; border-color: #E6DB55; text-align:center;">' . PHP_EOL;
-                echo '<tr><td>' . PHP_EOL;
-                    echo '<div class="message" style="margin:0.25em; font-weight:bold;">' . PHP_EOL;
+            echo '<table style="background-color: lightYellow; border-style:solid; border-width:1px; border-color: #E6DB55; text-align:center;">' . "\n";
+                echo '<tr><td>' . "\n";
+                    echo '<div class="message" style="margin:0.25em; font-weight:bold;">' . "\n";
                         // 1.2.5: added wp_kses_post to message output
-                        echo wp_kses_post( $message ) . PHP_EOL;
-                    echo '</div>' . PHP_EOL;
-                echo '</td></tr>' . PHP_EOL;
-            echo '</table>' . PHP_EOL;
+                        echo wp_kses_post( $message ) . "\n";
+                    echo '</div>' . "\n";
+                echo '</td></tr>' . "\n";
+            echo '</table>' . "\n";
             if ( !$echo ) {
                 $box = ob_get_contents();
@@ -1775 +1813 @@
             // 1.0.5: use sanitize_title on request variable
             // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-            if ( substr( sanitize_title( $_REQUEST['page'] ), 0, strlen( $args['slug'] ) ) != $args['slug'] ) {
+            if ( substr( sanitize_text_field( $_REQUEST['page'] ), 0, strlen( $args['slug'] ) ) != $args['slug'] ) {
                 return;
             }
@@ -1785 +1823 @@
 
             // --- output notice box ---
-            echo '<div style="width: 98%;" id="admin-notices-box" class="postbox">' . PHP_EOL;
-            echo '<h3 class="admin-notices-title" style="cursor:pointer; margin:7px 14px; font-size:16px;" onclick="settings_toggle_notices();">' . PHP_EOL;
-            echo '<span id="admin-notices-arrow" style="font-size:24px;">&#9656;</span> &nbsp; ' . PHP_EOL;
-            echo '<span id="admin-notices-title" style="vertical-align:top;">' . esc_html( __( 'Notices' ) ) . '</span>  &nbsp; ' . PHP_EOL;
-            echo '<span id="admin-notices-count" style="vertical-align:top;"></span></h3>' . PHP_EOL;
-
-            echo '<div id="admin-notices-wrap" style="display:none";><h2 style="display:none;"></h2></div>' . PHP_EOL;
-            echo '</div>' . PHP_EOL;
+            echo '<div style="width: 98%;" id="admin-notices-box" class="postbox">' . "\n";
+            echo '<h3 class="admin-notices-title" style="cursor:pointer; margin:7px 14px; font-size:16px;" onclick="settings_toggle_notices();">' . "\n";
+            echo '<span id="admin-notices-arrow" style="font-size:24px;">&#9656;</span> &nbsp; ' . "\n";
+            echo '<span id="admin-notices-title" style="vertical-align:top;">' . esc_html( __( 'Notices' ) ) . '</span>  &nbsp; ' . "\n";
+            echo '<span id="admin-notices-count" style="vertical-align:top;"></span></h3>' . "\n";
+
+            echo '<div id="admin-notices-wrap" style="display:none";><h2 style="display:none;"></h2></div>' . "\n";
+            echo '</div>' . "\n";
 
             // --- toggle notice box script ---
@@ -1831 +1869 @@
                 // phpcs:ignore WordPress.PHP.DevelopmentFunctions
                 echo esc_html( print_r( $settings, true ) );
-                echo '<br><br>' . PHP_EOL;
+                echo '<br><br>' . "\n";
 
                 echo '<br><b>Plugin Options:</b><br>';
                 // phpcs:ignore WordPress.PHP.DevelopmentFunctions
                 echo esc_html( print_r( $this->options, true ) );
-                echo '<br><br>' . PHP_EOL;
+                echo '<br><br>' . "\n";
 
                 // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1842 +1880 @@
                     echo '<br><b>Posted Values:</b><br>';
                     // phpcs:ignore WordPress.Security.NonceVerification.Missing
-                    foreach ( $_POST as $key => $value ) {
+                    $posted = array_map( 'sanitize_text_field', $_POST );
+                    foreach ( $posted as $key => $value ) {
                         // phpcs:ignore WordPress.PHP.DevelopmentFunctions
-                        echo esc_attr( $key ) . ': ' . esc_html( print_r( $value, true ) ) . '<br>' . PHP_EOL;
+                        echo esc_html( $key ) . ': ' . esc_html( print_r( $value, true ) ) . '<br>' . "\n";
                     }
                 }
@@ -1871 +1910 @@
 
             // --- open header table ---
-            echo '<table class="plugin-settings-page-header"><tr>' . PHP_EOL;
+            echo '<table class="plugin-settings-page-header"><tr>' . "\n";
 
             // --- plugin icon ---
             // 1.1.9: add filter for plugin icon url
             $icon_url = apply_filters( $namespace . '_settings_page_icon_url', $icon_url );
-            echo '<td>' . PHP_EOL;
+            echo '<td>' . "\n";
             if ( $icon_url ) {
-                echo '<img class="plugin-settings-page-icon" src="' . esc_url( $icon_url ) . '" width="128" height="128">' . PHP_EOL;
-            }
-            echo '</td>' . PHP_EOL;
-
-            echo '<td width="20"></td><td>' . PHP_EOL;
-
-            echo '<table><tr>' . PHP_EOL;
+                echo '<img class="plugin-settings-page-icon" src="' . esc_url( $icon_url ) . '" width="128" height="128">' . "\n";
+            }
+            echo '</td>' . "\n";
+
+            echo '<td width="20"></td><td>' . "\n";
+
+            echo '<table><tr>' . "\n";
 
             // --- plugin title ---
             // 1.1.9: add filter for plugin pagetitle
-            $title = apply_filters( $namespace . '_settings_page_title', $args['title'] ) . PHP_EOL;
-            echo '<td><h3 style="font-size:20px;">' . PHP_EOL;
-            echo '<a href="' . esc_url( $args['home'] ) . '" target="_blank" style="text-decoration:none;">' . esc_html( $title ) . '</a>' . PHP_EOL;
-            echo '</h3></td>' . PHP_EOL;
-
-            echo '<td width="20"></td>' . PHP_EOL;
+            $title = apply_filters( $namespace . '_settings_page_title', $args['title'] );
+            echo '<td><h3 style="font-size:20px;">' . "\n";
+            echo '<a href="' . esc_url( $args['home'] ) . '" target="_blank" style="text-decoration:none;">' . esc_html( $title ) . '</a>' . "\n";
+            echo '</h3></td>' . "\n";
+
+            echo '<td width="20"></td>' . "\n";
 
             // --- plugin version ---
             // 1.1.9: add filter for plugin version
             $version = apply_filters( $namespace . '_settings_page_version', 'v' . $args['version'] );
-            echo '<td><h3 class="plugin-setttings-page-version">' . esc_html( $version ) . '</h3></td></tr>' . PHP_EOL;
+            echo '<td><h3 class="plugin-setttings-page-version">' . esc_html( $version ) . '</h3></td></tr>' . "\n";
 
             // --- subtitle ---
@@ -1904 +1943 @@
             $subtitle = apply_filters( $namespace . '_settings_page_subtitle', '' );
             if ( '' != $subtitle ) {
-                echo '<tr><td colspan="3" align="center">' . PHP_EOL;
-                echo '<h4 class="plugins-settings-page-subtitle" style="font-size:14px; margin-top:0;">' . esc_html( $subtitle ) . '</h4>' . PHP_EOL;
-                echo '</td></tr>' . PHP_EOL;
-            }
-
-            echo '<tr><td colspan="3" align="center">' . PHP_EOL;
-
-            echo '<table><tr><td align="center">' . PHP_EOL;
+                echo '<tr><td colspan="3" align="center">' . "\n";
+                echo '<h4 class="plugins-settings-page-subtitle" style="font-size:14px; margin-top:0;">' . esc_html( $subtitle ) . '</h4>' . "\n";
+                echo '</td></tr>' . "\n";
+            }
+
+            echo '<tr><td colspan="3" align="center">' . "\n";
+
+            echo '<table><tr><td align="center">' . "\n";
 
             // ---- plugin author ---
@@ -1917 +1956 @@
             if ( isset( $args['author_url'] ) ) {
                 echo '<font style="font-size:16px;">' . esc_html( __( 'by' ) ) . '</font> ';
-                echo '<a href="' . esc_url( $args['author_url'] ) . '" target="_blank" style="text-decoration:none;font-size:16px;" target="_blank"><b>' . esc_html( $args['author'] ) . '</b></a><br><br>' . PHP_EOL;
+                echo '<a href="' . esc_url( $args['author_url'] ) . '" target="_blank" style="text-decoration:none;font-size:16px;" target="_blank"><b>' . esc_html( $args['author'] ) . '</b></a><br><br>' . "\n";
             }
 
@@ -1951 +1990 @@
             // --- author icon ---
             if ( $author_icon_url ) {
-                echo '</td><td>' . PHP_EOL;
+                echo '</td><td>' . "\n";
 
                 // 1.0.8: check if author URL is set for link
                 if ( isset( $args['author_url'] ) ) {
-                    echo '<a href="' . esc_url( $args['author_url'] ) . '" target="_blank">' . PHP_EOL;
-                }
-                echo '<img src="' . esc_url( $author_icon_url ) . '" width="64" height="64" border="0">' . PHP_EOL;
+                    echo '<a href="' . esc_url( $args['author_url'] ) . '" target="_blank">' . "\n";
+                }
+                echo '<img src="' . esc_url( $author_icon_url ) . '" width="64" height="64" border="0">' . "\n";
                 if ( isset( $args['author_url'] ) ) {
-                    echo '</a>' . PHP_EOL;
-                }
-            }
-
-            echo '</td></tr></table>' . PHP_EOL;
-
-            echo '</td></tr></table>' . PHP_EOL;
-
-            echo '</td><td width="50"></td><td style="vertical-align:top;">' . PHP_EOL;
+                    echo '</a>' . "\n";
+                }
+            }
+
+            echo '</td></tr></table>' . "\n";
+
+            echo '</td></tr></table>' . "\n";
+
+            echo '</td><td width="50"></td><td style="vertical-align:top;">' . "\n";
 
             // --- plugin supporter links ---
             // 1.0.1: set rate/share/donate links and texts
             // 1.0.8: added filters for rate/share/donate links
-            echo '<br><div class="plugin-settings-page-links">' . PHP_EOL;
+            echo '<br><div class="plugin-settings-page-links">' . "\n";
 
             // --- Rate link ---
@@ -1990 +2029 @@
                 }
                 $rate_link = '<a href="' . esc_url( $rate_url ) . '" class="pluginlink" target="_blank">';
-                $rate_link .= '<span style="font-size:24px; color:#FC5; margin-right:10px;" class="dashicons dashicons-star-filled"></span>' . PHP_EOL;
-                $rate_link .= ' ' . esc_html( $rate_text ) . '</a><br><br>' . PHP_EOL;
+                $rate_link .= '<span style="font-size:24px; color:#FC5; margin-right:10px;" class="dashicons dashicons-star-filled"></span>' . "\n";
+                $rate_link .= ' ' . esc_html( $rate_text ) . '</a><br><br>' . "\n";
                 $rate_link = apply_filters( $args['namespace'] . '_rate_link', $rate_link, $args );
                 if ( $rate_link ) {
@@ -2033 +2072 @@
             }
 
-            echo '</div></td></tr>' . PHP_EOL;
+            echo '</div></td></tr>' . "\n";
 
             // --- output updated and reset messages ---
@@ -2039 +2078 @@
             if ( isset( $_GET['updated'] ) ) {
                 // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-                $updated = sanitize_title( $_GET['updated'] );
+                $updated = sanitize_text_field( $_GET['updated'] );
                 if ( 'yes' == $updated ) {
                     $message = $settings['title'] . ' ' . __( 'Settings Updated.' );
@@ -2048 +2087 @@
                 }
                 if ( isset( $message ) ) {
-                    echo '<tr><td></td><td></td><td align="center">' . PHP_EOL;
+                    echo '<tr><td></td><td></td><td align="center">' . "\n";
                     // 1.2.5: use direct echo option for message box
                     $this->message_box( $message, true );
-                    echo '</td></tr>' . PHP_EOL;
+                    echo '</td></tr>' . "\n";
                 }
             } else {
@@ -2057 +2096 @@
                 // 1.0.5: use sanitize_title on request variable
                 // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-                if ( isset( $_REQUEST['welcome'] ) && ( 'true' == sanitize_title( $_REQUEST['welcome'] ) ) ) {
+                if ( isset( $_REQUEST['welcome'] ) && ( 'true' == sanitize_text_field( $_REQUEST['welcome'] ) ) ) {
                     // 1.2.3: skip output if welcome message argument is empty
                     if ( isset( $args['welcome'] ) && ( '' != $args['welcome'] ) ) {
@@ -2063 +2102 @@
                         // 1.2.5: use direct echo option for message box
                         $this->message_box( $args['welcome'], true );
-                        echo '</td></tr>' . PHP_EOL;
+                        echo '</td></tr>' . "\n";
                     }
                 }
             }
 
-            echo '</table><br>' . PHP_EOL;
+            echo '</table><br>' . "\n";
         }
 
@@ -2079 +2118 @@
 
             // --- open page wrapper ---
-            echo '<div id="pagewrap" class="wrap" style="width:100%;margin-right:0px !important;">' . PHP_EOL;
+            echo '<div id="pagewrap" class="wrap" style="width:100%;margin-right:0 !important;">' . "\n";
 
             do_action( $namespace . '_admin_page_top' );
@@ -2094 +2133 @@
 
             // --- close page wrapper ---
-            echo '</div>' . PHP_EOL;
+            echo '</div>' . "\n";
         }
 
@@ -2150 +2189 @@
             // --- output saved settings ---
             if ( $this->debug ) {
-                echo '<br><b>Saved Settings:</b><br>';
+                echo '<br><b>Saved Settings:</b><br>' . "\n";
                 // phpcs:ignore WordPress.PHP.DevelopmentFunctions
                 echo esc_html( print_r( $settings, true ) );
-                echo '<br><br>';
+                echo '<br><br>' . "\n";
             }
 
@@ -2209 +2248 @@
 
                 $i = 0;
-                echo '<ul id="settings-tab-buttons">' . PHP_EOL;
+                echo '<ul id="settings-tab-buttons">' . "\n";
                 foreach ( $tabs as $tab => $tablabel ) {
                     $class = 'inactive';
@@ -2217 +2256 @@
                     // 1.2.5: remove onclick attribute and use jQuery click function
                     // onclick="plugin_panel_display_tab(\'' . esc_attr( $tab ) . '\');"
-                    echo '<li id="' . esc_attr( $tab ) . '-tab-button" class="settings-tab-button ' . esc_attr( $class ) . '">' . esc_html( $tablabel ) . '</li>' . PHP_EOL;
-                    $i ++;
-                }
-                echo '</ul>' . PHP_EOL;
+                    echo '<li id="' . esc_attr( $tab ) . '-tab-button" class="settings-tab-button ' . esc_attr( $class ) . '">' . esc_html( $tablabel ) . '</li>' . "\n";
+                    $i++;
+                }
+                echo '</ul>' . "\n";
             } else {
                 $tabs = array( 'general' => __( 'General' ) );
@@ -2231 +2270 @@
             // --- start settings form ---
             // 1.2.0: remove unused prefix on settings tab name attribute
-            echo '<form method="post" id="settings-form">' . PHP_EOL;
-            echo '<input type="hidden" name="' . esc_attr( $namespace ) . '_update_settings" id="settings-action" value="yes">' . PHP_EOL;
-            echo '<input type="hidden" name="settingstab" id="settings-tab" value="' . esc_attr( $currenttab ) . '">' . PHP_EOL;
+            echo '<form method="post" id="settings-form">' . "\n";
+            echo '<input type="hidden" name="' . esc_attr( $namespace ) . '_update_settings" id="settings-action" value="yes">' . "\n";
+            echo '<input type="hidden" name="settingstab" id="settings-tab" value="' . esc_attr( $currenttab ) . '">' . "\n";
             wp_nonce_field( $args['slug'] . '_update_settings' );
 
             // --- maybe set hidden debug input ---
             if ( $this->debug ) {
-                echo '<input type="hidden" name="debug" value="yes">' . PHP_EOL;
+                echo '<input type="hidden" name="debug" value="yes">' . "\n";
             }
 
             // ---- open wrapbox ---
-            echo '<div id="wrapbox" class="postbox" style="line-height:2em;">' . PHP_EOL;
-            echo '<div class="inner" style="padding-left:20px;">' . PHP_EOL;
+            echo '<div id="wrapbox" class="postbox" style="line-height:2em;">' . "\n";
+            echo '<div class="inner" style="padding-left:20px;">' . "\n";
 
             // --- output tabbed sections ---
@@ -2254 +2293 @@
                     $class = 'active';
                 }
-                echo '<div id="' . esc_attr( $tab ) . '-tab" class="settings-tab ' . esc_attr( $class ) . '">' . PHP_EOL;
+                echo '<div id="' . esc_attr( $tab ) . '-tab" class="settings-tab ' . esc_attr( $class ) . '">' . "\n";
 
                 do_action( $namespace . '_admin_page_tab_' . $tab . '_top' );
 
-                echo '<table cellpadding="0" cellspacing="0">' . PHP_EOL;
+                echo '<table cellpadding="0" cellspacing="0">' . "\n";
 
                 if ( count( $sections ) > 0 ) {
@@ -2269 +2308 @@
                             // --- section top ---
                             // 1.2.5: fix to mismatched class setting-section-bottom
-                            echo '<tr class="setting-section-top"><td colspan="5">' . PHP_EOL;
+                            echo '<tr class="setting-section-top"><td colspan="5">' . "\n";
                             // 1.2.5: use do_action directly instead of using stored output
                             do_action( $namespace . '_admin_page_section_' . $section . '_top' );
-                            echo '</td></tr>' . PHP_EOL;
+                            echo '</td></tr>' . "\n";
 
                             // --- section heading ---
                             if ( !isset( $sectionheadings[$section] ) ) {
-                                echo '<tr class="setting-section">' . PHP_EOL;
-                                echo '<td colspan="5"><h3>' . esc_html( $sectionlabel ) . '</h3></td>' . PHP_EOL;
-                                echo '</tr>' . PHP_EOL;
+                                echo '<tr class="setting-section">' . "\n";
+                                echo '<td colspan="5"><h3>' . esc_html( $sectionlabel ) . '</h3></td>' . "\n";
+                                echo '</tr>' . "\n";
                                 $sectionheadings[$section] = true;
                             }
@@ -2288 +2327 @@
                                 echo wp_kses( $this->setting_row( $option ), $this->allowed_html( $option ) );
                             }
-                            echo '<tr height="25"><td> </td></tr>' . PHP_EOL;
+                            echo '<tr height="25"><td> </td></tr>' . "\n";
 
                             // --- section bottom hook ---
@@ -2294 +2333 @@
                             // 1.2.5: use do_action directly instead of using stored output
                             do_action( $namespace . '_admin_page_section_' . $section . '_bottom' );
-                            echo '</td></tr>' . PHP_EOL;
+                            echo '</td></tr>' . "\n";
 
                         }
@@ -2302 +2341 @@
                     foreach ( $taboptions[$tab]['general'] as $key => $option ) {
                         $option['key'] = $key;
-                        echo '<tr height="25"><td> </td></tr>' . PHP_EOL;
+                        echo '<tr height="25"><td> </td></tr>' . "\n";
                         // 1.2.5: use wp_kses_post on setting output with custom allowed HTML
                         echo wp_kses( $this->setting_row( $option ), $this->allowed_html( $option ) );
-                        echo '<tr height="25"><td> </td></tr>' . PHP_EOL;
+                        echo '<tr height="25"><td> </td></tr>' . "\n";
                     }
                 }
@@ -2311 +2350 @@
                 // --- reset/save settings buttons ---
                 // (filtered so removable from any specific tab)
-                $buttons = '<tr height="25"><td> </td></tr>' . PHP_EOL;
-                $buttons .= '<tr><td align="center">' . PHP_EOL;
+                $buttons = '<tr height="25"><td> </td></tr>' . "\n";
+                $buttons .= '<tr><td align="center">' . "\n";
                 // 1.2.5: remove reset onclick attribute
-                $buttons .= '<input type="button" id="settingsresetbutton" class="button-secondary settings-button" value="' . esc_attr( __( 'Reset Settings' ) ) . '">' . PHP_EOL;
-                $buttons .= '</td><td colspan="3"></td><td align="center">' . PHP_EOL;
-                $buttons .= '<input type="submit" class="button-primary settings-button" value="' . esc_attr( __( 'Save Settings' ) ) . '">' . PHP_EOL;
-                $buttons .= '</td></tr>' . PHP_EOL;
-                $buttons .= '<tr height="25"><td></td></tr>' . PHP_EOL;
+                $buttons .= '<input type="button" id="settingsresetbutton" class="button-secondary settings-button" value="' . esc_attr( __( 'Reset Settings' ) ) . '">' . "\n";
+                $buttons .= '</td><td colspan="3"></td><td align="center">' . "\n";
+                $buttons .= '<input type="submit" class="button-primary settings-button" value="' . esc_attr( __( 'Save Settings' ) ) . '">' . "\n";
+                $buttons .= '</td></tr>' . "\n";
+                $buttons .= '<tr height="25"><td></td></tr>' . "\n";
                 $buttons = apply_filters( $namespace . '_admin_save_buttons', $buttons, $tab );
                 if ( $buttons ) {
@@ -2326 +2365 @@
 
                 // --- close table ---
-                echo '</table>' . PHP_EOL;
+                echo '</table>' . "\n";
 
                 // --- do below tab action ---
@@ -2332 +2371 @@
 
                 // --- close tab output ---
-                echo '</div>' . PHP_EOL;
+                echo '</div>' . "\n";
 
                 $i++;
@@ -2338 +2377 @@
 
             // --- close wrapbox ---
-            echo '</div></div>' . PHP_EOL;
+            echo '</div></div>' . "\n";
 
             // --- close settings form ---
-            echo '</form>' . PHP_EOL;
+            echo '</form>' . "\n";
 
             // --- enqueue settings resources ---
@@ -2499 +2538 @@
 
             // --- prepare row output ---
-            $row = '<tr class="settings-row">' . PHP_EOL;
-
-            $row .= '<td class="settings-label">' . $option['label'] . PHP_EOL;
+            $row = '<tr class="settings-row">' . "\n";
+
+            $row .= '<td class="settings-label">' . $option['label'] . "\n";
             if ( 'multiselect' == $type ) {
-                $row .= '<br><span>' . esc_html( __( 'Use Ctrl and Click to Select' ) ) . '</span>' . PHP_EOL;
-            }
-            $row .= '</td><td width="25"></td>' . PHP_EOL;
+                $row .= '<br><span>' . esc_html( __( 'Use Ctrl and Click to Select' ) ) . '</span>' . "\n";
+            }
+            $row .= '</td><td width="25"></td>' . "\n";
 
             // 1.0.9: added multiple cell spanning note type
             if ( ( 'note' == $type ) || ( 'info' == $type ) || ( 'helper' == $type ) ) {
 
-                $row .= '<td class="settings-helper" colspan="3">' . PHP_EOL;
+                $row .= '<td class="settings-helper" colspan="3">' . "\n";
                 if ( isset( $option['helper'] ) ) {
                     $row .= $option['helper'];
                 }
-                $row .= '</td>' . PHP_EOL;
+                $row .= '</td>' . "\n";
 
             } else {
@@ -2551 +2590 @@
                         if ( isset( $pro_link ) ) {
                             // 1.2.2: change text from Pro details
-                            $row .= '<a href="' . esc_url( $pro_link ) . '"' . $pro_target . '>' . esc_html( __( 'Details' ) ) . '</a>' . PHP_EOL;
+                            // 1.3.0: add hash link anchor for Pro feature options
+                            $option_anchor = str_replace( '_', '-', $option['key'] );
+                            $row .= '<a href="' . esc_url( $pro_link ) . '#' . esc_attr( $option_anchor ) . '"' . $pro_target . '>' . esc_html( __( 'Details' ) ) . '</a>' . "\n";
                         }
                     } else {
                         $row .= esc_html( __( 'Coming soon in Pro version!' ) );
                     }
-                    $row .= '</td>' . PHP_EOL;
+                    $row .= '</td>' . "\n";
 
                 } else {
 
-                    $row .= '<td class="settings-input">' . PHP_EOL;
+                    $row .= '<td class="settings-input">' . "\n";
 
                     // --- maybe prepare special options ---
@@ -2569 +2610 @@
 
                             $posttype = strtolower( substr( $option['options'], 0, 4 ) );
-                            if ( ( ( 'page' == $posttype ) && !isset( $pageoptions ) )
-                                || ( ( 'post' == $posttype ) && !isset( $postoptions ) ) ) {
+                            if ( ( ( 'page' == $posttype ) && !isset( $pageoptions ) ) || ( ( 'post' == $posttype ) && !isset( $postoptions ) ) ) {
+
                                 global $wpdb;
-                                $query = "SELECT ID,post_title,post_status FROM " . $wpdb->prefix . "posts";
-                                $query .= " WHERE post_type = %s AND post_status != 'auto-draft'";
-                                // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-                                $query = $wpdb->prepare( $query, $posttype );
-                                // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-                                $results = $wpdb->get_results( $query, ARRAY_A );
+                                $results = $wpdb->get_results( $wpdb->prepare( "SELECT ID,post_title,post_status FROM " . $wpdb->prefix . "posts WHERE post_type = %s AND post_status != 'auto-draft'", $posttype ), ARRAY_A );
 
                                 // 1.2.7: fix by moving page/post options variable here
-                                $pageoptions = $postoptions = array( '' => '' );
+                                // 1.3.0: check separately to avoid overwriting existing options
+                                if ( !isset( $pageoptions ) ) {
+                                    $pageoptions = array( '' => '' );
+                                }
+                                if ( !isset( $postoptions ) ) {
+                                    $postoptions = array( '' => '' );
+                                }
                                 if ( $results && ( count( $results ) > 0 ) ) {
                                     foreach ( $results as $result ) {
@@ -2656 +2698 @@
                             }
                             $useroptions = array( '' => '' );
+
                             global $wpdb;
-                            $query = "SELECT ID,user_login,display_name FROM " . $wpdb->prefix . "users";
                             // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-                            $results = $wpdb->get_results( $query, ARRAY_A );
+                            $results = $wpdb->get_results( "SELECT ID,user_login,display_name FROM " . $wpdb->prefix . "users", ARRAY_A );
                             if ( $results && ( count( $results ) > 0 ) ) {
                                 foreach ( $results as $result ) {
@@ -2689 +2731 @@
                         $checked = ( $setting == $option['value'] ) ? ' checked="checked"' : '';
                         $row .= '<label for="' . esc_attr( $name ) . '" class="setting-toggle">';
-                        $row .= '<input type="checkbox" name="' . esc_attr( $name ) . '" class="setting-toggle" value="' . esc_attr( $option['value'] ) . '"' . $checked . '>' . PHP_EOL;
-                        $row .= '<span class="setting-slider round"></span>' . PHP_EOL;
-                        $row .= '</label>' . PHP_EOL;
+                        $row .= '<input type="checkbox" name="' . esc_attr( $name ) . '" class="setting-toggle" value="' . esc_attr( $option['value'] ) . '"' . $checked . '>' . "\n";
+                        $row .= '<span class="setting-slider round"></span>' . "\n";
+                        $row .= '</label>' . "\n";
                         if ( isset( $option['suffix'] ) ) {
                             $row .= ' ' . $option['suffix'];
@@ -2704 +2746 @@
                         }
                         $checked = ( $setting == $option['value'] ) ? ' checked="checked"' : '';
-                        $row .= '<input type="checkbox" name="' . esc_attr( $name ) . '" class="setting-checkbox" value="' . esc_attr( $option['value'] ) . '"' . $checked . '>' . PHP_EOL;
+                        $row .= '<input type="checkbox" name="' . esc_attr( $name ) . '" class="setting-checkbox" value="' . esc_attr( $option['value'] ) . '"' . $checked . '>' . "\n";
                         if ( isset( $option['suffix'] ) ) {
                             $row .= ' ' . $option['suffix'];
@@ -2718 +2760 @@
                                 $checked = ' checked="checked"';
                             }
-                            $checkboxes[] = '<input type="checkbox" name="' . esc_attr( $name ) . "-" . esc_attr( $key ) . '" class="setting-checkbox" value="yes"' . $checked . '> ' . esc_html( $label ) . PHP_EOL;
+                            $checkboxes[] = '<input type="checkbox" name="' . esc_attr( $name ) . "-" . esc_attr( $key ) . '" class="setting-checkbox" value="yes"' . $checked . '> ' . esc_html( $label ) . "\n";
                         }
                         $row .= implode( '<br>', $checkboxes );
@@ -2728 +2770 @@
                         foreach ( $option['options'] as $value => $label ) {
                             $checked = ( $setting == $value ) ? ' checked="checked"' : '';
-                            $radios[] = '<input type="radio" class="setting-radio" name="' . esc_attr( $name ) . "' value='" . esc_attr( $value ) . '"' . $checked . '> ' . esc_html( $label ) . PHP_EOL;
+                            $radios[] = '<input type="radio" class="setting-radio" name="' . esc_attr( $name ) . "' value='" . esc_attr( $value ) . '"' . $checked . '> ' . esc_html( $label ) . "\n";
                         }
                         $row .= implode( '<br>', $radios );
@@ -2735 +2777 @@
 
                         // --- select dropdown ---
-                        $row .= '<select class="setting-select" name="' . esc_attr( $name ) . '">' . PHP_EOL;
+                        $row .= '<select class="setting-select" name="' . esc_attr( $name ) . '">' . "\n";
                         foreach ( $option['options'] as $value => $label ) {
                             // 1.0.9: support option grouping (set unique key containing OPTGROUP-)
                             if ( strstr( $value, '*OPTGROUP*' ) ) {
-                                $row .= '<optgroup label="' . esc_attr( $label ) . '">' . esc_html( $label ) . '</optgroup>' . PHP_EOL;
+                                $row .= '<optgroup label="' . esc_attr( $label ) . '">' . esc_html( $label ) . '</optgroup>' . "\n";
                             } else {
                                 // 1.1.3: remove strict value checking
@@ -2746 +2788 @@
                                     $row .= ' selected="selected"';
                                 }
-                                $row .= '>' . esc_html( $label ) . '</option>' . PHP_EOL;
+                                $row .= '>' . esc_html( $label ) . '</option>' . "\n";
                             }
                         }
@@ -2757 +2799 @@
 
                         // --- multiselect dropdown ---
-                        $row .= '<select multiple="multiple" class="setting-select" name="' . esc_attr( $name ) . '[]">' . PHP_EOL;
+                        $row .= '<select multiple="multiple" class="setting-select" name="' . esc_attr( $name ) . '[]">' . "\n";
                         foreach ( $option['options'] as $value => $label ) {
                             if ( '' != $value ) {
                                 // 1.1.3: check for OPTGROUP instead of *OPTGROUP*
                                 if ( strstr( $value, 'OPTGROUP' ) ) {
-                                    $row .= '<optgroup label="' . esc_attr( $label ) . '">' . PHP_EOL;
+                                    $row .= '<optgroup label="' . esc_attr( $label ) . '">' . "\n";
                                 } else {
-                                    if ( is_array( $setting ) && in_array( $value, $setting ) ) {
-                                        $selected = ' selected="selected"';
-                                    } else {
-                                        $selected = '';
-                                    }
-                                    $row .= '<option value="' . esc_attr( $value ) . '"' . $selected . ">" . esc_html( $label ) . '</option>' . PHP_EOL;
+                                    $selected = ( is_array( $setting ) && in_array( $value, $setting ) ) ? ' selected="selected"' : '';
+                                    $row .= '<option value="' . esc_attr( $value ) . '"' . $selected . ">" . esc_html( $label ) . '</option>' . "\n";
                                 }
                             }
@@ -2793 +2831 @@
                         }
                         // 1.1.7: fix to attribute quoting output
-                        $row .= '<input type="text" name="' . esc_attr( $name ) . '" class="' . esc_attr( $class ) . '" value="' . esc_attr( $setting ) . '" placeholder="' . esc_attr( $placeholder ) . '">' . PHP_EOL;
+                        $row .= '<input type="text" name="' . esc_attr( $name ) . '" class="' . esc_attr( $class ) . '" value="' . esc_attr( $setting ) . '" placeholder="' . esc_attr( $placeholder ) . '">' . "\n";
                         if ( isset( $option['suffix'] ) ) {
                             $row .= ' ' . $option['suffix'];
@@ -2812 +2850 @@
                         }
                         // 1.2.4: added missing esc_textarea on value
-                        $row .= '<textarea class="setting-textarea" name="' . esc_attr( $name ) . '" rows="' . esc_attr( $rows ) . '" placeholder="' . esc_attr( $placeholder ) . '">' . esc_textarea( $setting ) . '</textarea>' . PHP_EOL;
+                        $row .= '<textarea class="setting-textarea" name="' . esc_attr( $name ) . '" rows="' . esc_attr( $rows ) . '" placeholder="' . esc_attr( $placeholder ) . '">' . esc_textarea( $setting ) . '</textarea>' . "\n";
 
                     } elseif ( ( 'numeric' == $type ) || ( 'number' == $type ) ) {
@@ -2840 +2878 @@
 
                         // 1.1.7: remove esc_js from onclick attributes
-                        // $onclickdown = "plugin_panel_number_step('down', '" . esc_attr( $name ) . "', " . esc_attr( $min ) . ", " . esc_attr( $max ) . ", " . esc_attr( $step ) . ");" . PHP_EOL;
-                        // $row .= '<input class="setting-button button-secondary" type="button" value="-" onclick="' . $onclickdown . '">' . PHP_EOL;
-                        $row .= '<input class="number-button number-down-button setting-button button-secondary" type="button" value="-" data="' . esc_attr( $name ) . '">' . PHP_EOL;
+                        // $onclickdown = "plugin_panel_number_step('down', '" . esc_attr( $name ) . "', " . esc_attr( $min ) . ", " . esc_attr( $max ) . ", " . esc_attr( $step ) . ");" . "\n";
+                        // $row .= '<input class="setting-button button-secondary" type="button" value="-" onclick="' . $onclickdown . '">' . "\n";
+                        $row .= '<input class="number-button number-down-button setting-button button-secondary" type="button" value="-" data="' . esc_attr( $name ) . '">' . "\n";
                         if ( isset( $option['prefix'] ) ) {
                             $row .= ' ' . $option['prefix'];
                         }
                         $data = esc_attr( $min ) . "," . esc_attr( $max ) . "," . esc_attr( $step );
-                        $row .= '<input id="number-input-' . esc_attr( $name ) . '" class="setting-numeric" type="text" name="' . esc_attr( $name ) . '" value="' . esc_attr( $setting ) . '" placeholder="' . esc_attr( $placeholder ) . '" data="' . esc_attr( $data ) . '">' . PHP_EOL;
+                        $row .= '<input id="number-input-' . esc_attr( $name ) . '" class="setting-numeric" type="text" name="' . esc_attr( $name ) . '" value="' . esc_attr( $setting ) . '" placeholder="' . esc_attr( $placeholder ) . '" data="' . esc_attr( $data ) . '">' . "\n";
                         if ( isset( $option['suffix'] ) ) {
                             $row .= ' ' . $option['suffix'];
                         }
-                        // $onclickup = "plugin_panel_number_step('up', '" . esc_attr( $name ) . "', " . esc_attr( $min ) . ", " . esc_attr( $max ) . ", " . esc_attr( $step ) . ");" . PHP_EOL;
-                        // $row .= '<input class="setting-button button-secondary" type="button" value="+" onclick="' . $onclickup . '">' . PHP_EOL;
-                        $row .= '<input class="number-button number-up-button setting-button button-secondary" type="button" value="+" data="' . esc_attr( $name ) . '">' . PHP_EOL;
+                        // $onclickup = "plugin_panel_number_step('up', '" . esc_attr( $name ) . "', " . esc_attr( $min ) . ", " . esc_attr( $max ) . ", " . esc_attr( $step ) . ");" . "\n";
+                        // $row .= '<input class="setting-button button-secondary" type="button" value="+" onclick="' . $onclickup . '">' . "\n";
+                        $row .= '<input class="number-button number-up-button setting-button button-secondary" type="button" value="+" data="' . esc_attr( $name ) . '">' . "\n";
 
 
@@ -2867 +2905 @@
                         $row .= '<div class="custom-image-container">';
                         if ( $has_image ) {
-                            $row .= '<img src="' . esc_url( $image[0] ) . '" alt="" style="max-width:100%;">' . PHP_EOL;
-                        }
-                        $row .= '</div>' . PHP_EOL;
+                            $row .= '<img src="' . esc_url( $image[0] ) . '" alt="" style="max-width:100%;">' . "\n";
+                        }
+                        $row .= '</div>' . "\n";
 
                         // --- add and remove links ---
                         $upload_link = get_upload_iframe_src( 'image' );
-                        $row .= '<p class="hide-if-no-js">' . PHP_EOL;
+                        $row .= '<p class="hide-if-no-js">' . "\n";
                             $hidden = '';
                             if ( $has_image ) {
                                 $hidden = ' hidden';
                             }
-                            $row .= '<a class="upload-custom-image' . esc_attr( $hidden ) . '" href="' . esc_url( $upload_link ) . '">' . PHP_EOL;
+                            $row .= '<a class="upload-custom-image' . esc_attr( $hidden ) . '" href="' . esc_url( $upload_link ) . '">' . "\n";
                             $row .= esc_html( __( 'Add Image' ) );
-                            $row .= '</a>' . PHP_EOL;
+                            $row .= '</a>' . "\n";
 
                             $hidden = '';
@@ -2886 +2924 @@
                                 $hidden = ' hidden';
                             }
-                            $row .= '<a class="delete-custom-image' . esc_attr( $hidden ) . '" href="#">' . PHP_EOL;
+                            $row .= '<a class="delete-custom-image' . esc_attr( $hidden ) . '" href="#">' . "\n";
                             $row .= esc_html( __( 'Remove Image' ) );
-                            $row .= '</a>' . PHP_EOL;
-                        $row .= '</p>' . PHP_EOL;
+                            $row .= '</a>' . "\n";
+                        $row .= '</p>' . "\n";
 
                         // --- hidden input for image ID ---
-                        $row .= '<input class="custom-image-id" name="' . esc_attr( $name ) . '" type="hidden" value="' . esc_attr( $setting ) . '">' . PHP_EOL;
+                        $row .= '<input class="custom-image-id" name="' . esc_attr( $name ) . '" type="hidden" value="' . esc_attr( $setting ) . '">' . "\n";
 
                     } elseif ( 'color' == $type ) {
 
                         // 1.1.7: added color picker field
-                        $row .= '<input type="text" class="color-picker" data-default-color="' . esc_attr( $option['default'] ) . '" name="' . esc_attr( $name ) . '" value="' . esc_attr( $setting ) . '">' . PHP_EOL;
+                        $row .= '<input type="text" class="color-picker" data-default-color="' . esc_attr( $option['default'] ) . '" name="' . esc_attr( $name ) . '" value="' . esc_attr( $setting ) . '">' . "\n";
 
                     } elseif ( 'coloralpha' == $type ) {
 
                         // 1.1.7: added color picker alpha field
-                        $row .= '<input type="text" class="color-picker" data-alpha-enabled="true" data-default-color="' . esc_attr( $option['default'] ) . '" name="' . esc_attr( $name ) . '" value="' . esc_attr( $setting ) . '">' . PHP_EOL;
+                        $row .= '<input type="text" class="color-picker" data-alpha-enabled="true" data-default-color="' . esc_attr( $option['default'] ) . '" name="' . esc_attr( $name ) . '" value="' . esc_attr( $setting ) . '">' . "\n";
 
                     }
@@ -2911 +2949 @@
                 // --- setting helper text ---
                 if ( isset( $option['helper'] ) ) {
-                    $row .= '<td width="25"></td>' . PHP_EOL;
-                    $row .= '<td class="settings-helper">' . esc_html( $option['helper'] ) . '</td>' . PHP_EOL;
-                }
-            }
-
-            $row .= '</tr>' . PHP_EOL;
+                    $row .= '<td width="25"></td>' . "\n";
+                    $row .= '<td class="settings-helper">' . esc_html( $option['helper'] ) . '</td>' . "\n";
+                }
+            }
+
+            $row .= '</tr>' . "\n";
 
             // --- settings row spacer ---
-            $row .= '<tr class="settings-spacer"><td> </td></tr>' . PHP_EOL;
+            $row .= '<tr class="settings-spacer"><td> </td></tr>' . "\n";
 
             // --- filter and return setting row ---
@@ -2944 +2982 @@
                         // --- output tab switcher function ---
                         // 1.2.5: changed function prefix for consistency
-                        /* echo "function plugin_panel_display_tab(tab) {" . PHP_EOL;
+                        /* echo "function plugin_panel_display_tab(tab) {" . "\n";
                         foreach ( $tabs as $tab => $label ) {
-                            echo "  document.getElementById('" . esc_js( $tab ) . "-tab-button').className = 'settings-tab-button inactive';" . PHP_EOL;
-                            echo "  document.getElementById('" . esc_js( $tab ) . "-tab').className = 'settings-tab inactive'; " . PHP_EOL;
-                        }
-                        echo "  document.getElementById(tab+'-tab-button').className = 'settings-tab-button active';" . PHP_EOL;
-                        echo "  document.getElementById(tab+'-tab').className = 'settings-tab active';" . PHP_EOL;
-                        echo "  document.getElementById('settings-tab').value = tab;" . PHP_EOL;
-                        echo "}" . PHP_EOL; */
+                            echo "  document.getElementById('" . esc_js( $tab ) . "-tab-button').className = 'settings-tab-button inactive';" . "\n";
+                            echo "  document.getElementById('" . esc_js( $tab ) . "-tab').className = 'settings-tab inactive'; " . "\n";
+                        }
+                        echo "  document.getElementById(tab+'-tab-button').className = 'settings-tab-button active';" . "\n";
+                        echo "  document.getElementById(tab+'-tab').className = 'settings-tab active';" . "\n";
+                        echo "  document.getElementById('settings-tab').value = tab;" . "\n";
+                        echo "}" . "\n"; */
 
                         // 1.2.5: use jQuery click function to remove onclick button attributes
-                        echo "jQuery('.settings-tab-button').on('click', function() {" . PHP_EOL;
-                        echo "  tab = jQuery(this).attr('id').replace('-tab-button','');" . PHP_EOL;
-                        echo "  jQuery('.settings-tab,.settings-tab-button').removeClass('active').addClass('inactive');" . PHP_EOL;
-                        echo "  jQuery('#'+tab+'-tab,#'+tab+'-tab-button').removeClass('inactive').addClass('active');" . PHP_EOL;
-                        echo "  jQuery('#settings-tab').val(tab);" . PHP_EOL;
-                        echo "});" . PHP_EOL;
+                        echo "jQuery('.settings-tab-button').on('click', function() {" . "\n";
+                        echo "  tab = jQuery(this).attr('id').replace('-tab-button','');" . "\n";
+                        echo "  jQuery('.settings-tab,.settings-tab-button').removeClass('active').addClass('inactive');" . "\n";
+                        echo "  jQuery('#'+tab+'-tab,#'+tab+'-tab-button').removeClass('inactive').addClass('active');" . "\n";
+                        echo "  jQuery('#settings-tab').val(tab);" . "\n";
+                        echo "});" . "\n";
 
                     } elseif ( 'settings_reset' == $script ) {
@@ -2968 +3006 @@
                         // 1.2.5: changed to jQuery click function to remove onclick button attribute
                         $confirmreset = __( 'Are you sure you want to reset to default settings?' );
-                        // echo "function plugin_panel_reset_defaults() {" . PHP_EOL;
-                        echo "jQuery('#settingsresetbutton').on('click', function() {" . PHP_EOL;
-                        echo "  agree = confirm('" . esc_js( $confirmreset ) . "');" . PHP_EOL;
-                        echo "  if (!agree) {return false;}" . PHP_EOL;
-                        echo "  document.getElementById('settings-action').value = 'reset';" . PHP_EOL;
-                        echo "  document.getElementById('settings-form').submit();" . PHP_EOL;
-                        echo "});" . PHP_EOL;
-                        // echo "}" . PHP_EOL;
+                        // echo "function plugin_panel_reset_defaults() {" . "\n";
+                        echo "jQuery('#settingsresetbutton').on('click', function() {" . "\n";
+                        echo "  agree = confirm('" . esc_js( $confirmreset ) . "');" . "\n";
+                        echo "  if (!agree) {return false;}" . "\n";
+                        echo "  document.getElementById('settings-action').value = 'reset';" . "\n";
+                        echo "  document.getElementById('settings-form').submit();" . "\n";
+                        echo "});" . "\n";
+                        // echo "}" . "\n";
 
                     } elseif ( 'number_step' == $script ) {
@@ -2988 +3026 @@
                             if ((max !== false) && (newvalue > parseInt(max))) {newvalue = max;}
                             document.getElementById(id).value = newvalue;
-                        }" . PHP_EOL; */
+                        }" . "\n"; */
                         // 1.2.5: replace with jQuery click function to remove onclick attributes
+                        // 1.2.9: fix for possible empty value converting to NaN
                         echo "jQuery('.number-button').on('click', function() {
                             if (jQuery(this).hasClass('number-up-button')) {multiplier = 1;}
@@ -2996 +3035 @@
                             data = jQuery('#'+idref).attr('data').split(',');
                             min = data[0]; max = data[1]; step = data[2];
-                            value = parseInt(jQuery('#'+idref).val());
+                            value = jQuery('#'+idref).val();
+                            if (value == '') {value = 0;} else {value = parseInt(value);}               
                             newvalue = value + (multiplier * parseInt(step));
                             if ((min !== false) && (newvalue < parseInt(min))) {newvalue = min;}
                             if ((max !== false) && (newvalue > parseInt(max))) {newvalue = max;}
                             jQuery('#'+idref).val(newvalue);
-                        });" . PHP_EOL;
+                        });" . "\n";
 
                     } elseif ( 'media_functions' == $script ) {
@@ -3052 +3092 @@
                             });
 
-                        });" . PHP_EOL;
+                        });" . "\n";
 
                     } elseif ( 'colorpicker_init' == $script ) {
 
                         // --- initialize color pickers ---
-                        echo "jQuery(document).ready(function(){" . PHP_EOL;
-                        echo "  if (jQuery('.color-picker').length) {jQuery('.color-picker').wpColorPicker();}" . PHP_EOL;
-                        echo "});" . PHP_EOL;
+                        echo "jQuery(document).ready(function(){" . "\n";
+                        echo "  if (jQuery('.color-picker').length) {jQuery('.color-picker').wpColorPicker();}" . "\n";
+                        echo "});" . "\n";
 
                     }
@@ -3083 +3123 @@
 
             // --- page styles ---
-            $styles[] = '#wrapbox {margin-right: 20px;}';
+            // 1.2.9: add padding to bottom of settings form
+            $styles[] = '#wrapbox {margin-right: 20px; padding-bottom: 20px;}';
 
             // --- plugin header styles ---
@@ -3118 +3159 @@
             $styles[] = '.settings-input input.setting-textarea {width:100%;}';
             $styles[] = '.settings-input select.setting-select {min-width:100px; max-width:100%;}';
-
+            
             // --- toggle input styles ---
             // Ref: https://www.w3schools.com/howto/howto_css_switch.asp
@@ -3147 +3188 @@
             $namespace = $this->namespace;
             $styles = apply_filters( $namespace . '_admin_page_styles', $styles );
-            echo "<style>";
             // 1.2.5: added wp_strip_all_tags to styles output
-            echo wp_strip_all_tags( implode( "\n", $styles ) );
-            echo "</style>";
+            // 1.3.0: use wp_kses_post on styles output
+            // echo wp_strip_all_tags( implode( "\n", $styles ) );
+            echo "<style>" . wp_kses_post( implode( "\n", $styles ) ) . "</style>";
 
         }
@@ -3469 +3510 @@
 // =========
 
+// == 1.3.0 ==
+// - fix for possible page/post options conflict
+// - added explicit email option field type
+// - added fallback to text option firld type
+// - added check if pro slug data is a string
+// - added Freemius has_affiliation key
+// - added hash link anchor for Pro feature options
+
+// == 1.2.9 ==
+// - fix empty number field converting to NaN value
+// - add bottom padding to settings form wrap box
+
 // == 1.2.8 ==
 // - fix saving non-alpha colours in coloralpha fields

adminsanity/trunk/readme.txt

@@ -4 +4 @@
 Tags: wordpress admin, admin menu, admin notices, admin bar, cleaner
 Requires at least: 4.0.0
-Tested up to: 6.1
-Stable tag: 1.0.2
+Tested up to: 6.5.5
+Stable tag: 1.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -124 +124 @@
 == Changelog ==
 
+= 1.0.3 =
+* Improved: do not load Menu/Notices on Block Editor pages
+* Fixed: removed conflicting postbox class on notifications box
+* Admin Menu: changed expanded menu autoload to on-demand load
+* Admin Menu: keep menu positions for top WordPress.Com items
+* Admin Bar: fix to conflict with post type template edit pages
+* Admin Bar: auto disable bar module on WordPress.Com
+* Admin Notices: added Elementor Notice class
+* Admin Notices: do not float right after collapse click
+
 = 1.0.2 =
 * Updates: Plugin Panel (1.2.8)