Fix. Settings. 2FA users roles setting fixed.

inc/spbc-settings.php

@@ -1950,7 +1950,7 @@ function spbc_field_2fa__roles()
     global $spbc, $wp_roles;
 
     $wp_roles = new WP_Roles();
-    $roles    = $wp_roles->get_names();
+    $roles    = $wp_roles->roles;
 
     echo '<div class="spbc_wrapper_field spbc_sub_setting">';
 
@@ -1969,10 +1969,12 @@ function spbc_field_2fa__roles()
          . ' size="' . (count($roles) - 1 < 6 ? count($roles) - 1 : 5) . '"'
          . '>';
 
-    foreach ($roles as $role) {
+    foreach ($roles as $role_slug => $role_details) {
+        $role_name = isset($role_details['name']) ? $role_details['name'] : esc_html__('Unknown', 'security-malware-firewall');
         echo '<option'
-             . (in_array($role, (array) $spbc->settings['2fa__roles']) ? ' selected="selected"' : '')
-             . '>' . $role . '</option>';
+             . (in_array($role_slug, (array) $spbc->settings['2fa__roles']) ? ' selected="selected"' : '')
+             . ' value="' . $role_slug . '"'
+             . '>' . $role_name . '</option>';
     }
 
     echo '</select>';

inc/spbc-tools.php

@@ -247,37 +247,14 @@ function spbc_is_user_role_in($roles, $user = false)
     }
 
     foreach ((array) $roles as $role) {
-        $role_slug = spbc_get_role_slug_by_role_name($role);
-        if (isset($user->caps[$role_slug]) || in_array($role_slug, $user->roles)) {
+        if (isset($user->caps[strtolower($role)]) || in_array(strtolower($role), $user->roles)) {
             return true;
         }
     }
 
     return false;
 }
 
-/**
- * @param string $role_name
- *
- * @return string
- */
-function spbc_get_role_slug_by_role_name($role_name)
-{
-    $wp_roles = new WP_Roles();
-    $role_slug = '';
-
-    if ( ! is_array($wp_roles->roles) ) {
-        return $role_slug;
-    }
-
-    foreach ( $wp_roles->roles as $role_slug => $role_details ) {
-        if ( isset($role_details['name']) && $role_details['name'] === $role_name ) {
-            return $role_slug;
-        }
-    }
-    return $role_slug;
-}
-
 /**
  * Does ey has correct symbols? Checks against regexp ^[a-z\d]{3,30}$
  *

lib/CleantalkSP/Updater/UpdaterScripts.php

@@ -1531,4 +1531,25 @@ public static function updateTo_2_166_1() // phpcs:ignore PSR1.Methods.CamelCaps
 
         $spbc->save('settings');
     }
+
+    public static function updateTo_2_168_0() // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+    {
+        global $spbc;
+
+        $old_2fa_roles = $spbc->settings['2fa_roles'];
+        $wp_roles = new \WP_Roles();
+
+        $new_2fa_roles = [];
+        foreach ($old_2fa_roles as $role_display_name) {
+            foreach ($wp_roles->roles as $role_key => $role_data) {
+                if ($role_data['name'] === $role_display_name) {
+                    $new_2fa_roles[] = $role_key;
+                    break;
+                }
+            }
+        }
+
+        $spbc->settings['2fa_roles'] = $new_2fa_roles;
+        $spbc->save('settings');
+    }
 }