Merge remote-tracking branch 'origin/support/3.3' into develop

# Conflicts:
#	core/oql/expression.class.inc.php

.doc/itop-version-history.md

@@ -110,11 +110,11 @@ gitGraph
     commit id: "2025-09-25" tag: "2.7.13"
     checkout support/3.2
     commit id: "2026-04-27 " tag: "3.2.3"
-    checkout support/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,6 +8,8 @@ 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,18 +1,22 @@
 <!--
 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 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. 🙏
+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. 🙏
 
 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 -->                 |
-| Type of change?                                                                 | Bug fix / Enhancement / Translations |
+| 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  |
 
 ## Symptom (bug) / Objective (enhancement)
 
@@ -70,6 +74,7 @@ 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

@@ -1,56 +0,0 @@
-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

@@ -0,0 +1,13 @@
+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,7 +33,6 @@ 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__.'\droidsansfallback.*');
+$aFontFilesToCopy = glob(__DIR__.DIRECTORY_SEPARATOR.'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://sourceforge.net/projects/itop/files/latest/download
+[65]: https://github.com/Combodo/iTop/releases/latest
 
 
 ## Resources
 
- - [iTop Forums][1]: community support
- - [iTop Tickets][2]: for feature requests and bug reports
+ - [GitHub Discussions][1]: community support
+ - [GitHub Issues 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://sourceforge.net/p/itop/discussion/
-[2]: https://sourceforge.net/p/itop/tickets/
-[3]: https://sourceforge.net/projects/itop/files/itop/
+[1]: https://github.com/Combodo/iTop/discussions
+[2]: https://github.com/Combodo/iTop/issues
+[3]: https://github.com/Combodo/iTop/releases
 [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
+- Couronné, Guy [@GurneyHallack](https://github.com/GurneyHallack)
 - 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
+- Kunin, Vladimir (a.k.a [@vbkunin](https://github.com/vbkunin)
 - Lassiter, Denis (a.k.a [@delassiter](https://github.com/delassiter))
 - Lazcano, Federico
 - Lucas, Jonathan
@@ -128,6 +128,7 @@ 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))

application/applicationextension.inc.php

@@ -30,6 +30,15 @@ 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');
@@ -43,19 +52,12 @@ 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/common/ApplicationPopupMenuItem.php

@@ -1,5 +1,9 @@
 <?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
  *
@@ -7,7 +11,7 @@
  * @package     UIExtensibilityAPI
  * @since 2.0
  */
-abstract class ApplicationPopupMenuItem
+abstract class ApplicationPopupMenuItem implements iGroupingProvider, iDataAttributesProvider, iAriaAttributesProvider
 {
 	/** @ignore */
 	protected $sUID;
@@ -19,6 +23,12 @@ abstract class ApplicationPopupMenuItem
 	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
@@ -58,6 +68,17 @@ abstract class ApplicationPopupMenuItem
 		return $this->sLabel;
 	}
 
+	/**
+	 * @param string $sLabel
+	 *
+	 * @api
+	 * @since 3.3.0
+	 */
+	public function SetLabel(string $sLabel): void
+	{
+		$this->sLabel = $sLabel;
+	}
+
 	/**
 	 * Get the CSS classes
 	 *
@@ -141,9 +162,76 @@ abstract class ApplicationPopupMenuItem
 	 */
 	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/common/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 \JSButtonItem} for the end-user portal
+ * Note: This works only in the backoffice, {@see \common\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!
-		return [
+		$aData = [
 			'label' => $this->GetLabel(),
 			'onclick' => $this->GetJsCode().'; return false;',
 			'url' => $this->GetUrl(),
@@ -48,6 +48,8 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 			'icon_class' => $this->sIconClass,
 			'tooltip' => $this->sTooltip,
 		];
+
+		return array_merge($aData, $this->GetMenuItemAdditionalData());
 	}
 
 	/** @ignore */

application/applicationextension/common/SeparatorPopupMenuItem.php

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

application/applicationextension/common/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 \URLButtonItem} for the end-user portal
+ * Note: This works only in the backoffice, {@see \common\URLButtonItem} for the end-user portal
  *
  * @api
  * @package     UIExtensibilityAPI
@@ -35,13 +35,15 @@ class URLPopupMenuItem extends ApplicationPopupMenuItem
 	/** @ignore */
 	public function GetMenuItem()
 	{
-		return ['label' => $this->GetLabel(),
+		$aData = ['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/common/iAriaAttributesProvider.php

@@ -0,0 +1,15 @@
+<?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

@@ -0,0 +1,14 @@
+<?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

@@ -0,0 +1,13 @@
+<?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

@@ -0,0 +1,14 @@
+<?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/applicationextension/common/iPopupMenuExtension.php

@@ -95,7 +95,24 @@ 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/cmdbabstract.class.inc.php

@@ -49,6 +49,7 @@ 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;
@@ -1065,6 +1066,14 @@ 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);
@@ -4651,7 +4660,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:ObjectAlreadyUpdated'));
+				throw new Exception(Dict::S('UI:Error:InvalidToken'));
 			}
 			utils::RemoveTransaction($sTransactionId);
 		}

application/dashboard.class.inc.php

@@ -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().'" style="display:none">');
+					$oPage->add('<div class="dashlet_properties" id="dashlet_properties_'.$oDashlet->GetID().'" data-role="ibo-dashlet-properties" data-dashlet-class="'.$oDashlet->GetDashletType().'" 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">');
+		$oPage->add('<div id="dashboard_editor" class="ibo-dashboard-editor" data-role="ibo-dashboard-editor" data-dashboard-id="'.$this->sId.'">');
 		$oPage->add('<div class="ui-layout-center">');
 		$this->SetCustomFlag(true);
 		$this->Render($oPage, true, $aRenderParams);

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.3">
+             version="3.4">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>

application/displayblock.class.inc.php

@@ -2292,6 +2292,17 @@ 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,10 +220,19 @@ 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).'<td class="prop_value" colspan="2">'.$aRow['value'];
+						$sReturn .= $this->StartRow($sFieldId, $aPropertyFieldData).
+							'<td class="prop_value" data-role="ibo-property-field-value" colspan="2">'.$aRow['value'];
 					} else {
-						$sReturn .= $this->StartRow($sFieldId).'<td class="prop_label">'.$aRow['label'].'</td><td class="prop_value">'.$aRow['value'];
+						$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'];
 					}
 					if (!($oField instanceof DesignerFormSelectorField) && !($oField instanceof DesignerMultipleSubFormField)) {
 						$sReturn .= $sValidationFields;
@@ -294,12 +303,21 @@ EOF
 		}
 	}
 
-	public function StartRow($sFieldId = null)
+	public function StartRow($sFieldId = null, $aPropertyFieldData = [])
 	{
-		if ($sFieldId != null) {
-			return '<tr id="row_'.$sFieldId.'" data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'">';
+		$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).'"';
 		}
-		return '<tr data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'">';
+		if ($sFieldId != null) {
+			return '<tr id="row_'.$sFieldId.'" data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'"'.$sPropertyFieldAttributes.'>';
+		}
+		return '<tr data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'"'.$sPropertyFieldAttributes.'>';
 	}
 
 	public function EndRow()
