Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed for associative array of roles #27

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed for associative array of roles #27

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e863167
Fixed for associative array of roles
Nov 5, 2018
48b4b3b
Fixed blank array for $network_roles
Nov 5, 2018
aeaaa5e
Fixed spacing to pass travis
Nov 5, 2018
35fafed
restore_current_blog() to force it back to the orginating blog.
Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions inc/namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,8 @@ function map_user_roles( $user, array $attributes ) {
// Manage super admin flag
if ( is_sso_enabled_network_wide() ) {
if ( isset( $roles['network'] ) && in_array( 'superadmin', $roles['network'], true ) ) {
$roles = array_diff( $roles['network'], [ 'superadmin' ] );
// $roles = array_diff( $roles['network'], [ 'superadmin' ] );
// Had to remove this line. It removes the $roles['sites'] from the array. Cant have that as we have Super Admins who are also specific roles in specific sites.

if ( ! is_super_admin( $user->ID ) ) {
grant_super_admin( $user->ID );
Expand All @@ -496,9 +497,18 @@ function map_user_roles( $user, array $attributes ) {
$user->for_site( $site_id );
$user->set_role( reset( $site_roles ) );

foreach ( array_slice( $site_roles, 1 ) as $role ) {
$user->add_role( $role );
foreach ( $site_roles as $role ) {
// modified to include multiple roles per site. Our sites included multiple roles in an associative array.
if ( is_array( $role ) ) {
foreach ( $role as $r ) {
$user->add_role( $r );
}
} else {
$user->add_role( $role );
}
}
// Switch back to original blog in the situation where the user has multiple blogs.
restore_current_blog();
}
} elseif ( ! isset( $roles['sites'] ) && isset( $roles['network'] ) ) {
$all_site_ids = new \WP_Site_Query( [
Expand Down Expand Up @@ -721,7 +731,8 @@ function get_user_roles_from_sso( \WP_User $user, array $attributes ) {
}

if ( is_sso_enabled_network_wide() ) {
$network_roles = [];
// $network_roles = [];
// removed because it's not previously named and breaks if you have $roles['sites'] and $roles['network'] in the same array. Keys are not numeric.

// If this is a multisite, the roles array may contain a 'network' key and a 'sites' key. Otherwise, if
// it is a flat array, use it to add the roles for all sites
Expand Down