test errors

# Conflicts:
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php
#	symfony/config/services.yaml

.doc/itop-version-history.md

@@ -1,7 +1,14 @@
 # iTop version history
 
 ```mermaid
-%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
+%%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
+              'git0': 'lawngreen',
+              'git3': 'dodgerblue',
+              'git4': 'grey',
+              'git5': 'grey',
+              'git6': 'grey',
+              'git7': 'grey'
+       }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
 gitGraph
     commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
     branch support/2.3 order: 900
@@ -68,6 +75,10 @@ gitGraph
     branch support/3.1 order: 840
     checkout support/3.1
     commit id: "2023-08-09" tag: "3.1.0-2"
+    checkout support/2.7
+    commit id: "2023-08-10" tag: "2.7.9"
+    checkout support/3.1
+    commit id: "2023-12-20" tag: "3.1.1"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.github/pull_request_template.md

@@ -1,83 +0,0 @@
-<!--
-
-IMPORTANT: 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 thead / Another PR / Combodo ticket? | <!-- Put the URL -->
-| Type of change?                                               | Bug fix / Enhancement / Translations
-
-
-## Symptom (bug) / Objective (enhancement)
-<!--
-If it's a bug
-  - Explain the symptom in details
-  - If possible put error messages, logs or screenshots (you can paste image directly in this editor).
-
-If it's an enhancement
-  - Describe what is blocking you, what is the objective with as much details as possible.
-  - Add screenshots if it's related to UI.
--->
-
-
-## Reproduction procedure (bug)
-<!--
-Remove this section only if it's NOT a bug.
-
-Otherwise, explain step by step how to reproduce the issue on a standard iTop Community.
-
-If it requires a custom datamodel, provide the minimal XML delta to reproduce it on a standard iTop Community.
--->
-
-1. On iTop x.y.z <!-- Put complete iTop version (eg. 3.1.0-2) -->
-2. With PHP x.y.z <!-- Put complete PHP version (eg. 8.1.24) -->
-2. First go there
-2. Then do that
-3. ...
-4. Finally, see that...
-
-
-## Cause (bug)
-<!--
-Remove this section only if it's NOT a bug.
-
-Otherwise, explain what is the cause of the issue (where in the code and why)
--->
-
-
-## Proposed solution (bug and enhancement)
-<!--
-Explain in details how you are proposing to solve this:
-  - What did you do in the code and why
-  - If you changed something in the UI, put before / after screenshots (you can paste image directly in this editor)
--->
-
-
-## Checklist before requesting a review
-<!--
-Don't remove these lines, check them once done.
--->
-- [ ] 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
-- [ ] Is the PR clear and detailed enough so anyone can understand digging in the code?
-
-## Checklist of things to do before PR is ready to merge
-<!--
-Things that needs to be done in the PR before it can be considered as ready to be merged
-
-Examples:
-- Changes requested in the review
-- Unit test to add
-- Dictionary entries to translate
-- ...
--->
-
-- [ ] ...
-- [ ] ...
-- [ ] ...

.github/workflows/action.yml

@@ -1,43 +0,0 @@
-name: Add PRs to Combodo PRs Dashboard
-
-on:
-  pull_request_target:
-    types:
-      - opened
-
-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
-        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/Combodo/iTop/issues/${{ github.event.pull_request.number }}/labels \
-            -d '{"labels":["internal"]}'
-        env:
-          is_member: ${{ env.is_member }}
-
-      - name: Add PR to the appropriate project
-        uses: actions/add-to-project@v1.0.2
-        with:
-          project-url: ${{ env.project_url }}
-          github-token: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}

.make/build/commands/setupCssCompiler.php

@@ -27,7 +27,7 @@ $iTopFolder = __DIR__."/../../../";
 require_once("$iTopFolder/approot.inc.php");
 require_once(APPROOT."/application/utils.inc.php");
 
-if (PHP_SAPI !== 'cli')
+if (php_sapi_name() !== 'cli')
 {
 	throw new \Exception('This script can only run from CLI');
 }
@@ -48,4 +48,4 @@ if (!file_exists($sCssFile))
 {
 	fwrite(STDERR, "Failed to compile $sCssFile, exiting.");
 	exit(1);
-}
+}

.make/composer/rmDeniedTestDir.php

@@ -26,7 +26,7 @@ $iTopFolder = __DIR__ . "/../../" ;
 require_once ("$iTopFolder/approot.inc.php");
 require_once (APPROOT."/setup/setuputils.class.inc.php");
 
-if  (PHP_SAPI !== 'cli')
+if  (php_sapi_name() !== 'cli')
 {
 	throw new \Exception('This script can only run from CLI');
 }
@@ -70,4 +70,4 @@ if (false === empty($aMissing)) {
 	echo "Some new tests dirs exists !\n"
 		.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
 		.'  List of dirs:'."\n".var_export($aMissing, true);
-}
+}

CONTRIBUTING.md

@@ -140,7 +140,7 @@ When your code is working, please:
 * Pull request description: mind to add all the information useful to understand why you're suggesting this modification and anything necessary to dive into your work. Especially:
   - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented 
   - Enhancements: use cases, implementation details if needed
-* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option !
+* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this option [won't be available](https://github.com/orgs/community/discussions/5634))
 
 
 ## 🙏 We are thankful

README.md

@@ -87,9 +87,11 @@ We would like to give a special thank you 🤗 to the people from the community
 - Castro, Randall Badilla
 - Colantoni, Maria Laura
 - Couronné, Guy
+- Dejin, Bie (a.k.a [@bdejin](https://github.com/bdejin))
 - Dvořák, Lukáš
 - Goethals, Stefan
 - Gumble, David
+- Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
 - Kaltefleiter, Lars (a.k.a [@larhip](https://www.github.com/larhip))
 - Khamit, Shamil
 - Kincel, Martin
@@ -105,9 +107,11 @@ We would like to give a special thank you 🤗 to the people from the community
 - Roháč, Richard (a.k.a [@RohacRichard](https://github.com/RohacRichard))
 - Rosenke, Stephan
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
+- Šafránek, Jaroslav (a.k.a [jkcinik](https://sourceforge.net/u/jkcinik/profile/) on SourceForge)
 - Seki, Shoji
 - Shilov, Vladimir
-- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya-stukalov))
+- 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))
 - Tulio, Marco
 - Turrubiates, Miguel

addons/userrights/userrightsprofile.class.inc.php

@@ -4,6 +4,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('ADMIN_PROFILE_NAME', 'Administrator');
 define('PORTAL_PROFILE_NAME', 'Portal user');
 

addons/userrights/userrightsprofile.db.class.inc.php

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('ADMIN_PROFILE_NAME', 'Administrator');
 define('PORTAL_PROFILE_NAME', 'Portal user');
 

addons/userrights/userrightsprojection.class.inc.php

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('ADMIN_PROFILE_ID', 1);
 
 class UserRightsBaseClass extends cmdbAbstractObject

app.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * 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
+ */
+
+use Combodo\iTop\Kernel;
+
+require_once __DIR__.'/lib/autoload_runtime.php';
+
+require_once('approot.inc.php');
+require_once('application/startup.inc.php');
+
+return function (array $context) {
+    return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+};

application/ajaxwebpage.class.inc.php

@@ -7,6 +7,7 @@
 
 // cannot notify depreciation for now as this is still load in autoloader
 //DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader');
+use Combodo\iTop\Application\WebPage\AjaxPage;
 
 /**
  * Class ajax_page

application/applicationextension.inc.php

@@ -19,6 +19,8 @@
  */
 
 use Combodo\iTop\Application\UI\Base\iUIBlock;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Symfony\Component\DependencyInjection\Container;
 
 require_once(APPROOT.'application/newsroomprovider.class.inc.php');
@@ -270,14 +272,14 @@ interface iPreferencesExtension
 {
 	/**
 	 * @api
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 */
 	public function DisplayPreferences(WebPage $oPage);
 
 	/**
 	 * @api
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sOperation
 	 *
 	 * @return bool true if the operation has been used
@@ -2103,16 +2105,8 @@ class RestUtils
 		elseif (is_string($key))
 		{
 			// OQL
-            try {
-                $oSearch = DBObjectSearch::FromOQL($key);
-            } catch (Exception $e) {
-                throw new CoreOqlException('Query failed to execute', [
-                        'query' => $key,
-                        'exception_class' => get_class($e),
-                        'exception_message' => $e->getMessage(),
-                ]);
-            }
-        }
+			$oSearch = DBObjectSearch::FromOQL($key);
+		}
 		else
 		{
 			throw new Exception("Wrong format for key");

application/audit.domain.class.inc.php

@@ -86,7 +86,7 @@ class lnkAuditCategoryToAuditDomain extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"            => "application,grant_by_profile",
+			"category"            => "application, grant_by_profile",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "",
 			"state_attcode"       => "",

application/cmdbabstract.class.inc.php

@@ -26,7 +26,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Html\HtmlFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
-use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\JsPopoverMenuItem;
@@ -42,6 +42,9 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetViewTable;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetViewTable;
 use Combodo\iTop\Application\UI\Links\Set\LinkSetUIBlockFactory;
+use Combodo\iTop\Application\WebPage\AjaxPage;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
@@ -134,8 +137,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	/** @var string */
 	public const ENUM_INPUT_TYPE_TAGSET = 'tagset';
 	/** @var string */
-	public const ENUM_INPUT_TYPE_TAGSET_LINKEDSET = 'tagset_linkedset';
-	/** @var string */
 	public const ENUM_INPUT_TYPE_RADIO = 'radio';
 	/** @var string */
 	public const ENUM_INPUT_TYPE_CHECKBOX = 'checkbox';
@@ -287,7 +288,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \cmdbAbstractObject $oObj
 	 * @param array $aParams
 	 *
@@ -356,7 +357,7 @@ JS
 	 * @param int $iKey The identifier of the object
 	 * @param string $sMessageId Your id or one of the well-known ids: 'create', 'update' and 'apply_stimulus'
 	 * @param string $sMessage The HTML message (must be correctly escaped)
-	 * @param string $sSeverity Any of the \WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants
+	 * @param string $sSeverity Any of the WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants
 	 * @param float $fRank Ordering of the message: smallest displayed first (can be negative)
 	 * @param bool $bMustNotExist Do not alter any existing message (considering the id)
 	 *
@@ -378,7 +379,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
+	 * @param WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
 	 *   When writing to the page, markup will be put above the real header of the panel.
 	 *   To insert something IN the panel, we now need to add UIBlocks in either the "subtitle" or "toolbar" sections of the array that will be returned.
 	 * @param bool $bEditMode Deprecated parameter in iTop 3.0.0, use {@see GetDisplayMode()} and ENUM_DISPLAY_MODE_* constants instead
@@ -556,7 +557,7 @@ HTML
 	/**
 	 * Display properties tab of an object
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 * @param string $sPrefix
 	 * @param array $aExtraParams
@@ -595,7 +596,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @throws \Exception
@@ -636,7 +637,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 *
 	 * @throws \CoreException
@@ -863,7 +864,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 * @param string $sPrefix
 	 * @param array $aExtraParams
@@ -1067,7 +1068,7 @@ HTML
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method, {@see static::$sDisplayMode} is used instead, but we cannot remove it as it part of the base interface (iDisplay)...
 	 *
 	 * @throws \ApplicationException
@@ -1114,10 +1115,8 @@ HTML
 		}
 
 		// Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage.
-		/** @var \iTopWebPage $oPage */
-		$oKPI = new ExecutionKPI();
+		/** @var iTopWebPage $oPage */
 		$aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareHeader');
 		if (false === empty($aHeadersBlocks['subtitle'])) {
 			$oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']);
 		}
@@ -1130,12 +1129,8 @@ HTML
 		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB, '', $oObjectDetails);
 		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
 		$oPage->SetCurrentTab('UI:PropertiesTab');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareProperties($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareProperties');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareRelations($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareRelations');
 
 
 		// Note: Adding the JS snippet which enables the image upload should have been done directly by the ActivityPanel which would have kept the independance principle
@@ -1155,7 +1150,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1178,7 +1173,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams See possible values in {@see DataTableUIBlockFactory::RenderDataTable()}
 	 *
@@ -1240,7 +1235,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \DBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -1412,7 +1407,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams key used :
 	 *      <ul>
@@ -1535,7 +1530,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 * @param string $sCharset
@@ -1694,7 +1689,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1907,7 +1902,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1985,7 +1980,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -2016,7 +2011,7 @@ HTML
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sClass
 	 * @param string $sAttCode
 	 * @param \AttributeDefinition $oAttDef
@@ -2367,7 +2362,6 @@ EOF
 
 				case 'LinkedSet':
 					if ($oAttDef->GetDisplayStyle() === LINKSET_DISPLAY_STYLE_PROPERTY) {
-						$sInputType = self::ENUM_INPUT_TYPE_TAGSET_LINKEDSET;
 						if (array_key_exists('bulk_context', $aArgs)) {
 							$oTagSetBlock = LinkSetUIBlockFactory::MakeForBulkLinkSet($iId, $oAttDef, $value, $sWizardHelperJsVarName, $aArgs['bulk_context']);
 						} else {
@@ -2755,7 +2749,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ArchivedObjectException
@@ -3160,7 +3154,7 @@ EOF
 	/**
 	 *  Select the derived class to create
 	 * @param string $sClass
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param \ApplicationContext $oAppContext
 	 * @param array $aPossibleClasses
 	 * @param array $aHiddenFields
@@ -3255,7 +3249,7 @@ EOF
 		return $oBlock;
 	}
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sClass
 	 * @param \DBObject|null $oSourceObject Object to use for the creation form, can be either the class to instantiate, an object to clone or an object to use (eg. already prefilled / modeled object)
 	 * @param array $aArgs
@@ -3340,7 +3334,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage      $oPage
+	 * @param WebPage      $oPage
 	 * @param string        $sStimulus
 	 * @param array|null    $aPrefillFormParam
 	 * @param bool          $bDisplayBareProperties Whether to display the object details or not
@@ -3753,7 +3747,7 @@ HTML;
 	/**
 	 * Displays a blob document *inline* (if possible, depending on the type of the document)
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @return string
@@ -4589,8 +4583,6 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBInsert()");
             $oKPI = new ExecutionKPI();
 			$oExtensionInstance->OnDBInsert($oNewObj, self::GetCurrentChange());
             $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
@@ -4672,22 +4664,7 @@ HTML;
 		return $oDeletionPlan;
 	}
 
-	final protected function PreDeleteActions(): void
-	{
-		/** @var \iApplicationObjectExtension $oExtensionInstance */
-		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
-		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBDelete()");
-			$oKPI = new ExecutionKPI();
-			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
-			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
-		}
-
-		parent::PreDeleteActions();
-	}
-
-	final protected function PostDeleteActions(): void
+	protected function PostDeleteActions(): void
 	{
 		parent::PostDeleteActions();
 	}
@@ -4701,8 +4678,6 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBDelete()");
             $oKPI = new ExecutionKPI();
 			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
             $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
@@ -4724,7 +4699,6 @@ HTML;
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
 			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified()");
 			$oKPI = new ExecutionKPI();
 			$bIsModified = $oExtensionInstance->OnIsModified($this);
 			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnIsModified');
@@ -4784,8 +4758,6 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnCheckToWrite()");
             $oKPI = new ExecutionKPI();
 			$aNewIssues = $oExtensionInstance->OnCheckToWrite($this);
             $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToWrite');
@@ -4836,8 +4808,6 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnCheckToDelete()");
             $oKPI = new ExecutionKPI();
 			$aNewIssues = $oExtensionInstance->OnCheckToDelete($this);
             $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToDelete');
@@ -4865,7 +4835,7 @@ HTML;
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sComment
 	 * @param string $sPrefix
@@ -4969,7 +4939,7 @@ HTML
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sComment
 	 * @param string $sPrefix
@@ -5094,7 +5064,7 @@ HTML
 	 * Display a form for modifying several objects at once
 	 * The form will be submitted to the current page, with the specified additional values
 	 *
-	 * @param \iTopWebPage $oP
+	 * @param iTopWebPage $oP
 	 * @param string $sClass
 	 * @param array $aSelectedObj
 	 * @param string $sCustomOperation
@@ -5338,7 +5308,7 @@ EOF
 	/**
 	 * Process the reply made from a form built with DisplayBulkModifyForm
 	 *
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param string $sClass
 	 * @param array $aSelectedObj
 	 * @param string $sCustomOperation
@@ -5478,7 +5448,7 @@ EOF
 	/**
 	 * Perform all the needed checks to delete one (or more) objects
 	 *
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sClass
 	 * @param \DBObject[] $aObjects
 	 * @param $bPreview
@@ -5964,7 +5934,7 @@ JS
 	final protected function FireEventAfterWrite(array $aChanges, bool $bIsNew): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
-		$this->RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
+		$this->FireEventDbLinksChangedForCurrentObject();
 		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges]);
 	}
 
@@ -6077,6 +6047,31 @@ JS
 		}
 	}
 
+	/**
+	 * Fire the EVENT_DB_LINKS_CHANGED event if current object is registered
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 *
+	 * @since 3.1.0 N°5906
+	 */
+	final protected function FireEventDbLinksChangedForCurrentObject(): void
+	{
+		if (true === static::IsEventDBLinksChangedBlocked()) {
+			return;
+		}
+
+		$sClass = get_class($this);
+		$sId = $this->GetKey();
+		$bIsObjectAwaitingEventDbLinksChanged = self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+		if (false === $bIsObjectAwaitingEventDbLinksChanged) {
+			return;
+		}
+		self::FireEventDbLinksChangedForObject($this);
+		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+	}
+
 	/**
 	 * Fire the EVENT_DB_LINKS_CHANGED event if given object is registered, and unregister it
 	 *
@@ -6106,9 +6101,7 @@ JS
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
 		$oObject = MetaModel::GetObject($sClass, $sId, false);
-		if (!is_null($oObject)) {
-			self::FireEventDbLinksChangedForObject($oObject);
-		}
+		self::FireEventDbLinksChangedForObject($oObject);
 		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 	}
 
@@ -6116,11 +6109,13 @@ JS
 	{
 		self::SetEventDBLinksChangedBlocked(true);
 		// N°6408 The object can have been deleted
-		$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
-
-		// Update the object if needed
-		if (count($oObject->ListChanges()) !== 0) {
-			$oObject->DBUpdate();
+		if (!is_null($oObject)) {
+			MetaModel::StartReentranceProtection($oObject);
+			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
+			MetaModel::StopReentranceProtection($oObject);
+			if (count($oObject->ListChanges()) !== 0) {
+				$oObject->DBUpdate();
+			}
 		}
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
 	}

application/dashboard.class.inc.php

@@ -9,6 +9,8 @@ use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
 use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'application/dashboardlayout.class.inc.php');
 require_once(APPROOT.'application/dashlet.class.inc.php');
@@ -422,7 +424,7 @@ abstract class Dashboard
 	}
 
 	/**
-	 * @param \WebPage $oPage *
+	 * @param WebPage $oPage *
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ReflectionException
@@ -513,7 +515,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 * @param bool $bCanEdit
@@ -569,7 +571,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ReflectionException
 	 * @throws \Exception
@@ -592,7 +594,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 */
 	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = array())
@@ -1109,7 +1111,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \Exception
@@ -1228,7 +1230,7 @@ EOF
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @param array $aExtraParams
 	 *
@@ -1264,12 +1266,12 @@ EOF
 		$sOkButtonLabel = Dict::S('UI:Button:Save');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		
-		$sId = json_encode($this->sId);
-		$sLayoutClass = json_encode($this->sLayoutClass);
+		$sId = utils::HtmlEntities($this->sId);
+		$sLayoutClass = utils::HtmlEntities($this->sLayoutClass);
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
-		$sTitle = json_encode($this->sTitle);
-		$sFile = json_encode($this->GetDefinitionFile());
+		$sTitle = utils::HtmlEntities($this->sTitle);
+		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
 		$sReloadURL = $this->GetReloadURL();
 
@@ -1325,15 +1327,15 @@ $('#dashboard_editor').dialog({
 });
 
 $('#dashboard_editor .ui-layout-center').runtimedashboard({
-	dashboard_id: $sId, 
-	layout_class: $sLayoutClass, 
-	title: $sTitle,
+	dashboard_id: '$sId', 
+	layout_class: '$sLayoutClass', 
+	title: '$sTitle',
 	auto_reload: $sAutoReload, 
 	auto_reload_sec: $sAutoReloadSec,
 	submit_to: '$sUrl', 
-	submit_parameters: {operation: 'save_dashboard', file: $sFile, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	submit_parameters: {operation: 'save_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	render_to: '$sUrl', 
-	render_parameters: {operation: 'render_dashboard', file: $sFile, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	render_parameters: {operation: 'render_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	new_dashlet_parameters: {operation: 'new_dashlet'}
 });
 
@@ -1488,7 +1490,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sOQL
 	 *
 	 * @throws \DictExceptionMissingString

application/dashboardlayout.class.inc.php

@@ -19,6 +19,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardRow;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Dashboard presentation
@@ -106,7 +107,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aCells
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams

application/dashlet.class.inc.php

@@ -23,6 +23,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\UIBlock;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'application/forms.class.inc.php');
 
@@ -222,7 +223,7 @@ abstract class Dashlet
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param bool $bEnclosingDiv
 	 * @param array $aExtraParams
@@ -298,7 +299,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *
@@ -309,7 +310,7 @@ EOF
 	/**
 	 * Rendering without the real data
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *

application/datamodel.application.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.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -187,9 +187,7 @@
   </menus>
   <events>
     <event id="EVENT_DB_BEFORE_WRITE" _delta="define">
-      <name>Before create or update</name>
-      <description><![CDATA[An object is about to be written into the database.
-The object can be modified.]]></description>
+      <description>An object is about to be written into the database. The object can be modified.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -210,9 +208,7 @@ The object can be modified.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_CHECK_TO_WRITE" _delta="define">
-      <name>Check to write</name>
-      <description><![CDATA[Check an object before it is written into the database (no change possible).
-Call $this->AddCheckIssue() to signal an issue.]]></description>
+      <description>Check an object before it is written into the database (no change possible). Call DBObject::AddCheckIssue() to signal an issue</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -233,9 +229,7 @@ Call $this->AddCheckIssue() to signal an issue.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_AFTER_WRITE" _delta="define">
-      <name>After create or update</name>
-      <description><![CDATA[An object has been written into the database.
-The modifications can be propagated to other objects.]]></description>
+      <description>An object has been written into the database. The modifications can be propagated to other objects.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -250,7 +244,7 @@ The modifications can be propagated to other objects.]]></description>
           <type>boolean</type>
         </event_datum>
         <event_datum id="changes">
-          <description><![CDATA[For updates, the list of changes done during this operation]]></description>
+          <description>For updates, the list of changes done during this operation</description>
           <type>array</type>
         </event_datum>
         <event_datum id="debug_info">
@@ -260,9 +254,7 @@ The modifications can be propagated to other objects.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_CHECK_TO_DELETE" _delta="define">
-      <name>Check to delete</name>
-      <description><![CDATA[Check an object before it is deleted from the database.
-Call $this->AddDeleteIssue() to signal an issue.]]></description>
+      <description>Check an object before it is deleted from the database. Call DBObject::AddDeleteIssue() to signal an issue</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -279,8 +271,7 @@ Call $this->AddDeleteIssue() to signal an issue.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_ABOUT_TO_DELETE" _delta="define">
-      <name>Before delete</name>
-      <description><![CDATA[An object is about to be deleted from the database]]></description>
+      <description>An object is about to be deleted from the database</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -297,8 +288,7 @@ Call $this->AddDeleteIssue() to signal an issue.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_AFTER_DELETE" _delta="define">
-      <name>After delete</name>
-      <description><![CDATA[An object has been deleted into the database]]></description>
+      <description>An object has been deleted into the database</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -314,10 +304,8 @@ Call $this->AddDeleteIssue() to signal an issue.]]></description>
         </event_datum>
       </event_data>
     </event>
-    <event id="EVENT_ENUM_TRANSITIONS" _delta="define">
-      <name>Enum transitions</name>
-      <description><![CDATA[Manage the allowed transitions in current object state.
-The only action allowed is to deny transitions with $this->DenyTransition()]]></description>
+    <event id="EVENT_DB_BEFORE_APPLY_STIMULUS" _delta="define">
+      <description>A stimulus is about to be applied to an object</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -326,9 +314,89 @@ The only action allowed is to deny transitions with $this->DenyTransition()]]></
           <description>The object where the stimulus is targeted</description>
           <type>DBObject</type>
         </event_datum>
-        <event_datum id="allowed_stimuli">
-          <description>The list of available stimuli in the current state</description>
-          <type>array</type>
+        <event_datum id="stimulus">
+          <description>Current stimulus applied</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="previous_state">
+          <description>Object previous state</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="new_state">
+          <description>Object new state</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="save_object">
+          <description>The object must be saved in the database</description>
+          <type>boolean</type>
+        </event_datum>
+        <event_datum id="debug_info">
+          <description>Debug string</description>
+          <type>string</type>
+        </event_datum>
+      </event_data>
+    </event>
+    <event id="EVENT_DB_AFTER_APPLY_STIMULUS" _delta="define">
+      <description>A stimulus has been applied to an object</description>
+      <sources>
+        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
+      </sources>
+      <event_data>
+        <event_datum id="object">
+          <description>The object where the stimulus is targeted</description>
+          <type>DBObject</type>
+        </event_datum>
+        <event_datum id="stimulus">
+          <description>Current stimulus applied</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="previous_state">
+          <description>Object previous state</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="new_state">
+          <description>Object new state</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="save_object">
+          <description>The object is asked to be saved in the database</description>
+          <type>boolean</type>
+        </event_datum>
+        <event_datum id="debug_info">
+          <description>Debug string</description>
+          <type>string</type>
+        </event_datum>
+      </event_data>
+    </event>
+    <event id="EVENT_DB_APPLY_STIMULUS_FAILED" _delta="define">
+      <description>A stimulus has failed</description>
+      <sources>
+        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
+      </sources>
+      <event_data>
+        <event_datum id="action">
+          <description>The action that failed to apply the stimulus</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="object">
+          <description>The object where the stimulus is targeted</description>
+          <type>DBObject</type>
+        </event_datum>
+        <event_datum id="stimulus">
+          <description>Current stimulus applied</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="previous_state">
+          <description>Object previous state</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="new_state">
+          <description>Object new state</description>
+          <type>string</type>
+        </event_datum>
+        <event_datum id="save_object">
+          <description>The object must be saved in the database</description>
+          <type>boolean</type>
         </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
@@ -337,8 +405,7 @@ The only action allowed is to deny transitions with $this->DenyTransition()]]></
       </event_data>
     </event>
     <event id="EVENT_DB_LINKS_CHANGED" _delta="define">
-      <name>Links on object have changed</name>
-      <description><![CDATA[At least one link class was changed]]></description>
+      <description>At least one link class was changed</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -354,9 +421,7 @@ The only action allowed is to deny transitions with $this->DenyTransition()]]></
       </event_data>
     </event>
     <event id="EVENT_DB_OBJECT_RELOAD" _delta="define">
-      <name>Object reload</name>
-      <internal>true</internal>
-      <description><![CDATA[An object has been re-loaded from the database]]></description>
+      <description>An object has been re-loaded from the database</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -372,8 +437,7 @@ The only action allowed is to deny transitions with $this->DenyTransition()]]></
       </event_data>
     </event>
     <event id="EVENT_DB_COMPUTE_VALUES" _delta="define">
-      <name>Recompute object values</name>
-      <description><![CDATA[An object needs to be recomputed after changes]]></description>
+      <description>An object needs to be recomputed after changes</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -390,8 +454,7 @@ The only action allowed is to deny transitions with $this->DenyTransition()]]></
       </event_data>
     </event>
     <event id="EVENT_DB_ARCHIVE" _delta="define">
-      <name>Object archived</name>
-      <description><![CDATA[An object has been archived]]></description>
+      <description>An object has been archived</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -407,8 +470,7 @@ The only action allowed is to deny transitions with $this->DenyTransition()]]></
       </event_data>
     </event>
     <event id="EVENT_DB_UNARCHIVE" _delta="define">
-      <name>Object unarchived</name>
-      <description><![CDATA[An object has been unarchived]]></description>
+      <description>An object has been unarchived</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -424,9 +486,7 @@ The only action allowed is to deny transitions with $this->DenyTransition()]]></
       </event_data>
     </event>
     <event id="EVENT_DB_SET_ATTRIBUTES_FLAGS" _delta="define">
-      <name>Set attributes flags</name>
-      <description><![CDATA[Set object attributes flags.
-Call $this->AddAttributeFlags() for all the attributes to be set for this target state.]]></description>
+      <description>Set object attributes flags. Call cmdbAbstractObject::AddAttributeFlags() for all the attributes to be set for this target state.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -437,7 +497,7 @@ Call $this->AddAttributeFlags() for all the attributes to be set for this target
         </event_datum>
         <event_datum id="target_state">
           <description>The target state in which to evaluate the flags</description>
-          <type>string</type>
+          <type>array</type>
         </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
@@ -446,9 +506,7 @@ Call $this->AddAttributeFlags() for all the attributes to be set for this target
       </event_data>
     </event>
     <event id="EVENT_DB_SET_INITIAL_ATTRIBUTES_FLAGS" _delta="define">
-      <name>Set initial attributes flags</name>
-      <description><![CDATA[Set object initial attributes flags.
-Call $this->AddInitialAttributeFlags() for all the initial attributes to be set initially.]]></description>
+      <description>Set object initial attributes flags. Call cmdbAbstractObject::AddInitialAttributeFlags() for all the initial attributes to be set initially.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -464,8 +522,7 @@ Call $this->AddInitialAttributeFlags() for all the initial attributes to be set
       </event_data>
     </event>
     <event id="EVENT_DOWNLOAD_DOCUMENT" _delta="define">
-      <name>Document downloaded</name>
-      <description><![CDATA[A document has been downloaded from the GUI]]></description>
+      <description>A document has been downloaded from the GUI</description>
       <sources>
         <source id="Document">Document</source>
       </sources>
@@ -474,10 +531,18 @@ Call $this->AddInitialAttributeFlags() for all the initial attributes to be set
           <description>The object containing the document</description>
           <type>DBObject</type>
         </event_datum>
+        <event_datum id="att_code">
+          <description>The optional object attribute code hosting the document</description>
+          <type>string</type>
+        </event_datum>
         <event_datum id="document">
           <description>The document downloaded</description>
           <type>ormDocument</type>
         </event_datum>
+        <event_datum id="content_disposition">
+          <description>The content disposition of the document ("inline" or "attachment")</description>
+          <type>string</type>
+        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -485,9 +550,7 @@ Call $this->AddInitialAttributeFlags() for all the initial attributes to be set
       </event_data>
     </event>
     <event id="EVENT_LOGIN" _delta="define">
-      <name>Login</name>
-      <internal>true</internal>
-      <description><![CDATA[Inform the listeners about the connection states]]></description>
+      <description>Inform the listeners about the connection states</description>
       <event_data>
         <event_datum id="code">
           <description>The login step result code (LoginWebPage::EXIT_CODE_...) </description>

application/datatable.class.inc.php

@@ -1,5 +1,7 @@
 <?php
 
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 /**
@@ -61,8 +63,8 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
-	 * @param \DataTableSettings $oSettings
+	 * @param WebPage $oPage
+	 * @param DataTableSettings $oSettings
 	 * @param $bActionsMenu
 	 * @param $sSelectMode
 	 * @param $bViewLink
@@ -141,7 +143,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -236,7 +238,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sSelectMode
 	 *
 	 * @return string
@@ -255,7 +257,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -348,7 +350,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -375,7 +377,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -405,7 +407,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $bViewLink
 	 * @param $iDefaultPageSize
@@ -658,7 +660,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize
@@ -790,7 +792,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iDefaultPageSize
 	 * @param $iStart
 	 */
@@ -818,7 +820,7 @@ JS
 class PrintableDataTable extends DataTable
 {
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -844,7 +846,7 @@ class PrintableDataTable extends DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize

application/displayblock.class.inc.php

@@ -24,6 +24,8 @@ use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxBars\BlockChartAjaxBa
 use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxPie\BlockChartAjaxPie;
 use Combodo\iTop\Application\UI\DisplayBlock\BlockCsv\BlockCsv;
 use Combodo\iTop\Application\UI\DisplayBlock\BlockList\BlockList;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Router\Router;
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -595,7 +597,7 @@ class DisplayBlock
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ApplicationException
@@ -704,7 +706,7 @@ class DisplayBlock
 				if ($bDoSearch)
 				{
 					// Keep the table_id identifying this table if we're performing a search
-					$sTableId = utils::ReadParam('_table_id_', null, false, utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+					$sTableId = utils::ReadParam('_table_id_', null, false, 'raw_data');
 					if ($sTableId != null)
 					{
 						$aExtraParams['table_id'] = $sTableId;
@@ -1354,7 +1356,7 @@ JS
 }
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\iUIBlock
@@ -1378,7 +1380,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \ConfigException
@@ -1456,7 +1458,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Layout\UIContentBlock
 	 * @throws \ApplicationException
@@ -1564,7 +1566,7 @@ JS
 	/**
 	 * @deprecated 3.1.0 N°5957
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Component\Html\Html|\Combodo\iTop\Application\UI\Base\Layout\UIContentBlock|string
@@ -1664,7 +1666,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1830,7 +1832,7 @@ class MenuBlock extends DisplayBlock
 	 * an object in with the same tab active by default as the tab that was active when selecting
 	 * the "Modify..." action.
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 * @param string|null $sId
 	 *

application/excelexporter.class.inc.php

@@ -1,4 +1,8 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\CLIPage;
+use Combodo\iTop\Application\WebPage\Page;
+
 require_once('xlsxwriter.class.php');
 
 class ExcelExporter

application/exceptions/CoreCannotSaveObjectException.php

@@ -60,24 +60,6 @@ class CoreCannotSaveObjectException extends CoreException
 		return $sContent;
 	}
 
-	public function getTextMessage()
-	{
-		$sTitle = Dict::S('UI:Error:SaveFailed');
-		$sContent = utils::HtmlEntities($sTitle);
-
-		if (count($this->aIssues) == 1) {
-			$sIssue = reset($this->aIssues);
-			$sContent .= utils::HtmlEntities($sIssue);
-		} else {
-			foreach ($this->aIssues as $sError) {
-				$sContent .= " ".utils::HtmlEntities($sError).", ";
-			}
-		}
-
-		return $sContent;
-	}
-
-
 	public function getIssues()
 	{
 		return $this->aIssues;

application/forms.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Helper class to build interactive forms to be used either in stand-alone
@@ -828,7 +829,7 @@ class DesignerFormField
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param string $sFormId
 	 * @param string $sRenderMode
 	 *

application/loginform.class.inc.php

@@ -140,7 +140,11 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('extensionblock/loginformfooter.html.twig'));
 
 		$bEnableResetPassword = MetaModel::GetConfig()->Get('forgot_password');
-		$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
+		$sResetPasswordUrl = MetaModel::GetConfig()->Get('forgot_password.url');
+		if ($sResetPasswordUrl == '')
+		{
+			$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
+		}
 		$aData = array(
 			'bEnableResetPassword' => $bEnableResetPassword,
 			'sResetPasswordUrl' => $sResetPasswordUrl,

application/logintwig.class.inc.php

@@ -9,6 +9,7 @@
 
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\TwigBase\Twig\Extension;
+use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Twig\Environment;
 use Twig\Loader\ChainLoader;
 use Twig\Loader\FilesystemLoader;

application/loginwebpage.class.inc.php

@@ -26,6 +26,8 @@
 
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\Helper\Session;
+use Combodo\iTop\Application\WebPage\ErrorPage;
+use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
 

application/maintenancemsg.php

@@ -22,6 +22,7 @@
 // Maintenance message display functions
 // Only included by approot.inc.php
 //
+use Combodo\iTop\Application\WebPage\ErrorPage;
 
 /**
  * Use a setup page to display the maintenance message

application/menunode.class.inc.php

@@ -5,6 +5,9 @@
  */
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\WebPage\ErrorPage;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/application/template.class.inc.php');
@@ -345,7 +348,7 @@ class ApplicationMenu
 
 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 * @throws DictExceptionMissingString
 	 *
@@ -419,7 +422,7 @@ EOF
 	/**
 	 * Handles the display of the sub-menus (called recursively if necessary)
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aMenus
 	 * @param array $aExtraParams
 	 * @param int $iActiveMenu

application/query.class.inc.php

@@ -21,6 +21,7 @@ use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 abstract class Query extends cmdbAbstractObject
 {

application/shortcut.class.inc.php

@@ -16,6 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 
 /**

application/template.class.inc.php

@@ -17,6 +17,9 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 /**
  * This class manages the special template format used internally to build the iTop web pages

application/ui.extkeywidget.class.inc.php

@@ -7,6 +7,7 @@
 use Combodo\iTop\Application\Helper\FormHelper;
 use Combodo\iTop\Application\UI\Base\Component\Form\FormUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 
 require_once(APPROOT.'/application/displayblock.class.inc.php');
@@ -65,7 +66,7 @@ class UIExtKeyWidget
 	//public function __construct($sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sClass
 	 * @param string $sTitle
@@ -132,7 +133,7 @@ class UIExtKeyWidget
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param int $iMaxComboLength
 	 * @param bool $bAllowTargetCreation
 	 * @param string $sTitle
@@ -444,7 +445,7 @@ JS
 	/**
 	 * Get the HTML fragment corresponding to the ext key editing widget
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param int $iMaxComboLength
 	 * @param boolean $bAllowTargetCreation
 	 * @param string $sTitle

application/ui.htmleditorwidget.class.inc.php

@@ -16,6 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Class UIHTMLEditorWidget
@@ -71,16 +72,15 @@ class UIHTMLEditorWidget
 		// To change the default settings of the editor,
 		// a) edit the file /js/ckeditor/config.js
 		// b) or override some of the configuration settings, using the second parameter of ckeditor()
-		$sJSDefineWidth = '';
 		$aConfig = utils::GetCkeditorPref();
 		$sWidthSpec = addslashes(trim($this->m_oAttDef->GetWidth()));
-		if ($sWidthSpec != '') {
-			/*N°6543 - the function min allow to keep text inside the column when width is defined*/
-			$aConfig['width'] = "min($sWidthSpec,100%)";
-			$sJSDefineWidth = '$("#cke_'.$iId.' iframe").contents().find("body").css("width", "'.$sWidthSpec.'")';
+		if ($sWidthSpec != '')
+		{
+			$aConfig['width'] = $sWidthSpec;
 		}
 		$sHeightSpec = addslashes(trim($this->m_oAttDef->GetHeight()));
-		if ($sHeightSpec != '') {
+		if ($sHeightSpec != '')
+		{
 			$aConfig['height'] = $sHeightSpec;
 		}
 		$sConfigJS = json_encode($aConfig);
@@ -111,7 +111,6 @@ $('#$iId').on('update', function(evt){
 		else
 		{
 			oMe.data('ckeditorInstance').setReadOnly(oMe.prop('disabled'));
-			$sJSDefineWidth
 		}
 	};
 	setTimeout(delayedSetReadOnly, 50);

application/ui.linksdirectwidget.class.inc.php

@@ -6,6 +6,7 @@
 
 use Combodo\iTop\Application\Helper\FormHelper;
 use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetEditTable;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 /**

application/ui.linkswidget.class.inc.php

@@ -8,6 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory
 use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow\FormTableRow;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetEditTable;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockObjectPickerDialog;
+use Combodo\iTop\Application\WebPage\JsonPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 require_once(APPROOT.'application/displayblock.class.inc.php');

application/ui.passwordwidget.class.inc.php

@@ -24,6 +24,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UIPasswordWidget 

application/ui.searchformforeignkeys.class.inc.php

@@ -21,6 +21,8 @@
  */
 
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys

application/uiwizard.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\WebPage\iTopWebPage;
 
 
 /**

application/utils.inc.php

@@ -20,6 +20,8 @@
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
+use Combodo\iTop\Application\UI\Hook\iKeyboardShortcut;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Module\ModuleService;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\OutputStyle;
@@ -109,11 +111,6 @@ class utils
 	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER = 'element_identifier';
-	/**
-	 * @var string For XML / HTML node id/class selector
-	 * @since 3.1.2 3.2.1
-	 */
-	public const ENUM_SANITIZATION_FILTER_ELEMENT_SELECTOR = 'element_selector';
 	/**
 	 * @var string For variables names
 	 * @since 3.0.0
@@ -243,8 +240,13 @@ class utils
 
 	public static function IsModeCLI()
 	{
-		$sCleanName = strtolower(trim(PHP_SAPI));
-		return ($sCleanName === 'cli');
+		$sSAPIName = php_sapi_name();
+		$sCleanName = strtolower(trim($sSAPIName));
+		if ($sCleanName == 'cli') {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -367,13 +369,13 @@ class utils
 		}
 		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
 	}
-
+	
 	public static function ReadPostedParam($sName, $defaultValue = '', $sSanitizationFilter = 'parameter')
 	{
 		$retValue = isset($_POST[$sName]) ? $_POST[$sName] : $defaultValue;
 		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
 	}
-
+	
 	public static function Sanitize($value, $defaultValue, $sSanitizationFilter)
 	{
 		if ($value === $defaultValue)
@@ -389,7 +391,7 @@ class utils
 				$retValue = $defaultValue;
 			}
 		}
-		return $retValue;
+		return $retValue;		
 	}
 
 	/**
@@ -494,17 +496,8 @@ class utils
 				}
 				break;
 
-			// For XML / HTML node identifiers
 			case static::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER:
 				$retValue = preg_replace('/[^a-zA-Z0-9_-]/', '', $value);
-				$retValue = filter_var($retValue, FILTER_VALIDATE_REGEXP,
-					['options' => ['regexp' => '/^[A-Za-z0-9][A-Za-z0-9_-]*$/']]);
-				break;
-
-			// For XML / HTML node id selector
-			case static::ENUM_SANITIZATION_FILTER_ELEMENT_SELECTOR:
-				$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
-					['options' => ['regexp' => '/^[#\.][A-Za-z0-9][A-Za-z0-9_-]*$/']]);
 				break;
 
 			case static::ENUM_SANITIZATION_FILTER_VARIABLE_NAME:
@@ -554,11 +547,11 @@ class utils
 					$sMimeType = self::GetFileMimeType($sTmpName);
 					$oDocument = new ormDocument($doc_content, $sMimeType, $sName);
 				break;
-
+				
 				case UPLOAD_ERR_NO_FILE:
 				// no file to load, it's a normal case, just return an empty document
 				break;
-
+				
 				case UPLOAD_ERR_FORM_SIZE:
 				case UPLOAD_ERR_INI_SIZE:
 				throw new FileUploadException(Dict::Format('UI:Error:UploadedFileTooBig', ini_get('upload_max_filesize')));
@@ -567,7 +560,7 @@ class utils
 				case UPLOAD_ERR_PARTIAL:
 				throw new FileUploadException(Dict::S('UI:Error:UploadedFileTruncated.'));
 				break;
-
+				
 				case UPLOAD_ERR_NO_TMP_DIR:
 				throw new FileUploadException(Dict::S('UI:Error:NoTmpDir'));
 				break;
@@ -580,7 +573,7 @@ class utils
 				$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
 				throw new FileUploadException(Dict::Format('UI:Error:UploadStoppedByExtension_FileName', $sName));
 				break;
-
+				
 				default:
 				throw new FileUploadException(Dict::Format('UI:Error:UploadFailedUnknownCause_Code', $sError));
 				break;
@@ -686,17 +679,17 @@ class utils
 
 		return $aSelectedObj;
 	}
-
+	
 	public static function GetNewTransactionId()
 	{
 		return privUITransaction::GetNewTransactionId();
 	}
-
+	
 	public static function IsTransactionValid($sId, $bRemoveTransaction = true)
 	{
 		return privUITransaction::IsTransactionValid($sId, $bRemoveTransaction);
 	}
-
+	
 	public static function RemoveTransaction($sId)
 	{
 		return privUITransaction::RemoveTransaction($sId);
@@ -880,9 +873,9 @@ class utils
 			$aDateTokens = array_keys($aSpec);
 			$aDateRegexps = array_values($aSpec);
 		}
-
+	   
 	   $sDateRegexp = str_replace($aDateTokens, $aDateRegexps, $sFormat);
-
+	   
 	   if (preg_match('!^(?<head>)'.$sDateRegexp.'(?<tail>)$!', $sDate, $aMatches))
 	   {
 			$sYear = isset($aMatches['year']) ? $aMatches['year'] : 0;
@@ -899,7 +892,7 @@ class utils
 	   }
 	   // http://www.spaweditor.com/scripts/regex/index.php
 	}
-
+	
 	/**
 	 * Convert an old date/time format specification (using % placeholders)
 	 * to a format compatible with DateTime::createFromFormat
@@ -1462,7 +1455,7 @@ class utils
 	/**
 	 * Merge standard menu items with plugin provided menus items
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param int $iMenuId
 	 * @param \DBObjectSet $param
 	 * @param array $aActions
@@ -1497,7 +1490,7 @@ class utils
 		$aResult = [];
 
 		// 1st - add standard built-in menu items
-		//
+		// 
 		switch($iMenuId)
 		{
 			case iPopupMenuExtension::MENU_OBJLIST_ACTIONS:
@@ -1881,7 +1874,7 @@ SQL;
 			return $sProposed;
 		}
 	}
-
+	
 	/**
 	 * 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
@@ -1891,7 +1884,7 @@ SQL;
 	{
 		return str_replace(array(':', '[', ']', '+', '-', ' '), '_', $sId);
 	}
-
+	
 	/**
 	 * Helper to execute an HTTP POST request, uses CURL PHP extension
 	 *
@@ -1976,7 +1969,7 @@ SQL;
 
 	/**
 	 * Get a standard list of character sets
-	 *
+	 *	 
  	 * @param array $aAdditionalEncodings Additional values
 	 * @return array of iconv code => english label, sorted by label
 	 */
@@ -2083,7 +2076,7 @@ SQL;
 			return $e->getMessage();
 		}
 	}
-
+	
 	/**
 	 * Convert (?) plain text to some HTML markup by replacing newlines by <br/> tags
 	 * and escaping HTML entities
@@ -2100,7 +2093,7 @@ SQL;
 
 		return str_replace("\n", '<br/>', utils::EscapeHtml($sText));
 	}
-
+	
 	/**
 	 * Eventually compiles the SASS (.scss) file into the CSS (.css) file
 	 *
@@ -2214,7 +2207,7 @@ SQL;
 			case 'image/png':
 			$img = @imagecreatefromstring($oImage->GetData());
 			break;
-
+			
 			default:
 			// Unsupported image type, return the image as-is
 			//throw new Exception("Unsupported image type: '".$oImage->GetMimeType()."'. Cannot resize the image, original image will be used.");
@@ -2228,14 +2221,14 @@ SQL;
 		else
 		{
 			// Let's scale the image, preserving the transparency for GIFs and PNGs
-
+			
 			$fScale = min($iMaxImageWidth / $iWidth, $iMaxImageHeight / $iHeight);
 
 			$iNewWidth = $iWidth * $fScale;
 			$iNewHeight = $iHeight * $fScale;
-
+			
 			$new = imagecreatetruecolor($iNewWidth, $iNewHeight);
-
+			
 			// Preserve transparency
 			if(($oImage->GetMimeType() == "image/gif") || ($oImage->GetMimeType() == "image/png"))
 			{
@@ -2243,38 +2236,38 @@ SQL;
 				imagealphablending($new, false);
 				imagesavealpha($new, true);
 			}
-
+			
 			imagecopyresampled($new, $img, 0, 0, 0, 0, $iNewWidth, $iNewHeight, $iWidth, $iHeight);
-
+			
 			ob_start();
 			switch ($oImage->GetMimeType())
 			{
 				case 'image/gif':
 				imagegif($new); // send image to output buffer
 				break;
-
+				
 				case 'image/jpeg':
 				imagejpeg($new, null, 80); // null = send image to output buffer, 80 = good quality
 				break;
-
+				 
 				case 'image/png':
 				imagepng($new, null, 5); // null = send image to output buffer, 5 = medium compression
 				break;
 			}
 			$oResampledImage = new ormDocument(ob_get_contents(), $oImage->GetMimeType(), $oImage->GetFileName());
 			@ob_end_clean();
-
+			
 			imagedestroy($img);
 			imagedestroy($new);
-
+							
 			return $oResampledImage;
 		}
-
+				
 	}
-
+	
 	/**
 	 * Create a 128 bit UUID in the format: {########-####-####-####-############}
-	 *
+	 * 
 	 * Note: this method can be run from the command line as well as from the web server.
 	 * Note2: this method is not cryptographically secure! If you need a cryptographically secure value
 	 * consider using open_ssl or PHP 7 methods.
@@ -2312,7 +2305,7 @@ SQL;
 	{
         return ModuleService::GetInstance()->GetCurrentModuleName($iCallDepth + 1);
 	}
-
+	
 	/**
 	 * **Warning** : returned result can be invalid as we're using backtrace to find the module dir name
 	 *
@@ -2349,7 +2342,7 @@ SQL;
 	{
 		return ModuleService::GetInstance()->GetCurrentModuleUrl(1);
 	}
-
+	
 	/**
 	 * @param string $sProperty The name of the property to retrieve
 	 * @param mixed $defaultvalue
@@ -2359,7 +2352,7 @@ SQL;
 	{
         return ModuleService::GetInstance()->GetCurrentModuleSetting($sProperty, $defaultvalue);
 	}
-
+	
 	/**
 	 * @param string $sModuleName
 	 * @return string|NULL compiled version of a given module, as it was seen by the compiler
@@ -2368,7 +2361,7 @@ SQL;
 	{
         return ModuleService::GetInstance()->GetCompiledModuleVersion($sModuleName);
 	}
-
+	
 	/**
 	 * Check if the given path/url is an http(s) URL
 	 * @param string $sPath
@@ -2383,7 +2376,7 @@ SQL;
 		}
 		return $bRet;
 	}
-
+	
 	/**
 	 * Check if the given URL is a link to download a document/image on the CURRENT iTop
 	 * In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument
@@ -2432,7 +2425,7 @@ SQL;
 		}
 		return $result;
 	}
-
+	
 	/**
 	 * Read the content of a file (and retrieve its MIME type) from either:
 	 * - an URL pointing to a blob (image/document) on the current iTop server
@@ -2476,7 +2469,7 @@ SQL;
 			'html' => 'text/html',
 			'exe' => 'application/octet-stream',
 		);
-
+	
 		$sData = null;
 		$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
 		$sFileName = 'uploaded-file'; // Default name for downloaded-files
@@ -2534,7 +2527,7 @@ SQL;
 			}
 			$sExtension = strtolower(pathinfo($sPath, PATHINFO_EXTENSION));
 			$sFileName = basename($sPath);
-
+				
 			if (array_key_exists($sExtension, $aKnownExtensions))
 			{
 				$sMimeType = $aKnownExtensions[$sExtension];
@@ -2548,7 +2541,7 @@ SQL;
 		}
 		return $oUploadedDoc;
 	}
-
+	
 	protected static function ParseHeaders($aHeaders)
 	{
 		$aCleanHeaders = array();
@@ -2573,7 +2566,7 @@ SQL;
 		}
 		return $aCleanHeaders;
 	}
-
+	
 	/**
 	 * @return string a string based on compilation time or (if not available because the datamodel has not been loaded)
 	 * the version of iTop. This string is useful to prevent browser side caching of content that may vary at each
@@ -2965,7 +2958,7 @@ HTML;
 		$aResultPref = [];
 		$aShortcutPrefs = appUserPreferences::GetPref('keyboard_shortcuts', []);
 		// Note: Mind the 4 blackslashes, see utils::GetClassesForInterface()
-		$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
+		$aShortcutClasses = utils::GetClassesForInterface(iKeyboardShortcut::class, '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
 
 		foreach ($aShortcutClasses as $cShortcutPlugin) {
 			$sTriggeredElement = $cShortcutPlugin::GetShortcutTriggeredElementSelector();

application/wizardhelper.class.inc.php

@@ -24,6 +24,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/uiwizard.class.inc.php');
 
 class WizardHelper
@@ -367,7 +369,7 @@ JS;
 	/**
 	 * Add necessary JS snippets (to the page) to be executed for fields update
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @return void
 	 * @since 3.0.3-2 3.0.4 3.1.1 3.2.0 N°6766
 	 */

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

bootstrap.inc.php

@@ -68,7 +68,7 @@ if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
 	http_response_code(503);
 	// Display message depending on the request
 	include(APPROOT.'application/maintenancemsg.php');
-	$sSAPIName = strtoupper(trim(PHP_SAPI));
+	$sSAPIName = strtoupper(trim(php_sapi_name()));
 
 	switch (true)
 	{

composer.json

@@ -4,7 +4,7 @@
   "type": "project",
   "license": "AGPL-3.0-only",
   "require": {
-    "php": ">=7.4.0 <8.2.0",
+    "php": ">=8.1.0 <8.2.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -23,18 +23,24 @@
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "^6.0.0",
     "scssphp/scssphp": "^1.10.3",
-    "symfony/console": "5.4.*",
-    "symfony/dotenv": "5.4.*",
-    "symfony/framework-bundle": "5.4.*",
-    "symfony/http-foundation": "5.4.*",
-    "symfony/http-kernel": "5.4.*",
-    "symfony/twig-bundle": "5.4.*",
-    "symfony/yaml": "5.4.*",
+    "symfony/console": "~6.4.0",
+    "symfony/dotenv": "~6.4.0",
+    "symfony/form": "~6.4.0",
+    "symfony/framework-bundle": "~6.4.0",
+    "symfony/http-foundation": "~6.4.0",
+    "symfony/http-kernel": "~6.4.0",
+    "symfony/runtime": "~6.4.0",
+    "symfony/serializer": "^6.4",
+    "symfony/twig-bundle": "~6.4.0",
+    "symfony/validator": "~6.4.0",
+    "symfony/var-dumper": "~6.4.0",
+    "symfony/yaml": "~6.4.0",
     "thenetworg/oauth2-azure": "^2.0"
   },
   "require-dev": {
-    "symfony/stopwatch": "5.4.*",
-    "symfony/web-profiler-bundle": "5.4.*"
+    "symfony/stopwatch": "~6.4.0",
+    "symfony/web-profiler-bundle": "~6.4.0",
+    "symfony/debug-bundle": "~6.4.0"
   },
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
@@ -46,7 +52,7 @@
   },
   "config": {
     "platform": {
-      "php": "7.4.0"
+      "php": "8.1.0"
     },
     "vendor-dir": "lib",
     "preferred-install": {
@@ -54,7 +60,10 @@
     },
     "sort-packages": true,
     "classmap-authoritative": true,
-    "platform-check": true
+    "platform-check": true,
+    "allow-plugins": {
+      "symfony/runtime": true
+    }
   },
   "autoload": {
     "classmap": [
@@ -72,6 +81,9 @@
       "application/logindefault.class.inc.php",
       "application/loginexternal.class.inc.php",
       "application/loginurl.class.inc.php"
+    ],
+    "files": [
+      "sources/alias.php"
     ]
   },
   "conflict": {
@@ -81,6 +93,9 @@
     "symfony": {
       "allow-contrib": false,
       "require": "3.4.*"
+    },
+    "runtime": {
+      "dotenv_path": "symfony/.env"
     }
   },
   "scripts": {

core/action.class.inc.php

@@ -17,6 +17,7 @@
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Persistent classes (internal): user defined actions
@@ -201,12 +202,39 @@ abstract class ActionNotification extends Action
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list'));
 		// - Attributes to be displayed for a list
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'description', 'status'));
+		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
 		// Search criteria
 		// - Criteria of the std search form
 //		MetaModel::Init_SetZListItems('standard_search', array('name'));
 		// - Default criteria of the search form
 //		MetaModel::Init_SetZListItems('default_search', array('name'));
 	}
+
+	/**
+	 * @param $sLanguage
+	 * @param $sLanguageCode
+	 *
+	 * @return array [$sPreviousLanguage, $aPreviousPluginProperties]
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \DictExceptionUnknownLanguage
+	 * @since 3.2.0
+	 */
+	public function SetNotificationLanguage($sLanguage = null, $sLanguageCode = null){
+		$sPreviousLanguage = Dict::GetUserLanguage();
+		$aPreviousPluginProperties = ApplicationContext::GetPluginProperties('QueryLocalizerPlugin');
+		$sLanguage = $sLanguage ?? $this->Get('language');
+		$sLanguageCode = $sLanguageCode ?? $sLanguage;
+		if (!utils::IsNullOrEmptyString($sLanguage)) {
+			// If a language is specified for this action, force this language
+			// when rendering all placeholders inside this message
+			Dict::SetUserLanguage($sLanguage);
+			AttributeDateTime::LoadFormatFromConfig();
+			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $sLanguageCode);
+		}
+		return [$sPreviousLanguage, $aPreviousPluginProperties];
+	}
 }
 
 /**
@@ -273,7 +301,6 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values" => null, "sql" => "subject", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values" => null, "sql" => "body", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values" => new ValueSetEnum('low,normal,high'), "sql" => "importance", "default_value" => 'normal', "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeBlob("html_template", array("is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeEnum("ignore_notify", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "ignore_notify", "default_value" => 'yes', "is_null_allowed" => false, "depends_on" => array())));
 		
@@ -561,15 +588,7 @@ class ActionEmail extends ActionNotification
 			'attachments' => [],
 		];
 		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		$sPreviousLanguage = Dict::GetUserLanguage();
-		$aPreviousPluginProperties = ApplicationContext::GetPluginProperties('QueryLocalizerPlugin');
-		if ($this->Get('language') !== '') {
-			// If a language is specified for this action, force this language
-			// when rendering all placeholders inside this message
-			Dict::SetUserLanguage($this->Get('language'));
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $this->Get('language'));
-		}
+		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
 
 		try
 		{
@@ -601,9 +620,7 @@ class ActionEmail extends ActionNotification
 		}
 		finally {
 			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-			Dict::SetUserLanguage($sPreviousLanguage);
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $aPreviousPluginProperties['language_code'] ?? null);
+			$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
 		}
 		
 		if (!is_null($oLog)) {
@@ -629,7 +646,9 @@ class ActionEmail extends ActionNotification
 				$oLog->Set('body', HTMLSanitizer::Sanitize($aMessageContent['body']));
 			}
 		}
-
+		$sStyles = file_get_contents(APPROOT.'css/email.css');
+		$sStyles .= MetaModel::GetConfig()->Get('email_css');
+		
 		if ($this->IsBeingTested()) {
 			$sTestBody = $aMessageContent['body'];
 			$sTestBody .= "<div style=\"border: dashed;\">\n";

core/apc-emulation.php

@@ -60,15 +60,14 @@ function apc_store($key, $var = NULL, $ttl = 0)
  */
 function apc_fetch($key)
 {
-	if (is_array($key)) {
-		$aResult = [];
-		foreach ($key as $sKey) {
+	if (is_array($key))
+	{
+		$aResult = array();
+		foreach($key as $sKey)
+		{
 			$aResult[$sKey] = apcFile::FetchOneFile($sKey);
 		}
-
 		return $aResult;
-	} elseif (is_null($key)) {
-		return false;
 	}
 	return apcFile::FetchOneFile($key);
 }
@@ -212,16 +211,21 @@ class apcFile
 	 */
 	static public function StoreOneFile($sKey, $value, $iTTL)
 	{
-		if (empty($sKey)) {
+		if (empty($sKey))
+		{
 			return false;
 		}
-		if (is_file(self::GetCacheFileName($sKey))) {
+
+		if (is_file(self::GetCacheFileName($sKey)))
+		{
 			@unlink(self::GetCacheFileName($sKey));
 		}
-		if (is_file(self::GetCacheFileName('-'.$sKey))) {
+		if (is_file(self::GetCacheFileName('-'.$sKey)))
+		{
 			@unlink(self::GetCacheFileName('-'.$sKey));
 		}
-		if ($iTTL > 0) {
+		if ($iTTL > 0)
+		{
 			// hint for ttl management
 			$sKey = '-'.$sKey;
 		}
@@ -229,14 +233,15 @@ class apcFile
 		$sFilename = self::GetCacheFileName($sKey);
 		// try to create the folder
 		$sDirname = dirname($sFilename);
-		if (!is_dir($sDirname)) {
-			if (!@mkdir($sDirname, 0755, true)) {
+		if (!file_exists($sDirname))
+		{
+			if (!@mkdir($sDirname, 0755, true))
+			{
 				return false;
 			}
 		}
 		$bRes = !(@file_put_contents($sFilename, serialize($value), LOCK_EX) === false);
 		self::AddFile($sFilename);
-
 		return $bRes;
 	}
 
@@ -320,15 +325,19 @@ class apcFile
 	 */
 	static protected function ReadCacheLocked($sFilename)
 	{
-		$sContent = false;
-		$file = @fopen($sFilename, 'r');
-		if ($file !== false) {
-			if (flock($file, LOCK_SH)) {
-				$sContent = file_get_contents($sFilename);
-				flock($file, LOCK_UN);
-			}
-			fclose($file);
+		if (!is_file($sFilename))
+		{
+			return false;
 		}
+		$file = @fopen($sFilename, 'r');
+		if ($file === false)
+		{
+			return false;
+		}
+		flock($file, LOCK_SH);
+		$sContent = @fread($file, @filesize($sFilename));
+		flock($file, LOCK_UN);
+		fclose($file);
 		return $sContent;
 	}
 

core/attributedef.class.inc.php

@@ -6,6 +6,7 @@
 
 use Combodo\iTop\Application\UI\Base\Component\FieldBadge\FieldBadgeUIBlockFactory;
 use Combodo\iTop\Application\UI\Links\Set\BlockLinkSetDisplayAsProperty;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Form\Field\LabelField;
 use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Form;
@@ -3061,11 +3062,6 @@ class AttributeObjectKey extends AttributeDBFieldVoid
 		return ((int) $proposedValue) !== 0;
 	}
 
-    /**
-     * @inheritDoc
-     *
-     * @param int|DBObject $proposedValue Object key or valid ({@see MetaModel::IsValidObject()}) datamodel object
-     */
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (is_null($proposedValue))
@@ -3078,6 +3074,7 @@ class AttributeObjectKey extends AttributeDBFieldVoid
 		}
 		if (MetaModel::IsValidObject($proposedValue))
 		{
+			/** @var \DBObject $proposedValue */
 			return $proposedValue->GetKey();
 		}
 
@@ -4534,6 +4531,7 @@ class AttributeText extends AttributeString
 		$sStyle = '';
 		if (count($aStyles) > 0)
 		{
+			$aStyles[] = 'overflow:auto';
 			$sStyle = 'style="'.implode(';', $aStyles).'"';
 		}
 
@@ -6513,11 +6511,6 @@ class AttributeDateTime extends AttributeDBField
 		}
 	}
 
-    /**
-     * @inheritDoc
-     *
-     * @param int|string $proposedValue timestamp ({@see DateTime::getTimestamp()) or date as string, following the {@see GetInternalFormat} format.
-     */
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (is_null($proposedValue))
@@ -8307,9 +8300,9 @@ class AttributeBlob extends AttributeDefinition
 	}
 
 	/**
-     * {@inheritDoc}
-     *
-     * @param string $proposedValue Can be an URL (including an URL to iTop itself), or a local path (CSV import)
+	 * Users can provide the document from an URL (including an URL on iTop itself)
+	 * for CSV import. Administrators can even provide the path to a local file
+	 * {@inheritDoc}
 	 *
 	 * @see AttributeDefinition::MakeRealValue()
 	 */
@@ -8550,7 +8543,7 @@ class AttributeBlob extends AttributeDefinition
 		$sFingerprint = '';
 		if ($value instanceOf ormDocument)
 		{
-			$sFingerprint = $value->GetSignature();
+			$sFingerprint = md5($value->GetData());
 		}
 
 		return $sFingerprint;
@@ -11508,11 +11501,6 @@ class AttributeClassAttCodeSet extends AttributeSet
 		}
 		return '<span class="'.implode(' ', $this->aCSSClasses).'">'.$value.'</span>';
 	}
-
-	public function IsNull($proposedValue)
-	{
-		return (empty($proposedValue));
-	}
 }
 
 class AttributeQueryAttCodeSet extends AttributeSet
@@ -13009,7 +12997,7 @@ class AttributeRedundancySettings extends AttributeDBField
 	 * Display an option (form, or current value)
 	 *
 	 * @param string $sCurrentValue
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sFormPrefix
 	 * @param bool $bEditMode
 	 * @param string $sUserOption

core/autoload.php

@@ -25,6 +25,7 @@ MetaModel::IncludeModule('application/audit.domain.class.inc.php');
 MetaModel::IncludeModule('application/query.class.inc.php');
 MetaModel::IncludeModule('setup/moduleinstallation.class.inc.php');
 
+
 MetaModel::IncludeModule('core/event.class.inc.php');
 MetaModel::IncludeModule('core/action.class.inc.php');
 MetaModel::IncludeModule('core/trigger.class.inc.php');

core/bulkchange.class.inc.php

@@ -6,6 +6,9 @@
 
 // The BOM is added at the head of exported UTF-8 CSV data, and removed (if present) from input UTF-8 data.
 // This helps MS-Excel (Version > 2007, Windows only) in changing its interpretation of a CSV file (by default Excel reads data as ISO-8859-1 -not 100% sure!)
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('UTF8_BOM', chr(239).chr(187).chr(191)); // 0xEF, 0xBB, 0xBF
 
 
@@ -32,37 +35,11 @@ abstract class CellChangeSpec
 		return $this->m_proposedValue;
 	}
 
-	/**
-	 * @throws \Exception
-	 * @since 3.2.0
-	 */
-	public function GetCLIValue(bool $bLocalizedValues = false): string
+	public function GetDisplayableValue()
 	{
-		if (is_object($this->m_proposedValue))	{
-			if ($this->m_proposedValue instanceof ReportValue) {
-				return $this->m_proposedValue->GetAsCSV($bLocalizedValues, ',', '"');
-			}
-			throw new Exception('Unexpected class : '. get_class($this->m_proposedValue));
-		}
 		return $this->m_proposedValue;
 	}
 
-	/**
-	 * @throws \Exception
-	 * @since 3.2.0
-	 */
-	public function GetHTMLValue(bool $bLocalizedValues = false): string
-	{
-		if (is_object($this->m_proposedValue)) {
-			if ($this->m_proposedValue instanceof ReportValue) {
-				return $this->m_proposedValue->GetAsHTML($bLocalizedValues);
-			}
-			throw new Exception('Unexpected class : '. get_class($this->m_proposedValue));
-		}
-		return utils::EscapeHtml($this->m_proposedValue);
-	}
-
-
 	/**
 	 * @since 3.1.0 N°5305
 	 */
@@ -77,12 +54,12 @@ abstract class CellChangeSpec
 	}
 
 	/**
-	 * @since 3.2.0
+	 * @since 3.1.0 N°5305
 	 */
-	public function GetCLIValueAndDescription(): string
+	public function GetDisplayableValueAndDescription(): string
 	{
 		return sprintf("%s%s",
-			$this->GetCLIValue(),
+			$this->GetDisplayableValue(),
 			$this->GetDescription()
 		);
 	}
@@ -131,25 +108,13 @@ class CellStatus_Issue extends CellStatus_Modify
 		parent::__construct($proposedValue, $previousValue);
 	}
 
-	public function GetCLIValue(bool $bLocalizedValues = false): string
-	{
-		if (is_null($this->m_proposedValue)) {
-			return Dict::Format('UI:CSVReport-Value-SetIssue');
-		}
-		return Dict::Format('UI:CSVReport-Value-ChangeIssue',$this->m_proposedValue);
-	}
-
-	public function GetHTMLValue(bool $bLocalizedValues = false): string
+	public function GetDisplayableValue()
 	{
 		if (is_null($this->m_proposedValue))
 		{
 			return Dict::Format('UI:CSVReport-Value-SetIssue');
 		}
-		if ($this->m_proposedValue instanceof ReportValue)
-		{
-			return Dict::Format('UI:CSVReport-Value-ChangeIssue', $this->m_proposedValue->GetAsHTML($bLocalizedValues));
-		}
-		return Dict::Format('UI:CSVReport-Value-ChangeIssue',utils::EscapeHtml($this->m_proposedValue));
+		return Dict::Format('UI:CSVReport-Value-ChangeIssue', \utils::EscapeHtml($this->m_proposedValue));
 	}
 
 	public function GetDescription()
@@ -157,12 +122,12 @@ class CellStatus_Issue extends CellStatus_Modify
 		return $this->m_sReason;
 	}
 	/*
-	 * @since 3.2.0
+	 * @since 3.1.0 N°5305
 	 */
-	public function GetCLIValueAndDescription(): string
+	public function GetDisplayableValueAndDescription(): string
 	{
 		return sprintf("%s. %s",
-			$this->GetCLIValue(),
+			$this->GetDisplayableValue(),
 			$this->GetDescription()
 		);
 	}
@@ -198,7 +163,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	 * @param null $sAllowedValues : used for additional message that provides allowed values $sAllowedValues for current class
 	 * @param string|null $sAllowedValuesSearch : used to search all allowed values
 	 */
-	public function __construct($sSerializedSearch, $sReason, $sClass = null, $sAllowedValues = null, string $sAllowedValuesSearch = null)
+	public function __construct($sSerializedSearch, $sReason, $sClass=null, $sAllowedValues=null, string $sAllowedValuesSearch=null)
 	{
 		parent::__construct(null, null, $sReason);
 		$this->sSerializedSearch = $sSerializedSearch;
@@ -207,7 +172,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 		$this->sAllowedValuesSearch = $sAllowedValuesSearch;
 	}
 
-	public function GetCLIValue(bool $bLocalizedValues = false): string
+	public function GetDisplayableValue()
 	{
 		if (null === $this->m_sReason) {
 			return Dict::Format('UI:CSVReport-Value-NoMatch', '');
@@ -216,15 +181,6 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 		return $this->m_sReason;
 	}
 
-	public function GetHTMLValue(bool $bLocalizedValues = false): string
-	{
-		if (null === $this->m_sReason) {
-			return Dict::Format('UI:CSVReport-Value-NoMatch', '');
-		}
-
-		return utils::EscapeHtml($this->m_sReason);
-	}
-
 	public function GetDescription()
 	{
 		if (\utils::IsNullOrEmptyString($this->m_sAllowedValues) ||
@@ -242,7 +198,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	public function GetSearchLinkUrl()
 	{
 		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sSerializedSearch ?? "")
+			rawurlencode($this->sSerializedSearch)
 		);
 	}
 
@@ -253,7 +209,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	public function GetAllowedValuesLinkUrl(): ?string
 	{
 		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sAllowedValuesSearch ?? "")
+			rawurlencode($this->sAllowedValuesSearch)
 		);
 	}
 }
@@ -271,42 +227,6 @@ class CellStatus_NullIssue extends CellStatus_Issue
 	}
 }
 
-/**
- * Class to differ formatting depending on the caller
- */
-class ReportValue
-{
-	protected DBObject $oObject;
-	protected string $sAttCode;
-	protected bool $bOriginal;
-
-	/**
-	 * @param DBObject $oObject
-	 * @param string $sAttCode
-	 * @param bool $bOriginal
-	 */
-	public function __construct(DBObject $oObject, string $sAttCode, bool $bOriginal)
-	{
-		$this->oObject = $oObject;
-		$this->sAttCode = $sAttCode;
-		$this->bOriginal = $bOriginal;
-	}
-
-	public function GetAsHTML(bool $bLocalizedValues)
-	{
-		if ($this->bOriginal) {
-			return $this->oObject->GetOriginalAsHTML($this->sAttCode, $bLocalizedValues);
-		}
-		return $this->oObject->GetAsHTML($this->sAttCode, $bLocalizedValues);
-	}
-	public function GetAsCSV (bool $bLocalizedValues, string $sCsvSep, string $sCsvDelimiter) {
-		if ($this->bOriginal) {
-			return $this->oObject->GetOriginalAsCSV($this->sAttCode, $sCsvSep, $sCsvDelimiter, $bLocalizedValues);
-		}
-		return $this->oObject->GetAsCSV($this->sAttCode, $sCsvSep, $sCsvDelimiter, $bLocalizedValues);
-	}
-}
-
 
 class CellStatus_Ambiguous extends CellStatus_Issue
 {
@@ -345,7 +265,7 @@ class CellStatus_Ambiguous extends CellStatus_Issue
 	public function GetSearchLinkUrl()
 	{
 		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sSerializedSearch ?? "")
+			rawurlencode($this->sSerializedSearch)
 		);
 	}
 }
@@ -493,6 +413,22 @@ class BulkChange
 		$this->m_aExtKeysMappingCache = array();
 	}
 
+	protected $m_bReportHtml = false;
+	protected $m_sReportCsvSep = ',';
+	protected $m_sReportCsvDelimiter = '"';
+
+	public function SetReportHtml()
+	{
+		$this->m_bReportHtml = true;
+	}
+
+	public function SetReportCsv($sSeparator = ',', $sDelimiter = '"')
+	{
+		$this->m_bReportHtml = false;
+		$this->m_sReportCsvSep = $sSeparator;
+		$this->m_sReportCsvDelimiter = $sDelimiter;
+	}
+
 	protected function ResolveExternalKey($aRowData, $sAttCode, &$aResults)
 	{
 		$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
@@ -510,7 +446,7 @@ class BulkChange
 				$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
 			}
 			$oReconFilter->AddCondition($sReconKeyAttCode, $value, '=');
-			$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+			$aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 		}
 
 		$oExtObjects = new CMDBObjectSet($oReconFilter);
@@ -534,7 +470,7 @@ class BulkChange
 	}
 
 	/**
-	 * @param DBObject $oTargetObj
+	 * @param \DBObject $oTargetObj
 	 * @param array $aRowData
 	 * @param array $aErrors
 	 *
@@ -597,7 +533,7 @@ class BulkChange
 					}
 					$aCacheKeys[] = $value;
 					$oReconFilter->AddCondition($sReconKeyAttCode, $value, '=');
-					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+					$aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 				}
 				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
 				$iForeignKey = null;
@@ -666,7 +602,7 @@ class BulkChange
 						foreach ($aReconKeys as $sReconKeyAttCode => $iCol)
 						{
 							// Report the change on reconciliation values as well
-							$aResults[$iCol] = new CellStatus_Modify($aRowData[$iCol]);
+							$aResults[$iCol] = new CellStatus_Modify(utils::HtmlEntities($aRowData[$iCol]));
 						}
 					}
 				}
@@ -744,32 +680,50 @@ class BulkChange
 		// Reporting on fields
 		//
 		$aChangedFields = $oTargetObj->ListChanges();
-		foreach ($this->m_aAttList as $sAttCode => $iCol) {
-			if ($sAttCode == 'id') {
-				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+		foreach ($this->m_aAttList as $sAttCode => $iCol)
+		{
+			if ($sAttCode == 'id')
+			{
+				$aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 			}
-			else {
-				$sCurValue = new ReportValue($oTargetObj, $sAttCode, false);
-				$sOrigValue = new ReportValue($oTargetObj, $sAttCode, true);
-				if (isset($aErrors[$sAttCode])) {
-					$aResults[$iCol]= new CellStatus_Issue($aRowData[$iCol], $sOrigValue, $aErrors[$sAttCode]);
+			else
+			{
+				if ($this->m_bReportHtml)
+				{
+					$sCurValue = $oTargetObj->GetAsHTML($sAttCode, $this->m_bLocalizedValues);
+					$sOrigValue = $oTargetObj->GetOriginalAsHTML($sAttCode, $this->m_bLocalizedValues);
 				}
-				elseif (array_key_exists($sAttCode, $aChangedFields)){
-					if ($oTargetObj->IsNew())	{
+				else
+				{
+					$sCurValue = $oTargetObj->GetAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
+					$sOrigValue = $oTargetObj->GetOriginalAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
+				}
+				if (isset($aErrors[$sAttCode]))
+				{
+					$aResults[$iCol]= new CellStatus_Issue(utils::HtmlEntities($aRowData[$iCol]), $sOrigValue, $aErrors[$sAttCode]);
+				}
+				elseif (array_key_exists($sAttCode, $aChangedFields))
+				{
+					if ($oTargetObj->IsNew())
+					{
 						$aResults[$iCol]= new CellStatus_Void($sCurValue);
 					}
-					else	{
+					else
+					{
 						$aResults[$iCol]= new CellStatus_Modify($sCurValue, $sOrigValue);
 					}
 				}
-				else	{
+				else
+				{
 					// By default... nothing happens
 					$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-					if ($oAttDef instanceof AttributeDateTime) {
+					if ($oAttDef instanceof AttributeDateTime)
+					{
 						$aResults[$iCol]= new CellStatus_Void($oAttDef->GetFormat()->Format($aRowData[$iCol]));
 					}
-					else	{
-						$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+					else
+					{
+						$aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 					}
 				}
 			}
@@ -834,7 +788,7 @@ class BulkChange
 			// Possibles values are displayed to UI user. we have to limit the amount of displayed values
 			$oExtObjectSetWithCurrentUserPermissions->SetLimit(4);
 			for($i = 0; $i < 3; $i++){
-				/** @var DBObject $oVisibleObject */
+				/** @var \DBObject $oVisibleObject */
 				$oVisibleObject = $oExtObjectSetWithCurrentUserPermissions->Fetch();
 				if (is_null($oVisibleObject)){
 					break;
@@ -1201,7 +1155,7 @@ class BulkChange
 							if (!preg_match($sRegExp, $sValue))
 							{
 								$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
-								$aResult[$iRow][$iCol] = new CellStatus_Issue($sValue, null, $sErrorMsg);
+								$aResult[$iRow][$iCol] = new CellStatus_Issue(utils::HtmlEntities($sValue), null, $sErrorMsg);
 
 							}
 							else
@@ -1214,7 +1168,6 @@ class BulkChange
 								}
 								else
 								{
-									// almost impossible ti reproduce since even incorrect dates with correct formats are formated and $oDate will not be false
 									// Leave the cell unchanged
 									$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
 									$aResult[$iRow][$iCol] = new CellStatus_Issue($sValue, null, $sErrorMsg);
@@ -1354,7 +1307,7 @@ class BulkChange
 			{
 				if (!array_key_exists($iCol, $aResult[$iRow]))
 				{
-					$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
+					$aResult[$iRow][$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 				}
 			}
 			foreach($this->m_aExtKeys as $sAttCode => $aForeignAtts)
@@ -1368,7 +1321,7 @@ class BulkChange
 					if (!array_key_exists($iCol, $aResult[$iRow]))
 					{
 						// The foreign attribute is one of our reconciliation key
-						$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
+						$aResult[$iRow][$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 					}
 				}
 			}

core/bulkexport.class.inc.php

@@ -17,6 +17,9 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('EXPORTER_DEFAULT_CHUNK_SIZE', 1000);
 
 class BulkExportException extends Exception
@@ -391,7 +394,7 @@ abstract class BulkExport
 
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/cmdbobject.class.inc.php

@@ -335,7 +335,7 @@ abstract class CMDBObject extends DBObject
 		$oMyChangeOp->Set("objclass", MetaModel::GetRootClass(get_class($this)));
 		$oMyChangeOp->Set("objkey", $objkey);
 		$oMyChangeOp->Set("fclass", get_class($this));
-		$oMyChangeOp->SetTrim("fname", $this->GetRawName()); // Protect against very long friendly names
+		$oMyChangeOp->Set("fname", substr($this->GetRawName(), 0, 255)); // Protect against very long friendly names
 		$iId = $oMyChangeOp->DBInsertNoReload();
 	}
 

core/cmdbsource.class.inc.php

@@ -549,9 +549,10 @@ class CMDBSource
 	/**
 	 * @param string $sSQLQuery
 	 *
-     * @return mysqli_result|null
-     * @throws MySQLException
-     * @throws MySQLHasGoneAwayException
+	 * @return \mysqli_result|null
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \CoreException
 	 *
 	 * @since 2.7.0 N°679 handles nested transactions
 	 */
@@ -1169,8 +1170,8 @@ class CMDBSource
 	 */
 	public static function IsSameFieldTypes($sItopGeneratedFieldType, $sDbFieldType)
 	{
-		[$sItopFieldDataType, $sItopFieldTypeOptions, $sItopFieldOtherOptions] = static::GetFieldDataTypeAndOptions($sItopGeneratedFieldType);
-		[$sDbFieldDataType, $sDbFieldTypeOptions, $sDbFieldOtherOptions] = static::GetFieldDataTypeAndOptions($sDbFieldType);
+		list($sItopFieldDataType, $sItopFieldTypeOptions, $sItopFieldOtherOptions) = static::GetFieldDataTypeAndOptions($sItopGeneratedFieldType);
+		list($sDbFieldDataType, $sDbFieldTypeOptions, $sDbFieldOtherOptions) = static::GetFieldDataTypeAndOptions($sDbFieldType);
 
 		if (strcasecmp($sItopFieldDataType, $sDbFieldDataType) !== 0)
 		{
@@ -1603,19 +1604,7 @@ class CMDBSource
 		return false;
 	}
 
-    public static function GetClusterNb()
-    {
-        $result = 0;
-        $sSql = "SHOW STATUS LIKE 'wsrep_cluster_size';";
-        $aRows = self::QueryToArray($sSql);
-        if (count($aRows) > 0)
-        {
-            $result = $aRows[0]['Value'];
-        }
-        return intval($result);
-    }
-
-    /**
+	/**
 	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-database.html
 	 * @return string query to upgrade database charset and collation if needed, null if not
 	 * @throws \MySQLException

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.1.1-dev');
+define('ITOP_VERSION', '3.2.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -889,6 +889,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+        'forgot_password.url' => [
+			'type'                => 'string',
+			'description'         => 'Set this value to your "forgot password" service URL if it should be handled out of '.ITOP_APPLICATION_SHORT.'. Note that it will apply to all users (iTop users, LDAP users, ...)',
+			'default'             => '',
+			'value'               => '',
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 		'deadline_format' => [
 			'type' => 'string',
 			'description' => 'The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$',
@@ -1595,6 +1603,22 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'notifications.itop.read_notification_retention' => [
+			'type' => 'integer',
+			'description' => 'Duration in days after which iTop read notifications will be deleted',
+			'default' => 182,
+			'value' => 182,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
+		'notifications.itop.newsroom_cache_time' => [
+			'type' => 'integer',
+			'description' => 'Duration in min between each fetch for notifications in newsroom',
+			'default' => 5,
+			'value' => 5,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'regenerate_session_id_enabled' => [
 			'type' => 'bool',
 			'description' => 'If true then session id will be regenerated on each login, to prevent session fixation.',
@@ -1715,6 +1739,14 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
+		'application.secret' => [
+			'type'                => 'string',
+			'description'         => 'Application secret, uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).',
+			'default'             => '',
+			'value'               => '',
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 	];
 
 	public function IsProperty($sPropCode)
@@ -1894,6 +1926,15 @@ class Config
 	 */
 	protected $m_iPasswordHashAlgo;
 
+	/**
+	 * Symfony uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).
+	 *
+	 * @see https://symfony.com/doc/current/reference/configuration/framework.html#secret
+	 * @since 3.2.0 - N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4
+	 * @var string
+	 */
+	protected $m_sAppSecret;
+
 	/**
 	 * Config constructor.
 	 *
@@ -1938,6 +1979,7 @@ class Config
 		$this->m_aCharsets = array();
 		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;
 		$this->m_iPasswordHashAlgo = DEFAULT_HASH_ALGO;
+		$this->m_sAppSecret = bin2hex(random_bytes(16));
 
 		//define default encryption params according to php install
 		$aEncryptParams = SimpleCrypt::GetNewDefaultParams();
@@ -2098,6 +2140,7 @@ class Config
 		$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
 		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
 		$this->m_iPasswordHashAlgo = isset($MySettings['password_hash_algo']) ? $MySettings['password_hash_algo'] : $this->m_iPasswordHashAlgo;
+		$this->m_sAppSecret = isset($MySettings['application.secret']) ? trim($MySettings['application.secret']) : $this->m_sAppSecret;
 	}
 
 	protected function Verify()
@@ -2233,6 +2276,11 @@ class Config
 		return $this->m_sEncryptionKey;
 	}
 
+	public function GetAppSecret()
+	{
+		return $this->m_sAppSecret;
+	}
+
 	public function GetEncryptionLibrary()
 	{
 		return $this->m_sEncryptionLibrary;
@@ -2349,6 +2397,12 @@ class Config
 		$this->m_sEncryptionKey = $sKey;
 	}
 
+	public function SetAppSecret($sKey)
+	{
+		$this->m_sAppSecret = $sKey;
+	}
+
+
 	public function SetCSVImportCharsets($aCharsets)
 	{
 		$this->m_aCharsets = $aCharsets;
@@ -2400,6 +2454,7 @@ class Config
 		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
 		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
 		$aSettings['password_hash_algo'] = $this->m_iPasswordHashAlgo;
+		$aSettings['application.secret'] = $this->m_sAppSecret;
 
 		foreach ($this->m_aModuleSettings as $sModule => $aProperties)
 		{
@@ -2512,7 +2567,8 @@ class Config
 				'encryption_key' => $this->m_sEncryptionKey,
 				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,
-				'password_hash_algo' => $this->m_iPasswordHashAlgo
+				'password_hash_algo' => $this->m_iPasswordHashAlgo,
+				'application.secret' => $this->m_sAppSecret,
 			);
 			foreach ($aOtherValues as $sKey => $value)
 			{

core/csvbulkexport.class.inc.php

@@ -8,11 +8,13 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
-use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
 use Combodo\iTop\Application\Helper\ExportHelper;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: CSV export
@@ -101,7 +103,7 @@ class CSVBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/datamodel.core.xml

@@ -1,5 +1,268 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+  <classes>
+    <class id="ActioniTopNotification"  _delta="define">
+      <php_parent>
+        <name>ActionNotification</name>
+      </php_parent>
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>grant_by_profile,core/cmdb,application</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_action_itop_notif</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </naming>
+      </properties>
+      <fields>
+        <field id="title" xsi:type="AttributeString">
+          <sql>title</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="message" xsi:type="AttributeText">
+          <sql>message</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="icon" xsi:type="AttributeImage">
+          <sql>icon</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_max_width>96</display_max_width>
+          <display_max_height>96</display_max_height>
+          <storage_max_width>256</storage_max_width>
+          <storage_max_height>256</storage_max_height>
+          <default_image>null</default_image>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <sql>priority</sql>
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="recipients" xsi:type="AttributeOQL">
+          <sql>recipients</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="url" xsi:type="AttributeString">
+          <sql>url</sql>
+          <default_value>$this->url()$</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="col:col1">
+              <items>
+                <item id="fieldset:ActioniTopNotification:content">
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="status">
+                      <rank>20</rank>
+                    </item>
+                    <item id="language">
+                      <rank>30</rank>
+                    </item>
+                    <item id="title">
+                      <rank>40</rank>
+                    </item>
+                    <item id="message">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <items>
+                <item id="fieldset:ActioniTopNotification:settings">
+                  <items>
+                    <item id="priority">
+                      <rank>10</rank>
+                    </item>
+                    <item id="icon">
+                      <rank>20</rank>
+                    </item>
+                    <item id="recipients">
+                      <rank>30</rank>
+                    </item>
+                    <item id="url">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <list>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="language">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods>
+        <method id="DoExecute">
+          <comment>	/**
+            *
+            *  Create EventiTopNotification for each recipient
+            * @param $oTrigger
+            * @param $aContextArgs
+            *
+            * @return void
+            * @throws \ArchivedObjectException
+            * @throws \CoreCannotSaveObjectException
+            * @throws \CoreException
+            * @throws \CoreUnexpectedValue
+            * @throws \CoreWarning
+            * @throws \MySQLException
+            * @throws \OQLException
+            */</comment>
+          <static>false</static>
+          <access>public</access>
+          <code><![CDATA[
+              public function DoExecute($oTrigger, $aContextArgs)
+	{
+		$oRecipientsSearch = DBObjectSearch::FromOQL($this->Get('recipients'));
+		$oRecipientsSearch->AllowAllData();
+		$oRecipientsSet = new DBObjectSet($oRecipientsSearch);
+		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
+		while ($oRecipient = $oRecipientsSet->Fetch()) {
+			$oEvent = new EventiTopNotification();
+			$oEvent->Set('title', MetaModel::ApplyParams($this->Get('title'), $aContextArgs));
+			$oEvent->Set('message', MetaModel::ApplyParams($this->Get('message'), $aContextArgs));
+			$oIcon = !$this->Get('icon')->IsEmpty() ? $this->Get('icon') : MetaModel::GetAttributeDef('EventiTopNotification', 'icon')->MakeRealValue(Combodo\iTop\Application\Branding::GetCompactMainLogoAbsoluteUrl(), $oEvent);
+			$oEvent->Set('icon', $oIcon);
+			$oEvent->Set('priority', $this->Get('priority'));
+			$oEvent->Set('contact_id', $oRecipient->GetKey());
+			$oEvent->Set('trigger_id', $oTrigger->GetKey());
+			$oEvent->Set('action_id', $this->GetKey());
+			$iObjectId = array_key_exists('this->object()', $aContextArgs) ? $aContextArgs['this->object()']->GetKey() : 0;
+			$oEvent->Set('object_id', $iObjectId);
+			$oEvent->Set('url', MetaModel::ApplyParams($this->Get('url'), $aContextArgs));
+			$oEvent->DBInsertNoReload();
+		}
+		$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
+	}
+]]></code>
+        </method>
+      </methods>
+    </class>
+    <class id="EventiTopNotification"  _delta="define">
+      <php_parent>
+        <name>EventNotification</name>
+      </php_parent>
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>core/cmdb,view_in_gui</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_event_itop_notif</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </naming>
+      </properties>
+      <fields>
+        <field id="title" xsi:type="AttributeString">
+          <sql>title</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="icon" xsi:type="AttributeImage">
+          <sql>icon</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <default_image>null</default_image>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <sql>priority</sql>
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="url" xsi:type="AttributeURL">
+          <sql>url</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+          <target>_blank</target>
+        </field>
+        <field id="read" xsi:type="AttributeEnum">
+          <sql>read</sql>
+          <values>
+            <value id="yes">
+              <code>yes</code>
+            </value>
+            <value id="no">
+              <code>no</code>
+            </value>
+          </values>
+          <default_value>no</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="read_date" xsi:type="AttributeDateTime">
+          <sql>read_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalKey">
+          <sql>contact_id</sql>
+          <target_class>Contact</target_class>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+      </fields>
+      <presentation/>
+      <methods/>
+    </class>
+  </classes>
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -282,8 +545,50 @@
           <field id="obj_attcode" xsi:type="AttributeString"/>
         </fields>
       </class>
+      <class id="DefaultWorkingTimeComputer" _delta="define">
+        <interfaces>
+          <interface id="iWorkingTimeComputer"/>
+        </interfaces>
+      </class>
+      <class id="ActionNotification" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>Action</parent>
+        <properties>
+          <category>grant_by_profile,core/cmdb</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeString"/>
+          <field id="status" xsi:type="AttributeEnum"/>
+          <field id="trigger_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="language" xsi:type="AttributeApplicationLanguage"/>
+        </fields>
+      </class>
+      <class id="EventNotification" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>Event</parent>
+        <properties>
+          <category>core/cmdb,view_in_gui</category>
+        </properties>
+        <fields>
+          <field id="message" xsi:type="AttributeText"/>
+          <field id="date" xsi:type="AttributeDateTime"/>
+          <field id="userinfo" xsi:type="AttributeString"/>
+          <field id="trigger_id" xsi:type="AttributeExternalKey">
+            <target_class>Trigger</target_class>
+          </field>
+          <field id="action_id" xsi:type="AttributeExternalKey">
+            <target_class>Action</target_class>
+          </field>
+          <field id="object_id" xsi:type="AttributeInteger"/>
+          <field id="trigger_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="trigger_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+          <field id="action_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="action_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
     </classes>
-    <attribute_properties_definition  _delta="define">
+    <attribute_properties_definition _delta="define">
       <properties>
         <property id="sql">
           <php_param>sql</php_param>

core/dbobject.class.php

@@ -4,12 +4,14 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventException;
 use Combodo\iTop\Service\Events\EventService;
 use Combodo\iTop\Service\Events\EventServiceLog;
 use Combodo\iTop\Service\Module\ModuleService;
+use Combodo\iTop\Service\SummaryCard\SummaryCardService;
 use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
 
 /**
@@ -208,7 +210,6 @@ abstract class DBObject implements iDisplay
 	const MAX_UPDATE_LOOP_COUNT = 10;
 
 	private $aEventListeners = [];
-	private array $aAllowedTransitions = [];
 
 	/**
 	 * DBObject constructor.
@@ -607,10 +608,11 @@ abstract class DBObject implements iDisplay
      * Attributes setter
      *
      * Set $sAttCode to $value.
-     * The value must be valid according to the type of attribute : see the different {@see AttributeDefinition::MakeRealValue()} implementations
+     * The value must be valid according to the type of attribute.
      * The value will not be recorded into the DB until DBObject::DBWrite() is called.
      *
      * @api
+     * @see DBWrite()
      *
      * @param string $sAttCode
      * @param mixed $value
@@ -618,8 +620,6 @@ abstract class DBObject implements iDisplay
      * @return bool
      * @throws CoreException
      * @throws CoreUnexpectedValue
-     *
-     * @see DBWrite()
      */
 	public function Set($sAttCode, $value)
 	{
@@ -766,42 +766,6 @@ abstract class DBObject implements iDisplay
 		$this->Set($sAttCode, $sValue);
 	}
 
-	/**
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 * @throws \ReflectionException
-	 */
-	protected function PreDeleteActions(): void
-	{
-		$this->SetReadOnly('No modification allowed before delete');
-		$this->FireEventAboutToDelete();
-		$oKPI = new ExecutionKPI();
-		$this->OnDelete();
-		$oKPI->ComputeStatsForExtension($this, 'OnDelete');
-
-		// Activate any existing trigger
-		$sClass = get_class($this);
-		$aParams = array('class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectDelete AS t WHERE t.target_class IN (:class_list)'), array(),
-			$aParams);
-		while ($oTrigger = $oSet->Fetch()) {
-			/** @var \TriggerOnObjectDelete $oTrigger */
-			try {
-				$oKPI = new ExecutionKPI();
-				$oTrigger->DoActivate($this->ToArgs('this'));
-			}
-			catch (Exception $e) {
-				$oTrigger->LogException($e, $this);
-				utils::EnrichRaisedException($oTrigger, $e);
-			}
-			finally {
-				$oKPI->ComputeStatsForExtension($this, 'TriggerOnObjectDelete');
-			}
-		}
-	}
-
 	/**
 	 * @return void
 	 * @throws \ReflectionException
@@ -2353,17 +2317,16 @@ abstract class DBObject implements iDisplay
 	}
 
 	/**
-     * @param array $aUniquenessRuleProperties uniqueness rule properties
-	 *
-     * @param string $sUniquenessRuleId uniqueness rule ID
-	 * @return \DBSearch
-	 * @throws \OQLException
-     * @throws \CoreException
-     *
      * @internal
      *
-     * @since 2.6.0 N°659 uniqueness constraint
-     * @since 2.7.11 3.1.2 3.2.0 N°4314 Fix Uniqueness rules not working with Silo
+	 * @param string $sUniquenessRuleId uniqueness rule ID
+	 * @param array $aUniquenessRuleProperties uniqueness rule properties
+	 *
+	 * @return \DBSearch
+	 * @throws \CoreException
+	 * @throws \OQLException
+	 * @since 2.6.0 N°659 uniqueness constraint
+	 * @api
 	 */
 	protected function GetSearchForUniquenessRule($sUniquenessRuleId, $aUniquenessRuleProperties)
 	{
@@ -2392,10 +2355,8 @@ abstract class DBObject implements iDisplay
 			$oUniquenessQuery->AddConditionForInOperatorUsingParam('finalclass', $aChildClassesWithRuleDisabled, false);
 		}
 
-        $oUniquenessQuery->AllowAllData();
-
-        return $oUniquenessQuery;
-    }
+		return $oUniquenessQuery;
+	}
 
 	/**
 	 * @param string $sAttCode
@@ -3368,9 +3329,6 @@ abstract class DBObject implements iDisplay
 	 */
 	public function DBInsertNoReload()
 	{
-		// Prevent DBUpdate at this point (reentrancy protection with temp id)
-		MetaModel::StartReentranceProtection($this);
-
 		$sClass = get_class($this);
 
 		$this->AddCurrentObjectInCrudStack('INSERT');
@@ -3417,8 +3375,6 @@ abstract class DBObject implements iDisplay
 			}
 
 			$this->ComputeStopWatchesDeadline(true);
-			// With temp id
-			MetaModel::StopReentranceProtection($this);
 
 			$iTransactionRetry = 1;
 			$bIsTransactionEnabled = MetaModel::GetConfig()->Get('db_core_transactions_enabled');
@@ -3611,12 +3567,6 @@ abstract class DBObject implements iDisplay
 	 */
 	public function DBUpdate()
 	{
-		if (!MetaModel::StartReentranceProtection($this)) {
-			$this->LogCRUDExit(__METHOD__, 'Rejected (reentrance)');
-
-			return false;
-		}
-
 		$this->LogCRUDEnter(__METHOD__);
 		if (!$this->m_bIsInDB)
 		{
@@ -3626,6 +3576,12 @@ abstract class DBObject implements iDisplay
 
 		$this->AddCurrentObjectInCrudStack('UPDATE');
 
+		if (!MetaModel::StartReentranceProtection($this)) {
+			$this->RemoveCurrentObjectInCrudStack();
+			$this->LogCRUDExit(__METHOD__, 'Rejected (reentrance)');
+
+			return false;
+		}
 		try {
 			// Protect against infinite loop
 			$this->iUpdateLoopCount++;
@@ -4126,17 +4082,16 @@ abstract class DBObject implements iDisplay
 		CMDBSource::DeleteFrom($sDeleteSQL);
 	}
 
-	/**
-	 * @internal
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 * @throws \OQLException
-	 * @throws \Random\RandomException
-	 * @throws \ReflectionException
-	 */
+    /**
+     * @internal
+     *
+     * @throws ArchivedObjectException
+     * @throws CoreException
+     * @throws CoreUnexpectedValue
+     * @throws MySQLException
+     * @throws MySQLHasGoneAwayException
+     * @throws OQLException
+     */
 	protected function DBDeleteSingleObject()
 	{
 		$this->LogCRUDEnter(__METHOD__);
@@ -4147,7 +4102,29 @@ abstract class DBObject implements iDisplay
 			return;
 		}
 
-		$this->PreDeleteActions();
+		$this->SetReadOnly("No modification allowed before delete");
+		$this->FireEventAboutToDelete();
+		$oKPI = new ExecutionKPI();
+		$this->OnDelete();
+		$oKPI->ComputeStatsForExtension($this, 'OnDelete');
+
+		// Activate any existing trigger
+		$sClass = get_class($this);
+		$aParams = array('class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObjectDelete AS t WHERE t.target_class IN (:class_list)"), array(),
+			$aParams);
+		while ($oTrigger = $oSet->Fetch())
+		{
+			/** @var \TriggerOnObjectDelete $oTrigger */
+			try
+			{
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+			catch(Exception $e) {
+				$oTrigger->LogException($e, $this);
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
+		}
 
 		$this->RecordObjDeletion($this->m_iKey); // May cause a reload for storing history information
 
@@ -4424,32 +4401,9 @@ abstract class DBObject implements iDisplay
 				]);
 		}
 
-		$this->aAllowedTransitions = $aSortedTransitions;
-		$this->FireEvent(EVENT_ENUM_TRANSITIONS, ['allowed_stimuli' => array_keys($aSortedTransitions)]);
-		$aSortedTransitions = $this->aAllowedTransitions;
-		$this->aAllowedTransitions = [];
-
 		return $aSortedTransitions;
 	}
 
-	/**
-	 * Remove a transition for a specific stimulus.
-	 * This is only usable by EVENT_ENUM_TRANSITIONS listeners in order
-	 * to manage the allowed transitions in the current object state.
-	 *
-	 * @param string $sStimulus
-	 *
-	 * @return void
-	 * @api
-	 * @since 3.1.2
-	 */
-	public function DenyTransition(string $sStimulus): void
-	{
-		if (isset($this->aAllowedTransitions[$sStimulus])) {
-			unset($this->aAllowedTransitions[$sStimulus]);
-		}
-	}
-
     /**
      * Helper to reset a stop-watch
      * Suitable for use as a lifecycle action
@@ -4535,6 +4489,14 @@ abstract class DBObject implements iDisplay
 		$sNewState = $aTransitionDef['target_state'];
 		$this->Set($sStateAttCode, $sNewState);
 
+		$aEventData = [
+			'stimulus' => $sStimulusCode,
+			'previous_state' => $sPreviousState,
+			'new_state' => $sNewState,
+			'save_object' => !$bDoNotWrite,
+		];
+		$this->FireEvent(EVENT_DB_BEFORE_APPLY_STIMULUS, $aEventData);
+
 		// $aTransitionDef is an
 		//    array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD
 
@@ -4619,6 +4581,8 @@ abstract class DBObject implements iDisplay
 			if (!$bDoNotWrite) {
 				$this->DBWrite();
 			}
+
+			$this->FireEvent(EVENT_DB_AFTER_APPLY_STIMULUS, $aEventData);
 		}
 		else
 		{
@@ -4627,6 +4591,8 @@ abstract class DBObject implements iDisplay
 			{
 				$this->m_aCurrValues[$sAttCode] = $aBackupValues[$sAttCode];
 			}
+			$aEventData['action'] = $sActionDesc;
+			$this->FireEvent(EVENT_DB_APPLY_STIMULUS_FAILED, $aEventData);
 		}
 		return $bSuccess;
 	}
@@ -4763,7 +4729,7 @@ abstract class DBObject implements iDisplay
 			}
 		}
 		$oDate->modify($sModifier);
-		$this->Set($sAttCode, $oDate->getTimestamp());
+		$this->Set($sAttCode, $oDate->format('Y-m-d H:i:s'));
 	}
 
 	/**

core/dbsearch.class.php

@@ -851,11 +851,11 @@ abstract class DBSearch
 			return;
 		}
 
-        if (count($aColumns) == 0)
-        {
-            $aColumns = array_keys(MetaModel::ListAttributeDefs($this->GetClass()));
-            // Add the standard id (as first column)
-            array_unshift($aColumns, 'id');
+		if (count($aColumns) == 0)
+		{
+			$aColumns = array_keys(MetaModel::ListAttributeDefs($this->GetClass()));
+			// Add the standard id (as first column)
+			array_unshift($aColumns, 'id');
 		}
 
 		$aQueryCols = CMDBSource::GetColumns($resQuery, $sSQL);
@@ -885,55 +885,6 @@ abstract class DBSearch
 		return $aRes;
 	}
 
-    /**
-     * Selects a column ($sAttCode) from the specified class ($sClassAlias - default main class) of the DBsearch object and gives the result as an array
-     * @param string $sAttCode
-     * @param string|null $sClassAlias
-     *
-     * @return array
-     * @throws ConfigException
-     * @throws CoreException
-     * @throws MissingQueryArgument
-     * @throws MySQLException
-     * @throws MySQLHasGoneAwayException
-     */
-    public function SelectAttributeToArray(string $sAttCode, ?string $sClassAlias = null):array
-    {
-       if(is_null($sClassAlias)) {
-           $sClassAlias = $this->GetClassAlias();
-       }
-
-       $sClass = $this->GetClass();
-       if($sAttCode === 'id'){
-           $aAttToLoad[$sClassAlias]=[];
-       } else {
-           $aAttToLoad[$sClassAlias][$sAttCode] = MetaModel::GetAttributeDef($sClass, $sAttCode);
-       }
-
-        $sSQL = $this->MakeSelectQuery([], [], $aAttToLoad);
-        $resQuery = CMDBSource::Query($sSQL);
-        if (!$resQuery)
-        {
-            return [];
-        }
-
-        $sColName = $sClassAlias.$sAttCode;
-
-        $aRes = [];
-        while ($aRow = CMDBSource::FetchArray($resQuery))
-        {
-            $aMappedRow = array();
-            if($sAttCode === 'id') {
-                $aMappedRow[$sAttCode] = $aRow[$sColName];
-            } else {
-                $aMappedRow[$sAttCode] = $aAttToLoad[$sClassAlias][$sAttCode]->FromSQLToValue($aRow, $sColName);
-            }
-            $aRes[] = $aMappedRow;
-        }
-        CMDBSource::FreeResult($resQuery);
-        return $aRes;
-    }
-
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Construction of the SQL queries

core/designdocument.class.inc.php

@@ -28,13 +28,8 @@ namespace Combodo\iTop;
 
 use DOMDocument;
 use DOMFormatException;
-use DOMNode;
-use DOMNodeList;
-use DOMXPath;
-use Exception;
 use IssueLog;
 use LogAPI;
-use MFElement;
 use utils;
 
 /**
@@ -46,11 +41,6 @@ use utils;
  */
 class DesignDocument extends DOMDocument
 {
-
-	/** To fix DOMNode::getLineNo() ref https://www.php.net/manual/en/domnode.getlineno.php */
-	public const XML_PARSE_BIG_LINES = 4194304;
-
-
 	/**
 	 * @throws \Exception
 	 */
@@ -79,12 +69,10 @@ class DesignDocument extends DOMDocument
 	 */
 	public function load($filename, $options = null)
 	{
-		if (is_file($filename)) {
-			libxml_clear_errors();
-			if (parent::load($filename, LIBXML_NOBLANKS | LIBXML_BIGLINES | LIBXML_PARSEHUGE | self::XML_PARSE_BIG_LINES) === false) {
-				$aErrors = libxml_get_errors();
-				IssueLog::Error("Error loading $filename", LogAPI::CHANNEL_DEFAULT, $aErrors);
-			}
+		libxml_clear_errors();
+		if (parent::load($filename, LIBXML_NOBLANKS) === false) {
+			$aErrors = libxml_get_errors();
+			IssueLog::Error("Error loading $filename", LogAPI::CHANNEL_DEFAULT, $aErrors);
 		}
 	}
 
@@ -239,56 +227,6 @@ class DesignElement extends \DOMElement
 
 		return '';
 	}
-
-	/**
-	 * Compatibility with PHP8.0
-	 *
-	 * @return \DOMElement|null
-	 *
-	 * @since 3.1.2
-	 */
-	public function GetFirstElementChild()
-	{
-		if (property_exists($this, 'firstElementChild')) {
-			return $this->firstElementChild;
-		}
-
-		$oChildNode = $this->firstChild;
-		while (!is_null($oChildNode)) {
-			if ($oChildNode instanceof \DOMElement) {
-				return $oChildNode;
-			}
-			$oChildNode = $oChildNode->nextSibling;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Compatibility with PHP8.0
-	 *
-	 * @return \DOMElement|null
-	 *
-	 * @since 3.1.2
-	 */
-	public function GetNextElementSibling()
-	{
-		if (property_exists($this, 'nextElementSibling')) {
-			return $this->nextElementSibling;
-		}
-
-		$oSibling = $this->nextSibling;
-		while (!is_null($oSibling)) {
-			if ($oSibling instanceof \DOMElement) {
-				return $oSibling;
-			}
-			$oSibling = $oSibling->nextSibling;
-		}
-
-		return null;
-
-	}
-
 	/**
 	 * Returns the node directly under the given node
 	 * @param $sTagName
@@ -369,146 +307,4 @@ class DesignElement extends \DOMElement
 		}
 		return $sRet;
 	}
-
-	/**
-	 * Check that the current node is actually a class node, under classes
-	 * @since 3.1.2 3.2.0 N°6974
-	 */
-	public function IsClassNode(): bool
-	{
-		if ($this->tagName == 'class') {
-			// Beware: classes/class also exists in the group definition
-			if (($this->parentNode->tagName == 'classes') && ($this->parentNode->parentNode->tagName == 'itop_design')) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * True if the node is contained in a _delta="merge" tree
-	 * @return bool
-	 */
-	public function IsInSpecifiedMerge(): bool
-	{
-		// Iterate through the parents: reset the flag if any of them has a flag set
-		for ($oParent = $this; $oParent instanceof MFElement; $oParent = $oParent->parentNode) {
-			$sDeltaSpec = $oParent->getAttribute('_delta');
-			if ($sDeltaSpec === 'merge') {
-				return true;
-			}
-			if (in_array($sDeltaSpec, ['define', 'define_if_not_exists', 'force', 'redefine'])) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Find the child node matching the given node.
-	 * UNSAFE: may return nodes marked as _alteration="removed"
-	 * A method with the same signature MUST exist in MFDocument for the recursion to work fine
-	 *
-	 * @param DesignElement $oRefNode The node to search for
-	 * @param null|string $sSearchId substitutes to the value of the 'id' attribute
-	 *
-	 * @return DesignElement|null
-	 * @throws \Exception
-	 * @since 3.1.2 3.2.0 N°6974
-	 */
-	public function _FindChildNode(DesignElement $oRefNode, $sSearchId = null): ?DesignElement
-	{
-		return self::_FindNode($this, $oRefNode, $sSearchId);
-	}
-
-
-	/**
-	 * Find the child node matching the given node.
-	 * UNSAFE: may return nodes marked as _alteration="removed"
-	 * A method with the same signature MUST exist in MFDocument for the recursion to work fine
-	 *
-	 * @param DesignElement $oRefNode The node to search for
-	 *
-	 * @return DesignElement|null
-	 * @throws \Exception
-	 * @since 3.1.2 3.2.0 N°6974
-	 */
-	public function _FindChildNodes(DesignElement $oRefNode): ?DesignElement
-	{
-		return self::_FindNodes($this, $oRefNode);
-	}
-
-	/**
-	 * Find the child node matching the given node under the specified parent.
-	 * UNSAFE: may return nodes marked as _alteration="removed"
-	 *
-	 * @param \DOMNode $oParent
-	 * @param DesignElement $oRefNode
-	 * @param string|null $sSearchId
-	 *
-	 * @return DesignElement|null
-	 * @throws Exception
-	 * @since 3.1.2 3.2.0 N°6974
-	 */
-	public static function _FindNode(DOMNode $oParent, DesignElement $oRefNode, string $sSearchId = null): ?DesignElement
-	{
-		$oNodes = self::_FindNodes($oParent, $oRefNode, $sSearchId);
-		if ($oNodes instanceof DOMNodeList) {
-			/** @var DesignElement $oNode */
-			$oNode = $oNodes->item(0);
-
-			return $oNode;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Find the child node matching the given node under the specified parent.
-	 * UNSAFE: may return nodes marked as _alteration="removed"
-	 *
-	 * @param \DOMNode $oParent
-	 * @param DesignElement $oRefNode
-	 * @param string|null $sSearchId
-	 *
-	 * @return \DOMNodeList|false|mixed
-	 * @since 3.1.2 3.2.0 N°6974
-	 */
-	public static function _FindNodes(DOMNode $oParent, DesignElement $oRefNode, string $sSearchId = null)
-	{
-		if ($oParent instanceof DOMDocument)
-		{
-			$oDoc = $oParent->firstChild->ownerDocument;
-			$oRoot = $oParent;
-		}
-		else
-		{
-			$oDoc = $oParent->ownerDocument;
-			$oRoot = $oParent;
-		}
-
-		$oXPath = new DOMXPath($oDoc);
-		if ($oRefNode->hasAttribute('id'))
-		{
-			// Find the elements having the same tag name and id
-			if (!$sSearchId)
-			{
-				$sSearchId = $oRefNode->getAttribute('id');
-			}
-			$sXPath = './'.$oRefNode->tagName."[@id='$sSearchId']";
-
-			$oRes = $oXPath->query($sXPath, $oRoot);
-		}
-		else
-		{
-			// Get the elements having the same tag name
-			$sXPath = './'.$oRefNode->tagName;
-
-			$oRes = $oXPath->query($sXPath, $oRoot);
-		}
-
-		return $oRes;
-	}
 }

core/displayablegraph.class.inc.php

@@ -21,6 +21,9 @@ use Combodo\iTop\Application\UI\Base\Component\MedallionIcon\MedallionIcon;
 use Combodo\iTop\Application\UI\Base\Component\Panel\Panel;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\iTopPDF;
+use Combodo\iTop\Application\WebPage\PDFPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 /**
@@ -1580,7 +1583,7 @@ EOF
 	 * @param string $sContextKey
 	 * @param array $aContextParams
 	 * @param array $aExcludedObjects
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param bool $bLazyLoading
 	 *
@@ -1602,7 +1605,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param bool $bLazyLoading
 	 *

core/email.class.inc.php

@@ -46,6 +46,15 @@ class EMail implements iEMail
 	const ORIGINAL_FORMAT = 1; // Original format, consisting in serializing the whole object, inculding the Swift Mailer's object.
 	// Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
 	const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
+	
+	/** @var int ENUM_SEND_DEFAULT This option can be used when sending an e-mail to respect the default configuration parameter. */
+	const ENUM_SEND_DEFAULT = 0;
+	
+	/** @var int ENUM_SEND_FORCE_SYNCHRONOUS This option can be used when sending an e-mail to ignore the default and force synchronous sending instead. Example of a use case: instant e-mail test. */
+	const ENUM_SEND_FORCE_SYNCHRONOUS = 1;
+	
+	/** @var int ENUM_SEND_FORCE_ASYNCHRONOUS This option can be used when sending an e-mail to ignore the default and force synchronous sending instead. Example of a use case: Bulk mails. */
+	const ENUM_SEND_FORCE_ASYNCHRONOUS = 2;
 
 	public function __construct()
 	{
@@ -145,7 +154,7 @@ class EMail implements iEMail
 	 */
 	public function SetInReplyTo(string $sMessageId)
 	{
-		$this->oMailer->SetInReplyTo($sMessageId);
+		$this->AddToHeader('In-Reply-To', $sMessageId);
 	}
 
 	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)

core/event.class.inc.php

@@ -1,4 +1,7 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\WebPage;
+
 /**
  * Copyright (C) 2013-2023 Combodo SARL
  *

core/excelbulkexport.class.inc.php

@@ -11,6 +11,8 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
 use Combodo\iTop\Application\Helper\ExportHelper;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'application/xlsxwriter.class.php');
 
@@ -69,7 +71,7 @@ class ExcelBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/htmlbulkexport.class.inc.php

@@ -15,6 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: HTML export
@@ -37,7 +39,7 @@ class HTMLBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/log.class.inc.php

@@ -1301,7 +1301,19 @@ class DeprecatedCallsLog extends LogAPI
 		}
 
 		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
-		$sMessage = self::GetMessageFromStack($aStack);
+		$iStackDeprecatedMethodLevel = 1; // level 0 = current method, level 1 = method containing the `NotifyDeprecatedPhpMethod` call
+		$sDeprecatedObject = $aStack[$iStackDeprecatedMethodLevel]['class'];
+		$sDeprecatedMethod = $aStack[$iStackDeprecatedMethodLevel]['function'];
+		$sCallerFile = $aStack[$iStackDeprecatedMethodLevel]['file'];
+		$sCallerLine = $aStack[$iStackDeprecatedMethodLevel]['line'];
+		$sMessage = "Call to {$sDeprecatedObject}::{$sDeprecatedMethod} in {$sCallerFile}#L{$sCallerLine}";
+
+		$iStackCallerMethodLevel = $iStackDeprecatedMethodLevel + 1; // level 2 = caller of the deprecated method
+		if (array_key_exists($iStackCallerMethodLevel, $aStack)) {
+			$sCallerObject = $aStack[$iStackCallerMethodLevel]['class'];
+			$sCallerMethod = $aStack[$iStackCallerMethodLevel]['function'];
+			$sMessage .= " ({$sCallerObject}::{$sCallerMethod})";
+		}
 
 		if (!is_null($sAdditionalMessage)) {
 			$sMessage .= ' : '.$sAdditionalMessage;
@@ -1310,45 +1322,6 @@ class DeprecatedCallsLog extends LogAPI
 		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_METHOD);
 	}
 
-	/**
-	 * @param array $aDebugBacktrace data from {@see debug_backtrace()}
-	 *
-	 * @return string message to print to the log
-	 */
-	private static function GetMessageFromStack(array $aDebugBacktrace): string
-	{
-		// level 0 = current method
-		// level 1 = deprecated method, containing the `NotifyDeprecatedPhpMethod` call
-		$sMessage = 'Call'.self::GetMessageForCurrentStackLevel($aDebugBacktrace[1], " to ");
-
-		// level 2 = caller of the deprecated method
-		if (array_key_exists(2, $aDebugBacktrace)) {
-			$sMessage .= ' (from ';
-			$sMessage .= self::GetMessageForCurrentStackLevel($aDebugBacktrace[2]);
-			$sMessage .= ')';
-		}
-
-		return $sMessage;
-	}
-
-	private static function GetMessageForCurrentStackLevel(array $aCurrentLevelDebugTrace, ?string $sPrefix = ""): string
-	{
-		$sMessage = "";
-		if (array_key_exists('class', $aCurrentLevelDebugTrace)) {
-			$sDeprecatedObject = $aCurrentLevelDebugTrace['class'];
-			$sDeprecatedMethod = $aCurrentLevelDebugTrace['function'] ?? "";
-			$sMessage = "{$sPrefix}{$sDeprecatedObject}::{$sDeprecatedMethod} in ";
-		}
-
-		if (array_key_exists('file', $aCurrentLevelDebugTrace)) {
-			$sCallerFile = $aCurrentLevelDebugTrace['file'];
-			$sCallerLine = $aCurrentLevelDebugTrace['line'] ?? "";
-			$sMessage .= "{$sCallerFile}#L{$sCallerLine}";
-		}
-
-		return $sMessage;
-	}
-
 	/**
 	 * @param string|null $sAdditionalMessage
 	 * @since 3.1.0

core/metamodel.class.php

@@ -6846,15 +6846,24 @@ abstract class MetaModel
 			$sClass = $aRow[$sClassAlias."finalclass"];
 		}
 
+		// if an object is already being updated, then this method will return this object instead of recreating a new one.
+		// At this point the method DBUpdate of a new object with the same class and id won't do anything due to reentrance protection,
+		// so to ensure that the potential modifications are correctly saved, the object currently being updated is returned.
+		// DBUpdate() method then will take care that all the modifications will be saved.
+		if (array_key_exists($sClassAlias.'id', $aRow)) {
+			$iKey = $aRow[$sClassAlias."id"];
+			$oObject = self::GetReentranceObject($sClass, $iKey);
+			if ($oObject !== false) {
+				return $oObject;
+			}
+		}
+
 		return new $sClass($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
 	}
 
 	/**
 	 * Instantiate an object already persisted to the Database.
 	 *
-	 * Note that LinkedSet attributes are not loaded.
-	 * DBObject::Reload() will be called when getting a LinkedSet attribute
-	 *
 	 * @api
 	 * @see MetaModel::GetObjectWithArchive to get object even if it's archived
 	 * @see utils::PushArchiveMode() to enable search on archived objects

core/ormcaselog.class.inc.php

@@ -20,6 +20,7 @@ use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSec
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 define('CASELOG_VISIBLE_ITEMS', 2);
@@ -169,7 +170,7 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (utils::StrLen($this->m_sLog) - 1))
+		if ($iPos < (strlen($this->m_sLog) - 1))
 		{
 			$sTextEntry = substr($this->m_sLog, $iPos);
 
@@ -292,7 +293,7 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (utils::StrLen($this->m_sLog) - 1)) {
+		if ($iPos < (strlen($this->m_sLog) - 1)) {
 			$sTextEntry = substr($this->m_sLog, $iPos);
 			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));
 
@@ -373,7 +374,7 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (utils::StrLen($this->m_sLog) - 1)) {
+		if ($iPos < (strlen($this->m_sLog) - 1)) {
 			$sTextEntry = substr($this->m_sLog, $iPos);
 			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));
 
@@ -467,7 +468,7 @@ class ormCaseLog {
 			$oBlock->AddSubBlock($oCollapsibleBlock);
 		}
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (utils::StrLen($this->m_sLog) - 1)) {
+		if ($iPos < (strlen($this->m_sLog) - 1)) {
 			// In this case the format is always "text"
 			$sTextEntry = substr($this->m_sLog, $iPos);
 			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));

core/ormdocument.class.inc.php

@@ -17,6 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
 
@@ -343,6 +344,6 @@ class ormDocument
 	 */
 	public function GetSignature(): string
 	{
-		return md5($this->GetData() ?? '');
+		return md5($this->GetData());
 	}
 }

core/pdfbulkexport.class.inc.php

@@ -8,10 +8,13 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
-use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\PDFPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: PDF export, based on the HTML export converted to PDF
@@ -49,7 +52,7 @@ class PDFBulkExport extends HTMLBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock
@@ -68,8 +71,6 @@ class PDFBulkExport extends HTMLBulkExport
 
 				//page format
 				$oSelectFormat = SelectUIBlockFactory::MakeForSelectWithLabel("page_size", Dict::S('Core:BulkExport:PDFPageSize'));
-				$oSelectFormat->SetIsLabelBefore(false);
-				//$oSelectFormat->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetFormat->AddSubBlock($oSelectFormat);
 
 				$aPossibleFormat = ['A3', 'A4', 'Letter'];
@@ -79,10 +80,7 @@ class PDFBulkExport extends HTMLBulkExport
 				}
 				$oFieldSetFormat->AddSubBlock(new Html('</br>'));
 
-				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation",
-					Dict::S('Core:BulkExport:PDFPageOrientation'));
-				$oSelectOrientation->SetIsLabelBefore(false);
-				//$oSelectOrientation->AddCSSClass('ibo-input-checkbox');
+				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation", Dict::S('Core:BulkExport:PDFPageOrientation'));
 				$oFieldSetFormat->AddSubBlock($oSelectOrientation);
 
 				$aPossibleOrientation = ['P', 'L'];

core/simplegraph.class.inc.php

@@ -537,7 +537,7 @@ EOF
 		}
 		else
 		{
-            throw new Exception('graphviz not found');
+			throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')');
 		}
 		return $sHtml;
 	}
@@ -592,7 +592,7 @@ EOF
 		}
 		else
 		{
-            throw new Exception('graphviz not found');
+			throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')');
 		}
 		return $sHtml;
 	}

core/spreadsheetbulkexport.class.inc.php

@@ -10,6 +10,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: "spreadsheet" export: a simplified HTML export in which the date/time columns are split in two column: date AND time
@@ -34,7 +36,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tabularbulkexport.class.inc.php

@@ -6,6 +6,7 @@
 
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: Tabular export: abstract base class for all "tabular" exports.
@@ -22,7 +23,7 @@ abstract class TabularBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tagsetfield.class.inc.php

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 
 /**
  * <p>Stores data for {@link AttributeTagSet} fields
@@ -296,7 +298,7 @@ abstract class TagSetFieldData extends cmdbAbstractObject
 	/**
 	 * Display Tag Usage
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 *
 	 * @throws \CoreException

core/userrights.class.inc.php

@@ -1,6 +1,7 @@
 <?php
 
 use Combodo\iTop\Application\Helper\Session;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 define('UR_ALLOWED_NO', 0);
 define('UR_ALLOWED_YES', 1);
@@ -161,7 +162,7 @@ abstract class UserRightsAddOnAPI
 				$oSearchSharers->AllowAllData();
 				$oSearchSharers->AddCondition_ReferencedBy($oShareSearch, 'sharing_org_id');
 				$aSharers = array();
-				foreach($oSearchSharers->SelectAttributeToArray('id') as $aRow)
+				foreach($oSearchSharers->ToDataArray(array('id')) as $aRow)
 				{
 					$aSharers[] = $aRow['id'];
 				}
@@ -186,7 +187,7 @@ abstract class UserRightsAddOnAPI
 				$oOrgField = new FieldExpression('org_id', $sShareClass);
 				$oSearchShares->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
 				$aShared = array();
-				foreach($oSearchShares->SelectAttributeToArray($sShareAttCode) as $aRow)
+				foreach($oSearchShares->ToDataArray(array($sShareAttCode)) as $aRow)
 				{
 					$aShared[] = $aRow[$sShareAttCode];
 				}
@@ -867,6 +868,8 @@ class UserRights
 	 */
 	public static function Login($sLogin, $sAuthentication = 'any')
 	{
+		self::ResetCurrentUserData();
+
 		$oUser = self::FindUser($sLogin, $sAuthentication);
 		if (is_null($oUser))
 		{

core/xmlbulkexport.class.inc.php

@@ -8,6 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: XML export
@@ -30,7 +32,7 @@ class XMLBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

css/backoffice/components/_field.scss

@@ -80,29 +80,16 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
       }
     }
   }
-
-  /*N°6543 - We need the rule to keep text inside the column when width is defined*/
-  &[data-attribute-type="AttributeHtml"],
-  &[data-attribute-type="AttributeText"] {
-    &[data-attribute-flag-read-only="true"] {
-      display: grid;
-
-      > .ibo-field--value {
-        max-width: 100%;
-        overflow: auto;
-      }
-    }
-  }
 }
 
-  /* Large field = Label on top, value below */
-  .ibo-field-large {
-    display: block;
+/* Large field = Label on top, value below */
+.ibo-field-large {
+  display: block;
 
-    .ibo-field--label {
-      position: relative; /* Necessary for fullscreen toggler */
-      display: flex;
-      align-items: center;
+  .ibo-field--label {
+    position: relative; /* Necessary for fullscreen toggler */
+    display: flex;
+    align-items: center;
     max-width: initial;
     width: 100%;
   }

css/backoffice/components/datatable/_datatable.scss

@@ -123,13 +123,6 @@ $ibo-fieldsorter--selected--background-color: $ibo-color-blue-200 !default;
     .ibo-datatable--row-actions-toolbar{
       justify-content: end;
     }
-    /* N°6543 - We need the rule to keep text inside the column when width is defined */
-    > [data-attribute-type="AttributeHtml"],
-    > [data-attribute-type="AttributeText"] {
-          max-width: 100%;
-          overflow: auto;
-    }
-
   }
 }
 

css/form-sdk/form.css

@@ -0,0 +1,75 @@
+/**
+ * Widgets Factory.
+ *
+ * @package FormSDK
+ * @since 3.2.0
+ */
+
+/* debug purpose */
+.form-type-pictograms{
+	display: inline-block;
+	float: right;
+	margin-left: 5px;
+	color: grey;
+	cursor: pointer;
+	padding: 0px 5px;
+	border-radius: 8px;
+	font-size: 0.9rem;
+}
+.form-type-pictograms i{
+	width: 15px;
+}
+.complete .form-type-pictograms .pattern:after{
+	content: '\f00c';
+	font-family: "Font Awesome 6 Free";
+	font-weight: 900;
+	background-color: #20b220;
+	border-radius: 50%;
+	font-size: 7px;
+	color: white;
+	position: relative;
+	top: -10px;
+	padding: 2px;
+}
+
+/* form label */
+.form-label.required:after{
+	content: '*';
+	color: #e63535;
+	margin-left: 3px;
+}
+
+.cke_focus .cke_contents{
+	border: 1px #86b7fe solid;
+	outline: 0;
+	border-radius: 6px;
+	box-shadow: 0 0 0 0.25rem rgba(13,110,253,.25);
+}
+
+.form_interval_horizontal{
+	display: flex;
+}
+.form_interval_horizontal > div{
+	margin-right: 8px;
+}
+
+.form-compound-fieldset{
+	padding: 8px;
+	border-radius: 10px;
+	border: 1px dashed lightgrey;
+}
+
+.form-layout-row{
+	display: flex;
+	flex-direction: row;
+}
+.form-layout-column{
+	margin: 10px;
+}
+.form-layout-column:first-child{
+	margin-left: 0px;
+}
+.form-layout-column:last-child{
+	margin-right: 0px;
+}
+

css/form-sdk/test.css

@@ -0,0 +1,88 @@
+.layout-grow{
+	flex-grow: 1;
+}
+
+.custom-container{
+	position: relative;
+	border-radius: 10px;
+	padding: 40px 20px 0px;
+}
+
+.custom-container:before{
+	content: 'Custom Layout CSS';
+	font-weight: 500;
+	position: absolute;
+	left: 50%;
+	top: -10px;
+	transform: translateX(-50%);
+	/*border: 1px solid #9c21af;*/
+	background-color: white;
+	padding: 5px 15px;
+	border-radius: 10px;
+}
+
+.container-flower{
+	background-color: #f3deff;
+	background-size: 500px;
+	background-repeat: no-repeat;
+	background-position-x: right;
+	background-position-y: bottom;
+	background: linear-gradient( to right bottom, rgb(248 242 251) 50%, rgb(241 187 255) );
+	padding-bottom: 200px;
+}
+.container-flower fieldset{
+	position: relative;
+	z-index: 1;
+}
+.container-flower:after{
+	content: '';
+	width: 300px;
+	height: 200px;
+	background-image: url('../../sources/FormImplementation/Resources/6662396.png');
+	background-size: 300px;
+	position: absolute;
+	bottom: 0px;
+	right: 0px;
+	border-radius: 10px;
+}
+
+.container-flower .col-form-label{
+	color: #8d63b7;
+}
+.container-flower .form-compound-fieldset{
+	border: 1px solid #8d63b7;
+}
+
+.container-color{
+	position: relative;
+	border-radius: 10px;
+	background-color: #faf7ff;
+}
+
+.container-color .form-compound-fieldset{
+	background-color: #ebe4f6;
+	border: none;
+}
+
+.container-color2{
+	position: relative;
+	border-radius: 10px;
+	background-color: #f7f9ff;
+}
+
+.container-color2 .form-compound-fieldset{
+	background-color: #e8edf9;
+	border: none;
+}
+
+.error-label{
+	color: #d32f2f;
+}
+
+.container-color2 .form-compound-fieldset fieldset{
+	border-bottom: 1px dashed #a3adc5;
+}
+
+.container-color2 .form-compound-fieldset fieldset:last-child{
+	border-bottom: none;
+}

css/setup.scss

@@ -58,9 +58,6 @@ $progress-bar-error-bg-color: #F56565 !default;
 .center {
   text-align: center;
 }
-.hidden {
-  display: none;
-}
 
 /* Animations */
 @keyframes progress_bar_color_ongoing {

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

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

@@ -7,6 +7,6 @@
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'CAS:Error:UserNotAllowed' => '用户被禁止登录',
-	'CAS:Login:SignIn' => '使用CAS 登录',
-	'CAS:Login:SignInTooltip' => '点击这里使用CAS 服务器认证',
+	'CAS:Login:SignIn' => '使用CAS登录',
+	'CAS:Login:SignInTooltip' => '点击这里使用CAS服务器认证',
 ));

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

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.1.3',
+	'authent-cas/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -35,5 +35,5 @@
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserExternal' => '外部用户',
-	'Class:UserExternal+' => '用户在 '.ITOP_APPLICATION_SHORT.' 外部验证身份',
+	'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.1.3',
+	'authent-external/3.2.0',
 	array(
 		// 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.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -34,7 +34,7 @@
 // Class: UserLDAP
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:UserLDAP' => 'LDAP 用户',
-	'Class:UserLDAP+' => '用户身份由LDAP 认证',
-	'UserLDAP:server' => 'LDAP specifics~~',
+	'Class:UserLDAP' => 'LDAP用户',
+	'Class:UserLDAP+' => '用户身份由LDAP认证',
+	'UserLDAP:server' => 'LDAP详情',
 ));

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

@@ -9,7 +9,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.1.3',
+	'authent-ldap/3.2.0',
 	array(
 		// 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.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
       <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>

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

@@ -50,7 +50,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'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' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',

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

@@ -35,7 +35,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'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' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',

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

@@ -48,7 +48,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'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' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',

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

@@ -35,7 +35,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'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' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',

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

@@ -47,7 +47,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'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' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',

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

@@ -49,7 +49,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'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' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',

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

@@ -35,11 +35,11 @@
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' 用户',
-	'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+' => '密码过期状态 (需要一个扩展才能生效)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => '允许过期',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => '永不过期',
@@ -50,7 +50,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
 	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8个字符,包含大小写,数字和特殊字符.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8个字符, 包含大小写, 数字和特殊字符.',
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
-	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置"一次性密码"的失效期限',
+	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',
 ));

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

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.1.3',
+	'authent-local/3.2.0',
 	array(
 		// 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.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <branding>
     <themes>
       <theme id="darkmoon" _delta="define">

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

@@ -21,5 +21,5 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'theme:darkmoon' => 'Dark moon~~',
-));
+	'theme:darkmoon' => 'Dark moon',
+));