Changeset 2591584

Timestamp:

08/31/2021 03:28:42 PM (5 years ago)

Author:

danielpw

Message:

• Fixed bug that prevented a super admin of a multisite from adding themselves as a board member.
• Tested up to WordPress 5.8.

Location:

nonprofit-board-management

Files:

• assets/banner-772x250.png (modified) (previous)
• assets/icon-128x128.png (modified) (previous)
• assets/icon-256x256.png (modified) (previous)
• assets/icon.svg (modified) (1 diff)
• trunk/nonprofit-board-management.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)

nonprofit-board-management/assets/icon.svg

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
      viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
-<circle fill="#CE4B37" cx="128" cy="128" r="128"/>
-<path fill="#B3392D" d="M256,128C256,57.3,198.7,0,128,0v256C198.7,256,256,198.7,256,128z"/>
-<path fill="#FFFFFF" d="M128,74.8c-30,0-54.4,24.3-54.4,54.4S98,183.6,128,183.6s54.4-24.3,54.4-54.4S158,74.8,128,74.8z
-     M119.3,115.7c-2.1,0-3.7,0.1-3.7,1.7c0,4.6,0,18.1-0.1,23.1c0,1.6,1.8,1.9,3.7,1.9l0,3.2l-10.6,0c0,0,0.1-26.7,0.1-28.2
-    c0-1.6-1.8-1.8-3.6-1.8l0-3.1l14.2,0L119.3,115.7z M134.5,127.8c-1.2,0-3,0.1-3,1.4c0,0.8,0,10.2,0,11.8c0,1.1,0.8,1.4,1.7,1.5
-    l1.3,0v0.1l0,3.1l-13,0l0-3.1l0-0.1l1.2,0c0.9-0.1,1.7-0.4,1.8-1.2c0-2.8,0-9.4,0-11.9c0-1.5-1.6-1.6-3-1.6l0-3.1l13,0L134.5,127.8z
-     M150.8,115.8c-1.8,0-3.6,0.1-3.6,1.7c0,1.5-0.1,28.2-0.1,28.2l-10.6,0l0-3.2c1.9,0,3.7-0.3,3.7-1.9c0-5,0-18.5,0.1-23.1
-    c0-1.6-1.5-1.7-3.7-1.7l0-3.1l14.2,0L150.8,115.8z"/>
-<circle fill="#FFFFFF" cx="128.5" cy="35.4" r="15"/>
-<circle fill="#FFFFFF" cx="221" cy="128" r="15"/>
-<circle fill="#FFFFFF" cx="128.5" cy="221.1" r="15"/>
-<circle fill="#FFFFFF" cx="38.7" cy="128" r="15"/>
-<circle fill="#FFFFFF" cx="62.7" cy="63.3" r="15"/>
-<circle fill="#FFFFFF" cx="196.4" cy="63.3" r="15"/>
-<circle fill="#FFFFFF" cx="61.7" cy="195.1" r="15"/>
-<circle fill="#FFFFFF" cx="196.4" cy="195.1" r="15"/>
+<circle fill="#CE4B37" cx="128" cy="128" r="125"/>
+<path fill="#B3392D" d="M253,128C253,59,197,3,128,3v250C197,253,253,197,253,128z"/>
+<path fill="#FFFFFF" d="M128,76.1c-29.3,0-53.1,23.8-53.1,53.1s23.8,53.1,53.1,53.1s53.1-23.8,53.1-53.1S157.3,76.1,128,76.1z"/>
+<circle fill="#FFFFFF" cx="128.5" cy="37.6" r="14.6"/>
+<circle fill="#FFFFFF" cx="218.8" cy="128" r="14.6"/>
+<circle fill="#FFFFFF" cx="128.5" cy="218.9" r="14.6"/>
+<circle fill="#FFFFFF" cx="40.8" cy="128" r="14.6"/>
+<circle fill="#FFFFFF" cx="64.3" cy="64.9" r="14.6"/>
+<circle fill="#FFFFFF" cx="194.8" cy="64.9" r="14.6"/>
+<circle fill="#FFFFFF" cx="63.3" cy="193.5" r="14.6"/>
+<circle fill="#FFFFFF" cx="194.8" cy="193.5" r="14.6"/>
+<g>
+    <path fill="#CD4731" stroke="#CD4731" stroke-width="0.5769" stroke-miterlimit="10" d="M132.5,122.1c1.4-4.9,1.3-5.6-2.2-5.6v-0.6
+        h9.2v0.6c-2.6,0-4.1,0.7-5.3,5.1l-7.6,26.7l-9-23.2l-8.4,23.2h-0.2l-8.2-29.2c-0.4-1.6-1.5-2.5-4-2.5v-0.6h9.2v0.6
+        c-2.4,0-3.3,0.4-2.8,2.4l6.5,24l8.2-23.2h0.1l8.6,23.1L132.5,122.1z"/>
+    <path fill="#CD4731" stroke="#CD4731" stroke-width="0.5769" stroke-miterlimit="10" d="M147.4,118.7c0-1.7-0.7-2.2-3.9-2.2v-0.6
+        h10.1v0.6c-3.2,0-3.9,0.5-3.9,2.2v25.1c0,1.7,0.7,2.4,3.9,2.4v0.6h-10.1v-0.6c3.2,0,3.9-0.7,3.9-2.4V118.7z"/>
+</g>
 </svg>

