From 7d537e51274c112c664c1b86faf5270a8485ee8b Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Thu, 11 Sep 2025 13:15:08 -0500
Subject: [PATCH 1/2] Course: Improve filter by extra fields from catalog -
 refs #6235

---
 .../course/AdvancedCourseFilters.vue          | 237 ++++++++
 assets/vue/views/course/CatalogueCourses.vue  | 530 ++++++++++--------
 .../inc/lib/pear/HTML/QuickForm/radio.php     |   2 +-
 public/plugin/Bbb/lib/bbb.lib.php             | 159 ++++++
 public/plugin/Bbb/lib/bbb_plugin.class.php    |  84 +++
 public/plugin/Bbb/listing.php                 |  22 +
 .../Controller/CatalogueController.php        | 326 ++++++++++-
 7 files changed, 1111 insertions(+), 249 deletions(-)
 create mode 100644 assets/vue/components/course/AdvancedCourseFilters.vue

diff --git a/assets/vue/components/course/AdvancedCourseFilters.vue b/assets/vue/components/course/AdvancedCourseFilters.vue
new file mode 100644
index 00000000000..61137d2ba49
--- /dev/null
+++ b/assets/vue/components/course/AdvancedCourseFilters.vue
@@ -0,0 +1,237 @@
+<template>
+  <form class="grid gap-3 md:grid-cols-4 items-end" @submit.prevent="apply">
+    <div v-if="allowTitle">
+      <label class="block text-sm font-medium mb-1">{{ $t('Title') }}</label>
+      <InputText v-model="model.title" :placeholder="$t('Search by title')" />
+    </div>
+
+    <template v-for="f in fields" :key="f.variable">
+      <!-- SELECT simple -->
+      <div v-if="isSelect(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <Dropdown
+          v-model="model.extra[f.variable]"
+          :options="toDropdown(f.options)"
+          optionLabel="label"
+          optionValue="value"
+          showClear
+          :placeholder="$t('Select')"
+          class="w-full"
+        />
+      </div>
+
+      <!-- MULTISELECT -->
+      <div v-else-if="isMulti(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <MultiSelect
+          v-model="model.extra[f.variable]"
+          :options="toDropdown(f.options)"
+          optionLabel="label"
+          optionValue="value"
+          display="chip"
+          :placeholder="$t('Select')"
+          class="w-full"
+        />
+      </div>
+
+      <!-- RADIO -->
+      <div v-else-if="isRadio(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <div class="flex flex-wrap gap-3">
+          <div v-for="opt in toDropdown(f.options)" :key="opt.value" class="flex items-center gap-2">
+            <RadioButton :inputId="f.variable + opt.value" :value="opt.value" v-model="model.extra[f.variable]" />
+            <label :for="f.variable + opt.value">{{ opt.label }}</label>
+          </div>
+        </div>
+      </div>
+
+      <!-- CHECKBOX -->
+      <div v-else-if="isCheckbox(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <div v-if="hasOptions(f)" class="flex flex-col gap-1">
+          <div v-for="opt in toDropdown(f.options)" :key="opt.value" class="flex items-center gap-2">
+            <Checkbox :inputId="f.variable + opt.value"
+                      :value="opt.value"
+                      v-model="model.extra[f.variable]" binary="false" />
+            <label :for="f.variable + opt.value">{{ opt.label }}</label>
+          </div>
+        </div>
+        <div v-else class="flex items-center gap-2">
+          <Checkbox :inputId="f.variable" v-model="model.extra[f.variable]" binary />
+          <label :for="f.variable">{{ $t('Yes') }}</label>
+        </div>
+      </div>
+
+      <!-- DATE -->
+      <div v-else-if="isDate(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <Calendar v-model="model.extra[f.variable]" dateFormat="yy-mm-dd" showIcon class="w-full" />
+      </div>
+
+      <!-- DATETIME -->
+      <div v-else-if="isDateTime(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <Calendar v-model="model.extra[f.variable]" showTime hourFormat="24" dateFormat="yy-mm-dd" showIcon class="w-full" />
+      </div>
+
+      <!-- SELECT + TEXT -->
+      <div v-else-if="isSelectWithText(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <div class="grid grid-cols-2 gap-2">
+          <Dropdown
+            v-model="model.extra[f.variable]"
+            :options="toDropdown(level1(f))"
+            optionLabel="label" optionValue="id" showClear class="w-full"
+          />
+          <InputText v-model="model.extra[`${f.variable}_second`]" :placeholder="$t('Type value')" />
+        </div>
+      </div>
+
+      <!-- DOUBLE SELECT -->
+      <div v-else-if="isDouble(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <div class="grid grid-cols-2 gap-2">
+          <Dropdown
+            v-model="model.extra[f.variable]"
+            :options="toDropdown(level1(f))"
+            optionLabel="label" optionValue="id" showClear class="w-full"
+            @change="onDoubleChange(f)"
+          />
+          <Dropdown
+            v-model="model.extra[`${f.variable}_second`]"
+            :options="toDropdown(level2(f, model.extra[f.variable]))"
+            optionLabel="label" optionValue="id" showClear class="w-full"
+            :disabled="!model.extra[f.variable]"
+          />
+        </div>
+      </div>
+
+      <!-- TRIPLE SELECT -->
+      <div v-else-if="isTriple(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <div class="grid grid-cols-3 gap-2">
+          <Dropdown
+            v-model="model.extra[f.variable]"
+            :options="toDropdown(level1(f))"
+            optionLabel="label" optionValue="id" showClear class="w-full"
+            @change="onTripleL1Change(f)"
+          />
+          <Dropdown
+            v-model="model.extra[`${f.variable}_second`]"
+            :options="toDropdown(level2(f, model.extra[f.variable]))"
+            optionLabel="label" optionValue="id" showClear class="w-full"
+            :disabled="!model.extra[f.variable]"
+            @change="onTripleL2Change(f)"
+          />
+          <Dropdown
+            v-model="model.extra[`${f.variable}_third`]"
+            :options="toDropdown(level3(f, model.extra[`${f.variable}_second`]))"
+            optionLabel="label" optionValue="id" showClear class="w-full"
+            :disabled="!model.extra[`${f.variable}_second`]"
+          />
+        </div>
+      </div>
+
+      <!-- TAGS -->
+      <div v-else-if="isTag(f)">
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <Chips v-model="model.extra[f.variable]" :placeholder="$t('Add tags…')" />
+      </div>
+
+      <!-- TEXT / INTEGER / FLOAT / DURATION  -->
+      <div v-else>
+        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
+        <InputText v-model="model.extra[f.variable]" />
+      </div>
+    </template>
+
+    <div class="md:col-span-4 flex flex-wrap gap-2 justify-end">
+      <Button type="button" class="p-button-outlined" :label="$t('Clear')" @click="clear" />
+      <Button type="submit" :label="$t('Apply filters')" icon="pi pi-filter" />
+    </div>
+  </form>
+</template>
+
+<script setup>
+import { reactive, computed } from 'vue'
+import Dropdown from 'primevue/dropdown'
+import MultiSelect from 'primevue/multiselect'
+import Calendar from 'primevue/calendar'
+import InputText from 'primevue/inputtext'
+import Checkbox from 'primevue/checkbox'
+import RadioButton from 'primevue/radiobutton'
+import Chips from 'primevue/chips'
+import Button from 'primevue/button'
+
+const TYPE = {
+  TEXT: 1, TEXTAREA: 2, RADIO: 3, SELECT: 4, SELECT_MULTI: 5,
+  DATE: 6, DATETIME: 7, DOUBLE: 8, DIVIDER: 9, TAG: 10,
+  TIMEZONE: 11, SOCIAL: 12, CHECKBOX: 13, MOBILE: 14, INTEGER: 15,
+  FILE_IMAGE: 16, FLOAT: 17, FILE: 18, VIDEO_URL: 19, LETTERS_ONLY: 20,
+  ALPHANUM: 21, LETTERS_SPACE: 22, ALPHANUM_SPACE: 23, GEO: 24,
+  GEO_COORD: 25, SELECT_WITH_TEXT: 26, TRIPLE: 27, DURATION: 28,
+}
+
+// Props
+const props = defineProps({
+  fields: { type: Array, default: () => [] },
+  allowTitle: { type: Boolean, default: true },
+})
+const emit = defineEmits(['apply', 'clear'])
+
+const model = reactive({
+  title: '',
+  extra: {},
+})
+
+const isSelect        = f => f.value_type === TYPE.SELECT
+const isMulti         = f => f.value_type === TYPE.SELECT_MULTI
+const isRadio         = f => f.value_type === TYPE.RADIO
+const isCheckbox      = f => f.value_type === TYPE.CHECKBOX
+const isDate          = f => f.value_type === TYPE.DATE
+const isDateTime      = f => f.value_type === TYPE.DATETIME
+const isDouble        = f => f.value_type === TYPE.DOUBLE
+const isTriple        = f => f.value_type === TYPE.TRIPLE
+const isSelectWithText= f => f.value_type === TYPE.SELECT_WITH_TEXT
+const isTag           = f => f.value_type === TYPE.TAG
+const hasOptions      = f => Array.isArray(f.options) && f.options.length > 0
+
+const toDropdown = opts => (opts || []).map(o => ({
+  id: o.id, label: o.label, value: o.value ?? o.id, parent: o.parent ?? 0,
+}))
+
+const level1 = f => (f.options || []).filter(o => Number(o.parent) === 0)
+const level2 = (f, parentId) => (f.options || []).filter(o => String(o.parent) === String(parentId))
+const level3 = (f, parentId) => (f.options || []).filter(o => String(o.parent) === String(parentId))
+
+function onDoubleChange(f) {
+  model.extra[`${f.variable}_second`] = ''
+}
+function onTripleL1Change(f) {
+  model.extra[`${f.variable}_second`] = ''
+  model.extra[`${f.variable}_third`] = ''
+}
+function onTripleL2Change(f) {
+  model.extra[`${f.variable}_third`] = ''
+}
+
+function clear() {
+  model.title = ''
+  model.extra = {}
+  emit('clear')
+}
+
+function apply() {
+  const payload = {}
+  if (model.title?.trim()) payload.title = model.title.trim()
+
+  Object.entries(model.extra).forEach(([k, v]) => {
+    if (v === null || v === undefined) return
+    if (Array.isArray(v) && v.length === 0) return
+    if (typeof v === 'string' && v.trim() === '') return
+    payload[`extra_${k}`] = v
+  })
+
+  emit('apply', payload)
+}
+</script>
diff --git a/assets/vue/views/course/CatalogueCourses.vue b/assets/vue/views/course/CatalogueCourses.vue
index 5df7d33aa3e..19ddc045d7a 100644
--- a/assets/vue/views/course/CatalogueCourses.vue
+++ b/assets/vue/views/course/CatalogueCourses.vue
@@ -7,12 +7,12 @@
         <strong>{{ $t("Matching courses") }}:</strong>
         {{ totalVisibleCourses }}
       </div>
-      <div class="flex gap-3">
+      <div class="flex gap-3 items-center">
         <Button
           :label="$t('Clear filter results')"
           class="p-button-outlined"
           icon="pi pi-filter-slash"
-          @click="clearFilter()"
+          @click="clearFilter"
         />
         <Button
           :label="$t('Advanced search')"
@@ -20,13 +20,7 @@
           icon="pi pi-sliders-h"
           @click="showAdvancedSearch = !showAdvancedSearch"
         />
-        <Button
-          v-if="showAdvancedSearch"
-          :label="$t('Apply advanced filters')"
-          icon="pi pi-check"
-          class="p-button-sm p-button-success"
-          @click="applyAdvancedSearch"
-        />
+
         <Dropdown
           v-if="allSortOptions.length"
           v-model="sortField"
@@ -46,80 +40,23 @@
         </div>
       </div>
     </div>
-    <div
-      v-if="showAdvancedSearch"
-      class="p-4 border border-gray-300 rounded bg-white mb-6"
-    >
-      <div class="grid sm:grid-cols-3 gap-4 mb-4">
-        <InputText
-          v-if="courseCatalogueSettings.filters?.by_title"
-          v-model="advancedFilters.title"
-          :placeholder="$t('Filter by title')"
-        />
-        <InputText
-          v-if="courseCatalogueSettings.filters?.by_category"
-          v-model="advancedFilters.category"
-          :placeholder="$t('Filter by category')"
-        />
-        <Dropdown
-          v-if="courseCatalogueSettings.filters?.by_language && languages.length > 1"
-          v-model="advancedFilters.language"
-          :options="languages"
-          optionLabel="originalName"
-          optionValue="isocode"
-          :placeholder="$t('Filter by language')"
-          class="w-full"
-        />
-      </div>
 
-      <div
-        class="grid sm:grid-cols-3 gap-4 mb-4"
-        v-if="searchExtraFields.length > 0"
-      >
-        <template
-          v-for="field in searchExtraFields"
-          :key="field.variable"
-        >
-          <InputText
-            v-if="[1, 15, 17].includes(field.value_type)"
-            v-model="advancedFilters[field.variable]"
-            :placeholder="formatLabel(field)"
-            class="w-full"
-          />
-          <Textarea
-            v-else-if="field.value_type === 2"
-            v-model="advancedFilters[field.variable]"
-            :placeholder="formatLabel(field)"
-            class="w-full"
-            autoResize
-          />
-          <Calendar
-            v-else-if="field.value_type === 6"
-            v-model="advancedFilters[field.variable]"
-            :placeholder="formatLabel(field)"
-            class="w-full"
-            dateFormat="yy-mm-dd"
-            showIcon
-          />
-          <InputText
-            v-else
-            v-model="advancedFilters[field.variable]"
-            :placeholder="formatLabel(field)"
-            class="w-full"
-          />
-        </template>
-      </div>
+    <!-- Advanced search form -->
+    <div v-if="showAdvancedSearch" class="p-4 border border-gray-300 rounded bg-white mb-6">
+      <AdvancedCourseFilters
+        :key="advancedFormKey"
+        :fields="extraFields"
+        :allowTitle="courseCatalogueSettings.filters?.by_title ?? true"
+        @apply="onAdvancedApply"
+        @clear="onAdvancedClear"
+      />
     </div>
-    <div
-      v-if="status"
-      class="text-center text-gray-500 py-6"
-    >
+
+    <div v-if="status" class="text-center text-gray-500 py-6">
       {{ $t("Loading courses. Please wait.") }}
     </div>
-    <div
-      v-else-if="!filteredCourses.length"
-      class="text-center text-gray-500 py-6"
-    >
+
+    <div v-else-if="!filteredCourses.length" class="text-center text-gray-500 py-6">
       {{ $t("No course available") }}
     </div>
 
@@ -136,10 +73,7 @@
       />
     </div>
 
-    <div
-      v-if="loadingMore"
-      class="text-center text-gray-400 py-4"
-    >
+    <div v-if="loadingMore" class="text-center text-gray-400 py-4">
       {{ $t("Loading more courses...") }}
     </div>
   </div>
@@ -148,6 +82,7 @@
 import { computed, onMounted, ref, watch } from "vue"
 import InputText from "primevue/inputtext"
 import Button from "primevue/button"