@@ -679,6 +697,14 @@ class DesignerFormField
 		return $this->sCode;
 	}
 
+	/**
+	 * @return mixed
+	 */
+	public function GetRawValue()
+	{
+		return $this->defaultValue;
+	}
+
 	/**
 	 * @param \DesignerForm $oForm
 	 */
@@ -1629,6 +1655,11 @@ 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/shortcut.class.inc.php

@@ -109,10 +109,18 @@ $('#shortcut_rename_dlg').dialog({
 	modal: true,
 	title: '$sDialogTitle',
 	buttons: [
-	{ text: "$sOkButtonLabel", click: ShortcutRenameOK},
-	{ text: "$sCancelButtonLabel", click: function() {
-		$(this).dialog( "close" ); $(this).remove();
-	} },
+        { 
+            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'
+        },
 	],
 	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());
+		$id = static::GetUserPrefix().str_replace(['.', ' '], '', microtime()).'-'.bin2hex(random_bytes(24));
 		Session::Set(['transactions', $id], true);
 		// sem_release($rSemIdentified);
 
@@ -236,7 +236,7 @@ class privUITransactionFile
 
 		self::CleanupOldTransactions();
 
-		$sTransactionIdFullPath = tempnam(utils::GetDataPath().'transactions', static::GetUserPrefix());
+		$sTransactionIdFullPath = static::CreateUniqueTransactionFilePath(utils::GetDataPath().'transactions', static::GetUserPrefix());
 		file_put_contents($sTransactionIdFullPath, $iCurrentUserId, LOCK_EX);
 
 		$sTransactionIdFileName = basename($sTransactionIdFullPath);
@@ -245,6 +245,33 @@ 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
@@ -281,6 +308,18 @@ 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) {
@@ -314,7 +353,7 @@ class privUITransactionFile
 	}
 
 	/**
-	 * Cleanup old transactions which have been pending since more than 24 hours
+	 * Cleanup old transactions which have been pending since more than the lifetime defined in the configuration parameter 'transactions_file_lifetime'.
 	 * 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)
@@ -327,7 +366,7 @@ class privUITransactionFile
 		}
 
 		clearstatcache();
-		$iLimit = time() - 24 * 3600;
+		$iLimit = time() - (int) MetaModel::GetConfig()->Get('transactions_file_lifetime');
 		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : utils::GetDataPath().'transactions/*';
 		$aTransactions = glob($sPattern);
 		foreach ($aTransactions as $sFileName) {

application/utils.inc.php

@@ -1833,10 +1833,15 @@ 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)
+	public static function GetSafeId($sId, bool $bForSelector = false)
 	{
+		if ($bForSelector) {
+			return preg_replace('/[^a-zA-Z0-9_]/', '_', $sId);
+		}
+
 		return str_replace([':', '[', ']', '+', '-', ' '], '_', $sId);
 	}
 

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.3');
+define('ITOP_DESIGN_LATEST_VERSION', '3.4');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.3');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.3.0');
+define('ITOP_CORE_VERSION', '3.4.0');
 
 /**
  * @var string

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.3.0-dev');
+define('ITOP_VERSION', '3.4.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -607,6 +607,14 @@ 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',
@@ -1288,6 +1296,14 @@ 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.',
@@ -1749,8 +1765,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'             => true,
-			'value'               => true,
+			'default'             => false,
+			'value'               => false,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
@@ -1765,8 +1781,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'             => true,
-			'value'               => true,
+			'default'             => false,
+			'value'               => false,
 			'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.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
   <classes>
     <class id="lnkActionNotificationToContact" _delta="define">
       <parent>DBObject</parent>

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)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
 	{
 		// Hide objects that are not visible to the current user
 		//
@@ -1782,6 +1782,8 @@ 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
 			}
@@ -1835,7 +1837,7 @@ class DBObjectSearch extends DBSearch
 		if (!isset($oSQLQuery)) {
 			$oKPI = new ExecutionKPI();
 			$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($oSearch);
-			$oSQLQuery = $oSQLObjectQueryBuilder->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
+			$oSQLQuery = $oSQLObjectQueryBuilder->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr, $bSelectOnlyIds);
 			$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);
 
 			if (self::$m_bQueryCacheEnabled) {
@@ -1945,7 +1947,7 @@ class DBObjectSearch extends DBSearch
 		$oSearch = $this;
 		$aClassesToFilter = $this->GetSelectedClasses();
 
-		// Opt-in for joined classes filtering, otherwise only filter the selected class(es)
+		// Joined classes filtering can be disabled through the configuration.
 		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)
+	public function MakeSelectQuery($aOrderBy = [], $aArgs = [], $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulSQL = true, $bSelectOnlyIds = false)
 	{
 		// 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);
+		$oSQLQuery = $this->GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, null, null, $bSelectOnlyIds);
 
 		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)
+	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null, $bSelectOnlyIds = false)
 	{
 		$oSearch = $this->ApplyDataFilters();
 
@@ -1068,7 +1068,7 @@ abstract class DBSearch
 			}
 		}
 
-		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr);
+		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr, $bSelectOnlyIds);
 		$oSQLQuery->SetSourceOQL($oSearch->ToOQL());
 
 		// Join to an additional table, if required...
@@ -1103,7 +1103,8 @@ abstract class DBSearch
 		$bGetCount,
 		$aGroupByExpr = null,
 		$aSelectedClasses = null,
-		$aSelectExpr = null
+		$aSelectExpr = null,
+		$bSelectOnlyIds = false
 	);
 
 	/**

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)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
 	{
 		if (count($this->aSearches) == 1) {
-			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
+			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectedClasses, $aSelectExpr, $bSelectOnlyIds);
 		}
 
 		$aSQLQueries = [];
@@ -610,7 +610,7 @@ class DBUnionSearch extends DBSearch
 					}
 				}
 			}
-			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr);
+			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr, $bSelectOnlyIds);
 			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)
@@ -683,7 +683,7 @@ class DBUnionSearch extends DBSearch
 			return $this;
 		}
 
-		// Opt-in for joined classes filtering, otherwise fallback on DBSearch filtering
+		// Joined classes filtering can be disabled through the configuration.
 		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === true) {
 			return parent::ApplyDataFilters();
 		}

core/metamodel.class.php

@@ -6866,10 +6866,24 @@ 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'];
-				apc_delete($sAPCKey);
+				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");
 			}
 		}
 
@@ -6879,7 +6893,9 @@ abstract class MetaModel
 		// Reset the opcache since otherwise the PHP "model" files may still be cached !!
 		if (function_exists('opcache_reset')) {
 			// Zend opcode cache
-			opcache_reset();
+			if (!opcache_reset()) {
+				SetupLog::Warning("opcache_reset failed for env $sEnvironment");
+			}
 		}
 
 		require_once(APPROOT.'setup/setuputils.class.inc.php');

core/sqlobjectquerybuilder.class.inc.php

@@ -29,13 +29,14 @@ 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)
+	public function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
 	{
-		if ($bGetCount || !is_null($aGroupByExpr)) {
+		if ($bGetCount || !is_null($aGroupByExpr) || $bSelectOnlyIds) {
 			// Avoid adding all the fields for counts or "group by" requests
 			$aAttToLoad = [];
 			foreach ($this->oDBObjetSearch->GetSelectedClasses() as $sClassAlias => $sClass) {

core/tabularbulkexport.class.inc.php

@@ -325,7 +325,7 @@ EOF
 		$sQueryId = utils::ReadParam('query', null, true);
 		$sFields = utils::ReadParam('fields', null, true, 'raw_data');
 		if ((($sFields === null) || ($sFields === '')) && ($sQueryId === null)) {
-			throw new BulkExportMissingParameterException('fields');
+			$sFields =  $this->GetFieldsFromQuery();
 		} else {
 			if (($sQueryId !== null) && ($sQueryId !== null)) {
 				$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', ['query_id' => $sQueryId]);
@@ -336,11 +336,11 @@ EOF
 						// No 'fields' parameter supplied, take the fields from the query phrasebook definition
 						$sFields = trim($oQuery->Get('fields'));
 						if ($sFields === '') {
-							throw new BulkExportMissingParameterException('fields');
+							$sFields =  $this->GetFieldsFromQuery();
 						}
 					}
 				} else {
-					throw BulkExportException('Invalid value for the parameter: query. There is no Query Phrasebook with id = '.$sQueryId, Dict::Format('Core:BulkExport:InvalidParameter_Query', $sQueryId));
+					throw new BulkExportException('Invalid value for the parameter: query. There is no Query Phrasebook with id = '.$sQueryId, Dict::Format('Core:BulkExport:InvalidParameter_Query', $sQueryId));
 				}
 			}
 		}
@@ -348,6 +348,39 @@ 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

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 completly to insert SCSS variables (not great as it will be outdated when updating the lib itself. e.g. jQuery UI)
+|                           # - 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)
 |   |– _bulma-variables-overload.scss   # Bulma CSS framework
 |   |– _jquery-ui.scss                  # jQuery UI
 |   ...                                 # Etc…

css/backoffice/components/_all.scss

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

css/backoffice/components/_button-bar.scss

@@ -0,0 +1,43 @@
+/*
+ * @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

@@ -0,0 +1,20 @@
+/*
+ * @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,6 +37,12 @@ $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;
@@ -264,4 +270,32 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !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/input/_input-set.scss

@@ -21,6 +21,7 @@ $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;
@@ -59,7 +60,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-color-grey-900;
+  color: $ibo-input-set--item--color;
   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,7 +4,6 @@
  */
 
 @import "navigation-menu";