nonprofit-board-management/trunk/nonprofit-board-management.php

@@ -5 +5 @@
 Domain Path: /languages
 Description: A simple, free way to manage your nonprofit’s board.
-Version: 1.1.16
+Version: 1.1.17
 Author: Wired Impact
 Author URI: https://wiredimpact.com/?utm_source=wordpress_admin&utm_medium=plugins_page&utm_campaign=nonprofit_board_management
@@ -60 +60 @@
         add_action( 'wp_initialize_site', array( $this, 'multisite_activate_plugin' ) );
 
-        if( is_admin() ){
-          add_action( 'wp_dashboard_setup', array( $this, 'remove_dashboard_widgets' ) );
-
-          //Setup top level menu
-          add_action( 'admin_menu', array( $this, 'create_menu' ), 10 );
-
-          //Load CSS and JS
-          add_action( 'admin_enqueue_scripts', array( $this, 'insert_css') );
-          add_action( 'admin_enqueue_scripts', array( $this, 'insert_js') );
-
-          //Add our board members dashboard widget
-          add_action('wp_dashboard_setup', array( $this, 'add_board_members_dashboard_widget' ) );
-
-          //Remove the help tabs for all board members
-          add_action( 'in_admin_header', array( $this, 'remove_help_tabs' ) );
-
-          //Add notice to admin who can't serve on board in case they want to.
-          add_action( 'admin_notices', array( $this, 'show_admins_notices' ) );
-
-          //Allow admin to click a button and start serving on the board.
-          add_action( 'wp_ajax_allow_user_to_serve', array( $this, 'allow_user_to_serve' ) );
-        }
+        if ( is_admin() ) {
+            add_action( 'wp_dashboard_setup', array( $this, 'remove_dashboard_widgets' ) );
+
+            // Setup top level menu.
+            add_action( 'admin_menu', array( $this, 'create_menu' ), 10 );
+
+            // Load CSS and JS.
+            add_action( 'admin_enqueue_scripts', array( $this, 'insert_css') );
+            add_action( 'admin_enqueue_scripts', array( $this, 'insert_js') );
+
+            // Add our board members dashboard widget.
+            add_action( 'wp_dashboard_setup', array( $this, 'add_board_members_dashboard_widget' ) );
+
+            // Remove the help tabs for all board members.
+            add_action( 'in_admin_header', array( $this, 'remove_help_tabs' ) );
+
+            // Add notice to admin who can't serve on board in case they want to.
+            add_action( 'admin_notices', array( $this, 'show_admins_notices' ) );
+
+            // Allow admin to click a button and start serving on the board.
+            add_action( 'wp_ajax_allow_user_to_serve', array( $this, 'allow_user_to_serve' ) );
+
+            // Used to check if a multisite super admin specifically has the 'serve_on_board' capability.
+            if ( is_multisite() ) {
+                add_filter( 'map_meta_cap', array( $this, 'check_serve_on_board_capability' ), 10, 3 );
+            }
+        }
 
         //Redirect board members to dashboard on login.
@@ -874 +879 @@
    }
 
+   /**
+    * This function only runs on multisites and denies the 'serve_on_board' capability
+    * if the capability isn't set.
+    *
+    * This is needed because current_user_can() will always return true if the current
+    * user is a super admin, unless specifically denied.
+    *
+    * @param array  $caps Primitive capabilities required of the user.
+    * @param string $cap Capability being checked.
+    * @param int    $user_id The user ID.
+    *
+    * @return array The filtered capabilities.
+    */
+    public function check_serve_on_board_capability( $caps, $cap, $user_id ) {
+
+        // Only filter the 'serve_on_board' capability.
+        if ( 'serve_on_board' === $cap ) {
+    
+            $user      = get_userdata( $user_id );
+            $user_caps = $user->get_role_caps();
+    
+            /**
+             * If the user does not have the capability, then add do_not_allow.
+             * Without this, a super admin in a multisite has no way of adding
+             * themselves as a Board Member.
+             */
+            if ( empty( $user_caps[ $cap ] ) ) {
+    
+                $caps[] = 'do_not_allow';
+            }
+        }
+    
+        return $caps;
+    }
+
 
    /*

nonprofit-board-management/trunk/readme.txt

@@ -3 +3 @@
 Tags: nonprofits, boards, non profits, non-profits, directors, 501c3, 501(c)3, board governance
 Requires at least: 3.0
-Tested up to: 5.7
-Stable tag: 1.1.16
+Tested up to: 5.8
+Stable tag: 1.1.17
 License: GPLv3
 License URI: http://www.gnu.org/licenses/lgpl-3.0.html
@@ -105 +105 @@
 == Changelog ==
 
+= 1.1.17 =
+* Fixed bug that prevented a super admin of a multisite from adding themselves as a board member.
+* Tested up to WordPress 5.8.
+
 = 1.1.16 =
 * Fixed the Board Member role not being available on subsites of a multisite installation if the plugin was network activated.