Changes GetAsCSV() to AttributeEnum->GetValueLabel()

Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>

.doc/itop-version-history.md

@@ -2,17 +2,13 @@
 
 ```mermaid
 %%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
-              'git0': '#7ccf00',
-              'git1': '#7ccf00',
-              'git2': '#99a1af',
-              'git3': '#99a1af',
-              'git4': '#99a1af',
-              'git5': '#99a1af',
-              'git6': '#99a1af',
-              'git7': '#99a1af',
-              'git8': '#99a1af',
-              'git9': '#99a1af',
-              'git10': '#99a1af'
+              'git0': 'lawngreen',
+              'git3': 'dodgerblue',
+              'git4': 'grey',
+              'git5': 'grey',
+              'git6': 'grey',
+              'git7': 'grey',
+              'git8': 'grey'
        }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
 gitGraph
     commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
@@ -110,11 +106,6 @@ gitGraph
     commit id: "2025-09-25" tag: "2.7.13"
     checkout support/3.2
     commit id: "2026-04-27 " tag: "3.2.3"
-    commit id: "2026-05-25 " tag: "3.2.3-1"
-    commit id: "2026-07-17 " tag: "3.2.3-2"
-    checkout develop
-    commit id: "2026-07-23" tag: "3.3.0-beta1"
-    commit id: "2026-09-15" tag: "3.3.0"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -8,8 +8,6 @@ body:
         Please explain why you're creating this issue :
         - Please describe what's your improvement proposition.
         - Then tell us if you're willing to create a PR for this enhancement ? If so, we'll indicate in the issue if we're interested in it.
-        - The more users are affected and the greater is the impact, the more likely this improvement will be accepted. If you identified a bug and have an improvement proposition, please use the 'Bug report' template instead."
-        Please note we're not willing to accept code improvement (e.g. refactoring) that won't have a "functional" change for the user.
 
   - type: textarea
     id: enhancement_details

.github/pull_request_template.md

@@ -1,22 +1,23 @@
 <!--
 IMPORTANT: Before creating your PR, please create an issue first to know if Combodo is interested in your contribution (not needed for translations PR).
 Since we may refuse a PR, it's preferable to create an issue first, to avoid spending time coding something that won't be accepted.
-PR that will benefit the most users and has a greater impact on the product are more likely to be accepted, so please explain your use case and why you think it would be useful for the community.
-We're not willing to receive PR concerning codes improvements (e.g. code refactoring), except if it's part of a code that brings/corrects a feature for users. 
-Please note that we're working with sprints, so we reserve the right to decline a PR if we do not plan to work on that subject in the 6 coming months.
-Thank you for your comprehension 😊
 
-Once you've created the issue, and we confirmed we're interested in it, please follow the guidelines within this PR template before submitting it, it will greatly help us process your PR. 🙏
+Once you've done it, and we confirmed we're interested in it, please follow the guidelines within this PR template before submitting it, it will greatly help us process your PR. 🙏
 
 Any PRs not following the guidelines or with missing information will not be considered.
 -->
 
 ## Base information
 
-| Question                                                                        | Answer                                |
-|---------------------------------------------------------------------------------|---------------------------------------|
-| Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL or ticket number --> |
-| Type of change?                                                                 | Bug fix / Enhancement / Translations  |
+| Question                                                       | Answer 
+|----------------------------------------------------------------|--------
+| Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL -->                 |
+| Type of change?                                                | Bug fix / Enhancement / Translations
+
+| Question                                                                        | Answer                               |
+|---------------------------------------------------------------------------------|--------------------------------------|
+| Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL -->                 |
+| Type of change?                                                                 | Bug fix / Enhancement / Translations |
 
 ## Symptom (bug) / Objective (enhancement)
 
@@ -74,7 +75,6 @@ Explain in details how you are proposing to solve this:
 Don't remove these lines, check them once done.
 -->
 
-- [ ] If my PR is a bug fix or an enhancement, I opened an issue that got reviewed and approved by Combodo
 - [ ] I have performed a self-review of my code
 - [ ] I have tested all changes I made on an iTop instance
 - [ ] I have added a unit test, otherwise I have explained why I couldn't

.github/workflows/action.yml

@@ -0,0 +1,56 @@
+name: Add PRs to Combodo PRs Dashboard
+
+on:
+  pull_request:
+    types:
+      - opened
+  issues:
+    types:
+      - opened
+  workflow_call:
+
+jobs:
+  add-to-project:
+    name: Add PR to Combodo Project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if author is a member of the organization
+        id: check-membership
+        run: |
+          ORG="Combodo"
+          AUTHOR=$(jq -r .pull_request.user.login "$GITHUB_EVENT_PATH")
+          RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}" \
+            "https://api.github.com/orgs/$ORG/members/$AUTHOR")
+          if [ "$RESPONSE" == "404" ]; then
+            echo "project_url=https://github.com/orgs/Combodo/projects/5" >> $GITHUB_ENV
+            echo "is_member=false" >> $GITHUB_ENV
+          else
+            echo "project_url=https://github.com/orgs/Combodo/projects/4" >> $GITHUB_ENV
+            echo "is_member=true" >> $GITHUB_ENV
+
+          fi
+
+      - name: Add internal tag if member of the organization
+        if: env.is_member == 'true'
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}" \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels \
+            -d '{"labels":["internal"]}'
+
+      - name: Set PR author as assignee if member of the organization
+        if: env.is_member == 'true' && github.event_name == 'pull_request'
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}" \
+            https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/assignees \
+            -d '{"assignees":["${{ github.event.pull_request.user.login }}"]}'
+        env:
+          is_member: ${{ env.is_member }}
+      - name: Add PR to the appropriate project
+        uses: actions/add-to-project@v2
+        with:
+          project-url: ${{ env.project_url }}
+          github-token: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}

.github/workflows/add-to-dashboard.yml

@@ -1,13 +0,0 @@
-name: Add issue/PR to Combodo dashboard
-
-on:
-  pull_request:
-    types: [opened]
-  issues:
-    types: [opened]
-
-jobs:
-  route-to-project:
-    uses: Combodo/.github/.github/workflows/action.yml@master
-    secrets:
-      PR_AUTOMATICALLY_ADD_TO_PROJECT: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}

.gitignore

@@ -33,6 +33,7 @@ tests/*/vendor/*
 !/data/index.php
 !/data/web.config
 !/data/exclude.txt
+!/data/.compilation-symlinks
 
 # iTop extensions
 /extensions/**

.make/dependencies/composer/tcpdf/tcpdfUpdateFonts.php

@@ -61,7 +61,7 @@ foreach ($aTcpdfFontsDirContent as $sTcpdfFontResourceName) {
  * 2) Then adding the DroidSansFallback font (useful for CJK data for example)
  */
 echo $sCurrentScriptFileName.": ---2) Copying font files to TCPDF ($sTcPdfFontsFolder)...\n";
-$aFontFilesToCopy = glob(__DIR__.DIRECTORY_SEPARATOR.'droidsansfallback.*');
+$aFontFilesToCopy = glob(__DIR__.'\droidsansfallback.*');
 foreach ($aFontFilesToCopy as $sFontFileToCopy) {
 	$sFontFileName = basename($sFontFileToCopy);
 	echo $sCurrentScriptFileName.': copying '.$sFontFileName."\n";

README.md

@@ -33,13 +33,13 @@ iTop also offers mass import tools to help you become even more efficient.
 [62]: https://www.itophub.io/wiki/page?id=latest:release:change_log
 [63]: https://www.itophub.io/wiki/page?id=latest:release:start
 [64]: https://www.itophub.io/wiki/page?id=latest:install:start
-[65]: https://github.com/Combodo/iTop/releases/latest
+[65]: https://sourceforge.net/projects/itop/files/latest/download
 
 
 ## Resources
 
- - [GitHub Discussions][1]: community support
- - [GitHub Issues Tickets ][2]: for feature requests and bug reports
+ - [iTop Forums][1]: community support
+ - [iTop Tickets][2]: for feature requests and bug reports
  - [Releases download][3]
  - [iTop requirements][4]
  - [Documentation][5] covering both iTop and its official extensions
@@ -47,9 +47,9 @@ iTop also offers mass import tools to help you become even more efficient.
  - [iTop versions history][7]
 
 
-[1]: https://github.com/Combodo/iTop/discussions
-[2]: https://github.com/Combodo/iTop/issues
-[3]: https://github.com/Combodo/iTop/releases
+[1]: https://sourceforge.net/p/itop/discussion/
+[2]: https://sourceforge.net/p/itop/tickets/
+[3]: https://sourceforge.net/projects/itop/files/itop/
 [4]: https://www.itophub.io/wiki/page?id=latest:install:requirements
 [5]: https://www.itophub.io/wiki
 [6]: https://store.itophub.io/en_US/
@@ -95,7 +95,7 @@ We would like to give a special thank you 🤗 to the people from the community
 - Casteleyn, Thomas (a.k.a [@Hipska](https://www.github.com/Hipska))
 - Castro, Randall Badilla
 - Colantoni, Maria Laura
-- Couronné, Guy [@GurneyHallack](https://github.com/GurneyHallack)
+- Couronné, Guy
 - Dejin, Bie (a.k.a [@bdejin](https://github.com/bdejin))
 - Delicado, Elodie
 - Dvořák, Lukáš
@@ -110,7 +110,7 @@ We would like to give a special thank you 🤗 to the people from the community
 - Khamit, Shamil
 - Kincel, Martin
 - Konečný, Kamil
-- Kunin, Vladimir (a.k.a [@vbkunin](https://github.com/vbkunin)
+- Kunin, Vladimir
 - Lassiter, Denis (a.k.a [@delassiter](https://github.com/delassiter))
 - Lazcano, Federico
 - Lucas, Jonathan
@@ -128,7 +128,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Šafránek, Jaroslav (a.k.a [jkcinik](https://sourceforge.net/u/jkcinik/profile/) on SourceForge)
 - Seki, Shoji
 - Shilov, Vladimir
-- Srivastava, Vaibhav (a.k.a [@vaibhav8a](https://github.com/vaibhav8a))
 - Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
 - Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya-stukalov))
 - Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))

addons/userrights/userrightsprofile.class.inc.php

@@ -582,30 +582,16 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	public function ListProfiles($oUser)
 	{
-		if (!array_key_exists('profile_list', $oUser->ListChanges())) {
-			// Profiles list is not modified on the $oUser object, we can use DBObjectSearch with `all data` capabilities
-			// Note: This is the default behavior
-			$aRet = [];
-			$oSearch = new DBObjectSearch('URP_UserProfile');
-			$oSearch->AllowAllData();
-			$oSearch->NoContextParameters();
-			$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
-			$oProfiles = new DBObjectSet($oSearch);
-			while ($oUserProfile = $oProfiles->Fetch()) {
-				$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
-			}
-
-			return $aRet;
-		} else {
-			// Profiles list must be computed with memory changes.
-			// Note: this is a bit tricky because the user object may have been modified in memory (e.g. a profile added or removed) and we need to take that into account
-			$aRet = [];
-			$oProfilesSet = $oUser->Get('profile_list');
-			foreach ($oProfilesSet as $oUserProfile) {
-				$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
-			}
-			return $aRet;
+		$aRet = [];
+		$oSearch = new DBObjectSearch('URP_UserProfile');
+		$oSearch->AllowAllData();
+		$oSearch->NoContextParameters();
+		$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
+		$oProfiles = new DBObjectSet($oSearch);
+		while ($oUserProfile = $oProfiles->Fetch()) {
+			$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
 		}
+		return $aRet;
 	}
 
 	public function GetSelectFilter($oUser, $sClass, $aSettings = [])
@@ -719,23 +705,26 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
 	{
 		$this->LoadCache();
-		if (count($oUser->ListChanges()) === 0) {
-			// load and cache permissions for the current user on the given class
-			if (isset($this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode])) {
-				$aTest = $this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode];
-				if (is_array($aTest)) {
-					return $aTest;
-				}
+
+		// load and cache permissions for the current user on the given class
+		//
+		$iUser = $oUser->GetKey();
+		if (isset($this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode])) {
+			$aTest = $this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
+			if (is_array($aTest)) {
+				return $aTest;
 			}
 		}
 
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
 		$bStatus = null;
-
-		$aProfileList = $this->GetProfileList($oUser);
+		// Cache user's profiles
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
+			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
 		// Call the API of UserRights because it caches the list for us
-		foreach ($aProfileList as $iProfile => $oProfile) {
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
 			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
 			if (!is_null($bGrant)) {
 				if ($bGrant) {
@@ -753,9 +742,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$aRes = [
 			'permission' => $iPermission,
 		];
-		if (count($oUser->ListChanges()) === 0) {
-			$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode] = $aRes;
-		}
+		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
 		return $aRes;
 	}
 
@@ -837,14 +824,18 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	{
 		$this->LoadCache();
 		// Note: this code is VERY close to the code of IsActionAllowed()
+		$iUser = $oUser->GetKey();
 
-		$aProfileList  = $this->GetProfileList($oUser);
+		// Cache user's profiles
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
+			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
 
 		// Note: The object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
 		$bStatus = null;
 		// Call the API of UserRights because it caches the list for us
-		foreach ($aProfileList as $iProfile => $oProfile) {
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
 			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
 			if (!is_null($bGrant)) {
 				if ($bGrant) {
@@ -902,25 +893,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		}
 		return $bHasSharing;
 	}
-
-	/**
-	 * @param \User $oUser
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function GetProfileList(User $oUser): array
-	{
-		if (count($oUser->ListChanges()) === 0) { // if user is already in db and not changed
-			$iUser = $oUser->GetKey();
-			if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
-				$aProfiles = UserRights::ListProfiles($oUser);
-				$this->aUsersProfilesList[$iUser] = $aProfiles;
-			}
-			return $this->aUsersProfilesList[$iUser];
-		}
-		return UserRights::ListProfiles($oUser);
-	}
 }
 
 UserRights::SelectModule('UserRightsProfile');

application/applicationextension.inc.php

@@ -30,15 +30,6 @@ require_once(APPROOT.'application/newsroomprovider.class.inc.php');
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @since       2.7.0
  */
-
-require_once(APPROOT.'application/applicationextension/common/ApplicationPopupMenuItem.php');
-require_once(APPROOT.'application/applicationextension/common/iPopupMenuExtension.php');
-require_once(APPROOT.'application/applicationextension/common/JSButtonItem.php');
-require_once(APPROOT.'application/applicationextension/common/JSPopupMenuItem.php');
-require_once(APPROOT.'application/applicationextension/common/SeparatorPopupMenuItem.php');
-require_once(APPROOT.'application/applicationextension/common/URLButtonItem.php');
-require_once(APPROOT.'application/applicationextension/common/URLPopupMenuItem.php');
-
 require_once(APPROOT.'application/applicationextension/backoffice/iApplicationUIExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/iBackofficeDictEntriesExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/iBackofficeDictEntriesPrefixesExtension.php');
@@ -52,12 +43,19 @@ require_once(APPROOT.'application/applicationextension/backoffice/iBackofficeScr
 require_once(APPROOT.'application/applicationextension/backoffice/iBackofficeStyleExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/iFieldRendererMappingsExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/iPageUIBlockExtension.php');
+require_once(APPROOT.'application/applicationextension/backoffice/iPopupMenuExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/iPreferencesExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/iWelcomePopupExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/AbstractApplicationUIExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/AbstractPageUIBlockExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/AbstractPreferencesExtension.php');
 require_once(APPROOT.'application/applicationextension/backoffice/AbstractWelcomePopupExtension.php');
+require_once(APPROOT.'application/applicationextension/backoffice/ApplicationPopupMenuItem.php');
+require_once(APPROOT.'application/applicationextension/backoffice/JSButtonItem.php');
+require_once(APPROOT.'application/applicationextension/backoffice/JSPopupMenuItem.php');
+require_once(APPROOT.'application/applicationextension/backoffice/SeparatorPopupMenuItem.php');
+require_once(APPROOT.'application/applicationextension/backoffice/URLButtonItem.php');
+require_once(APPROOT.'application/applicationextension/backoffice/URLPopupMenuItem.php');
 
 require_once(APPROOT.'application/applicationextension/iBackupExtraFilesExtension.php');
 require_once(APPROOT.'application/applicationextension/iKPILoggerExtension.php');

application/applicationextension/backoffice/ApplicationPopupMenuItem.php

@@ -1,9 +1,5 @@
 <?php
 
-use Combodo\iTop\Application\UI\Base\Common\Metadata\AriaAttributes;
-use Combodo\iTop\Application\UI\Base\Common\Metadata\DataAttributes;
-use Combodo\iTop\Application\UI\Base\Common\Metadata\Grouping;
-
 /**
  * Base class for the various types of custom menus
  *
@@ -11,7 +7,7 @@ use Combodo\iTop\Application\UI\Base\Common\Metadata\Grouping;
  * @package     UIExtensibilityAPI
  * @since 2.0
  */
-abstract class ApplicationPopupMenuItem implements iGroupingProvider, iDataAttributesProvider, iAriaAttributesProvider
+abstract class ApplicationPopupMenuItem
 {
 	/** @ignore */
 	protected $sUID;
@@ -23,12 +19,6 @@ abstract class ApplicationPopupMenuItem implements iGroupingProvider, iDataAttri
 	protected $sIconClass;
 	/** @ignore */
 	protected $aCssClasses;
-	/** @since 3.3.0 */
-	protected ?AriaAttributes $oAriaAttributes = null;
-	/** @since 3.3.0 */
-	protected ?DataAttributes $oDataAttributes = null;
-	/** @since 3.3.0 */
-	protected ?Grouping $oGrouping = null;
 
 	/**
 	 * Constructor
@@ -68,17 +58,6 @@ abstract class ApplicationPopupMenuItem implements iGroupingProvider, iDataAttri
 		return $this->sLabel;
 	}
 
-	/**
-	 * @param string $sLabel
-	 *
-	 * @api
-	 * @since 3.3.0
-	 */
-	public function SetLabel(string $sLabel): void
-	{
-		$this->sLabel = $sLabel;
-	}
-
 	/**
 	 * Get the CSS classes
 	 *
@@ -162,76 +141,9 @@ abstract class ApplicationPopupMenuItem implements iGroupingProvider, iDataAttri
 	 */
 	abstract public function GetMenuItem();
 
-	/**
-	 * Get additional data, child classes can use this without having to worry about this class interfaces
-	 * @return array<string, mixed>
-	 * @since 3.3.0
-	 */
-	protected function GetMenuItemAdditionalData(): array
-	{
-		$aAdditionalData = [];
-
-		$aDataAttributes = $this->GetDataAttributes()->GetAttributes();
-		if (!empty($aDataAttributes)) {
-			$aAdditionalData['data_attributes'] = $aDataAttributes;
-		}
-
-		$aAriaAttributes = $this->GetAriaAttributes()->GetAttributes();
-		if (!empty($aAriaAttributes)) {
-			$aAdditionalData['aria_attributes'] = $aAriaAttributes;
-		}
-
-		$oGrouping = $this->GetGrouping();
-		if ($oGrouping !== null) {
-			$aAdditionalData['grouping_uid'] = $oGrouping->GetUID();
-		}
-
-		return $aAdditionalData;
-	}
-
 	/** @ignore */
 	public function GetLinkedScripts()
 	{
 		return [];
 	}
-
-	/**
-	 * @api
-	 * @since 3.3.0
-	 */
-	public function GetAriaAttributes(): AriaAttributes
-	{
-		return $this->oAriaAttributes ??= new AriaAttributes();
-	}
-
-	/**
-	 * @api
-	 * @since 3.3.0
-	 */
-	public function GetDataAttributes(): DataAttributes
-	{
-		return $this->oDataAttributes ??= new DataAttributes();
-	}
-
-	/**
-	 * @api
-	 * @since 3.3.0
-	 */
-	public function GetGrouping(): ?Grouping
-	{
-		return $this->oGrouping;
-	}
-
-	/**
-	 * @param Grouping|null $oGrouping
-	 * @return static
-	 * @api
-	 * @since 3.3.0
-	 */
-	public function SetGrouping(?Grouping $oGrouping): static
-	{
-		$this->oGrouping = $oGrouping;
-
-		return $this;
-	}
 }

application/applicationextension/backoffice/JSPopupMenuItem.php

@@ -3,7 +3,7 @@
 /**
  * Class for adding an item into a popup menu that triggers some Javascript code
  *
- * Note: This works only in the backoffice, {@see \common\JSButtonItem} for the end-user portal
+ * Note: This works only in the backoffice, {@see \JSButtonItem} for the end-user portal
  *
  * @api
  * @package     UIExtensibilityAPI
@@ -40,7 +40,7 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 	public function GetMenuItem()
 	{
 		// Note: the semicolumn is a must here!
-		$aData = [
+		return [
 			'label' => $this->GetLabel(),
 			'onclick' => $this->GetJsCode().'; return false;',
 			'url' => $this->GetUrl(),
@@ -48,8 +48,6 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 			'icon_class' => $this->sIconClass,
 			'tooltip' => $this->sTooltip,
 		];
-
-		return array_merge($aData, $this->GetMenuItemAdditionalData());
 	}
 
 	/** @ignore */

application/applicationextension/backoffice/SeparatorPopupMenuItem.php

@@ -24,12 +24,6 @@ class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
 	/** @ignore */
 	public function GetMenuItem()
 	{
-		$aData = [
-			'label' => '<hr class="menu-separator">',
-			'url' => '',
-			'css_classes' => $this->aCssClasses,
-		];
-
-		return array_merge($aData, $this->GetMenuItemAdditionalData());
+		return ['label' => '<hr class="menu-separator">', 'url' => '', 'css_classes' => $this->aCssClasses];
 	}
 }

application/applicationextension/backoffice/URLPopupMenuItem.php

@@ -3,7 +3,7 @@
 /**
  * Class for adding an item into a popup menu that browses to the given URL
  *
- * Note: This works only in the backoffice, {@see \common\URLButtonItem} for the end-user portal
+ * Note: This works only in the backoffice, {@see \URLButtonItem} for the end-user portal
  *
  * @api
  * @package     UIExtensibilityAPI
@@ -35,15 +35,13 @@ class URLPopupMenuItem extends ApplicationPopupMenuItem
 	/** @ignore */
 	public function GetMenuItem()
 	{
-		$aData = ['label' => $this->GetLabel(),
+		return ['label' => $this->GetLabel(),
 			'url' => $this->GetUrl(),
 			'target' => $this->GetTarget(),
 			'css_classes' => $this->aCssClasses,
 			'icon_class' => $this->sIconClass,
 			'tooltip' => $this->sTooltip,
 		];
-
-		return array_merge($aData, $this->GetMenuItemAdditionalData());
 	}
 
 	/** @ignore */

application/applicationextension/backoffice/iBackofficeSassExtension.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implement this interface to add sass files (SCSS) to the backoffice pages.
+ * Implement this interface to add sass file (SCSS) to the backoffice pages.
  * example: return "css/setup.scss"
  *
  * @api
@@ -11,9 +11,9 @@
 interface iBackofficeSassExtension
 {
 	/**
-	 * @return array An array of relative paths (from loaded import paths) to the files to compile and include
-	 * @see \iTopWebPage::$a_linked_stylesheets
+	 * @return string
+	 * @see \iTopWebPage::$a_styles
 	 * @api
 	 */
-	public function GetSassRelPaths(): array;
+	public function GetSass(): string;
 }

application/applicationextension/backoffice/iPopupMenuExtension.php

@@ -95,24 +95,7 @@ interface iPopupMenuExtension
 	 * @todo
 	 */
 	public const PORTAL_MENU_ACTIONS = 10;
-	/**
-	 * Get the list of items to be added to the backoffice top-bar items
-	 * $param is an array: [] for now, in a distant future we want to give a complete context
-	 * @since 3.3.0
-	 */
-	public const MENU_TOPBAR_ACTIONS = 11;
-	/**
-	 * Get the list of items to be added to the actions on a given form field (i.e. the attribute of an object)
-	 * $param is an array: ['object' => DBObject, att_code => attribute code , mode => edit/read]
-	 * @since 3.3.0
-	 */
-	public const MENU_OBJDETAILS_FIELD_ACTIONS = 12;
-	/**
-	 * Get the list of items to be added to the actions in the activity panel (read-only mode)
-	 * $param is an array: ['object' => DBObject, caselog_att_code =>  caselog attribute code or 'activity']
-	 * @since 3.3.0
-	 */
-	public const MENU_OBJDETAILS_ACTIVITY_PANEL_ACTIONS = 13;
+
 	/**
 	 * Get the list of items to be added to a menu.
 	 *

application/applicationextension/common/iAriaAttributesProvider.php

@@ -1,15 +0,0 @@
-<?php
-
-use Combodo\iTop\Application\UI\Base\Common\Metadata\AriaAttributes;
-
-/**
- * Allows to provide ARIA attributes to classes that implement this interface.
- * The ARIA attributes will be used to improve accessibility of the UI components
- *
- * @api
- * @since 3.3.0
- */
-interface iAriaAttributesProvider
-{
-	public function GetAriaAttributes(): AriaAttributes;
-}

application/applicationextension/common/iDataAttributesProvider.php

@@ -1,14 +0,0 @@
-<?php
-
-use Combodo\iTop\Application\UI\Base\Common\Metadata\DataAttributes;
-
-/**
- * Allows to provide data attributes to classes that implement this interface.
- * The data attributes will be used to provide additional information to the UI components
- * @api
- * @since 3.3.0
- */
-interface iDataAttributesProvider
-{
-	public function GetDataAttributes(): DataAttributes;
-}

application/applicationextension/common/iGroupingProvider.php

@@ -1,13 +0,0 @@
-<?php
-
-use Combodo\iTop\Application\UI\Base\Common\Metadata\Grouping;
-
-/**
- * Allows to provide grouping information to classes that implement this interface.
- * @api
- * @since 3.3.0
- */
-interface iGroupingProvider
-{
-	public function GetGrouping(): ?Grouping;
-}

application/applicationextension/common/iHtmlAttributesSource.php

@@ -1,14 +0,0 @@
-<?php
-
-/**
- * Implemented by metadata value objects that flatten to HTML attributes.
- * Ease the implementation of classes that need to provide HTML attributes to the UI components
- *
- * @api
- * @since 3.3.0
- */
-interface iHtmlAttributesSource
-{
-	/** @return array<string, string> Attribute name => value, ready to be escaped and printed */
-	public function GetHtmlAttributes(): array;
-}

application/cmdbabstract.class.inc.php

@@ -49,7 +49,6 @@ use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
-use Combodo\iTop\Service\InterfaceDiscovery\InterfaceDiscovery;
 use Combodo\iTop\Service\Links\LinkSetDataTransformer;
 use Combodo\iTop\Service\Links\LinkSetModel;
 use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectHelper;
@@ -1047,7 +1046,7 @@ HTML
 							// Add extra data for markup generation
 							// - Attribute code and AttributeDef. class
 							$val['attcode'] = $sAttCode;
-							$val['atttype'] = $oAttDef->GetTypeShortClassName();
+							$val['atttype'] = $oAttDef->GetType();
 							$val['attlabel'] = $sAttLabel;
 							$val['attflags'] = ($bEditMode) ? $this->GetFormAttributeFlags($sAttCode) : OPT_ATT_READONLY;
 
@@ -1066,14 +1065,6 @@ HTML
 								}
 							}
 							$val['value_raw'] = ($bExcludeRawValue === false) ? $this->Get($sAttCode) : '';
-							$val['actions'] = [];
-
-							/** @var \iPopupMenuExtension $oExtensionInstance */
-							foreach (InterfaceDiscovery::GetInstance()->FindItopClasses('iPopupMenuExtension') as $oExtensionInstance) {
-								foreach ($oExtensionInstance::EnumItems(iPopupMenuExtension::MENU_OBJDETAILS_FIELD_ACTIONS, ['object' => $this, 'att_code' => $sAttCode, 'mode' => $bEditMode ? 'edit' : 'read']) as $oMenuItem) {
-									$val['actions'][] = $oMenuItem;
-								}
-							}
 
 							// The field is visible, add it to the current column
 							$oField = FieldUIBlockFactory::MakeFromParams($val);
@@ -1544,6 +1535,190 @@ HTML
 		return $sHtml;
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @throws \Exception
+	 *  only used in old and deprecated export.php
+	 *
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
+	 */
+	public static function DisplaySetAsHTMLSpreadsheet(WebPage $oPage, CMDBObjectSet $oSet, $aParams = [])
+	{
+		$oPage->add(self::GetSetAsHTMLSpreadsheet($oSet, $aParams));
+	}
+
+	/**
+	 * Spreadsheet output: designed for end users doing some reporting
+	 * Then the ids are excluded and replaced by the corresponding friendlyname
+	 *
+	 * @param \DBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 *
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
+	 */
+	public static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = [])
+	{
+		$aFields = null;
+		if (isset($aParams['fields']) && (strlen($aParams['fields']) > 0)) {
+			$aFields = explode(',', $aParams['fields']);
+		}
+
+		$bFieldsAdvanced = false;
+		if (isset($aParams['fields_advanced'])) {
+			$bFieldsAdvanced = (bool)$aParams['fields_advanced'];
+		}
+
+		$bLocalize = true;
+		if (isset($aParams['localize_values'])) {
+			$bLocalize = (bool)$aParams['localize_values'];
+		}
+
+		$aList = [];
+
+		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
+		$aAuthorizedClasses = [];
+		foreach ($aClasses as $sAlias => $sClassName) {
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) {
+				$aAuthorizedClasses[$sAlias] = $sClassName;
+			}
+		}
+		$aHeader = [];
+		foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
+			$aList[$sAlias] = [];
+
+			foreach (MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef) {
+				if (is_null($aFields) || (count($aFields) == 0)) {
+					// Standard list of attributes (no link sets)
+					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField())) {
+						$sAttCodeEx = $oAttDef->IsExternalField() ? $oAttDef->GetKeyAttCode().'->'.$oAttDef->GetExtAttCode() : $sAttCode;
+
+						$aList[$sAlias][$sAttCodeEx] = $oAttDef;
+
+						if ($bFieldsAdvanced && $oAttDef->IsExternalKey(EXTKEY_RELATIVE)) {
+							$sRemoteClass = $oAttDef->GetTargetClass();
+							foreach (MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode) {
+								$aList[$sAlias][$sAttCode.'->'.$sRemoteAttCode] = MetaModel::GetAttributeDef(
+									$sRemoteClass,
+									$sRemoteAttCode
+								);
+							}
+						}
+					}
+				} else {
+					// User defined list of attributes
+					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields)) {
+						$aList[$sAlias][$sAttCode] = $oAttDef;
+					}
+				}
+			}
+			// Replace external key by the corresponding friendly name (if not already in the list)
+			foreach ($aList[$sAlias] as $sAttCode => $oAttDef) {
+				if ($oAttDef->IsExternalKey()) {
+					unset($aList[$sAlias][$sAttCode]);
+					$sFriendlyNameAttCode = $sAttCode.'_friendlyname';
+					if (!array_key_exists(
+						$sFriendlyNameAttCode,
+						$aList[$sAlias]
+					) && MetaModel::IsValidAttCode($sClassName, $sFriendlyNameAttCode)) {
+						$oFriendlyNameAtt = MetaModel::GetAttributeDef($sClassName, $sFriendlyNameAttCode);
+						$aList[$sAlias][$sFriendlyNameAttCode] = $oFriendlyNameAtt;
+					}
+				}
+			}
+
+			foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
+				$sColLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx) : $sAttCodeEx;
+
+				$oFinalAttDef = $oAttDef->GetFinalAttDef();
+				if (get_class($oFinalAttDef) == 'AttributeDateTime') {
+					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Date').')';
+					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Time').')';
+				} else {
+					$aHeader[] = $sColLabel;
+				}
+			}
+		}
+
+		$sHtml = "<table border=\"1\">\n";
+		$sHtml .= "<tr>\n";
+		$sHtml .= "<td>".implode("</td><td>", $aHeader)."</td>\n";
+		$sHtml .= "</tr>\n";
+		$oSet->Seek(0);
+		while ($aObjects = $oSet->FetchAssoc()) {
+			$aRow = [];
+			foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
+				$oObj = $aObjects[$sAlias];
+				foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
+					if (is_null($oObj)) {
+						$aRow[] = '<td></td>';
+					} else {
+						$oFinalAttDef = $oAttDef->GetFinalAttDef();
+						if (get_class($oFinalAttDef) == 'AttributeDateTime') {
+							$sDate = $oObj->Get($sAttCodeEx);
+							if ($sDate === null) {
+								$aRow[] = '<td></td>';
+								$aRow[] = '<td></td>';
+							} else {
+								$iDate = AttributeDateTime::GetAsUnixSeconds($sDate);
+								$aRow[] = '<td>'.date(
+									'Y-m-d',
+									$iDate
+								).'</td>'; // Format kept as-is for 100% backward compatibility of the exports
+								$aRow[] = '<td>'.date(
+									'H:i:s',
+									$iDate
+								).'</td>'; // Format kept as-is for 100% backward compatibility of the exports
+							}
+						} else {
+							if ($oAttDef instanceof AttributeCaseLog) {
+								$rawValue = $oObj->Get($sAttCodeEx);
+								$outputValue = str_replace(
+									"\n",
+									"<br/>",
+									utils::EscapeHtml($rawValue->__toString())
+								);
+								// Trick for Excel: treat the content as text even if it begins with an equal sign
+								$aRow[] = '<td x:str>'.$outputValue.'</td>';
+							} else {
+								$rawValue = $oObj->Get($sAttCodeEx);
+								// Due to custom formatting rules, empty friendlynames may be rendered as non-empty strings
+								// let's fix this and make sure we render an empty string if the key == 0
+								if ($oAttDef instanceof AttributeExternalField && $oAttDef->IsFriendlyName()) {
+									$sKeyAttCode = $oAttDef->GetKeyAttCode();
+									if ($oObj->Get($sKeyAttCode) == 0) {
+										$rawValue = '';
+									}
+								}
+								if ($bLocalize) {
+									$outputValue = utils::EscapeHtml($oFinalAttDef->GetEditValue($rawValue));
+								} else {
+									$outputValue = utils::EscapeHtml($rawValue);
+								}
+								$aRow[] = '<td>'.$outputValue.'</td>';
+							}
+						}
+					}
+				}
+			}
+			$sHtml .= implode("\n", $aRow);
+			$sHtml .= "</tr>\n";
+		}
+		$sHtml .= "</table>\n";
+
+		return $sHtml;
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
@@ -3075,12 +3250,8 @@ EOF
 							}
 							$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, $aArgs);
 							if (is_array($aAllowedValues) && count($aAllowedValues) == 1) {
-								// linkset are ignored
-								// N°9622 - Error in the user story life cycle
-								if (!$oAttDef->IsLinkSet()) {
-									$aValues = array_keys($aAllowedValues);
-									$this->Set($sAttCode, $aValues[0]);
-								}
+								$aValues = array_keys($aAllowedValues);
+								$this->Set($sAttCode, $aValues[0]);
 							}
 						}
 					}
@@ -3996,27 +4167,6 @@ HTML;
 				$sTagSetJson = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null, 'raw_data');
 				if ($sTagSetJson !== null) { // bulk modify, direct linked set not handled
 					$value = json_decode($sTagSetJson, true);
-					if ($this->IsNew()) {
-						if (is_array($value['orig_value'])) {
-							foreach ($value['orig_value'] as $val) {
-								if (!in_array($val, $value['removed'])) {
-									$value['added'][] = $val;
-								}
-							}
-						}
-					} else {
-						$aCurrentValues = $this->Get($sAttCode)->GetValues();
-						foreach ($value['orig_value'] as $val) {
-							if (!in_array($val, $aCurrentValues) && !in_array($val, $value['removed']) && !in_array($val, $value['added'])) {
-								$value['added'][] = $val;
-							}
-						}
-						foreach ($aCurrentValues as $val) {
-							if (!in_array($val, $value['orig_value']) && !in_array($val, $value['removed']) && !in_array($val, $value['added'])) {
-								$value['removed'][] = $val;
-							}
-						}
-					}
 				}
 				break;
 
@@ -4357,7 +4507,7 @@ HTML;
 
 			$oDivField = FieldUIBlockFactory::MakeLarge("");
 			//	UIContentBlockUIBlockFactory::MakeStandard(null,["field_container field_large"]);
-			$oDivField->AddDataAttribute("attribute-type", $oAttDef->GetTypeShortClassName());
+			$oDivField->AddDataAttribute("attribute-type", $oAttDef->GetType());
 			$oDivField->AddDataAttribute("attribute-label", $sAttMetaDataLabel);
 			$oDivField->AddDataAttribute("attribute-flag-hidden", false);
 			$oDivField->AddDataAttribute("attribute-flag-read-only", false);
@@ -4660,7 +4810,7 @@ EOF
 			// Not in preview mode, do the update for real
 			$sTransactionId = utils::ReadPostedParam('transaction_id', '', 'transaction_id');
 			if (!utils::IsTransactionValid($sTransactionId, false)) {
-				throw new Exception(Dict::S('UI:Error:InvalidToken'));
+				throw new Exception(Dict::S('UI:Error:ObjectAlreadyUpdated'));
 			}
 			utils::RemoveTransaction($sTransactionId);
 		}

application/dashboard.class.inc.php

@@ -501,7 +501,7 @@ EOF
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = [], $bCanEdit = true)
 	{
-		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? $this->GetId(), $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? null, $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
 
 		/** @var \DashboardLayoutMultiCol $oLayout */
 		$oLayout = new $this->sLayoutClass();
@@ -586,7 +586,7 @@ JS
 			/** @var \Dashlet $oDashlet */
 			foreach ($aCell as $oDashlet) {
 				if ($oDashlet->IsVisible()) {
-					$oPage->add('<div class="dashlet_properties" id="dashlet_properties_'.$oDashlet->GetID().'" data-role="ibo-dashlet-properties" data-dashlet-class="'.$oDashlet->GetDashletType().'" style="display:none">');
+					$oPage->add('<div class="dashlet_properties" id="dashlet_properties_'.$oDashlet->GetID().'" style="display:none">');
 					$oForm = $oDashlet->GetForm();
 					$this->SetFormParams($oForm, $aExtraParams);
 					$oForm->RenderAsPropertySheet($oPage, false, '.itop-dashboard');
@@ -1203,7 +1203,7 @@ EOF
 		}
 		$aRenderParams['dashboard_div_id'] = $aExtraParams['dashboard_div_id'];
 		$sJSExtraParams = json_encode($aExtraParams);
-		$oPage->add('<div id="dashboard_editor" class="ibo-dashboard-editor" data-role="ibo-dashboard-editor" data-dashboard-id="'.$this->sId.'">');
+		$oPage->add('<div id="dashboard_editor" class="ibo-dashboard-editor" data-role="ibo-dashboard-editor">');
 		$oPage->add('<div class="ui-layout-center">');
 		$this->SetCustomFlag(true);
 		$this->Render($oPage, true, $aRenderParams);

application/dashlet.class.inc.php

@@ -25,20 +25,6 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\UIBlock;
 use Combodo\iTop\Application\WebPage\WebPage;
-use Combodo\iTop\Core\AttributeDefinition\AttributeDateTime;
-use Combodo\iTop\Core\AttributeDefinition\AttributeDecimal;
-use Combodo\iTop\Core\AttributeDefinition\AttributeDuration;
-use Combodo\iTop\Core\AttributeDefinition\AttributeEncryptedString;
-use Combodo\iTop\Core\AttributeDefinition\AttributeEnum;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalField;
-use Combodo\iTop\Core\AttributeDefinition\AttributeFriendlyName;
-use Combodo\iTop\Core\AttributeDefinition\AttributeInteger;
-use Combodo\iTop\Core\AttributeDefinition\AttributeLinkedSet;
-use Combodo\iTop\Core\AttributeDefinition\AttributeOneWayPassword;
-use Combodo\iTop\Core\AttributeDefinition\AttributePassword;
-use Combodo\iTop\Core\AttributeDefinition\AttributePercentage;
-use Combodo\iTop\Core\AttributeDefinition\AttributeSubItem;
-use Combodo\iTop\Core\AttributeDefinition\iAttributeNoGroupBy;
 
 require_once(APPROOT.'application/forms.class.inc.php');
 
@@ -454,7 +440,7 @@ EOF
 				// For external fields, find the real type of the target
 				$sExtFieldAttCode = $sAttCode;
 				$sTargetClass = $sClass;
-				while (is_a($sAttType, AttributeExternalField::class, true)) {
+				while (is_a($sAttType, 'AttributeExternalField', true)) {
 					$sExtKeyAttCode = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtFieldAttCode, 'extkey_attcode');
 					$sTargetAttCode = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtFieldAttCode, 'target_attcode');
 					$sTargetClass = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtKeyAttCode, 'targetclass');
@@ -464,13 +450,13 @@ EOF
 				}
 
 				$aForbidenAttType = [
-					AttributeLinkedSet::class,
-					AttributeFriendlyName::class,
+					'AttributeLinkedSet',
+					'AttributeFriendlyName',
 
-					iAttributeNoGroupBy::class, //we cannot only use iAttributeNoGroupBy since this method is also used by the designer who do not have access to the classes' PHP reflection API. So the known classes has to be listed altogether
-					AttributeOneWayPassword::class,
-					AttributeEncryptedString::class,
-					AttributePassword::class,
+					'iAttributeNoGroupBy', //we cannot only use iAttributeNoGroupBy since this method is also used by the designer who do not have access to the classes' PHP reflection API. So the known classes has to be listed altogether
+					'AttributeOneWayPassword',
+					'AttributeEncryptedString',
+					'AttributePassword',
 				];
 				foreach ($aForbidenAttType as $sForbidenAttType) {
 					if (is_a($sAttType, $sForbidenAttType, true)) {
@@ -482,7 +468,7 @@ EOF
 				if (!in_array($sLabel, $aGroupBy)) {
 					$aGroupBy[$sAttCode] = $sLabel;
 
-					if (is_a($sAttType, AttributeDateTime::class, true)) {
+					if (is_a($sAttType, 'AttributeDateTime', true)) {
 						$aGroupBy[$sAttCode.':hour'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Hour', $sLabel);
 						$aGroupBy[$sAttCode.':month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Month', $sLabel);
 						$aGroupBy[$sAttCode.':day_of_week'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek', $sLabel);
@@ -1116,7 +1102,7 @@ abstract class DashletGroupBy extends Dashlet
 			$aAttributeTypes = $this->oModelReflection->ListAttributes($this->sClass);
 			if (isset($aAttributeTypes[$this->sGroupByAttCode])) {
 				$sAttributeType = $aAttributeTypes[$this->sGroupByAttCode];
-				if (is_subclass_of($sAttributeType, AttributeDateTime::class) || $sAttributeType == AttributeDateTime::class) {
+				if (is_subclass_of($sAttributeType, 'AttributeDateTime') || $sAttributeType == 'AttributeDateTime') {
 					$this->sOrderDirection = 'asc';
 				} else {
 					$this->sOrderDirection = 'desc';
@@ -1272,7 +1258,7 @@ abstract class DashletGroupBy extends Dashlet
 		if ($this->oModelReflection->IsValidAttCode($sClass, $this->sGroupByAttCode)) {
 			$aAttributeTypes = $this->oModelReflection->ListAttributes($sClass);
 			$sAttributeType = $aAttributeTypes[$this->sGroupByAttCode];
-			if (is_subclass_of($sAttributeType, AttributeDateTime::class) || $sAttributeType == AttributeDateTime::class) {
+			if (is_subclass_of($sAttributeType, 'AttributeDateTime') || $sAttributeType == 'AttributeDateTime') {
 				// Note: an alternative to this somewhat hardcoded way of doing things would be to implement...
 				//$oExpr = Expression::FromOQL($this->sGroupByExpr);
 				//$aTranslationData = array($oQuery->GetClassAlias() => array($this->sGroupByAttCode => new ScalarExpression(date('Y-m-d H:i:s', $iTime))));
@@ -1303,7 +1289,7 @@ abstract class DashletGroupBy extends Dashlet
 				foreach ($aValues as $sValue) {
 					$aDisplayValues[] = ['label' => $sValue, 'value' => (int)rand(1, 15)];
 				}
-			} elseif (is_subclass_of($sAttributeType, AttributeEnum::class) || $sAttributeType == AttributeEnum::class) {
+			} elseif (is_subclass_of($sAttributeType, 'AttributeEnum') || $sAttributeType == 'AttributeEnum') {
 				$aAllowed = $this->oModelReflection->GetAllowedValues_att($sClass, $this->sGroupByAttCode);
 				if ($aAllowed) { // null for non enums
 					foreach ($aAllowed as $sValue => $sValueLabel) {
@@ -1472,11 +1458,11 @@ abstract class DashletGroupBy extends Dashlet
 			}
 			foreach ($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType) {
 				switch ($sAttType) {
-					case AttributeDecimal::class:
-					case AttributeDuration::class:
-					case AttributeInteger::class:
-					case AttributePercentage::class:
-					case AttributeSubItem::class: // TODO: Known limitation: no unit displayed (values in sec)
+					case 'AttributeDecimal':
+					case 'AttributeDuration':
+					case 'AttributeInteger':
+					case 'AttributePercentage':
+					case 'AttributeSubItem': // TODO: Known limitation: no unit displayed (values in sec)
 						$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
 						$aFunctionAttributes[$sAttCode] = $sLabel;
 						break;

application/datamodel.application.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="https://www.combodo.com/itop-schema/3.3"
-             version="3.4">
+             version="3.3">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>

application/displayblock.class.inc.php

@@ -1707,7 +1707,7 @@ JS
 		$oBlock->bAdvancedMode = utils::ReadParam('advanced', false);
 
 		$oBlock->sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv';
-		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
+		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
 		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
 		// Pass the parameters via POST, since expression may be very long
 		$aParamsToPost = [
@@ -1724,7 +1724,7 @@ JS
 			$oBlock->sLinkToToggle = $oBlock->sLinkToToggle.'&advanced=1';
 			$oBlock->sChecked = '';
 		}
-		$oBlock->sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php';
+		$oBlock->sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php';
 
 		$oBlock->sCharsetNotice = false;
 		$oBlock->sJsonParams = json_encode($aParamsToPost);
@@ -2292,17 +2292,6 @@ class MenuBlock extends DisplayBlock
 				}
 				// ResourceId should not be sanitized
 				$oActionButton->AddDataAttribute('resource-id', $sActionId);
-				if (isset($aAction['data_attributes']) && is_array($aAction['data_attributes'])) {
-					foreach ($aAction['data_attributes'] as $sName => $sValue) {
-						$sDataAttributeName = $sName;
-						$oActionButton->AddDataAttribute($sDataAttributeName, (string) $sValue);
-					}
-				}
-				if (isset($aAction['aria_attributes']) && is_array($aAction['aria_attributes'])) {
-					foreach ($aAction['aria_attributes'] as $sName => $sValue) {
-						$oActionButton->AddAriaAttribute((string) $sName, (string) $sValue);
-					}
-				}
 				$oActionButton->AddCSSClasses(['ibo-action-button', 'ibo-regular-action-button']);
 				if (empty($sLabel)) {
 					if (empty($aAction['tooltip'])) {

application/forms.class.inc.php

@@ -220,19 +220,10 @@ class DesignerForm
 					$sValidationFields = '</td><td class="prop_icon prop_apply ibo-prop--apply" >'.$sValidation.'</td><td  class="prop_icon prop_cancel ibo-prop--cancel"><span><div class="ibo-button ibo-is-alternative ibo-is-neutral" data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Revert').'"><i class="fas fa-undo"></i></div></span></td>'
 						.$this->EndRow();
 
-					$aPropertyFieldData = [
-						'code' => $oField->GetCode(),
-						'type' => $oField->GetInputType(),
-						'label' => $aRow['label'],
-						'raw-value' => $oField->GetRawValue(),
-					];
 					if (is_null($aRow['label'])) {
-						$sReturn .= $this->StartRow($sFieldId, $aPropertyFieldData).
-							'<td class="prop_value" data-role="ibo-property-field-value" colspan="2">'.$aRow['value'];
+						$sReturn .= $this->StartRow($sFieldId).'<td class="prop_value" colspan="2">'.$aRow['value'];
 					} else {
-						$sReturn .= $this->StartRow($sFieldId, $aPropertyFieldData).
-							'<td class="prop_label" data-role="ibo-property-field-label">'.$aRow['label'].
-							'</td><td class="prop_value" data-role="ibo-property-field-value">'.$aRow['value'];
+						$sReturn .= $this->StartRow($sFieldId).'<td class="prop_label">'.$aRow['label'].'</td><td class="prop_value">'.$aRow['value'];
 					}
 					if (!($oField instanceof DesignerFormSelectorField) && !($oField instanceof DesignerMultipleSubFormField)) {
 						$sReturn .= $sValidationFields;
@@ -303,21 +294,12 @@ EOF
 		}
 	}
 
-	public function StartRow($sFieldId = null, $aPropertyFieldData = [])
+	public function StartRow($sFieldId = null)
 	{
-		$sPropertyFieldAttributes = '';
-		foreach ($aPropertyFieldData as $sAttribute => $value) {
-			if (is_array($value)) {
-				$value = json_encode($value);
-			} elseif (is_null($value)) {
-				$value = '';
-			}
-			$sPropertyFieldAttributes .= ' data-property-field-'.$sAttribute.'="'.utils::EscapeHtml((string)$value).'"';
-		}
 		if ($sFieldId != null) {
-			return '<tr id="row_'.$sFieldId.'" data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'"'.$sPropertyFieldAttributes.'>';
+			return '<tr id="row_'.$sFieldId.'" data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'">';
 		}
-		return '<tr data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'"'.$sPropertyFieldAttributes.'>';
+		return '<tr data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'">';
 	}
 
 	public function EndRow()
@@ -697,14 +679,6 @@ class DesignerFormField
 		return $this->sCode;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function GetRawValue()
-	{
-		return $this->defaultValue;
-	}
-
 	/**
 	 * @param \DesignerForm $oForm
 	 */
@@ -1655,11 +1629,6 @@ class DesignerFormSelectorField extends DesignerFormField
 		return 'selector_property_field';
 	}
 
-	public function GetRawValue()
-	{
-		return $this->defaultRealValue;
-	}
-
 	public function AddSubForm($oSubForm, $sLabel, $sValue)
 	{
 		$this->aSubForms[] = ['form' => $oSubForm, 'label' => $sLabel, 'value' => $sValue];

application/loginwebpage.class.inc.php

@@ -25,11 +25,11 @@
  */
 
 use Combodo\iTop\Application\Branding;
+use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\WebPage\ErrorPage;
 use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
-use Combodo\iTop\Service\Session\Session;
 
 /**
  * Web page used for displaying the login form
@@ -369,7 +369,16 @@ class LoginWebPage extends NiceWebPage
 	public static function ResetSession()
 	{
 		// Unset all of the session variables.
-		Session::UnsetAll();
+		Session::Unset('auth_user');
+		Session::Unset('login_state');
+		Session::Unset('can_logoff');
+		Session::Unset('archive_mode');
+		Session::Unset('impersonate_user');
+		Session::Unset('PluginProperties');
+		Session::Unset('UrlMakerClass');
+		Session::Unset('itop_env');
+		Session::Unset('obj_messages');
+		Session::Unset('profile_list');
 		UserRights::_ResetSessionCache();
 		// If it's desired to kill the session, also delete the session cookie.
 		// Note: This will destroy the session, and not just the session data!

application/query.class.inc.php

@@ -113,43 +113,17 @@ abstract class Query extends cmdbAbstractObject
 			]
 		));
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey(
-			"owner_id",
-			[
-				"targetclass" => 'Contact',
-				"allowed_values" => null,
-				"sql" => 'owner_id',
-				"is_null_allowed" => true,
-				"depends_on" => [],
-				"display_style" => 'select',
-				"always_load_in_tables" => false,
-				"on_target_delete" => DEL_AUTO,
-			]
-		));
-
-		MetaModel::Init_AddAttribute(new AttributeEnumSet(
-			"usages",
-			[
-				"allowed_values" => null,
-				"possible_values" => new ValueSetEnumPadded("export,reference,notif,draft,dashlet"),
-				"sql" => "usages",
-				"depends_on" => [],
-				"is_null_allowed" => true,
-				"max_items" => 12,
-			]
-		));
-
 		// Display lists
 		MetaModel::Init_SetZListItems(
 			'details',
-			['name', 'is_template', 'owner_id', 'usages', 'description']
+			['name', 'is_template', 'description']
 		); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', ['description', 'usages']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', ['name', 'description', 'is_template']); // Criteria of the std search form
 		MetaModel::Init_SetZListItems(
 			'default_search',
-			['name', 'description', 'is_template', 'owner_id', 'usages']
+			['name', 'description', 'is_template']
 		); // Criteria of the default search form
 		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
@@ -169,15 +143,6 @@ abstract class Query extends cmdbAbstractObject
 		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
 	}
 
-	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = [])
-	{
-		// read only attribute
-		if (in_array($sAttCode, ['export_count', 'export_last_date', 'export_last_user_id'])) {
-			return OPT_ATT_READONLY;
-		}
-		return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
-	}
-
 	/**
 	 * Return export url.
 	 *
@@ -249,15 +214,15 @@ class QueryOQL extends Query
 		MetaModel::Init_SetZListItems(
 			'details',
 			[
-				'col:col1' => ['fieldset:Query:baseinfo' => ['name', 'is_template', 'owner_id', 'usages', 'description', 'oql', 'fields']],
+				'col:col1' => ['fieldset:Query:baseinfo' => ['name', 'is_template', 'description', 'oql', 'fields']],
 				'col:col2' => ['fieldset:Query:exportInfo' => ['export_count', 'export_last_date', 'export_last_user_id', 'export_last_user_contact']],
 			]
 		); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', ['description', 'usages']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems(
 			'standard_search',
-			['name', 'description', 'is_template', 'owner_id', 'usages', 'oql']
+			['name', 'description', 'is_template', 'fields', 'oql']
 		); // Criteria of the std search form
 	}
 

application/shortcut.class.inc.php

@@ -109,18 +109,10 @@ $('#shortcut_rename_dlg').dialog({
 	modal: true,
 	title: '$sDialogTitle',
 	buttons: [
-        { 
-            text: "$sCancelButtonLabel",
-            click: function() {
-                $(this).dialog( "close" ); $(this).remove();
-            },
-            'class': 'ibo-button ibo-is-alternative ibo-is-neutral action cancel'
-        },
-        { 
-            text: "$sOkButtonLabel",
-             click: ShortcutRenameOK,
-            'class': 'ibo-is-regular ibo-is-primary'
-        },
+	{ text: "$sOkButtonLabel", click: ShortcutRenameOK},
+	{ text: "$sCancelButtonLabel", click: function() {
+		$(this).dialog( "close" ); $(this).remove();
+	} },
 	],
 	close: function() { $(this).remove(); }
 });

application/transaction.class.inc.php

@@ -115,7 +115,7 @@ class privUITransactionSession
 		// Strictly speaking, the two lines below should be grouped together
 		// by a critical section
 		// sem_acquire($rSemIdentified);
-		$id = static::GetUserPrefix().str_replace(['.', ' '], '', microtime()).'-'.bin2hex(random_bytes(24));
+		$id = static::GetUserPrefix().str_replace(['.', ' '], '', microtime());
 		Session::Set(['transactions', $id], true);
 		// sem_release($rSemIdentified);
 
@@ -236,7 +236,7 @@ class privUITransactionFile
 
 		self::CleanupOldTransactions();
 
-		$sTransactionIdFullPath = static::CreateUniqueTransactionFilePath(utils::GetDataPath().'transactions', static::GetUserPrefix());
+		$sTransactionIdFullPath = tempnam(utils::GetDataPath().'transactions', static::GetUserPrefix());
 		file_put_contents($sTransactionIdFullPath, $iCurrentUserId, LOCK_EX);
 
 		$sTransactionIdFileName = basename($sTransactionIdFullPath);
@@ -245,33 +245,6 @@ class privUITransactionFile
 		return $sTransactionIdFileName;
 	}
 
-	/**
-	 * Create a transaction file path with a longer random suffix and create it atomically.
-	 *
-	 * @param string $sDir
-	 * @param string $sPrefix
-	 *
-	 * @return string
-	 *
-	 * @throws CoreException
-	 */
-	private static function CreateUniqueTransactionFilePath(string $sDir, string $sPrefix): string
-	{
-		$iMaxAttempts = 10;
-		for ($i = 0; $i < $iMaxAttempts; $i++) {
-			$sFileName = $sPrefix.bin2hex(random_bytes(24)); // 48 random hex chars
-			$sFullPath = $sDir.'/'.$sFileName;
-
-			$hFile = @fopen($sFullPath, 'x');
-			if ($hFile !== false) {
-				fclose($hFile);
-				return $sFullPath;
-			}
-		}
-
-		throw new CoreException('Failed to allocate a unique transaction file name after multiple attempts.');
-	}
-
 	/**
 	 * Check whether a transaction is valid or not and (optionally) remove the valid transaction from
 	 * the session so that another call to IsTransactionValid for the same transaction id
@@ -308,18 +281,6 @@ class privUITransactionFile
 			return false;
 		}
 
-		$iTime = filemtime($sFilepath);
-		$iLifetime = (int) MetaModel::GetConfig()->Get('transactions_file_lifetime');
-		$iLimit = time() - $iLifetime;
-		if ($iTime < $iLimit) {
-			self::Info("IsTransactionValid: Transaction '$id' expired.");
-			if ($iLifetime < 3600) {
-				IssueLog::Warning("IsTransactionValid: Transaction '$id' expired after only $iLifetime seconds. Consider increasing the 'transactions_file_lifetime' configuration parameter.");
-			}
-			@unlink($sFilepath);
-			return false;
-		}
-
 		if ($bRemoveTransaction) {
 			$bResult = @unlink($sFilepath);
 			if (!$bResult) {
@@ -353,7 +314,7 @@ class privUITransactionFile
 	}
 
 	/**
-	 * Cleanup old transactions which have been pending since more than the lifetime defined in the configuration parameter 'transactions_file_lifetime'.
+	 * Cleanup old transactions which have been pending since more than 24 hours
 	 * Use filemtime instead of filectime since filectime may be affected by operations on the directory (like changing the access rights)
 	 */
 	protected static function CleanupOldTransactions($sTransactionDir = null)
@@ -366,7 +327,7 @@ class privUITransactionFile
 		}
 
 		clearstatcache();
-		$iLimit = time() - (int) MetaModel::GetConfig()->Get('transactions_file_lifetime');
+		$iLimit = time() - 24 * 3600;
 		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : utils::GetDataPath().'transactions/*';
 		$aTransactions = glob($sPattern);
 		foreach ($aTransactions as $sFileName) {

application/ui.extkeywidget.class.inc.php

@@ -284,7 +284,8 @@ class UIExtKeyWidget
 				if ($bAddingValue) {
 					$aArguments = [];
 					foreach ($aAdditionalField as $sAdditionalField) {
-						array_push($aArguments, $oObj->Get($sAdditionalField));
+						$oAttrDef = MetaModel::GetAttributeDef(get_class($oObj), $sAdditionalField);
+						array_push($aArguments, $oAttrDef->GetValueLabel($oObj->Get($sAdditionalField)));
 					}
 					$aOption['additional_field'] = utils::HtmlEntities(utils::VSprintf($sFormatAdditionalField, $aArguments));
 				}

application/utils.inc.php

@@ -1833,15 +1833,10 @@ SQL;
 	/**
 	 * Some characters cause troubles with jQuery when used inside DOM IDs, so let's replace them by the safe _ (underscore)
 	 * @param string $sId The ID to sanitize
-	 * @param bool $bForSelector Whether to apply strict CSS/jQuery selector-safe sanitization
 	 * @return string The sanitized ID
 	 */
-	public static function GetSafeId($sId, bool $bForSelector = false)
+	public static function GetSafeId($sId)
 	{
-		if ($bForSelector) {
-			return preg_replace('/[^a-zA-Z0-9_]/', '_', $sId);
-		}
-
 		return str_replace([':', '[', ']', '+', '-', ' '], '_', $sId);
 	}
 
@@ -1891,7 +1886,7 @@ SQL;
 			CURLOPT_HEADER         => false,    // don't return the headers in the output
 			CURLOPT_FOLLOWLOCATION => true,     // follow redirects
 			CURLOPT_ENCODING       => "",       // handle all encodings
-			CURLOPT_USERAGENT      => static::GetConfig()->Get('http.request.user_agent'), // who am i
+			CURLOPT_USERAGENT      => "spider", // who am i
 			CURLOPT_AUTOREFERER    => true,     // set referer on redirect
 			CURLOPT_CONNECTTIMEOUT => 120,      // timeout on connect
 			CURLOPT_TIMEOUT        => 120,      // timeout on response
@@ -3027,6 +3022,7 @@ TXT
 	 * Note: Only works for backoffice URLs for now
 	 *
 	 * @param string $sText Text containing the mentioned objects to be found
+	 * @param string $sFormat {@uses static::ENUM_TEXT_FORMAT_HTML, ...}
 	 *
 	 * @return array Array of object classes / IDs for the ones found in $sText
 	 *
@@ -3041,45 +3037,13 @@ TXT
 	public static function GetMentionedObjectsFromText(string $sText): array
 	{
 		$aMentionedObjects = [];
-		$aMentionAllowedClasses = MetaModel::GetConfig()->Get('mentions.allowed_classes');
-		$oDom = new \DOMDocument();
-		$bPreviousUseInternalErrors = libxml_use_internal_errors(true); // to keep processing even in case of "invalid" HTML, cf. testGetMentionedObjectsFromText
+		$aMentionMatches = [];
+		$sText = html_entity_decode($sText);
 
-		try {
-			$oDom->loadHTML('<?xml encoding="UTF-8">'.$sText);
-		} finally {
-			libxml_clear_errors();
-			libxml_use_internal_errors($bPreviousUseInternalErrors);
-		}
-		$oXpath = new \DOMXPath($oDom);
-		$oNodes = $oXpath->query('//a[@data-object-class and @data-object-key]');
-
-		foreach ($oNodes as $oObjNode) {
-			$sMatchedClass = $oObjNode->getAttribute('data-object-class');
-			$sMatchedId = $oObjNode->getAttribute('data-object-key');
-			$sMatchedName = trim($oObjNode->textContent);
-
-			// Ensure that what we found is actually configured as a mention
-			$sMentionPrefix = array_search($sMatchedClass, $aMentionAllowedClasses);
-			// - No direct configuration for the matched class, let's look for a configuration on parent classes
-			if (false === $sMentionPrefix) {
-				$bHasMentionConfigurationForParentClass = false;
-				foreach (MetaModel::EnumParentClasses($sMatchedClass, ENUM_PARENT_CLASSES_EXCLUDELEAF, false) as $aMatchedParentClass) {
-					$sMentionPrefix = array_search($aMatchedParentClass, $aMentionAllowedClasses);
-					if (false !== $sMentionPrefix) {
-						$bHasMentionConfigurationForParentClass = true;
-						break;
-					}
-				}
-
-				if (false === $bHasMentionConfigurationForParentClass) {
-					continue;
-				}
-			}
-			// - Test if the name starts with $sMentionPrefix (e.g. '@' for 'Contact' class)
-			if (false === str_starts_with($sMatchedName, $sMentionPrefix)) {
-				continue;
-			}
+		preg_match_all('/<a\s*([^>]*)data-object-class="([^"]*)"\s.*data-object-key="([^"]*)"/Ui', $sText, $aMentionMatches);
+		foreach ($aMentionMatches[0] as $iMatchIdx => $sCompleteMatch) {
+			$sMatchedClass = $aMentionMatches[2][$iMatchIdx];
+			$sMatchedId = $aMentionMatches[3][$iMatchIdx];
 
 			// Prepare array for matched class if not already present
 			if (!array_key_exists($sMatchedClass, $aMentionedObjects)) {
@@ -3254,48 +3218,4 @@ TXT
 				return (int)$sLimit;
 		}
 	}
-
-	/**
-	 * @since 3.3.0 N°9875
-	 * Open archive and raise appropriate exception.
-	 * Warning: do not forget to close archive afterwhile
-	 * @param string $sArchiveFilePath
-	 * @param int|null $flags
-	 * @return ZipArchive
-	 * @throws \Exception
-	 */
-	public static function ZipArchiveOpen(string $sArchiveFilePath, int|null $flags = null): ZipArchive
-	{
-		$oZip = new ZipArchive();
-		if (is_null($flags)) {
-			$code = $oZip->open($sArchiveFilePath);
-		} else {
-			$code = $oZip->open($sArchiveFilePath, $flags);
-		}
-		if (true !== $code) {
-			//ZipArchive::ZIP_ER_NOZIP : 19
-			if ($code === 19) {
-				throw new \Exception(sprintf('Cannot open zip file due to inconsistent or empty content'));
-			}
-
-			throw new \Exception(sprintf('Cannot open zip file due to error code %s', $code));
-		}
-		return $oZip;
-	}
-
-	/**
-	* @since 3.3.0 N°9875
-	* @param string $sDirectory
-	* @param string $sPrefix
-	* @return ZipArchive
-	* @throws \Exception
-	 */
-	public static function ZipArchiveCreateWithTempNam(string $sDirectory, string $sPrefix): ZipArchive
-	{
-		$sTempnam = tempnam($sDirectory, $sPrefix);
-		unlink($sTempnam);
-		$sArchiveName = $sTempnam.'.zip';
-
-		return self::ZipArchiveOpen($sArchiveName, ZipArchive::CREATE);
-	}
 }

approot.inc.php

@@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/');
  *
  * @see ITOP_CORE_VERSION to get full iTop core version
  */
-define('ITOP_DESIGN_LATEST_VERSION', '3.4');
+define('ITOP_DESIGN_LATEST_VERSION', '3.3');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.4');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.4.0');
+define('ITOP_CORE_VERSION', '3.3.0');
 
 /**
  * @var string

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "24e7507794b971955358df5f2b143ac4",
+    "content-hash": "1cca58a0e26794fb9c546a001f7f7de8",
     "packages": [
         {
             "name": "apereo/phpcas",
@@ -5570,16 +5570,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.28.0",
+            "version": "v3.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b"
+                "reference": "a6769aefb305efef849dc25c9fd1653358c148f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
-                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6769aefb305efef849dc25c9fd1653358c148f0",
+                "reference": "a6769aefb305efef849dc25c9fd1653358c148f0",
                 "shasum": ""
             },
             "require": {
@@ -5634,7 +5634,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.28.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.24.0"
             },
             "funding": [
                 {
@@ -5646,7 +5646,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-03T20:44:34+00:00"
+            "time": "2026-03-17T21:31:11+00:00"
         }
     ],
     "packages-dev": [

core/cmdbsource.class.inc.php

@@ -916,9 +916,7 @@ class CMDBSource
 		$aColumn = [];
 		$aData = self::QueryToArray($sSql);
 		foreach ($aData as $aRow) {
-			if ($aRow[$col] !== null) {
-				$aColumn[] = $aRow[$col];
-			}
+			@$aColumn[] = $aRow[$col];
 		}
 		return $aColumn;
 	}

core/config.class.inc.php

@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.4.0-dev');
+define('ITOP_VERSION', '3.3.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -607,14 +607,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'attribute.max_actions_items' => [
-			'type' => 'integer',
-			'description' => 'Maximum number of actions to display before it\'s compacted into a single action (0 means no limit)',
-			'default' => 2,
-			'value' => 2,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'email_asynchronous' => [
 			'type' => 'bool',
 			'description' => 'If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode',
@@ -1296,14 +1288,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'transactions_file_lifetime' => [
-			'type'                => 'integer',
-			'description'         => 'Value in seconds for the lifetime of a transaction file (after this duration, the transaction will be invalid and the garbage collector could delete it). This only works if the "transaction_storage" parameter is set to "File".',
-			'default'             => 3600,
-			'value'               => '',
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'log_transactions' => [
 			'type'                => 'bool',
 			'description'         => 'Whether or not to enable the debug log for the transactions.',
@@ -1765,8 +1749,8 @@ class Config
 		'security.disable_joined_classes_filter' => [
 			'type'                => 'bool',
 			'description'         => 'If true, scope filters aren\'t applied to joined classes or union classes not directly listed in the SELECT clause.',
-			'default'             => false,
-			'value'               => false,
+			'default'             => true,
+			'value'               => true,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
@@ -1781,8 +1765,8 @@ class Config
 		'security.disable_exec_forced_login_for_all_enpoints' => [
 			'type'                => 'bool',
 			'description'         => 'If true, when no delegated authentication module is defined, no login will be forced on modules exec endpoints',
-			'default'             => false,
-			'value'               => false,
+			'default'             => true,
+			'value'               => true,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],

core/datamodel.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="lnkActionNotificationToContact" _delta="define">
       <parent>DBObject</parent>

core/dbobject.class.php

@@ -730,8 +730,13 @@ abstract class DBObject implements iDisplay
 	public function SetTrim($sAttCode, $sValue)
 	{
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-
-		$this->Set($sAttCode, $oAttDef->TrimValue($sValue));
+		$iMaxSize = $oAttDef->GetMaxSize();
+		$sLength = mb_strlen($sValue);
+		if ($iMaxSize && ($sLength > $iMaxSize)) {
+			$sMessage = " -truncated ($sLength chars)";
+			$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
+		}
+		$this->Set($sAttCode, $sValue);
 	}
 
 	/**
@@ -2033,7 +2038,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 			if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
-				$iLen = $oAtt->GetSize($toCheck);
+				$iLen = mb_strlen($toCheck);
 				if ($iLen > $iMaxSize) {
 					return "String too long (found $iLen, limited to $iMaxSize)";
 				}

core/dbobjectsearch.class.php

@@ -1711,7 +1711,7 @@ class DBObjectSearch extends DBSearch
 	 * @return array|mixed|\SQLObjectQuery|null
 	 * @throws \CoreException
 	 */
-	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
 		// Hide objects that are not visible to the current user
 		//
@@ -1782,8 +1782,6 @@ class DBObjectSearch extends DBSearch
 			$aContextData['aSelectExpr'] = $aSelectExpr;
 			$sRawId .= $bGetCount;
 			$aContextData['bGetCount'] = $bGetCount;
-			$sRawId .= 'ids:'.($bSelectOnlyIds ? '1' : '0');
-			$aContextData['bSelectOnlyIds'] = $bSelectOnlyIds;
 			if (is_array($aSelectedClasses)) {
 				$sRawId .= implode(',', $aSelectedClasses); // Unions may alter the list of selected columns
 			}
@@ -1837,7 +1835,7 @@ class DBObjectSearch extends DBSearch
 		if (!isset($oSQLQuery)) {
 			$oKPI = new ExecutionKPI();
 			$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($oSearch);
-			$oSQLQuery = $oSQLObjectQueryBuilder->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr, $bSelectOnlyIds);
+			$oSQLQuery = $oSQLObjectQueryBuilder->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
 			$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);
 
 			if (self::$m_bQueryCacheEnabled) {
@@ -1937,8 +1935,9 @@ class DBObjectSearch extends DBSearch
 
 	/**
 	 * @inheritDoc
+	 * @return DBObjectSearch
 	 */
-	protected function ApplyDataFilters(): DBSearch
+	protected function ApplyDataFilters(): DBObjectSearch
 	{
 		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
 			return $this;
@@ -1947,7 +1946,7 @@ class DBObjectSearch extends DBSearch
 		$oSearch = $this;
 		$aClassesToFilter = $this->GetSelectedClasses();
 
-		// Joined classes filtering can be disabled through the configuration.
+		// Opt-in for joined classes filtering, otherwise only filter the selected class(es)
 		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === false) {
 			$aClassesToFilter = $this->GetJoinedClasses();
 		}

core/dbsearch.class.php

@@ -921,7 +921,7 @@ abstract class DBSearch
 	 * @internal
 	 *
 	 */
-	public function MakeSelectQuery($aOrderBy = [], $aArgs = [], $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulSQL = true, $bSelectOnlyIds = false)
+	public function MakeSelectQuery($aOrderBy = [], $aArgs = [], $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulSQL = true)
 	{
 		// Check the order by specification, and prefix with the class alias
 		// and make sure that the ordering columns are going to be selected
@@ -962,7 +962,7 @@ abstract class DBSearch
 			}
 		}
 
-		$oSQLQuery = $this->GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, null, null, $bSelectOnlyIds);
+		$oSQLQuery = $this->GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount);
 
 		if ($this->m_bNoContextParameters) {
 			// Only internal parameters
@@ -1046,7 +1046,7 @@ abstract class DBSearch
 	 * @internal
 	 *
 	 */
-	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null)
 	{
 		$oSearch = $this->ApplyDataFilters();
 
@@ -1068,7 +1068,7 @@ abstract class DBSearch
 			}
 		}
 
-		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr, $bSelectOnlyIds);
+		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr);
 		$oSQLQuery->SetSourceOQL($oSearch->ToOQL());
 
 		// Join to an additional table, if required...
@@ -1103,8 +1103,7 @@ abstract class DBSearch
 		$bGetCount,
 		$aGroupByExpr = null,
 		$aSelectedClasses = null,
-		$aSelectExpr = null,
-		$bSelectOnlyIds = false
+		$aSelectExpr = null
 	);
 
 	/**

core/dbunionsearch.class.php

@@ -527,10 +527,10 @@ class DBUnionSearch extends DBSearch
 		throw new Exception('MakeUpdateQuery is not implemented for the unions!');
 	}
 
-	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
 		if (count($this->aSearches) == 1) {
-			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectedClasses, $aSelectExpr, $bSelectOnlyIds);
+			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
 		}
 
 		$aSQLQueries = [];
@@ -610,7 +610,7 @@ class DBUnionSearch extends DBSearch
 					}
 				}
 			}
-			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr, $bSelectOnlyIds);
+			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr);
 			if (count($aSearchAliases) > 1) {
 				// Necessary to make sure that selected columns will match throughout all the queries
 				// (default order of selected fields depending on the order of JOINS)
@@ -676,14 +676,15 @@ class DBUnionSearch extends DBSearch
 
 	/**
 	 * @inheritDoc
+	 * @return DBUnionSearch
 	 */
-	protected function ApplyDataFilters(): DBSearch
+	protected function ApplyDataFilters(): DBUnionSearch
 	{
 		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
 			return $this;
 		}
 
-		// Joined classes filtering can be disabled through the configuration.
+		// Opt-in for joined classes filtering, otherwise fallback on DBSearch filtering
 		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === true) {
 			return parent::ApplyDataFilters();
 		}

core/inlineimage.class.inc.php

@@ -434,7 +434,7 @@ JS
 	 * Resize an image so that it fits the maximum width/height defined in the config file
 	 * @param ormDocument $oImage The original image stored as an array (content / mimetype / filename)
 	 * @return ormDocument The resampled image (or the original one if it already fit)
-	 * @deprecated 3.3.0 Use ormDocument::ResizeImageToFit instead
+	 * @deprecated since 3.3.0 Replaced by ormDocument::ResizeImageToFit
 	 */
 	public static function ResizeImageToFit(ormDocument $oImage, &$aDimensions = null)
 	{

core/log.class.inc.php

@@ -614,13 +614,6 @@ class LogChannels
 	 * @since 3.2.0
 	 */
 	public const SECURITY = 'Security';
-
-	/**
-	 * For Session parameters
-	 *
-	 * @Since 3.3.0
-	 */
-	public const SESSION_PARAMETERS = 'SessionParameters';
 }
 
 abstract class LogAPI

core/metamodel.class.php

@@ -1642,10 +1642,10 @@ abstract class MetaModel
 		if ($sFilterCode == 'id') {
 			return true;
 		}
-		if (array_key_exists($sClass, self::$m_aMagicFields) && in_array($sFilterCode, self::$m_aMagicFields[$sClass])) {
+		if (array_key_exists($sClass, self::$m_aMagicFields) && array_key_exists($sFilterCode, self::$m_aMagicFields[$sClass])) {
 			return true;
 		}
-		if (array_key_exists($sClass, self::$m_aFilterForbiddenAttributes) && in_array($sFilterCode, self::$m_aFilterForbiddenAttributes[$sClass])) {
+		if (array_key_exists($sClass, self::$m_aFilterForbiddenAttributes) && array_key_exists($sFilterCode, self::$m_aFilterForbiddenAttributes[$sClass])) {
 			return false;
 		}
 		return self::IsValidAttCode($sClass, $sFilterCode);
@@ -2963,9 +2963,8 @@ abstract class MetaModel
 						self::$m_aMagicFields[] = $sClass;
 					}
 					self::$m_aMagicFields[$sClass][] = $sCode;
-					self::$m_aAttribOrigins[$sClass][$sCode] = self::$m_aAttribOrigins[$sClass][$sAttCode];
 				}
-				if (!$oAttDef->IsValidFilterAttribute()) {
+				if (!$oAttDef->IsSearchable()) {
 					if (!array_key_exists($sClass, self::$m_aFilterForbiddenAttributes)) {
 						self::$m_aFilterForbiddenAttributes[] = $sClass;
 					}
@@ -5762,37 +5761,36 @@ abstract class MetaModel
 
 		self::$m_sEnvironment = $sEnvironment;
 
-		if (!defined('MODULESROOT')) {
-			define('MODULESROOT', APPROOT.'env-'.self::$m_sEnvironment.'/');
+		try {
+			if (!defined('MODULESROOT')) {
+				define('MODULESROOT', APPROOT.'env-'.self::$m_sEnvironment.'/');
 
-			self::$m_bTraceSourceFiles = $bTraceSourceFiles;
+				self::$m_bTraceSourceFiles = $bTraceSourceFiles;
 
-			// $config can be either a filename, or a Configuration object (volatile!)
-			if ($config instanceof Config) {
-				self::LoadConfig($config, $bAllowCache);
-			} else {
-				self::LoadConfig(new Config($config), $bAllowCache);
+				// $config can be either a filename, or a Configuration object (volatile!)
+				if ($config instanceof Config) {
+					self::LoadConfig($config, $bAllowCache);
+				} else {
+					self::LoadConfig(new Config($config), $bAllowCache);
+				}
+
+				if ($bModelOnly) {
+					return;
+				}
 			}
 
-			if ($bModelOnly) {
-				// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
-				EventService::InitService();
-				EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
-				return;
+			CMDBSource::SelectDB(self::$m_sDBName);
+
+			foreach (MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass) {
+				$oPHPClass::OnMetaModelStarted();
 			}
+
+			ExpressionCache::Warmup();
+		} finally {
+			// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
+			EventService::InitService();
+			EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
 		}
-
-		CMDBSource::SelectDB(self::$m_sDBName);
-
-		foreach (MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass) {
-			$oPHPClass::OnMetaModelStarted();
-		}
-
-		ExpressionCache::Warmup();
-
-		// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
-		EventService::InitService();
-		EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
 	}
 
 	/**
@@ -6866,24 +6864,10 @@ abstract class MetaModel
 		require_once(APPROOT.'/core/dict.class.inc.php');
 		Dict::ResetCache($sAppIdentity);
 
-		$iApcDeleteFailureCount = 0;
 		if (function_exists('apc_delete')) {
 			foreach (self::GetCacheEntries($sEnvironmentId) as $sKey => $aAPCInfo) {
 				$sAPCKey = $aAPCInfo['info'];
-				if (!apc_delete($sAPCKey)) {
-					$iApcDeleteFailureCount++;
-				}
-			}
-		}
-
-		if ($iApcDeleteFailureCount > 0) {
-			SetupLog::Warning("apc_delete failed for $iApcDeleteFailureCount entries for env $sEnvironment");
-		}
-
-		if (function_exists('apc_clear_cache')) {
-			// old style APC
-			if (!apc_clear_cache()) {
-				SetupLog::Warning("apc_clear_cache failed for env $sEnvironment");
+				apc_delete($sAPCKey);
 			}
 		}
 
@@ -6893,9 +6877,7 @@ abstract class MetaModel
 		// Reset the opcache since otherwise the PHP "model" files may still be cached !!
 		if (function_exists('opcache_reset')) {
 			// Zend opcode cache
-			if (!opcache_reset()) {
-				SetupLog::Warning("opcache_reset failed for env $sEnvironment");
-			}
+			opcache_reset();
 		}
 
 		require_once(APPROOT.'setup/setuputils.class.inc.php');

core/oqlactualclasstreeresolver.class.inc.php

@@ -60,13 +60,15 @@ class OQLActualClassTreeResolver
 		$aTranslateFields = [];
 		foreach ($aExpectedAttributes as $sAttCode => $oExpression) {
 			// 'id' is managed later
-			if ($sAttCode === 'id') {
+			if ($sAttCode == 'id') {
 				continue;
 			}
 			// Attributes can be stored in attributes list or for magic ones into filter codes list.
 			$sOriginClass = null;
-			if (MetaModel::IsValidAttCode($sClass, $sAttCode) || MetaModel::IsValidFilterCode($sClass, $sAttCode)) {
+			if (MetaModel::IsValidAttCode($sClass, $sAttCode)) {
 				$sOriginClass = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
+			} elseif ($sAttCode == 'id') {
+				$sOriginClass = $sClass;
 			} else {
 				continue;
 			}

core/ormdocument.class.inc.php

@@ -408,7 +408,7 @@ class ormDocument
 	 * @param int $iMaxImageHeight Maximum height for the resized image
 	 * @param array|null $aFinalDimensions Image dimensions after resizing or null if unable to read the image
 	 * @return ormDocument The resampled image
-	 * @since 3.3.0 N°3124
+	 *
 	 */
 	public function ResizeImageToFit(int $iMaxWidth, int $iMaxHeight, array|null &$aFinalDimensions = null): static
 	{

core/sqlobjectquerybuilder.class.inc.php

@@ -29,14 +29,13 @@ class SQLObjectQueryBuilder
 	 * @param array $aGroupByExpr
 	 * @param array $aSelectedClasses
 	 * @param array $aSelectExpr
-	 * @param bool $bSelectOnlyIds
 	 *
 	 * @return null|SQLObjectQuery
 	 * @throws \CoreException
 	 */
-	public function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	public function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
-		if ($bGetCount || !is_null($aGroupByExpr) || $bSelectOnlyIds) {
+		if ($bGetCount || !is_null($aGroupByExpr)) {
 			// Avoid adding all the fields for counts or "group by" requests
 			$aAttToLoad = [];
 			foreach ($this->oDBObjetSearch->GetSelectedClasses() as $sClassAlias => $sClass) {

core/tabularbulkexport.class.inc.php

@@ -8,13 +8,6 @@
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Application\WebPage\WebPage;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalField;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalKey;
-use Combodo\iTop\Core\AttributeDefinition\AttributeFriendlyName;
-use Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey;
-use Combodo\iTop\Core\AttributeDefinition\AttributeLinkedSet;
-use Combodo\iTop\Core\AttributeDefinition\AttributeStopWatch;
-use Combodo\iTop\Core\AttributeDefinition\AttributeSubItem;
 
 /**
  * Bulk export: Tabular export: abstract base class for all "tabular" exports.
@@ -98,8 +91,8 @@ abstract class TabularBulkExport extends BulkExport
 	{
 		$aResult = [];
 		switch (get_class($oAttDef)) {
-			case AttributeExternalKey::class:
-			case AttributeHierarchicalKey::class:
+			case 'AttributeExternalKey':
+			case 'AttributeHierarchicalKey':
 
 				$bAddFriendlyName = true;
 				$oKeyAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
@@ -149,7 +142,7 @@ abstract class TabularBulkExport extends BulkExport
 				}
 				break;
 
-			case AttributeStopWatch::class:
+			case 'AttributeStopWatch':
 				foreach (MetaModel::ListAttributeDefs($sClass) as $sSubAttCode => $oSubAttDef) {
 					if ($oSubAttDef instanceof AttributeSubItem) {
 						if ($oSubAttDef->GetParentAttCode() == $sAttCode) {
@@ -325,7 +318,7 @@ EOF
 		$sQueryId = utils::ReadParam('query', null, true);
 		$sFields = utils::ReadParam('fields', null, true, 'raw_data');
 		if ((($sFields === null) || ($sFields === '')) && ($sQueryId === null)) {
-			$sFields =  $this->GetFieldsFromQuery();
+			throw new BulkExportMissingParameterException('fields');
 		} else {
 			if (($sQueryId !== null) && ($sQueryId !== null)) {
 				$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', ['query_id' => $sQueryId]);
@@ -336,11 +329,11 @@ EOF
 						// No 'fields' parameter supplied, take the fields from the query phrasebook definition
 						$sFields = trim($oQuery->Get('fields'));
 						if ($sFields === '') {
-							$sFields =  $this->GetFieldsFromQuery();
+							throw new BulkExportMissingParameterException('fields');
 						}
 					}
 				} else {
-					throw new BulkExportException('Invalid value for the parameter: query. There is no Query Phrasebook with id = '.$sQueryId, Dict::Format('Core:BulkExport:InvalidParameter_Query', $sQueryId));
+					throw BulkExportException('Invalid value for the parameter: query. There is no Query Phrasebook with id = '.$sQueryId, Dict::Format('Core:BulkExport:InvalidParameter_Query', $sQueryId));
 				}
 			}
 		}
@@ -348,39 +341,6 @@ EOF
 		$this->SetFields($sFields);
 	}
 
-	public function GetFieldsFromQuery(): string
-	{
-		if (is_null($this->oSearch)) {
-			throw new BulkExportMissingParameterException("fields");
-		}
-
-		$aSelectedClasses = $this->oSearch->GetSelectedClasses();
-		$aAuthorizedClasses = [];
-		$aFields = [];
-		foreach ($aSelectedClasses as $sAlias => $sClassName) {
-			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_BULK_READ) == UR_ALLOWED_YES) {
-				$aAuthorizedClasses[$sAlias] = $sClassName;
-			}
-		}
-		foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
-			foreach (MetaModel::ListAttributeDefs($sClassName) as $oAttribute) {
-				$sAttCode = $oAttribute->GetCode();
-				if (! $this->IsExportableField($sClassName, $sAttCode, $oAttribute)) {
-					continue;
-				}
-				$sCurrentAlias = utils::IsNullOrEmptyString($sAlias) ? "" : "$sAlias.";
-				$aFields[] = "{$sCurrentAlias}{$sAttCode}";
-			}
-		}
-
-		if (count($aFields) === 0) {
-			IssueLog::Error("User is not allowed to see any field for exported OQL");
-			throw new BulkExportMissingParameterException("fields");
-		}
-
-		return implode(',', $aFields);
-	}
-
 	public function SetFields($sFields)
 	{
 		// Interpret (and check) the list of fields

core/trigger.class.inc.php

@@ -39,7 +39,7 @@ abstract class Trigger extends cmdbAbstractObject
 			"category"                   => "grant_by_profile,core/cmdb",
 			"key_type"                   => "autoincrement",
 			"name_attcode"               => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode"              => "",
 			"reconc_keys"                => ['description'],
 			"db_table"                   => "priv_trigger",
@@ -174,7 +174,7 @@ abstract class TriggerOnObject extends Trigger
 			"category"            => "grant_by_profile,core/cmdb",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode"       => "",
 			"reconc_keys" => ['description'],
 			"db_table"            => "priv_trigger_onobject",
@@ -401,7 +401,7 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onportalupdate",
@@ -434,7 +434,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstatechange",
@@ -469,7 +469,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstateenter",
@@ -503,7 +503,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstateleave",
@@ -537,7 +537,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjcreate",
@@ -572,7 +572,7 @@ class TriggerOnObjectDelete extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjdelete",
@@ -607,7 +607,7 @@ class TriggerOnObjectUpdate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjupdate",
@@ -695,7 +695,7 @@ class TriggerOnObjectMention extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjmention",
@@ -773,7 +773,7 @@ class TriggerOnAttributeBlobDownload extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onattblobdownload",
@@ -852,7 +852,7 @@ class TriggerOnThresholdReached extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_threshold",

core/userrights.class.inc.php

@@ -1530,37 +1530,6 @@ class UserRights
 		}
 	}
 
-	/**
-	 * @param User $oUser
-	 * @param array $aExcludedProfilesId Administrator by default, but can also be other proofiles depending on needs (e.g. power portal user or REST profile)
-	 * @return bool
-	 * @throws ArchivedObjectException
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 * @throws MySQLException
-	 */
-	public static function IsUserReadOnly(User $oUser, array $aExcludedProfilesId = [1]): bool
-	{
-		$oUserProfiles = $oUser->Get('profile_list');
-		$oUserRights = UserRights::GetModuleInstance();
-		while ($oUserProfile = $oUserProfiles->Fetch()) {
-			$iProfileId = $oUserProfile->Get('profileid');
-			if (in_array($iProfileId, $aExcludedProfilesId)) {
-				return false;
-			}
-			foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass) {
-				foreach (['w', 'bw', 'd', 'bd'] as $sWriteActionCode) {
-					$bIsGranted = $oUserRights->GetProfileActionGrant($iProfileId, $sClass, $sWriteActionCode);
-					if ($bIsGranted === true) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	 * @param string $sClass
 	 * @param int $iActionCode see UR_ACTION_* constants

core/valuesetdef.class.inc.php

@@ -404,7 +404,8 @@ class ValueSetObjects extends ValueSetDefinition
 			if (count($aAdditionalField) > 0) {
 				$aArguments = [];
 				foreach ($aAdditionalField as $sAdditionalField) {
-					array_push($aArguments, $oObject->Get($sAdditionalField));
+					$oAttrDef = MetaModel::GetAttributeDef(get_class($oObject), $sAdditionalField);
+					array_push($aArguments, $oAttrDef->GetValueLabel($oObject->Get($sAdditionalField)));
 				}
 				$aData['additional_field'] = utils::VSprintf($sFormatAdditionalField, $aArguments);
 			} else {

css/backoffice/README.md

@@ -42,7 +42,7 @@ css/backoffice/
 |– vendors/                 # Third-party libs, should be either:
 |                           # - Overload of the lib SCSS variables (BEST way, but possible only if the lib exposes them. e.g. Bulma)
 |                           # - Overload of the lib necessary CSS classes only (not great as it duplicates some rules in the browser, which add weight and computation. e.g. dataTables)
-|                           # - Duplicate the lib CSS completely to insert SCSS variables (not great as it will be outdated when updating the lib itself. e.g. jQuery UI)
+|                           # - Duplicate the lib CSS completly to insert SCSS variables (not great as it will be outdated when updating the lib itself. e.g. jQuery UI)
 |   |– _bulma-variables-overload.scss   # Bulma CSS framework
 |   |– _jquery-ui.scss                  # jQuery UI
 |   ...                                 # Etc…

css/backoffice/application/_user-rights.scss

@@ -4,7 +4,7 @@
  */
 
 $ibo-user-rights--padding-x: $ibo-spacing-400 !default;
-$ibo-user-rights--padding-y: $ibo-spacing-100 !default;
+$ibo-user-rights--padding-y: $ibo-spacing-200 !default;
 $ibo-user-rights--border-radius: $ibo-border-radius-400 !default;
 
 $ibo-user-rights--is-success--background-color: $ibo-color-success-100 !default;
@@ -18,8 +18,6 @@ $ibo-user-rights--is-failure--border-color: $ibo-color-danger-500 !default;
 $ibo-user-rights--is-failure--border: 1px solid $ibo-user-rights--is-failure--border-color !default;
 
 .ibo-user-rights {
-  display: inline-flex;
-  align-items: baseline;
   padding: $ibo-user-rights--padding-y $ibo-user-rights--padding-x;
   border-radius: $ibo-user-rights--border-radius;
   &.ibo-is-success {

css/backoffice/components/_all.scss

@@ -5,8 +5,6 @@
 
 @import "alert";
 @import "button";
-@import "button-bar";
-@import "button-separator";
 @import "button-group";
 @import "breadcrumbs";
 @import "quick-create";

css/backoffice/components/_badge.scss

@@ -19,8 +19,6 @@ $ibo-badge-colors: (
 		'orange' : ($ibo-color-orange-100, $ibo-color-orange-900),
 		'red': ($ibo-color-red-100, $ibo-color-red-900),
 		'pink': ($ibo-color-pink-100, $ibo-color-pink-900),
-		'purple': ($ibo-color-purple-100, $ibo-color-purple-900),
-		'yellow': ($ibo-color-yellow-200, $ibo-color-yellow-900),
 ) !default;
 
 

css/backoffice/components/_button-bar.scss

@@ -1,43 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-$ibo-button-bar--gap: 2px !default;
-$ibo-button-bar--track--gap: 6px !default;
-
-/* button-bar.css */
-ibo-button-bar{
-  display: flex;
-  flex-wrap: nowrap;
-  align-items: center;
-  position: relative;
-  gap: $ibo-button-bar--gap;
-  overflow: hidden;
-}
-
-/* Keep content visible even if JS initialization is delayed. */
-
-ibo-button-bar .ibo-button-bar--track{
-  display: flex;
-  flex: 1 1 auto;
-  flex-wrap: nowrap;
-  overflow: hidden;
-  white-space: nowrap;
-  gap: $ibo-button-bar--track--gap;
-  align-items: center;
-}
-
-ibo-button-bar .ibo-button-bar--item{
-  flex: 0 0 auto;
-  white-space: nowrap;
-}
-
-ibo-button-bar .ibo-button-bar--item[hidden]{
-  display: none !important;
-}
-
-ibo-button-bar .ibo-button-bar--extra{
-  flex: 0 0 auto;
-  position: relative;
-}

css/backoffice/components/_button-separator.scss

@@ -1,20 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-$ibo-button-separator--width: 1px !default;
-$ibo-button-separator--height: 16px !default;
-$ibo-button-separator--margin-x: 0.75rem !default;
-$ibo-button-separator--margin-y: $ibo-spacing-0 !default;
-$ibo-button-separator--border-size: 1px !default;
-$ibo-button-separator--border-color: $ibo-color-grey-500 !default;
-
-.ibo-button-separator {
-	display: inline-flex;
-	border-right: $ibo-button-separator--border-size solid $ibo-button-separator--border-color;
-	width: $ibo-button-separator--width;
-	height: $ibo-button-separator--height;
-	margin: $ibo-button-separator--margin-y $ibo-button-separator--margin-x;
-}
-

css/backoffice/components/_field.scss

@@ -37,12 +37,6 @@ $ibo-field--enable-bulk--border-radius: $ibo-border-radius-500 !default;
 
 $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
 
-$ibo-field--label--action--margin-y: $ibo-spacing-0 !default;
-$ibo-field--label--action--margin-x: $ibo-spacing-100 !default;
-$ibo-field--label--action--size: $ibo-field--fullscreen-toggler--size !default;
-$ibo-field--label--action--padding: $ibo-spacing-0 !default;
-$ibo-field--label--action--font-size: $ibo-font-size-50 !default;
-
 /* SCSS rules */
 .ibo-field {
   @extend %ibo-font-size-150;
@@ -270,32 +264,4 @@ $ibo-field--label--action--font-size: $ibo-font-size-50 !default;
 
 .ibo-input-select--action-buttons a  {
   @extend %ibo-hyperlink-inherited-colors;
-}
-
-.ibo-field--label {
-  .ibo-field--action:not(.ibo-button-separator) {
-    display: inline-flex;
-    align-content: center;
-    align-items: center;
-    justify-content: center;
-    vertical-align: middle;
-
-    width: $ibo-field--label--action--size;
-    height: $ibo-field--label--action--size;
-    padding: $ibo-field--label--action--padding;
-    border-radius: $ibo-field--fullscreen-toggler--border-radius;
-    font-size: $ibo-field--label--action--font-size;
-    ~ .ibo-field--action {
-      margin-left: $ibo-field--label--action--margin-x;
-    }
-  }
-  .ibo-field--action.ibo-button-separator {
-    margin:  $ibo-field--label--action--margin-y $ibo-field--label--action--margin-x;
-    vertical-align: middle;
-  }
-}
-
-// Specific rule to ensure that the grouped actions popover of a field is visible in fullscreen mode
-body.ibo-has-fullscreen-descendant .ibo-popover-menu.ibo-field--grouped-actions-popover {
-  z-index: 1060 !important;
 }

css/backoffice/components/_form.scss

@@ -8,74 +8,70 @@
   padding-bottom: 14px;
 }
 
-// WIP SDK Forms
-//form[is="itop-form-element"] {
-//
-//  .help-text{
-//    padding: 1px 5px;
-//    background-color: #d7e3f8;
-//    border: 1px solid #c6e7f5;
-//    border-radius: 5px;
-//    margin: 5px 0;
-//    font-size: 0.9em;
-//  }
-//
-//  .form-error ul{
-//    padding: 1px 5px;
-//    background-color: #f8d7da;
-//    border: 1px solid #f5c6cb;
-//    border-radius: 5px;
-//    margin: 5px 0;
-//    font-size: 0.9em;
-//  }
-//
-//  .subform{
-//    background-color: #efefef;
-//    border-radius: 5px;
-//    padding: 10px;
-//  }
-//
-//  .form-buttons{
-//    margin: 20px 0;
-//  }
-//
-//  .form select{
-//    padding: 0;
-//    overflow-y: auto;
-//  }
-//
-//  .form select option{
-//    height: 30px;
-//    display: flex;
-//    align-items: center;
-//  }
-//
-//  .turbo-refreshing{
-//    opacity: .5;
-//  }
-//
-//  .ibo-field legend{
-//    margin-top: 24px;
-//  }
-//
-//  collection-entry-element {
-//    margin-top: 8px;
-//    display: block;
-//    padding: 10px 10px;
-//    background-color: #f5f5f5;
-//    border-radius: 5px;
-//  }
-//  .ts-control{
-//    height: auto;
-//    min-height: 30px;
-//  }
-//
-//  .ibo-form-actions > .ibo-button > span{
-//    margin-right: 5px;
-//  }
-//
-//  .ibo-form textarea{
-//    resize: vertical;
-//  }
-//
-//}
+.help-text{
+  padding: 1px 5px;
+  background-color: #d7e3f8;
+  border: 1px solid #c6e7f5;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.form-error ul{
+  padding: 1px 5px;
+  background-color: #f8d7da;
+  border: 1px solid #f5c6cb;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.subform{
+  background-color: #efefef;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.form-buttons{
+  margin: 20px 0;
+}
+
+.form select{
+  padding: 0;
+  overflow-y: auto;
+}
+
+.form select option{
+  height: 30px;
+  display: flex;
+  align-items: center;
+}
+
+.turbo-refreshing{
+  opacity: .5;
+}
+
+.ibo-field legend{
+  margin-top: 24px;
+}
+
+collection-entry-element {
+  margin-top: 8px;
+  display: block;
+  padding: 10px 10px;
+  background-color: #f5f5f5;
+  border-radius: 5px;
+}
+.ts-control{
+  height: auto;
+  min-height: 30px;
+}
+
+.ibo-form-actions > .ibo-button > span{
+  margin-right: 5px;
+}
+
+.ibo-form textarea{
+  resize: vertical;
+}
+

css/backoffice/components/input/_input-select-icon.scss

@@ -3,9 +3,9 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-input-select-icon--max-height: 100% !default;
-$ibo-input-select-icon--max-width: 100% !default;
-$ibo-input-select-icon--padding-right: $ibo-spacing-200 !default;
+$ibo-input-select-icon--menu--icon--max-height: 100% !default;
+$ibo-input-select-icon--menu--icon--max-width: 100% !default;
+$ibo-input-select-icon--icon--padding-right: $ibo-spacing-200 !default;
 
 $ibo-input-select-icon--menu--z-index: 21 !default;
 $ibo-input-select-icon--menu--max-height: 300px !default;
@@ -18,9 +18,9 @@ $ibo-input-select-icon--menu--icon--margin-right: 10px !default;
   display: inline-flex;
   text-align: left;
 	>img{
-		max-height: $ibo-input-select-icon--max-height;
-		max-width: $ibo-input-select-icon--max-width;
-		padding-right: $ibo-input-select-icon--padding-right;
+		max-height: $ibo-input-select-icon--menu--icon--max-height;
+		max-width: $ibo-input-select-icon--menu--icon--max-width;
+		padding-right: $ibo-input-select-icon--icon--padding-right;
 	}
   >span{
     overflow: hidden;

css/backoffice/components/input/_input-set.scss

@@ -21,7 +21,6 @@ $ibo-input-set--item--padding-x: 6px !default;
 $ibo-input-set--item--padding-y: $ibo-spacing-200 !default;
 $ibo-input-set--item--max-width: 360px !default;
 $ibo-input-set--item--background-color: $ibo-color-white-100 !default;
-$ibo-input-set--item--color: $ibo-color-grey-900 !default;
 $ibo-input-set--item--border: none !default;
 $ibo-input-set--item--border-radius: $ibo-border-radius-300 !default;
 $ibo-input-set--item--box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px rgba(241, 241, 241, 0.7) !default;
@@ -60,7 +59,7 @@ $ibo-input-set--item--box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px rgb
   border-radius: $ibo-input-set--item--border-radius;
   box-shadow: $ibo-input-set--item--box-shadow;
 
-  color: $ibo-input-set--item--color;
+  color: $ibo-color-grey-900;
   text-shadow: none;
   @extend %ibo-text-truncated-with-ellipsis;
   /* - Guaranty that if a set item has html sub-node, they correctly display ellipsis (eg. Link set set items) */

css/backoffice/layout/_all.scss

@@ -4,6 +4,7 @@
  */
 
 @import "navigation-menu";
+@import "top-bar";
 @import "content";
 @import "details";
 @import "tab-container/tab-container";
@@ -14,5 +15,4 @@
 @import "wizard-container/wizard-container";
 @import "object/all";
 @import "activity-panel/all";
-@import "extension/all";
-@import "top-bar/all";
+@import "extension/all";

css/backoffice/layout/_navigation-menu.scss

@@ -793,9 +793,8 @@ $ibo-navigation-menu--user-info--height--is-expanded: 100% !default;
 			color: $ibo-navigation-menu--user--text-color;
 		}
 
-      .ibo-navigation-menu--user-notifications--toggler--icon {
-        position: relative;
-        padding-left: $ibo-navigation-menu--user-notifications--toggler--icon--padding-left;
+		.ibo-navigation-menu--user-notifications--toggler--icon {
+			padding-left: $ibo-navigation-menu--user-notifications--toggler--icon--padding-left;
 		}
 	}
 

css/backoffice/layout/activity-panel/_activity-action.scss

@@ -1,78 +0,0 @@
-$ibo-activity-panel--activity-actions--right: $ibo-activity-panel--add-caselog-entry-button--right !default;
-$ibo-activity-panel--activity-actions--top: 76px + $ibo-activity-panel--activity-actions--right !default;
-$ibo-activity-panel--activity-actions--gap: $ibo-spacing-300 !default;
-
-$ibo-activity-panel--activity-action--diameter: $ibo-activity-panel--add-caselog-entry-button--diameter !default;
-$ibo-activity-panel--activity-action--background-color: $ibo-activity-panel--add-caselog-entry-button--background-color !default;
-$ibo-activity-panel--activity-action--background-color--on-hover: $ibo-activity-panel--add-caselog-entry-button--background-color--on-hover !default;
-$ibo-activity-panel--activity-action--background-color--is-active: $ibo-activity-panel--add-caselog-entry-button--background-color--is-active !default;
-$ibo-activity-panel--activity-action--color: $ibo-activity-panel--add-caselog-entry-button--color !default;
-$ibo-activity-panel--activity-action--border-radius: $ibo-border-radius-full !default;
-$ibo-activity-panel--activity-action--box-shadow: $ibo-activity-panel--add-caselog-entry-button--box-shadow !default;
-$ibo-activity-panel--activity-action--hover--box-shadow: $ibo-activity-panel--add-caselog-entry-button--hover--box-shadow !default;
-
-$ibo-activity-panel--activity-action--icon--height: $ibo-activity-panel--add-caselog-entry-button--icon--height !default;
-$ibo-activity-panel--activity-action--icon--width: $ibo-activity-panel--activity-action--icon--height !default;
-$ibo-activity-panel--activity-action--icon--font-size: $ibo-activity-panel--add-caselog-entry-button--icon--font-size !default;
-$ibo-activity-panel--activity-action--icon--line-height: $ibo-activity-panel--add-caselog-entry-button--icon--line-height !default;
-$ibo-activity-panel--activity-action-separator--width: calc(#{$ibo-activity-panel--activity-action--diameter} / 1.5) !default;
-$ibo-activity-panel--activity-action-separator--height: 2px !default;
-$ibo-activity-panel--activity-action-separator--background-color: $ibo-color-grey-500 !default;
-
-
-.ibo-activity-panel--activity-actions {
-  display: flex;
-  flex-direction: column;
-  gap: $ibo-activity-panel--activity-actions--gap;
-  position: absolute;
-  z-index: 1;
-  right: $ibo-activity-panel--activity-actions--right;
-  top: $ibo-activity-panel--activity-actions--top;
-  &.ibo-is-hidden{
-    display: none;
-  }
-  &:has(+ .ibo-activity-panel--add-caselog-entry-button) {
-    top: calc(#{$ibo-activity-panel--activity-actions--top} + #{$ibo-activity-panel--activity-action--diameter} + #{$ibo-activity-panel--activity-actions--gap});
-  }
-}
-
-.ibo-activity-panel--activity-action {
-  @extend %ibo-baseline-centered-content;
-
-  width: $ibo-activity-panel--activity-action--diameter;
-  height: $ibo-activity-panel--activity-action--diameter;
-
-  background-color: $ibo-activity-panel--activity-action--background-color;
-  color: $ibo-activity-panel--activity-action--color;
-
-  border-radius: $ibo-activity-panel--activity-action--border-radius;
-  box-shadow: $ibo-activity-panel--activity-action--box-shadow;
-
-  > i{
-    text-align: center;
-    height: $ibo-activity-panel--activity-action--icon--height;
-    width: $ibo-activity-panel--activity-action--icon--width;
-    font-size: $ibo-activity-panel--activity-action--icon--font-size;
-    line-height: $ibo-activity-panel--activity-action--icon--line-height;
-  }
-  &:hover {
-    color: $ibo-activity-panel--activity-action--color;
-    background-color: $ibo-activity-panel--activity-action--background-color--on-hover;
-    box-shadow: $ibo-activity-panel--activity-action--hover--box-shadow;
-  }
-  &:active {
-    color: $ibo-activity-panel--activity-action--color;
-    background-color: $ibo-activity-panel--activity-action--background-color--is-active;
-  }
-  &.ibo-is-hidden{
-    display: none;
-  }
-}
-
-.ibo-activity-panel--activity-action-separator {
-  display: block;
-  width: $ibo-activity-panel--activity-action-separator--width;
-  height: $ibo-activity-panel--activity-action-separator--height;
-  margin: auto;
-  background-color: $ibo-activity-panel--activity-action-separator--background-color;
-}

css/backoffice/layout/activity-panel/_activity-panel.scss

@@ -137,8 +137,7 @@ $ibo-activity-panel--open-icon--margin-left: 0.75rem !default;
 
     .ibo-activity-panel--header,
     .ibo-activity-panel--body,
-    .ibo-activity-panel--add-caselog-entry-button,
-    .ibo-activity-panel--activity-actions{
+    .ibo-activity-panel--add-caselog-entry-button {
       display: none;
     }
 

css/backoffice/layout/activity-panel/_all.scss

@@ -10,4 +10,3 @@
 @import "transition-entry";
 @import "edits-entry";
 @import "notification-entry";
-@import "activity-action";

css/backoffice/layout/activity-panel/_caselog-entry-form.scss

@@ -59,9 +59,4 @@ $ibo-caselog-entry-form--lock-message--margin-left: 1rem !default;
 }
 .ibo-caselog-entry-form--action-buttons--main-actions > .ibo-popover-menu {
   z-index: 1;
-}
-
-.ibo-caselog-entry-form--action-buttons--extra-actions{
-  overflow: hidden;
-  flex-grow: 1;
 }

css/backoffice/layout/top-bar/_all.scss

@@ -1,2 +0,0 @@
-@import "top-bar";
-@import "top-bar-action";

css/backoffice/layout/top-bar/_top-bar-action.scss

@@ -1,40 +0,0 @@
-$ibo-top-bar-quick-action--head--background-color: $ibo-color-white-100 !default;
-
-$ibo-top-bar-quick-action--icon-padding-x: $ibo-spacing-500 !default;
-$ibo-top-bar-quick-action--icon-padding-y: $ibo-spacing-0 !default;
-$ibo-top-bar-quick-action--icon--color: $ibo-color-primary-600 !default;
-$ibo-top-bar-quick-action--icon--color--on-hover: $ibo-color-primary-700 !default;
-$ibo-top-bar-quick-action--icon--color--on-active: $ibo-color-primary-800 !default;
-$ibo-top-bar-quick-action-separator--width: 2px !default;
-$ibo-top-bar-quick-action-separator--background-color: $ibo-color-grey-300 !default;
-$ibo-top-bar-quick-action-separator--margin-y: $ibo-spacing-0 !default;
-$ibo-top-bar-quick-action-separator--margin-x: $ibo-spacing-300 !default;
-
-.ibo-top-bar-quick-action{
-  position: relative;
-  @extend %ibo-full-height-content;
-}
-.ibo-top-bar-quick-action--head{
-  @extend %ibo-full-height-content;
-  height: 100%;
-  background-color: $ibo-top-bar-quick-action--head--background-color;
-}
-.ibo-top-bar-quick-action--icon{
-  color: $ibo-top-bar-quick-action--icon--color;
-  align-self: center;
-  padding: $ibo-top-bar-quick-action--icon-padding-y $ibo-top-bar-quick-action--icon-padding-x;
-  @extend %ibo-font-ral-nor-400;
-
-  &:hover{
-    color: $ibo-top-bar-quick-action--icon--color--on-hover;
-  }
-  &:active{
-    color: $ibo-top-bar-quick-action--icon--color--on-active;
-  }
-}
-
-.ibo-top-bar-quick-action-separator {
-  width: $ibo-top-bar-quick-action-separator--width;
-  background-color: $ibo-top-bar-quick-action-separator--background-color;
-  margin: $ibo-top-bar-quick-action-separator--margin-y $ibo-top-bar-quick-action-separator--margin-x;
-}

css/backoffice/vendors/ckeditor/_overloads.scss

@@ -70,7 +70,7 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
   }
 }
 
-.ck-editor__editable_inline:not(.ck-comment__input *), .ck-source-editing-area {
+.ck-editor__editable_inline:not(.ck-comment__input *) {
   height: 200px;
 }
 
@@ -84,6 +84,11 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
   }
 }
 
+// N°7552 Allow source editing area to be scrollable in full screen
+.ck-maximize_editor_main .ck-source-editing-area textarea{
+  overflow: auto !important;
+}
+
 /* Mentions */
 .ck-mentions {
   .ck-button {

css/common/utils/helpers/_text-decoration.scss

@@ -4,7 +4,7 @@
  */
 
 /* SCSS variables */
-$common-has-description--content: "?" !default;
+$common-has-description--content: "\1F6C8" !default;
 $common-has-description--padding-left: $common-spacing-200 !default;
 $common-has-description--color: $common-color-grey-600 !default;
 $common-has-description--font-size: 0.7em !default; /* Font size is em on purpose as we want it to be proportional to its context */

css/common/utils/helpers/_typography.scss

@@ -11,9 +11,6 @@
  *
  * Usage: @extend %common-font-size-XXX;
  */
-%common-font-size-20 {
-  font-size: $common-font-size-20;
-}
 %common-font-size-50 {
   font-size: $common-font-size-50;
 }

css/setup.scss

@@ -611,6 +611,32 @@ body {
 .setup-extension--missing .setup-extension--icon{
 	color:#a00000;
 }
+.setup-extension-tag {
+  display: inline-flex;
+	background-color: grey;
+	border-radius: 8px;
+	padding-left: 3px;
+	padding-right: 3px;
+	margin-right: 3px;
+	&.installed{
+		background-color:#9eff9e
+	}
+	&.notinstalled{
+		background-color:#ed9eff
+	}
+	&.tobeinstalled{
+		background-color:#9ef0ff
+	}
+	&.tobeuninstalled{
+		background-color:#ff9e9e
+	}
+	&.notuninstallable{
+		background-color:#ffc98c
+	}
+	&.removed{
+		background-color: #969594
+	}
+}
 
 .ibo-extension-details {
 	align-items: flex-start;

datamodels/2.x/authent-cas/datamodel.authent-cas.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
   </constants>
   <classes>

datamodels/2.x/authent-cas/dictionaries/en_gb.dict.authent-cas.php

@@ -3,13 +3,10 @@
 /**
  * Localized data
  *
- * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0
- *
- */
-/**
- *
+ * @copyright   Copyright (C) 2024 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
+
 Dict::Add('EN GB', 'British English', 'British English', [
 	'CAS:Error:UserNotAllowed' => 'User not allowed',
 	'CAS:Login:SignIn' => 'Sign in with CAS',

datamodels/2.x/authent-cas/dictionaries/es_cr.dict.authent-cas.php

@@ -1,15 +1,12 @@
 <?php
 
 /**
- * Localized data
+ * Spanish Localized data
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
- *
- */
-/**
  * @author Miguel Turrubiates <miguel_tf@yahoo.com>
- *
+ * @notas       Utilizar codificación UTF-8 para mostrar acentos y otros caracteres especiales
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'CAS:Error:UserNotAllowed' => 'Usuario no permitido',

datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php

@@ -5,13 +5,9 @@
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
- *
- */
-/**
- *
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'CAS:Error:UserNotAllowed' => '用户被禁止登录',
-	'CAS:Login:SignIn' => '使用 CAS 登录',
-	'CAS:Login:SignInTooltip' => '点击这里使用 CAS 服务器认证',
+	'CAS:Login:SignIn' => '使用CAS登录',
+	'CAS:Login:SignInTooltip' => '点击这里使用CAS服务器认证',
 ]);

datamodels/2.x/authent-cas/module.authent-cas.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.4.0',
+	'authent-cas/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/authent-external/dictionaries/en_gb.dict.authent-external.php

@@ -3,13 +3,39 @@
 /**
  * Localized data
  *
- * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0
+ * @copyright Copyright (C) 2024 Combodo SAS
+ * @license https://opensource.org/licenses/AGPL-3.0
  *
- */
-/**
+ * This file is part of iTop.
  *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
 Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:UserExternal' => 'External user',
 	'Class:UserExternal+' => 'User authentified outside of '.ITOP_APPLICATION_SHORT,

datamodels/2.x/authent-external/dictionaries/es_cr.dict.authent-external.php

@@ -1,15 +1,12 @@
 <?php
 
 /**
- * Localized data
+ * Spanish Localized data
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
- *
- */
-/**
  * @author Miguel Turrubiates <miguel_tf@yahoo.com>
- *
+ * @notas       Utilizar codificación UTF-8 para mostrar acentos y otros caracteres especiales
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:UserExternal' => 'Usuario externo',

datamodels/2.x/authent-external/dictionaries/hu.dict.authent-external.php

@@ -12,5 +12,5 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:UserExternal' => 'Külső felhasználó',
-	'Class:UserExternal+' => 'User authentified outside of '.ITOP_APPLICATION_SHORT.'~~',
+	'Class:UserExternal+' => '',
 ]);

datamodels/2.x/authent-external/dictionaries/pt_br.dict.authent-external.php

@@ -12,5 +12,5 @@
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:UserExternal' => 'Usuário externo',
-	'Class:UserExternal+' => 'User authentified outside of '.ITOP_APPLICATION_SHORT.'~~',
+	'Class:UserExternal+' => '',
 ]);

datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php

@@ -10,7 +10,31 @@
 /**
  * @author Robert Deng <denglx@gmail.com>
  *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//
+// Class: UserExternal
+//
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserExternal' => '外部用户',
 	'Class:UserExternal+' => '用户在'.ITOP_APPLICATION_SHORT.'外部验证身份',

datamodels/2.x/authent-external/module.authent-external.php

@@ -27,7 +27,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/3.4.0',
+	'authent-external/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/authent-ldap/dictionaries/cs.dict.authent-ldap.php

@@ -16,6 +16,13 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:UserLDAP' => 'LDAP uživatel',
 	'Class:UserLDAP+' => 'Uživatel ověřen přes LDAP',
 	'UserLDAP:server' => 'Specifika LDAP',
+]);
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

datamodels/2.x/authent-ldap/dictionaries/da.dict.authent-ldap.php

@@ -15,6 +15,13 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:UserLDAP' => 'LDAP-Bruger',
 	'Class:UserLDAP+' => 'Bruger der godkendes via LDAP',
 	'UserLDAP:server' => 'LDAP specifics~~',
+]);
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

datamodels/2.x/authent-ldap/dictionaries/de.dict.authent-ldap.php

@@ -15,6 +15,13 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:UserLDAP' => 'LDAP-Benutzer',
 	'Class:UserLDAP+' => 'Benutzer, der via LDAP authentifiziert wird',
 	'UserLDAP:server' => 'LDAP-Einstellungen',
+]);
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'LDAP-Server',
 	'Class:UserLDAP/Attribute:ldap_server+' => 'Optional: LDAP-Server, der zur Authentifizierung verwendet werden soll, falls mehrere LDAP-Server konfiguriert sind.',
 ]);