-@import "top-bar";
 @import "content";
 @import "details";
 @import "tab-container/tab-container";
@@ -15,4 +14,5 @@
 @import "wizard-container/wizard-container";
 @import "object/all";
 @import "activity-panel/all";
-@import "extension/all";
+@import "extension/all";
+@import "top-bar/all";

css/backoffice/layout/_navigation-menu.scss

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

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

@@ -0,0 +1,78 @@
+$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,7 +137,8 @@ $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--add-caselog-entry-button,
+    .ibo-activity-panel--activity-actions{
       display: none;
     }
 

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

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

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

@@ -59,4 +59,9 @@ $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

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

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

@@ -0,0 +1,40 @@
+$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;
+}

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.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
   <constants>
   </constants>
   <classes>

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

@@ -3,10 +3,13 @@
 /**
  * Localized data
  *
- * @copyright   Copyright (C) 2024 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license    https://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,12 +1,15 @@
 <?php
 
 /**
- * Spanish Localized data
+ * 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,8 +5,11 @@
  *
  * @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 登录',

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.3.0',
+	'authent-cas/3.4.0',
 	[
 		// Identification
 		//

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

@@ -3,39 +3,13 @@
 /**
  * Localized data
  *
- * @copyright Copyright (C) 2024 Combodo SAS
- * @license https://opensource.org/licenses/AGPL-3.0
+ * @copyright Copyright (C) 2010-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,12 +1,15 @@
 <?php
 
 /**
- * Spanish Localized data
+ * 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+' => '',
+	'Class:UserExternal+' => 'User authentified outside of '.ITOP_APPLICATION_SHORT.'~~',
 ]);

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+' => '',
+	'Class:UserExternal+' => 'User authentified outside of '.ITOP_APPLICATION_SHORT.'~~',
 ]);

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

@@ -5,37 +5,12 @@
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
- * @author Robert Deng <denglx@gmail.com>
- * 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
-//
-
+/**
+ * @author Robert Deng <denglx@gmail.com>
+ *
+ */
 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.3.0',
