diff --git a/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java b/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java index 828b7f0a3784e812bc80490b76c8cc3ab604b965..a8fd7ed54dc09164b74e01c210d6bf150da42d2c 100644 --- a/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java +++ b/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java @@ -117,7 +117,9 @@ public class CourseBusinessGroupListController extends AbstractBusinessGroupList if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor(new ResourcesColumnDescriptor(this, mainVC, getTranslator())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.tutorsCount.i18n(), Cols.tutorsCount.ordinal(), null, getLocale())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale())); diff --git a/src/main/java/org/olat/group/ui/main/BusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/BusinessGroupListController.java index db83e3429e757565b51fd6c11a5fc6d3e2959a63..91c5d6c3a54c0597f510d9b0ba9ff681ca464fa2 100644 --- a/src/main/java/org/olat/group/ui/main/BusinessGroupListController.java +++ b/src/main/java/org/olat/group/ui/main/BusinessGroupListController.java @@ -20,6 +20,7 @@ package org.olat.group.ui.main; import org.olat.core.gui.UserRequest; +import org.olat.core.gui.components.EscapeMode; import org.olat.core.gui.components.table.BooleanColumnDescriptor; import org.olat.core.gui.components.table.ColumnDescriptor; import org.olat.core.gui.components.table.CustomCellRenderer; @@ -52,7 +53,9 @@ public class BusinessGroupListController extends AbstractBusinessGroupListContro if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor(new ResourcesColumnDescriptor(this, mainVC, getTranslator())); CustomCellRenderer acRenderer = new BGAccessControlledCellRenderer(); groupListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(Cols.accessTypes.i18n(), Cols.accessTypes.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, acRenderer)); diff --git a/src/main/java/org/olat/group/ui/main/FavoritBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/FavoritBusinessGroupListController.java index 076fa8a28e5626b9883aee7eaded1d7ba416e2b7..60e0ed81ddf3b02aad6942f7728c50b27484477f 100644 --- a/src/main/java/org/olat/group/ui/main/FavoritBusinessGroupListController.java +++ b/src/main/java/org/olat/group/ui/main/FavoritBusinessGroupListController.java @@ -20,6 +20,7 @@ package org.olat.group.ui.main; import org.olat.core.gui.UserRequest; +import org.olat.core.gui.components.EscapeMode; import org.olat.core.gui.components.table.BooleanColumnDescriptor; import org.olat.core.gui.components.table.ColumnDescriptor; import org.olat.core.gui.components.table.CustomCellRenderer; @@ -52,7 +53,9 @@ public class FavoritBusinessGroupListController extends AbstractBusinessGroupLis if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor(new ResourcesColumnDescriptor(this, mainVC, getTranslator())); CustomCellRenderer acRenderer = new BGAccessControlledCellRenderer(); groupListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(Cols.accessTypes.i18n(), Cols.accessTypes.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, acRenderer)); diff --git a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java index 16e06c4bb784f8a1ed7a15f606230bb2c526a23c..5ddbc5a6b5475e8103fffc176b8ed10547b4b6ef 100644 --- a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java +++ b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java @@ -59,7 +59,9 @@ public class OpenBusinessGroupListController extends AbstractBusinessGroupListCo if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(descCol); groupListCtr.addColumnDescriptor(new ResourcesColumnDescriptor(this, mainVC, getTranslator())); DefaultColumnDescriptor freePlacesCol = new DefaultColumnDescriptor(Cols.freePlaces.i18n(), Cols.freePlaces.ordinal(), TABLE_ACTION_LAUNCH, getLocale()); freePlacesCol.setEscapeHtml(EscapeMode.none); diff --git a/src/main/java/org/olat/group/ui/main/OwnedBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/OwnedBusinessGroupListController.java index 2996da2e27e906fff424f6cfa554a9316c3b2dd1..a95410998277d226283b928c6beeffb15d65cdc5 100644 --- a/src/main/java/org/olat/group/ui/main/OwnedBusinessGroupListController.java +++ b/src/main/java/org/olat/group/ui/main/OwnedBusinessGroupListController.java @@ -20,6 +20,7 @@ package org.olat.group.ui.main; import org.olat.core.gui.UserRequest; +import org.olat.core.gui.components.EscapeMode; import org.olat.core.gui.components.table.BooleanColumnDescriptor; import org.olat.core.gui.components.table.ColumnDescriptor; import org.olat.core.gui.components.table.CustomCellRenderer; @@ -64,7 +65,9 @@ public class OwnedBusinessGroupListController extends AbstractBusinessGroupListC if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor( new ResourcesColumnDescriptor(this, mainVC, getTranslator())); CustomCellRenderer acRenderer = new BGAccessControlledCellRenderer(); groupListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(Cols.accessTypes.i18n(), Cols.accessTypes.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, acRenderer)); diff --git a/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java index 9648c0936f2ab7381ef375cef3317e7d2ef46e79..9d46befc7d4af98a0c5b49b8ef8be64bb0aa2f83 100644 --- a/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java +++ b/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java @@ -22,6 +22,7 @@ package org.olat.group.ui.main; import java.util.List; import org.olat.core.gui.UserRequest; +import org.olat.core.gui.components.EscapeMode; import org.olat.core.gui.components.table.BooleanColumnDescriptor; import org.olat.core.gui.components.table.ColumnDescriptor; import org.olat.core.gui.components.table.CustomCellRenderer; @@ -79,7 +80,9 @@ public class SearchBusinessGroupListController extends AbstractBusinessGroupList if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor(new ResourcesColumnDescriptor(this, mainVC, getTranslator())); CustomCellRenderer acRenderer = new BGAccessControlledCellRenderer(); groupListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(Cols.accessTypes.i18n(), Cols.accessTypes.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, acRenderer)); diff --git a/src/main/java/org/olat/group/ui/main/SearchOpenBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/SearchOpenBusinessGroupListController.java index f810e006939a4a44294a680fca5ee30e6cbf5e94..38956eff00be9fe4cf1a75379f7d4d516ffda313 100644 --- a/src/main/java/org/olat/group/ui/main/SearchOpenBusinessGroupListController.java +++ b/src/main/java/org/olat/group/ui/main/SearchOpenBusinessGroupListController.java @@ -66,7 +66,9 @@ public class SearchOpenBusinessGroupListController extends AbstractBusinessGroup if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(descCol); groupListCtr.addColumnDescriptor(new ResourcesColumnDescriptor(this, mainVC, getTranslator())); DefaultColumnDescriptor freePlacesCol = new DefaultColumnDescriptor(Cols.freePlaces.i18n(), Cols.freePlaces.ordinal(), TABLE_ACTION_LAUNCH, getLocale()); diff --git a/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java b/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java index 84e2e958931b635fd58759125b5deca66b7ad9d0..7663e129207b6b7d0397eea9f68fb99f87a11aca 100644 --- a/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java +++ b/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java @@ -59,7 +59,9 @@ public class SelectBusinessGroupCourseAuthorController extends AbstractBusinessG if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor( new ResourcesColumnDescriptor(this, mainVC, getTranslator())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.tutorsCount.i18n(), Cols.tutorsCount.ordinal(), null, getLocale())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale())); diff --git a/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java b/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java index 926b6a0065ce8ebe74b24bf8d2ab2237a558a97f..0d99ab25389cf6d7c0d2ff8401bb6e6a0c569960 100644 --- a/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java +++ b/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java @@ -56,7 +56,9 @@ public class SelectFavoritBusinessGroupController extends AbstractBusinessGroupL if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor( new ResourcesColumnDescriptor(this, mainVC, getTranslator())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.tutorsCount.i18n(), Cols.tutorsCount.ordinal(), null, getLocale())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale())); diff --git a/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java b/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java index 80440b2c3bb7210be1f9b3691ac6792c2f1757ec..85b194887d82ddee728bdcb0abacde631e7157ae 100644 --- a/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java +++ b/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java @@ -56,7 +56,9 @@ public class SelectOwnedBusinessGroupController extends AbstractBusinessGroupLis if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor( new ResourcesColumnDescriptor(this, mainVC, getTranslator())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.tutorsCount.i18n(), Cols.tutorsCount.ordinal(), null, getLocale())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale())); diff --git a/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java b/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java index d795e71be323c61c82c0a7a32bbfbab306954b1a..bc3464b043c68882a19a7048c6fd84860cad63dd 100644 --- a/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java +++ b/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java @@ -70,7 +70,9 @@ public class SelectSearchBusinessGroupController extends AbstractBusinessGroupLi if(groupModule.isManagedBusinessGroups()) { groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.externalId.i18n(), Cols.externalId.ordinal(), null, getLocale())); } - groupListCtr.addColumnDescriptor(false, new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale())); + DefaultColumnDescriptor descCol = new DefaultColumnDescriptor(Cols.description.i18n(), Cols.description.ordinal(), null, getLocale()); + descCol.setEscapeHtml(EscapeMode.antisamy); + groupListCtr.addColumnDescriptor(false, descCol); groupListCtr.addColumnDescriptor( new ResourcesColumnDescriptor(this, mainVC, getTranslator())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.tutorsCount.i18n(), Cols.tutorsCount.ordinal(), null, getLocale())); groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale()));