+import Dropdown from "primevue/dropdown"
 import { FilterMatchMode } from "@primevue/core/api"
 import { useNotification } from "../../composables/notification"
 import { useLanguage } from "../../composables/language"
@@ -158,73 +93,20 @@ import { useRouter } from "vue-router"
 import { usePlatformConfig } from "../../store/platformConfig"
 import { useI18n } from "vue-i18n"
 import courseService from "../../services/courseService"
+import AdvancedCourseFilters from "../../components/course/AdvancedCourseFilters.vue"
 
 const { t } = useI18n()
 const sortField = ref("title")
 
-const formatLabel = (field) => {
-  if (field.display_text) return field.display_text
-  return field.variable
-    .replace(/_/g, " ")
-    .replace(/\b\w/g, (l) => l.toUpperCase())
-}
-
-const standardSortOptions = computed(() => {
-  return courseCatalogueSettings.value.standard_sort_options ?? {}
-})
-
-const extraSortOptions = computed(() => {
-  return courseCatalogueSettings.value.extra_field_sort_options ?? {}
-})
-
-const allSortOptions = computed(() => {
-  const standard = Object.entries(standardSortOptions.value).map(([key, value]) => ({
-    label: t(key.replace("point_info/", "")),
-    value: key,
-    order: value,
-    type: "standard",
-  }))
-  const extra = Object.entries(extraSortOptions.value).map(([key, value]) => ({
-    label: key,
-    value: key,
-    order: value,
-    type: "extra",
-  }))
-  return [...standard, ...extra]
-})
-
-const cardExtraFields = computed(() => {
-  const allowed = courseCatalogueSettings.value.extra_fields_in_course_block ?? []
-  return extraFields.value.filter((field) => allowed.includes(field.variable))
-})
-
-const showAdvancedSearch = ref(false)
-const advancedFilters = ref({
-  title: "",
-  category: "",
-  language: "",
-})
-
-const extraFields = ref([])
-const { showErrorNotification } = useNotification()
-const { languageList } = useLanguage()
-const languages = languageList
 const router = useRouter()
 const securityStore = useSecurityStore()