+	'authent-external/3.4.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.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -16,13 +16,6 @@ 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,13 +15,6 @@ 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,13 +15,6 @@ 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.',
 ]);

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

@@ -3,41 +3,17 @@
 /**
  * Localized data
  *
- * @copyright Copyright (C) 2024 Combodo SAS
- * @license    http://opensource.org/licenses/AGPL-3.0
+ * @copyright Copyright (C) 2010-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: UserLDAP
-//
-
 Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:UserLDAP' => 'LDAP user',
 	'Class:UserLDAP+' => 'User authenticated by LDAP',
 	'UserLDAP:server' => 'LDAP specifics',
+	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -1,24 +1,20 @@
 <?php
 
 /**
- * Spanish Localized data
+ * 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:UserLDAP' => 'Usuario LDAP',
 	'Class:UserLDAP+' => 'Usuario autenticado vía LDAP',
 	'UserLDAP:server' => 'Especificaciones LDAP',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -14,13 +14,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:UserLDAP' => 'Utilisateur LDAP',
 	'Class:UserLDAP+' => 'Utilisateur authentifié par un serveur LDAP',
 	'UserLDAP:server' => 'Champs spécifiques pour LDAP',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('FR FR', 'French', 'Français', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Serveur LDAP',
 	'Class:UserLDAP/Attribute:ldap_server+' => 'Serveur LDAP utilisé pour l\'authentification de cet utilisateur',
 ]);

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

@@ -14,13 +14,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:UserLDAP' => 'LDAP felhasználó',
 	'Class:UserLDAP+' => 'LDAP vagy AD felhasználó',
 	'UserLDAP:server' => 'LDAP specifics~~',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -14,13 +14,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:UserLDAP' => 'Utente LDAP',
 	'Class:UserLDAP+' => 'Utente autenticato da LDAP',
 	'UserLDAP:server' => 'Specifiche LDAP',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -15,13 +15,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:UserLDAP' => 'LDAP ユーザー',
 	'Class:UserLDAP+' => 'LDAP認証ユーザー',
 	'UserLDAP:server' => 'LDAP specifics~~',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -10,18 +10,12 @@
 /**
  * @author Thomas Casteleyn <thomas.casteleyn@super-visions.com>
  * @author Jeffrey Bostoen <info@jeffreybostoen.be> (2018 - 2022)
+ *
  */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:UserLDAP' => 'LDAP-gebruiker',
 	'Class:UserLDAP+' => 'Gebruiker die aanmeldt via LDAP',
 	'UserLDAP:server' => 'LDAP informatie',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -14,13 +14,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:UserLDAP' => 'Użytkownik LDAP',
 	'Class:UserLDAP+' => 'Użytkownik uwierzytelniony przez LDAP',
 	'UserLDAP:server' => 'Serwer LDAP',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -12,15 +12,8 @@
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:UserLDAP' => 'Usuário externo via LDAP',
-	'Class:UserLDAP+' => '',
+	'Class:UserLDAP+' => 'User authenticated by LDAP~~',
 	'UserLDAP:server' => 'LDAP specifics~~',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -15,13 +15,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLDAP' => 'Пользователь LDAP',
 	'Class:UserLDAP+' => 'Пользователь, аутентифицируемый через LDAP',
 	'UserLDAP:server' => 'Особенности LDAP',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Сервер LDAP',
