Merge branch 'master' into hotfix/link-to-target-groups-filtering

Author: cs1m0n

plugins/bcc-login/bcc-login.php

@@ -3,7 +3,7 @@
 /**
  * Plugin Name: BCC Login
  * Description: Integration to BCC's Login System.
- * Version: 1.1.364
+ * Version: 1.1.369
  * Author: BCC IT
  * License: GPL2
  */
@@ -31,7 +31,7 @@ class BCC_Login {
      * The plugin instance.
      */
     private static $instance = null;
-    private $plugin_version = "1.1.364";
+    private $plugin_version = "1.1.369";
     private $plugin;
     private $plugin_slug;
     private $plugin_name = "BCC Login";

plugins/bcc-login/includes/class-bcc-login-visibility.php

@@ -1048,23 +1048,40 @@ function post_group_tags_widget($atts) {
         $post_id = get_the_ID();
         if (!$post_id) return false;
 
-        $attributes = shortcode_atts(array('limit' => 100, 'with_link' => true), $atts);
+        $attributes = shortcode_atts(
+            array(
+                'limit' => 100,
+                'with_link' => true,
+                'only_user_groups' => false
+            ),
+            $atts
+        );
+
+        // Convert to actual booleans
+        $only_user_groups = filter_var($attributes['only_user_groups'], FILTER_VALIDATE_BOOLEAN);
+        $with_link = filter_var($attributes['with_link'], FILTER_VALIDATE_BOOLEAN);
 
         $post_groups = get_post_meta($post_id, 'bcc_groups', false);
         $filtering_groups = $this->_settings->filtering_groups;
-        $shown_groups = array_slice(array_intersect($post_groups, $filtering_groups), 0, $attributes['limit']);
+        $shown_groups = array_intersect($post_groups, $filtering_groups);
+
+        if ($only_user_groups) {
+            $user_groups = $this->get_current_user_groups();
+            $shown_groups = array_intersect($shown_groups, $user_groups);
+        }
+
+        $shown_groups = array_slice($shown_groups, 0, $attributes['limit']);
 
         $html = '';
 
         foreach ($shown_groups as $group) {
-            $link = $attributes['with_link'] == true ? '/informasjon/?target-groups[]='. $group : 'javascript:void(0)';
+            $link = $with_link ? '/informasjon/?target-groups[]='. $group : 'javascript:void(0)';
             $html .= '<a class="bcc-badge bcc-badge-sm bcc-badge-custom" href="'. $link . '"><i class="material-symbols-rounded">info</i><span>' . $this->get_group_name($group) . '</span></a>';
         }
 
         return $html;
     }
 
-
     function tags_for_queried_target_groups() {
         $html = '';
 

plugins/bcc-login/package.json

@@ -1,14 +1,14 @@
 {
 	"private": true,
 	"name": "bcc-login",
-	"version": "1.1.364",
+	"version": "1.1.369",
 	"slug": "bcc-login",
 	"author": "<a href='https://github.com/bcc-code'>BCC Code</a>",
 	"author_profile": "https://github.com/bcc-code",
 	"requires": "3.0",
 	"tested": "5.8",
 	"requires_php": "5.3",
-	"last_updated": "2025-09-16 11:22:27",
+	"last_updated": "2025-10-27 12:58:02",
 	"sections": {
 		"description": "BCC Login",
 		"installation": "Add OIDC_CLIENT_ID and OIDC_CLIENT_SECRET as environment variables or constants in wp-config.php, and active plugin",