-
 const platformConfigStore = usePlatformConfig()
 const courseCatalogueSettings = computed(() => {
   let raw = platformConfigStore.getSetting("catalog.course_catalog_settings")
   if (!raw || raw === false || raw === "false") return {}
   try {
-    if (typeof raw === "string") {
-      raw = JSON.parse(raw)
-    }
-
-    if (typeof raw.courses === "object") {
-      return raw.courses
-    }
-
+    if (typeof raw === "string") raw = JSON.parse(raw)
+    if (typeof raw.courses === "object") return raw.courses
     return raw
   } catch (e) {
     console.error("Invalid catalogue settings format", e)
@@ -232,86 +114,14 @@ const courseCatalogueSettings = computed(() => {
   }
 })
 
-const searchExtraFields = computed(() => {
-  const allowed = courseCatalogueSettings.value.extra_fields_in_search_form ?? []
-  return extraFields.value.filter((field) => allowed.includes(field.variable))
-})
-
-const showCourseTitle = computed(() => courseCatalogueSettings.value.hide_course_title !== true)
-
-const redirectAfterSubscription = computed(
-  () => courseCatalogueSettings.value.redirect_after_subscription ?? "course_catalog",
-)
-
-const onUserSubscribed = ({ courseId, newUser }) => {
-  const index = courses.value.findIndex((c) => c.id === courseId)
-  if (index !== -1) {
-    const oldCourse = courses.value[index]
-    const updatedCourse = {
-      ...oldCourse,
-      subscribed: true,
-      users: [...(oldCourse.users || []), newUser],
-    }
-
-    courses.value[index] = updatedCourse
-    const filteredIndex = filteredCourses.value.findIndex((c) => c.id === courseId)
-    if (filteredIndex !== -1) {
-      filteredCourses.value[filteredIndex] = updatedCourse
-    }
-    applyAdvancedSearch()
-    if (redirectAfterSubscription.value === "course_home") {
-      router.push({ name: "CourseHome", params: { id: courseId } })
-    }
-  }
-}
-
-const applyAdvancedSearch = () => {
-  filteredCourses.value = courses.value.filter((course) => {
-    const keyword = filters.value.global.value?.toLowerCase()
-    const matchesGlobal =
-      !keyword || course.title?.toLowerCase().includes(keyword) || course.description?.toLowerCase().includes(keyword)
-
-    const matchesTitle =
-      !advancedFilters.value.title || course.title?.toLowerCase().includes(advancedFilters.value.title.toLowerCase())
-
-    const matchesCategory =
-      !advancedFilters.value.category ||
-      course.categories?.some((cat) => cat.title?.toLowerCase().includes(advancedFilters.value.category.toLowerCase()))
-
-    const matchesLanguage =
-      !advancedFilters.value.language ||
-      course.courseLanguage?.toLowerCase().includes(advancedFilters.value.language?.toLowerCase())
-
-    const matchesExtras = extraFields.value.every((field) => {
-      const val = advancedFilters.value[field.variable]
-      if (!val) return true
-      const fieldValue = course.extra_fields?.[field.variable]
-      return typeof fieldValue === "string" ? fieldValue.toLowerCase().includes(val.toLowerCase()) : true
-    })
-
-    return matchesGlobal && matchesTitle && matchesCategory && matchesLanguage && matchesExtras
-  })
-
-  visibleCount.value = rowsPerScroll
-}
-
 const isAnonymous = !securityStore.isAuthenticated
 const isPrivilegedUser =
   securityStore.isAdmin || securityStore.isTeacher || securityStore.isHRM || securityStore.isSessionAdmin
 
 const allowCatalogueAccess = computed(() => {
-  if (isAnonymous) {
-    return platformConfigStore.getSetting("catalog.course_catalog_published") !== "false"
-  }
-
-  if (isPrivilegedUser) {
-    return true
-  }
-
-  if (securityStore.isStudent) {
-    return platformConfigStore.getSetting("catalog.allow_students_to_browse_courses") !== "false"
-  }
-
+  if (isAnonymous) return platformConfigStore.getSetting("catalog.course_catalog_published") !== "false"
+  if (isPrivilegedUser) return true
+  if (securityStore.isStudent) return platformConfigStore.getSetting("catalog.allow_students_to_browse_courses") !== "false"
   return false
 })
 
@@ -329,12 +139,18 @@ if (!allowCatalogueAccess.value) {
 const currentUserId = securityStore.user?.id ?? null
 const status = ref(false)
 const courses = ref([])
+const filteredCourses = ref([])
 const filters = ref({ global: { value: null, matchMode: FilterMatchMode.CONTAINS } })
 
 const rowsPerScroll = 9
 const visibleCount = ref(rowsPerScroll)
 const loadingMore = ref(false)
 
+const extraFields = ref([])
+const { showErrorNotification } = useNotification()
+const { languageList } = useLanguage()
+const languages = languageList
+
 const loadExtraFields = async () => {
   try {
     const response = await fetch("/catalogue/course-extra-fields")
@@ -350,12 +166,21 @@ const load = async () => {
   try {
     courses.value = await courseService.loadCourseCatalogue()
 
+    const ids = courses.value.map(c => c.id).join(',')
+    if (ids) {
+      const res = await fetch(`/catalogue/course-extra-field-values?ids=${ids}`)
+      const extraByCourse = await res.json()
+      courses.value = courses.value.map(c => ({
+        ...c,
+        extra_fields: extraByCourse[c.id] || {}
+      }))
+    }
+
     if (currentUserId) {
       const votes = await userRelCourseVoteService.getUserVotes({
         userId: currentUserId,
         urlId: window.access_url_id,
       })
-
       for (const vote of votes) {
         let courseId
         if (typeof vote.course === "object" && vote.course !== null) {
@@ -363,11 +188,8 @@ const load = async () => {
         } else if (typeof vote.course === "string") {
           courseId = parseInt(vote.course.split("/").pop())
         }
-
         const course = courses.value.find((c) => c.id === courseId)
-        if (course) {
-          course.userVote = vote
-        }
+        if (course) course.userVote = vote
       }
     }
   } catch (error) {
@@ -377,19 +199,213 @@ const load = async () => {
   }
 }
 
-onMounted(async () => {
-  window.addEventListener("scroll", handleScroll)
-  await loadExtraFields()
-  await load()
-  applyAdvancedSearch()
+const standardSortOptions = computed(() => courseCatalogueSettings.value.standard_sort_options ?? {})
+const extraSortOptions = computed(() => courseCatalogueSettings.value.extra_field_sort_options ?? {})
+
+const allSortOptions = computed(() => {
+  const standard = Object.entries(standardSortOptions.value).map(([key, value]) => ({
+    label: t(key.replace("point_info/", "")),
+    value: key,
+    order: value,
+    type: "standard",
+  }))
+  const extra = Object.entries(extraSortOptions.value).map(([key, value]) => ({
+    label: key,
+    value: key,
+    order: value,
+    type: "extra",
+  }))
+  return [...standard, ...extra]
 })
 
-const clearFilter = () => {
-  filters.value.global.value = null
+const cardExtraFields = computed(() => {
+  const allowed = courseCatalogueSettings.value.extra_fields_in_course_block ?? []
+  return extraFields.value.filter((field) => allowed.includes(field.variable))
+})
+
+const showCourseTitle = computed(() => courseCatalogueSettings.value.hide_course_title !== true)
+
+const showAdvancedSearch = ref(false)
+const advancedPayload = ref({})
+const advancedFormKey = ref(0)
+
+function onAdvancedApply(payload) {
+  advancedPayload.value = payload || {}
+  applyAdvancedSearch()
+}
+
+function onAdvancedClear() {
+  advancedPayload.value = {}
+  applyAdvancedSearch()
+}
+
+function normalizeString(x) {
+  return (x ?? "").toString().trim().toLowerCase()
+}
+
+function splitCandidates(str) {
+  return normalizeString(str)
+    .split(/[:;,\|]+/)
+    .map((s) => s.trim())
+    .filter(Boolean)
+}
+
+function optionLabelBy({ field, idOrValue }) {
+  if (!field?.options?.length) return null
+  const found = field.options.find(
+    (o) => String(o.id) === String(idOrValue) || String(o.value) === String(idOrValue),
+  )
+  return found?.label ?? null
+}
+
+function optionLabelsForArray({ field, arr }) {
+  const out = []
+  for (const v of arr || []) {
+    const lbl = optionLabelBy({ field, idOrValue: v })
+    out.push(normalizeString(lbl ?? v))
+  }
+  return out
+}
+
+function matchesExtraField(course, field, payload) {
+  const courseVal = course?.extra_fields?.[field.variable]
+  if (courseVal == null) return false
+
+  let courseTokens = []
+  if (Array.isArray(courseVal)) {
+    courseTokens = courseVal.map(normalizeString)
+  } else if (typeof courseVal === "object") {
+    courseTokens = Object.values(courseVal).map(normalizeString)
+  } else {
+    courseTokens = splitCandidates(courseVal)
+  }
+
+  const tokensContain = (needle) =>
+    courseTokens.some((tok) => tok.includes(normalizeString(needle)))
+
+  const vt = Number(field.value_type)
+
+  // SELECT simple
+  if (vt === 4) {
+    const sel = payload[`extra_${field.variable}`]
+    if (!sel) return true
+    const label = optionLabelBy({ field, idOrValue: sel }) ?? sel
+    return tokensContain(label) || tokensContain(sel)
+  }
+
+  // MULTISELECT
+  if (vt === 5) {
+    const arr = payload[`extra_${field.variable}`]
+    if (!arr || !arr.length) return true
+    const labels = optionLabelsForArray({ field, arr })
+    return labels.every((lbl) => tokensContain(lbl))
+  }
+
+  // DATE / DATETIME
+  if (vt === 6 || vt === 7) {
+    const sel = payload[`extra_${field.variable}`]
+    if (!sel) return true
+    const dateStr =
+      sel instanceof Date
+        ? `${sel.getFullYear()}-${String(sel.getMonth() + 1).padStart(2, "0")}-${String(sel.getDate()).padStart(2, "0")}`
+        : String(sel)
+    return tokensContain(dateStr)
+  }
+
+  // DOUBLE SELECT
+  if (vt === 8) {
+    const first = payload[`extra_${field.variable}`]
+    const second = payload[`extra_${field.variable}_second`]
+    if (!first && !second) return true
+
+    const firstLbl = first ? optionLabelBy({ field, idOrValue: first }) : null
+    const secondLbl = second ? optionLabelBy({ field, idOrValue: second }) : null
+
+    const okFirst = !first || tokensContain(firstLbl ?? first)
+    const okSecond = !second || tokensContain(secondLbl ?? second)
+    return okFirst && okSecond
+  }
+
+  // TAGS
+  if (vt === 10) {
+    const arr = payload[`extra_${field.variable}`]
+    if (!arr || !arr.length) return true
+    const want = arr.map(normalizeString)
+    return want.every((w) => tokensContain(w))
+  }
+
+  // CHECKBOX
+  if (vt === 13) {
+    const v = payload[`extra_${field.variable}`]
+    if (v == null) return true
+    const expected = v === true || v === 1 || v === "1"
+    const yes = ["1", "yes", "true", "on"]
+    const courseHasYes = courseTokens.some((x) => yes.includes(x))
+    return expected ? courseHasYes : !courseHasYes
+  }
+
+  // SELECT + TEXT
+  if (vt === 26) {
+    const first = payload[`extra_${field.variable}`]
+    const text = payload[`extra_${field.variable}_second`]
+    const okFirst = !first || tokensContain(optionLabelBy({ field, idOrValue: first }) ?? first)
+    const okText = !text || tokensContain(text)
+    return okFirst && okText
+  }
+
+  // TRIPLE SELECT
+  if (vt === 27) {
+    const l1 = payload[`extra_${field.variable}`]
+    const l2 = payload[`extra_${field.variable}_second`]
+    const l3 = payload[`extra_${field.variable}_third`]
+    if (!l1 && !l2 && !l3) return true
+    const labels = [l1, l2, l3].filter(Boolean).map((x) => optionLabelBy({ field, idOrValue: x }) ?? x)
+    return labels.every((lbl) => tokensContain(lbl))
+  }
+
+  // DURATION
+  if (vt === 28) {
+    const sel = payload[`extra_${field.variable}`]
+    if (!sel) return true
+    return tokensContain(sel)
+  }
+
+  // Fallback (TEXT/INT/FLOAT/etc.)
+  const val = payload[`extra_${field.variable}`]
+  if (!val) return true
+  return tokensContain(val)
+}
+
+function applyAdvancedSearch() {
+  const keyword = normalizeString(filters.value.global.value)
+  const adv = advancedPayload.value || {}
+
+  filteredCourses.value = courses.value.filter((course) => {
+    const matchesGlobal =
+      !keyword ||
+      normalizeString(course.title).includes(keyword) ||
+      normalizeString(course.description).includes(keyword)
+
+    const matchesTitle =
+      !adv.title || normalizeString(course.title).includes(normalizeString(adv.title))
+
+    const advHasExtra = Object.keys(adv).some((k) => k.startsWith("extra_"))
+    const matchesExtras = !advHasExtra
+      ? true
+      : extraFields.value.every((field) => {
+        const present =
+          adv.hasOwnProperty(`extra_${field.variable}`) ||
+          adv.hasOwnProperty(`extra_${field.variable}_second`) ||
+          adv.hasOwnProperty(`extra_${field.variable}_third`)
+        return present ? matchesExtraField(course, field, adv) : true
+      })
+
+    return matchesGlobal && matchesTitle && matchesExtras
+  })
+
   visibleCount.value = rowsPerScroll
 }
 
-const filteredCourses = ref([])
 const visibleCoursesBase = computed(() => {
   const hidePrivate = platformConfigStore.getSetting("catalog.course_catalog_hide_private") === "true"
   const sortOpt = allSortOptions.value.find((opt) => opt.value === sortField.value)
@@ -438,13 +454,10 @@ const visibleCoursesBase = computed(() => {
   return list
 })
 
-const visibleCourses = computed(() => {
-  return visibleCoursesBase.value.slice(0, visibleCount.value)
-})
-
+const visibleCourses = computed(() => visibleCoursesBase.value.slice(0, visibleCount.value))
 const totalVisibleCourses = computed(() => visibleCoursesBase.value.length)
 
-const handleScroll = () => {
+function handleScroll() {
   if (loadingMore.value) return
 
   const threshold = 150
@@ -463,12 +476,29 @@ const handleScroll = () => {
   }
 }
 
-watch(
-  () => filters.value.global.value,
-  () => {
-    visibleCount.value = rowsPerScroll
-  },
-)
+watch(() => filters.value.global.value, () => {
+  visibleCount.value = rowsPerScroll
+  applyAdvancedSearch()
+})
+
+watch(sortField, () => {
+  visibleCount.value = rowsPerScroll
+})
+
+onMounted(async () => {
+  window.addEventListener("scroll", handleScroll)
+  await loadExtraFields()
+  await load()
+  applyAdvancedSearch()
+})
+
+function clearFilter() {
+  filters.value.global.value = null
+  advancedPayload.value = {}
+  advancedFormKey.value++
+  visibleCount.value = rowsPerScroll
+  applyAdvancedSearch()
+}
 
 const saveOrUpdateVote = async (course, value) => {
   try {
@@ -507,11 +537,33 @@ const saveOrUpdateVote = async (course, value) => {
   }
 }
 
-const onRatingChange = ({ value, course }) => {
+function onRatingChange({ value, course }) {
   if (value > 0 && currentUserId) {
     saveOrUpdateVote(course, value)
   }
 }
+
+function onUserSubscribed({ courseId, newUser }) {
+  const index = courses.value.findIndex((c) => c.id === courseId)
+  if (index !== -1) {
+    const oldCourse = courses.value[index]
+    const updatedCourse = {
+      ...oldCourse,
+      subscribed: true,
+      users: [...(oldCourse.users || []), newUser],
+    }
+    courses.value[index] = updatedCourse
+    const filteredIndex = filteredCourses.value.findIndex((c) => c.id === courseId)
+    if (filteredIndex !== -1) {
+      filteredCourses.value[filteredIndex] = updatedCourse
+    }
+    applyAdvancedSearch()
+    const redirectAfterSubscription = courseCatalogueSettings.value.redirect_after_subscription ?? "course_catalog"
+    if (redirectAfterSubscription === "course_home") {
+      router.push({ name: "CourseHome", params: { id: courseId } })
+    }
+  }
+}
 </script>
 <style scoped>
 .catalogue-courses {
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/radio.php b/public/main/inc/lib/pear/HTML/QuickForm/radio.php
index 53606377b80..7dc03c57643 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/radio.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/radio.php
@@ -55,7 +55,7 @@ public function __construct(
         ?array $attributes = []
     ) {
         $this->labelClass = $attributes['label-class'] ?? '';
-        $this->radioClass = $attributes['radio-class'] ?? 'field-radiobutton';
+        $this->radioClass = $attributes['radio-class'] ?? 'field-radiobutton2';
 
         if (isset($attributes['label-class'])) {
             unset($attributes['label-class']);
diff --git a/public/plugin/Bbb/lib/bbb.lib.php b/public/plugin/Bbb/lib/bbb.lib.php
index e8c1570693e..39217d2b7dc 100644
--- a/public/plugin/Bbb/lib/bbb.lib.php
+++ b/public/plugin/Bbb/lib/bbb.lib.php
@@ -541,6 +541,25 @@ public function createMeeting($params)
                     $meeting->setInternalMeetingId($result['internalMeetingID']);
                     $em->flush();
                 }
+
+                // Register webhook if enabled (no DB tables, pure BBB hooks API)
+                try {
+                    if ($this->plugin->webhooksEnabled()) {
+                        $scope = $this->plugin->webhooksScope(); // 'per_meeting' | 'global'
+                        if ($scope === 'per_meeting') {
+                            $this->registerWebhookForMeeting($meeting->getRemoteId());
+                        } else {
+                            // idempotent: checks existing hooks/list before creating
+                            $this->ensureGlobalWebhook();
+                        }
+                    }
+                } catch (\Throwable $e) {
+                    if ($this->debug) {
+                        error_log('BBB webhook registration failed: '.$e->getMessage());
+                    }
+                    // Do not block meeting start on webhook issues
+                }
+
                 return $this->joinMeeting($meetingName, true);
             }
 
@@ -2164,4 +2183,144 @@ public static function showGlobalConferenceLink($userInfo)
 
         return false;
     }
+
+    /**
+     * Build the callback URL for BBB webhooks, signed with HMAC using the plugin salt.
+     * No DB tables involved.
+     */
+    private function buildWebhookCallbackUrl(?string $meetingId = null): string
+    {
+        // Plugin public endpoint to implement in the next step (receiver)
+        $base = rtrim(api_get_path(WEB_PLUGIN_PATH), '/').'/Bbb/webhook.php';
+
+        $au  = (int) $this->accessUrl;
+        $mid = (string) ($meetingId ?? '');
+        $ts  = time();
+
+        // Reuse plugin salt as HMAC secret (no new setting)
+        $algo = $this->plugin->webhooksHashAlgo(); // 'sha256' | 'sha1'
+        $secret = (string) $this->salt;
+
+        $payload = implode('|', [$au, $mid, (string)$ts]);
+        $sig = hash_hmac($algo, $payload, $secret);
+
+        $qs = [
+            'au'  => $au,
+            'mid' => $mid,
+            'ts'  => $ts,
+            'sig' => $sig,
+        ];
+
+        return $base.'?'.http_build_query($qs);
+    }
+
+    /**
+     * Low-level BBB hooks API caller (GET with BBB checksum: sha1(call+query+salt)).
+     * Returns a normalized array. Never throws.
+     */
+    private function bbbHooksRequest(string $call, array $params): array
+    {
+        try {
+            $base = rtrim($this->urlWithProtocol ?: '', '/'); // ends with /bigbluebutton/
+            if ($base === '') {
+                return ['returncode' => 'FAILED', 'messageKey' => 'missingServerUrl'];
+            }
+
+            // BBB expects checksum = sha1(call + querystring + salt)
+            $query = http_build_query($params);
+            $checksum = sha1($call.$query.$this->salt);
+            $url = $base.'api/'.$call.'?'.$query.'&checksum='.$checksum;
+
+            $xml = @simplexml_load_file($url);
+            if (!$xml) {
+                return ['returncode' => 'FAILED', 'messageKey' => 'noResponse'];
+            }
+
+            $out = ['returncode' => (string)($xml->returncode ?? '')];
+            if (isset($xml->messageKey)) { $out['messageKey'] = (string)$xml->messageKey; }
+            if (isset($xml->message))    { $out['message']    = (string)$xml->message; }
+
+            if ($call === 'hooks/list' && isset($xml->hooks)) {
+                $out['hooks'] = [];
+                foreach (($xml->hooks->hook ?? []) as $h) {
+                    $out['hooks'][] = [
+                        'id'          => isset($h->id) ? (string)$h->id : '',
+                        'callbackURL' => isset($h->callbackURL) ? (string)$h->callbackURL : '',
+                        'meetingID'   => isset($h->meetingID) ? (string)$h->meetingID : '',
+                    ];
+                }
+            }
+            if ($call === 'hooks/create' && isset($xml->hookID)) {
+                $out['hookID'] = (string)$xml->hookID;
+            }
+
+            return $out;
+        } catch (\Throwable $e) {
+            if ($this->debug) {
+                error_log('bbbHooksRequest error: '.$e->getMessage());
+            }
+            return ['returncode' => 'FAILED', 'messageKey' => 'exception'];
+        }
+    }
+
+    /**
+     * Register a per-meeting webhook (idempotent enough for our flow).
+     * Will silently no-op if BBB webhooks plugin isn’t installed.
+     */
+    private function registerWebhookForMeeting(string $meetingId): void
+    {
+        if ($meetingId === '') {
+            return;
+        }
+
+        $params = [
+            'callbackURL' => $this->buildWebhookCallbackUrl($meetingId),
+            'meetingID'   => $meetingId,
+        ];
+
+        // Optional CSV filter like: user-joined,user-left,webcam-started,webcam-stopped
+        $events = trim((string)$this->plugin->webhooksEventFilter());
+        if ($events !== '') {
+            $params['events'] = $events;
+        }
+
+        $res = $this->bbbHooksRequest('hooks/create', $params);
+        if (($res['returncode'] ?? '') !== 'SUCCESS' && $this->debug) {
+            error_log('BBB hooks/create (per_meeting) failed: '.json_encode($res));
+        }
+    }
+
+    /**
+     * Ensure a single global webhook subscription exists (no meetingID).
+     * Uses hooks/list to avoid duplicates (no DB table needed).
+     */
+    private function ensureGlobalWebhook(): void
+    {
+        $callback = $this->buildWebhookCallbackUrl(null);
+
+        $list = $this->bbbHooksRequest('hooks/list', []);
+        if (($list['returncode'] ?? '') !== 'SUCCESS') {
+            if ($this->debug) {
+                error_log('BBB hooks/list failed or unavailable (global).');
+            }
+            return; // webhooks plugin might not be installed
+        }
+
+        foreach (($list['hooks'] ?? []) as $h) {
+            if (($h['callbackURL'] ?? '') === $callback && ($h['meetingID'] ?? '') === '') {
+                return; // already registered
+            }
+        }
+
+        $params = ['callbackURL' => $callback];
+        $events = trim((string)$this->plugin->webhooksEventFilter());
+        if ($events !== '') {
+            $params['events'] = $events;
+        }
+
+        $res = $this->bbbHooksRequest('hooks/create', $params);
+        if (($res['returncode'] ?? '') !== 'SUCCESS' && $this->debug) {
+            error_log('BBB hooks/create (global) failed: '.json_encode($res));
+        }
+    }
 }
diff --git a/public/plugin/Bbb/lib/bbb_plugin.class.php b/public/plugin/Bbb/lib/bbb_plugin.class.php
index 9f2ff32f6ab..4b0dd6208f9 100644
--- a/public/plugin/Bbb/lib/bbb_plugin.class.php
+++ b/public/plugin/Bbb/lib/bbb_plugin.class.php
@@ -65,6 +65,22 @@ protected function __construct()
                 'meeting_duration' => 'text',
                 'delete_recordings_on_course_delete' => 'boolean',
                 'hide_conference_link' => 'boolean',
+                'webhooks_enabled' => 'boolean',
+                'webhooks_scope' => [
+                    'type' => 'select',
+                    'options' => [
+                        'per_meeting' => 'Per meeting',
+                        'global'      => 'Global',
+                    ],
+                ],
+                'webhooks_hash_algo' => [
+                    'type' => 'select',
+                    'options' => [
+                        'sha256' => 'SHA-256',
+                        'sha1'   => 'SHA-1',
+                    ],
+                ],
+                'webhooks_event_filter' => 'text',
             ]
         );
 
@@ -333,6 +349,13 @@ public function install(): void
                         $configuration[$name] = in_array($type, ['boolean','checkbox'], true) ? 'false' : '';
                     }
                 }
+
+                // Explicit defaults for webhooks
+                $configuration['webhooks_enabled']      = $configuration['webhooks_enabled']      ?? 'false';
+                $configuration['webhooks_scope']        = $configuration['webhooks_scope']        ?? 'per_meeting';
+                $configuration['webhooks_hash_algo']    = $configuration['webhooks_hash_algo']    ?? 'sha256';
+                $configuration['webhooks_event_filter'] = $configuration['webhooks_event_filter'] ?? '';
+
                 $rel->setConfiguration($configuration);
 
                 $em->persist($rel);
@@ -408,6 +431,67 @@ public function canCurrentUserSeeGlobalConferenceLink(): bool
         return false;
     }
 
+    public function webhooksEnabled(): bool
+    {
+        return $this->get('webhooks_enabled') === 'true';
+    }
+    public function webhooksScope(): string
+    {
+        $v = (string) ($this->get('webhooks_scope') ?? 'per_meeting');
+        return in_array($v, ['per_meeting','global'], true) ? $v : 'per_meeting';
+    }
+    public function webhooksHashAlgo(): string
+    {
+        $v = (string) ($this->get('webhooks_hash_algo') ?? 'sha256');
+        return in_array($v, ['sha256','sha1'], true) ? $v : 'sha256';
+    }
+    public function webhooksEventFilter(): string
+    {
+        return (string) ($this->get('webhooks_event_filter') ?? '');
+    }
+
+    public function checkWebhooksHealth(): array
+    {
+        if (!$this->webhooksEnabled()) {
+            return ['enabled' => false, 'ok' => false, 'reason' => 'disabled'];
+        }
+        $host = rtrim((string) $this->get('host'), '/');
+        $salt = (string) $this->get('salt');
+        if ($host === '' || $salt === '') {
+            return ['enabled' => true, 'ok' => false, 'reason' => 'missing_config'];
+        }
+
+        if (!preg_match('#/bigbluebutton$#', $host)) {
+            $host .= '/bigbluebutton';
+        }
+
+        $call = 'hooks/list';
+        $query = ''; // no params
+        $checksum = sha1($call.$query.$salt);
+        $url = $host.'/api/'.$call.'?checksum='.$checksum;
+
+        $xml = @simplexml_load_file($url);
+        if ($xml && (string)($xml->returncode ?? '') === 'SUCCESS') {
+            return ['enabled' => true, 'ok' => true];
+        }
+        $reason = '';
+        if ($xml && isset($xml->messageKey)) $reason = (string)$xml->messageKey;
+        return ['enabled' => true, 'ok' => false, 'reason' => $reason ?: 'no_response'];
+    }
+
+    public function getWebhooksAdminWarningHtml(): ?string
+    {
+        $h = $this->checkWebhooksHealth();
+        if ($h['enabled'] && !$h['ok']) {
+            $msg = 'Webhooks are not installed on the BBB server — running in reduced mode (basic callbacks only).';
+            if (!empty($h['reason'])) {
+                $msg .= ' [' . htmlspecialchars($h['reason'], ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . ']';
+            }
+            return '<div class="alert alert-warning" role="alert">'.$msg.'</div>';
+        }
+        return null;
+    }
+
     /**
      * Make sure the current user can see the "share" link under the join
      * button in the course tool page.
diff --git a/public/plugin/Bbb/listing.php b/public/plugin/Bbb/listing.php
index bba7c4b27cb..7e94cf83a15 100644
--- a/public/plugin/Bbb/listing.php
+++ b/public/plugin/Bbb/listing.php
@@ -435,6 +435,27 @@
 $messagesAboveForm = '';
 try {
     $messagesAboveForm .= Display::getFlash();
+
+    // Show admin warning if webhooks are enabled but not available on BBB server
+    if (api_is_platform_admin() && $plugin->webhooksEnabled()) {
+        // Optional: tiny 60s cache to avoid calling BBB on every refresh
+        $cacheKey = 'bbb_hooks_warning_cache';
+        $cached = Container::getSession()->get($cacheKey);
+        $warnHtml = null;
+
+        if ($cached && isset($cached['ts'], $cached['html']) && ($cached['ts'] > time() - 60)) {
+            $warnHtml = $cached['html'];
+        } else {
+            $warnHtml = $plugin->getWebhooksAdminWarningHtml(); // returns HTML or null
+            Container::getSession()->set($cacheKey, ['ts' => time(), 'html' => $warnHtml]);
+        }
+
+        if ($warnHtml) {
+            // Already HTML (English message inside the code)
+            $messagesAboveForm .= $warnHtml;
+        }
+    }
+
     $sess = Container::getSession()->get('bbb_preupload_message');
     if ($sess) {
         $messagesAboveForm .= Display::return_message($sess['text'], $sess['type'], false);
@@ -442,6 +463,7 @@
     }
 } catch (\Throwable $e) {}
 
+
 // Links + start form (with pre-upload document picker).
 $urlList = [];
 if ($conferenceManager && $allowToEdit) {
diff --git a/src/CoreBundle/Controller/CatalogueController.php b/src/CoreBundle/Controller/CatalogueController.php
index ffa224407d2..77ed3781440 100644
--- a/src/CoreBundle/Controller/CatalogueController.php
+++ b/src/CoreBundle/Controller/CatalogueController.php
@@ -25,6 +25,7 @@
 use ExtraField;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 #[Route('/catalogue')]
@@ -176,20 +177,327 @@ public function listSessions(): JsonResponse
         return $this->json($data);
     }
 
+    private function readCatalogueSettings(SettingsManager $settingsManager): array
+    {
+        $raw = $settingsManager->getSetting('catalog.course_catalog_settings');
+        if (empty($raw)) {
+            return [];
+        }
+
+        if (is_string($raw)) {
+            $raw = json_decode($raw, true) ?? [];
+        }
+
+        if (isset($raw['courses']) && is_array($raw['courses'])) {
+            return $raw['courses'];
+        }
+
+        return is_array($raw) ? $raw : [];
+    }
+
     #[Route('/course-extra-fields', name: 'chamilo_core_catalogue_course_extra_fields', methods: ['GET'])]
     public function getCourseExtraFields(SettingsManager $settingsManager): JsonResponse
     {
-        $extraField = new \ExtraField('course');
-        $fields = $extraField->get_all() ?? [];
-        $result = array_map(static function ($field) {
-            return [
-                'variable'     => $field['variable'],
-                'display_text' => $field['display_text'],
-                'value_type'   => (int) ($field['value_type'] ?? 0),
+        $settings = $this->readCatalogueSettings($settingsManager);
+        if (empty($settings)) {
+            return $this->json([]);
+        }
+
+        $allowed = array_map('strval', $settings['extra_fields_in_search_form'] ?? []);
+
+        $ef = new \ExtraField('course');
+        $raw = $ef->get_all();
+
+        $mapped = array_map(function ($f) {
+            $type = (int) $f['value_type'];
+
+            $base = [
+                'variable'     => (string) $f['variable'],
+                'title'        => (string) ($f['display_text'] ?? $f['variable']),
+                'value_type'   => $type,
+                'defaultValue' => $f['field_default_value'] ?? null,
             ];
-        }, $fields);
 
-        return $this->json($result);
+            $options = [];
+            if (!empty($f['options']) && is_array($f['options'])) {
+                foreach ($f['options'] as $opt) {
+                    $options[] = [
+                        'id'     => isset($opt['id']) ? (int) $opt['id'] : 0,
+                        'value'  => isset($opt['option_value']) ? (string) $opt['option_value'] : (string) ($opt['id'] ?? ''),
+                        'label'  => (string) ($opt['display_text'] ?? $opt['option_value'] ?? ''),
+                        'parent' => isset($opt['parent_id']) ? (int) $opt['parent_id'] : 0,
+                    ];
+                }
+            }
+
+            $typesWithOptions = [
+                \ExtraField::FIELD_TYPE_SELECT,
+                \ExtraField::FIELD_TYPE_SELECT_MULTIPLE,
+                \ExtraField::FIELD_TYPE_DOUBLE_SELECT,
+                \ExtraField::FIELD_TYPE_TRIPLE_SELECT,
+                \ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD,
+                \ExtraField::FIELD_TYPE_RADIO,
+                \ExtraField::FIELD_TYPE_CHECKBOX,
+                \ExtraField::FIELD_TYPE_TAG,
+            ];
+
+            if (in_array($type, $typesWithOptions, true)) {
+                $base['options'] = $options;
+            }
+
+            return $base;
+        }, $raw);
+
+        if (!empty($allowed)) {
+            $byVar = [];
+            foreach ($mapped as $row) {
+                $byVar[$row['variable']] = $row;
+            }
+            $ordered = [];
+            foreach ($allowed as $var) {
+                if (isset($byVar[$var])) {
+                    $ordered[] = $byVar[$var];
+                }
+            }
+            $mapped = $ordered;
+        }
+
+        return $this->json(array_values($mapped));
+    }
+
+    #[Route('/course-extra-field-values', name: 'chamilo_core_catalogue_course_extra_field_values', methods: ['GET'])]
+    public function getCourseExtraFieldValues(Request $request, SettingsManager $settingsManager): JsonResponse
+    {
+        $ids = array_filter(array_map('intval', explode(',', (string) $request->query->get('ids', ''))));
+        if (!$ids) {
+            return $this->json(new \stdClass());
+        }
+
+        $settings = $this->readCatalogueSettings($settingsManager);
+
+        // Union of allowed variables (search form ∪ course card)
+        $allowedSearch = array_map('strval', $settings['extra_fields_in_search_form'] ?? []);
+        $allowedCard   = array_map('strval', $settings['extra_fields_in_course_block'] ?? []);
+        $allowedVars   = array_values(array_unique(array_filter(array_merge($allowedSearch, $allowedCard))));
+
+        // Force-include variables that we always want to expose
+        $allowedVars = array_values(array_unique(array_merge($allowedVars, ['video_url', 'special_course'])));
+
+        if (!$allowedVars) {
+            return $this->json(new \stdClass());
+        }
+
+        $ef  = new \ExtraField('course');
+        $efv = new \ExtraFieldValue('course');
+
+        // Build metadata maps (by variable and by id)
+        $allFields = $ef->get_all(); // rows: ['id','variable','value_type','field_default_value', ...]
+        $byVar = [];
+        $byId  = [];
+
+        foreach ($allFields as $f) {
+            $var = (string) ($f['variable'] ?? '');
+            if (!$var) {
+                continue;
+            }
+            if (!in_array($var, $allowedVars, true)) {
+                continue; // only expose what we explicitly allow
+            }
+
+            $type    = (int) ($f['value_type'] ?? 0);
+            $default = $f['field_default_value'] ?? null;
+
+            $byVar[$var] = [
+                'id'           => (int) ($f['id'] ?? 0),
+                'value_type'   => $type,
+                'default_raw'  => $default,
+            ];
+            if (!empty($f['id'])) {
+                $byId[(int) $f['id']] = $var;
+            }
+        }
+
+        // If settings reference a variable that doesn't exist, still include it with a null-like default
+        foreach ($allowedVars as $var) {
+            if (!isset($byVar[$var])) {
+                $byVar[$var] = [
+                    'id'           => 0,
+                    'value_type'   => 0,     // unknown → treat as text-like
+                    'default_raw'  => null,
+                ];
+            }
+        }
+
+        $out = [];
+
+        foreach ($ids as $courseId) {
+            $values = [];
+            $rows = method_exists($efv, 'getAllValuesByItem') ? $efv->getAllValuesByItem($courseId) : null;
+            if (!is_array($rows) || !$rows) {
+                $rows = method_exists($efv, 'get_values_by_item') ? $efv->get_values_by_item($courseId) : null;
+            }
+
+            if (!is_array($rows) || !$rows) {
+                $rows = method_exists($ef, 'getDataAndFormattedValues')
+                    ? $ef->getDataAndFormattedValues($courseId, false, array_keys($byVar))
+                    : null;
+            }
+
+            // Normalize bulk rows into { var => value }
+            if (is_array($rows)) {
+                // Handle both shapes: list-of-rows and map-by-variable
+                $hasStringKeys = static function(array $a): bool {
+                    foreach (array_keys($a) as $k) {
+                        if (is_string($k)) return true;
+                    }
+                    return false;
+                };
+
+                if ($hasStringKeys($rows) && !isset($rows[0])) {
+                    // Shape A: map variable => value/row
+                    foreach ($rows as $var => $valRaw) {
+                        if (!isset($byVar[$var])) continue;
+
+                        $type = (int) ($byVar[$var]['value_type'] ?? 0);
+                        $val  = $valRaw;
+                        $arr  = null;
+
+                        if (is_array($valRaw)) {
+                            // Common keys across Chamilo providers
+                            $val = $valRaw['field_value'] ?? $valRaw['value'] ?? $valRaw['value_raw'] ?? null;
+                            $arr = $valRaw['value_as_array'] ?? $valRaw['value_array'] ?? null;
+
+                            // Prefer explicit type if row provides it
+                            if (isset($valRaw['value_type']) || isset($valRaw['field_type'])) {
+                                $type = (int) ($valRaw['value_type'] ?? $valRaw['field_type']);
+                            }
+                        }
+
+                        $values[$var] = $this->normaliseValueForType($type, $val, is_array($arr) ? $arr : null);
+                    }
+                } else {
+                    // Shape B: list of rows (possibly indexed by field ID)
+                    foreach ($rows as $key => $r) {
+                        // Resolve variable
+                        $var = (string) ($r['variable'] ?? $r['field_variable'] ?? '');
+                        if (!$var && isset($r['id']) && isset($byId[(int) $r['id']])) {
+                            $var = $byId[(int) $r['id']];
+                        }
+                        if (!$var && isset($r['field_id']) && isset($byId[(int) $r['field_id']])) {
+                            $var = $byId[(int) $r['field_id']];
+                        }
+                        if (!$var || !isset($byVar[$var])) {
+                            continue;
+                        }
+
+                        $type = (int) ($r['value_type'] ?? $r['field_type'] ?? $byVar[$var]['value_type'] ?? 0);
+                        $val  = $r['field_value'] ?? $r['value'] ?? null;
+                        $arr  = $r['value_as_array'] ?? $r['value_array'] ?? null;
+
+                        $values[$var] = $this->normaliseValueForType($type, $val, is_array($arr) ? $arr : null);
+                    }
+                }
+            }
+
+            $missing = array_diff(array_keys($byVar), array_keys($values));
+            foreach ($missing as $var) {
+                $meta = $byVar[$var];
+                $type = (int) ($meta['value_type'] ?? 0);
+                $val  = null;
+                $row  = null;
+
+                // Prefer lookup by field_id when available
+                if (!empty($meta['id'])) {
+                    $row = $efv->get_values_by_handler_and_field_id($courseId, (int) $meta['id'], false);
+                }
+                // Fallback by variable
+                if (!$row && method_exists($efv, 'get_values_by_handler_and_field_variable')) {
+                    $row = $efv->get_values_by_handler_and_field_variable($courseId, $var, false);
+                }
+
+                if (is_array($row)) {
+                    // Unify shape
+                    $type = (int) ($row['value_type'] ?? $type);
+                    $val  = $row['field_value'] ?? $row['value'] ?? null;
+                    $values[$var] = $this->normaliseValueForType($type, $val, null);
+                }
+            }
+
+            // Ensure all allowed vars exist with sensible defaults
+            $norm = [];
+            foreach ($byVar as $var => $meta) {
+                if (array_key_exists($var, $values)) {
+                    $norm[$var] = $values[$var];
+                } else {
+                    $norm[$var] = $this->normaliseDefaultForType(
+                        (int) ($meta['value_type'] ?? 0),
+                        $meta['default_raw'] ?? null
+                    );
+                }
+            }
+
+            $out[$courseId] = (object) $norm;
+        }
+
+        return $this->json($out);
+    }
+
+    /**
+     * Normalizes a stored value for the given type so the frontend gets consistent shapes:
+     * - Checkbox => boolean
+     * - Multiselect/Tags => array<string>
+     * - Double/Triple/Select+Text => array when applicable (or string)
+     */
+    private function normaliseValueForType(int $type, $value, ?array $arrayValue)
+    {
+        switch ($type) {
+            case \ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
+            case \ExtraField::FIELD_TYPE_TAG:
+                if (is_array($arrayValue)) return array_values($arrayValue);
+                if ($value === null || $value === '') return [];
+                return is_array($value) ? array_values($value) : [(string) $value];
+
+            case \ExtraField::FIELD_TYPE_CHECKBOX:
+                if (is_bool($value)) return $value;
+                $v = strtolower((string) $value);
+                return in_array($v, ['1','true','yes','on'], true);
+
+            case \ExtraField::FIELD_TYPE_DOUBLE_SELECT:
+            case \ExtraField::FIELD_TYPE_TRIPLE_SELECT:
+            case \ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD:
+                if (is_array($arrayValue)) return array_values($arrayValue);
+                if (is_array($value))     return array_values($value);
+                return $value;
+
+            default:
+                return $value;
+        }
+    }
+
+    /**
+     * Provides a sensible default when the course has no stored value:
+     * - Checkbox => false (unless default_raw explicitly says otherwise)
+     * - Multiselect/Tags => []
+     * - Others => null (or normalized default_raw when present)
+     */
+    private function normaliseDefaultForType(int $type, $defaultRaw)
+    {
+        // If a default is set at field level, try to normalize it first.
+        if ($defaultRaw !== null && $defaultRaw !== '') {
+            return $this->normaliseValueForType($type, $defaultRaw, is_array($defaultRaw) ? $defaultRaw : null);
+        }
+
+        switch ($type) {
+            case \ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
+            case \ExtraField::FIELD_TYPE_TAG:
+                return [];
+
+            case \ExtraField::FIELD_TYPE_CHECKBOX:
+                return false;
+
+            default:
+                return null;
+        }
     }
 
     #[Route('/auto-subscribe-course/{courseId}', name: 'chamilo_core_catalogue_auto_subscribe_course', methods: ['POST'])]

From f4c47d02add2cd90d3aa92b616e99b3e803a1f99 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Thu, 11 Sep 2025 13:20:11 -0500
Subject: [PATCH 2/2] Revert "Course: Improve filter by extra fields from
 catalog - refs #6235"

This reverts commit 7d537e51274c112c664c1b86faf5270a8485ee8b.
---
 .../course/AdvancedCourseFilters.vue          | 237 --------
 assets/vue/views/course/CatalogueCourses.vue  | 530 ++++++++----------
 .../inc/lib/pear/HTML/QuickForm/radio.php     |   2 +-
 public/plugin/Bbb/lib/bbb.lib.php             | 159 ------
 public/plugin/Bbb/lib/bbb_plugin.class.php    |  84 ---
 public/plugin/Bbb/listing.php                 |  22 -
 .../Controller/CatalogueController.php        | 326 +----------
 7 files changed, 249 insertions(+), 1111 deletions(-)
 delete mode 100644 assets/vue/components/course/AdvancedCourseFilters.vue

diff --git a/assets/vue/components/course/AdvancedCourseFilters.vue b/assets/vue/components/course/AdvancedCourseFilters.vue
deleted file mode 100644
index 61137d2ba49..00000000000
--- a/assets/vue/components/course/AdvancedCourseFilters.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <form class="grid gap-3 md:grid-cols-4 items-end" @submit.prevent="apply">
-    <div v-if="allowTitle">
-      <label class="block text-sm font-medium mb-1">{{ $t('Title') }}</label>
-      <InputText v-model="model.title" :placeholder="$t('Search by title')" />
-    </div>
-
-    <template v-for="f in fields" :key="f.variable">
-      <!-- SELECT simple -->
-      <div v-if="isSelect(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <Dropdown
-          v-model="model.extra[f.variable]"
-          :options="toDropdown(f.options)"
-          optionLabel="label"
-          optionValue="value"
-          showClear
-          :placeholder="$t('Select')"
-          class="w-full"
-        />
-      </div>
-
-      <!-- MULTISELECT -->
-      <div v-else-if="isMulti(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <MultiSelect
-          v-model="model.extra[f.variable]"
-          :options="toDropdown(f.options)"
-          optionLabel="label"
-          optionValue="value"
-          display="chip"
-          :placeholder="$t('Select')"
-          class="w-full"
-        />
-      </div>
-
-      <!-- RADIO -->
-      <div v-else-if="isRadio(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <div class="flex flex-wrap gap-3">
-          <div v-for="opt in toDropdown(f.options)" :key="opt.value" class="flex items-center gap-2">
-            <RadioButton :inputId="f.variable + opt.value" :value="opt.value" v-model="model.extra[f.variable]" />
-            <label :for="f.variable + opt.value">{{ opt.label }}</label>
-          </div>
-        </div>
-      </div>
-
-      <!-- CHECKBOX -->
-      <div v-else-if="isCheckbox(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <div v-if="hasOptions(f)" class="flex flex-col gap-1">
-          <div v-for="opt in toDropdown(f.options)" :key="opt.value" class="flex items-center gap-2">
-            <Checkbox :inputId="f.variable + opt.value"
-                      :value="opt.value"
-                      v-model="model.extra[f.variable]" binary="false" />
-            <label :for="f.variable + opt.value">{{ opt.label }}</label>
-          </div>
-        </div>
-        <div v-else class="flex items-center gap-2">
-          <Checkbox :inputId="f.variable" v-model="model.extra[f.variable]" binary />
-          <label :for="f.variable">{{ $t('Yes') }}</label>
-        </div>
-      </div>
-
-      <!-- DATE -->
-      <div v-else-if="isDate(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <Calendar v-model="model.extra[f.variable]" dateFormat="yy-mm-dd" showIcon class="w-full" />
-      </div>
-
-      <!-- DATETIME -->
-      <div v-else-if="isDateTime(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <Calendar v-model="model.extra[f.variable]" showTime hourFormat="24" dateFormat="yy-mm-dd" showIcon class="w-full" />
-      </div>
-
-      <!-- SELECT + TEXT -->
-      <div v-else-if="isSelectWithText(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <div class="grid grid-cols-2 gap-2">
-          <Dropdown
-            v-model="model.extra[f.variable]"
-            :options="toDropdown(level1(f))"
-            optionLabel="label" optionValue="id" showClear class="w-full"
-          />
-          <InputText v-model="model.extra[`${f.variable}_second`]" :placeholder="$t('Type value')" />
-        </div>
-      </div>
-
-      <!-- DOUBLE SELECT -->
-      <div v-else-if="isDouble(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <div class="grid grid-cols-2 gap-2">
-          <Dropdown
-            v-model="model.extra[f.variable]"
-            :options="toDropdown(level1(f))"
-            optionLabel="label" optionValue="id" showClear class="w-full"
-            @change="onDoubleChange(f)"
-          />
-          <Dropdown
-            v-model="model.extra[`${f.variable}_second`]"
-            :options="toDropdown(level2(f, model.extra[f.variable]))"
-            optionLabel="label" optionValue="id" showClear class="w-full"
-            :disabled="!model.extra[f.variable]"
-          />
-        </div>
-      </div>
-
-      <!-- TRIPLE SELECT -->
-      <div v-else-if="isTriple(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <div class="grid grid-cols-3 gap-2">
-          <Dropdown
-            v-model="model.extra[f.variable]"
-            :options="toDropdown(level1(f))"
-            optionLabel="label" optionValue="id" showClear class="w-full"
-            @change="onTripleL1Change(f)"
-          />
-          <Dropdown
-            v-model="model.extra[`${f.variable}_second`]"
-            :options="toDropdown(level2(f, model.extra[f.variable]))"
-            optionLabel="label" optionValue="id" showClear class="w-full"
-            :disabled="!model.extra[f.variable]"
-            @change="onTripleL2Change(f)"
-          />
-          <Dropdown
-            v-model="model.extra[`${f.variable}_third`]"
-            :options="toDropdown(level3(f, model.extra[`${f.variable}_second`]))"
-            optionLabel="label" optionValue="id" showClear class="w-full"
-            :disabled="!model.extra[`${f.variable}_second`]"
-          />
-        </div>
-      </div>
-
-      <!-- TAGS -->
-      <div v-else-if="isTag(f)">
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <Chips v-model="model.extra[f.variable]" :placeholder="$t('Add tags…')" />
-      </div>
-
-      <!-- TEXT / INTEGER / FLOAT / DURATION  -->
-      <div v-else>
-        <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <InputText v-model="model.extra[f.variable]" />
-      </div>
-    </template>
-
-    <div class="md:col-span-4 flex flex-wrap gap-2 justify-end">
-      <Button type="button" class="p-button-outlined" :label="$t('Clear')" @click="clear" />
-      <Button type="submit" :label="$t('Apply filters')" icon="pi pi-filter" />
-    </div>
-  </form>
-</template>
-
-<script setup>
-import { reactive, computed } from 'vue'
-import Dropdown from 'primevue/dropdown'
-import MultiSelect from 'primevue/multiselect'
-import Calendar from 'primevue/calendar'
-import InputText from 'primevue/inputtext'
-import Checkbox from 'primevue/checkbox'
-import RadioButton from 'primevue/radiobutton'
-import Chips from 'primevue/chips'
-import Button from 'primevue/button'
-
-const TYPE = {
-  TEXT: 1, TEXTAREA: 2, RADIO: 3, SELECT: 4, SELECT_MULTI: 5,
-  DATE: 6, DATETIME: 7, DOUBLE: 8, DIVIDER: 9, TAG: 10,
-  TIMEZONE: 11, SOCIAL: 12, CHECKBOX: 13, MOBILE: 14, INTEGER: 15,
-  FILE_IMAGE: 16, FLOAT: 17, FILE: 18, VIDEO_URL: 19, LETTERS_ONLY: 20,
-  ALPHANUM: 21, LETTERS_SPACE: 22, ALPHANUM_SPACE: 23, GEO: 24,
-  GEO_COORD: 25, SELECT_WITH_TEXT: 26, TRIPLE: 27, DURATION: 28,
-}
-
-// Props
-const props = defineProps({
-  fields: { type: Array, default: () => [] },
-  allowTitle: { type: Boolean, default: true },
-})
-const emit = defineEmits(['apply', 'clear'])
-
-const model = reactive({
-  title: '',
-  extra: {},
-})
-
-const isSelect        = f => f.value_type === TYPE.SELECT
-const isMulti         = f => f.value_type === TYPE.SELECT_MULTI
-const isRadio         = f => f.value_type === TYPE.RADIO
-const isCheckbox      = f => f.value_type === TYPE.CHECKBOX
-const isDate          = f => f.value_type === TYPE.DATE
-const isDateTime      = f => f.value_type === TYPE.DATETIME
-const isDouble        = f => f.value_type === TYPE.DOUBLE
-const isTriple        = f => f.value_type === TYPE.TRIPLE
-const isSelectWithText= f => f.value_type === TYPE.SELECT_WITH_TEXT
-const isTag           = f => f.value_type === TYPE.TAG
-const hasOptions      = f => Array.isArray(f.options) && f.options.length > 0
-
-const toDropdown = opts => (opts || []).map(o => ({
-  id: o.id, label: o.label, value: o.value ?? o.id, parent: o.parent ?? 0,
-}))
-
-const level1 = f => (f.options || []).filter(o => Number(o.parent) === 0)
-const level2 = (f, parentId) => (f.options || []).filter(o => String(o.parent) === String(parentId))
-const level3 = (f, parentId) => (f.options || []).filter(o => String(o.parent) === String(parentId))
-
-function onDoubleChange(f) {
-  model.extra[`${f.variable}_second`] = ''
-}
-function onTripleL1Change(f) {
-  model.extra[`${f.variable}_second`] = ''
-  model.extra[`${f.variable}_third`] = ''
-}
-function onTripleL2Change(f) {
-  model.extra[`${f.variable}_third`] = ''
-}
-
-function clear() {
-  model.title = ''
-  model.extra = {}
-  emit('clear')
-}
-
-function apply() {
-  const payload = {}
-  if (model.title?.trim()) payload.title = model.title.trim()
-
-  Object.entries(model.extra).forEach(([k, v]) => {
-    if (v === null || v === undefined) return
-    if (Array.isArray(v) && v.length === 0) return
-    if (typeof v === 'string' && v.trim() === '') return
-    payload[`extra_${k}`] = v
-  })
-
-  emit('apply', payload)
-}
-</script>
diff --git a/assets/vue/views/course/CatalogueCourses.vue b/assets/vue/views/course/CatalogueCourses.vue
index 19ddc045d7a..5df7d33aa3e 100644
--- a/assets/vue/views/course/CatalogueCourses.vue
+++ b/assets/vue/views/course/CatalogueCourses.vue
@@ -7,12 +7,12 @@
         <strong>{{ $t("Matching courses") }}:</strong>
         {{ totalVisibleCourses }}
       </div>
-      <div class="flex gap-3 items-center">
+      <div class="flex gap-3">
         <Button
           :label="$t('Clear filter results')"
           class="p-button-outlined"
           icon="pi pi-filter-slash"
-          @click="clearFilter"
+          @click="clearFilter()"
         />
         <Button
           :label="$t('Advanced search')"
@@ -20,7 +20,13 @@
           icon="pi pi-sliders-h"
           @click="showAdvancedSearch = !showAdvancedSearch"
         />
-
+        <Button
+          v-if="showAdvancedSearch"
+          :label="$t('Apply advanced filters')"
+          icon="pi pi-check"
+          class="p-button-sm p-button-success"
+          @click="applyAdvancedSearch"
+        />
         <Dropdown
           v-if="allSortOptions.length"
           v-model="sortField"
@@ -40,23 +46,80 @@
         </div>
       </div>
     </div>
+    <div
+      v-if="showAdvancedSearch"
+      class="p-4 border border-gray-300 rounded bg-white mb-6"
+    >
+      <div class="grid sm:grid-cols-3 gap-4 mb-4">
+        <InputText
+          v-if="courseCatalogueSettings.filters?.by_title"
+          v-model="advancedFilters.title"
+          :placeholder="$t('Filter by title')"
+        />
+        <InputText
+          v-if="courseCatalogueSettings.filters?.by_category"
+          v-model="advancedFilters.category"
+          :placeholder="$t('Filter by category')"
+        />
+        <Dropdown
+          v-if="courseCatalogueSettings.filters?.by_language && languages.length > 1"
+          v-model="advancedFilters.language"
+          :options="languages"
+          optionLabel="originalName"
+          optionValue="isocode"
+          :placeholder="$t('Filter by language')"
+          class="w-full"
+        />
+      </div>
 
-    <!-- Advanced search form -->
-    <div v-if="showAdvancedSearch" class="p-4 border border-gray-300 rounded bg-white mb-6">
-      <AdvancedCourseFilters
-        :key="advancedFormKey"
-        :fields="extraFields"
-        :allowTitle="courseCatalogueSettings.filters?.by_title ?? true"
-        @apply="onAdvancedApply"
-        @clear="onAdvancedClear"
-      />
+      <div
+        class="grid sm:grid-cols-3 gap-4 mb-4"
+        v-if="searchExtraFields.length > 0"
+      >
+        <template
+          v-for="field in searchExtraFields"
+          :key="field.variable"
+        >
+          <InputText
+            v-if="[1, 15, 17].includes(field.value_type)"
+            v-model="advancedFilters[field.variable]"
+            :placeholder="formatLabel(field)"
+            class="w-full"
+          />
+          <Textarea
+            v-else-if="field.value_type === 2"
+            v-model="advancedFilters[field.variable]"
+            :placeholder="formatLabel(field)"
+            class="w-full"
+            autoResize
+          />
+          <Calendar
+            v-else-if="field.value_type === 6"
+            v-model="advancedFilters[field.variable]"
+            :placeholder="formatLabel(field)"
+            class="w-full"
+            dateFormat="yy-mm-dd"
+            showIcon
+          />
+          <InputText
+            v-else
+            v-model="advancedFilters[field.variable]"
+            :placeholder="formatLabel(field)"
+            class="w-full"
+          />
+        </template>
+      </div>
     </div>
-
-    <div v-if="status" class="text-center text-gray-500 py-6">
+    <div
+      v-if="status"
+      class="text-center text-gray-500 py-6"
+    >
       {{ $t("Loading courses. Please wait.") }}
     </div>
-
-    <div v-else-if="!filteredCourses.length" class="text-center text-gray-500 py-6">
+    <div
+      v-else-if="!filteredCourses.length"
+      class="text-center text-gray-500 py-6"
+    >
       {{ $t("No course available") }}
     </div>
 
@@ -73,7 +136,10 @@
       />
     </div>
 
-    <div v-if="loadingMore" class="text-center text-gray-400 py-4">
+    <div
+      v-if="loadingMore"
+      class="text-center text-gray-400 py-4"
+    >
       {{ $t("Loading more courses...") }}
     </div>
   </div>
@@ -82,7 +148,6 @@
 import { computed, onMounted, ref, watch } from "vue"
 import InputText from "primevue/inputtext"
 import Button from "primevue/button"
-import Dropdown from "primevue/dropdown"
 import { FilterMatchMode } from "@primevue/core/api"
 import { useNotification } from "../../composables/notification"
 import { useLanguage } from "../../composables/language"
@@ -93,20 +158,73 @@ import { useRouter } from "vue-router"
 import { usePlatformConfig } from "../../store/platformConfig"
 import { useI18n } from "vue-i18n"
 import courseService from "../../services/courseService"
-import AdvancedCourseFilters from "../../components/course/AdvancedCourseFilters.vue"
 
 const { t } = useI18n()
 const sortField = ref("title")
 
+const formatLabel = (field) => {
+  if (field.display_text) return field.display_text
+  return field.variable
+    .replace(/_/g, " ")
+    .replace(/\b\w/g, (l) => l.toUpperCase())
+}
+
+const standardSortOptions = computed(() => {
+  return courseCatalogueSettings.value.standard_sort_options ?? {}
+})
+
+const extraSortOptions = computed(() => {
+  return courseCatalogueSettings.value.extra_field_sort_options ?? {}
+})
+
+const allSortOptions = computed(() => {
+  const standard = Object.entries(standardSortOptions.value).map(([key, value]) => ({
+    label: t(key.replace("point_info/", "")),
+    value: key,
+    order: value,
+    type: "standard",
+  }))
+  const extra = Object.entries(extraSortOptions.value).map(([key, value]) => ({
+    label: key,
+    value: key,
+    order: value,
+    type: "extra",
+  }))
+  return [...standard, ...extra]
+})
+
+const cardExtraFields = computed(() => {
+  const allowed = courseCatalogueSettings.value.extra_fields_in_course_block ?? []
+  return extraFields.value.filter((field) => allowed.includes(field.variable))
+})
+
+const showAdvancedSearch = ref(false)
+const advancedFilters = ref({
+  title: "",
+  category: "",
+  language: "",
+})
+
+const extraFields = ref([])
+const { showErrorNotification } = useNotification()
+const { languageList } = useLanguage()
+const languages = languageList
 const router = useRouter()
 const securityStore = useSecurityStore()
+
 const platformConfigStore = usePlatformConfig()
 const courseCatalogueSettings = computed(() => {
   let raw = platformConfigStore.getSetting("catalog.course_catalog_settings")
   if (!raw || raw === false || raw === "false") return {}
   try {
-    if (typeof raw === "string") raw = JSON.parse(raw)
-    if (typeof raw.courses === "object") return raw.courses
+    if (typeof raw === "string") {
+      raw = JSON.parse(raw)
+    }
+
+    if (typeof raw.courses === "object") {
+      return raw.courses
+    }
+
     return raw
   } catch (e) {
     console.error("Invalid catalogue settings format", e)
@@ -114,14 +232,86 @@ const courseCatalogueSettings = computed(() => {
   }
 })
 
+const searchExtraFields = computed(() => {
+  const allowed = courseCatalogueSettings.value.extra_fields_in_search_form ?? []
+  return extraFields.value.filter((field) => allowed.includes(field.variable))
+})
+
+const showCourseTitle = computed(() => courseCatalogueSettings.value.hide_course_title !== true)
+
+const redirectAfterSubscription = computed(
+  () => courseCatalogueSettings.value.redirect_after_subscription ?? "course_catalog",
+)
+
+const onUserSubscribed = ({ courseId, newUser }) => {
+  const index = courses.value.findIndex((c) => c.id === courseId)
+  if (index !== -1) {
+    const oldCourse = courses.value[index]
+    const updatedCourse = {
+      ...oldCourse,
+      subscribed: true,
+      users: [...(oldCourse.users || []), newUser],
+    }
+
+    courses.value[index] = updatedCourse
+    const filteredIndex = filteredCourses.value.findIndex((c) => c.id === courseId)
+    if (filteredIndex !== -1) {
+      filteredCourses.value[filteredIndex] = updatedCourse
+    }
+    applyAdvancedSearch()
+    if (redirectAfterSubscription.value === "course_home") {
+      router.push({ name: "CourseHome", params: { id: courseId } })
+    }
+  }
+}
+
+const applyAdvancedSearch = () => {
+  filteredCourses.value = courses.value.filter((course) => {
+    const keyword = filters.value.global.value?.toLowerCase()
+    const matchesGlobal =
+      !keyword || course.title?.toLowerCase().includes(keyword) || course.description?.toLowerCase().includes(keyword)
+
+    const matchesTitle =
+      !advancedFilters.value.title || course.title?.toLowerCase().includes(advancedFilters.value.title.toLowerCase())
+
+    const matchesCategory =
+      !advancedFilters.value.category ||
+      course.categories?.some((cat) => cat.title?.toLowerCase().includes(advancedFilters.value.category.toLowerCase()))
+
+    const matchesLanguage =
+      !advancedFilters.value.language ||
+      course.courseLanguage?.toLowerCase().includes(advancedFilters.value.language?.toLowerCase())
+
+    const matchesExtras = extraFields.value.every((field) => {
+      const val = advancedFilters.value[field.variable]
+      if (!val) return true
+      const fieldValue = course.extra_fields?.[field.variable]
+      return typeof fieldValue === "string" ? fieldValue.toLowerCase().includes(val.toLowerCase()) : true
+    })
+
+    return matchesGlobal && matchesTitle && matchesCategory && matchesLanguage && matchesExtras
+  })
+
+  visibleCount.value = rowsPerScroll
+}
+
 const isAnonymous = !securityStore.isAuthenticated
 const isPrivilegedUser =
   securityStore.isAdmin || securityStore.isTeacher || securityStore.isHRM || securityStore.isSessionAdmin
 
 const allowCatalogueAccess = computed(() => {
-  if (isAnonymous) return platformConfigStore.getSetting("catalog.course_catalog_published") !== "false"
-  if (isPrivilegedUser) return true
-  if (securityStore.isStudent) return platformConfigStore.getSetting("catalog.allow_students_to_browse_courses") !== "false"
+  if (isAnonymous) {
+    return platformConfigStore.getSetting("catalog.course_catalog_published") !== "false"
+  }
+
+  if (isPrivilegedUser) {
+    return true
+  }
+
+  if (securityStore.isStudent) {
+    return platformConfigStore.getSetting("catalog.allow_students_to_browse_courses") !== "false"
+  }
+
   return false
 })
 
@@ -139,18 +329,12 @@ if (!allowCatalogueAccess.value) {
 const currentUserId = securityStore.user?.id ?? null
 const status = ref(false)
 const courses = ref([])
-const filteredCourses = ref([])
 const filters = ref({ global: { value: null, matchMode: FilterMatchMode.CONTAINS } })
 
 const rowsPerScroll = 9
 const visibleCount = ref(rowsPerScroll)
 const loadingMore = ref(false)
 
-const extraFields = ref([])
-const { showErrorNotification } = useNotification()
-const { languageList } = useLanguage()
-const languages = languageList
-
 const loadExtraFields = async () => {
   try {
     const response = await fetch("/catalogue/course-extra-fields")
@@ -166,21 +350,12 @@ const load = async () => {
   try {
     courses.value = await courseService.loadCourseCatalogue()
 
-    const ids = courses.value.map(c => c.id).join(',')
-    if (ids) {
-      const res = await fetch(`/catalogue/course-extra-field-values?ids=${ids}`)
-      const extraByCourse = await res.json()
-      courses.value = courses.value.map(c => ({
-        ...c,
-        extra_fields: extraByCourse[c.id] || {}
-      }))
-    }
-
     if (currentUserId) {
       const votes = await userRelCourseVoteService.getUserVotes({
         userId: currentUserId,
         urlId: window.access_url_id,
       })
+
       for (const vote of votes) {
         let courseId
         if (typeof vote.course === "object" && vote.course !== null) {
@@ -188,8 +363,11 @@ const load = async () => {
         } else if (typeof vote.course === "string") {
           courseId = parseInt(vote.course.split("/").pop())
         }
+
         const course = courses.value.find((c) => c.id === courseId)
-        if (course) course.userVote = vote
+        if (course) {
+          course.userVote = vote
+        }
       }
     }
   } catch (error) {
@@ -199,213 +377,19 @@ const load = async () => {
   }
 }
 
-const standardSortOptions = computed(() => courseCatalogueSettings.value.standard_sort_options ?? {})
-const extraSortOptions = computed(() => courseCatalogueSettings.value.extra_field_sort_options ?? {})
-
-const allSortOptions = computed(() => {
-  const standard = Object.entries(standardSortOptions.value).map(([key, value]) => ({
-    label: t(key.replace("point_info/", "")),
-    value: key,
-    order: value,
-    type: "standard",
-  }))
-  const extra = Object.entries(extraSortOptions.value).map(([key, value]) => ({
-    label: key,
-    value: key,
-    order: value,
-    type: "extra",
-  }))
-  return [...standard, ...extra]
-})
-
-const cardExtraFields = computed(() => {
-  const allowed = courseCatalogueSettings.value.extra_fields_in_course_block ?? []
-  return extraFields.value.filter((field) => allowed.includes(field.variable))
-})
-
-const showCourseTitle = computed(() => courseCatalogueSettings.value.hide_course_title !== true)
-
-const showAdvancedSearch = ref(false)
-const advancedPayload = ref({})
-const advancedFormKey = ref(0)
-
-function onAdvancedApply(payload) {
-  advancedPayload.value = payload || {}
-  applyAdvancedSearch()
-}
-
-function onAdvancedClear() {
-  advancedPayload.value = {}
+onMounted(async () => {
+  window.addEventListener("scroll", handleScroll)
+  await loadExtraFields()
+  await load()
   applyAdvancedSearch()
-}
-
-function normalizeString(x) {
-  return (x ?? "").toString().trim().toLowerCase()
-}
-
-function splitCandidates(str) {
-  return normalizeString(str)
-    .split(/[:;,\|]+/)
-    .map((s) => s.trim())
-    .filter(Boolean)
-}
-
-function optionLabelBy({ field, idOrValue }) {
-  if (!field?.options?.length) return null
-  const found = field.options.find(
-    (o) => String(o.id) === String(idOrValue) || String(o.value) === String(idOrValue),
-  )
-  return found?.label ?? null
-}
-
-function optionLabelsForArray({ field, arr }) {
-  const out = []
-  for (const v of arr || []) {
-    const lbl = optionLabelBy({ field, idOrValue: v })
-    out.push(normalizeString(lbl ?? v))
-  }
-  return out
-}
-
-function matchesExtraField(course, field, payload) {
-  const courseVal = course?.extra_fields?.[field.variable]
-  if (courseVal == null) return false
-
-  let courseTokens = []
-  if (Array.isArray(courseVal)) {
-    courseTokens = courseVal.map(normalizeString)
-  } else if (typeof courseVal === "object") {
-    courseTokens = Object.values(courseVal).map(normalizeString)
-  } else {
-    courseTokens = splitCandidates(courseVal)
-  }
-
-  const tokensContain = (needle) =>
-    courseTokens.some((tok) => tok.includes(normalizeString(needle)))
-
-  const vt = Number(field.value_type)
-
-  // SELECT simple
-  if (vt === 4) {
-    const sel = payload[`extra_${field.variable}`]
-    if (!sel) return true
-    const label = optionLabelBy({ field, idOrValue: sel }) ?? sel
-    return tokensContain(label) || tokensContain(sel)
-  }
-
-  // MULTISELECT
-  if (vt === 5) {
-    const arr = payload[`extra_${field.variable}`]
-    if (!arr || !arr.length) return true
-    const labels = optionLabelsForArray({ field, arr })
-    return labels.every((lbl) => tokensContain(lbl))
-  }
-
-  // DATE / DATETIME
-  if (vt === 6 || vt === 7) {
-    const sel = payload[`extra_${field.variable}`]
-    if (!sel) return true
-    const dateStr =
-      sel instanceof Date
-        ? `${sel.getFullYear()}-${String(sel.getMonth() + 1).padStart(2, "0")}-${String(sel.getDate()).padStart(2, "0")}`
-        : String(sel)
-    return tokensContain(dateStr)
-  }
-
-  // DOUBLE SELECT
-  if (vt === 8) {
-    const first = payload[`extra_${field.variable}`]
-    const second = payload[`extra_${field.variable}_second`]
-    if (!first && !second) return true
-
-    const firstLbl = first ? optionLabelBy({ field, idOrValue: first }) : null
-    const secondLbl = second ? optionLabelBy({ field, idOrValue: second }) : null
-
-    const okFirst = !first || tokensContain(firstLbl ?? first)
-    const okSecond = !second || tokensContain(secondLbl ?? second)
-    return okFirst && okSecond
-  }
-
-  // TAGS
-  if (vt === 10) {
-    const arr = payload[`extra_${field.variable}`]
-    if (!arr || !arr.length) return true
-    const want = arr.map(normalizeString)
-    return want.every((w) => tokensContain(w))
-  }
-
-  // CHECKBOX
-  if (vt === 13) {
-    const v = payload[`extra_${field.variable}`]
-    if (v == null) return true
-    const expected = v === true || v === 1 || v === "1"
-    const yes = ["1", "yes", "true", "on"]
-    const courseHasYes = courseTokens.some((x) => yes.includes(x))
-    return expected ? courseHasYes : !courseHasYes
-  }
-
-  // SELECT + TEXT
-  if (vt === 26) {
-    const first = payload[`extra_${field.variable}`]
-    const text = payload[`extra_${field.variable}_second`]
-    const okFirst = !first || tokensContain(optionLabelBy({ field, idOrValue: first }) ?? first)
-    const okText = !text || tokensContain(text)
-    return okFirst && okText
-  }
-
-  // TRIPLE SELECT
-  if (vt === 27) {
-    const l1 = payload[`extra_${field.variable}`]
-    const l2 = payload[`extra_${field.variable}_second`]
-    const l3 = payload[`extra_${field.variable}_third`]
-    if (!l1 && !l2 && !l3) return true
-    const labels = [l1, l2, l3].filter(Boolean).map((x) => optionLabelBy({ field, idOrValue: x }) ?? x)
-    return labels.every((lbl) => tokensContain(lbl))
-  }
-
-  // DURATION
-  if (vt === 28) {
-    const sel = payload[`extra_${field.variable}`]
-    if (!sel) return true
-    return tokensContain(sel)
-  }
-
-  // Fallback (TEXT/INT/FLOAT/etc.)
-  const val = payload[`extra_${field.variable}`]
-  if (!val) return true
-  return tokensContain(val)
-}
-
-function applyAdvancedSearch() {
-  const keyword = normalizeString(filters.value.global.value)
-  const adv = advancedPayload.value || {}
-
-  filteredCourses.value = courses.value.filter((course) => {
-    const matchesGlobal =
-      !keyword ||
-      normalizeString(course.title).includes(keyword) ||
-      normalizeString(course.description).includes(keyword)
-
-    const matchesTitle =
-      !adv.title || normalizeString(course.title).includes(normalizeString(adv.title))
-
-    const advHasExtra = Object.keys(adv).some((k) => k.startsWith("extra_"))
-    const matchesExtras = !advHasExtra
-      ? true
-      : extraFields.value.every((field) => {
-        const present =
-          adv.hasOwnProperty(`extra_${field.variable}`) ||
-          adv.hasOwnProperty(`extra_${field.variable}_second`) ||
-          adv.hasOwnProperty(`extra_${field.variable}_third`)
-        return present ? matchesExtraField(course, field, adv) : true
-      })
-
-    return matchesGlobal && matchesTitle && matchesExtras
-  })
+})
 
+const clearFilter = () => {
+  filters.value.global.value = null
   visibleCount.value = rowsPerScroll
 }
 
+const filteredCourses = ref([])
 const visibleCoursesBase = computed(() => {
   const hidePrivate = platformConfigStore.getSetting("catalog.course_catalog_hide_private") === "true"
   const sortOpt = allSortOptions.value.find((opt) => opt.value === sortField.value)
@@ -454,10 +438,13 @@ const visibleCoursesBase = computed(() => {
   return list
 })
 
-const visibleCourses = computed(() => visibleCoursesBase.value.slice(0, visibleCount.value))
+const visibleCourses = computed(() => {
+  return visibleCoursesBase.value.slice(0, visibleCount.value)
+})
+
 const totalVisibleCourses = computed(() => visibleCoursesBase.value.length)
 
-function handleScroll() {
+const handleScroll = () => {
   if (loadingMore.value) return
 
   const threshold = 150
@@ -476,29 +463,12 @@ function handleScroll() {
   }
 }
 
-watch(() => filters.value.global.value, () => {
-  visibleCount.value = rowsPerScroll
-  applyAdvancedSearch()
-})
-
-watch(sortField, () => {
-  visibleCount.value = rowsPerScroll
-})
-
-onMounted(async () => {
-  window.addEventListener("scroll", handleScroll)
-  await loadExtraFields()
-  await load()
-  applyAdvancedSearch()
-})
-
-function clearFilter() {
-  filters.value.global.value = null
-  advancedPayload.value = {}
-  advancedFormKey.value++
-  visibleCount.value = rowsPerScroll
-  applyAdvancedSearch()
-}
+watch(
+  () => filters.value.global.value,
+  () => {
+    visibleCount.value = rowsPerScroll
+  },
+)
 
 const saveOrUpdateVote = async (course, value) => {
   try {
@@ -537,33 +507,11 @@ const saveOrUpdateVote = async (course, value) => {
   }
 }
 
-function onRatingChange({ value, course }) {
+const onRatingChange = ({ value, course }) => {
   if (value > 0 && currentUserId) {
     saveOrUpdateVote(course, value)
   }
 }
-
-function onUserSubscribed({ courseId, newUser }) {
-  const index = courses.value.findIndex((c) => c.id === courseId)
-  if (index !== -1) {
-    const oldCourse = courses.value[index]
-    const updatedCourse = {
-      ...oldCourse,
-      subscribed: true,
-      users: [...(oldCourse.users || []), newUser],
-    }
-    courses.value[index] = updatedCourse
-    const filteredIndex = filteredCourses.value.findIndex((c) => c.id === courseId)
-    if (filteredIndex !== -1) {
-      filteredCourses.value[filteredIndex] = updatedCourse
-    }
-    applyAdvancedSearch()
-    const redirectAfterSubscription = courseCatalogueSettings.value.redirect_after_subscription ?? "course_catalog"
-    if (redirectAfterSubscription === "course_home") {
-      router.push({ name: "CourseHome", params: { id: courseId } })
-    }
-  }
-}
 </script>
 <style scoped>
 .catalogue-courses {
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/radio.php b/public/main/inc/lib/pear/HTML/QuickForm/radio.php
index 7dc03c57643..53606377b80 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/radio.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/radio.php
@@ -55,7 +55,7 @@ public function __construct(
         ?array $attributes = []
     ) {
         $this->labelClass = $attributes['label-class'] ?? '';
-        $this->radioClass = $attributes['radio-class'] ?? 'field-radiobutton2';
+        $this->radioClass = $attributes['radio-class'] ?? 'field-radiobutton';
 
         if (isset($attributes['label-class'])) {
             unset($attributes['label-class']);
diff --git a/public/plugin/Bbb/lib/bbb.lib.php b/public/plugin/Bbb/lib/bbb.lib.php
index 39217d2b7dc..e8c1570693e 100644
--- a/public/plugin/Bbb/lib/bbb.lib.php
+++ b/public/plugin/Bbb/lib/bbb.lib.php
@@ -541,25 +541,6 @@ public function createMeeting($params)
                     $meeting->setInternalMeetingId($result['internalMeetingID']);
                     $em->flush();
                 }
-
-                // Register webhook if enabled (no DB tables, pure BBB hooks API)
-                try {
-                    if ($this->plugin->webhooksEnabled()) {
-                        $scope = $this->plugin->webhooksScope(); // 'per_meeting' | 'global'
-                        if ($scope === 'per_meeting') {
-                            $this->registerWebhookForMeeting($meeting->getRemoteId());
-                        } else {
-                            // idempotent: checks existing hooks/list before creating
-                            $this->ensureGlobalWebhook();
-                        }
-                    }
-                } catch (\Throwable $e) {
-                    if ($this->debug) {
-                        error_log('BBB webhook registration failed: '.$e->getMessage());
-                    }
-                    // Do not block meeting start on webhook issues
-                }
-
                 return $this->joinMeeting($meetingName, true);
             }
 
@@ -2183,144 +2164,4 @@ public static function showGlobalConferenceLink($userInfo)
 
         return false;
     }
-
-    /**
-     * Build the callback URL for BBB webhooks, signed with HMAC using the plugin salt.
-     * No DB tables involved.
-     */
-    private function buildWebhookCallbackUrl(?string $meetingId = null): string
-    {
-        // Plugin public endpoint to implement in the next step (receiver)
-        $base = rtrim(api_get_path(WEB_PLUGIN_PATH), '/').'/Bbb/webhook.php';
-
-        $au  = (int) $this->accessUrl;
-        $mid = (string) ($meetingId ?? '');
-        $ts  = time();
-
-        // Reuse plugin salt as HMAC secret (no new setting)
-        $algo = $this->plugin->webhooksHashAlgo(); // 'sha256' | 'sha1'
-        $secret = (string) $this->salt;
-
-        $payload = implode('|', [$au, $mid, (string)$ts]);
-        $sig = hash_hmac($algo, $payload, $secret);
-
-        $qs = [
-            'au'  => $au,
-            'mid' => $mid,
-            'ts'  => $ts,
-            'sig' => $sig,
-        ];
-
-        return $base.'?'.http_build_query($qs);
-    }
-
-    /**
-     * Low-level BBB hooks API caller (GET with BBB checksum: sha1(call+query+salt)).
-     * Returns a normalized array. Never throws.
-     */
-    private function bbbHooksRequest(string $call, array $params): array
-    {
-        try {
-            $base = rtrim($this->urlWithProtocol ?: '', '/'); // ends with /bigbluebutton/
-            if ($base === '') {
-                return ['returncode' => 'FAILED', 'messageKey' => 'missingServerUrl'];
-            }
-
-            // BBB expects checksum = sha1(call + querystring + salt)
-            $query = http_build_query($params);
-            $checksum = sha1($call.$query.$this->salt);
-            $url = $base.'api/'.$call.'?'.$query.'&checksum='.$checksum;
-
-            $xml = @simplexml_load_file($url);
-            if (!$xml) {
-                return ['returncode' => 'FAILED', 'messageKey' => 'noResponse'];
-            }
-
-            $out = ['returncode' => (string)($xml->returncode ?? '')];
-            if (isset($xml->messageKey)) { $out['messageKey'] = (string)$xml->messageKey; }
-            if (isset($xml->message))    { $out['message']    = (string)$xml->message; }
-
-            if ($call === 'hooks/list' && isset($xml->hooks)) {
-                $out['hooks'] = [];
-                foreach (($xml->hooks->hook ?? []) as $h) {
-                    $out['hooks'][] = [
-                        'id'          => isset($h->id) ? (string)$h->id : '',
-                        'callbackURL' => isset($h->callbackURL) ? (string)$h->callbackURL : '',
-                        'meetingID'   => isset($h->meetingID) ? (string)$h->meetingID : '',
-                    ];
-                }
-            }
-            if ($call === 'hooks/create' && isset($xml->hookID)) {
-                $out['hookID'] = (string)$xml->hookID;
-            }
-
-            return $out;
-        } catch (\Throwable $e) {
-            if ($this->debug) {
-                error_log('bbbHooksRequest error: '.$e->getMessage());
-            }
-            return ['returncode' => 'FAILED', 'messageKey' => 'exception'];
-        }
-    }
-
-    /**
-     * Register a per-meeting webhook (idempotent enough for our flow).
-     * Will silently no-op if BBB webhooks plugin isn’t installed.
-     */
-    private function registerWebhookForMeeting(string $meetingId): void
-    {
-        if ($meetingId === '') {
-            return;
-        }
-
-        $params = [
-            'callbackURL' => $this->buildWebhookCallbackUrl($meetingId),
-            'meetingID'   => $meetingId,
-        ];
-
-        // Optional CSV filter like: user-joined,user-left,webcam-started,webcam-stopped
-        $events = trim((string)$this->plugin->webhooksEventFilter());
-        if ($events !== '') {
-            $params['events'] = $events;
-        }
-
-        $res = $this->bbbHooksRequest('hooks/create', $params);
-        if (($res['returncode'] ?? '') !== 'SUCCESS' && $this->debug) {
-            error_log('BBB hooks/create (per_meeting) failed: '.json_encode($res));
-        }
-    }
-
-    /**
-     * Ensure a single global webhook subscription exists (no meetingID).
-     * Uses hooks/list to avoid duplicates (no DB table needed).
-     */
-    private function ensureGlobalWebhook(): void
-    {
-        $callback = $this->buildWebhookCallbackUrl(null);
-
-        $list = $this->bbbHooksRequest('hooks/list', []);
-        if (($list['returncode'] ?? '') !== 'SUCCESS') {
-            if ($this->debug) {
-                error_log('BBB hooks/list failed or unavailable (global).');
-            }
-            return; // webhooks plugin might not be installed
-        }
-
-        foreach (($list['hooks'] ?? []) as $h) {
-            if (($h['callbackURL'] ?? '') === $callback && ($h['meetingID'] ?? '') === '') {
-                return; // already registered
-            }
-        }
-
-        $params = ['callbackURL' => $callback];
-        $events = trim((string)$this->plugin->webhooksEventFilter());
-        if ($events !== '') {
-            $params['events'] = $events;
-        }
-
-        $res = $this->bbbHooksRequest('hooks/create', $params);
-        if (($res['returncode'] ?? '') !== 'SUCCESS' && $this->debug) {
-            error_log('BBB hooks/create (global) failed: '.json_encode($res));
-        }
-    }
 }
diff --git a/public/plugin/Bbb/lib/bbb_plugin.class.php b/public/plugin/Bbb/lib/bbb_plugin.class.php
index 4b0dd6208f9..9f2ff32f6ab 100644
--- a/public/plugin/Bbb/lib/bbb_plugin.class.php
+++ b/public/plugin/Bbb/lib/bbb_plugin.class.php
@@ -65,22 +65,6 @@ protected function __construct()
                 'meeting_duration' => 'text',
                 'delete_recordings_on_course_delete' => 'boolean',
                 'hide_conference_link' => 'boolean',
-                'webhooks_enabled' => 'boolean',
-                'webhooks_scope' => [
-                    'type' => 'select',
-                    'options' => [
-                        'per_meeting' => 'Per meeting',
-                        'global'      => 'Global',
-                    ],
-                ],
-                'webhooks_hash_algo' => [
-                    'type' => 'select',
-                    'options' => [
-                        'sha256' => 'SHA-256',
-                        'sha1'   => 'SHA-1',
-                    ],
-                ],
-                'webhooks_event_filter' => 'text',
             ]
         );
 
@@ -349,13 +333,6 @@ public function install(): void
                         $configuration[$name] = in_array($type, ['boolean','checkbox'], true) ? 'false' : '';
                     }
                 }
-
-                // Explicit defaults for webhooks
-                $configuration['webhooks_enabled']      = $configuration['webhooks_enabled']      ?? 'false';
-                $configuration['webhooks_scope']        = $configuration['webhooks_scope']        ?? 'per_meeting';
-                $configuration['webhooks_hash_algo']    = $configuration['webhooks_hash_algo']    ?? 'sha256';
-                $configuration['webhooks_event_filter'] = $configuration['webhooks_event_filter'] ?? '';
-
                 $rel->setConfiguration($configuration);
 
                 $em->persist($rel);
@@ -431,67 +408,6 @@ public function canCurrentUserSeeGlobalConferenceLink(): bool
         return false;
     }
 
-    public function webhooksEnabled(): bool
-    {
-        return $this->get('webhooks_enabled') === 'true';
-    }
-    public function webhooksScope(): string
-    {
-        $v = (string) ($this->get('webhooks_scope') ?? 'per_meeting');
-        return in_array($v, ['per_meeting','global'], true) ? $v : 'per_meeting';
-    }
-    public function webhooksHashAlgo(): string
-    {
-        $v = (string) ($this->get('webhooks_hash_algo') ?? 'sha256');
-        return in_array($v, ['sha256','sha1'], true) ? $v : 'sha256';
-    }
-    public function webhooksEventFilter(): string
-    {
-        return (string) ($this->get('webhooks_event_filter') ?? '');
-    }
-
-    public function checkWebhooksHealth(): array
-    {
-        if (!$this->webhooksEnabled()) {
-            return ['enabled' => false, 'ok' => false, 'reason' => 'disabled'];
-        }
-        $host = rtrim((string) $this->get('host'), '/');
-        $salt = (string) $this->get('salt');
-        if ($host === '' || $salt === '') {
-            return ['enabled' => true, 'ok' => false, 'reason' => 'missing_config'];
-        }
-
-        if (!preg_match('#/bigbluebutton$#', $host)) {
-            $host .= '/bigbluebutton';
-        }
-
-        $call = 'hooks/list';
-        $query = ''; // no params
-        $checksum = sha1($call.$query.$salt);
-        $url = $host.'/api/'.$call.'?checksum='.$checksum;
-
-        $xml = @simplexml_load_file($url);
-        if ($xml && (string)($xml->returncode ?? '') === 'SUCCESS') {
-            return ['enabled' => true, 'ok' => true];
-        }
-        $reason = '';
-        if ($xml && isset($xml->messageKey)) $reason = (string)$xml->messageKey;
-        return ['enabled' => true, 'ok' => false, 'reason' => $reason ?: 'no_response'];
-    }
-
-    public function getWebhooksAdminWarningHtml(): ?string
-    {
-        $h = $this->checkWebhooksHealth();
-        if ($h['enabled'] && !$h['ok']) {
-            $msg = 'Webhooks are not installed on the BBB server — running in reduced mode (basic callbacks only).';
-            if (!empty($h['reason'])) {
-                $msg .= ' [' . htmlspecialchars($h['reason'], ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . ']';
-            }
-            return '<div class="alert alert-warning" role="alert">'.$msg.'</div>';
-        }
-        return null;
-    }
-
     /**
      * Make sure the current user can see the "share" link under the join
      * button in the course tool page.
diff --git a/public/plugin/Bbb/listing.php b/public/plugin/Bbb/listing.php
index 7e94cf83a15..bba7c4b27cb 100644
--- a/public/plugin/Bbb/listing.php
+++ b/public/plugin/Bbb/listing.php
@@ -435,27 +435,6 @@
 $messagesAboveForm = '';
 try {
     $messagesAboveForm .= Display::getFlash();
-
-    // Show admin warning if webhooks are enabled but not available on BBB server
-    if (api_is_platform_admin() && $plugin->webhooksEnabled()) {
-        // Optional: tiny 60s cache to avoid calling BBB on every refresh
-        $cacheKey = 'bbb_hooks_warning_cache';
-        $cached = Container::getSession()->get($cacheKey);
-        $warnHtml = null;
-
-        if ($cached && isset($cached['ts'], $cached['html']) && ($cached['ts'] > time() - 60)) {
-            $warnHtml = $cached['html'];
-        } else {
-            $warnHtml = $plugin->getWebhooksAdminWarningHtml(); // returns HTML or null
-            Container::getSession()->set($cacheKey, ['ts' => time(), 'html' => $warnHtml]);
-        }
-
-        if ($warnHtml) {
-            // Already HTML (English message inside the code)
-            $messagesAboveForm .= $warnHtml;
-        }
-    }
-
     $sess = Container::getSession()->get('bbb_preupload_message');
     if ($sess) {
         $messagesAboveForm .= Display::return_message($sess['text'], $sess['type'], false);
@@ -463,7 +442,6 @@
     }
 } catch (\Throwable $e) {}
 
-
 // Links + start form (with pre-upload document picker).
 $urlList = [];
 if ($conferenceManager && $allowToEdit) {
diff --git a/src/CoreBundle/Controller/CatalogueController.php b/src/CoreBundle/Controller/CatalogueController.php
index 77ed3781440..ffa224407d2 100644
--- a/src/CoreBundle/Controller/CatalogueController.php
+++ b/src/CoreBundle/Controller/CatalogueController.php
@@ -25,7 +25,6 @@
 use ExtraField;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 #[Route('/catalogue')]
@@ -177,327 +176,20 @@ public function listSessions(): JsonResponse
         return $this->json($data);
     }
 
-    private function readCatalogueSettings(SettingsManager $settingsManager): array
-    {
-        $raw = $settingsManager->getSetting('catalog.course_catalog_settings');
-        if (empty($raw)) {
-            return [];
-        }
-
-        if (is_string($raw)) {
-            $raw = json_decode($raw, true) ?? [];
-        }
-
-        if (isset($raw['courses']) && is_array($raw['courses'])) {
-            return $raw['courses'];
-        }
-
-        return is_array($raw) ? $raw : [];
-    }
-
     #[Route('/course-extra-fields', name: 'chamilo_core_catalogue_course_extra_fields', methods: ['GET'])]
     public function getCourseExtraFields(SettingsManager $settingsManager): JsonResponse
     {
-        $settings = $this->readCatalogueSettings($settingsManager);
-        if (empty($settings)) {
-            return $this->json([]);
-        }
-
-        $allowed = array_map('strval', $settings['extra_fields_in_search_form'] ?? []);
-
-        $ef = new \ExtraField('course');
-        $raw = $ef->get_all();
-
-        $mapped = array_map(function ($f) {
-            $type = (int) $f['value_type'];
-
-            $base = [
-                'variable'     => (string) $f['variable'],
-                'title'        => (string) ($f['display_text'] ?? $f['variable']),
-                'value_type'   => $type,
-                'defaultValue' => $f['field_default_value'] ?? null,
-            ];
-
-            $options = [];
-            if (!empty($f['options']) && is_array($f['options'])) {
-                foreach ($f['options'] as $opt) {
-                    $options[] = [
-                        'id'     => isset($opt['id']) ? (int) $opt['id'] : 0,
-                        'value'  => isset($opt['option_value']) ? (string) $opt['option_value'] : (string) ($opt['id'] ?? ''),
-                        'label'  => (string) ($opt['display_text'] ?? $opt['option_value'] ?? ''),
-                        'parent' => isset($opt['parent_id']) ? (int) $opt['parent_id'] : 0,
-                    ];
-                }
-            }
-
-            $typesWithOptions = [
-                \ExtraField::FIELD_TYPE_SELECT,
-                \ExtraField::FIELD_TYPE_SELECT_MULTIPLE,
-                \ExtraField::FIELD_TYPE_DOUBLE_SELECT,
-                \ExtraField::FIELD_TYPE_TRIPLE_SELECT,
-                \ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD,
-                \ExtraField::FIELD_TYPE_RADIO,
-                \ExtraField::FIELD_TYPE_CHECKBOX,
-                \ExtraField::FIELD_TYPE_TAG,
-            ];
-
-            if (in_array($type, $typesWithOptions, true)) {
-                $base['options'] = $options;
-            }
-
-            return $base;
-        }, $raw);
-
-        if (!empty($allowed)) {
-            $byVar = [];
-            foreach ($mapped as $row) {
-                $byVar[$row['variable']] = $row;
-            }
-            $ordered = [];
-            foreach ($allowed as $var) {
-                if (isset($byVar[$var])) {
-                    $ordered[] = $byVar[$var];
-                }
-            }
-            $mapped = $ordered;
-        }
-
-        return $this->json(array_values($mapped));
-    }
-
-    #[Route('/course-extra-field-values', name: 'chamilo_core_catalogue_course_extra_field_values', methods: ['GET'])]
-    public function getCourseExtraFieldValues(Request $request, SettingsManager $settingsManager): JsonResponse
-    {
-        $ids = array_filter(array_map('intval', explode(',', (string) $request->query->get('ids', ''))));
-        if (!$ids) {
-            return $this->json(new \stdClass());
-        }
-
-        $settings = $this->readCatalogueSettings($settingsManager);
-
-        // Union of allowed variables (search form ∪ course card)
-        $allowedSearch = array_map('strval', $settings['extra_fields_in_search_form'] ?? []);
-        $allowedCard   = array_map('strval', $settings['extra_fields_in_course_block'] ?? []);
-        $allowedVars   = array_values(array_unique(array_filter(array_merge($allowedSearch, $allowedCard))));
-
-        // Force-include variables that we always want to expose
-        $allowedVars = array_values(array_unique(array_merge($allowedVars, ['video_url', 'special_course'])));
-
-        if (!$allowedVars) {
-            return $this->json(new \stdClass());
-        }
-
-        $ef  = new \ExtraField('course');
-        $efv = new \ExtraFieldValue('course');
-
-        // Build metadata maps (by variable and by id)
-        $allFields = $ef->get_all(); // rows: ['id','variable','value_type','field_default_value', ...]
-        $byVar = [];
-        $byId  = [];
-
-        foreach ($allFields as $f) {
-            $var = (string) ($f['variable'] ?? '');
-            if (!$var) {
-                continue;
-            }
-            if (!in_array($var, $allowedVars, true)) {
-                continue; // only expose what we explicitly allow
-            }
-
-            $type    = (int) ($f['value_type'] ?? 0);
-            $default = $f['field_default_value'] ?? null;
-
-            $byVar[$var] = [
-                'id'           => (int) ($f['id'] ?? 0),
-                'value_type'   => $type,
-                'default_raw'  => $default,
+        $extraField = new \ExtraField('course');
+        $fields = $extraField->get_all() ?? [];
+        $result = array_map(static function ($field) {
+            return [
+                'variable'     => $field['variable'],
+                'display_text' => $field['display_text'],
+                'value_type'   => (int) ($field['value_type'] ?? 0),
             ];
-            if (!empty($f['id'])) {
-                $byId[(int) $f['id']] = $var;
-            }
-        }
-
-        // If settings reference a variable that doesn't exist, still include it with a null-like default
-        foreach ($allowedVars as $var) {
-            if (!isset($byVar[$var])) {
-                $byVar[$var] = [
-                    'id'           => 0,
-                    'value_type'   => 0,     // unknown → treat as text-like
-                    'default_raw'  => null,
-                ];
-            }
-        }
-
-        $out = [];
-
-        foreach ($ids as $courseId) {
-            $values = [];
-            $rows = method_exists($efv, 'getAllValuesByItem') ? $efv->getAllValuesByItem($courseId) : null;
-            if (!is_array($rows) || !$rows) {
-                $rows = method_exists($efv, 'get_values_by_item') ? $efv->get_values_by_item($courseId) : null;
-            }
+        }, $fields);
 
-            if (!is_array($rows) || !$rows) {
-                $rows = method_exists($ef, 'getDataAndFormattedValues')
-                    ? $ef->getDataAndFormattedValues($courseId, false, array_keys($byVar))
-                    : null;
-            }
-
-            // Normalize bulk rows into { var => value }
-            if (is_array($rows)) {
-                // Handle both shapes: list-of-rows and map-by-variable
-                $hasStringKeys = static function(array $a): bool {
-                    foreach (array_keys($a) as $k) {
-                        if (is_string($k)) return true;
-                    }
-                    return false;
-                };
-
-                if ($hasStringKeys($rows) && !isset($rows[0])) {
-                    // Shape A: map variable => value/row
-                    foreach ($rows as $var => $valRaw) {
-                        if (!isset($byVar[$var])) continue;
-
-                        $type = (int) ($byVar[$var]['value_type'] ?? 0);
-                        $val  = $valRaw;
-                        $arr  = null;
-
-                        if (is_array($valRaw)) {
-                            // Common keys across Chamilo providers
-                            $val = $valRaw['field_value'] ?? $valRaw['value'] ?? $valRaw['value_raw'] ?? null;
-                            $arr = $valRaw['value_as_array'] ?? $valRaw['value_array'] ?? null;
-
-                            // Prefer explicit type if row provides it
-                            if (isset($valRaw['value_type']) || isset($valRaw['field_type'])) {
-                                $type = (int) ($valRaw['value_type'] ?? $valRaw['field_type']);
-                            }
-                        }
-
-                        $values[$var] = $this->normaliseValueForType($type, $val, is_array($arr) ? $arr : null);
-                    }
-                } else {
-                    // Shape B: list of rows (possibly indexed by field ID)
-                    foreach ($rows as $key => $r) {
-                        // Resolve variable
-                        $var = (string) ($r['variable'] ?? $r['field_variable'] ?? '');
-                        if (!$var && isset($r['id']) && isset($byId[(int) $r['id']])) {
-                            $var = $byId[(int) $r['id']];
-                        }
-                        if (!$var && isset($r['field_id']) && isset($byId[(int) $r['field_id']])) {
-                            $var = $byId[(int) $r['field_id']];
-                        }
-                        if (!$var || !isset($byVar[$var])) {
-                            continue;
-                        }
-
-                        $type = (int) ($r['value_type'] ?? $r['field_type'] ?? $byVar[$var]['value_type'] ?? 0);
-                        $val  = $r['field_value'] ?? $r['value'] ?? null;
-                        $arr  = $r['value_as_array'] ?? $r['value_array'] ?? null;
-
-                        $values[$var] = $this->normaliseValueForType($type, $val, is_array($arr) ? $arr : null);
-                    }
-                }
-            }
-
-            $missing = array_diff(array_keys($byVar), array_keys($values));
-            foreach ($missing as $var) {
-                $meta = $byVar[$var];
-                $type = (int) ($meta['value_type'] ?? 0);
-                $val  = null;
-                $row  = null;
-
-                // Prefer lookup by field_id when available
-                if (!empty($meta['id'])) {
-                    $row = $efv->get_values_by_handler_and_field_id($courseId, (int) $meta['id'], false);
-                }
-                // Fallback by variable
-                if (!$row && method_exists($efv, 'get_values_by_handler_and_field_variable')) {
-                    $row = $efv->get_values_by_handler_and_field_variable($courseId, $var, false);
-                }
-
-                if (is_array($row)) {
-                    // Unify shape
-                    $type = (int) ($row['value_type'] ?? $type);
-                    $val  = $row['field_value'] ?? $row['value'] ?? null;
-                    $values[$var] = $this->normaliseValueForType($type, $val, null);
-                }
-            }
-
-            // Ensure all allowed vars exist with sensible defaults
-            $norm = [];
-            foreach ($byVar as $var => $meta) {
-                if (array_key_exists($var, $values)) {
-                    $norm[$var] = $values[$var];
-                } else {
-                    $norm[$var] = $this->normaliseDefaultForType(
-                        (int) ($meta['value_type'] ?? 0),
-                        $meta['default_raw'] ?? null
-                    );
-                }
-            }
-
-            $out[$courseId] = (object) $norm;
-        }
-
-        return $this->json($out);
-    }
-
-    /**
-     * Normalizes a stored value for the given type so the frontend gets consistent shapes:
-     * - Checkbox => boolean
-     * - Multiselect/Tags => array<string>
-     * - Double/Triple/Select+Text => array when applicable (or string)
-     */
-    private function normaliseValueForType(int $type, $value, ?array $arrayValue)
-    {
-        switch ($type) {
-            case \ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
-            case \ExtraField::FIELD_TYPE_TAG:
-                if (is_array($arrayValue)) return array_values($arrayValue);
-                if ($value === null || $value === '') return [];
-                return is_array($value) ? array_values($value) : [(string) $value];
-
-            case \ExtraField::FIELD_TYPE_CHECKBOX:
-                if (is_bool($value)) return $value;
-                $v = strtolower((string) $value);
-                return in_array($v, ['1','true','yes','on'], true);
-
-            case \ExtraField::FIELD_TYPE_DOUBLE_SELECT:
-            case \ExtraField::FIELD_TYPE_TRIPLE_SELECT:
-            case \ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD:
-                if (is_array($arrayValue)) return array_values($arrayValue);
-                if (is_array($value))     return array_values($value);
-                return $value;
-
-            default:
-                return $value;
-        }
-    }
-
-    /**
-     * Provides a sensible default when the course has no stored value:
-     * - Checkbox => false (unless default_raw explicitly says otherwise)
-     * - Multiselect/Tags => []
-     * - Others => null (or normalized default_raw when present)
-     */
-    private function normaliseDefaultForType(int $type, $defaultRaw)
-    {
-        // If a default is set at field level, try to normalize it first.
-        if ($defaultRaw !== null && $defaultRaw !== '') {
-            return $this->normaliseValueForType($type, $defaultRaw, is_array($defaultRaw) ? $defaultRaw : null);
-        }
-
-        switch ($type) {
-            case \ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
-            case \ExtraField::FIELD_TYPE_TAG:
-                return [];
-
-            case \ExtraField::FIELD_TYPE_CHECKBOX:
-                return false;
-
-            default:
-                return null;
-        }
+        return $this->json($result);
     }
 
     #[Route('/auto-subscribe-course/{courseId}', name: 'chamilo_core_catalogue_auto_subscribe_course', methods: ['POST'])]