-	'Class:UserLDAP/Attribute:ldap_server+' => '',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -14,13 +14,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:UserLDAP' => 'LDAP užívateľ',
 	'Class:UserLDAP+' => 'User authenticated by LDAP~~',
 	'UserLDAP:server' => 'LDAP specifics~~',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -15,13 +15,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:UserLDAP' => 'LDAP kullanıcısı',
 	'Class:UserLDAP+' => 'Yetki kontrolü LDAP tarafından yapılan',
 	'UserLDAP:server' => 'LDAP specifics~~',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
 	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -5,48 +5,16 @@
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
- * @author Robert Deng <denglx@gmail.com>
- * 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: UserLDAP
-//
-
+/**
+ * @author Robert Deng <denglx@gmail.com>
+ *
+ */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLDAP' => 'LDAP 用户',
 	'Class:UserLDAP+' => '用户身份由 LDAP 认证',
 	'UserLDAP:server' => 'LDAP 详情',
-]);
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLDAP/Attribute:ldap_server' => 'LDAP 服务器',
-	'Class:UserLDAP/Attribute:ldap_server+' => '',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -7,7 +7,7 @@ if (function_exists('ldap_connect')) {
 
 	SetupWebPage::AddModule(
 		__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-		'authent-ldap/3.3.0',
+		'authent-ldap/3.4.0',
 		[
 			// Identification
 			//

datamodels/2.x/authent-local/datamodel.authent-local.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.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
       <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{12,}$</password_validation.pattern>

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

@@ -16,7 +16,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:UserLocal' => 'interní uživatel '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal+' => 'Uživatel ověřen interně v '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Heslo',
-	'Class:UserLocal/Attribute:password+' => '',
+	'Class:UserLocal/Attribute:password+' => 'User authentication string~~',
 	'Class:UserLocal/Attribute:expiration' => 'Exspirace hesla',
 	'Class:UserLocal/Attribute:expiration+' => 'Status exspirace hesla (je vyžadováno rozšíření, aby mělo efekt)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Může exspirovat',

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

@@ -19,11 +19,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:UserLocal/Attribute:expiration' => 'Passwortablauf',
 	'Class:UserLocal/Attribute:expiration+' => 'Passwortablaufstatus (statusabhängige Effekte müssen per Extension implementiert werden)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'kann ablaufen',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'läuft nie ab',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'abgelaufen',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'einmaliges Passwort',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Das Passwort kann vom Benutzer nicht geändert werden.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Letzte Passworterneuerung',

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

@@ -3,58 +3,30 @@
 /**
  * Localized data
  *
- * @copyright Copyright (C) 2024 Combodo SAS
- * @license    http://opensource.org/licenses/AGPL-3.0
+ * @copyright Copyright (C) 2010-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: UserLocal
-//
-
 Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' user',
 	'Class:UserLocal+' => 'User authentified by '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Password',
 	'Class:UserLocal/Attribute:password+' => 'User authentication string',
-
 	'Class:UserLocal/Attribute:expiration' => 'Password expiration',
 	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Never expire',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed',
-
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 12 characters and include uppercase, lowercase, numeric and special characters.',
 	'UserLocal:password:expiration' => 'The fields below require an extension',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User',

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

@@ -1,12 +1,15 @@
 <?php
 
 /**
- * Spanish Localized data
+ * 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:UserLocal' => 'Usuario de '.ITOP_APPLICATION_SHORT,
@@ -16,11 +19,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:UserLocal/Attribute:expiration' => 'Expiración de contraseña',
 	'Class:UserLocal/Attribute:expiration+' => 'Estatus de expiración de contraseña (requiere de una extensión para que tenga efecto)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Puede expirar',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Nunca expirar',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expirado',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Contraseña de un solo uso',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'El usuario no puede cambiar la contraseña.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Renovación de contraseña',

datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php

@@ -14,17 +14,17 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:UserLocal' => 'Utilisateur '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal+' => 'Utilisateur authentifié par '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Mot de passe',
-	'Class:UserLocal/Attribute:password+' => '',
+	'Class:UserLocal/Attribute:password+' => 'User authentication string~~',
 	'Class:UserLocal/Attribute:expiration' => 'Validité du mot de passe',
 	'Class:UserLocal/Attribute:expiration+' => 'État du mot de passe (nécessite une extension pour avoir un effet)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Durée limitée',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Permanente',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'A changer à la prochaine connexion',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Usage unique',
-	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Mot de passe changé le',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Dernière date à laquelle le mot de passe a été changé',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Le mot de passe doit contenir au moins 12 caractères, avec minuscule, majuscule, nombre et caractère spécial.',

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

@@ -14,7 +14,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' felhasználó',
 	'Class:UserLocal+' => 'Rendszeren belül létrehozott felhasználó',
 	'Class:UserLocal/Attribute:password' => 'Jelszó',
-	'Class:UserLocal/Attribute:password+' => '',
+	'Class:UserLocal/Attribute:password+' => 'User authentication string~~',
 	'Class:UserLocal/Attribute:expiration' => 'Jelszó lejárati ideje',
 	'Class:UserLocal/Attribute:expiration+' => 'Jelszó lejárati státusz (bővítmény szükséges hozzá)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Lejár',

datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php

@@ -19,11 +19,11 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:UserLocal/Attribute:expiration' => 'Wachtwoord verloopt',
 	'Class:UserLocal/Attribute:expiration+' => 'Of het wachtwoord al dan niet verlopen is (vereist een extensie vooraleer dit werkt)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Kan verlopen',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Verloopt nooit',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Moet veranderd worden',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Eenmalig wachtwoord',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'De gebruiker kan dit wachtwoord niet veranderen.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Wachtwoord laatst aangepast',

datamodels/2.x/authent-local/dictionaries/pl.dict.authent-local.php

@@ -18,11 +18,11 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:UserLocal/Attribute:expiration' => 'Wygaśnięcie hasła',
 	'Class:UserLocal/Attribute:expiration+' => 'Stan wygaśnięcia hasła (wymaga rozszerzenia, aby zadziałało)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Może wygasnąć',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Nigdy nie wygasa',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Wygasło',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Jednorazowe hasło',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Hasło nie może być zmienione przez użytkownika.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Odnowienie hasła',

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

@@ -12,17 +12,17 @@
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:UserLocal' => 'Usuário local',
-	'Class:UserLocal+' => '',
+	'Class:UserLocal+' => 'User authentified by '.ITOP_APPLICATION_SHORT.'~~',
 	'Class:UserLocal/Attribute:password' => 'Senha',
-	'Class:UserLocal/Attribute:password+' => '',
+	'Class:UserLocal/Attribute:password+' => 'User authentication string~~',
 	'Class:UserLocal/Attribute:expiration' => 'Expiração da senha',
 	'Class:UserLocal/Attribute:expiration+' => 'Status de expiração de senha (Requer uma extensão para fazer efeito)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Senha expira',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Senha nunca expira',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Senha expirada',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-Time Password (OTP)',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Senha não pode ser alterada pelo usuário',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Data da última alteração de senha',

datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php

@@ -19,11 +19,11 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLocal/Attribute:expiration' => 'Срок действия пароля',
 	'Class:UserLocal/Attribute:expiration+' => 'Статус срока действия пароля (требуется расширение для эффекта)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Органиченный',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Неограниченный',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Истёкший',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Одноразовый пароль',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Пароль не может быть изменён пользователем.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Дата изменения пароля',

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

@@ -5,56 +5,29 @@
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
- * @author Robert Deng <denglx@gmail.com>
- * 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: UserLocal
-//
-
+/**
+ * @author Robert Deng <denglx@gmail.com>
+ *
+ */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' 用户',
 	'Class:UserLocal+' => '用户由'.ITOP_APPLICATION_SHORT.'验证身份',
 	'Class:UserLocal/Attribute:password' => '密码',
 	'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',
-
 	'Class:UserLocal/Attribute:expiration' => '密码过期时间',
 	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要扩展才能生效)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => '允许过期',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => '永不过期',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => '已过期',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => '一次性密码',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
 	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新时间',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
-
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少12个字符, 包含大小写, 数字和特殊字符.',
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',

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

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

datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.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.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4">
   <branding>
     <themes>
       <theme id="darkmoon" _delta="define">

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/en_gb.dict.combodo-backoffice-darkmoon-theme.php

@@ -3,25 +3,13 @@
 /**
  * Localized data
  *
- * @copyright Copyright (C) 2024 Combodo SAS
- * @license    http://opensource.org/licenses/AGPL-3.0
+ * @copyright Copyright (C) 2010-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/>
  */
-
 Dict::Add('EN GB', 'British English', 'British English', [
 	'theme:darkmoon' => 'Dark moon',
 ]);

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/es_cr.dict.combodo-backoffice-darkmoon-theme.php

@@ -1,12 +1,15 @@
 <?php
 
 /**
- * Spanish Localized data
+ * 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', [
 	'theme:darkmoon' => 'Luna Obscura',

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php

@@ -6,22 +6,10 @@
  * @copyright Copyright (C) 2010-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/>
  */
-
+/**
+ *
+ */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'theme:darkmoon' => 'Dark moon',
 ]);