ci: add CreateContactlessUser method in test framework

.doc/itop-version-history.md

@@ -1,65 +0,0 @@
-# iTop version history
-
-```mermaid
-%%{init: { 'logLevel': 'debug', 'theme': 'base', '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
-    commit id: "2016-07-08" tag: "2.3.1"
-    commit id: "2016-12-22" tag: "2.3.3"
-    commit id: "2017-04-14" tag: "2.3.4"
-    checkout develop
-    commit id: "2017-07-12" tag: "2.4.0-beta" type: REVERSE
-    commit id: "2017-11-16" tag: "2.4.0" type: HIGHLIGHT
-    branch support/2.4 order: 890
-    commit id: "2018-02-14" tag: "2.4.1"
-    checkout develop
-    commit id: "2018-04-25" tag: "2.5.0-beta" type: REVERSE
-    checkout support/2.4
-    commit id: "2018-06-14" tag: "2.4.2"
-    checkout develop
-    commit id: "2018-06-27" tag: "2.5.0" type: HIGHLIGHT
-    branch support/2.5 order: 880
-    checkout develop
-    commit id: "2019-01-09" tag: "2.6.0" type: HIGHLIGHT
-    branch support/2.6 order: 870
-    commit id: "2019-03-28" tag: "2.6.1"
-    checkout develop
-    commit id: "2019-12-18" tag: "2.7.0-beta" type: REVERSE
-    checkout support/2.5
-    commit id: "2020-01-22" tag: "2.5.4"
-    checkout support/2.6
-    commit id: "2020-01-23" tag: "2.6.3"
-    checkout develop
-    commit id: "2020-01-29" tag: "2.7.0-beta2" type: REVERSE
-    commit id: "2020-04-01" tag: "2.7.0-1" type: HIGHLIGHT
-    checkout support/2.6
-    commit id: "2020-04-22" tag: "2.6.4"
-    checkout develop
-    branch support/2.7 order: 860
-    commit id: "2020-06-26" tag: "2.7.1"
-    checkout support/2.7
-    commit id: "2020-12-09" tag: "2.7.3"
-    commit id: "2021-03-31" tag: "2.7.4"
-    checkout develop
-    commit id: "2021-04-06" tag: "3.0.0-beta" type: REVERSE
-    checkout support/2.7
-    commit id: "2021-07-05" tag: "2.7.5"
-    checkout develop
-    commit id: "2021-07-05." tag: "3.0.0-beta2" type: REVERSE
-    checkout support/2.7
-    commit id: "2021-12-17" tag: "2.7.6"
-    checkout develop
-    commit id: "2022-01-04" tag: "3.0.0" type: HIGHLIGHT
-    branch support/3.0 order: 850
-    commit id: "2022-04-08" tag: "3.0.1"
-    checkout support/2.7
-    commit id: "2022-07-11" tag: "2.7.7"
-    checkout support/3.0
-    commit id: "2022-09-12" tag: "3.0.2-1"
-    checkout develop
-    checkout support/2.7
-    commit id: "2022-12-28" tag: "2.7.8"
-```
-
-To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.gitignore

@@ -19,7 +19,7 @@
 
 # composer reserver directory, from sources, populate/update using "composer install"
 vendor/*
-tests/*/vendor/*
+test/vendor/*
 
 # all conf but listing prevention
 /conf/**
@@ -46,7 +46,7 @@ tests/*/vendor/*
 !/log/web.config
 
 # PHPUnit cache file
-/tests/php-unit-tests/.phpunit.result.cache
+/test/.phpunit.result.cache
 
 
 # Jetbrains
@@ -146,10 +146,3 @@ local.properties
 .cache-main
 .scala_dependencies
 .worksheet
-
-# Mac
-.DS_Store
-
-# Windows
-Thumbs.db
-

.make/composer/listOutdated.php

@@ -19,23 +19,16 @@
  *
  */
 
-/**
- * Alias for `composer show -loD`
- * You can also use `composer outdated -D`
- *
- * @link https://getcomposer.org/doc/03-cli.md#show
- */
+$iTopFolder = __DIR__ . "/../../" ;
 
-$iTopFolder = __DIR__."/../../";
-
-require_once("$iTopFolder/approot.inc.php");
+require_once ("$iTopFolder/approot.inc.php");
 $sApproot = APPROOT;
 $aTrace = array();
 
 $aParamsConfig = array(
 	'composer-path' => array(
-		'default' => 'composer',
-	),
+		'default' => 'composer.phar',
+	)
 );
 $aParamsConfigNotFound = array_flip(array_keys($aParamsConfig));
 $aGivenArgs = $argv;

.make/release/update-xml.php

@@ -6,19 +6,11 @@
  * Will update version in the following files :
  *
  * datamodels/2.x/.../datamodel.*.xml
- * application/*.xml
- * core/*.xml
  *
  * Usage :
  * `php .make\release\update-xml.php "1.7"`
- * `php .make\release\update-xml.php`
  *
- * If no parameter provided then the current XML version will be used as target version
- *
- * @since 2.7.0 simple version change using regexp (not doing conversion)
- * @since 3.1.0 N°5405 now does a real conversion
- * @since 3.1.0 N°5633 allow to use without parameter
- * @since 3.1.0 N°5633 add /application and /core XML files
+ * @since 2.7.0
  ******************************************************************************/
 
 
@@ -30,12 +22,10 @@ require_once (__DIR__.DIRECTORY_SEPARATOR.'update.classes.inc.php');
 
 if (count($argv) === 1)
 {
-	echo '/!\ No version passed: assuming target XML version is current XML version ('.ITOP_DESIGN_LATEST_VERSION.")\n";
-	$sVersionLabel = ITOP_DESIGN_LATEST_VERSION;
-} else {
-	$sVersionLabel = $argv[1];
+	echo '/!\ You must pass the new version as parameter';
+	exit(1);
 }
-
+$sVersionLabel = $argv[1];
 if (empty($sVersionLabel))
 {
 	echo 'Version passed as parameter is empty !';

.make/release/update.classes.inc.php

@@ -125,31 +125,16 @@ class iTopVersionFileUpdater extends AbstractSingleFileVersionUpdater
 
 abstract class AbstractGlobFileVersionUpdater extends FileVersionUpdater
 {
-	/** @var array|string glob patterns to seek for files to modify */
-	protected $globPattern;
+	protected $sGlobPattern;
 
-	public function __construct($globPattern)
+	public function __construct($sGlobPattern)
 	{
-		$this->globPattern = $globPattern;
+		$this->sGlobPattern = $sGlobPattern;
 	}
 
 	public function GetFiles()
 	{
-		$aGlobPatterns = (is_array($this->globPattern))
-			? $this->globPattern
-			: [$this->globPattern];
-
-		$aFiles = [];
-		foreach ($aGlobPatterns as $sGlobPattern) {
-			$result = glob($sGlobPattern);
-			if (false === $result) {
-				continue;
-			}
-			/** @noinspection SlowArrayOperationsInLoopInspection */
-			$aFiles = array_merge($aFiles, $result);
-		}
-
-		return $aFiles;
+		return glob($this->sGlobPattern);
 	}
 }
 
@@ -181,11 +166,7 @@ class DatamodelsXmlFiles extends AbstractGlobFileVersionUpdater
 {
 	public function __construct()
 	{
-		parent::__construct([
-			APPROOT.'datamodels/2.x/*/datamodel.*.xml',
-			APPROOT.'application/*.xml',
-			APPROOT.'core/*.xml',
-		]);
+		parent::__construct(APPROOT.'datamodels/2.x/*/datamodel.*.xml');
 	}
 
 	/**
@@ -193,40 +174,10 @@ class DatamodelsXmlFiles extends AbstractGlobFileVersionUpdater
 	 */
 	public function UpdateFileContent($sVersionLabel, $sFileContent, $sFileFullPath)
 	{
-		require_once APPROOT.'setup/itopdesignformat.class.inc.php';
-		$oFileXml = new DOMDocument();
-		/** @noinspection PhpComposerExtensionStubsInspection */
-		libxml_clear_errors();
-		$oFileXml->formatOutput = true;
-		$oFileXml->preserveWhiteSpace = false;
-		$oFileXml->loadXML($sFileContent);
-
-		$oFileItopFormat = new iTopDesignFormat($oFileXml);
-
-		$sDesignVersionToSet = static::GetDesignVersionToSet($oFileItopFormat->GetVersion());
-		if (false === is_null($sDesignVersionToSet)) {
-			// N°5779 if same as target version, we will try to convert from version below
-			$oFileItopFormat->GetITopDesignNode()->setAttribute('version', $sDesignVersionToSet);
-		}
-
-		$bConversionResult = $oFileItopFormat->Convert($sVersionLabel);
-
-		if (false === $bConversionResult) {
-			throw new Exception("Error when converting $sFileFullPath");
-		}
-
-		return $oFileItopFormat->GetXmlAsString();
-	}
-
-	/**
-	 * @return ?string version to use : if file version is same as current version then return previous version, else return null
-	 * @since 3.1.0 N°5779
-	 */
-	protected static function GetDesignVersionToSet($sFileDesignVersion):?string {
-		if ($sFileDesignVersion !== ITOP_DESIGN_LATEST_VERSION) {
-			return null;
-		}
-
-		return iTopDesignFormat::GetPreviousDesignVersion(ITOP_DESIGN_LATEST_VERSION);
+		return preg_replace(
+			'/(<itop_design .* version=")[^"]+(">)/',
+			'${1}'.$sVersionLabel.'${2}',
+			$sFileContent
+		);
 	}
 }

CONTRIBUTING.md

@@ -27,14 +27,11 @@ If you have an idea you're sure would benefit to all of iTop users, you may
 [create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) to submit it, but be warned that there are lots of good 
 reasons to refuse such changes.
 
-### 📄 License and copyright
-iTop is distributed under the AGPL-3.0 license (see the [license.txt] file).
+### 📄 License
+iTop is distributed under the AGPL-3.0 license (see the [license.txt] file),
+your code must comply with this license.
 
-The iTop repository is divided in three parts: iTop (mainly PHP/JS/XML sources and dictionaries), images, and third-party libraries.
-Combodo has the copyright on most of the source files in the iTop part of the repository: please do not modify the existing file copyrights.  
-Anyhow, you are encouraged to signal your contribution by the mean of `@author` annotations.
-
-If you want to use another license or keep the code ownership (copyright), you may [create an extension][wiki new ext].
+If you want to use another license, you may [create an extension][wiki new ext].
 
 [license.txt]: https://github.com/Combodo/iTop/blob/develop/license.txt
 [wiki new ext]: https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Astart#by_writing_your_own_extension
@@ -55,26 +52,26 @@ Here are the branches we use and their meaning :
 
 For example, if no version is currently prepared for shipping we could have:
 
-- `develop` containing future 3.1.0 version
-- `support/3.0`: 3.0.x maintenance version
+- `develop` containing future 3.0.0 version
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.x maintenance version
+- `support/2.5`: 2.5.x maintenance version
 
-In this example, when 3.1.0-beta is shipped that will become:
+In this example, when 3.0.0-beta is shipped that will become:
 
-- `develop`: future 3.2.0 version
-- `release/3.1.0`: 3.1.0-beta
-- `support/3.0`: 3.0.x maintenance version
+- `develop`: future 3.1.0 version
+- `release/3.0.0`: 3.0.0-beta
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.x maintenance version
+- `support/2.5`: 2.5.x maintenance version
 
-And when 3.1.0 final will be out:
+And when 3.0.0 final will be out:
 
-- `develop`: future 3.2.0 version
-- `support/3.1`: 3.1.x maintenance version (will host developments for 3.1.1)
-- `support/3.0`: 3.0.x maintenance version
+- `develop`: future 3.1.0 version
+- `support/3.0`: 3.0.x maintenance version (will host developments for 3.0.1)
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.x maintenance version
+- `support/2.5`: 2.5.x maintenance version
 
 Also note that we have a "micro-version" concept : each of those versions have a very small amount of modifications. They are made from
  `support/*` branches as well. For example 2.6.2-1 and 2.6.2-2 were made from the `support/2.6.2` branch. 
@@ -134,20 +131,21 @@ Our tests are located in the `test/` directory, containing a PHPUnit config file
 
 When your code is working, please:
 
-* Squash as much as possible your commits,
-* Rebase your branch on our repo last commit,
-* Create a pull request. _Detailed procedure to work on fork and create PR is available [in GitHub help pages](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)_.
-* 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 !
+* stash as much as possible your commits,
+* rebase your branch on our repo last commit,
+* create a pull request.
 
+Detailed procedure to work on fork and create PR is available [in GitHub help pages](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
 
-## 🙏 We are thankful
+You might check the ["Allow edits from maintainers" PR checkbox][allow_edits_checkbox] to ease review.
 
-We are thankful for all your contributions to the iTop universe! As a thank you gift, we will send stickers to every iTop (& extensions) contributors!
+[allow_edits_checkbox]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork#enabling-repository-maintainer-permissions-on-existing-pull-requests
 
-We have one sticker per contribution type. You might get multiple stickers with one contribution though :)
+### 🙏 We are thankful
+
+We are thankful for all your contributions to the iTop universe! As a thank you gift, we will send stickers to every iTop (& extensions) contributors! 
+
+Stickers' design might change from one year to another. For the first year we wanted to try a "craft beer label" look, see examples below: 
 
 * Bug hunter: Fix a bug
 * Translator: Add/update translations
@@ -159,6 +157,4 @@ We have one sticker per contribution type. You might get multiple stickers with
 * Beta tester: Test and give feedback on beta releases
 * Extension developer: Develop and publish an extension
 
-Here is the design of each stickers for year 2022:
-
-![iTop stickers 2022](.doc/contributing-guide/2022.contributing-stickers-side-by-side.png)
+![](.doc/contributing-guide/contributing-stickers-side-by-side.png)

Jenkinsfile

@@ -1,14 +1,6 @@
 def infra
 
 node(){
-    properties([
-            buildDiscarder(
-                    logRotator(
-                            daysToKeepStr: "28",
-                            numToKeepStr: "500")
-            )
-    ])
-
   checkout scm
 
   infra = load '/var/lib/jenkins/workspace/itop-test-infra_master/src/Infra.groovy'

README.md

@@ -3,9 +3,9 @@
 </a></p>
 
 
-iTop stands for IT Operations Portal. It is a complete open source and web-based IT service management platform, including a fully customizable CMDB, a helpdesk system, and a document management tool. It is ITIL compliant and easily customizable and extensible thanks to a high number of add-ons and web services to integrate with your IT.
+iTop stands for IT Operations Portal. It is a complete open source and web based IT service management platform including a fully customizable CMDB, a helpdesk system and a document management tool. It is ITIL compliant and easily customizable and extensible thanks to a high number of adds-on and web services to integrate with your IT.
 
-iTop also offers mass import tools to help you become even more efficient.
+iTop also offers mass import tools to help you being even more efficient.
 
 ## Features
 - Fully configurable [Configuration Management (CMDB)][10]
@@ -40,7 +40,6 @@ iTop also offers mass import tools to help you become even more efficient.
  - [Software requirements][4]
  - [Documentation][5] covering both iTop and its official extensions
  - [iTop Hub][6] : discover and install extensions !
- - [iTop versions history][7]
 
 
 [1]: https://sourceforge.net/p/itop/discussion/
@@ -49,7 +48,6 @@ iTop also offers mass import tools to help you become even more efficient.
 [4]: https://www.itophub.io/wiki/page?id=latest:install:upgrading_itop
 [5]: https://www.itophub.io/wiki
 [6]: https://store.itophub.io/en_US/
-[7]: .doc/itop-version-history.md
 
 [10]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#configuration_management_cmdb
 [11]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#ticketing
@@ -65,7 +63,7 @@ iTop also offers mass import tools to help you become even more efficient.
 
 ## About Us
 
-iTop development is sponsored, led, and supported by [Combodo][0].
+iTop development is sponsored, led and supported by [Combodo][0].
 
 [0]: https://www.combodo.com
 
@@ -100,11 +98,8 @@ We would like to give a special thank you 🤗 to the people from the community
 - Lucas, Jonathan
 - Malik, Remie
 - Mindêllo de Andrade, Lucas (a.k.a [@rokam](https://www.github.com/rokam))
-- Mozart de Oliveira, Eduardo (a.k.a [@eduardomozart](https://github.com/eduardomozart))
 - Raenker, Martin
-- Roháč, Richard (a.k.a [@RohacRichard](https://github.com/RohacRichard))
 - Rosenke, Stephan
-- Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Seki, Shoji
 - Shilov, Vladimir
 - Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)

SECURITY.md

@@ -18,7 +18,8 @@ to [itop-security@combodo.com](mailto:itop-security@combodo.com).
 
 
 
-## 🔍 Combodo acknowledgment and investigation
+## 📆 Disclosure Policy
+
 Report sent to us will be acknowledged within the week.
 
 Then, a Combodo developer will be assigned to the reported issue and will:
@@ -33,12 +34,3 @@ Then, a Combodo developer will be assigned to the reported issue and will:
 Security issues always take precedence over bug fixes and feature work.
 
 The assignee will keep you informed of the resolution progress, and may ask you for additional information or guidance.
-
-
-## 📆 Disclosure Policy
-Once the fix is done and acknowledged by every stakeholder, it will be included in the next iTop version.  
-Mind we have at least 2 active branches (LTS and STS, see [iTop Community Releases [iTop Documentation]](https://www.itophub.io/wiki/page?id=latest:release:start)) 
-
-The release communications will include the information of the vulnerability fix.
-
-Corresponding GitHub advisories and CVE will be published 3 months after the iTop version release date so that iTop instances can be updated.  

addons/userrights/userrightsmatrix.class.inc.php

@@ -121,6 +121,7 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
 		// Maybe we should check that no other user with userid == 0 exists
+		CMDBObject::SetTrackInfo('Initialization');
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);

addons/userrights/userrightsprofile.class.inc.php

@@ -124,7 +124,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 				$bGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
 				if ($bGrant === true)
 				{
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.utils::EscapeHtml($oStimulus->GetDescription()).'">'.utils::EscapeHtml($oStimulus->GetLabel()).'</span>';
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
@@ -435,18 +435,20 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	// Installation: create the very first user
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
-		CMDBObject::SetCurrentChangeFromParams('Initialization create administrator');
+		CMDBObject::SetTrackInfo('Initialization');
 
 		$iContactId = 0;
 		// Support drastic data model changes: no organization class (or not writable)!
-		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization')) {
+		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
+		{
 			$oOrg = MetaModel::NewObject('Organization');
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
 			$iOrgId = $oOrg->DBInsertNoReload();
 
 			// Support drastic data model changes: no Person class  (or not writable)!
-			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person')) {
+			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
+			{
 				$oContact = MetaModel::NewObject('Person');
 				$oContact->Set('name', 'My last name');
 				$oContact->Set('first_name', 'My first name');

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

@@ -278,8 +278,8 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			{
 				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
 				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
-				{
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.utils::EscapeHtml($oStimulus->GetDescription()).'">'.utils::EscapeHtml($oStimulus->GetLabel()).'</span>';
+				{ 
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
@@ -508,18 +508,24 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
 		// Create a change to record the history of the User object
-		CMDBObject::SetCurrentChangeFromParams('Initialization : create first user admin profile');
+		/** @var \CMDBChange $oChange */
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$oChange->Set("userinfo", "Initialization");
 
 		$iContactId = 0;
 		// Support drastic data model changes: no organization class (or not writable)!
-		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization')) {
+		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
+		{
 			$oOrg = MetaModel::NewObject('Organization');
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
+			$oOrg::SetCurrentChange($oChange);
 			$iOrgId = $oOrg->DBInsertNoReload();
 
 			// Support drastic data model changes: no Person class  (or not writable)!
-			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person')) {
+			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
+			{
 				$oContact = MetaModel::NewObject('Person');
 				$oContact->Set('name', 'My last name');
 				$oContact->Set('first_name', 'My first name');
@@ -528,6 +534,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 					$oContact->Set('org_id', $iOrgId);
 				}
 				$oContact->Set('email', 'my.email@foo.org');
+				$oContact::SetCurrentChange($oChange);
 				$iContactId = $oContact->DBInsertNoReload();
 			}
 		}
@@ -536,22 +543,24 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
-		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0)) {
+		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0))
+		{
 			$oUser->Set('contactid', $iContactId);
 		}
 		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
 
 		// Add this user to the very specific 'admin' profile
 		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => ADMIN_PROFILE_NAME), true /*all data*/);
-		if (is_object($oAdminProfile)) {
+		if (is_object($oAdminProfile))
+		{
 			$oUserProfile = new URP_UserProfile();
 			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
 			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
 			$oSet = DBObjectSet::FromObject($oUserProfile);
 			$oUser->Set('profile_list', $oSet);
 		}
-		$oUser->DBInsertNoReload();
-
+		$oUser::SetCurrentChange($oChange);
+		$iUserId = $oUser->DBInsertNoReload();
 		return true;
 	}
 

addons/userrights/userrightsprojection.class.inc.php

@@ -110,8 +110,8 @@ class URP_Profiles extends UserRightsBaseClass
 			{
 				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
 				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
-				{
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.utils::EscapeHtml($oStimulus->GetDescription()).'">'.utils::EscapeHtml($oStimulus->GetLabel()).'</span>';
+				{ 
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
@@ -568,11 +568,14 @@ class UserRightsProjection extends UserRightsAddOnAPI
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
 		// Create a change to record the history of the User object
-		CMDBObject::SetCurrentChangeFromParams('Initialization : create first user admin');
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$oChange->Set("userinfo", "Initialization");
 
 		$oOrg = new Organization();
 		$oOrg->Set('name', 'My Company/Department');
 		$oOrg->Set('code', 'SOMECODE');
+		$oOrg::SetCurrentChange($oChange);
 		$iOrgId = $oOrg->DBInsertNoReload();
 
 		$oContact = new Person();
@@ -581,6 +584,7 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		//$oContact->Set('status', 'available');
 		$oContact->Set('org_id', $iOrgId);
 		$oContact->Set('email', 'my.email@foo.org');
+		$oContact::SetCurrentChange($oChange);
 		$iContactId = $oContact->DBInsertNoReload();
 		
 		$oUser = new UserLocal();
@@ -588,6 +592,7 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		$oUser->Set('password', $sAdminPwd);
 		$oUser->Set('contactid', $iContactId);
 		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+		$oUser::SetCurrentChange($oChange);
 		$iUserId = $oUser->DBInsertNoReload();
 		
 		// Add this user to the very specific 'admin' profile
@@ -595,6 +600,7 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		$oUserProfile->Set('userid', $iUserId);
 		$oUserProfile->Set('profileid', ADMIN_PROFILE_ID);
 		$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+		$oUserProfile::SetCurrentChange($oChange);
 		$oUserProfile->DBInsertNoReload();
 		return true;
 	}

application/ajaxwebpage.class.inc.php

@@ -1,24 +1,20 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/AjaxPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-// 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');
+// cannot notify depreciation for now as this is still MASSIVELY used in iTop core !
+//DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/AjaxPage.php, now loadable using autoloader');
 
 /**
  * Class ajax_page
  *
- * @deprecated 3.0.0 will be removed in 3.1.0 - moved to AjaxPage
+ * @deprecated will be removed in 3.1.0 - moved to AjaxPage
  */
 class ajax_page extends AjaxPage
 {
-	function __construct($s_title)
-	{
-		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('ajax_page is deprecated. Please use AjaxPage instead');
-		parent::__construct($s_title);
-	}
+
 }
 

application/application.inc.php

@@ -12,7 +12,6 @@ require_once(APPROOT.'/application/applicationcontext.class.inc.php');
 require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 require_once(APPROOT.'/application/audit.category.class.inc.php');
-require_once(APPROOT.'/application/audit.domain.class.inc.php');
 require_once(APPROOT.'/application/audit.rule.class.inc.php');
 require_once(APPROOT.'/application/query.class.inc.php');
 require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');

application/applicationcontext.class.inc.php

@@ -224,7 +224,7 @@ class ApplicationContext
 	{
 		$sContext = "";
 		foreach ($this->aValues as $sName => $sValue) {
-			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"".utils::EscapeHtml($sValue)."\" />\n";
+			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n";
 		}
 		return $sContext;
 	}
@@ -238,7 +238,7 @@ class ApplicationContext
 	{
 		$aContextInputBlocks = [];
 		foreach ($this->aValues as $sName => $sValue) {
-			$aContextInputBlocks[] = InputUIBlockFactory::MakeForHidden("c[$sName]", utils::EscapeHtml($sValue));
+			$aContextInputBlocks[] = InputUIBlockFactory::MakeForHidden("c[$sName]", htmlentities($sValue, ENT_QUOTES, 'UTF-8'));
 		}
 		return $aContextInputBlocks;
 	}
@@ -376,19 +376,26 @@ class ApplicationContext
    {
    	$oAppContext = new ApplicationContext();
 
-        if (is_null($sUrlMakerClass)) {
-	        $sUrlMakerClass = self::GetUrlMakerClass();
-        }
+      if (is_null($sUrlMakerClass))
+      {
+			$sUrlMakerClass = self::GetUrlMakerClass();
+		}
 		$sUrl = call_user_func(array($sUrlMakerClass, 'MakeObjectUrl'), $sObjClass, $sObjKey);
-	   if (utils::StrLen($sUrl) > 0) {
-		   if ($bWithNavigationContext) {
-			   return $sUrl."&".$oAppContext->GetForLink();
-		   } else {
-			   return $sUrl;
-		   }
-	   } else {
-		   return '';
-	   }
+		if (strlen($sUrl) > 0)
+		{
+			if ($bWithNavigationContext)
+			{
+				return $sUrl."&".$oAppContext->GetForLink();
+			}
+			else
+			{
+				return $sUrl;
+			}
+		}
+		else
+		{
+			return '';
+		}	
 	}
 
 	/**

application/audit.category.class.inc.php

@@ -20,7 +20,7 @@
 /**
  * This class manages the audit "categories". Each category defines a set of objects
  * to check and is linked to a set of rules that determine the valid or invalid objects
- * inside the set
+ * inside the set 
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -48,39 +48,13 @@ class AuditCategory extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeOQL("definition_set", array("allowed_values"=>null, "sql"=>"definition_set", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSet("rules_list", array("linked_class"=>"AuditRule", "ext_key_to_me"=>"category_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(), "edit_mode" => LINKSET_EDITMODE_INPLACE, "tracking_level" => LINKSET_TRACKING_ALL)));
-		MetaModel::Init_AddAttribute(new AttributeInteger("ok_error_tolerance", array("allowed_values"=>null, "sql"=>"ok_error_tolerance", "default_value"=>5, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("warning_error_tolerance", array("allowed_values"=>null, "sql"=>"warning_error_tolerance", "default_value"=>25, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("domains_list", array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "category_id", "ext_key_to_remote" => "domain_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'ok_error_tolerance', 'warning_error_tolerance', 'rules_list', 'domains_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'rules_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
 		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
 	}
-
-	/**
-	 * @param int $iTotal
-	 * @param int $iErrors
-	 *
-	 * @return string A semantic color name (eg. red, green, orange, success, failure, ... {@see css/backoffice/utils/variables/colors/_semantic-palette.scss}) to use for this category depending on its error count and tolerance
-	 * @throws \CoreException
-	 *
-	 * @since 3.1.0
-	 */
-	public function GetReportColor($iTotal, $iErrors)
-	{
-		$sResult = 'red';
-		if ( ($iTotal == 0) || ($iErrors / $iTotal) <= ($this->Get('ok_error_tolerance') / 100) )
-		{
-			$sResult = 'green';
-		}
-		else if ( ($iErrors / $iTotal) <= ($this->Get('warning_error_tolerance') / 100) )
-		{
-			$sResult = 'orange';
-		}
-		return $sResult;
-	}
 }
 ?>

application/audit.domain.class.inc.php

@@ -1,99 +0,0 @@
-<?php
-// Copyright (C) 2010-2021 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
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * This class manages the audit "categories". Each category defines a set of objects
- * to check and is linked to a set of rules that determine the valid or invalid objects
- * inside the set
- *
- * @copyright   Copyright (C) 2010-2021 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * @since 3.1.0
- */
-class AuditDomain extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application, grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_auditdomain",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeImage("icon", array("is_null_allowed"=>true, "depends_on"=>array(), "display_max_width"=>96, "display_max_height"=>96, "storage_max_width"=>256, "storage_max_height"=>256, "default_image"=>null, "always_load_in_tables"=>false)));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("categories_list", array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'icon', 'categories_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
-	}
-
-}
-
-/**
- * @since 3.1.0
- */
-class lnkAuditCategoryToAuditDomain extends cmdbAbstractObject
-{
-	/**
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application, grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array('category_id', 'domain_id'),
-			"db_table" => "priv_link_audit_category_domain",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"is_link" => true,
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("targetclass" => "AuditCategory", "jointype" => '', "allowed_values" => null, "sql" => "category_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values" => null, "extkey_attcode" => 'category_id', "target_attcode" => "name")));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("domain_id", array("targetclass" => "AuditDomain", "jointype" => '', "allowed_values" => null, "sql" => "domain_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("domain_name", array("allowed_values" => null, "extkey_attcode" => 'domain_id', "target_attcode" => "name")));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('category_id', 'domain_id'));
-		MetaModel::Init_SetZListItems('list', array('category_id', 'domain_id'));
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'domain_id'));
-	}
-}
-

application/capturewebpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/CaptureWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CaptureWebPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/CaptureWebPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/CaptureWebPage.php, now loadable using autoloader');

application/clipage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/CLIPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CLIPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/CLIPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/CLIPage.php, now loadable using autoloader');

application/csvpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/CSVPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CSVPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/CSVPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/CSVPage.php, now loadable using autoloader');

application/dashboard.class.inc.php

@@ -1549,29 +1549,6 @@ JS
 		return $this->sDefinitionFile;
 	}
 
-	/**
-	 * @param string $sDashboardFileRelative can also be an absolute path (compatibility with old URL)
-	 *
-	 * @return string full path to the Dashboard file
-	 * @throws \SecurityException if path isn't under approot
-	 * @uses utils::RealPath()
-	 * @since 2.7.8 3.0.3 3.1.0 N°4449 remove FPD
-	 */
-	public static function GetDashboardFileFromRelativePath($sDashboardFileRelative)
-	{
-		if (utils::RealPath($sDashboardFileRelative, APPROOT)) {
-			// compatibility with old URL containing absolute path !
-			return $sDashboardFileRelative;
-		}
-
-		$sDashboardFile = APPROOT.$sDashboardFileRelative;
-		if (false === utils::RealPath($sDashboardFile, APPROOT)) {
-			throw new SecurityException('Invalid dashboard file !');
-		}
-
-		return $sDashboardFile;
-	}
-
 	/**
 	 * @param string $sDefinitionFile
 	 */

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.0">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -55,9 +55,9 @@
   <menus>
     <menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define">
       <rank>10</rank>
-      <style>
-        <decoration_classes>fas fa-home</decoration_classes>
-      </style>
+	    <style>
+		    <decoration_classes>fas fa-home</decoration_classes>
+	    </style>
     </menu>
     <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="define">
       <rank>10</rank>
@@ -151,9 +151,9 @@
     </menu>
     <menu id="ConfigurationTools" xsi:type="MenuGroup" _delta="define_if_not_exists">
       <rank>90</rank>
-      <style>
-        <decoration_classes>fas fa-cog</decoration_classes>
-      </style>
+	    <style>
+		    <decoration_classes>fas fa-cog</decoration_classes>
+	    </style>
     </menu>
     <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
       <rank>20</rank>
@@ -172,356 +172,19 @@
     </menu>
     <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
       <rank>80</rank>
-      <style>
-        <decoration_classes>fas fa-tools</decoration_classes>
-      </style>
+	    <style>
+		    <decoration_classes>fas fa-tools</decoration_classes>
+	    </style>
     </menu>
     <menu id="SystemTools" xsi:type="MenuGroup" _delta="define">
       <rank>100</rank>
       <enable_class>ResourceSystemMenu</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
-      <style>
-        <decoration_classes>fas fa-terminal</decoration_classes>
-      </style>
+	    <style>
+		    <decoration_classes>fas fa-terminal</decoration_classes>
+	    </style>
     </menu>
   </menus>
-  <events>
-    <event id="EVENT_DB_CHECK_TO_WRITE" _delta="define">
-      <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>
-      <replaces>cmdbAbstractObject::DoCheckToWrite</replaces>
-      <event_data>
-        <event_datum id="object">
-          <description>The object to check</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_CREATE_DONE" _delta="define">
-      <description>An object has been created into the database. The modifications can be propagated to other objects.</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::AfterInsert</replaces>
-      <event_data>
-        <event_datum id="object">
-          <description>The object inserted</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_UPDATE_DONE" _delta="define">
-      <description>An object has been updated into the database and reloaded.</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::AfterUpdate</replaces>
-      <event_data>
-        <event_datum id="object">
-          <description>The object updated</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_CHECK_TO_DELETE" _delta="define">
-      <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>
-      <replaces>cmdbAbstractObject::DoCheckToDelete</replaces>
-      <event_data>
-        <event_datum id="object">
-          <description>The object to check</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_DELETE_DONE" _delta="define">
-      <description>An object has been deleted into the database</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::AfterDelete</replaces>
-      <event_data>
-        <event_datum id="object">
-          <description>The object deleted</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <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>
-      <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 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>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_LINKS_CHANGED" _delta="define">
-      <description>At least one link class was changed</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <event_data>
-        <event_datum id="object">
-          <description>The object where the link is or was pointing to</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_OBJECT_RELOAD" _delta="define">
-      <description>An object has been re-loaded from the database</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <event_data>
-        <event_datum id="object">
-          <description>The object re-loaded</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_COMPUTE_VALUES" _delta="define">
-      <description>An object needs to be recomputed after changes</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::ComputeValues</replaces>
-      <event_data>
-        <event_datum id="object">
-          <description>The object inserted</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_ARCHIVE" _delta="define">
-      <description>An object has been archived</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <event_data>
-        <event_datum id="object">
-          <description>The object archived</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_UNARCHIVE" _delta="define">
-      <description>An object has been unarchived</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <event_data>
-        <event_datum id="object">
-          <description>The object unarchived</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_SET_ATTRIBUTES_FLAGS" _delta="define">
-      <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>
-      <event_data>
-        <event_datum id="object">
-          <description>The current object</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="target_state">
-          <description>The target state in which to evaluate the flags</description>
-          <type>array</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_SET_INITIAL_ATTRIBUTES_FLAGS" _delta="define">
-      <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>
-      <event_data>
-        <event_datum id="object">
-          <description>The current object</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DOWNLOAD_DOCUMENT" _delta="define">
-      <description>A document has been downloaded from the GUI</description>
-      <sources>
-        <source id="Document">Document</source>
-      </sources>
-      <event_data>
-        <event_datum id="object">
-          <description>The object containing the document</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="document">
-          <description>The document downloaded</description>
-          <type>ormDocument</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_LOGIN" _delta="define">
-      <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>
-          <type>integer</type>
-        </event_datum>
-        <event_datum id="state">
-          <description>Current login state (LoginWebPage::LOGIN_STATE_CONNECTED...)</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-  </events>
   <meta>
     <classes>
       <class id="cmdbAbstractObject" _delta="define">

application/datatable.class.inc.php

@@ -19,7 +19,7 @@ use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
  *
  * You should have received a copy of the GNU Affero General Public License
  *
- * @deprecated 3.0.0 use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable
+ * @deprecated since 3.0.0 use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable
  */
 
 class DataTable

application/displayblock.class.inc.php

@@ -272,8 +272,6 @@ class DisplayBlock
 			'panel_title',
 			/** string true if panel title should be displayed as html */
 			'panel_title_is_html',
-			/** string Description of the panel content, displayed as a hint on the title */
-			'panel_title_tooltip',
 			/** string class for panel block style */
 			'panel_class',
 			/** string class for panel block style */
@@ -478,7 +476,7 @@ class DisplayBlock
 					$oExceptionAlert = AlertUIBlockFactory::MakeForFailure('Cannot display results', $sExceptionContent);
 					$oHtml->AddSubBlock($oExceptionAlert);
 				}
-				ExceptionLog::LogException($e);
+				IssueLog::Error('Exception during GetDisplay: '.$e->getMessage());
 			}
 		} else {
 			// render it as an Ajax (asynchronous) call
@@ -568,7 +566,7 @@ class DisplayBlock
 			if (($this->m_sStyle != 'links') && ($this->m_sStyle != 'search') && ($this->m_sStyle != 'list_search')) {
 				$oAppContext = new ApplicationContext();
 				$sClass = $this->m_oFilter->GetClass();
-				$aFilterCodes = MetaModel::GetFiltersList($sClass);
+				$aFilterCodes = array_keys(MetaModel::GetClassFilterDefs($sClass));
 				$aCallSpec = array($sClass, 'MapContextParam');
 				if (is_callable($aCallSpec)) {
 					foreach ($oAppContext->GetNames() as $sContextParam) {
@@ -1047,18 +1045,9 @@ JS
 			$aCount = $aCounts[$sStateValue];
 			$sHyperlink = $aCount['link'];
 			$sCountLabel = $aCount['label'];
-
-			$oPill = PillFactory::MakeForState($sClass, $sStateValue);
-			// N°5849 - Unencode label for ExternalKey attribute because friendlyname is already html encoded thanks to DBObject::GetName() in AttributeExternalKey::GetAllowedValues(). (A fix in this function may have too much impact).
-			if ($oAttDef instanceof AttributeExternalKey) {
-				$sPillTooltip = htmlspecialchars_decode($sStateLabel, ENT_QUOTES | ENT_DISALLOWED | ENT_HTML5);
-				$sPillLabel = $sStateLabel;
-			} else {
-				$sPillTooltip = $sStateLabel;
-				$sPillLabel = utils::HtmlEntities($sStateLabel);
-			}
-			$oPill->SetTooltip($sPillTooltip)
-				->AddHtml("<span class=\"ibo-dashlet-header-dynamic--count\">$sCountLabel</span><span class=\"ibo-dashlet-header-dynamic--label ibo-text-truncated-with-ellipsis\">".$sPillLabel."</span>");
+			$oPill = PillFactory::MakeForState($sClass, $sStateValue)
+				->SetTooltip($sStateLabel)
+				->AddHtml("<span class=\"ibo-dashlet-header-dynamic--count\">$sCountLabel</span><span class=\"ibo-dashlet-header-dynamic--label ibo-text-truncated-with-ellipsis\">".utils::HtmlEntities($sStateLabel)."</span>");
 			if ($sHyperlink != '-') {
 				$oPill->SetUrl($sHyperlink);
 			}
@@ -1315,12 +1304,17 @@ JS
 				}
 			}
 			if (count($aAuthorizedClasses) > 0) {
-				if (empty($aExtraParams['currentId'])) {
-					$iListId = utils::GetUniqueId(); // Works only if not in an Ajax page !!
+				if ($this->m_oSet->CountWithLimit(1) > 0) {
+					if (empty($aExtraParams['currentId'])) {
+						$iListId = utils::GetUniqueId(); // Works only if not in an Ajax page !!
+					} else {
+						$iListId = $aExtraParams['currentId'];
+					}
+					$oBlock->AddSubBlock(DataTableUIBlockFactory::MakeForObject($oPage, $iListId, $this->m_oSet, $aExtraParams));
 				} else {
-					$iListId = $aExtraParams['currentId'];
+					// Empty set
+					$oBlock->bEmptySet = true;
 				}
-				$oBlock->AddSubBlock(DataTableUIBlockFactory::MakeForObject($oPage, $iListId, $this->m_oSet, $aExtraParams));
 			} else {
 				// Not authorized
 				$oBlock->bNotAuthorized = true;
@@ -1343,13 +1337,43 @@ JS
 			}
 
 			// The list is made of only 1 class of objects, actions on the list are possible
-			if (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) {
+			if (($this->m_oSet->CountWithLimit(1) > 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES)) {
 				$oBlock->AddSubBlock(cmdbAbstractObject::GetDisplaySetBlock($oPage, $this->m_oSet, $aExtraParams));
 			} else {
 				$oBlock->bEmptySet = true;
 				$oBlock->sClass = $this->m_oFilter->GetClass();
 				$oBlock->sClassLabel = MetaModel::GetName($oBlock->sClass);
+				$bDisplayMenu = isset($aExtraParams['menu']) ? ($aExtraParams['menu'] == true) : true;
+				if ($bDisplayMenu) {
+					if ((UserRights::IsActionAllowed($oBlock->sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES)) {
+						$oBlock->sLinkTarget = '';
+						$oAppContext = new ApplicationContext();
+						$oBlock->sParams = $oAppContext->GetForLink();
+						// 1:n links, populate the target object as a default value when creating a new linked object
+						if (isset($aExtraParams['target_attr'])) {
+							$oBlock->sLinkTarget = ' target="_blank" ';
+							$aExtraParams['default'][$aExtraParams['target_attr']] = $aExtraParams['object_id'];
+						}
+						if (!empty($aExtraParams['default'])) {
+							foreach ($aExtraParams['default'] as $sKey => $sValue) {
+								$oBlock->sDefault .= "&default[$sKey]=$sValue";
+							}
+						}
+						$oBlock->bCreateNew = true;
+					}
+				}
+
+				if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) {
+					$oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
+					if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+						$oPanel->SetIcon($aExtraParams["panel_icon"]);
+					}
+					$oPanel->AddSubBlock($oBlock);
+
+					return $oPanel;
+				}
 			}
+
 		}
 
 		return $oBlock;
@@ -1447,7 +1471,6 @@ JS
 						} else {
 							$iListId = $aExtraParams['currentId'];
 						}
-
 						$oBlock = DataTableUIBlockFactory::MakeForRendering($iListId, $oSet, $aExtraParams);
 						$oHtml->AddHtml("<tr><td>");
 						$oContentBlock->AddSubBlock($oBlock);
@@ -1683,6 +1706,162 @@ JS
 
 }
 
+/**
+ * Helper class to manage 'blocks' of HTML pieces that are parts of a page and contain some list of cmdb objects
+ *
+ * Each block is actually rendered as a <div></div> tag that can be rendered synchronously
+ * or as a piece of Javascript/JQuery/Ajax that will get its content from another page (ajax.render.php).
+ * The list of cmdbObjects to be displayed into the block is defined by a filter
+ * Right now the type of display is either: list, count or details
+ * - list produces a table listing the objects
+ * - count produces a paragraphs with a sentence saying 'cont' objects found
+ * - details display (as  table) the details of each object found (best if only one)
+ *
+ * @deprecated 3.0.0 will be removed in 3.1, see N°3824
+ */
+class HistoryBlock extends DisplayBlock
+{
+	protected $iLimitCount;
+	protected $iLimitStart;
+	
+	public function __construct(DBSearch $oFilter, $sStyle = 'list', $bAsynchronous = false, $aParams = array(), $oSet = null)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		parent::__construct($oFilter, $sStyle, $bAsynchronous, $aParams, $oSet);
+		$this->iLimitStart = 0;
+		$this->iLimitCount = 0;
+	}
+
+	public function SetLimit($iCount, $iStart = 0)
+	{
+		$this->iLimitStart = $iStart;
+		$this->iLimitCount = $iCount;
+	}
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param array $aExtraParams
+	 * @param string $sId
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aExtraParams and add type hinting for PHP 8.0 compatibility
+	 *      (var is unused, and all calls were already made using a default value)
+	 */
+	public function GetRenderContent(WebPage $oPage, array $aExtraParams, string $sId)
+	{
+		$sHtml = '';
+		$bTruncated = false;
+		$oSet = new CMDBObjectSet($this->m_oFilter, array('date' => false));
+		if (!$oPage->IsPrintableVersion()) {
+			if (($this->iLimitStart > 0) || ($this->iLimitCount > 0)) {
+				$oSet->SetLimit($this->iLimitCount, $this->iLimitStart);
+				if (($this->iLimitCount - $this->iLimitStart) < $oSet->Count()) {
+					$bTruncated = true;
+				}
+			}
+		}
+		$sHtml .= "<!-- filter: ".($this->m_oFilter->ToOQL())."-->\n";
+		switch ($this->m_sStyle) {
+			case 'toggle':
+				// First the latest change that the user is allowed to see
+				do {
+					$oLatestChangeOp = $oSet->Fetch();
+				} while (is_object($oLatestChangeOp) && ($oLatestChangeOp->GetDescription() == ''));
+
+				if (is_object($oLatestChangeOp)) {
+					// There is one change in the list... only when the object has been created !
+					$sDate = $oLatestChangeOp->GetAsHTML('date');
+					$oChange = MetaModel::GetObject('CMDBChange', $oLatestChangeOp->Get('change'));
+					$sUserInfo = $oChange->GetAsHTML('userinfo');
+					$sHtml .= $oPage->GetStartCollapsibleSection(Dict::Format('UI:History:LastModified_On_By', $sDate, $sUserInfo));
+					$sHtml .= $this->GetHistoryTable($oPage, $oSet);
+					$sHtml .= $oPage->GetEndCollapsibleSection();
+				}
+				break;
+
+			case 'table':
+			default:
+			if ($bTruncated)
+			{
+				$sFilter = htmlentities($this->m_oFilter->serialize(), ENT_QUOTES, 'UTF-8');
+				$sHtml .= '<div id="history_container"><p>';
+				$sHtml .= Dict::Format('UI:TruncatedResults', $this->iLimitCount, $oSet->Count());
+				$sHtml .= ' ';
+				$sHtml .= '<a href="#" onclick="DisplayHistory(\'#history_container\', \''.$sFilter.'\', 0, 0); return false;">'.Dict::S('UI:DisplayAll').'</a>';
+				$sHtml .= $this->GetHistoryTable($oPage, $oSet);
+				$sHtml .= '</p></div>';
+				$oPage->add_ready_script("$('#{$sId} table.listResults tr:last td').addClass('truncated');");
+			}
+			else
+			{
+				$sHtml .= $this->GetHistoryTable($oPage, $oSet);
+			}
+			$oPage->add_ready_script(InlineImage::FixImagesWidth());
+		
+			$oPage->add_ready_script("$('.case-log-history-entry-toggle').on('click', function () { $(this).closest('.case-log-history-entry').toggleClass('expanded');});");
+			$oPage->add_ready_script(
+<<<EOF
+$('.history_entry').each(function() {
+	var jMe = $(this);
+	var oContent = $(this).find('.history_html_content');
+	if (jMe.height() < oContent.height())
+	{
+			jMe.prepend('<span class="history_truncated_toggler"></span>');
+			jMe.find('.history_truncated_toggler').on('click', function() {
+				jMe.toggleClass('history_entry_truncated');
+			});
+	}
+});
+EOF
+			);
+		}
+		return new Html($sHtml);
+	}
+	
+	protected function GetHistoryTable(WebPage $oPage, DBObjectSet $oSet)
+	{
+		$sHtml = '';
+		// First the latest change that the user is allowed to see
+		$oSet->Rewind(); // Reset the pointer to the beginning of the set
+		$aChanges = array();
+		while($oChangeOp = $oSet->Fetch())
+		{
+			$sChangeDescription = $oChangeOp->GetDescription();
+			if ($sChangeDescription != '')
+			{
+				// The change is visible for the current user
+				$changeId = $oChangeOp->Get('change');
+				$aChanges[$changeId]['date'] = $oChangeOp->Get('date');
+				$aChanges[$changeId]['userinfo'] = $oChangeOp->Get('userinfo');
+				if (!isset($aChanges[$changeId]['log']))
+				{
+					$aChanges[$changeId]['log'] = array();
+				}
+				$aChanges[$changeId]['log'][] = $sChangeDescription;
+			}
+		}
+		$aAttribs = array('date' => array('label' => Dict::S('UI:History:Date'), 'description' => Dict::S('UI:History:Date+')),
+						  'userinfo' => array('label' => Dict::S('UI:History:User'), 'description' => Dict::S('UI:History:User+')),
+						  'log' => array('label' => Dict::S('UI:History:Changes') , 'description' => Dict::S('UI:History:Changes+')),
+						 );
+		$aValues = array();
+		foreach($aChanges as $aChange)
+		{
+			$aValues[] = array('date' => AttributeDateTime::GetFormat()->Format($aChange['date']), 'userinfo' => htmlentities($aChange['userinfo'], ENT_QUOTES, 'UTF-8'), 'log' => "<ul><li>".implode('</li><li>', $aChange['log'])."</li></ul>");
+		}
+		$sHtml .= $oPage->GetTable($aAttribs, $aValues);
+		return $sHtml;
+	}
+}
+
 /**
  * Displays the 'Actions' menu for a given (list of) object(s)
  * The 'style' of the list (see constructor of DisplayBlock) can be either 'list' or 'details'
@@ -1729,14 +1908,9 @@ class MenuBlock extends DisplayBlock
 			$this->m_sStyle = 'list';
 		}
 
-		$sClass = $this->GetFilter()->GetClass();
-		$aSelectedClasses = $this->GetFilter()->GetSelectedClasses();
-		$bIsForLinkset = isset($aExtraParams['target_attr']);
-		$oSet = new CMDBObjectSet($this->GetFilter());
-		$iSetCount = $oSet->Count();
-		/** @var string $sRefreshAction JS snippet to run when clicking on the refresh button of the menu */
+		$sClass = $this->m_oFilter->GetClass();
+		$oSet = new CMDBObjectSet($this->m_oFilter);
 		$sRefreshAction = $aExtraParams['refresh_action'] ?? '';
-		$bIsCreationInModalAllowed = isset($aExtraParams['creation_in_modal_is_allowed']) && $aExtraParams['creation_in_modal_is_allowed'] === true;
 
 		/** @var array $aRegularActions Any action other than a transition */
 		$aRegularActions = [];
@@ -1744,240 +1918,275 @@ class MenuBlock extends DisplayBlock
 		$aTransitionActions = [];
 		/** @var array $aToolkitActions Any "legacy" toolkit menu item, which are now displayed in the same menu as the $aRegularActions, after them */
 		$aToolkitActions = [];
-
-		if (!isset($aExtraParams['selection_mode']) || ($aExtraParams['selection_mode'] == "")) {
+		if ((!isset($aExtraParams['selection_mode']) || $aExtraParams['selection_mode'] == "") && $this->m_sStyle != 'listInObject') {
 			$oAppContext = new ApplicationContext();
 			$sContext = $oAppContext->GetForLink();
-			if (utils::IsNotNullOrEmptyString($sContext)) {
+			if (!empty($sContext)) {
 				$sContext = '&'.$sContext;
 			}
-
 			$oReflectionClass = new ReflectionClass($sClass);
-			$sFilter = $this->GetFilter()->serialize();
+			$sFilter = $this->m_oFilter->serialize();
 			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
 			$sRootUrl = utils::GetAbsoluteUrlAppRoot();
-
 			// Common params that will be applied to actions
-			$aActionParams = $this->GetDefaultParamsForMenuAction();
-
+			$aActionParams = array();
+			if (isset($aExtraParams['menu_actions_target'])) {
+				$aActionParams['target'] = $aExtraParams['menu_actions_target'];
+			}
 			// 1:n links, populate the target object as a default value when creating a new linked object
-			if ($bIsForLinkset) {
+			if (isset($aExtraParams['target_attr'])) {
 				$aExtraParams['default'][$aExtraParams['target_attr']] = $aExtraParams['object_id'];
 			}
-			/** @var string $sDefaultValuesAsUrlParams Default values for the object to create, already formatted as URL params (eg. "&default[org_id]=3&default[title]=Foo") */
-			$sDefaultValuesAsUrlParams = '';
+			$sDefault = '';
 			if (!empty($aExtraParams['default'])) {
 				foreach ($aExtraParams['default'] as $sKey => $sValue) {
-					$sDefaultValuesAsUrlParams .= "&default[$sKey]=$sValue";
+					$sDefault .= "&default[$sKey]=$sValue";
 				}
 			}
-
-			// Check rights
-			$bIsCreationAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_CREATE) === UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
-			$bIsModifyAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) === UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
-
-			// Create in new tab
-			if ($bIsCreationAllowed && !$bIsCreationInModalAllowed) {
-				$this->AddNewObjectMenuAction($aRegularActions, $sClass, $sDefaultValuesAsUrlParams);
-			}
-
-			// Any style actions
-			// - Bulk actions on objects set
-			if ($iSetCount > 1) {
-				// Bulk actions for each selected classes (eg. "link" and "remote" on n:n relations)
-				foreach ($aSelectedClasses as $sSelectedAlias => $sSelectedClass) {
-					$sSelectedClassName = MetaModel::GetName($sSelectedClass);
-
-					// Check rights on class
-					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY, $oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
-					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE, $sSelectedClass);
-
-					// Refine filter on selected class so bullk actions occur on the right class
-					$oSelectedClassFilter = $this->GetFilter()->DeepClone();
-					$oSelectedClassFilter->SetSelectedClasses([$sSelectedAlias]);
-
-					// Action identifier is using the alias on purpose so they can be used as "shortcut actions" easily for "Link" or "Remote" aliases on linksets.
-					// Action label dict code has a specific suffix for "Link" / "Remote" aliases to allow dedicated labels in linksets.
-					$sActionLabelCodeSuffix = in_array($sSelectedAlias, ['Link', 'Remote']) ? $sSelectedAlias : 'Class';
-					if ($bIsBulkModifyAllowed) {
-						$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:ModifyAll:'.$sSelectedAlias, Dict::Format('UI:Menu:ModifyAll_'.$sActionLabelCodeSuffix, $sSelectedClassName));
+			$bIsCreationAllowed = (UserRights::IsActionAllowed($sClass,
+						UR_ACTION_CREATE) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+			switch ($oSet->Count()) {
+				case 0:
+					// No object in the set, the only possible action is "new"
+					if ($bIsCreationAllowed) {
+						$aRegularActions['UI:Menu:New'] = array(
+								'label' => Dict::S('UI:Menu:New'),
+								'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
+							) + $aActionParams;
 					}
-					if ($bIsBulkDeleteAllowed) {
-						$this->AddBulkDeleteObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:BulkDelete:'.$sSelectedAlias, Dict::Format('UI:Menu:BulkDelete_'.$sActionLabelCodeSuffix, $sSelectedClassName));
-					}
-				}
+					break;
 
-				// Stimuli
-				$aStates = MetaModel::EnumStates($sClass);
-				// Do not perform time-consuming computations if there are too many objects in the list
-				$iLimit = MetaModel::GetConfig()->Get('complex_actions_limit');
+				case 1:
+					$oObj = $oSet->Fetch();
+					if (is_null($oObj)) {
+						if (!isset($aExtraParams['link_attr'])) {
+							if ($bIsCreationAllowed) {
+								$aRegularActions['UI:Menu:New'] = array(
+										'label' => Dict::S('UI:Menu:New'),
+										'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
+									) + $aActionParams;
+							}
+						}
+					} else {
+						$id = $oObj->GetKey();
+						if (empty($sRefreshAction) && utils::ReadParam('operation') == 'details') {
+							if ($_SERVER['REQUEST_METHOD'] == 'GET') {
+								$sRefreshAction = "window.location.reload();";
+							} else {
+								$sRefreshAction = "window.location.href='".ApplicationContext::MakeObjectUrl(get_class($oObj), $id)."';";
+							}
+						}
 
-				if ((count($aStates) > 0) && (($iLimit == 0) || ($oSet->CountWithLimit($iLimit + 1) < $iLimit))) {
-					// Life cycle actions may be available... if all objects are in the same state
-					//
-					// Group by <state>
-					$oGroupByExp = new FieldExpression(MetaModel::GetStateAttributeCode($sClass), $this->m_oFilter->GetClassAlias());
-					$aGroupBy = array('__state__' => $oGroupByExp);
-					$aQueryParams = array();
-					if (isset($aExtraParams['query_params'])) {
-						$aQueryParams = $aExtraParams['query_params'];
-					}
+						$bLocked = false;
+						if (MetaModel::GetConfig()->Get('concurrent_lock_enabled')) {
+							$aLockInfo = iTopOwnershipLock::IsLocked(get_class($oObj), $id);
+							if ($aLockInfo['locked']) {
+								$bLocked = true;
+								//$this->AddMenuSeparator($aActions);
+								//$aActions['concurrent_lock_unlock'] = array ('label' => Dict::S('UI:Menu:ReleaseConcurrentLock'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}");
+							}
+						}
+						$bRawModifiedAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+						$bIsModifyAllowed = !$bLocked && $bRawModifiedAllowed;
+						$bIsDeleteAllowed = !$bLocked && UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet);
+						// Just one object in the set, possible actions are "new / clone / modify and delete"
+						if (!isset($aExtraParams['link_attr'])) {
+							if ($bIsModifyAllowed) {
+								$aRegularActions['UI:Menu:Modify'] = array(
+										'label' => Dict::S('UI:Menu:Modify'),
+										'url' => "{$sRootUrl}pages/$sUIPage?operation=modify&class=$sClass&id=$id{$sContext}#",
+									) + $aActionParams;
+							}
+							if ($bIsCreationAllowed) {
+								$aRegularActions['UI:Menu:New'] = array(
+										'label' => Dict::S('UI:Menu:New'),
+										'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
+									) + $aActionParams;
+							}
+							if ($bIsDeleteAllowed) {
+								$aRegularActions['UI:Menu:Delete'] = array(
+										'label' => Dict::S('UI:Menu:Delete'),
+										'url' => "{$sRootUrl}pages/$sUIPage?operation=delete&class=$sClass&id=$id{$sContext}",
+									) + $aActionParams;
+							}
 
-					$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy);
-					$aRes = CMDBSource::QueryToArray($sSql);
-					if (count($aRes) == 1) {
-						// All objects are in the same state...
-						$sState = $aRes[0]['__state__'];
-						$aTransitions = Metamodel::EnumTransitions($sClass, $sState);
-						if (count($aTransitions)) {
-							$aStimuli = Metamodel::EnumStimuli($sClass);
-							foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
-								$oSet->Rewind();
-								// As soon as the user rights implementation will browse the object set,
-								// then we might consider using OptimizeColumnLoad() here
-								$iActionAllowed = UserRights::IsStimulusAllowed($sClass, $sStimulusCode, $oSet);
-								$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? $iActionAllowed : UR_ALLOWED_NO;
-								switch ($iActionAllowed) {
-									case UR_ALLOWED_YES:
-									case UR_ALLOWED_DEPENDS:
-										$aTransitionActions[$sStimulusCode] = array(
-												'label' => $aStimuli[$sStimulusCode]->GetLabel(),
-												'url' => "{$sRootUrl}pages/UI.php?operation=select_bulk_stimulus&stimulus=$sStimulusCode&state=$sState&class=$sClass&filter=".urlencode($sFilter)."{$sContext}",
+							// Transitions / Stimuli
+							if (!$bLocked) {
+								$aTransitions = $oObj->EnumTransitions();
+								if (count($aTransitions)) {
+									$aStimuli = Metamodel::EnumStimuli(get_class($oObj));
+									foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
+										$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? UserRights::IsStimulusAllowed($sClass,
+											$sStimulusCode, $oSet) : UR_ALLOWED_NO;
+										switch ($iActionAllowed) {
+											case UR_ALLOWED_YES:
+												$aTransitionActions[$sStimulusCode] = array(
+														'label' => $aStimuli[$sStimulusCode]->GetLabel(),
+														'url' => "{$sRootUrl}pages/UI.php?operation=stimulus&stimulus=$sStimulusCode&class=$sClass&id=$id{$sContext}",
+													) + $aActionParams;
+												break;
+
+											default:
+												// Do nothing
+										}
+									}
+								}
+							}
+
+							// Relations...
+							$aRelations = MetaModel::EnumRelationsEx($sClass);
+							if (count($aRelations)) {
+								$this->AddMenuSeparator($aRegularActions);
+								foreach ($aRelations as $sRelationCode => $aRelationInfo) {
+									if (array_key_exists('down', $aRelationInfo)) {
+										$aRegularActions[$sRelationCode.'_down'] = array(
+												'label' => $aRelationInfo['down'],
+												'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}",
 											) + $aActionParams;
-										break;
+									}
+									if (array_key_exists('up', $aRelationInfo)) {
+										$aRegularActions[$sRelationCode.'_up'] = array(
+												'label' => $aRelationInfo['up'],
+												'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}",
+											) + $aActionParams;
+									}
+								}
+							}
 
-									default:
-										// Do nothing
+							// Add a special menu to kill the lock, but only to allowed users who can also modify this object
+							if ($bLocked && $bRawModifiedAllowed) {
+								/** @var array $aAllowedProfiles */
+								$aAllowedProfiles = MetaModel::GetConfig()->Get('concurrent_lock_override_profiles');
+								$bCanKill = false;
+
+								$oUser = UserRights::GetUserObject();
+								$aUserProfiles = array();
+								if (!is_null($oUser)) {
+									$oProfileSet = $oUser->Get('profile_list');
+									while ($oProfile = $oProfileSet->Fetch()) {
+										$aUserProfiles[$oProfile->Get('profile')] = true;
+									}
+								}
+
+								foreach ($aAllowedProfiles as $sProfile) {
+									if (array_key_exists($sProfile, $aUserProfiles)) {
+										$bCanKill = true;
+										break;
+									}
+								}
+
+								if ($bCanKill) {
+									$this->AddMenuSeparator($aRegularActions);
+									$aRegularActions['concurrent_lock_unlock'] = array(
+										'label' => Dict::S('UI:Menu:KillConcurrentLock'),
+										'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}",
+									);
+								}
+							}
+						}
+
+						$this->AddMenuSeparator($aRegularActions);
+
+						$this->GetEnumAllowedActions($oSet, function ($sLabel, $data) use (&$aRegularActions, $aActionParams) {
+							$aRegularActions[$sLabel] = array('label' => $sLabel, 'url' => $data) + $aActionParams;
+						});
+					}
+					break;
+
+				default:
+					// Check rights
+					// New / Modify
+					$bIsModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY,
+							$oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY,
+							$oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+					$bIsBulkDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_DELETE, $oSet);
+					if (isset($aExtraParams['link_attr'])) {
+						$id = $aExtraParams['object_id'];
+						$sTargetAttr = $aExtraParams['target_attr'];
+						$oAttDef = MetaModel::GetAttributeDef($sClass, $sTargetAttr);
+						$sTargetClass = $oAttDef->GetTargetClass();
+						if ($bIsModifyAllowed) {
+							$aRegularActions['UI:Menu:Add'] = array(
+									'label' => Dict::S('UI:Menu:Add'),
+									'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true{$sContext}",
+								) + $aActionParams;
+						}
+						if ($bIsBulkModifyAllowed) {
+							$aRegularActions['UI:Menu:Manage'] = array(
+									'label' => Dict::S('UI:Menu:Manage'),
+									'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id{$sContext}",
+								) + $aActionParams;
+						}
+						//if ($bIsBulkDeleteAllowed) { $aActions[] = array ('label' => 'Remove All...', 'url' => "#") + $aActionParams; }
+					} else {
+						// many objects in the set, possible actions are: new / modify all / delete all
+						if ($bIsCreationAllowed) {
+							$aRegularActions['UI:Menu:New'] = array(
+									'label' => Dict::S('UI:Menu:New'),
+									'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
+								) + $aActionParams;
+						}
+						if ($bIsBulkModifyAllowed) {
+							$aRegularActions['UI:Menu:ModifyAll'] = array(
+									'label' => Dict::S('UI:Menu:ModifyAll'),
+									'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_modify_all&class=$sClass&filter=".urlencode($sFilter)."{$sContext}",
+								) + $aActionParams;
+						}
+						if ($bIsBulkDeleteAllowed) {
+							$aRegularActions['UI:Menu:BulkDelete'] = array(
+									'label' => Dict::S('UI:Menu:BulkDelete'),
+									'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_deletion&filter=".urlencode($sFilter)."{$sContext}",
+								) + $aActionParams;
+						}
+
+						// Stimuli
+						$aStates = MetaModel::EnumStates($sClass);
+						// Do not perform time consuming computations if there are too may objects in the list
+						$iLimit = MetaModel::GetConfig()->Get('complex_actions_limit');
+
+						if ((count($aStates) > 0) && (($iLimit == 0) || ($oSet->CountWithLimit($iLimit + 1) < $iLimit))) {
+							// Life cycle actions may be available... if all objects are in the same state
+							//
+							// Group by <state>
+							$oGroupByExp = new FieldExpression(MetaModel::GetStateAttributeCode($sClass), $this->m_oFilter->GetClassAlias());
+							$aGroupBy = array('__state__' => $oGroupByExp);
+							$aQueryParams = array();
+							if (isset($aExtraParams['query_params'])) {
+								$aQueryParams = $aExtraParams['query_params'];
+							}
+
+							$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy);
+							$aRes = CMDBSource::QueryToArray($sSql);
+							if (count($aRes) == 1) {
+								// All objects are in the same state...
+								$sState = $aRes[0]['__state__'];
+								$aTransitions = Metamodel::EnumTransitions($sClass, $sState);
+								if (count($aTransitions)) {
+									$aStimuli = Metamodel::EnumStimuli($sClass);
+									foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
+										$oSet->Rewind();
+										// As soon as the user rights implementation will browse the object set,
+										// then we might consider using OptimizeColumnLoad() here
+										$iActionAllowed = UserRights::IsStimulusAllowed($sClass, $sStimulusCode, $oSet);
+										$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? $iActionAllowed : UR_ALLOWED_NO;
+										switch ($iActionAllowed) {
+											case UR_ALLOWED_YES:
+											case UR_ALLOWED_DEPENDS:
+												$aTransitionActions[$sStimulusCode] = array(
+														'label' => $aStimuli[$sStimulusCode]->GetLabel(),
+														'url' => "{$sRootUrl}pages/UI.php?operation=select_bulk_stimulus&stimulus=$sStimulusCode&state=$sState&class=$sClass&filter=".urlencode($sFilter)."{$sContext}",
+													) + $aActionParams;
+												break;
+
+											default:
+												// Do nothing
+										}
+									}
 								}
 							}
 						}
 					}
-				}
-			}
-
-			// NOT "listInObject" style actions
-			if ($this->m_sStyle !== 'listInObject') {
-				switch ($iSetCount) {
-					case 1:
-						$oObj = $oSet->Fetch();
-						if (false === is_null($oObj)) {
-							$id = $oObj->GetKey();
-							if (empty($sRefreshAction) && utils::ReadParam('operation') == 'details') {
-								if ($_SERVER['REQUEST_METHOD'] == 'GET') {
-									$sRefreshAction = "window.location.reload();";
-								} else {
-									$sRefreshAction = "window.location.href='".ApplicationContext::MakeObjectUrl(get_class($oObj), $id)."';";
-								}
-							}
-
-							$bLocked = false;
-							if (MetaModel::GetConfig()->Get('concurrent_lock_enabled')) {
-								$aLockInfo = iTopOwnershipLock::IsLocked(get_class($oObj), $id);
-								if ($aLockInfo['locked']) {
-									$bLocked = true;
-								}
-							}
-							$bRawModifiedAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
-							$bIsModifyAllowed = !$bLocked && $bRawModifiedAllowed;
-							$bIsDeleteAllowed = !$bLocked && UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet);
-							// Just one object in the set, possible actions are "new / clone / modify and delete"
-							if (!isset($aExtraParams['link_attr'])) {
-								if ($bIsModifyAllowed) {
-									$aRegularActions['UI:Menu:Modify'] = array(
-											'label' => Dict::S('UI:Menu:Modify'),
-											'url'   => "{$sRootUrl}pages/$sUIPage?route=object.modify&class=$sClass&id=$id{$sContext}#",
-										) + $aActionParams;
-								}
-								if ($bIsDeleteAllowed) {
-									$aRegularActions['UI:Menu:Delete'] = array(
-											'label' => Dict::S('UI:Menu:Delete'),
-											'url' => "{$sRootUrl}pages/$sUIPage?operation=delete&class=$sClass&id=$id{$sContext}",
-										) + $aActionParams;
-								}
-
-								// Transitions / Stimuli
-								if (!$bLocked) {
-									$aTransitions = $oObj->EnumTransitions();
-									if (count($aTransitions)) {
-										$aStimuli = Metamodel::EnumStimuli(get_class($oObj));
-										foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
-											$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? UserRights::IsStimulusAllowed($sClass,
-												$sStimulusCode, $oSet) : UR_ALLOWED_NO;
-											switch ($iActionAllowed) {
-												case UR_ALLOWED_YES:
-													$aTransitionActions[$sStimulusCode] = array(
-															'label' => $aStimuli[$sStimulusCode]->GetLabel(),
-															'url' => "{$sRootUrl}pages/UI.php?operation=stimulus&stimulus=$sStimulusCode&class=$sClass&id=$id{$sContext}",
-														) + $aActionParams;
-													break;
-
-												default:
-													// Do nothing
-											}
-										}
-									}
-								}
-
-								// Relations...
-								$aRelations = MetaModel::EnumRelationsEx($sClass);
-								if (count($aRelations)) {
-									$this->AddMenuSeparator($aRegularActions);
-									foreach ($aRelations as $sRelationCode => $aRelationInfo) {
-										if (array_key_exists('down', $aRelationInfo)) {
-											$aRegularActions[$sRelationCode.'_down'] = array(
-													'label' => $aRelationInfo['down'],
-													'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}",
-												) + $aActionParams;
-										}
-										if (array_key_exists('up', $aRelationInfo)) {
-											$aRegularActions[$sRelationCode.'_up'] = array(
-													'label' => $aRelationInfo['up'],
-													'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}",
-												) + $aActionParams;
-										}
-									}
-								}
-
-								// Add a special menu to kill the lock, but only to allowed users who can also modify this object
-								if ($bLocked && $bRawModifiedAllowed) {
-									/** @var array $aAllowedProfiles */
-									$aAllowedProfiles = MetaModel::GetConfig()->Get('concurrent_lock_override_profiles');
-									$bCanKill = false;
-
-									$oUser = UserRights::GetUserObject();
-									$aUserProfiles = array();
-									if (!is_null($oUser)) {
-										$oProfileSet = $oUser->Get('profile_list');
-										while ($oProfile = $oProfileSet->Fetch()) {
-											$aUserProfiles[$oProfile->Get('profile')] = true;
-										}
-									}
-
-									foreach ($aAllowedProfiles as $sProfile) {
-										if (array_key_exists($sProfile, $aUserProfiles)) {
-											$bCanKill = true;
-											break;
-										}
-									}
-
-									if ($bCanKill) {
-										$this->AddMenuSeparator($aRegularActions);
-										$aRegularActions['concurrent_lock_unlock'] = array(
-											'label' => Dict::S('UI:Menu:KillConcurrentLock'),
-											'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}",
-										);
-									}
-								}
-							}
-
-							$this->AddMenuSeparator($aRegularActions);
-
-							$this->GetEnumAllowedActions($oSet, function ($sLabel, $data) use (&$aRegularActions, $aActionParams) {
-								$aRegularActions[$sLabel] = array('label' => $sLabel, 'url' => $data) + $aActionParams;
-							});
-						}
-						break;
-				}
 			}
 
 			$this->AddMenuSeparator($aRegularActions);
@@ -2002,9 +2211,8 @@ class MenuBlock extends DisplayBlock
 				$sRefreshAction = "window.location.reload();";
 			}
 		} else {
-			// It's easier just display configure this list and MENU_OBJLIST_TOOLKIT
+			//it's easier just display configure this list and MENU_OBJLIST_TOOLKIT
 		}
-
 		$param = null;
 		if (is_null($sId)) {
 			$sId = uniqid();
@@ -2017,7 +2225,14 @@ class MenuBlock extends DisplayBlock
 			case 'listInObject':
 				$oSet->Rewind();
 				$param = $oSet;
-
+				$bToolkitMenu = true;
+				if (isset($aExtraParams['toolkit_menu'])) {
+					$bToolkitMenu = (bool)$aExtraParams['toolkit_menu'];
+				}
+				if ($bToolkitMenu) {
+					$sLabel = Dict::S('UI:ConfigureThisList');
+					$aRegularActions['iTop::ConfigureList'] = ['label' => $sLabel, 'url' => '#', 'onclick' => "$('#datatable_dlg_datatable_{$sId}').dialog('open'); return false;"];
+				}
 				utils::GetPopupMenuItemsBlock($oPopupMenuItemsBlock, iPopupMenuExtension::MENU_OBJLIST_ACTIONS, $param, $aRegularActions, $sId);
 				utils::GetPopupMenuItemsBlock($oPopupMenuItemsBlock, iPopupMenuExtension::MENU_OBJLIST_TOOLKIT, $param, $aToolkitActions, $sId);
 				break;
@@ -2029,7 +2244,6 @@ class MenuBlock extends DisplayBlock
 				break;
 
 		}
-
 		if ($oPopupMenuItemsBlock->HasSubBlocks()) {
 			$oRenderBlock->AddSubBlock($oPopupMenuItemsBlock);
 		} else {
@@ -2040,7 +2254,6 @@ class MenuBlock extends DisplayBlock
 				$oRenderBlock->AddCssFileRelPath($sCssPath);
 			}
 		}
-
 		// Extract favorite actions from their menus
 		$aFavoriteRegularActions = [];
 		$aFavoriteTransitionActions = [];
@@ -2126,16 +2339,12 @@ class MenuBlock extends DisplayBlock
 						break;
 
 					case 'UI:Menu:ModifyAll':
-					case 'UI:Menu:ModifyAll:Link':      // Link class on linkset
-					case 'UI:Menu:ModifyAll:Remote':    // Remote class on linkset
 					case 'UI:Menu:Modify':
 						$sIconClass = 'fas fa-pen';
 						$sLabel = '';
 						break;
 
 					case 'UI:Menu:BulkDelete':
-					case 'UI:Menu:BulkDelete:Link':     // Link class on linkset
-					case 'UI:Menu:BulkDelete:Remote':   // Remote class on linkset
 					case 'UI:Menu:Delete':
 						$sIconClass = 'fas fa-trash';
 						$sLabel = '';
@@ -2168,28 +2377,8 @@ class MenuBlock extends DisplayBlock
 				$oActionsToolbar->AddSubBlock($oActionButton);
 			}
 
-			// - Creation in modal
-			if ($bIsCreationInModalAllowed === true) {
-				$oAddLinkActionButton = ButtonUIBlockFactory::MakeIconAction(
-					'fas fa-plus',
-					Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($sClass)),
-					'UI:Links:New',
-					'',
-					false
-				);
-
-				// - If we are used in a Datatable, 'datatable_' will be prefixed to our $sId, so we do the same here
-				$sRealId = $sId;
-				if(in_array($this->m_sStyle, ['list', 'links', 'listInObject'])){
-					$sRealId = 'datatable_' . $sId;
-				}
-				$oAddLinkActionButton->AddCSSClasses(['ibo-action-button', 'ibo-regular-action-button'])
-					->SetOnClickJsCode("$('#$sRealId').trigger('open_creation_modal.object.itop');");
-				$oActionsToolbar->AddSubBlock($oAddLinkActionButton);
-			}
-
 			// - Refresh
-			if (utils::IsNotNullOrEmptyString($sRefreshAction)) {
+			if ($sRefreshAction != '') {
 				$oActionButton = ButtonUIBlockFactory::MakeAlternativeNeutral('', 'UI:Button:Refresh');
 				$oActionButton->SetIconClass('fas fa-sync-alt')
 					->SetOnClickJsCode($sRefreshAction)
@@ -2199,7 +2388,7 @@ class MenuBlock extends DisplayBlock
 			}
 
 			// - Search
-			if ($this->m_sStyle === 'details') {
+			if ($this->m_sStyle == 'details') {
 				$oActionButton = ButtonUIBlockFactory::MakeIconLink('fas fa-search', Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass)), "{$sRootUrl}pages/UI.php?operation=search_form&do_search=0&class=$sClass{$sContext}", '', 'UI:SearchFor_Class');
 				$oActionButton->AddCSSClasses(['ibo-action-button', 'ibo-regular-action-button']);
 				$oActionsToolbar->AddSubBlock($oActionButton);
@@ -2224,12 +2413,6 @@ class MenuBlock extends DisplayBlock
 
 				// Toolkit actions
 				if (!empty($aToolkitActions)) {
-					// Add separator if necessary
-					if (count($aRegularActions) > 0) {
-						$oRegularActionsMenu->AddItem('separator-regular-actions-toolkit-actions', PopoverMenuItemFactory::MakeSeparator());
-					}
-
-					// Add actions
 					foreach ($aToolkitActions as $sActionId => $aActionData) {
 						$oRegularActionsMenu->AddItem('toolkit-actions', PopoverMenuItemFactory::MakeFromApplicationPopupMenuItemData($sActionId, $aActionData));
 					}
@@ -2310,106 +2493,5 @@ class MenuBlock extends DisplayBlock
 				$aActions['sep_'.(count($aActions)-1)] = array('label' => $sSeparator, 'url' => '');
 			}
 		}
-	}
-
-	/**
-	 * Add a create action (to $aActions) for an $sClass object
-	 *
-	 * @param array &$aActions Pointer to the array in which the action will be added
-	 * @param string $sClass Datamodel class concerned by the action
-	 * @param string $sDefaultValuesAsUrlParams Default values for the new object form,
-	 *
-	 * @return void
-	 * @since 3.1.0
-	 * @internal
-	 */
-	protected function AddNewObjectMenuAction(array &$aActions, string $sClass, string $sDefaultValuesAsUrlParams = ''): void
-	{
-		$aActions['UI:Menu:New'] = [
-				'label' => Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($sClass)),
-				'url'   => $this->PrepareUrlForStandardMenuAction($sClass, "operation=new&class=$sClass{$sDefaultValuesAsUrlParams}"),
-			] + $this->GetDefaultParamsForMenuAction();
-	}
-
-	/**
-	 * Add a bulk modify action (to $aActions) on objects defined by $sFilter
-	 *
-	 * @param array &$aActions Pointer to the array in which the action will be added
-	 * @param string $sClass Datamodel class concerned by the action
-	 * @param string $sFilter OQL of the objects to propose for bulk modify
-	 * @param string $sActionIdentifier Unique identifier for the action. Default if 'UI:Menu:ModifyAll'
-	 * @param string $sActionLabel Label for the action, can be either a dict code to translate or an hardcoded label. Default is 'UI:Menu:ModifyAll'.
-	 *
-	 * @return void
-	 * @since 3.1.0
-	 * @internal
-	 */
-	protected function AddBulkModifyObjectsMenuAction(array &$aActions, string $sClass, string $sFilter, string $sActionIdentifier = 'UI:Menu:ModifyAll', $sActionLabel = 'UI:Menu:ModifyAll'): void
-	{
-		$aActions[$sActionIdentifier] = [
-			'label' => Dict::S($sActionLabel),
-			'url' => $this->PrepareUrlForStandardMenuAction($sClass, "operation=select_for_modify_all&class=$sClass&filter=".urlencode($sFilter)),
-		] + $this->GetDefaultParamsForMenuAction();
-	}
-
-	/**
-	 * Add a bulk delete action (to $aActions) on objects defined by $sFilter
-	 *
-	 * @param array &$aActions Pointer to the array in which the action will be added
-	 * @param string $sClass Datamodel class concerned by the action
-	 * @param string $sFilter OQL of the objects to propose for bulk deletion
-	 * @param string $sActionIdentifier Unique identifier for the action. Default if 'UI:Menu:BulkDelete'
-	 * @param string $sActionLabel Label for the action, can be either a dict code to translate or an hardcoded label. Default is 'UI:Menu:BulkDelete'.
-	 *
-	 * @return void
-	 * @since 3.1.0
-	 * @internal
-	 */
-	protected function AddBulkDeleteObjectsMenuAction(array &$aActions, string $sClass, string $sFilter, string $sActionIdentifier = 'UI:Menu:BulkDelete', $sActionLabel = 'UI:Menu:BulkDelete')
-	{
-		$aActions[$sActionIdentifier] = array(
-			'label' => Dict::S($sActionLabel),
-			'url' => $this->PrepareUrlForStandardMenuAction($sClass, "operation=select_for_deletion&filter=".urlencode($sFilter)),
-		) + $this->GetDefaultParamsForMenuAction();
-	}
-
-	/**
-	 * @return array Default parameters of a menu action
-	 * @since 3.1.0
-	 * @internal
-	 */
-	private function GetDefaultParamsForMenuAction(): array
-	{
-		$aDefaultParams = [];
-
-		if (isset($aExtraParams['menu_actions_target'])) {
-			$aDefaultParams['target'] = $aExtraParams['menu_actions_target'];
-		}
-
-		return $aDefaultParams;
-	}
-
-	/**
-	 * @param string $sClass Datamodel class for which the URL is prepared
-	 * @param string $sUrlParams URL parameters to add to the URL, must already be concatenated as a string (eg. "foo=bar&some=thing&third=param")
-	 *
-	 * @return string An absolute URL for a menu action on the $sClass class with $sUrlParams
-	 * @throws \Exception
-	 * @internal
-	 */
-	private function PrepareUrlForStandardMenuAction(string $sClass, string $sUrlParams)
-	{
-		$sRootUrl = utils::GetAbsoluteUrlAppRoot();
-		$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
-
-		$sUrl = "{$sRootUrl}pages/{$sUIPage}?{$sUrlParams}";
-
-		$oAppContext = new ApplicationContext();
-		$sContext = $oAppContext->GetForLink();
-		if (utils::IsNotNullOrEmptyString($sContext)) {
-			$sUrl .= '&'.$sContext;
-		}
-
-		return $sUrl;
-	}
+	}	
 }

application/errorpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/ErrorPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/ErrorPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/ErrorPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/ErrorPage.php, now loadable using autoloader');

application/exceptions/CoreException.php

@@ -6,10 +6,6 @@
 
 class CoreException extends Exception
 {
-	protected $m_sIssue;
-	protected $m_sImpact;
-	protected $m_aContextData;
-
 	/**
 	 * CoreException constructor.
 	 *

application/exceptions/iTopXmlException.php

@@ -1,10 +0,0 @@
-<?php
-/*
- * @copyright   Copyright (C) 2010-2022 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class iTopXmlException extends CoreException
-{
-
-}

application/exceptions/mysql/MySQLTransactionNotClosedException.php

@@ -1,13 +0,0 @@
-<?php
-/*
- * @copyright   Copyright (C) 2010-2021 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * @since 2.7.8 3.0.3 3.1.0 N°5538
- */
-class MySQLTransactionNotClosedException extends MySQLException
-{
-
-}

application/forms.class.inc.php

@@ -838,8 +838,7 @@ class DesignerFormField
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
-
-		return array('label' => $this->sLabel, 'value' => "<input type=\"text\" id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($this->defaultValue)."\">");
+		return array('label' => $this->sLabel, 'value' => "<input type=\"text\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\">");
 	}
 
 	/**
@@ -1013,8 +1012,9 @@ class DesignerTextField extends DesignerFormField
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		
 		$sName = $this->oForm->GetFieldName($this->sCode);
-		if ($this->IsReadOnly()) {
-			$sHtmlValue = "<span>".utils::EscapeHtml($this->defaultValue)."<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($this->defaultValue)."\"/></span>";
+		if ($this->IsReadOnly())
+		{
+			$sHtmlValue = "<span>".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\"/></span>";
 		}
 		else
 		{
@@ -1038,10 +1038,11 @@ $('#$sId').on('change keyup validate', function() { ValidateWithPattern('$sId',
 EOF
 			);
 			$sCSSClasses = '';
-			if (count($this->aCSSClasses) > 0) {
+			if (count($this->aCSSClasses) > 0)
+			{
 				$sCSSClasses = 'class="'.implode(' ', $this->aCSSClasses).'"';
 			}
-			$sHtmlValue = "<input type=\"text\" $sCSSClasses id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($this->defaultValue)."\">";
+			$sHtmlValue = "<input type=\"text\" $sCSSClasses id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\">";
 		}
 		return array('label' => $this->sLabel, 'value' => $sHtmlValue);
 	}
@@ -1100,9 +1101,10 @@ class DesignerLongTextField extends DesignerTextField
 		{
 			$sCSSClasses = 'class="'.implode(' ', $this->aCSSClasses).'"';
 		}
-		if (!$this->IsReadOnly()) {
+		if (!$this->IsReadOnly())
+		{
 			$oP->add_ready_script(
-				<<<EOF
+<<<EOF
 $('#$sId').on('change keyup validate', function() { ValidateWithPattern('$sId', $sMandatory, '$sPattern',  $(this).closest('form').attr('id'), $sForbiddenValues); } );
 {
 	var myTimer = null;
@@ -1110,10 +1112,11 @@ $('#$sId').on('change keyup validate', function() { ValidateWithPattern('$sId',
 }
 EOF
 			);
-			$sValue = "<textarea $sCSSClasses id=\"$sId\" name=\"$sName\">".utils::EscapeHtml($this->defaultValue)."</textarea>";
+			$sValue = "<textarea $sCSSClasses id=\"$sId\" name=\"$sName\">".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."</textarea>";
 		}
-		else {
-			$sValue = "<div $sCSSClasses id=\"$sId\">".utils::EscapeHtml($this->defaultValue)."</div>";
+		else
+		{
+			$sValue = "<div $sCSSClasses id=\"$sId\">".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."</div>";
 		}
 		return array('label' => $this->sLabel, 'value' => $sValue);
 	}
@@ -1142,8 +1145,9 @@ class DesignerIntegerField extends DesignerFormField
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		
 		$sName = $this->oForm->GetFieldName($this->sCode);
-		if ($this->IsReadOnly()) {
-			$sHtmlValue = "<span>".utils::EscapeHtml($this->defaultValue)."<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($this->defaultValue)."\"/></span>";
+		if ($this->IsReadOnly())
+		{
+			$sHtmlValue = "<span>".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\"/></span>";
 		}
 		else
 		{
@@ -1160,10 +1164,11 @@ $('#$sId').on('change keyup validate', function() { ValidateInteger('$sId', $sMa
 EOF
 			);
 			$sCSSClasses = '';
-			if (count($this->aCSSClasses) > 0) {
+			if (count($this->aCSSClasses) > 0)
+			{
 				$sCSSClasses = 'class="'.implode(' ', $this->aCSSClasses).'"';
 			}
-			$sHtmlValue = "<input type=\"text\" $sCSSClasses id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($this->defaultValue)."\">";
+			$sHtmlValue = "<input type=\"text\" $sCSSClasses id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\">";
 		}
 		return array('label' => $this->sLabel, 'value' => $sHtmlValue);
 	}
@@ -1284,18 +1289,22 @@ class DesignerComboField extends DesignerFormField
 			{
 				if ($this->bMultipleSelection)
 				{
-					if(in_array($sKey, $this->defaultValue)) {
+					if(in_array($sKey, $this->defaultValue))
+					{
 						$aSelected[] = $sDisplayValue;
-						$aHiddenValues[] = "<input type=\"hidden\" name=\"{$sName}[]\" value=\"".utils::EscapeHtml($sKey)."\"/>";
+						$aHiddenValues[] = "<input type=\"hidden\" name=\"{$sName}[]\" value=\"".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."\"/>";
 					}
-				} else {
-					if ($sKey == $this->defaultValue) {
+				}
+				else
+				{
+					if ($sKey == $this->defaultValue)
+					{
 						$aSelected[] = $sDisplayValue;
-						$aHiddenValues[] = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($sKey)."\"/>";
+						$aHiddenValues[] = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."\"/>";
 					}
 				}
 			}
-			$sHtml = "<span $sCSSClasses>".utils::EscapeHtml(implode(', ', $aSelected)).implode($aHiddenValues)."</span>";
+			$sHtml = "<span $sCSSClasses>".htmlentities(implode(', ', $aSelected), ENT_QUOTES, 'UTF-8').implode($aHiddenValues)."</span>";
 		}
 		else
 		{
@@ -1319,7 +1328,7 @@ class DesignerComboField extends DesignerFormField
 				}
 				// Quick and dirty: display the menu parents as a tree
 				$sHtmlValue = str_replace(' ', '&nbsp;', $sDisplayValue);
-				$sHtml .= "<option value=\"".utils::EscapeHtml($sKey)."\" $sSelected>$sHtmlValue</option>";
+				$sHtml .= "<option value=\"".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."\" $sSelected>$sHtmlValue</option>";
 			}
 			$sHtml .= "</select></span>";
 			if ($this->bOtherChoices)
@@ -1370,9 +1379,10 @@ class DesignerBooleanField extends DesignerFormField
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		$sChecked = $this->defaultValue ? 'checked' : '';
-		if ($this->IsReadOnly()) {
+		if ($this->IsReadOnly())
+		{
 			$sLabel = $this->defaultValue ? Dict::S('UI:UserManagement:ActionAllowed:Yes') : Dict::S('UI:UserManagement:ActionAllowed:No'); //TODO use our own yes/no translations
-			$sHtmlValue = "<span>".utils::EscapeHtml($sLabel)."<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($this->defaultValue)."\"/></span>";
+			$sHtmlValue = "<span>".htmlentities($sLabel)."<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\"/></span>";
 		}
 		else
 		{
@@ -1440,8 +1450,8 @@ class DesignerHiddenField extends DesignerFormField
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
-
-		return array('label' => '', 'value' => "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($this->defaultValue)."\">");
+		$sChecked = $this->defaultValue ? 'checked' : '';
+		return array('label' =>'', 'value' => "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\">");
 	}
 }
 
@@ -1508,7 +1518,7 @@ class DesignerIconSelectionField extends DesignerFormField
 EOF
 			);
 		} else {
-			$sValue = '<span style="display:inline-block;line-height:48px;height:48px;"><span><img style="vertical-align:middle" src="'.$this->aAllowedValues[$idx]['icon'].'" />&nbsp;'.utils::EscapeHtml($this->aAllowedValues[$idx]['label']).'</span></span>';
+			$sValue = '<span style="display:inline-block;line-height:48px;height:48px;"><span><img style="vertical-align:middle" src="'.$this->aAllowedValues[$idx]['icon'].'" />&nbsp;'.htmlentities($this->aAllowedValues[$idx]['label'], ENT_QUOTES, 'UTF-8').'</span></span>';
 		}
 		$sReadOnly = $this->IsReadOnly() ? 'disabled' : '';
 		return array('label' => $this->sLabel, 'value' => $sValue);
@@ -1655,14 +1665,14 @@ class DesignerSortableField extends DesignerFormField
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		$sReadOnly = $this->IsReadOnly() ? 'readonly="readonly"' : '';
-		$aResult = array('label' => $this->sLabel, 'value' => "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" $sReadOnly value=\"".utils::EscapeHtml($this->defaultValue)."\">");
-
+		$aResult = array('label' => $this->sLabel, 'value' => "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" $sReadOnly value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\">");
+		
 
 		$sJSFields = json_encode(array_keys($this->aAllowedValues));
 		$oP->add_ready_script(
 			"$('#$sId').sortable_field({aAvailableFields: $sJSFields});"
 		);
-
+		
 		return $aResult;
 	}
 }
@@ -1751,8 +1761,8 @@ class DesignerFormSelectorField extends DesignerFormField
 			foreach ($this->aSubForms as $iKey => $aFormData) {
 				if ($iKey == $this->defaultValue) // Default value is actually the index
 				{
-					$sDisplayValue = utils::EscapeHtml($aFormData['label']);
-					$sHiddenValue = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".utils::EscapeHtml($iKey)."\"/>";
+					$sDisplayValue = htmlentities($aFormData['label'], ENT_QUOTES, 'UTF-8');
+					$sHiddenValue = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($iKey, ENT_QUOTES, 'UTF-8')."\"/>";
 					break;
 				}
 			}
@@ -1760,8 +1770,8 @@ class DesignerFormSelectorField extends DesignerFormField
 		} else {
 			$sHtml = "<span class=\"ibo-input-select-wrapper\"><select $sCSSClasses id=\"$sId\" name=\"$sName\" $sReadOnly>";
 			foreach ($this->aSubForms as $iKey => $aFormData) {
-				$sDisplayValue = utils::EscapeHtml($aFormData['label']);
-				$sValue = utils::EscapeHtml($aFormData['value']);
+				$sDisplayValue = htmlentities($aFormData['label'], ENT_QUOTES, 'UTF-8');
+				$sValue = htmlentities($aFormData['value'], ENT_QUOTES, 'UTF-8');
 				$sSelected = ($iKey == $this->defaultValue) ? 'selected' : '';
 				$sHtml .= "<option data-value=\"$sValue\" value=\"$iKey\" $sSelected>".$sDisplayValue."</option>";
 			}

application/itopwebpage.class.inc.php

@@ -1,9 +1,9 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/iTopWebPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
 // cannot notify depreciation for now as this is still MASSIVELY used in iTop core !
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader');
+//DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/iTopWebPage.php, now loadable using autoloader');

application/itopwizardwebpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWizardWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/iTopWizardWebPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/iTopWizardWebPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/iTopWizardWebPage.php, now loadable using autoloader');

application/loginexternal.class.inc.php

@@ -88,4 +88,4 @@ class LoginExternal extends AbstractLoginFSMExtension
 		/** @var string $sAuthUser */
 		return $sAuthUser; // Retrieve the value
 	}
-}
+}

application/logintwig.class.inc.php

@@ -8,10 +8,7 @@
 
 
 use Combodo\iTop\Application\Branding;
-use Combodo\iTop\Application\TwigBase\Twig\Extension;
-use Twig\Environment;
-use Twig\Loader\ChainLoader;
-use Twig\Loader\FilesystemLoader;
+use Combodo\iTop\TwigExtension;
 
 /**
  * Twig context for modules extending the login screen
@@ -220,14 +217,14 @@ class LoginTwigRenderer
 			$sTwigLoaderPath = $oLoginContext->GetTwigLoaderPath();
 			if ($sTwigLoaderPath != null)
 			{
-				$oExtensionLoader = new FilesystemLoader();
+				$oExtensionLoader = new Twig_Loader_Filesystem();
 				$oExtensionLoader->setPaths($sTwigLoaderPath);
 				$aTwigLoaders[] = $oExtensionLoader;
 			}
 			$this->aPostedVars = array_merge($this->aPostedVars, $oLoginContext->GetPostedVars());
 		}
 
-		$oCoreLoader = new FilesystemLoader(array(), APPROOT.'templates');
+		$oCoreLoader = new Twig_Loader_Filesystem(array(), APPROOT.'templates');
 		$aCoreTemplatesPaths = array('pages/login', 'pages/login/password');
 		// Having this path declared after the plugins let the plugins replace the core templates
 		$oCoreLoader->setPaths($aCoreTemplatesPaths);
@@ -235,9 +232,9 @@ class LoginTwigRenderer
 		$oCoreLoader->setPaths($aCoreTemplatesPaths, 'ItopCore');
 		$aTwigLoaders[] = $oCoreLoader;
 
-		$oLoader = new ChainLoader($aTwigLoaders);
-		$this->oTwig = new Environment($oLoader);
-		Extension::RegisterTwigExtensions($this->oTwig);
+		$oLoader = new Twig_Loader_Chain($aTwigLoaders);
+		$this->oTwig = new Twig_Environment($oLoader);
+		TwigExtension::RegisterTwigExtensions($this->oTwig);
 	}
 
 	public function GetDefaultVars()
@@ -309,7 +306,7 @@ class LoginTwigRenderer
 	}
 
 	/**
-	 * @return \Twig\Environment
+	 * @return \Twig_Environment
 	 */
 	public function GetTwig()
 	{

application/loginurl.class.inc.php

@@ -92,4 +92,4 @@ class LoginURL extends AbstractLoginFSMExtension
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
-}
+}

application/loginwebpage.class.inc.php

@@ -26,8 +26,6 @@
 
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\Helper\Session;
-use Combodo\iTop\Service\Events\EventData;
-use Combodo\iTop\Service\Events\EventService;
 
 /**
  * Web page used for displaying the login form
@@ -133,6 +131,10 @@ class LoginWebPage extends NiceWebPage
 		//add profiles not already linked with user
 		foreach ($aProfiles as $iProfileId)
 		{
+			$oLink = new URP_UserProfile();
+			$oLink->Set('profileid', $iProfileId);
+			$oLink->Set('reason', $sOrigin);
+
 			$oProfilesSet->AddItem(MetaModel::NewObject('URP_UserProfile', array('profileid' => $iProfileId, 'reason' => $sOrigin)));
 		}
 		$oUser->Set('profile_list', $oProfilesSet);
@@ -481,13 +483,11 @@ class LoginWebPage extends NiceWebPage
 					$iResponse = $oLoginFSMExtensionInstance->LoginAction($sLoginState, $iErrorCode);
 					if ($iResponse == self::LOGIN_FSM_RETURN)
 					{
-						EventService::FireEvent(new EventData(EVENT_LOGIN, null, ['code' => $iErrorCode, 'state' => $sLoginState]));
 						Session::WriteClose();
 						return $iErrorCode; // Asked to exit FSM, generally login OK
 					}
 					if ($iResponse == self::LOGIN_FSM_ERROR)
 					{
-						EventService::FireEvent(new EventData(EVENT_LOGIN, null, ['code' => $iErrorCode, 'state' => $sLoginState]));
 						$sLoginState = self::LOGIN_STATE_SET_ERROR; // Next state will be error
 						// An error was detected, skip the other plugins turn
 						break;
@@ -501,7 +501,6 @@ class LoginWebPage extends NiceWebPage
 			}
 			catch (Exception $e)
 			{
-				EventService::FireEvent(new EventData(EVENT_LOGIN, null, ['state' => $_SESSION['login_state']]));
 				IssueLog::Error($e->getTraceAsString());
 				static::ResetSession();
 				die($e->getMessage());

application/menunode.class.inc.php

@@ -291,17 +291,7 @@ class ApplicationMenu
 	 * @param string $sMenuGroupIdx
 	 * @param array $aExtraParams
 	 *
-	 * @return array{
-	 *     array{
-	 *        sId: string,
-	 *        sTitle: string,
-	 *        sLabel: string,
-	 *        bHasCount: boolean,
-	 *        sUrl: string,
-	 *        bOpenInNewWindow: boolean,
-	 *        aSubMenuNodes: array
-	 *     }
-	 * } The aSubMenuNodes key contains the same structure recursively
+	 * @return array
 	 * @throws \DictExceptionMissingString
 	 * @throws \Exception
 	 * @since 3.0.0
@@ -330,13 +320,12 @@ class ApplicationMenu
 			}
 
 			$aSubMenuNodes[] = [
-				'sId'              => $oSubMenuNode->GetMenuId(),
-				'sTitle'           => $oSubMenuNode->GetTitle(),
-				'sLabel'           => $oSubMenuNode->GetLabel(),
-				'bHasCount'        => $oSubMenuNode->HasCount(),
-				'sUrl'             => $oSubMenuNode->GetHyperlink($aExtraParams),
+				'sId' => $oSubMenuNode->GetMenuId(),
+				'sTitle' => $oSubMenuNode->GetTitle(),
+				'bHasCount' => $oSubMenuNode->HasCount(),
+				'sUrl' => $oSubMenuNode->GetHyperlink($aExtraParams),
 				'bOpenInNewWindow' => $oSubMenuNode->IsHyperLinkInNewWindow(),
-				'aSubMenuNodes'    => static::GetSubMenuNodes($sSubMenuItemIdx, $aExtraParams),
+				'aSubMenuNodes' => static::GetSubMenuNodes($sSubMenuItemIdx, $aExtraParams),
 			];
 		}
 
@@ -757,7 +746,7 @@ abstract class MenuNode
 	}
 
 	/**
-	 * @return string The "+" dictionary entry for this menu if exists, otherwise the Title (if we have a parent title, will output parentTitle / currentTitle)
+	 * @return string
 	 */
 	public function GetLabel()
 	{
@@ -769,6 +758,7 @@ abstract class MenuNode
 			} else {
 				$sRet = $this->GetTitle();
 			}
+			//$sRet = $this->GetTitle();
 		}
 		return $sRet;
 	}
@@ -1111,7 +1101,6 @@ class OQLMenuNode extends MenuNode
 	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
-		ContextTag::AddContext(ContextTag::TAG_OBJECT_SEARCH);
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		OQLMenuNode::RenderOQLSearch
 		(

application/nicewebpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/NiceWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/NiceWebPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/NiceWebPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/NiceWebPage.php, now loadable using autoloader');

application/pdfpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/PDFPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/PDFPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/PDFPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/PDFPage.php, now loadable using autoloader');

application/query.class.inc.php

@@ -18,7 +18,8 @@
  */
 
 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\Field\Field;
+use Combodo\iTop\Application\UI\Base\Component\Field\FieldUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
 
@@ -50,7 +51,6 @@ abstract class Query extends cmdbAbstractObject
 			"is_null_allowed" => false,
 			"depends_on" => array(),
 		)));
-
 		MetaModel::Init_AddAttribute(new AttributeText("description", array(
 			"allowed_values" => null,
 			"sql" => "description",
@@ -68,41 +68,6 @@ abstract class Query extends cmdbAbstractObject
 			'display_style' => 'radio_horizontal',
 		)));
 
-		MetaModel::Init_AddAttribute(new AttributeInteger("export_count", array(
-			"allowed_values" => null,
-			"sql" => "export_count",
-			"default_value" => 0,
-			"is_null_allowed" => false,
-			"depends_on" => array(),
-		)));
-
-		MetaModel::Init_AddAttribute(new AttributeDateTime("export_last_date", array(
-			"allowed_values" => null,
-			"sql" => "export_last_date",
-			"default_value" => null,
-			"is_null_allowed" => true,
-			"depends_on" => array(),
-		)));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("export_last_user_id",
-			array(
-				"targetclass"=>'User',
-				"allowed_values"=>null,
-				"sql"=>'user_id',
-				"is_null_allowed"=>true,
-				"depends_on"=>array(),
-				"display_style"=>'select',
-				"always_load_in_tables"=>false,
-				"on_target_delete"=>DEL_SILENT
-			)));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalField("export_last_user_contact",
-			array(
-				"allowed_values"=>null,
-				"extkey_attcode"=> "export_last_user_id",
-				"target_attcode"=>"contactid"
-			)));
-
 		// Display lists
 		MetaModel::Init_SetZListItems('details',
 			array('name', 'is_template', 'description')); // Attributes to be displayed for the complete details
@@ -113,55 +78,6 @@ abstract class Query extends cmdbAbstractObject
 			array('name', 'description', 'is_template')); // Criteria of the default search form
 		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
-
-
-	/**
-	 * @inheritdoc
-	 *
-	 * @since 3.1.0
-	 */
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		// read only attribute
-		if (in_array($sAttCode, ['export_count', 'export_last_date', 'export_last_user_id'])){
-			return OPT_ATT_READONLY;
-		}
-
-		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-	}
-
-
-	/**
-	 * Return export url.
-	 *
-	 * @param array|null $aValues optional values for the query
-	 *
-	 * @return string|null
-	 * @since 3.1.0
-	 */
-	abstract public function GetExportUrl(array $aValues = null) : ?string;
-
-	/**
-	 * Update last export information.
-	 *
-	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @since 3.1.0
-	 */
-	public function UpdateLastExportInformation() : void
-	{
-		// last export information
-		$this->Set('export_last_date', date(AttributeDateTime::GetSQLFormat()));
-		$this->Set('export_last_user_id', UserRights::GetUserObject());
-		$this->AllowWrite(true);
-		$this->DBUpdate();
-
-		// increment usage counter
-		$this->DBIncrement('export_count');
-	}
 }
 
 class QueryOQL extends Query
@@ -200,51 +116,13 @@ class QueryOQL extends Query
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details',
-			array(
-				'col:col1' => array('fieldset:Query:baseinfo' => array('name', 'is_template', 'description', 'oql', 'fields')),
-				'col:col2' => array('fieldset:Query:exportInfo' => array('export_count', 'export_last_date', 'export_last_user_id', 'export_last_user_contact'))
-			)
-		); // Attributes to be displayed for the complete details
+			array('name', 'is_template', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search',
 			array('name', 'description', 'is_template', 'fields', 'oql')); // Criteria of the std search form
 	}
 
-	/** @inheritdoc */
-	public function GetExportUrl(array $aValues = null) : ?string
-	{
-		try{
-			// retrieve attributes
-			$sFields = trim($this->Get('fields'));
-			$sOql = $this->Get('oql');
-
-			// construct base url depending on version
-			$bExportV1Recommended = ($sFields == '');
-			if ($bExportV1Recommended) {
-				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
-			}
-			else{
-				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
-			}
-
-			// search object from OQL
-			$oSearch = DBObjectSearch::FromOQL($sOql);
-
-			// inject parameters
-			$aParameters = $oSearch->GetQueryParams();
-			foreach ($aParameters as $sParam => $val) {
-				$paramValue = ($aValues === null || $aValues[$sParam] === null) ? $sParam : $aValues[$sParam];
-				$sUrl .= '&arg_' . $sParam . '=' . $paramValue;
-			}
-
-			return $sUrl;
-		}
-		catch(Exception $e){
-			return null;
-		}
-	}
-
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
 		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
@@ -274,11 +152,9 @@ class QueryOQL extends Query
 					$sUrl .= '&arg_'.$sParam.'=["'.$sParam.'"]';
 				}
 
-				// add text area inside field set
-				$oFieldSet = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:Query:UrlForExcel'));
 				$oTextArea = new TextArea("", $sUrl, null, 80, 3);
-				$oFieldSet->AddSubBlock($oTextArea);
-				$oPage->AddSubBlock($oFieldSet);
+				$oFieldUrl = FieldUIBlockFactory::MakeFromObject(Dict::S('UI:Query:UrlForExcel'), $oTextArea, Field::ENUM_FIELD_LAYOUT_LARGE);
+				$oPage->AddSubBlock($oFieldUrl);
 
 				if (count($aParameters) == 0) {
 					$oBlock = new DisplayBlock($oSearch, 'list');
@@ -302,7 +178,6 @@ class QueryOQL extends Query
 		return $aFieldsMap;
 	}
 
-
 // Rolled back until 'fields' can be properly managed by AttributeQueryAttCodeSet
 //
 //	public function ComputeValues()

application/startup.inc.php

@@ -15,16 +15,12 @@
 //
 //   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\EventRegister\ApplicationEvents;
 use Combodo\iTop\Application\Helper\Session;
-use Combodo\iTop\Service\Events\EventData;
-use Combodo\iTop\Service\Events\EventService;
 
-require_once(APPROOT.'core/cmdbobject.class.inc.php');
-require_once(APPROOT.'application/utils.inc.php');
-require_once(APPROOT.'core/contexttag.class.inc.php');
-require_once(APPROOT.'core/kpi.class.inc.php');
-require_once(APPROOT.'setup/setuputils.class.inc.php');
+require_once(APPROOT.'/core/cmdbobject.class.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/core/contexttag.class.inc.php');
+require_once(APPROOT.'/core/kpi.class.inc.php');
 
 
 /**
@@ -103,6 +99,3 @@ else
 }
 $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
 MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);
-// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
-EventService::InitService();
-EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));

application/template.class.inc.php

@@ -229,10 +229,12 @@ class DisplayTemplate
 	static public function UnitTest()
 	{
 		require_once(APPROOT.'/application/startup.inc.php');
+		require_once(APPROOT."/application/itopwebpage.class.inc.php");
 		
 		$sTemplate = '<div class="page_header">
 		<div class="actions_details"><a href="#"><span>Actions</span></a></div>
 		<h1>$class$: <span class="hilite">$name$</span></h1>
+		<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = \'$class$\'</itopblock>
 		</div>
 		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
 		<itoptabs>
@@ -351,7 +353,7 @@ class ObjectDetailsTemplate extends DisplayTemplate
 							$sTip = '';
 							foreach($aReasons as $aRow)
 							{
-								$sDescription = utils::EscapeHtml($aRow['description']);
+								$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
 								$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
 								$sTip .= "<div class='synchro-source'>";
 								$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
@@ -359,10 +361,10 @@ class ObjectDetailsTemplate extends DisplayTemplate
 							}
 							$oPage->add_ready_script("$('#synchro_$iInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
 						}
-
+	
 						// Attribute is read-only
 						$sHTMLValue = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetAsHTML($sAttCode);
-						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.utils::EscapeHtml($this->m_oObj->Get($sAttCode)).'"/></span>';
+						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.htmlentities($this->m_oObj->Get($sAttCode), ENT_QUOTES, 'UTF-8').'"/></span>';
 						$aFieldsMap[$sAttCode] = $iInputId;
 						$aParams['this->comments('.$sAttCode.')'] = $sSynchroIcon;
 					}

application/templates/audit_category.html

@@ -1,6 +1,7 @@
 <div class="page_header">
 	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $id$</itopblock>
 	<h1>$class$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'</itopblock>
 </div>
 <img src="../../images/clean.png" style="margin-top:-20px; margin-right:10px; float:right">
 <itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $id$</itopblock>

application/twigextension.class.inc.php

@@ -4,17 +4,14 @@ namespace Combodo\iTop;
 
 use AttributeDate;
 use AttributeDateTime;
-use DeprecatedCallsLog;
 use Dict;
 use Exception;
 use MetaModel;
-use Twig\Environment;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
+use Twig_Environment;
+use Twig_SimpleFilter;
+use Twig_SimpleFunction;
 use utils;
 
-DeprecatedCallsLog::NotifyDeprecatedFile('instead use sources/Application/TwigBase/Twig/Extension.php, which is loaded by the autoloader');
-
 /**
  * Class TwigExtension
  *
@@ -28,13 +25,13 @@ class TwigExtension
 	 * Registers Twig extensions such as filters or functions.
 	 * It allows us to access some stuff directly in twig.
 	 *
-	 * @param Environment $oTwigEnv
+	 * @param \Twig_Environment $oTwigEnv
 	 */
-	public static function RegisterTwigExtensions(Environment &$oTwigEnv)
+	public static function RegisterTwigExtensions(Twig_Environment &$oTwigEnv)
 	{
 		// Filter to translate a string via the Dict::S function
 		// Usage in twig: {{ 'String:ToTranslate'|dict_s }}
-		$oTwigEnv->addFilter(new TwigFilter('dict_s',
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('dict_s',
 				function ($sStringCode, $sDefault = null, $bUserLanguageOnly = false) {
 					return Dict::S($sStringCode, $sDefault, $bUserLanguageOnly);
 				})
@@ -42,7 +39,7 @@ class TwigExtension
 
 		// Filter to format a string via the Dict::Format function
 		// Usage in twig: {{ 'String:ToTranslate'|dict_format() }}
-		$oTwigEnv->addFilter(new TwigFilter('dict_format',
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('dict_format',
 				function ($sStringCode, $sParam01 = null, $sParam02 = null, $sParam03 = null, $sParam04 = null) {
 					return Dict::Format($sStringCode, $sParam01, $sParam02, $sParam03, $sParam04);
 				})
@@ -51,13 +48,16 @@ class TwigExtension
 		// Filter to format output
 		// example a DateTime is converted to user format
 		// Usage in twig: {{ 'String:ToFormat'|output_format }}
-		$oTwigEnv->addFilter(new TwigFilter('date_format',
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('date_format',
 				function ($sDate) {
-					try {
-						if (preg_match('@^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$@', trim($sDate))) {
+					try
+					{
+						if (preg_match('@^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$@', trim($sDate)))
+						{
 							return AttributeDateTime::GetFormat()->Format($sDate);
 						}
-						if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate))) {
+						if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate)))
+						{
 							return AttributeDate::GetFormat()->Format($sDate);
 						}
 					}
@@ -72,7 +72,7 @@ class TwigExtension
 		// Filter to format output
 		// example a DateTime is converted to user format
 		// Usage in twig: {{ 'String:ToFormat'|output_format }}
-		$oTwigEnv->addFilter(new TwigFilter('size_format',
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('size_format',
 				function ($sSize) {
 					return utils::BytesToFriendlyFormat($sSize);
 				})
@@ -80,25 +80,24 @@ class TwigExtension
 
 		// Filter to enable base64 encode/decode
 		// Usage in twig: {{ 'String to encode'|base64_encode }}
-		$oTwigEnv->addFilter(new TwigFilter('base64_encode', 'base64_encode'));
-		$oTwigEnv->addFilter(new TwigFilter('base64_decode', 'base64_decode'));
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('base64_encode', 'base64_encode'));
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('base64_decode', 'base64_decode'));
 
 		// Filter to enable json decode  (encode already exists)
 		// Usage in twig: {{ aSomeArray|json_decode }}
-		$oTwigEnv->addFilter(new TwigFilter('json_decode', function ($sJsonString, $bAssoc = false) {
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('json_decode', function ($sJsonString, $bAssoc = false) {
 				return json_decode($sJsonString, $bAssoc);
 			})
 		);
 
 		// Filter to add itopversion to an url
-		$oTwigEnv->addFilter(new TwigFilter('add_itop_version', function ($sUrl) {
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
 			$sUrl = utils::AddParameterToUrl($sUrl, 'itopversion', ITOP_VERSION);
-
 			return $sUrl;
 		}));
 
 		// Filter to add a module's version to an url
-		$oTwigEnv->addFilter(new TwigFilter('add_module_version', function ($sUrl, $sModuleName) {
+		$oTwigEnv->addFilter(new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) {
 			$sModuleVersion = utils::GetCompiledModuleVersion($sModuleName);
 			$sUrl = utils::AddParameterToUrl($sUrl, 'moduleversion', $sModuleVersion);
 
@@ -107,19 +106,38 @@ class TwigExtension
 
 		// Function to check our current environment
 		// Usage in twig:   {% if is_development_environment() %}
-		$oTwigEnv->addFunction(new TwigFunction('is_development_environment', function () {
+		$oTwigEnv->addFunction(new Twig_SimpleFunction('is_development_environment', function()
+		{
 			return utils::IsDevelopmentEnvironment();
 		}));
 
+		// Function to get configuration parameter
+		// Usage in twig: {{ get_config_parameter('foo') }}
+		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_config_parameter', function($sParamName)
+		{
+			$oConfig = MetaModel::GetConfig();
+			return $oConfig->Get($sParamName);
+		}));
+
+		// Function to get a module setting
+		// Usage in twig: {{ get_module_setting(<MODULE_CODE>, <PROPERTY_CODE> [, <DEFAULT_VALUE>]) }}
+		// since 3.0.0, but see N°4034 for upcoming evolutions in the 3.1
+		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_module_setting', function (string $sModuleCode, string $sPropertyCode, $defaultValue = null) {
+			$oConfig = MetaModel::GetConfig();
+			return $oConfig->GetModuleSetting($sModuleCode, $sPropertyCode, $defaultValue);
+		}));
+
 		// Function to get the URL of a static page in a module
 		// Usage in twig: {{ get_static_page_module_url('itop-my-module', 'path-to-my-page') }}
-		$oTwigEnv->addFunction(new TwigFunction('get_static_page_module_url', function ($sModuleName, $sPage) {
+		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_static_page_module_url', function($sModuleName, $sPage)
+		{
 			return utils::GetAbsoluteUrlModulesRoot().$sModuleName.'/'.$sPage;
 		}));
 
 		// Function to get the URL of a php page in a module
 		// Usage in twig: {{ get_page_module_url('itop-my-module', 'path-to-my-my-page.php') }}
-		$oTwigEnv->addFunction(new TwigFunction('get_page_module_url', function ($sModuleName, $sPage) {
+		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_page_module_url', function($sModuleName, $sPage)
+		{
 			return utils::GetAbsoluteUrlModulePage($sModuleName, $sPage);
 		}));
 	}

application/ui.extkeywidget.class.inc.php

@@ -307,7 +307,7 @@ EOF
 			$sHTMLValue .= "<input class=\"field_autocomplete ibo-input ibo-input-select ibo-input-select-autocomplete\" type=\"text\"  id=\"label_$this->iId\" value=\"$sDisplayValue\" placeholder='...'/>";
 
 			// another hidden input to store & pass the object's Id
-			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".utils::HtmlEntities($value)."\" />\n";
+			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" />\n";
 
 			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';
 			// Scripts to start the autocomplete and bind some events to it
@@ -619,7 +619,7 @@ EOF
 			$sHTMLValue .= "<div class=\"ibo-input-select--action-buttons\"><span class=\"field_input_btn\"><div class=\"mini_button ibo-input-select--action-button\"  id=\"mini_search_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.Search();\"><i class=\"fas fa-search\"></i></div></span></div>";
 
 			// another hidden input to store & pass the object's Id
-			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".utils::EscapeHtml($value)."\" />\n";
+			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" />\n";
 
 			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';
 			// Scripts to start the autocomplete and bind some events to it
@@ -685,15 +685,15 @@ JS
 		}
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
-		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, 'dtc_'.$this->iId,
+		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, $this->iId,
 			array(
-				'menu'           => false,
-				'currentId'      => $this->iId,
-				'table_id'       => "dr_{$this->iId}",
+				'menu' => false,
+				'currentId' => $this->iId,
+				'table_id' => "dr_{$this->iId}",
 				'table_inner_id' => "{$this->iId}_results",
 				'selection_mode' => true,
 				'selection_type' => 'single',
-				'cssCount'       => '#count_'.$this->iId.'_results',
+				'cssCount' => '#count_'.$this->iId.'_results',
 			)
 		));
 		$sCancel = Dict::S('UI:Button:Cancel');
@@ -971,7 +971,7 @@ HTML
 		foreach (MetaModel::ListAttributeDefs($this->sTargetClass) as $sAttCode => $oAttDef) {
 			if (($oAttDef instanceof AttributeBlob) || (false)) {
 				$aFieldsFlags[$sAttCode] = OPT_ATT_READONLY;
-				$aFieldsComments[$sAttCode] = '&nbsp;<img src="../images/transp-lock.png" style="vertical-align:middle" title="'.utils::EscapeHtml(Dict::S('UI:UploadNotSupportedInThisMode')).'"/>';
+				$aFieldsComments[$sAttCode] = '&nbsp;<img src="../images/transp-lock.png" style="vertical-align:middle" title="'.htmlentities(Dict::S('UI:UploadNotSupportedInThisMode')).'"/>';
 			}
 		}
 		cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments));
@@ -984,7 +984,7 @@ HTML
 		$oPage->add_ready_script(<<<JS
 $('#ac_create_{$this->iId}').dialog({ width: $(window).width() * 0.6, height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true});
 $('#dcr_{$this->iId} form').removeAttr('onsubmit');
-$('#dcr_{$this->iId} form').find('button[type="submit"]').on('click', oACWidget_{$this->iId}.DoCreateObject);
+$('#dcr_{$this->iId} form').on('submit.uilinksWizard', oACWidget_{$this->iId}.DoCreateObject);
 JS
 		);
 	}

application/ui.linksdirectwidget.class.inc.php

@@ -4,8 +4,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinksEditTable;
-use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 
 /**
  * Class UILinksWidgetDirect
@@ -19,12 +19,10 @@ class UILinksWidgetDirect
 	protected $sAttCode;
 	protected $sInputid;
 	protected $sNameSuffix;
-	protected $aZlist;
 	protected $sLinkedClass;
 
 	/**
 	 * UILinksWidgetDirect constructor.
-	 *
 	 * @param string $sClass
 	 * @param string $sAttCode
 	 * @param string $sInputId
@@ -82,10 +80,97 @@ class UILinksWidgetDirect
 	 */
 	public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj)
 	{
-		$oBlock = new BlockDirectLinksEditTable($this, $this->sInputid);
-		$oBlock->InitTable($oPage, $oValue, $sFormPrefix);
+		if (empty($aArgs)) {
+			$aArgs = [];
+		}
 
-		return ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock);
+		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
+		switch($oLinksetDef->GetEditMode())
+		{
+			case LINKSET_EDITMODE_NONE: // The linkset is read-only
+			$this->DisplayAsBlock($oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, false /* bDisplayMenu*/);
+			break;
+			
+			case LINKSET_EDITMODE_ADDONLY: // The only possible action is to open (in a new window) the form to create a new object
+			if ($oCurrentObj && !$oCurrentObj->IsNew())
+			{
+				$sTargetClass = $oLinksetDef->GetLinkedClass();
+				$sExtKeyToMe = $oLinksetDef->GetExtKeyToMe();
+				$sDefault = "default[$sExtKeyToMe]=".$oCurrentObj->GetKey();
+				$oAppContext = new ApplicationContext();
+				$sParams = $oAppContext->GetForLink();
+				$oPage->p("<a target=\"_blank\" href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=new&class=$sTargetClass&$sParams&{$sDefault}\">".Dict::Format('UI:ClickToCreateNew', Metamodel::GetName($sTargetClass))."</a>\n");
+			}
+			$this->DisplayAsBlock($oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, false /* bDisplayMenu*/);
+			break;
+			
+			case LINKSET_EDITMODE_INPLACE: // The whole linkset can be edited 'in-place'
+			$this->DisplayEditInPlace($oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj);
+			break;
+			
+			case LINKSET_EDITMODE_ADDREMOVE: // The whole linkset can be edited 'in-place'
+			$sTargetClass = $oLinksetDef->GetLinkedClass();
+			$sExtKeyToMe = $oLinksetDef->GetExtKeyToMe();
+			$oExtKeyDef = MetaModel::GetAttributeDef($sTargetClass, $sExtKeyToMe);
+			$aButtons = array('add');
+			if ($oExtKeyDef->IsNullAllowed())
+			{
+				$aButtons = array('add', 'remove');
+			}
+			$this->DisplayEditInPlace($oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $aButtons);
+			break;
+			
+			case LINKSET_EDITMODE_ACTIONS:
+			default:
+			$this->DisplayAsBlock($oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, true /* bDisplayMenu*/);
+		}
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param DBObjectSet $oValue
+	 * @param array $aArgs
+	 * @param string $sFormPrefix
+	 * @param DBObject $oCurrentObj
+	 * @param bool $bDisplayMenu
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (protected method, always called with default value)
+	 */
+	protected function DisplayAsBlock(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $bDisplayMenu)
+	{
+		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
+		$sTargetClass = $oLinksetDef->GetLinkedClass();
+		if ($oCurrentObj && $oCurrentObj->IsNew() && $bDisplayMenu)
+		{
+			$oPage->p(Dict::Format('UI:BeforeAdding_Class_ObjectsSaveThisObject', MetaModel::GetName($sTargetClass)));
+		}
+		else
+		{
+			$oFilter = new DBObjectSearch($sTargetClass);
+			$oFilter->AddCondition($oLinksetDef->GetExtKeyToMe(), $oCurrentObj->GetKey(),'=');
+
+			$aDefaults = array($oLinksetDef->GetExtKeyToMe() => $oCurrentObj->GetKey());
+			$oAppContext = new ApplicationContext();
+			foreach($oAppContext->GetNames() as $sKey)
+			{
+				// The linked object inherits the parent's value for the context
+				if (MetaModel::IsValidAttCode($this->sClass, $sKey) && $oCurrentObj)
+				{
+					$aDefaults[$sKey] = $oCurrentObj->Get($sKey);
+				}
+			}
+			$aParams = array(
+				'target_attr' => $oLinksetDef->GetExtKeyToMe(),
+				'object_id' => $oCurrentObj ? $oCurrentObj->GetKey() : null,
+				'menu' => $bDisplayMenu,
+                'menu_actions_target' => '_blank',
+				'default' => $aDefaults,
+				'table_id' => $this->sClass.'_'.$this->sAttCode,
+			);
+
+			$oBlock = new DisplayBlock($oFilter, 'list', false);
+			$oBlock->Display($oPage, $this->sInputid, $aParams);
+		}	
 	}
 
 	/**
@@ -144,6 +229,55 @@ class UILinksWidgetDirect
 		$oPage->add('</div></div>');
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param DBObjectSet $oValue
+	 * @param array $aArgs
+	 * @param string $sFormPrefix
+	 * @param DBObject $oCurrentObj
+	 * @param array $aButtons
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (protected method, caller already handles it)
+	 */
+	protected function DisplayEditInPlace(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $aButtons = array('create', 'delete'))
+	{
+		$aAttribs = $this->GetTableConfig();
+		$oValue->Rewind();
+		$aData = array();
+		while ($oLinkObj = $oValue->Fetch()) {
+			$aRow = array();
+			$aRow['form::select'] = '<input type="checkbox" class="selectList'.$this->sInputid.'" value="'.$oLinkObj->GetKey().'"/>';
+			foreach ($this->aZlist as $sLinkedAttCode) {
+				$aRow[$sLinkedAttCode] = $oLinkObj->GetAsHTML($sLinkedAttCode);
+			}
+			$aData[] = $aRow;
+		}
+		$oDiv = UIContentBlockUIBlockFactory::MakeStandard($this->sInputid, ['listContainer']);
+		$oPage->AddSubBlock($oDiv);
+		$oDatatable = DataTableUIBlockFactory::MakeForForm($this->sInputid, $aAttribs, $aData);
+		$oDatatable->SetOptions(['select_mode' => 'custom']);
+		$oDiv->AddSubBlock($oDatatable);
+		$sInputName = $sFormPrefix.'attr_'.$this->sAttCode;
+		$aLabels = array(
+			'delete' => Dict::S('UI:Button:Delete'),
+			// 'modify' => 'Modify...' ,
+			'creation_title' => Dict::Format('UI:CreationTitle_Class', MetaModel::GetName($this->sLinkedClass)),
+			'create' => Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($this->sLinkedClass)),
+			'remove' => Dict::S('UI:Button:Remove'),
+			'add' => Dict::Format('UI:AddAnExisting_Class', MetaModel::GetName($this->sLinkedClass)),
+			'selection_title' => Dict::Format('UI:SelectionOf_Class', MetaModel::GetName($this->sLinkedClass)),
+		);
+		$oContext = new ApplicationContext();
+		$sSubmitUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?'.$oContext->GetForLink();
+		$sJSONLabels = json_encode($aLabels);
+		$sJSONButtons = json_encode($aButtons);
+		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
+		// Don't automatically launch the search if the table is huge
+		$bDoSearch = !utils::IsHighCardinality($this->sLinkedClass);
+		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
+		$oPage->add_ready_script("$('#{$this->sInputid}').directlinks({class_name: '$this->sClass', att_code: '$this->sAttCode', input_name:'$sInputName', labels: $sJSONLabels, submit_to: '$sSubmitUrl', buttons: $sJSONButtons, oWizardHelper: $sWizHelper, do_search: $sJSDoSearch});");
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param DBObject $oCurrentObj
@@ -299,21 +433,18 @@ HTML
 	{
 		
 	}
-
-	public function GetTableConfig()
+	
+	protected function GetTableConfig()
 	{
 		$aAttribs = array();
-		$aAttribs['form::select'] = array(
-			'label'       => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->sInputid}:not(:disabled)', this.checked);oWidget".$this->sInputid.".directlinks('instance')._onSelectChange();\" class=\"checkAll\"></input>",
-			'description' => Dict::S('UI:SelectAllToggle+'),
-		);
+		$aAttribs['form::select'] = array('label' => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->sInputid}:not(:disabled)', this.checked);\" class=\"checkAll\"></input>", 'description' => Dict::S('UI:SelectAllToggle+'));
 
-		foreach ($this->aZlist as $sLinkedAttCode) {
+		foreach($this->aZlist as $sLinkedAttCode)
+		{
 			$oAttDef = MetaModel::GetAttributeDef($this->sLinkedClass, $sLinkedAttCode);
 			$aAttribs[$sLinkedAttCode] = array('label' => MetaModel::GetLabel($this->sLinkedClass, $sLinkedAttCode), 'description' => $oAttDef->GetOrderByHint());
 		}
-
-		return $aAttribs;
+		return $aAttribs;	
 	}
 
 	/**
@@ -412,43 +543,12 @@ HTML
 				{
 					$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
 				}
-
-				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue)) {
+	
+				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue))
+				{
 					$oSearch->AddCondition($sAttCode, $defaultValue);
 				}
 			}
 		}
 	}
-
-
-	public function GetClass(): string
-	{
-		return $this->sClass;
-	}
-
-	public function GetLinkedClass(): string
-	{
-		return $this->sLinkedClass;
-	}
-
-	public function GetAttCode(): string
-	{
-		return $this->sAttCode;
-	}
-
-	public function GetInputId(): string
-	{
-		return $this->sInputid;
-	}
-
-	public function GetNameSuffix(): string
-	{
-		return $this->sNameSuffix;
-	}
-
-	public function GetZList(): array
-	{
-		return $this->aZlist;
-	}
-
 }

application/ui.linkswidget.class.inc.php

@@ -6,18 +6,18 @@
 
 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\BlockIndirectLinksEditTable;
-use Combodo\iTop\Application\UI\Links\Indirect\BlockObjectPickerDialog;
+use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinksEdit\BlockIndirectLinksEdit;
+use Combodo\iTop\Application\UI\Links\Indirect\BlockObjectPickerDialog\BlockObjectPickerDialog;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 require_once(APPROOT.'application/displayblock.class.inc.php');
 
-class UILinksWidget
+class UILinksWidget 
 {
 	protected $m_sClass;
 	protected $m_sAttCode;
 	protected $m_sNameSuffix;
-	protected $m_sInputId;
+	protected $m_iInputId;
 	protected $m_aAttributes;
 	protected $m_sExtKeyToRemote;
 	protected $m_sExtKeyToMe;
@@ -33,7 +33,7 @@ class UILinksWidget
 	 *
 	 * @param string $sClass
 	 * @param string $sAttCode AttributeLinkedSetIndirect attcode
-	 * @param string $sInputId
+	 * @param int $iInputId
 	 * @param string $sNameSuffix
 	 * @param bool $bDuplicatesAllowed
 	 *
@@ -41,14 +41,13 @@ class UILinksWidget
 	 * @throws \DictExceptionMissingString
 	 * @throws \Exception
 	 */
-	public function __construct($sClass, $sAttCode, $sInputId, $sNameSuffix = '', $bDuplicatesAllowed = false)
+	public function __construct($sClass, $sAttCode, $iInputId, $sNameSuffix = '', $bDuplicatesAllowed = false)
 	{
 		$this->m_sClass = $sClass;
 		$this->m_sAttCode = $sAttCode;
-		$this->m_sInputId = $sInputId;
 		$this->m_sNameSuffix = $sNameSuffix;
+		$this->m_iInputId = $iInputId;
 		$this->m_bDuplicatesAllowed = $bDuplicatesAllowed;
-
 		$this->m_aEditableFields = array();
 
 		/** @var AttributeLinkedSetIndirect $oAttDef */
@@ -64,7 +63,7 @@ class UILinksWidget
 		$this->m_aEditableFields = array();
 		$this->m_aTableConfig = array();
 		$this->m_aTableConfig['form::checkbox'] = array(
-			'label'       => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_sInputId.".OnSelectChange();\">",
+			'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_iInputId.".OnSelectChange();\">",
 			'description' => Dict::S('UI:SelectAllToggle+'),
 		);
 
@@ -92,13 +91,234 @@ class UILinksWidget
 		}
 	}
 
+	/**
+	 * A one-row form for editing a link record
+	 *
+	 * @param WebPage $oP Web page used for the ouput
+	 * @param DBObject $oLinkedObj Remote object
+	 * @param DBObject|int $linkObjOrId Either the lnk object or a unique number for new link records to add
+	 * @param array $aArgs Extra context arguments
+	 * @param DBObject $oCurrentObj The object to which all the elements of the linked set refer to
+	 * @param int $iUniqueId A unique identifier of new links
+	 * @param boolean $bReadOnly Display link as editable or read-only. Default is false (editable)
+	 *
+	 * @return array The HTML fragment of the one-row form
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \Exception
+	 */
+	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId, $aArgs, $oCurrentObj, $iUniqueId, $bReadOnly = false)
+	{
+		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
+		$aRow = array();
+		$aFieldsMap = array();
+		$iKey = 0;
+
+		if (is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
+		{
+			$iKey = $linkObjOrId->GetKey();
+			$iRemoteObjKey = $linkObjOrId->Get($this->m_sExtKeyToRemote);
+			$sPrefix .= "[$iKey][";
+			$sNameSuffix = "]"; // To make a tabular form
+			$aArgs['prefix'] = $sPrefix;
+			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$iKey}";
+			$aArgs['this'] = $linkObjOrId;
+
+			if ($bReadOnly)
+			{
+				$aRow['form::checkbox'] = "";
+				foreach ($this->m_aEditableFields as $sFieldCode)
+				{
+					$sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
+					$aRow[$sFieldCode] = $sDisplayValue;
+				}
+			}
+			else
+			{
+				$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"$iKey\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$iKey\">";
+				foreach ($this->m_aEditableFields as $sFieldCode)
+				{
+					$sSafeFieldId = $this->GetFieldId($linkObjOrId->GetKey(), $sFieldCode);
+					$this->AddRowForFieldCode($aRow, $sFieldCode, $aArgs, $linkObjOrId, $oP, $sNameSuffix, $sSafeFieldId);
+					$aFieldsMap[$sFieldCode] = $sSafeFieldId;
+				}
+			}
+
+			$sState = $linkObjOrId->GetState();
+			$sRemoteKeySafeFieldId = $this->GetFieldId($aArgs['this']->GetKey(), $this->m_sExtKeyToRemote);;
+		}
+		else
+		{
+			// form for creating a new record
+			if (is_object($linkObjOrId))
+			{
+				// New link existing only in memory
+				$oNewLinkObj = $linkObjOrId;
+				$iRemoteObjKey = $oNewLinkObj->Get($this->m_sExtKeyToRemote);
+				$oNewLinkObj->Set($this->m_sExtKeyToMe,
+					$oCurrentObj); // Setting the extkey with the object also fills the related external fields
+			}
+			else
+			{
+				$iRemoteObjKey = $linkObjOrId;
+				$oNewLinkObj = MetaModel::NewObject($this->m_sLinkedClass);
+				$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, $iRemoteObjKey);
+				$oNewLinkObj->Set($this->m_sExtKeyToRemote,
+					$oRemoteObj); // Setting the extkey with the object alsoo fills the related external fields
+				$oNewLinkObj->Set($this->m_sExtKeyToMe,
+					$oCurrentObj); // Setting the extkey with the object also fills the related external fields
+			}
+			$sPrefix .= "[-$iUniqueId][";
+			$sNameSuffix = "]"; // To make a tabular form
+			$aArgs['prefix'] = $sPrefix;
+			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".($iUniqueId < 0 ? -$iUniqueId : $iUniqueId);
+			$aArgs['this'] = $oNewLinkObj;
+			$sInputValue = $iUniqueId > 0 ? "-$iUniqueId" : "$iUniqueId";
+			$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"0\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$sInputValue\">";
+
+			if ($iUniqueId > 0)
+			{
+				// Rows created with ajax call need OnLinkAdded call.
+				//
+				$oP->add_ready_script(
+					<<<EOF
+PrepareWidgets();
+oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
+EOF
+				);
+			}
+			else
+			{
+				// Rows added before loading the form don't have to call OnLinkAdded.
+				// Listeners are already present and DOM is not recreated
+				$iPositiveUniqueId = -$iUniqueId;
+				$oP->add_ready_script(<<<EOF
+oWidget{$this->m_iInputId}.AddLink($iPositiveUniqueId, $iRemoteObjKey);
+EOF
+				);
+			}
+
+			foreach($this->m_aEditableFields as $sFieldCode)
+			{
+				$sSafeFieldId = $this->GetFieldId($iUniqueId, $sFieldCode);
+				$this->AddRowForFieldCode($aRow, $sFieldCode, $aArgs, $oNewLinkObj, $oP, $sNameSuffix, $sSafeFieldId);
+				$aFieldsMap[$sFieldCode] = $sSafeFieldId;
+
+				$sValue = $oNewLinkObj->Get($sFieldCode);
+				$oP->add_ready_script(
+					<<<JS
+oWidget{$this->m_iInputId}.OnValueChange($iKey, $iUniqueId, '$sFieldCode', '$sValue');
+JS
+				);
+			}
+
+			$sState = '';
+			$sRemoteKeySafeFieldId = $this->GetFieldId($iUniqueId, $this->m_sExtKeyToRemote);
+		}
+
+		if (!$bReadOnly)
+		{
+			$sExtKeyToMeId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToMe);
+			$aFieldsMap[$this->m_sExtKeyToMe] = $sExtKeyToMeId;
+			$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToMeId\" value=\"".$oCurrentObj->GetKey()."\">";
+
+			$sExtKeyToRemoteId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToRemote);
+			$aFieldsMap[$this->m_sExtKeyToRemote] = $sExtKeyToRemoteId;
+			$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToRemoteId\" value=\"$iRemoteObjKey\">";
+		}
+
+		// Adding fields from remote class
+		// all fields are embedded in a span + added to $aFieldsMap array so that we can refresh them after extkey change
+		$aRemoteFieldsMap = [];
+		foreach (MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+		{
+			$sSafeFieldId = $this->GetFieldId($aArgs['this']->GetKey(), $sFieldCode);
+			$aRow['static::'.$sFieldCode] = "<span id='field_$sSafeFieldId'>".$oLinkedObj->GetAsHTML($sFieldCode).'</span>';
+			$aRemoteFieldsMap[$sFieldCode] = $sSafeFieldId;
+		}
+		// id field is needed so that remote object could be load server side
+		$aRemoteFieldsMap['id'] = $sRemoteKeySafeFieldId;
+
+		// Generate WizardHelper to update dependant fields
+		$this->AddWizardHelperInit($oP, $aArgs['wizHelper'], $this->m_sLinkedClass, $sState, $aFieldsMap);
+		//instantiate specific WizarHelper instance for remote class fields refresh
+		$bHasExtKeyUpdatingRemoteClassFields = (
+			array_key_exists('replaceDependenciesByRemoteClassFields', $aArgs)
+			&& ($aArgs['replaceDependenciesByRemoteClassFields'])
+		);
+		if ($bHasExtKeyUpdatingRemoteClassFields)
+		{
+			$this->AddWizardHelperInit($oP, $aArgs['wizHelperRemote'], $this->m_sRemoteClass, $sState, $aRemoteFieldsMap);
+		}
+
+		return $aRow;
+	}
+
+	private function AddRowForFieldCode(&$aRow, $sFieldCode, &$aArgs, $oLnk, $oP, $sNameSuffix, $sSafeFieldId): void
+	{
+		if (($sFieldCode === $this->m_sExtKeyToRemote))
+		{
+			// current field is the lnk extkey to the remote class
+			$aArgs['replaceDependenciesByRemoteClassFields'] = true;
+			$sRowFieldCode = 'static::key';
+			$aArgs['wizHelperRemote'] = $aArgs['wizHelper'].'_remote';
+			$aRemoteAttDefs = MetaModel::GetZListAttDefsFilteredForIndirectRemoteClass($this->m_sRemoteClass);
+			$aRemoteCodes = array_map(
+				function ($value) {
+					return $value->GetCode();
+				},
+				$aRemoteAttDefs
+			);
+			$aArgs['remoteCodes'] = $aRemoteCodes;
+		}
+		else
+		{
+			$aArgs['replaceDependenciesByRemoteClassFields'] = false;
+			$sRowFieldCode = $sFieldCode;
+		}
+		$sValue = $oLnk->Get($sFieldCode);
+		$sDisplayValue = $oLnk->GetEditValue($sFieldCode);
+		$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
+
+		$aRow[$sRowFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'
+			.cmdbAbstractObject::GetFormElementForField(
+				$oP,
+				$this->m_sLinkedClass,
+				$sFieldCode,
+				$oAttDef,
+				$sValue,
+				$sDisplayValue,
+				$sSafeFieldId,
+				$sNameSuffix,
+				0,
+				$aArgs
+			)
+			.'</div></div></div>';
+	}
+
 	private function GetFieldId($iLnkId, $sFieldCode, $bSafe = true)
 	{
-		$sFieldId = $this->m_sInputId.'_'.$sFieldCode.'['.$iLnkId.']';
+		$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$iLnkId.']';
 
 		return ($bSafe) ? utils::GetSafeId($sFieldId) : $sFieldId;
 	}
 
+	private function AddWizardHelperInit($oP, $sWizardHelperVarName, $sWizardHelperClass, $sState, $aFieldsMap): void
+	{
+		$iFieldsCount = count($aFieldsMap);
+		$sJsonFieldsMap = json_encode($aFieldsMap);
+
+		$oP->add_script(
+			<<<JS
+var $sWizardHelperVarName = new WizardHelper('$sWizardHelperClass', '', '$sState');
+$sWizardHelperVarName.SetFieldsMap($sJsonFieldsMap);
+$sWizardHelperVarName.SetFieldsCount($iFieldsCount);
+$sWizardHelperVarName.SetReturnNotEditableFields(true);
+$sWizardHelperVarName.SetWizHelperJsVarName('$sWizardHelperVarName');
+JS
+		);
+	}
 
 	/**
 	 * Display the table with the form for editing all the links at once
@@ -136,12 +356,91 @@ class UILinksWidget
 	 */
 	public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj): string
 	{
-		$oBlock = new BlockIndirectLinksEditTable($this);
-		$oBlock->InitTable($oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $this->m_aTableConfig);
+		$sLinkedSetId = "{$this->m_sAttCode}{$this->m_sNameSuffix}";
+
+		$oBlock = new BlockIndirectLinksEdit("linkedset_{$sLinkedSetId}", ["ibo-block-indirect-links--edit"]);
+
+		$oBlock->sLinkedSetId = $sLinkedSetId;
+		$oBlock->sClass = $this->m_sClass;
+		$oBlock->sAttCode = $this->m_sAttCode;
+		$oBlock->iInputId = $this->m_iInputId;
+		$oBlock->sNameSuffix = $this->m_sNameSuffix;
+		$oBlock->bDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
+		$oBlock->oWizHelper = 'oWizardHelper'.$sFormPrefix;
+		$oBlock->sExtKeyToRemote = $this->m_sExtKeyToRemote;
+		// Don't automatically launch the search if the table is huge
+		$oBlock->bJSDoSearch = utils::IsHighCardinality($this->m_sRemoteClass) ? 'false' : 'true';
+		$oBlock->sFormPrefix = $sFormPrefix;
+		$oBlock->sRemoteClass = $this->m_sRemoteClass;
+
+		$oValue->Rewind();
+		$aForm = array();
+		$iMaxAddedId = 0;
+		$iAddedId = -1; // Unique id for new links
+		while ($oCurrentLink = $oValue->Fetch())
+		{
+			// We try to retrieve the remote object as usual
+			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote),
+				false /* Must not be found */);
+			// If successful, it means that we can edit its link
+			if ($oLinkedObj !== null) {
+				$bReadOnly = false;
+			} // Else we retrieve it without restrictions (silos) and will display its link as readonly
+			else {
+				$bReadOnly = true;
+				$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote), false /* Must not be found */, true);
+			}
+
+			if ($oCurrentLink->IsNew()) {
+				$key = $iAddedId--;
+			} else {
+				$key = $oCurrentLink->GetKey();
+			}
+
+			$iMaxAddedId = max($iMaxAddedId, $key);
+			$aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs, $oCurrentObj, $key, $bReadOnly);
+		}
+		$oBlock->iMaxAddedId = (int) $iMaxAddedId;
+
+		$oDataTable = DataTableUIBlockFactory::MakeForForm("{$this->m_sAttCode}{$this->m_sNameSuffix}", $this->m_aTableConfig, $aForm);
+		$oDataTable->SetOptions(['select_mode' => 'custom']);
+		$oBlock->AddSubBlock($oDataTable);
+
+		$oBlock->AddControls();
 
 		return ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock);
 	}
 
+	/**
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	protected static function GetTargetClass($sClass, $sAttCode)
+	{
+		/** @var AttributeLinkedSet $oAttDef */
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		$sLinkedClass = $oAttDef->GetLinkedClass();
+		$sTargetClass = '';
+		switch(get_class($oAttDef))
+		{
+			case 'AttributeLinkedSetIndirect':
+			/** @var AttributeExternalKey $oLinkingAttDef */
+			/** @var AttributeLinkedSetIndirect $oAttDef */
+			$oLinkingAttDef = 	MetaModel::GetAttributeDef($sLinkedClass, $oAttDef->GetExtKeyToRemote());
+			$sTargetClass = $oLinkingAttDef->GetTargetClass();
+			break;
+
+			case 'AttributeLinkedSet':
+			$sTargetClass = $sLinkedClass;
+			break;
+		}
+		
+		return $sTargetClass;
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param DBObject $oCurrentObj
@@ -171,10 +470,15 @@ class UILinksWidget
 			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
 		}
 
-		$oBlock = new BlockObjectPickerDialog($this);
+		$sLinkedSetId = "{$this->m_sAttCode}{$this->m_sNameSuffix}";
+
+		$oBlock = new BlockObjectPickerDialog();
 		$oPage->AddUiBlock($oBlock);
 
-		$sLinkedSetId = $oBlock->oUILinksWidget->GetLinkedSetId();
+		$oBlock->sLinkedSetId = $sLinkedSetId;
+		$oBlock->iInputId = $this->m_iInputId;
+		$oBlock->sLinkedClassName = MetaModel::GetName($this->m_sLinkedClass);
+		$oBlock->sClassName = MetaModel::GetName($this->m_sClass);
 
 		$oDisplayBlock = new DisplayBlock($oFilter, 'search', false);
 		$oBlock->AddSubBlock($oDisplayBlock->GetDisplay($oPage, "SearchFormToAdd_{$sLinkedSetId}",
@@ -243,8 +547,7 @@ class UILinksWidget
 		foreach ($aLinkedObjectIds as $iObjectId) {
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
 			if (is_object($oLinkedObj)) {
-				$oBlock = new BlockIndirectLinksEditTable($this);
-				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
+				$aRow = $this->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
 				$oRow = new FormTableRow("{$this->m_sAttCode}{$this->m_sNameSuffix}", $this->m_aTableConfig, $aRow, -$iAdditionId);
 				$oP->AddUiBlock($oRow);
 				$iAdditionId++;
@@ -271,8 +574,7 @@ class UILinksWidget
 		foreach ($aLinkedObjectIds as $iObjectId) {
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
 			if (is_object($oLinkedObj)) {
-				$oBlock = new BlockIndirectLinksEditTable($this);
-				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
+				$aRow = $this->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
 				$aData = [];
 				foreach ($aRow as $item) {
 					$aData[] = $item;
@@ -333,77 +635,24 @@ class UILinksWidget
 							/** @var AttributeExternalKey $oAttDef */
 							$sTargetClass = $oAttDef->GetTargetClass();
 							$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sTargetClass);
-							if ($sHierarchicalKeyCode !== false) {
+							if ($sHierarchicalKeyCode !== false)
+							{
 								$oFilter = new DBObjectSearch($sTargetClass);
 								$oFilter->AddCondition('id', $defaultValue);
 								$oHKFilter = new DBObjectSearch($sTargetClass);
 								$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
 								$oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
 							}
+						} catch (Exception $e)
+						{
 						}
-						catch (Exception $e) {
-						}
-					} else {
+					}
+					else
+					{
 						$oSearch->AddCondition($sAttCode, $defaultValue);
 					}
 				}
 			}
 		}
 	}
-
-	public function GetLinkedSetId(): string
-	{
-		return "{$this->m_sAttCode}{$this->m_sNameSuffix}";
-	}
-
-	public function GetClass(): string
-	{
-		return $this->m_sClass;
-	}
-
-	public function GetLinkedClass(): string
-	{
-		return $this->m_sLinkedClass;
-	}
-
-	public function GetAttCode(): string
-	{
-		return $this->m_sAttCode;
-	}
-
-	public function GetInputId(): string
-	{
-		return $this->m_sInputId;
-	}
-
-	public function GetNameSuffix(): string
-	{
-		return $this->m_sNameSuffix;
-	}
-
-	public function IsDuplicatesAllowed(): bool
-	{
-		return $this->m_bDuplicatesAllowed;
-	}
-
-	public function GetExternalKeyToRemote(): string
-	{
-		return $this->m_sExtKeyToRemote;
-	}
-
-	public function GetExternalKeyToMe(): string
-	{
-		return $this->m_sExtKeyToMe;
-	}
-
-	public function GetRemoteClass(): string
-	{
-		return $this->m_sRemoteClass;
-	}
-
-	public function GetEditableFields(): array
-	{
-		return $this->m_aEditableFields;
-	}
-
 }

application/ui.passwordwidget.class.inc.php

@@ -60,8 +60,8 @@ class UIPasswordWidget
 		$sChangedValue = (($sPasswordValue != '*****') || ($sConfirmPasswordValue != '*****')) ? 1 : 0;
 		$sHtmlValue = '';
 		$sHtmlValue .= '<div class="field_input_zone field_input_onewaypassword ibo-input-wrapper ibo-input-one-way-password-wrapper">';
-		$sHtmlValue .= '<input class="ibo-input" type="password" maxlength="255" name="attr_'.$sCode.'[value]" id="'.$this->iId.'" value="'.utils::EscapeHtml($sPasswordValue).'"/>';
-		$sHtmlValue .= '<div class="ibo-input-wrapper ibo-input-wrapper--with-buttons"><input class="ibo-input" type="password" maxlength="255" id="'.$this->iId.'_confirm" value="'.utils::EscapeHtml($sConfirmPasswordValue).'" name="attr_'.$sCode.'[confirm]"/>';
+		$sHtmlValue .= '<input class="ibo-input" type="password" maxlength="255" name="attr_'.$sCode.'[value]" id="'.$this->iId.'" value="'.htmlentities($sPasswordValue, ENT_QUOTES, 'UTF-8').'"/>';
+		$sHtmlValue .= '<div class="ibo-input-wrapper ibo-input-wrapper--with-buttons"><input class="ibo-input" type="password" maxlength="255" id="'.$this->iId.'_confirm" value="'.htmlentities($sConfirmPasswordValue, ENT_QUOTES, 'UTF-8').'" name="attr_'.$sCode.'[confirm]"/>';
 		$sHtmlValue .= '<div class="ibo-input-select--action-buttons"><div class="ibo-input-select--action-button ibo-input-select--action-button--create" data-tooltip-content="'.Dict::S('UI:PasswordConfirm').'"><i class="fas fa-question-circle"></i></div></div></div>';
 		$sHtmlValue .= '<button id="'.$this->iId.'_reset" class="ibo-button ibo-is-regular ibo-is-neutral" onClick="ResetPwd(\''.$this->iId.'\');">';
 		$sHtmlValue .= '<span class="ibo-button--icon fas fa-undo"></span><span class="ibo-button--label">'.Dict::S('UI:Button:ResetPassword').'</span></button>';

application/utils.inc.php

@@ -69,16 +69,6 @@ class utils
 	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_CONTEXT_PARAM = 'context_param';
-	/**
-	 * @var string To filter routes passed to back-end router before being redirected to corresponding controller / method
-	 * @since 3.1.0
-	 */
-	public const ENUM_SANITIZATION_FILTER_ROUTE = 'route';
-	/**
-	 * @var string To filter operation codes passed to back-end router before being redirected to corresponding controller (/ business logic in case of legacy operations)
-	 * @since 3.1.0
-	 */
-	public const ENUM_SANITIZATION_FILTER_OPERATION = 'operation';
 	/**
 	 * @var string
 	 * @since 3.0.0
@@ -416,8 +406,6 @@ class utils
 				break;
 
 			case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
-			case static::ENUM_SANITIZATION_FILTER_ROUTE:
-			case static::ENUM_SANITIZATION_FILTER_OPERATION:
 			case static::ENUM_SANITIZATION_FILTER_PARAMETER:
 			case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
 			case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
@@ -439,31 +427,27 @@ class utils
 					switch ($sSanitizationFilter)
 					{
 						case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
-							// Same as parameter type but keep the dot character
-							// transaction_id, the dot is mostly for Windows servers when using file storage as the tokens are named *.tmp
-							// - See N°1835
-							// - Note: It must be included at the regexp beginning otherwise you'll get an invalid character error
-							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
-							break;
-
-						case static::ENUM_SANITIZATION_FILTER_ROUTE:
-						case static::ENUM_SANITIZATION_FILTER_OPERATION:
-							// - Routes should be of the "controller_namespace_code.controller_method_name" form
-							// - Operations should be allowed to be namespaced as well even though then don't have dedicated controller yet
-							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\.A-Za-z0-9_-]*$/')));
+							// same as parameter type but keep the dot character
+							// see N°1835 : when using file transaction_id on Windows you get *.tmp tokens
+							// it must be included at the regexp beginning otherwise you'll get an invalid character error
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
+								array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
 							break;
 
 						case static::ENUM_SANITIZATION_FILTER_PARAMETER:
-							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
-							// Characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
+								array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
+							// characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
 							break;
 
 						case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
-							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
+								array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
 							break;
 
 						case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
-							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
+								array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
 							break;
 
 					}
@@ -829,20 +813,21 @@ class utils
 	 */
 	public static function StringToTime($sDate, $sFormat)
 	{
-		// Source: http://php.net/manual/fr/function.strftime.php
+	   // Source: http://php.net/manual/fr/function.strftime.php
 		// (alternative: http://www.php.net/manual/fr/datetime.formats.date.php)
 		static $aDateTokens = null;
 		static $aDateRegexps = null;
-		if (is_null($aDateTokens)) {
-			$aSpec = array(
-				'%d' => '(?<day>[0-9]{2})',
+		if (is_null($aDateTokens))
+		{
+		   $aSpec = array(
+				'%d' =>'(?<day>[0-9]{2})',
 				'%m' => '(?<month>[0-9]{2})',
 				'%y' => '(?<year>[0-9]{2})',
 				'%Y' => '(?<year>[0-9]{4})',
 				'%H' => '(?<hour>[0-2][0-9])',
 				'%i' => '(?<minute>[0-5][0-9])',
 				'%s' => '(?<second>[0-5][0-9])',
-			);
+				);
 			$aDateTokens = array_keys($aSpec);
 			$aDateRegexps = array_values($aSpec);
 		}
@@ -874,50 +859,11 @@ class utils
 	 */
 	public static function DateTimeFormatToPHP($sOldDateTimeFormat)
 	{
-		$aSearch = ['%d', '%m', '%y', '%Y', '%H', '%i', '%s'];
-		$aReplacement = ['d', 'm', 'y', 'Y', 'H', 'i', 's'];
+		$aSearch = array('%d', '%m', '%y', '%Y', '%H', '%i', '%s');
+		$aReplacement = array('d', 'm', 'y', 'Y', 'H', 'i', 's');
 		return str_replace($aSearch, $aReplacement, $sOldDateTimeFormat);
 	}
 
-	/**
-	 * Convert an old strtime() date/time format specification {@link https://www.php.net/manual/fr/function.strftime.php}
-	 * to a format compatible with \DateTime::format {@link https://www.php.net/manual/fr/datetime.format.php}
-	 *
-	 * Example: '%Y-%m-%d %H:%M:%S' => 'Y-m-d H:i:s'
-	 *
-	 * Note: Not all strftime() formats can be converted, in which case they will be present in the returned string (eg. '%U' or '%W')
-	 *
-	 * @param string $sOldStrftimeFormat
-	 *
-	 * @return string
-	 * @since 3.1.0
-	 */
-	public static function StrftimeFormatToDateTimeFormat(string $sOldStrftimeFormat): string
-	{
-		$aSearch = [
-			'%d', '%m', '%y', '%Y', '%H', '%M', '%S', // Most popular formats
-			'%a', '%A', '%e', '%j', '%u', '%w', // Day formats
-			'%U', '%V', '%W', // Week formats
-			'%b', '%B', '%h', // Month formats
-			'%C', '%g', '%G', // Year formats
-			'%k', '%I', '%l', '%p', '%P', '%r', '%R', '%T', '%X', '%z', '%Z', // Time formats
-			'%c', '%D', '%F', '%s', '%x', // Datetime formats
-			'%n', '%t', '%%', // Misc. formats
-		];
-		$aReplacement = [
-			'd', 'm', 'y', 'Y', 'H', 'i', 's',
-			'D', 'l', 'j', 'z', 'N', 'w',
-			'%U', 'W', '%W',
-			'M', 'F', 'M',
-			'%C', 'y', 'Y',
-			'G', 'h', 'g', 'A', 'a', 'h:i:s A', 'H:i', 'H:i:s', '%X', 'O', 'T',
-			'%c', 'm/d/y', 'Y-m-d', 'U', '%x',
-			'%n', '%t', '%',
-		];
-
-		return str_replace($aSearch, $aReplacement, $sOldStrftimeFormat);
-	}
-
 	/**
 	 * Allow to set cached config. Useful when running with {@link Parameters} for example.
 	 * @param \Config $oConfig
@@ -1449,83 +1395,71 @@ class utils
 	 */
 	public static function GetPopupMenuItemsBlock(iUIBlock &$oContainerBlock, $iMenuId, $param, &$aActions, $sDataTableId = null)
 	{
-		$aResult = [];
-
 		// 1st - add standard built-in menu items
 		// 
 		switch($iMenuId)
 		{
-			case iPopupMenuExtension::MENU_OBJLIST_ACTIONS:
-				// No native action there yet
-				break;
-
 			case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
-				/** @var \DBObjectSet $param */
-				$oAppContext = new ApplicationContext();
-				$sContext = $oAppContext->GetForLink();
-				$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
-				$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($param->GetFilter()->GetClass());
-				$sOQL = addslashes($param->GetFilter()->ToOQL(true));
-				$sFilter = urlencode($param->GetFilter()->serialize());
-				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
-				$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
-				$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
-				$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
+			// $param is a DBObjectSet
+			$oAppContext = new ApplicationContext();
+			$sContext = $oAppContext->GetForLink();
+			$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
+			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($param->GetFilter()->GetClass());
+			$sOQL = addslashes($param->GetFilter()->ToOQL(true));
+			$sFilter = urlencode($param->GetFilter()->serialize());
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
+			$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
+			$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
+			$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
 
-				// Configure this list on datatables
-				if (utils::IsNotNullOrEmptyString($sDataTableId)) {
-					$aResult[] = new JSPopupMenuItem(
-						'iTop::ConfigureList',
-						Dict::S('UI:ConfigureThisList'),
-						"$('#datatable_dlg_datatable_{$sDataTableId}').dialog('open'); return false;"
-					);
-					$aResult[] = new SeparatorPopupMenuItem();
+			$aResult = array();
+			if (strlen($sUrl) < SERVER_MAX_URL_LENGTH)
+			{
+				$aResult[] = new SeparatorPopupMenuItem();
+				// Static menus: Email this page, CSV Export & Add to Dashboard
+				$aResult[] = new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'),
+						"mailto:?body=".urlencode($sUrl).' ' // Add an extra space to make it work in Outlook
+				);
+			}
+			
+			if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_BULK_READ, $param) != UR_ALLOWED_NO)
+			{
+				// Bulk export actions
+				$aResult[] = new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '$sDataTableId', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")");
+				$aResult[] = new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '$sDataTableId', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")");
+				if (extension_loaded('gd'))
+				{
+					// PDF export requires GD
+					$aResult[] = new JSPopupMenuItem('UI:Menu:ExportPDF', Dict::S('UI:Menu:ExportPDF'), "ExportListDlg('$sOQL', '$sDataTableId', 'pdf', ".json_encode(Dict::S('UI:Menu:ExportPDF')).")");
 				}
-
-				if (strlen($sUrl) < SERVER_MAX_URL_LENGTH) {
-					// Static menus: Email this page, CSV Export & Add to Dashboard
-					$aResult[] = new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'),
-							"mailto:?body=".urlencode($sUrl).' ' // Add an extra space to make it work in Outlook
-					);
-				}
-
-				if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_BULK_READ, $param) != UR_ALLOWED_NO) {
-					// Bulk export actions
-					$aResult[] = new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '$sDataTableId', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")");
-					$aResult[] = new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '$sDataTableId', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")");
-					if (extension_loaded('gd'))
-					{
-						// PDF export requires GD
-						$aResult[] = new JSPopupMenuItem('UI:Menu:ExportPDF', Dict::S('UI:Menu:ExportPDF'), "ExportListDlg('$sOQL', '$sDataTableId', 'pdf', ".json_encode(Dict::S('UI:Menu:ExportPDF')).")");
-					}
-				}
-				$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL', '$sContext')");
-				$aResult[] = new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')");
-
-				break;
+			}
+			$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL', '$sContext')");
+			$aResult[] = new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')");
+				
+			break;
 
 			case iPopupMenuExtension::MENU_OBJDETAILS_ACTIONS:
-				/** @var \DBObject $param */
-				$oObj = $param;
-				$sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey();
-				$sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey());
-				$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
-				$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
-				$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
-				$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
-				$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
-				$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
-
-				$aResult = array(
-					new SeparatorPopupMenuItem(),
-					// Static menus: Email this page & CSV Export
-					new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?subject=".urlencode($oObj->GetRawName())."&body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
-					new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")"),
-					new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")"),
-					new SeparatorPopupMenuItem(),
-					new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $sUrl.'&printable=1', '_blank'),
-				);
-				break;
+			// $param is a DBObject
+			$oObj = $param;
+			$sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey();
+			$sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey());
+			$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
+			$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
+			$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
+			$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
+			$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
+			$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
+			
+			$aResult = array(
+				new SeparatorPopupMenuItem(),
+				// Static menus: Email this page & CSV Export
+				new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?subject=".urlencode($oObj->GetRawName())."&body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
+				new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")"),
+				new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")"),
+				new SeparatorPopupMenuItem(),
+				new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $sUrl.'&printable=1', '_blank'),
+			);
+			break;
 
 			case iPopupMenuExtension::MENU_DASHBOARD_ACTIONS:
 				// $param is a Dashboard
@@ -1533,19 +1467,19 @@ class utils
 				$oDashboard = $param;
 				$sDashboardId = $oDashboard->GetId();
 				$sDashboardFile = $oDashboard->GetDefinitionFile();
-				$sDashboardFileRelative = utils::LocalPath($sDashboardFile);
 				$sDlgTitle = addslashes(Dict::S('UI:ImportDashboardTitle'));
 				$sDlgText = addslashes(Dict::S('UI:ImportDashboardText'));
 				$sCloseBtn = addslashes(Dict::S('UI:Button:Cancel'));
-				$sDashboardFileJS = addslashes($sDashboardFileRelative);
-				$sDashboardFileURL = urlencode($sDashboardFileRelative);
+				$sDashboardFileJS = addslashes($sDashboardFile);
+				$sDashboardFileURL = urlencode($sDashboardFile);
 				$sUploadDashboardTransactId = utils::GetNewTransactionId();
 				$aResult = array(
 					new SeparatorPopupMenuItem(),
 					new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sDashboardId.'&file='.$sDashboardFileURL),
 					new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sDashboardId', file: '$sDashboardFileJS', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn', transaction: '$sUploadDashboardTransactId' })"),
 				);
-				if ($oDashboard->GetReloadURL()) {
+				if ($oDashboard->GetReloadURL())
+				{
 					$aResult[] = new SeparatorPopupMenuItem();
 					$aResult[] = new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $oDashboard->GetReloadURL().'&printable=1', '_blank');
 				}
@@ -1554,25 +1488,34 @@ class utils
 
 			default:
 				// Unknown type of menu, do nothing
+				$aResult = array();
 		}
-		foreach ($aResult as $oMenuItem) {
+		foreach ($aResult as $oMenuItem)
+		{
 			$aActions[$oMenuItem->GetUID()] = $oMenuItem->GetMenuItem();
 		}
 
 		// Invoke the plugins
 		//
 		/** @var \iPopupMenuExtension $oExtensionInstance */
-		foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance) {
-			if (is_object($param) && !($param instanceof DBObject)) {
+		foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
+		{
+			if (is_object($param) && !($param instanceof DBObject))
+			{
 				$tmpParam = clone $param; // In case the parameter is an DBObjectSet, clone it to prevent alterations
-			} else {
+			}
+			else
+			{
 				$tmpParam = $param;
 			}
-			foreach ($oExtensionInstance->EnumItems($iMenuId, $tmpParam) as $oMenuItem) {
-				if (is_object($oMenuItem)) {
+			foreach($oExtensionInstance->EnumItems($iMenuId, $tmpParam) as $oMenuItem)
+			{
+				if (is_object($oMenuItem))
+				{
 					$aActions[$oMenuItem->GetUID()] = $oMenuItem->GetMenuItem();
-
-					foreach ($oMenuItem->GetLinkedScripts() as $sLinkedScript) {
+					
+					foreach($oMenuItem->GetLinkedScripts() as $sLinkedScript)
+					{
 						$oContainerBlock->AddJsFileRelPath($sLinkedScript);
 					}
 				}
@@ -1580,136 +1523,6 @@ class utils
 		}
 	}
 
-	/**
-	 * We cannot use iMenuId (corresponding values in {@see \iPopupMenuExtension} constants) as value is always {@see \iPopupMenuExtension::MENU_OBJLIST_TOOLKIT}
-	 * whenever we are in a datatable, whereas it is included in a object tab, a dashlet or a search.
-	 *
-	 * So a {@see \ContextTag} is set on the corresponding calls.
-	 *
-	 * @return bool true if we are in a search page context, either directly or by the datatable ajax call
-	 *
-	 * @since 3.1.0 N°3200
-	 *
-	 * @uses \ContextTag::TAG_OBJECT_SEARCH
-	 */
-	public static function IsCurrentPageASearch(): bool
-	{
-		if (ContextTag::Check(ContextTag::TAG_OBJECT_SEARCH)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param \DBObjectSearch $oFilter object list
-	 * @param array $aExtraParams
-	 *
-	 * @return string|null null if we are already in a search, otherwise the URL to open this list in a search
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @uses utils::IsCurrentPageASearch()
-	 *
-	 * @since 3.1.0 N°3200
-	 */
-	public static function GetDataTableSearchUrl(DBSearch $oFilter, array $aExtraParams): ?string
-	{
-		if (static::IsCurrentPageASearch()) {
-			// we don't want to add the link when already in a search page !
-			return null;
-		}
-
-		$bIsObjectRelation = isset($aExtraParams['object_id'], $aExtraParams['target_attr']);
-		if ($bIsObjectRelation) {
-			[$oDataTableSearchFilter, $aParams] = static::GetDataTableSearchForRelations($oFilter, $aExtraParams);
-		} else {
-			$oDataTableSearchFilter = $oFilter;
-			$aParams = [];
-		}
-
-		if (isset($aExtraParams['table_id'])) {
-			$aParams['table_id'] = $aExtraParams['table_id'];
-		}
-		$sParams = json_encode($aParams);
-
-		$sAppRootUrl = static::GetAbsoluteUrlAppRoot();
-		$oAppContext = new ApplicationContext();
-
-		$sUrl = $sAppRootUrl
-			.'pages/UI.php?operation=search&'
-			.$oAppContext->GetForLink()
-			.'&filter='.rawurlencode($oDataTableSearchFilter->serialize());
-		$sUrl .= '&aParams='.rawurlencode($sParams); // Not working... yet, cause not handled by UI.php
-
-		return $sUrl;
-	}
-
-	/**
-	 * Rewrites filter for object relations, so that in the search page we will have the correct criteria and will be able to use "configure this list"
-	 *
-	 * @param \DBSearch $oFilter object list
-	 * @param array{link_attr: string, target_attr: string, object_id: string} $aExtraParams
-	 *
-	 * @return array{\DBObjectSearch, string[]}
-	 * @throws \CoreException
-	 * @throws \OQLException
-	 *
-	 * @since 3.1.0 N°3200
-	 */
-	private static function GetDataTableSearchForRelations(DBSearch $oFilter, array $aExtraParams): array
-	{
-		$sObjectId = $aExtraParams['object_id'];
-		$bIsLinkedSetIndirect = isset($aExtraParams['link_attr']);
-		if ($bIsLinkedSetIndirect) {
-			//--- AttributeLinkedSetIndirect (n,n => lnk class)
-			$sLnkClass = $oFilter->GetClass();
-			$sExtKeyToObjectClass = $aExtraParams['link_attr'];
-			$sExtKeyToRemoteClass = $aExtraParams['target_attr'];
-
-			/** @var \AttributeExternalKey $oLnkExtKeyToRemote */
-			$oLnkExtKeyToRemote = MetaModel::GetAttributeDef($sLnkClass, $sExtKeyToRemoteClass);
-			$sRemoteClass = $oLnkExtKeyToRemote->GetTargetClass();
-
-			/** @var \AttributeExternalKey $oLnkExtKeyToRemote */
-			$oLnkExtKeyToObject = MetaModel::GetAttributeDef($sLnkClass, $sExtKeyToObjectClass);
-			$sObjectClass = $oLnkExtKeyToObject->GetTargetClass();
-
-			/** @var \AttributeExternalKey $oLnkExtKeyToRemote */
-			$oObjectExtKeyToLnk = $oLnkExtKeyToObject->GetMirrorLinkAttribute();
-			$sObjectExtKeyToLnkClass = $oObjectExtKeyToLnk->GetCode();
-
-			$sRemoteClassAliasName = ormLinkSet::REMOTE_ALIAS;
-			$sLnkClassAliasName = ormLinkSet::LINK_ALIAS;
-			$sOql = <<<SQL
-SELECT {$sRemoteClassAliasName},{$sLnkClassAliasName}
-	FROM {$sRemoteClass} AS {$sRemoteClassAliasName}
-	JOIN {$sLnkClass} AS {$sLnkClassAliasName} ON {$sLnkClassAliasName}.$sExtKeyToRemoteClass = {$sRemoteClassAliasName}.id
-	WHERE {$sLnkClassAliasName}.$sExtKeyToObjectClass = $sObjectId
-SQL;
-
-			$aAttCodesToDisplay = MetaModel::GetAttributeLinkedSetIndirectDatatableAttCodesToDisplay($sObjectClass, $sObjectExtKeyToLnkClass, $sRemoteClass, $sExtKeyToRemoteClass);
-			/** @noinspection PhpUnnecessaryLocalVariableInspection */
-			$sAttCodesToDisplay = implode(',', $aAttCodesToDisplay);
-			$aParams = [
-				'zlist'        => false,
-				'extra_fields' => $sAttCodesToDisplay,
-			];
-		} else {
-			//--- AttributeLinkedSet (1,n => AttributeExternalKey)
-			$sClass = $oFilter->GetClass();
-			$sExtKeyCode = $aExtraParams['target_attr'];
-
-			$sOql = "SELECT $sClass WHERE $sExtKeyCode = $sObjectId";
-
-			$aParams = [];
-		}
-
-		$oDataTableSearchFilter = DBSearch::FromOQL($sOql);
-
-		return [$oDataTableSearchFilter, $aParams];
-	}
-
 	/**
 	 * @param string $sEnvironment
 	 *
@@ -1717,10 +1530,10 @@ SQL;
 	 */
 	public static function GetConfigFilePath($sEnvironment = null)
 	{
-		if (is_null($sEnvironment)) {
+		if (is_null($sEnvironment))
+		{
 			$sEnvironment = self::GetCurrentEnvironment();
 		}
-
 		return APPCONF.$sEnvironment.'/'.ITOP_CONFIG_FILE;
 	}
 
@@ -2014,7 +1827,7 @@ SQL;
 	 */
 	public static function HtmlEntities($sValue)
 	{
-		return htmlentities($sValue ?? '', ENT_QUOTES, 'UTF-8');
+		return htmlentities($sValue, ENT_QUOTES, 'UTF-8');
 	}
 
 	/**
@@ -2030,7 +1843,7 @@ SQL;
 	public static function EscapeHtml($sValue)
 	{
 		return htmlspecialchars(
-			$sValue ?? '',
+			$sValue,
 			ENT_QUOTES | ENT_DISALLOWED | ENT_HTML5,
 			WebPage::PAGES_CHARSET,
 			false
@@ -2079,8 +1892,7 @@ SQL;
 	{
 		$sText = str_replace("\r\n", "\n", $sText);
 		$sText = str_replace("\r", "\n", $sText);
-
-		return str_replace("\n", '<br/>', utils::EscapeHtml($sText));
+		return str_replace("\n", '<br/>', htmlentities($sText, ENT_QUOTES, 'UTF-8'));
 	}
 	
 	/**
@@ -2144,23 +1956,33 @@ SQL;
 		$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
 		set_time_limit(0);
 		// Compiling SASS
-		$oCompilationRes = $oSass->compileString($sSassContent);
+		$sCss = $oSass->compileString($sSassContent);
 		set_time_limit(intval($iCurrentMaxExecTime));
 
-		return $oCompilationRes->getCss();
+		return $sCss->getCss();
 	}
-
-	/**
-	 * Get the size of an image from a string.
-	 *
-	 * @see \getimagesizefromstring()
-	 * @param $sImageData string The image data, as a string.
-	 *
-	 * @return array|false
-	 */
+	
 	public static function GetImageSize($sImageData)
 	{
-		return @getimagesizefromstring($sImageData);
+		if (function_exists('getimagesizefromstring')) // PHP 5.4.0 or higher
+		{
+			$aRet = @getimagesizefromstring($sImageData);
+		}
+		else if(ini_get('allow_url_fopen'))
+		{
+			// work around to avoid creating a tmp file
+			$sUri = 'data://application/octet-stream;base64,'.base64_encode($sImageData);
+			$aRet = @getimagesize($sUri);
+		}
+		else
+		{
+			// Damned, need to create a tmp file
+			$sTempFile = tempnam(SetupUtils::GetTmpDir(), 'img-');
+			@file_put_contents($sTempFile, $sImageData);
+			$aRet = @getimagesize($sTempFile);
+			@unlink($sTempFile);
+		}
+		return $aRet;
 	}
 
 	/**
@@ -2906,24 +2728,10 @@ HTML;
 			$aAutoloadClassMaps = array_merge($aAutoloadClassMaps, glob(APPROOT.'env-'.utils::GetCurrentEnvironment().'/*/vendor/composer/autoload_classmap.php'));
 
 			$aClassMap = [];
-			$aAutoloaderErrors = [];
 			foreach ($aAutoloadClassMaps as $sAutoloadFile) {
-				if (false === static::RealPath($sAutoloadFile, APPROOT)) {
-					// can happen when we still have the autoloader symlink in env-*, but it points to a file that no longer exists
-					$aAutoloaderErrors[] = $sAutoloadFile;
-					continue;
-				}
 				$aTmpClassMap = include $sAutoloadFile;
-				/** @noinspection SlowArrayOperationsInLoopInspection we are getting an associative array so the documented workarounds cannot be used */
 				$aClassMap = array_merge($aClassMap, $aTmpClassMap);
 			}
-			if (count($aAutoloaderErrors) > 0) {
-				IssueLog::Debug(
-					"\utils::GetClassesForInterface cannot load some of the autoloader files",
-					LogChannels::CORE,
-					['autoloader_errors' => $aAutoloaderErrors]
-				);
-			}
 
 			// Add already loaded classes
 			$aCurrentClasses = array_fill_keys(get_declared_classes(), '');
@@ -2931,24 +2739,18 @@ HTML;
 
 			foreach ($aClassMap as $sPHPClass => $sPHPFile) {
 				$bSkipped = false;
-
+				
 				// Check if our class matches name filter, or is in an excluded path
 				if ($sClassNameFilter !== '' && strpos($sPHPClass, $sClassNameFilter) === false) {
 					$bSkipped = true;
 				}
 				else {
-					$sPHPFile = self::LocalPath($sPHPFile);
-					if ($sPHPFile !== false) {
-						$sPHPFile = '/'.$sPHPFile; // for regex
-						foreach ($aExcludedPath as $sExcludedPath) {
-							// Note: We use '#' as delimiters as usual '/' is often used in paths.
-							if ($sExcludedPath !== '' && preg_match('#'.$sExcludedPath.'#', $sPHPFile) === 1) {
-								$bSkipped = true;
-								break;
-							}
+					foreach ($aExcludedPath as $sExcludedPath) {
+						// Note: We use '#' as delimiters as usual '/' is often used in paths.
+						if ($sExcludedPath !== '' && preg_match('#'.$sExcludedPath.'#', $sPHPFile) === 1) {
+							$bSkipped = true;
+							break;
 						}
-					} else {
-						$bSkipped = true; // file not found
 					}
 				}
 				
@@ -2986,7 +2788,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', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]'));
 
 		foreach ($aShortcutClasses as $cShortcutPlugin) {
 			$sTriggeredElement = $cShortcutPlugin::GetShortcutTriggeredElementSelector();
@@ -3213,35 +3015,18 @@ HTML;
 	}
 
 	/**
+	 * Transform a snake_case $sInput into a CamelCase string
+	 *
 	 * @param string $sInput
 	 *
-	 * @return string Camel case representation of $sInput (eg. "something_new" becomes "SomethingNew")
+	 * @return string
 	 * @since 2.7.0
 	 */
-	public static function ToCamelCase($sInput): string
+	public static function ToCamelCase($sInput)
 	{
 		return str_replace(' ', '', ucwords(strtr($sInput, '_-', '  ')));
 	}
 
-	/**
-	 * @param string $sInput
-	 *
-	 * @return string Snake case representation of $sInput (eg. "SomethingNew" becomes "something_new")
-	 * @since 3.1.0
-	 * @link https://stackoverflow.com/a/19533226/2710325
-	 */
-	public static function ToSnakeCase(string $sInput): string
-	{
-		// Remove special chars to join words
-		$sOutput = preg_replace('/(\W)/', '_', $sInput);
-		// Transform camel case words to snake case
-		$sOutput = preg_replace('/[A-Z]([A-Z](?![a-z]))*/', '_$0', $sOutput);
-		// Lowercase everything
-		$sOutput = mb_strtolower($sOutput);
-		// Trim outer underscores
-		return trim($sOutput, '_');
-	}
-
 	/**
 	 * @param string $sInput
 	 *
@@ -3354,50 +3139,15 @@ HTML;
 	 */
 	public static function AddParameterToUrl(string $sUrl, string $sParamName, string $sParamValue): string
 	{
-		if (strpos($sUrl, '?') === false) {
+		if (strpos($sUrl, '?') === false)
+		{
 			$sUrl = $sUrl.'?'.urlencode($sParamName).'='.urlencode($sParamValue);
-		} else {
+		}
+		else
+		{
 			$sUrl = $sUrl.'&'.urlencode($sParamName).'='.urlencode($sParamValue);
 		}
 
 		return $sUrl;
 	}
-
-	/**
-	 * Return traits array used by a class and by parent classes hierarchy.
-	 *
-	 * @see https://www.php.net/manual/en/function.class-uses.php#110752
-	 *
-	 * @param string $sClass Class to scan
-	 * @param bool $bAutoload Autoload flag
-	 *
-	 * @return array traits used
-	 * @since 3.1.0
-	 */
-	public static function TraitsUsedByClass(string $sClass, bool $bAutoload = true): array
-	{
-		$aTraits = [];
-		do {
-			$aTraits = array_merge(class_uses($sClass, $bAutoload), $aTraits);
-		} while ($sClass = get_parent_class($sClass));
-		foreach ($aTraits as $sTrait => $same) {
-			$aTraits = array_merge(class_uses($sTrait, $bAutoload), $aTraits);
-		}
-
-		return array_unique($aTraits);
-	}
-
-	/**
-	 * Test trait usage by a class or by parent classes hierarchy.
-	 *
-	 * @param string $sTrait Trait to search for
-	 * @param string $sClass Class to check
-	 *
-	 * @return bool
-	 * @since 3.1.0
-	 */
-	public static function IsTraitUsedByClass(string $sTrait, string $sClass): bool
-	{
-		return in_array($sTrait, self::TraitsUsedByClass($sClass, true));
-	}
 }

application/webpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/WebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/WebPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/WebPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/WebPage.php, now loadable using autoloader');

application/wizardhelper.class.inc.php

@@ -60,20 +60,16 @@ class WizardHelper
 					// special handling for lists
 					// assumes this is handled as an array of objects
 					// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
-					if (!is_array($value)) {
-						$aData = json_decode($value, true); // true means decode as a hash array (not an object)
-					} else {
-						$aData = $value;
-					}
-
+					$aData = json_decode($value, true); // true means decode as a hash array (not an object)
 					// Check what are the meaningful attributes
 					$aFields = $this->GetLinkedWizardStructure($oAttDef);
 					$sLinkedClass = $oAttDef->GetLinkedClass();
 					$aLinkedObjectsArray = array();
-					if (!is_array($aData)) {
-						echo("aData: '$aData' (value: '$value')\n");
+					if (!is_array($aData))
+					{
+						echo ("aData: '$aData' (value: '$value')\n");
 					}
-					foreach ($aData as $aLinkedObject)
+					foreach($aData as $aLinkedObject)
 					{
 						$oLinkedObj = MetaModel::NewObject($sLinkedClass);
 						foreach($aFields as $sLinkedAttCode)
@@ -363,10 +359,6 @@ class WizardHelper
 JS;
 	}
 
-	/*
-	 * Function with an old pattern of code
-	 * @deprecated 3.1.0
-	*/
 	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
 	{
 		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object

application/xmlpage.class.inc.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/XMLPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/XMLPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/XMLPage.php, now loadable using autoloader');
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/application/WebPage/XMLPage.php, now loadable using autoloader');

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.0');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,6 +23,6 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.1');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.1.0');
+define('ITOP_CORE_VERSION', '3.0.2');
 
 require_once APPROOT.'bootstrap.inc.php';

composer.json

@@ -4,7 +4,7 @@
   "type": "project",
   "license": "AGPL-3.0-only",
   "require": {
-    "php": ">=7.4.0 <8.2.0",
+    "php": ">=7.1.3 <8.0.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -12,26 +12,27 @@
     "ext-json": "*",
     "ext-mysqli": "*",
     "ext-soap": "*",
-    "apereo/phpcas" : "~1.6.0",
     "combodo/tcpdf": "~6.4.4",
-    "guzzlehttp/guzzle": "^7.4.5",
+    "guzzlehttp/guzzle": "^6.5.8",
     "laminas/laminas-mail": "^2.11",
     "laminas/laminas-servicemanager": "^3.5",
     "league/oauth2-google": "^3.0",
-    "nikic/php-parser": "~4.14.0",
+    "nikic/php-parser": "~4.13.2",
     "pear/archive_tar": "~1.4.14",
-    "pelago/emogrifier": "^6.0.0",
+    "pelago/emogrifier": "~3.1.0",
     "scssphp/scssphp": "^1.10.3",
-    "symfony/console": "5.4.*",
-    "symfony/dotenv": "5.4.*",
-    "symfony/framework-bundle": "5.4.*",
-    "symfony/twig-bundle": "5.4.*",
-    "symfony/yaml": "5.4.*",
-    "thenetworg/oauth2-azure": "^2.0"
+    "swiftmailer/swiftmailer": "~6.3.0",
+    "symfony/console": "~3.4.47",
+    "symfony/dotenv": "~3.4.47",
+    "symfony/framework-bundle": "~3.4.47",
+    "symfony/twig-bundle": "~3.4.47",
+    "symfony/yaml": "~3.4.47",
+    "thenetworg/oauth2-azure": "^2.0",
+    "twig/twig": "~1.43.1"
   },
   "require-dev": {
-    "symfony/stopwatch": "5.4.*",
-    "symfony/web-profiler-bundle": "5.4.*"
+    "symfony/stopwatch": "~3.4.47",
+    "symfony/web-profiler-bundle": "~3.4.47"
   },
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
@@ -43,7 +44,7 @@
   },
   "config": {
     "platform": {
-      "php": "7.4.0"
+      "php": "7.1.3"
     },
     "vendor-dir": "lib",
     "preferred-install": {
@@ -60,7 +61,6 @@
       "sources"
     ],
     "exclude-from-classmap": [
-      "application/twigextension.class.inc.php",
       "core/oql/build/PHP/",
       "core/apc-emulation.php",
       "application/startup.inc.php",

core/MyHelpers.class.inc.php

@@ -470,9 +470,9 @@ class Str
 	public static function pure2html($pure, $maxLength = false)
 	{
 		// Check for HTML entities, but be careful the DB is in UTF-8
-		return $maxLength
-			? utils::EscapeHtml(substr($pure, 0, $maxLength))
-			: utils::EscapeHtml($pure);
+		return $maxLength                                         
+			? htmlentities(substr($pure, 0, $maxLength), ENT_QUOTES, 'UTF-8')
+			: htmlentities($pure, ENT_QUOTES, 'UTF-8');
 	}
 	public static function pure2sql($pure, $maxLength = false)
 	{

core/action.class.inc.php

@@ -43,24 +43,22 @@ abstract class Action extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"                   => "grant_by_profile,core/cmdb",
-			"key_type"                   => "autoincrement",
-			"name_attcode"               => "name",
-			"complementary_name_attcode" => array('finalclass', 'description'),
-			"state_attcode"              => "",
-			"reconc_keys"                => array('name'),
-			"db_table"                   => "priv_action",
-			"db_key_field"               => "id",
-			"db_finalclass_field"        => "realclass",
-			'style'                      => new ormStyle(null, null, null, null, null, '../images/icons/icons8-in-transit.svg'),
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_action",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			'style' =>  new ormStyle(null, null, null, null, null, '../images/icons/icons8-in-transit.svg'),
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values" => new ValueSetEnum(array('test' => 'Being tested', 'enabled' => 'In production', 'disabled' => 'Inactive')), "sql" => "status", "default_value" => "test", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list",
-			array("linked_class" => "lnkTriggerAction", "ext_key_to_me" => "action_id", "ext_key_to_remote" => "trigger_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array(), "display_style" => 'property')));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum(array('test'=>'Being tested' ,'enabled'=>'In production', 'disabled'=>'Inactive')), "sql"=>"status", "default_value"=>"test", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 
 		// Display lists
 		// - Attributes to be displayed for the complete details
@@ -568,7 +566,7 @@ class ActionEmail extends ActionNotification
 				// Prefix
 				$sPrefix = sprintf('%s_%s_%d', $sAppName, $sObjClass, $sObjId);
 				if ($sHeaderName === static::ENUM_HEADER_NAME_MESSAGE_ID) {
-					$sPrefix .= sprintf('_%F', microtime(true /* get as float*/));
+					$sPrefix .= sprintf('_%f', microtime(true /* get as float*/));
 				}
 				// Suffix
 				$sSuffix = sprintf('@%s.openitop.org', MetaModel::GetEnvironmentId());

core/asynctask.class.inc.php

@@ -181,7 +181,7 @@ abstract class AsyncTask extends DBObject
 	    if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
 	    {
 	        $aConfig = $aRetries[get_class($this)];
-		    $bExponential = (bool) ($aConfig['exponential_delay'] ?? $bExponential);
+	        $bExponential = (bool)$aConfig['exponential_delay'] ?? $bExponential;
 	    }
 	    return $bExponential;
 	}
@@ -409,6 +409,8 @@ class AsyncSendEmail extends AsyncTask
 		$oNew->Set('to', $oEMail->GetRecipientTO(true /* string */));
 		$oNew->Set('subject', $oEMail->GetSubject());
 
+//		$oNew->Set('version', 1);
+//		$sMessage = serialize($oEMail);
 		$oNew->Set('version', 2);
 		$sMessage = $oEMail->SerializeV2();
 		$oNew->Set('message', $sMessage);

core/attributedef.class.inc.php

@@ -5,15 +5,12 @@
  */
 
 use Combodo\iTop\Application\UI\Base\Component\FieldBadge\FieldBadgeUIBlockFactory;
-use Combodo\iTop\Application\UI\Links\Indirect\BlockLinksSetDisplayAsProperty;
 use Combodo\iTop\Form\Field\LabelField;
 use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Form;
 use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator;
 use Combodo\iTop\Form\Validator\Validator;
 use Combodo\iTop\Renderer\BlockRenderer;
-use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
-use Combodo\iTop\Service\Links\LinkSetModel;
 
 require_once('MyHelpers.class.inc.php');
 require_once('ormdocument.class.inc.php');
@@ -92,15 +89,8 @@ define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
 define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
 define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
 
-define('LINKSET_RELATIONTYPE_PROPERTY', 'property');
-define('LINKSET_RELATIONTYPE_LINK', 'link');
-
-define('LINKSET_DISPLAY_STYLE_PROPERTY', 'property');
-define('LINKSET_DISPLAY_STYLE_TAB', 'tab');
-
 /**
  * Attributes implementing this interface won't be accepted as `group by` field
- *
  * @since 2.7.4 N°3473
  */
 interface iAttributeNoGroupBy
@@ -146,15 +136,6 @@ abstract class AttributeDefinition
 
 	abstract public function GetEditClass();
 
-	/**
-	 * @return array Css classes
-	 * @since 3.1.0 N°3190
-	 */
-	public function GetCssClasses(): array
-	{
-		return $this->aCSSClasses;
-	}
-
 	/**
 	 * Return the search widget type corresponding to this attribute
 	 *
@@ -376,18 +357,6 @@ abstract class AttributeDefinition
 		return false;
 	}
 
-	/**
-	 * Returns true if the attribute can be used in bulk modify.
-	 *
-	 * @return bool
-	 * @since 3.1.0 N°3190
-	 *
-	 */
-	public static function IsBulkModifyCompatible(): bool
-	{
-		return static::IsScalar();
-	}
-
 	/**
 	 * Returns true if the attribute value is a set of related objects (1-N or N-N)
 	 *
@@ -651,16 +620,6 @@ abstract class AttributeDefinition
 		return $sLabel;
 	}
 
-	/**
-	 * @return bool True if the attribute has a description {@see \AttributeDefinition::GetDescription()}
-	 * @throws \Exception
-	 * @since 3.1.0
-	 */
-	public function HasDescription(): bool
-	{
-		return utils::IsNotNullOrEmptyString($this->GetDescription());
-	}
-
 	/**
 	 * @param string|null $sDefault
 	 *
@@ -895,11 +854,6 @@ abstract class AttributeDefinition
 	//abstract protected GetBasicFilterHTMLInput();
 	abstract public function GetBasicFilterSQLExpr($sOpCode, $value);
 
-	/**
-	 *  since 3.1.0 return has changed (N°4690 - Deprecate "FilterCodes")
-	 *
-	 * @return array filtercode => attributecode
-	 */
 	public function GetFilterDefinitions()
 	{
 		return array();
@@ -1454,7 +1408,6 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function __construct($sCode, $aParams)
 	{
 		parent::__construct($sCode, $aParams);
-		$this->aCSSClasses[] = 'attribute-set';
 	}
 
 	public static function ListExpectedParams()
@@ -1468,12 +1421,6 @@ class AttributeLinkedSet extends AttributeDefinition
 		return "LinkedSet";
 	}
 
-	/** @inheritDoc */
-	public static function IsBulkModifyCompatible(): bool
-	{
-		return false;
-	}
-
 	public function IsWritable()
 	{
 		return true;
@@ -1491,26 +1438,7 @@ class AttributeLinkedSet extends AttributeDefinition
 
 	public function GetValuesDef()
 	{
-		$oValSetDef = $this->Get("allowed_values");
-		if (!$oValSetDef) {
-			// Let's propose every existing value
-			$oValSetDef = new ValueSetObjects('SELECT '.LinkSetModel::GetTargetClass($this));
-		}
-
-		return $oValSetDef;
-	}
-
-	public function GetEditValue($value, $oHostObj = null)
-	{
-		/** @var ormLinkSet $value * */
-		if ($value->Count() === 0) {
-			return '';
-		}
-
-		/** Return linked objects key as string **/
-		$aValues = $value->GetValues();
-
-		return implode(' ', $aValues);
+		return $this->Get("allowed_values");
 	}
 
 	public function GetPrerequisiteAttributes($sClass = null)
@@ -1577,42 +1505,11 @@ class AttributeLinkedSet extends AttributeDefinition
 		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_default'));
 	}
 
-	/**
-	 * @return string see LINKSET_EDITMODE_* constants
-	 * @since 3.1.0 N°5563 relations are edited using new attributes in details mode, but as nothing changed in edit mode we are still using edit_mode attribute
-	 */
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
 	}
 
-	/**
-	 * @return string see LINKSET_RELATIONTYPE_* constants
-	 * @since 3.1.0 N°5563
-	 */
-	public function GetRelationType()
-	{
-		return $this->GetOptional('relation_type', LINKSET_RELATIONTYPE_LINK);
-	}
-
-	/**
-	 * @return string see LINKSET_DISPLAY_STYLE_* constants
-	 * @since 3.1.0 N°3190
-	 */
-	public function GetDisplayStyle()
-	{
-		return $this->GetOptional('display_style', LINKSET_DISPLAY_STYLE_TAB);
-	}
-
-	/**
-	 * @return boolean
-	 * @since 3.1.0 N°5563
-	 */
-	public function GetReadOnly()
-	{
-		return $this->GetOptional('read_only', false);
-	}
-
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
@@ -1638,30 +1535,49 @@ class AttributeLinkedSet extends AttributeDefinition
 		return '';
 	}
 
-	/** @inheritDoc * */
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true): string
+	/**
+	 * @param string $sValue
+	 * @param \DBObject $oHostObject
+	 * @param bool $bLocalize
+	 *
+	 * @return string|null
+	 *
+	 * @throws \CoreException
+	 */
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
 	{
-		try {
-
-			/** @var ormLinkSet $sValue */
-			if ($sValue->Count() === 0) {
-				return '';
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$aItems = array();
+			while ($oObj = $sValue->Fetch())
+			{
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($this->GetLinkedClass()) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == $this->GetExtKeyToMe())
+					{
+						continue;
+					}
+					if ($oAttDef->IsExternalField())
+					{
+						continue;
+					}
+					$sAttValue = $oObj->GetAsHTML($sAttCode);
+					if (strlen($sAttValue) > 0)
+					{
+						$aAttributes[] = $sAttValue;
+					}
+				}
+				$sAttributes = implode(', ', $aAttributes);
+				$aItems[] = $sAttributes;
 			}
 
-			$oLinkSetBlock = new BlockLinksSetDisplayAsProperty($this->GetCode(), $this, $sValue);
-
-			return ConsoleBlockRenderer::RenderBlockTemplates($oLinkSetBlock);
+			return implode('<br/>', $aItems);
 		}
-		catch (Exception $e) {
-			$sMessage = "Error while displaying attribute {$this->GetCode()}";
-			IssueLog::Error($sMessage, IssueLog::CHANNEL_DEFAULT, [
-				'host_object_class' => $this->GetHostClass(),
-				'host_object_key'   => $oHostObject->GetKey(),
-				'attribute'         => $this->GetCode(),
-			]);
 
-			return $sMessage;
-		}
+		return null;
 	}
 
 	/**
@@ -2368,15 +2284,6 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet
 		return $this->GetOptional("duplicates", false);
 	} // The same object may be linked several times... or not...
 
-	/**
-	 * @return boolean
-	 * @since 3.1.0 N°5563
-	 */
-	public function GetReadOnly()
-	{
-		return $this->GetOptional('read_only', false);
-	}
-
 	public function GetTrackingLevel()
 	{
 		return $this->GetOptional('tracking_level',
@@ -2414,13 +2321,6 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet
 
 		return $oRet;
 	}
-
-	/** @inheritDoc */
-	public static function IsBulkModifyCompatible(): bool
-	{
-		return true;
-	}
-
 }
 
 /**
@@ -2552,7 +2452,7 @@ class AttributeDBFieldVoid extends AttributeDefinition
 
 	public function GetFilterDefinitions()
 	{
-		return array($this->GetCode() => $this->GetCode());
+		return array($this->GetCode() => new FilterFromAttribute($this));
 	}
 
 	public function GetBasicFilterOperators()
@@ -4274,21 +4174,20 @@ class AttributeText extends AttributeString
 
 	public function GetEditValue($sValue, $oHostObj = null)
 	{
-		// N°4517 - PHP 8.1 compatibility: str_replace call with null cause deprecated message
-		if ($sValue == null) {
-			return '';
-		}
-
-		if ($this->GetFormat() == 'text') {
-			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER)) {
-				foreach ($aAllMatches as $iPos => $aMatches) {
+		if ($this->GetFormat() == 'text')
+		{
+			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
+			{
+				foreach($aAllMatches as $iPos => $aMatches)
+				{
 					$sClass = trim($aMatches[1]);
 					$sName = trim($aMatches[2]);
 					$sLabel = (!empty($aMatches[4])) ? trim($aMatches[4]) : null;
 
-					if (MetaModel::IsValidClass($sClass)) {
+					if (MetaModel::IsValidClass($sClass))
+					{
 						$sClassLabel = MetaModel::GetName($sClass);
-						$sReplacement = "[[$sClassLabel:$sName".(!empty($sLabel) ? " | $sLabel" : "")."]]";
+						$sReplacement = "[[$sClassLabel:$sName" . (!empty($sLabel) ? " | $sLabel" : "") . "]]";
 						$sValue = str_replace($aMatches[0], $sReplacement, $sValue);
 					}
 				}
@@ -4325,31 +4224,31 @@ class AttributeText extends AttributeString
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		$sValue = $proposedValue;
-
-		// N°4517 - PHP 8.1 compatibility: str_replace call with null cause deprecated message
-		if ($sValue == null) {
-			return '';
-		}
-
-		switch ($this->GetFormat()) {
+		switch ($this->GetFormat())
+		{
 			case 'html':
-				if (($sValue !== null) && ($sValue !== '')) {
+				if (($sValue !== null) && ($sValue !== ''))
+				{
 					$sValue = HTMLSanitizer::Sanitize($sValue);
 				}
 				break;
 
 			case 'text':
 			default:
-				if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER)) {
-					foreach ($aAllMatches as $iPos => $aMatches) {
+				if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
+				{
+					foreach($aAllMatches as $iPos => $aMatches)
+					{
 						$sClassLabel = trim($aMatches[1]);
 						$sName = trim($aMatches[2]);
-						$sLabel = (!empty($aMatches[4])) ? trim($aMatches[4]) : null;
+                        $sLabel = (!empty($aMatches[4])) ? trim($aMatches[4]) : null;
 
-						if (!MetaModel::IsValidClass($sClassLabel)) {
+						if (!MetaModel::IsValidClass($sClassLabel))
+						{
 							$sClass = MetaModel::GetClassFromLabel($sClassLabel);
-							if ($sClass) {
-								$sReplacement = "[[$sClassLabel:$sName".(!empty($sLabel) ? " | $sLabel" : "")."]]";
+							if ($sClass)
+							{
+                                $sReplacement = "[[$sClassLabel:$sName" . (!empty($sLabel) ? " | $sLabel" : "") . "]]";
 								$sValue = str_replace($aMatches[0], $sReplacement, $sValue);
 							}
 						}
@@ -6117,9 +6016,7 @@ class AttributeDateTime extends AttributeDBField
 
 	public function GetDefaultValue(DBObject $oHostObject = null)
 	{
-		if (!$this->IsNullAllowed()) {
-			return date($this->GetInternalFormat());
-		}
+		// null value will be replaced by the current date, if not already set, in DoComputeValues
 		return $this->GetNullValue();
 	}
 
@@ -7595,7 +7492,7 @@ class AttributeExternalField extends AttributeDefinition
 
 	public function GetFilterDefinitions()
 	{
-		return array($this->GetCode() => $this->GetCode());
+		return array($this->GetCode() => new FilterFromAttribute($this));
 	}
 
 	public function GetBasicFilterOperators()
@@ -7909,7 +7806,7 @@ class AttributeBlob extends AttributeDefinition
 
 	public function GetDefaultValue(DBObject $oHostObject = null)
 	{
-		return new ormDocument('', '', '');
+		return "";
 	}
 
 	public function IsNullAllowed(DBObject $oHostObject = null)
@@ -8258,11 +8155,6 @@ class AttributeImage extends AttributeBlob
 		return $oDoc;
 	}
 
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		return new ormDocument('', '', '');
-	}
-
 	/**
 	 * Check that the supplied ormDocument actually contains an image
 	 * {@inheritDoc}
@@ -8637,17 +8529,18 @@ class AttributeStopWatch extends AttributeDefinition
 	public function GetFilterDefinitions()
 	{
 		$aRes = array(
-			$this->GetCode()              => $this->GetCode(),
-			$this->GetCode().'_started'   => $this->GetCode(),
-			$this->GetCode().'_laststart' => $this->GetCode(),
-			$this->GetCode().'_stopped'   => $this->GetCode(),
+			$this->GetCode() => new FilterFromAttribute($this),
+			$this->GetCode().'_started' => new FilterFromAttribute($this, '_started'),
+			$this->GetCode().'_laststart' => new FilterFromAttribute($this, '_laststart'),
+			$this->GetCode().'_stopped' => new FilterFromAttribute($this, '_stopped')
 		);
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo) {
+		foreach($this->ListThresholds() as $iThreshold => $aFoo)
+		{
 			$sPrefix = $this->GetCode().'_'.$iThreshold;
-			$aRes[$sPrefix.'_deadline'] = $this->GetCode();
-			$aRes[$sPrefix.'_passed'] = $this->GetCode();
-			$aRes[$sPrefix.'_triggered'] = $this->GetCode();
-			$aRes[$sPrefix.'_overrun'] = $this->GetCode();
+			$aRes[$sPrefix.'_deadline'] = new FilterFromAttribute($this, '_deadline');
+			$aRes[$sPrefix.'_passed'] = new FilterFromAttribute($this, '_passed');
+			$aRes[$sPrefix.'_triggered'] = new FilterFromAttribute($this, '_triggered');
+			$aRes[$sPrefix.'_overrun'] = new FilterFromAttribute($this, '_overrun');
 		}
 
 		return $aRes;
@@ -9389,7 +9282,7 @@ class AttributeSubItem extends AttributeDefinition
 
 	public function GetFilterDefinitions()
 	{
-		return array($this->GetCode() => $this->GetCode());
+		return array($this->GetCode() => new FilterFromAttribute($this));
 	}
 
 	public function GetBasicFilterOperators()
@@ -11454,13 +11347,6 @@ class AttributeTagSet extends AttributeSet
 		return new ormTagSet(MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()), $this->GetCode(), $this->GetMaxItems());
 	}
 
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$oTagSet =  new ormTagSet(MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()), $this->GetCode(), $this->GetMaxItems());
-		$oTagSet->SetValues([]);
-		return $oTagSet;
-	}
-
 	public function IsNull($proposedValue)
 	{
 		if (is_null($proposedValue))
@@ -12055,7 +11941,7 @@ class AttributeFriendlyName extends AttributeDefinition
 
 	public function GetFilterDefinitions()
 	{
-		return array($this->GetCode() => $this->GetCode());
+		return array($this->GetCode() => new FilterFromAttribute($this));
 	}
 
 	public function GetBasicFilterOperators()
@@ -12892,7 +12778,7 @@ class AttributeCustomFields extends AttributeDefinition
 			$sRet = $value->GetAsHTML($bLocalize);
 		} catch (Exception $e)
 		{
-			$sRet = 'Custom field error: '.utils::EscapeHtml($e->getMessage());
+			$sRet = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
 		}
 
 		return $sRet;
@@ -13192,7 +13078,7 @@ class AttributeObsolescenceFlag extends AttributeBoolean
 
 	public function GetDefaultValue(DBObject $oHostObject = null)
 	{
-		return $this->MakeRealValue(false, $oHostObject);
+		return $this->MakeRealValue("", $oHostObject);
 	}
 
 	public function IsNullAllowed()

core/autoload.php

@@ -21,7 +21,6 @@ MetaModel::IncludeModule('application/menunode.class.inc.php');
 MetaModel::IncludeModule('application/user.preferences.class.inc.php');
 MetaModel::IncludeModule('application/user.dashboard.class.inc.php');
 MetaModel::IncludeModule('application/audit.rule.class.inc.php');
-MetaModel::IncludeModule('application/audit.domain.class.inc.php');
 MetaModel::IncludeModule('application/query.class.inc.php');
 MetaModel::IncludeModule('setup/moduleinstallation.class.inc.php');
 

core/bulkchange.class.inc.php

@@ -1160,112 +1160,136 @@ class BulkChange
 		}
 		$iPreviousTimeLimit = ini_get('max_execution_time');
 		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-
-		// Avoid too many events
-		cmdbAbstractObject::SetEventDBLinksChangedBlocked(true);
-		try {
-			foreach ($this->m_aData as $iRow => $aRowData) {
-				set_time_limit(intval($iLoopTimeLimit));
-				if (isset($aResult[$iRow]["__STATUS__"])) {
-					// An issue at the earlier steps - skip the rest
-					continue;
-				}
-				try {
-					$oReconciliationFilter = new DBObjectSearch($this->m_sClass);
-					$bSkipQuery = false;
-					foreach ($this->m_aReconcilKeys as $sAttCode) {
-						$valuecondition = null;
-						if (array_key_exists($sAttCode, $this->m_aExtKeys)) {
-							if ($this->IsNullExternalKeySpec($aRowData, $sAttCode)) {
-								$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-								if ($oExtKey->IsNullAllowed()) {
-									$valuecondition = $oExtKey->GetNullValue();
-									$aResult[$iRow][$sAttCode] = new CellStatus_Void($oExtKey->GetNullValue());
-								} else {
-									$aResult[$iRow][$sAttCode] = new CellStatus_NullIssue();
-								}
-							} else {
-								// The value has to be found or verified
-
-								/** var DBObjectSearch $oReconFilter */
-								list($oReconFilter, $aMatches) = $this->ResolveExternalKey($aRowData, $sAttCode, $aResult[$iRow]);
-
-								if (count($aMatches) == 1) {
-									$oRemoteObj = reset($aMatches); // first item
-									$valuecondition = $oRemoteObj->GetKey();
-									$aResult[$iRow][$sAttCode] = new CellStatus_Void($oRemoteObj->GetKey());
-								} elseif (count($aMatches) == 0) {
-									$oCellStatus_SearchIssue = $this->GetCellSearchIssue($oReconFilter);
-									$aResult[$iRow][$sAttCode] = $oCellStatus_SearchIssue;
-								} else {
-									$aResult[$iRow][$sAttCode] = new CellStatus_Ambiguous(null, count($aMatches), $oReconFilter->serialize());
-								}
-							}
-						} else {
-							// The value is given in the data row
-							$iCol = $this->m_aAttList[$sAttCode];
-							if ($sAttCode == 'id') {
-								$valuecondition = $aRowData[$iCol];
-							} else {
-								$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-								$valuecondition = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
-							}
-						}
-						if (is_null($valuecondition)) {
-							$bSkipQuery = true;
-						} else {
-							$oReconciliationFilter->AddCondition($sAttCode, $valuecondition, '=');
-						}
-					}
-					if ($bSkipQuery) {
-						$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Reconciliation'));
-					} else {
-						$oReconciliationSet = new CMDBObjectSet($oReconciliationFilter);
-						switch ($oReconciliationSet->Count()) {
-							case 0:
-								$oTargetObj = $this->CreateObject($aResult, $iRow, $aRowData, $oChange);
-								// $aResult[$iRow]["__STATUS__"]=> set in CreateObject
-								$aVisited[] = $oTargetObj->GetKey();
-								break;
-							case 1:
-								$oTargetObj = $oReconciliationSet->Fetch();
-								$this->UpdateObject($aResult, $iRow, $oTargetObj, $aRowData, $oChange);
-								// $aResult[$iRow]["__STATUS__"]=> set in UpdateObject
-								if (!is_null($this->m_sSynchroScope)) {
-									$aVisited[] = $oTargetObj->GetKey();
-								}
-								break;
-							default:
-								// Found several matches, ambiguous
-								$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Ambiguous'));
-								$aResult[$iRow]["id"] = new CellStatus_Ambiguous(0, $oReconciliationSet->Count(), $oReconciliationFilter->serialize());
-								$aResult[$iRow]["finalclass"] = 'n/a';
-						}
-					}
-				} catch (Exception $e) {
-					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-Internal', get_class($e), $e->getMessage()));
-				}
+		foreach($this->m_aData as $iRow => $aRowData)
+		{
+			set_time_limit(intval($iLoopTimeLimit));
+			if (isset($aResult[$iRow]["__STATUS__"]))
+			{
+				// An issue at the earlier steps - skip the rest
+				continue;
 			}
+			try
+			{
+				$oReconciliationFilter = new DBObjectSearch($this->m_sClass);
+				$bSkipQuery = false;
+				foreach($this->m_aReconcilKeys as $sAttCode)
+				{
+					$valuecondition = null;
+					if (array_key_exists($sAttCode, $this->m_aExtKeys))
+					{
+						if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
+						{
+							$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+							if ($oExtKey->IsNullAllowed())
+							{
+								$valuecondition = $oExtKey->GetNullValue();
+								$aResult[$iRow][$sAttCode] = new CellStatus_Void($oExtKey->GetNullValue());
+							}
+							else
+							{
+								$aResult[$iRow][$sAttCode] = new CellStatus_NullIssue();
+							}
+						}
+						else
+						{
+							// The value has to be found or verified
 
-			if (!is_null($this->m_sSynchroScope)) {
-				// Compute the delta between the scope and visited objects
-				$oScopeSearch = DBObjectSearch::FromOQL($this->m_sSynchroScope);
-				$oScopeSet = new DBObjectSet($oScopeSearch);
-				while ($oObj = $oScopeSet->Fetch()) {
-					$iObj = $oObj->GetKey();
-					if (!in_array($iObj, $aVisited)) {
-						set_time_limit(intval($iLoopTimeLimit));
-						$iRow++;
-						$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
+							/** var DBObjectSearch $oReconFilter */
+							list($oReconFilter, $aMatches) = $this->ResolveExternalKey($aRowData, $sAttCode, $aResult[$iRow]);
+
+							if (count($aMatches) == 1)
+							{
+								$oRemoteObj = reset($aMatches); // first item
+								$valuecondition = $oRemoteObj->GetKey();
+								$aResult[$iRow][$sAttCode] = new CellStatus_Void($oRemoteObj->GetKey());
+							}
+							elseif (count($aMatches) == 0)
+							{
+								$oCellStatus_SearchIssue = $this->GetCellSearchIssue($oReconFilter);
+								$aResult[$iRow][$sAttCode] = $oCellStatus_SearchIssue;
+							}
+							else
+							{
+								$aResult[$iRow][$sAttCode] = new CellStatus_Ambiguous(null, count($aMatches), $oReconFilter->serialize());
+							}
+						}
+					}
+					else
+					{
+						// The value is given in the data row
+						$iCol = $this->m_aAttList[$sAttCode];
+						if ($sAttCode == 'id')
+						{
+							$valuecondition = $aRowData[$iCol];
+						}
+						else
+						{
+							$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+							$valuecondition = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
+						}
+					}
+					if (is_null($valuecondition))
+					{
+						$bSkipQuery = true;
+					}
+					else
+					{
+						$oReconciliationFilter->AddCondition($sAttCode, $valuecondition, '=');
+					}
+				}
+				if ($bSkipQuery)
+				{
+					$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Reconciliation'));
+				}
+				else
+				{
+					$oReconciliationSet = new CMDBObjectSet($oReconciliationFilter);
+					switch($oReconciliationSet->Count())
+					{
+					case 0:
+						$oTargetObj = $this->CreateObject($aResult, $iRow, $aRowData, $oChange);
+						// $aResult[$iRow]["__STATUS__"]=> set in CreateObject
+						$aVisited[] = $oTargetObj->GetKey();
+						break;
+					case 1:
+						$oTargetObj = $oReconciliationSet->Fetch();
+						$this->UpdateObject($aResult, $iRow, $oTargetObj, $aRowData, $oChange);
+						// $aResult[$iRow]["__STATUS__"]=> set in UpdateObject
+						if (!is_null($this->m_sSynchroScope))
+						{
+							$aVisited[] = $oTargetObj->GetKey();
+						}
+						break;
+					default:
+						// Found several matches, ambiguous
+						$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Ambiguous'));
+						$aResult[$iRow]["id"]= new CellStatus_Ambiguous(0, $oReconciliationSet->Count(), $oReconciliationFilter->serialize());
+						$aResult[$iRow]["finalclass"]= 'n/a';
 					}
 				}
 			}
-		} finally {
-			// Send all the retained events for further computations
-			cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
-			cmdbAbstractObject::FireEventDbLinksChangedForAllObjects();
+			catch (Exception $e)
+			{
+				$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-Internal', get_class($e), $e->getMessage()));
+			}
 		}
 
+		if (!is_null($this->m_sSynchroScope))
+		{
+			// Compute the delta between the scope and visited objects
+			$oScopeSearch = DBObjectSearch::FromOQL($this->m_sSynchroScope);
+			$oScopeSet = new DBObjectSet($oScopeSearch);
+			while ($oObj = $oScopeSet->Fetch())
+			{
+				$iObj = $oObj->GetKey();
+				if (!in_array($iObj, $aVisited))
+				{
+					set_time_limit(intval($iLoopTimeLimit));
+					$iRow++;
+					$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
+				}
+			}
+		}
 		set_time_limit(intval($iPreviousTimeLimit));
 
 		// Fill in the blanks - the result matrix is expected to be 100% complete

core/cmdbchangeop.class.inc.php

@@ -350,30 +350,21 @@ class CMDBChangeOpSetAttributeURL extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_url",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_url",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-
-		// N°4910 (oldvalue), N°5423 (newvalue)
-		// We cannot have validation here, as AttributeUrl validation is field dependant.
-		// The validation will be done when editing the iTop object, it isn't the history API responsibility
-		//
-		// Pattern is retrieved using this order :
-		// 1.  try to get the pattern from the field definition (datamodel)
-		// 2. from the iTop config
-		// 3. config parameter default value
-		// see \AttributeURL::GetValidationPattern
-		MetaModel::Init_AddAttribute(new AttributeURL("oldvalue", array("allowed_values" => null, "sql" => "oldvalue", "target" => '_blank', "default_value" => null, "is_null_allowed" => true, "depends_on" => array(), "validation_pattern" => '.*')));
-		MetaModel::Init_AddAttribute(new AttributeURL("newvalue", array("allowed_values" => null, "sql" => "newvalue", "target" => '_blank', "default_value" => null, "is_null_allowed" => true, "depends_on" => array(), "validation_pattern" => '.*')));
-
+		//old value can have an old validation pattern -> force it to anything
+		MetaModel::Init_AddAttribute(new AttributeURL("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "target" => '_blank', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array(), "validation_pattern" => '.*')));
+		MetaModel::Init_AddAttribute(new AttributeURL("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "target" => '_blank', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
@@ -472,7 +463,7 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 				$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');
 				$sDisplayUrl = $oPrevDoc->GetDisplayURL(get_class($this), $this->GetKey(), 'prevdata');
 
-				$sDownloadLabel = Dict::S('UI:DownloadDocument_');
+				$sDownloadLabel = Dict::Format('UI:DownloadDocument_');
 				$sDownloadUrl = $oPrevDoc->GetDownloadURL(get_class($this), $this->GetKey(), 'prevdata');
 
 				$sDocView = <<<HTML
@@ -885,7 +876,7 @@ class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
 	 */
 	protected function ToHtml($sRawText)
 	{
-		return str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sRawText));
+		return str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sRawText, ENT_QUOTES, 'UTF-8'));
 	}
 }
 
@@ -1177,8 +1168,9 @@ class CMDBChangeOpSetAttributeCustomFields extends CMDBChangeOpSetAttribute
 					$oHandler = $oAttDef->GetHandler($aValues);
 					$sValueDesc = $oHandler->GetAsHTML($aValues);
 				}
-				catch (Exception $e) {
-					$sValueDesc = 'Custom field error: '.utils::EscapeHtml($e->getMessage());
+				catch (Exception $e)
+				{
+					$sValueDesc = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
 				}
 				$sTextView = '<div>'.$sValueDesc.'</div>';
 

core/cmdbobject.class.inc.php

@@ -499,7 +499,7 @@ abstract class CMDBObject extends DBObject
 			$oMyChangeOp->Set("objkey", $this->GetKey());
 			$oMyChangeOp->Set("attcode", $sAttCode);
 			$oMyChangeOp->Set("oldvalue", $original);
-			$oMyChangeOp->Set("newvalue", $value);
+			$oMyChangeOp->Set("newvalue", $value[$sAttCode]);
 			$iId = $oMyChangeOp->DBInsertNoReload();
 		}
 		elseif ($oAttDef instanceOf AttributeCustomFields)
@@ -623,9 +623,6 @@ abstract class CMDBObject extends DBObject
 		return $this->DBCloneTracked_Internal();
 	}
 
-	/**
-	 * @deprecated 3.1.0 N°5232 not used
-	 */
 	public function DBCloneTracked(CMDBChange $oChange, $newKey = null)
 	{
 		self::SetCurrentChange($oChange);
@@ -640,6 +637,20 @@ abstract class CMDBObject extends DBObject
 		return $newKey;
 	}
 
+	public function DBUpdate()
+	{
+		// Copy the changes list before the update (the list should be reset afterwards)
+		$aChanges = $this->ListChanges();
+		if (count($aChanges) == 0)
+		{
+			return;
+		}
+
+		$ret = parent::DBUpdate();
+		return $ret;
+	}
+
+
 	/**
 	 * @param null $oDeletionPlan
 	 *
@@ -674,7 +685,46 @@ abstract class CMDBObject extends DBObject
 	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
 		$ret = parent::DBDelete($oDeletionPlan);
+		return $ret;
+	}
 
+	public static function BulkUpdate(DBSearch $oFilter, array $aValues)
+	{
+		return static::BulkUpdateTracked_Internal($oFilter, $aValues);
+	}
+
+	public static function BulkUpdateTracked(CMDBChange $oChange, DBSearch $oFilter, array $aValues)
+	{
+		self::SetCurrentChange($oChange);
+		static::BulkUpdateTracked_Internal($oFilter, $aValues);
+	}
+
+	protected static function BulkUpdateTracked_Internal(DBSearch $oFilter, array $aValues)
+	{
+		// $aValues is an array of $sAttCode => $value
+
+		// Get the list of objects to update (and load it before doing the change)
+		$oObjSet = new CMDBObjectSet($oFilter);
+		$oObjSet->Load();
+
+		// Keep track of the previous values (will be overwritten when the objects are synchronized with the DB)
+		$aOriginalValues = array();
+		$oObjSet->Rewind();
+		while ($oItem = $oObjSet->Fetch())
+		{
+			$aOriginalValues[$oItem->GetKey()] = $oItem->m_aOrigValues;
+		}
+
+		// Update in one single efficient query
+		$ret = parent::BulkUpdate($oFilter, $aValues);
+
+		// Record... in many queries !!!
+		$oObjSet->Rewind();
+		while ($oItem = $oObjSet->Fetch())
+		{
+			$aChangedValues = $oItem->ListChangedValues($aValues);
+			$oItem->RecordAttChanges($aChangedValues, $aOriginalValues[$oItem->GetKey()]);
+		}
 		return $ret;
 	}
 

core/cmdbsource.class.inc.php

@@ -157,7 +157,7 @@ class CMDBSource
 		$iPort = null;
 		self::InitServerAndPort($sDbHost, $sServer, $iPort);
 
-		$iFlags = 0;
+		$iFlags = null;
 
 		// *some* errors (like connection errors) will throw mysqli_sql_exception instead of generating warnings printed to the output
 		// but some other errors will still cause the query() method to return false !!!
@@ -166,6 +166,7 @@ class CMDBSource
 		try
 		{
 			$oMysqli = new mysqli();
+			$oMysqli->init();
 
 			if ($bTlsEnabled)
 			{
@@ -350,21 +351,19 @@ class CMDBSource
 	}
 
 	/**
-	 * Get the version of the database server.
-	 *
 	 * @return string
 	 * @throws \MySQLException
 	 *
-	 * @uses \CMDBSource::QueryToScalar() so needs a connection opened !
+	 * @uses \CMDBSource::QueryToCol() so needs a connection opened !
 	 */
 	public static function GetDBVersion()
 	{
-		return static::QueryToScalar('SELECT VERSION()', 0);
+		$aVersions = self::QueryToCol('SELECT Version() as version', 'version');
+		return $aVersions[0];
 	}
 
 	/**
-	 * @deprecated Use `CMDBSource::GetDBVersion` instead.
-	 * @uses mysqli_get_server_info
+	 * @return string
 	 */
 	public static function GetServerInfo()
 	{
@@ -1508,14 +1507,20 @@ class CMDBSource
 	 * Returns the value of the specified server variable
 	 * @param string $sVarName Name of the server variable
 	 * @return mixed Current value of the variable
-	 * @throws \MySQLQueryHasNoResultException|\MySQLException
-	 */
+	 */	   	
 	public static function GetServerVariable($sVarName)
 	{
-		$sSql = 'SELECT @@'.$sVarName;
-		return static::QueryToScalar($sSql, 0) ?: '';
+		$result = '';
+		$sSql = "SELECT @@$sVarName as theVar";
+		$aRows = self::QueryToArray($sSql);
+		if (count($aRows) > 0)
+		{
+			$result = $aRows[0]['theVar'];
+		}
+		return $result;
 	}
 
+
 	/**
 	 * Returns the privileges of the current user
 	 * @return string privileges in a raw format
@@ -1611,22 +1616,4 @@ class CMDBSource
 
 		return 'ALTER DATABASE'.CMDBSource::GetSqlStringColumnDefinition().';';
 	}
-
-	/**
-	 * Check which mysql client option (--ssl or --ssl-mode) to be used for encrypted connection
-	 *
-	 * @return bool true if --ssl-mode should be used, false otherwise
-	 * @throws \MySQLException
-	 *
-	 * @link https://dev.mysql.com/doc/refman/5.7/en/connection-options.html#encrypted-connection-options "Command Options for Encrypted Connections"
-	 */
-	public static function IsSslModeDBVersion()
-	{
-		if (static::GetDBVendor() === static::ENUM_DB_VENDOR_MYSQL)
-		{
-			//Mysql 5.7.0 and upper deprecated --ssl and uses --ssl-mode instead
-			return version_compare(static::GetDBVersion(), '5.7.11', '>=');
-		}
-		return false;
-	}
 }

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.0-dev');
+define('ITOP_VERSION', '3.0.1-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -129,22 +129,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'event_service.debug.filter_events' => [
-			'type' => 'array',
-			'description' => 'List of events name to filter Event Service debug messages',
-			'default' => [],
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'event_service.debug.filter_sources' => [
-			'type' => 'array',
-			'description' => 'List of event sources to filter Event Service debug messages',
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'app_env_label' => [
 			'type' => 'string',
 			'description' => 'Label displayed to describe the current application environment, defaults to the environment name (e.g. "production")',
@@ -342,11 +326,11 @@ class Config
 			'show_in_conf_sample' => false,
 		],
 		'allow_menu_on_linkset' => [
-			'type'                => 'bool',
-			'description'         => 'Display Action menus in view mode on any LinkedSet with edit_mode != none',
-			'default'             => true,
-			'value'               => true,
-			'source_of_value'     => '',
+			'type' => 'bool',
+			'description' => 'Display Action menus in view mode on any LinkedSet with edit_mode != none',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
 		'allow_target_creation' => [
@@ -592,29 +576,13 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'email_transport_smtp.allow_self_signed' => array(
-			'type'                => 'bool',
-			'description'         => 'Allow self signed peer certificates',
-			'default'             => false,
-			'value'               => false,
+		'email_css'                                => [
+			'type'                => 'string',
+			'description'         => 'CSS that will override the standard stylesheet used for the notifications',
+			'default'             => "",
+			'value'               => "",
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
-		),
-		'email_transport_smtp.verify_peer' => array(
-			'type'                => 'bool',
-			'description'         => 'Verify peer certificate',
-			'default'             => true,
-			'value'               => true,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_css' => [
-			'type' => 'string',
-			'description' => 'CSS that will override the standard stylesheet used for the notifications',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
 		],
 		'email_default_sender_address' => [
 			'type' => 'string',
@@ -1270,14 +1238,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'navigation_menu.show_organization_filter' => [
-			'type' => 'bool',
-			'description' => 'Display organization filter in menu',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'quick_create.enabled' => [
 			'type' => 'bool',
 			'description' => 'Whether or not the quick create is enabled',
@@ -1545,11 +1505,11 @@ class Config
 			'show_in_conf_sample' => false,
 		],
 		'security.hide_administrators' => [
-			'type'                => 'bool',
-			'description'         => 'If true, non-administrator users will not be able to see the administrator accounts, the Administrator profile and the links between the administrator accounts and their profiles.',
-			'default'             => true,
-			'value'               => true,
-			'source_of_value'     => '',
+			'type' => 'bool',
+			'description' => 'If true, non-administrator users will not be able to see the administrator accounts, the Administrator profile and the links between the administrator accounts and their profiles.',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
 		'behind_reverse_proxy' => [
@@ -1584,22 +1544,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'setup.launch_button.enabled' => [
-			'type'                => 'bool',
-			'description'         => 'If true displays in the Application Upgrade screen a button allowing to launch the setup in a single click (no more manual config file permission change needed)',
-			'default'             => null,
-			'value'               => false,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
-		'audit.enable_selection_landing_page' => [
-			'type'                => 'bool',
-			'description'         => 'If true audit categories must be selected before results are computed (use this setting in case of a lot of audit categories)',
-			'default'             => false,
-			'value'               => false,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 	];
 
 	public function IsProperty($sPropCode)
@@ -1917,9 +1861,9 @@ class Config
 		}
 		if (strlen($sNoise) > 0)
 		{
-			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack)
+			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
 			throw new ConfigException('Syntax error in configuration file',
-				array('file' => $sConfigFile, 'error' => '<tt>'.utils::EscapeHtml($sNoise, ENT_QUOTES).'</tt>'));
+				array('file' => $sConfigFile, 'error' => '<tt>'.htmlentities($sNoise, ENT_QUOTES, 'UTF-8').'</tt>'));
 		}
 
 		if (!isset($MySettings) || !is_array($MySettings))
@@ -2302,7 +2246,7 @@ class Config
 		$oHandle = null;
 		$sConfig = null;
 
-		if ($this->m_sFile !== null && is_file($this->m_sFile))
+		if (is_file($this->m_sFile))
 		{
 			$oHandle = fopen($this->m_sFile, 'r');
 			$index = 0;
@@ -2477,15 +2421,10 @@ class Config
 	/**
 	 * Helper function to initialize a configuration from the page arguments
 	 *
-	 * @see \Parameters::GetParamForConfigArray() to get aParamValues from {@see Parameters} object hierarchy in setup
-	 * @see \WizardController::GetParamForConfigArray() to get aParamValues from {@see \WizardController} object hierarchy in setup
-	 *
 	 * @param array $aParamValues
-	 * @param ?string $sModulesDir
+	 * @param string|null $sModulesDir
 	 * @param bool $bPreserveModuleSettings
 	 *
-	 * @return void The current object is modified directly
-	 *
 	 * @throws \Exception
 	 * @throws \CoreException
 	 */
@@ -2732,7 +2671,7 @@ class ConfigPlaceholdersResolver
 		}
 
 		$sPattern = '/\%(env|server)\((\w+)\)(?:\?:(\w*))?\%/'; //3 capturing groups, ie `%env(HTTP_PORT)?:8080%` produce: `env` `HTTP_PORT` and `8080`.
-
+		
 		if (! preg_match_all($sPattern, $rawValue, $aMatchesCollection, PREG_SET_ORDER))
 		{
 			return $rawValue;

core/contexttag.class.inc.php

@@ -52,23 +52,17 @@
  */
 class ContextTag
 {
-	public const TAG_PORTAL  = 'GUI:Portal';
-	public const TAG_CRON    = 'CRON';
-	public const TAG_CONSOLE = 'GUI:Console';
-	public const TAG_SETUP   = 'Setup';
-	public const TAG_SYNCHRO = 'Synchro';
-	public const TAG_REST    = 'REST/JSON';
-	/**
-	 * @var string
-	 * @since 3.1.0 N°3200
-	 */
-	public const TAG_OBJECT_SEARCH = 'ObjectSearch';
+	const TAG_PORTAL = 'GUI:Portal';
+	const TAG_CRON = 'CRON';
+	const TAG_CONSOLE = 'GUI:Console';
+	const TAG_SETUP = 'Setup';
+	const TAG_SYNCHRO = 'Synchro';
+	const TAG_REST = 'REST/JSON';
 
 	protected static $aStack = array();
 
 	/**
 	 * Store a context tag on the stack
-	 *
 	 * @param string $sTag
 	 */
 	public function __construct($sTag)

core/csvbulkexport.class.inc.php

@@ -125,8 +125,8 @@ class CSVBulkExport extends TabularBulkExport
 				$sRawSeparator = utils::ReadParam('separator', ',', true, 'raw_data');
 				$sCustomDateTimeFormat = utils::ReadParam('', ',', true, 'raw_data');
 				$aSep = array(
-					';'   => Dict::S('UI:CSVImport:SeparatorSemicolon+'),
-					','   => Dict::S('UI:CSVImport:SeparatorComma+'),
+					';' => Dict::S('UI:CSVImport:SeparatorSemicolon+'),
+					',' => Dict::S('UI:CSVImport:SeparatorComma+'),
 					'tab' => Dict::S('UI:CSVImport:SeparatorTab+'),
 				);
 				$sOtherSeparator = '';
@@ -134,10 +134,10 @@ class CSVBulkExport extends TabularBulkExport
 					$sOtherSeparator = $sRawSeparator;
 					$sRawSeparator = 'other';
 				}
-				$aSep['other'] = Dict::S('UI:CSVImport:SeparatorOther').' <input type="text" size="3" name="other-separator" value="'.utils::EscapeHtml($sOtherSeparator).'"/>';
+				$aSep['other'] = Dict::S('UI:CSVImport:SeparatorOther').' <input type="text" size="3" name="other-separator" value="'.htmlentities($sOtherSeparator, ENT_QUOTES, 'UTF-8').'"/>';
 
 				foreach ($aSep as $sVal => $sLabel) {
-					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "separator", utils::EscapeHtml($sVal), $sLabel, "radio");
+					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "separator", htmlentities($sVal, ENT_QUOTES, 'UTF-8'), $sLabel, "radio");
 					$oRadio->GetInput()->SetIsChecked(($sVal == $sRawSeparator));
 					$oRadio->SetBeforeInput(false);
 					$oRadio->GetInput()->AddCSSClass('ibo-input--label-right');
@@ -152,7 +152,7 @@ class CSVBulkExport extends TabularBulkExport
 
 				$sRawQualifier = utils::ReadParam('text-qualifier', '"', true, 'raw_data');
 				$aQualifiers = array(
-					'"'  => Dict::S('UI:CSVImport:QualifierDoubleQuote+'),
+					'"' => Dict::S('UI:CSVImport:QualifierDoubleQuote+'),
 					'\'' => Dict::S('UI:CSVImport:QualifierSimpleQuote+'),
 				);
 				$sOtherQualifier = '';
@@ -160,10 +160,10 @@ class CSVBulkExport extends TabularBulkExport
 					$sOtherQualifier = $sRawQualifier;
 					$sRawQualifier = 'other';
 				}
-				$aQualifiers['other'] = Dict::S('UI:CSVImport:QualifierOther').' <input type="text" size="3" name="other-text-qualifier" value="'.utils::EscapeHtml($sOtherQualifier).'"/>';
+				$aQualifiers['other'] = Dict::S('UI:CSVImport:QualifierOther').' <input type="text" size="3" name="other-text-qualifier" value="'.htmlentities($sOtherQualifier, ENT_QUOTES, 'UTF-8').'"/>';
 
 				foreach ($aQualifiers as $sVal => $sLabel) {
-					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "text-qualifier", utils::EscapeHtml($sVal), $sLabel, "radio");
+					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "text-qualifier", htmlentities($sVal, ENT_QUOTES, 'UTF-8'), $sLabel, "radio");
 					$oRadio->GetInput()->SetIsChecked(($sVal == $sRawSeparator));
 					$oRadio->SetBeforeInput(false);
 					$oRadio->GetInput()->AddCSSClass('ibo-input--label-right');
@@ -209,8 +209,8 @@ class CSVBulkExport extends TabularBulkExport
 
 				$sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
 
-				$sDefaultFormat = utils::EscapeHtml((string)AttributeDateTime::GetFormat());
-				$sExample = utils::EscapeHtml(date((string)AttributeDateTime::GetFormat()));
+				$sDefaultFormat = htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
+				$sExample = htmlentities(date((string)AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
 				$oRadioDefault = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatDefault_Example', $sDefaultFormat, $sExample), "csv_date_format_radio", "default", "csv_date_time_format_default", "radio");
 				$oRadioDefault->GetInput()->SetIsChecked(($sDateTimeFormat == (string)AttributeDateTime::GetFormat()));
 				$oRadioDefault->SetBeforeInput(false);
@@ -218,7 +218,7 @@ class CSVBulkExport extends TabularBulkExport
 				$oFieldSetDate->AddSubBlock($oRadioDefault);
 				$oFieldSetDate->AddSubBlock(new Html('</br>'));
 
-				$sFormatInput = '<input type="text" size="15" name="date_format" id="csv_custom_date_time_format" title="" value="'.utils::EscapeHtml($sDateTimeFormat).'"/>';
+				$sFormatInput = '<input type="text" size="15" name="date_format" id="csv_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "csv_date_format_radio", "custom", "csv_date_time_format_custom", "radio");
 				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
@@ -246,18 +246,17 @@ EOF
 	}
 
 	protected function GetSampleData($oObj, $sAttCode)
-	{
-		if ($sAttCode != 'id') {
+	{	
+		if ($sAttCode != 'id')
+		{
 			$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
 			if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
 			{
 				$sClass = (get_class($oAttDef) == 'AttributeDateTime') ? 'user-formatted-date-time' : 'user-formatted-date';
-
-				return '<div class="'.$sClass.'" data-date="'.$oObj->Get($sAttCode).'">'.utils::EscapeHtml($oAttDef->GetEditValue($oObj->Get($sAttCode), $oObj)).'</div>';
+				return '<div class="'.$sClass.'" data-date="'.$oObj->Get($sAttCode).'">'.htmlentities($oAttDef->GetEditValue($oObj->Get($sAttCode), $oObj), ENT_QUOTES, 'UTF-8').'</div>';
 			}
 		}
-
-		return '<div class="text-preview">'.utils::EscapeHtml($this->GetValue($oObj, $sAttCode)).'</div>';
+		return '<div class="text-preview">'.htmlentities($this->GetValue($oObj, $sAttCode), ENT_QUOTES, 'UTF-8').'</div>';
 	}
 
 	protected function GetValue($oObj, $sAttCode)

core/datamodel.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -270,4 +270,4 @@
       </class>
     </classes>
   </meta>
-</itop_design>
+</itop_design>

core/dbobjectiterator.php

@@ -38,7 +38,7 @@ interface iDBObjectSetIterator extends Countable
 	 *
 	 * @return int
 	 */
-	public function Count(): int;
+	public function Count();
 
 	/**
 	 * Reset the cursor to the first item in the collection. Equivalent to Seek(0)
@@ -52,7 +52,7 @@ interface iDBObjectSetIterator extends Countable
 	 *
 	 * @param int $iRow
 	 */
-	public function Seek($iPosition): void;
+	public function Seek($iPosition);
 
 	/**
 	 * Fetch the object at the current position in the collection and move the cursor to the next position.

core/dbobjectsearch.class.php

@@ -413,10 +413,6 @@ class DBObjectSearch extends DBSearch
 	}
 
 	/**
-	 * Important: If you need to add a condition on the same $sFilterCode several times with different $value values; do not use this method as the previous $value occurences will be replaced by the last. Instead use:
-	 *  * {@see \DBObjectSearch::AddConditionExpression()} in loops to add conditions one by one
-	 *  * {@see \DBObjectSearch::AddConditionForInOperatorUsingParam()} for IN/NOT IN queries with lots of params at once
-	 *
 	 * @param string $sFilterCode
 	 * @param mixed $value
 	 * @param string $sOpCode operator to use : 'IN', 'NOT IN', 'Contains',' Begins with', 'Finishes with', ...
@@ -427,16 +423,22 @@ class DBObjectSearch extends DBSearch
 	 * @param bool $bParseSearchString
 	 *
 	 * @throws \CoreException
+	 *
+	 * @see AddConditionForInOperatorUsingParam for IN/NOT IN queries with lots of params
 	 */
 	public function AddCondition($sFilterCode, $value, $sOpCode = null, $bParseSearchString = false)
 	{
-		MyHelpers::CheckKeyInArray('filter code in class: '.$this->GetClass(), $sFilterCode, MetaModel::GetFilterAttribList($this->GetClass()));
+		MyHelpers::CheckKeyInArray('filter code in class: '.$this->GetClass(), $sFilterCode, MetaModel::GetClassFilterDefs($this->GetClass()));
 
 		$oField = new FieldExpression($sFilterCode, $this->GetClassAlias());
-		if (empty($sOpCode)) {
-			if ($sFilterCode == 'id') {
+		if (empty($sOpCode))
+		{
+			if ($sFilterCode == 'id')
+			{
 				$sOpCode = '=';
-			} else {
+			}
+			else
+			{
 				$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
 				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams);
 				$this->AddConditionExpression($oNewCondition);
@@ -1898,13 +1900,16 @@ class DBObjectSearch extends DBSearch
 		// Hide objects that are not visible to the current user
 		//
 		$oSearch = $this;
-		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered()) {
+		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered())
+		{
 			$oVisibleObjects = UserRights::GetSelectFilter($this->GetClass(), $this->GetModifierProperties('UserRightsGetSelectFilter'));
-			if ($oVisibleObjects === false) {
+			if ($oVisibleObjects === false)
+			{
 				// Make sure this is a valid search object, saying NO for all
 				$oVisibleObjects = DBObjectSearch::FromEmptySet($this->GetClass());
 			}
-			if (is_object($oVisibleObjects)) {
+			if (is_object($oVisibleObjects))
+			{
 				$oVisibleObjects->AllowAllData();
 				$oSearch = $this->Intersect($oVisibleObjects);
 				$oSearch->SetDataFiltered();
@@ -1924,49 +1929,63 @@ class DBObjectSearch extends DBSearch
 			if (isset($_SERVER['REQUEST_URI']))
 			{
 				$aContextData['sRequestUri'] = $_SERVER['REQUEST_URI'];
-			} else if (isset($_SERVER['SCRIPT_NAME'])) {
+			}
+			else if (isset($_SERVER['SCRIPT_NAME']))
+			{
 				$aContextData['sRequestUri'] = $_SERVER['SCRIPT_NAME'];
-			} else {
+			}
+			else
+			{
 				$aContextData['sRequestUri'] = '';
 			}
 
 			// Need to identify the query
 			$sOqlQuery = $oSearch->ToOql(false, null, true);
-			if ((strpos($sOqlQuery, '`id` IN (') !== false) || (strpos($sOqlQuery, '`id` NOT IN (') !== false)) {
+			if ((strpos($sOqlQuery, '`id` IN (') !== false) || (strpos($sOqlQuery, '`id` NOT IN (') !== false))
+			{
 				// Requests containing "id IN" are not worth caching
 				$bCanCache = false;
 			}
 
 			$aContextData['sOqlQuery'] = $sOqlQuery;
 
-			if (count($aModifierProperties)) {
+			if (count($aModifierProperties))
+			{
 				array_multisort($aModifierProperties);
 				$sModifierProperties = json_encode($aModifierProperties);
-			} else {
+			}
+			else
+			{
 				$sModifierProperties = '';
 			}
 			$aContextData['sModifierProperties'] = $sModifierProperties;
 
 			$sRawId = Dict::GetUserLanguage().'-'.$sOqlQuery.$sModifierProperties;
-			if (!is_null($aAttToLoad)) {
+			if (!is_null($aAttToLoad))
+			{
 				$sRawId .= json_encode($aAttToLoad);
 			}
 			$aContextData['aAttToLoad'] = $aAttToLoad;
-			if (!is_null($aGroupByExpr)) {
-				foreach ($aGroupByExpr as $sAlias => $oExpr) {
-					$sRawId .= 'g:'.$sAlias.'!'.$oExpr->RenderExpression();
+			if (!is_null($aGroupByExpr))
+			{
+				foreach($aGroupByExpr as $sAlias => $oExpr)
+				{
+					$sRawId .= 'g:'.$sAlias.'!'.$oExpr->Render();
 				}
 			}
-			if (!is_null($aSelectExpr)) {
-				foreach ($aSelectExpr as $sAlias => $oExpr) {
-					$sRawId .= 'se:'.$sAlias.'!'.$oExpr->RenderExpression();
+			if (!is_null($aSelectExpr))
+			{
+				foreach($aSelectExpr as $sAlias => $oExpr)
+				{
+					$sRawId .= 'se:'.$sAlias.'!'.$oExpr->Render();
 				}
 			}
 			$aContextData['aGroupByExpr'] = $aGroupByExpr;
 			$aContextData['aSelectExpr'] = $aSelectExpr;
 			$sRawId .= $bGetCount;
 			$aContextData['bGetCount'] = $bGetCount;
-			if (is_array($aSelectedClasses)) {
+			if (is_array($aSelectedClasses))
+			{
 				$sRawId .= implode(',', $aSelectedClasses); // Unions may alter the list of selected columns
 			}
 			$aContextData['aSelectedClasses'] = $aSelectedClasses;
@@ -2077,13 +2096,17 @@ class DBObjectSearch extends DBSearch
 			// 3rd step - position the attributes in the hierarchy of classes
 			//
 			$oSubClassExp->Browse(function($oNode) use ($sSubClass) {
-				if ($oNode instanceof FieldExpression) {
+				if ($oNode instanceof FieldExpression)
+				{
 					$sAttCode = $oNode->GetName();
 					$oAttDef = MetaModel::GetAttributeDef($sSubClass, $sAttCode);
-					if ($oAttDef->IsExternalField()) {
+					if ($oAttDef->IsExternalField())
+					{
 						$sKeyAttCode = $oAttDef->GetKeyAttCode();
 						$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sKeyAttCode);
-					} else {
+					}
+					else
+					{
 						$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sAttCode);
 					}
 					$sParent = MetaModel::GetAttributeOrigin($sClassOfAttribute, $oNode->GetName());
@@ -2091,11 +2114,12 @@ class DBObjectSearch extends DBSearch
 				}
 			});
 
-			$sSignature = $oSubClassExp->RenderExpression();
-			if (!array_key_exists($sSignature, $aExpressions)) {
+			$sSignature = $oSubClassExp->Render();
+			if (!array_key_exists($sSignature, $aExpressions))
+			{
 				$aExpressions[$sSignature] = array(
 					'expression' => $oSubClassExp,
-					'classes'    => array(),
+					'classes' => array(),
 				);
 			}
 			$aExpressions[$sSignature]['classes'][] = $sSubClass;

core/dbobjectset.class.php

@@ -53,18 +53,6 @@ class DBObjectSet implements iDBObjectSetIterator
 	 * @var array
 	 */
 	protected $m_aAttToLoad;
-	/**
-	 * @var null|array
-	 */
-	protected $m_aExtendedDataSpec;
-	/**
-	 * @var int Maximum number of elements to retrieve
-	 */
-	protected $m_iLimitCount;
-	/**
-	 * @var int Offset from which elements should be retrieved
-	 */
-	protected $m_iLimitStart;
 	/**
 	 * @var array
 	 */
@@ -153,7 +141,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	{
 		$sRet = '';
 		$this->Rewind();
-		$sRet .= "Set (".$this->m_oFilter->ToOQL(true).")<br/>\n";
+		$sRet .= "Set (".$this->m_oFilter->ToOQL().")<br/>\n";
         $sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".$this->m_oFilter->MakeSelectQuery().")</pre>\n";
 		
 		$sRet .= $this->Count()." records<br/>\n";
@@ -166,7 +154,6 @@ class DBObjectSet implements iDBObjectSetIterator
 			}
 			$sRet .= "</ul>\n";
 		}
-		$this->Rewind();
 		return $sRet;
 	}
 
@@ -855,7 +842,7 @@ class DBObjectSet implements iDBObjectSetIterator
      * @throws \MySQLException
      * @throws \MySQLHasGoneAwayException
      */
-	public function Count(): int
+	public function Count()
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
@@ -1090,13 +1077,14 @@ class DBObjectSet implements iDBObjectSetIterator
      *
      * @param int $iRow
      *
+     * @return int|mixed
+     *
      * @throws \CoreException
      * @throws \MissingQueryArgument
      * @throws \MySQLException
      * @throws \MySQLHasGoneAwayException
-     * @since 3.1.0 N°4517 Now returns void for return type to match parent class and be compatible with PHP 8.1
      */
-	public function Seek($iRow): void
+	public function Seek($iRow)
 	{
 		if (!$this->m_bLoaded) $this->Load();
 
@@ -1105,6 +1093,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		{
 			$this->m_oSQLResult->data_seek($this->m_iCurrRow);
 		}
+		return $this->m_iCurrRow;
 	}
 
     /**

core/dbsearch.class.php

@@ -773,14 +773,14 @@ abstract class DBSearch
      * @see DBSearch::ToOQL()
      *
 	 * @param string $sQuery The OQL to convert to a DBSearch
-	 * @param array $aParams array of <mixed> params index by <string> name
+	 * @param mixed[string]  $aParams array of <mixed> params index by <string> name
 	 * @param ModelReflection|null $oMetaModel The MetaModel to use when checking the consistency of the OQL
      *
 	 * @return DBObjectSearch|DBUnionSearch
      *
 	 * @throws OQLException
 	 */
-	public static function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel=null)
+	static public function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel=null)
 	{
 		if (empty($sQuery))
 		{
@@ -1717,6 +1717,6 @@ abstract class DBSearch
 	 */
 	public function __toString()
 	{
-		return $this->ToOQL(true);
+		return $this->ToOQL();
 	}
 }

core/designdocument.class.inc.php

@@ -30,7 +30,6 @@ use DOMDocument;
 use DOMFormatException;
 use IssueLog;
 use LogAPI;
-use utils;
 
 /**
  * Class \Combodo\iTop\DesignDocument
@@ -84,8 +83,6 @@ class DesignDocument extends DOMDocument
 	 *
 	 * @return int
 	 */
-	// Return type union is not supported by PHP 7.4, we can remove the following PHP attribute and add the return type once iTop min PHP version is PHP 8.0+
-	#[\ReturnTypeWillChange]
 	public function save($filename, $options = null)
 	{
 		$this->documentElement->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
@@ -100,12 +97,13 @@ class DesignDocument extends DOMDocument
 	public function Dump($bReturnRes = false)
 	{
 		$sXml = $this->saveXML();
-		if ($bReturnRes) {
+		if ($bReturnRes)
+		{
 			return $sXml;
 		}
 
 		echo "<pre>\n";
-		echo utils::EscapeHtml($sXml);
+		echo htmlentities($sXml);
 		echo "</pre>\n";
 
 		return '';
@@ -183,26 +181,6 @@ class DesignElement extends \DOMElement
 		return $this->ownerDocument->GetNodes($sXPath, $this);
 	}
 
-	public static function ToArray(DesignElement $oNode)
-	{
-		$aRes = [];
-
-		if ($oNode->GetNodes('./*')->length == 0) {
-			return $oNode->GetText('');
-		}
-		foreach ($oNode->GetNodes('./*') as $oSubNode) {
-			/** @var \Combodo\iTop\DesignElement $oSubNode */
-			$aSubArray = DesignElement::ToArray($oSubNode);
-			if ($oSubNode->hasAttribute('id')) {
-				$aRes[$oSubNode->getAttribute('id')] = $aSubArray;
-			} else {
-				$aRes[$oSubNode->tagName] = $aSubArray;
-			}
-		}
-
-		return $aRes;
-	}
-
 	/**
 	 * Create an HTML representation of the DOM, for debugging purposes
 	 *
@@ -218,13 +196,13 @@ class DesignElement extends \DOMElement
 		$oDoc->appendChild($oClone);
 
 		$sXml = $oDoc->saveXML($oClone);
-		if ($bReturnRes) {
+		if ($bReturnRes)
+		{
 			return $sXml;
 		}
 		echo "<pre>\n";
-		echo utils::EscapeHtml($sXml);
+		echo htmlentities($sXml);
 		echo "</pre>\n";
-
 		return '';
 	}
 	/**

core/dict.class.inc.php

@@ -110,7 +110,7 @@ class Dict
 	 *
 	 * @param string $sStringCode The code identifying the dictionary entry
 	 * @param string $sDefault Default value if there is no match in the dictionary
-	 * @param bool $bUserLanguageOnly False to allow the use of the default language as a fallback, true otherwise
+	 * @param bool $bUserLanguageOnly True to allow the use of the default language as a fallback, false otherwise
 	 *
 	 * @return string
 	 */
@@ -174,7 +174,7 @@ class Dict
 	 *
 	 * @return string
 	 */
-	public static function Format($sFormatCode /*, ... arguments ... */)
+	public static function Format($sFormatCode /*, ... arguments ....*/)
 	{
 		$sLocalizedFormat = self::S($sFormatCode);
 		$aArguments = func_get_args();

core/displayablegraph.class.inc.php

@@ -459,10 +459,11 @@ class DisplayableNode extends GraphNode
 			{
 				$aContext = $aContextDefs[$key];
 				$aRootCauses = array();
-				foreach ($aObjects as $oRootCause) {
+				foreach($aObjects as $oRootCause)
+				{
 					$aRootCauses[] = $oRootCause->GetHyperlink();
 				}
-				$sHtml .= '<p><img style="max-height: 24px; vertical-align:bottom;" class="ibo-class-icon ibo-is-small" src="'.utils::GetAbsoluteUrlModulesRoot().$aContext['icon'].'" title="'.utils::EscapeHtml(Dict::S($aContext['dict'])).'">&nbsp;'.implode(', ', $aRootCauses).'</p>';
+				$sHtml .= '<p><img style="max-height: 24px; vertical-align:bottom;" class="ibo-class-icon ibo-is-small" src="'.utils::GetAbsoluteUrlModulesRoot().$aContext['icon'].'" title="'.htmlentities(Dict::S($aContext['dict'])).'">&nbsp;'.implode(', ', $aRootCauses).'</p>';
 			}
 			$sHtml .= '<hr/>';
 		}
@@ -1334,17 +1335,18 @@ class DisplayableGraph extends SimpleGraph
 		}
 		$oPdf->Rect($xMin, $yMin, $fMaxWidth + $fIconSize + 3*$fPadding, $yMax - $yMin, 'D');
 
-		if ($sComments != '') {
+		if ($sComments != '')
+		{
 			// Draw the comment text (surrounded by a rectangle)
-			$xPos = $xMin + $fMaxWidth + $fIconSize + 4 * $fPadding;
-			$w = $xMax - $xPos - 2 * $fPadding;
+			$xPos = $xMin + $fMaxWidth + $fIconSize + 4*$fPadding;
+			$w = $xMax - $xPos - 2*$fPadding;
 			$iNbLines = 1;
-			$sText = '<p>'.str_replace("\n", '<br/>', utils::EscapeHtml($sComments), $iNbLines).'</p>';
+			$sText = '<p>'.str_replace("\n", '<br/>', htmlentities($sComments, ENT_QUOTES, 'UTF-8'), $iNbLines).'</p>';
 			$fLineHeight = $oPdf->getStringHeight($w, $sText);
-			$h = (1 + $iNbLines) * $fLineHeight;
-			$yPos = $yMax - 2 * $fPadding - $h;
+			$h = (1+$iNbLines) * $fLineHeight;
+			$yPos = $yMax - 2*$fPadding - $h;
 			$oPdf->writeHTMLCell($w, $h, $xPos + $fPadding, $yPos + $fPadding, $sText, 0 /* border */, 1 /* ln */);
-			$oPdf->Rect($xPos, $yPos, $w + 2 * $fPadding, $h + 2 * $fPadding, 'D');
+			$oPdf->Rect($xPos, $yPos, $w + 2*$fPadding, $h + 2*$fPadding, 'D');
 			$yMax = $yPos - $fPadding;
 		}
 

core/email.class.inc.php

@@ -27,19 +27,15 @@
 use Combodo\iTop\Core\Email\EmailFactory;
 use Combodo\iTop\Core\Email\iEMail;
 
+Swift_Preferences::getInstance()->setCharset('UTF-8');
+
+
 define ('EMAIL_SEND_OK', 0);
 define ('EMAIL_SEND_PENDING', 1);
 define ('EMAIL_SEND_ERROR', 2);
 
 class EMail implements iEMail
 {
-	/**
-	 * @see self::LoadConfig()
-	 * @var Config
-	 * @since 2.7.7 3.0.2 3.1.0 N°3169 N°5102 Move attribute to children classes
-	 * @since 2.7.8 3.0.3 3.1.0 N°4947 pull up the attribute back to the Email class as config init is done here
-	 */
-	protected static $m_oConfig = null;
 	protected $oMailer;
 
 	// Serialization formats
@@ -52,42 +48,6 @@ class EMail implements iEMail
 		$this->oMailer = EmailFactory::GetMailer();
 	}
 
-	/**
-	 * Sets {@see m_oConfig} if current attribute is null
-	 *
-	 * @returns \Config the current {@see m_oConfig} value
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 *
-	 * @uses utils::GetConfig()
-	 *
-	 * @since 2.7.7 3.0.2 3.1.0 N°3169 N°5102 Move method to children classes
-	 * @since 2.7.8 3.0.3 3.1.0 N°4947 Pull up to the parent class, and remove `$sConfigFile` param
-	 */
-	public function LoadConfig()
-	{
-		if (is_null(static::$m_oConfig)) {
-			static::$m_oConfig = utils::GetConfig();
-		}
-
-		return static::$m_oConfig;
-	}
-
-	/**
-	 * @return void
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 * @since 2.7.8 3.0.3 3.1.0 N°4947 Method creation, to factorize same code in children classes
-	 */
-	protected function InitRecipientFrom()
-	{
-		$oConfig = $this->LoadConfig();
-		$this->SetRecipientFrom(
-			$oConfig->Get('email_default_sender_address'),
-			$oConfig->Get('email_default_sender_label')
-		);
-	}
-
 	/**
 	 * Custom serialization method
 	 * No longer use the brute force "serialize" method since
@@ -109,7 +69,7 @@ class EMail implements iEMail
 	 * @throws \CoreException
 	 * @throws \Symfony\Component\CssSelector\Exception\SyntaxErrorException
 	 */
-	public static function UnSerializeV2($sSerializedMessage)
+	static public function UnSerializeV2($sSerializedMessage)
 	{
 		return EmailFactory::GetMailer()::UnSerializeV2($sSerializedMessage);
 	}
@@ -151,7 +111,7 @@ class EMail implements iEMail
 	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)
 	{
 		$this->oMailer->SetBody($sBody, $sMimeType, $sCustomStyles);
-		}
+	}
 
 	public function AddPart($sText, $sMimeType = 'text/html')
 	{
@@ -202,4 +162,5 @@ class EMail implements iEMail
 	{
 		$this->oMailer->SetRecipientReplyTo($sAddress);
 	}
+
 }

core/excelbulkexport.class.inc.php

@@ -100,8 +100,8 @@ class ExcelBulkExport extends TabularBulkExport
 
 				$sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
 
-				$sDefaultFormat = utils::EscapeHtml((string)AttributeDateTime::GetFormat());
-				$sExample = utils::EscapeHtml(date((string)AttributeDateTime::GetFormat()));
+				$sDefaultFormat = htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
+				$sExample = htmlentities(date((string)AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
 				$oRadioDefault = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatDefault_Example', $sDefaultFormat, $sExample), "excel_date_format_radio", "default", "excel_date_time_format_default", "radio");
 				$oRadioDefault->GetInput()->SetIsChecked(($sDateTimeFormat == (string)AttributeDateTime::GetFormat()));
 				$oRadioDefault->SetBeforeInput(false);
@@ -109,7 +109,7 @@ class ExcelBulkExport extends TabularBulkExport
 				$oFieldSetDate->AddSubBlock($oRadioDefault);
 				$oFieldSetDate->AddSubBlock(new Html('</br>'));
 
-				$sFormatInput = '<input type="text" size="15" name="date_format" id="excel_custom_date_time_format" title="" value="'.utils::EscapeHtml($sDateTimeFormat).'"/>';
+				$sFormatInput = '<input type="text" size="15" name="date_format" id="excel_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "excel_date_format_radio", "custom", "excel_date_time_format_custom", "radio");
 				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
@@ -156,17 +156,16 @@ EOF
 
 	protected function GetSampleData($oObj, $sAttCode)
 	{
-		if ($sAttCode != 'id') {
+		if ($sAttCode != 'id')
+		{
 			$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
 			if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
 			{
 				$sClass = (get_class($oAttDef) == 'AttributeDateTime') ? 'user-formatted-date-time' : 'user-formatted-date';
-
-				return '<div class="'.$sClass.'" data-date="'.$oObj->Get($sAttCode).'">'.utils::EscapeHtml($oAttDef->GetEditValue($oObj->Get($sAttCode), $oObj)).'</div>';
+				return '<div class="'.$sClass.'" data-date="'.$oObj->Get($sAttCode).'">'.htmlentities($oAttDef->GetEditValue($oObj->Get($sAttCode), $oObj), ENT_QUOTES, 'UTF-8').'</div>';
 			}
 		}
-
-		return '<div class="text-preview">'.utils::EscapeHtml($this->GetValue($oObj, $sAttCode)).'</div>';
+		return '<div class="text-preview">'.htmlentities($this->GetValue($oObj, $sAttCode), ENT_QUOTES, 'UTF-8').'</div>';
 	}
 
 	protected function GetValue($oObj, $sAttCode)

core/expression.class.inc.php

@@ -1,8 +1,4 @@
 <?php
 // The file has been moved in iTop 2.2.0+ (revision 3803)
 // Preserve backward compatibility with some external tools (Cf. toolkit)
-
-// @deprecated 3.1.0
-DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use core/oql/expression.class.inc.php instead');
-
 require_once(APPROOT.'core/oql/expression.class.inc.php');

core/filterdef.class.inc.php

@@ -31,9 +31,8 @@ require_once('MyHelpers.class.inc.php');
 
 
 /**
- * Definition of a filter (could be made out of an existing attribute, or from an expression)
+ * Definition of a filter (could be made out of an existing attribute, or from an expression) 
  *
- * @deprecated  3.1.0 not used N°4690 - Deprecate "FilterCodes"
  * @package     iTopORM
  */
 abstract class FilterDefinition
@@ -47,7 +46,6 @@ abstract class FilterDefinition
 	
 	public function __construct($sCode, $aParams = array())
 	{
-		DeprecatedCallsLog::NotifyDeprecatedPhpMethod("Deprecated class ".$this->GetClass().". Do not use. Will be removed in next version.");
 		$this->m_sCode = $sCode;
 		$this->m_aParams = $aParams;
 		$this->ConsistencyCheck();
@@ -100,9 +98,8 @@ abstract class FilterDefinition
 }
 
 /**
- * Match against the object unique identifier
+ * Match against the object unique identifier 
  *
- * @deprecated 3.1.0 N°4690 - Deprecate "FilterCodes"
  * @package     iTopORM
  */
 class FilterPrivateKey extends FilterDefinition
@@ -148,9 +145,8 @@ class FilterPrivateKey extends FilterDefinition
 }
 
 /**
- * Match against an existing attribute (the attribute type will determine the available operators)
+ * Match against an existing attribute (the attribute type will determine the available operators) 
  *
- * @deprecated 3.1.0 N°4690 - Deprecate "FilterCodes"
  * @package     iTopORM
  */
 class FilterFromAttribute extends FilterDefinition

core/htmlbulkexport.class.inc.php

@@ -62,8 +62,7 @@ class HTMLBulkExport extends TabularBulkExport
 			if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
 			{
 				$sClass = (get_class($oAttDef) == 'AttributeDateTime') ? 'user-formatted-date-time' : 'user-formatted-date';
-
-				return '<div class="'.$sClass.'" data-date="'.$oObj->Get($sAttCode).'">'.utils::EscapeHtml($oAttDef->GetEditValue($oObj->Get($sAttCode), $oObj)).'</div>';
+				return '<div class="'.$sClass.'" data-date="'.$oObj->Get($sAttCode).'">'.htmlentities($oAttDef->GetEditValue($oObj->Get($sAttCode), $oObj), ENT_QUOTES, 'UTF-8').'</div>';
 			}
 		}
 		return $this->GetValue($oObj, $sAttCode);

core/htmlsanitizer.class.inc.php

@@ -134,7 +134,7 @@ abstract class DOMSanitizer extends HTMLSanitizer
 	public function DoSanitize($sHTML)
 	{
 		$this->oDoc = new DOMDocument();
-		$this->oDoc->preserveWhiteSpace = true;
+		$this->oDoc->preserveWhitespace = true;
 
 		// MS outlook implements empty lines by the mean of <p><o:p></o:p></p>
 		// We have to transform that into <p><br></p> (which is how Thunderbird implements empty lines)
@@ -286,8 +286,8 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		'strong' => array(),
 		'img' => array('src', 'style', 'alt', 'title'),
 		'ul' => array('style'),
-		'ol' => array('reversed', 'start', 'style', 'type'),
-		'li' => array('style', 'value'),
+		'ol' => array('style'),
+		'li' => array('style'),
 		'h1' => array('style'),
 		'h2' => array('style'),
 		'h3' => array('style'),
@@ -402,7 +402,7 @@ class HTMLDOMSanitizer extends DOMSanitizer
 	public function LoadDoc($sHTML)
 	{
 		@$this->oDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sHTML); // For loading HTML chunks where the character set is not specified
-		$this->oDoc->preserveWhiteSpace = true;
+		$this->oDoc->preserveWhitespace = true;
 	}
 
 	public function PrintDoc()

core/inlineimage.class.inc.php

@@ -295,12 +295,13 @@ class InlineImage extends DBObject
 			{
 				$sImgTag = $aImgInfo[0][0];
 				$sSecret = '';
-				if (preg_match('/data-img-secret="([0-9a-f]+)"/', $sImgTag, $aSecretMatches)) {
+				if (preg_match('/data-img-secret="([0-9a-f]+)"/', $sImgTag, $aSecretMatches))
+				{
 					$sSecret = '&s='.$aSecretMatches[1];
 				}
 				$sAttId = $aImgInfo[2][0];
-
-				$sNewImgTag = preg_replace('/src="[^"]+"/', 'src="'.utils::EscapeHtml($sUrl.$sAttId.$sSecret).'"', $sImgTag); // preserve other attributes, must convert & to & to be idempotent with CKEditor
+	
+				$sNewImgTag = preg_replace('/src="[^"]+"/', 'src="'.htmlentities($sUrl.$sAttId.$sSecret, ENT_QUOTES, 'UTF-8').'"', $sImgTag); // preserve other attributes, must convert & to & to be idempotent with CKEditor
 				$aNeedles[] = $sImgTag;
 				$aReplacements[] = $sNewImgTag;
 			}
@@ -535,8 +536,8 @@ JS
 		$iObjKey = $oObject->GetKey();
 
 		$sAbsoluteUrlAppRoot = utils::GetAbsoluteUrlAppRoot();
-		$sToggleFullScreen = utils::EscapeHtml(Dict::S('UI:ToggleFullScreen'));
-
+		$sToggleFullScreen = htmlentities(Dict::S('UI:ToggleFullScreen'), ENT_QUOTES, 'UTF-8');
+		
 		return
 			<<<JS
 		// Hook the file upload of all CKEditor instances

core/kpi.class.inc.php

@@ -299,7 +299,7 @@ class ExecutionKPI
 	 */
 	private static function Push(ExecutionKPI $oExecutionKPI)
 	{
-		self::$m_aExecutionStack[] = $oExecutionKPI;
+		array_push(self::$m_aExecutionStack, $oExecutionKPI);
 	}
 
 	/**
@@ -449,3 +449,4 @@ class ExecutionKPI
 		return 0;
 	}
 }
+

core/log.class.inc.php

@@ -551,15 +551,6 @@ class LogChannels
 	 */
 	public const NOTIFICATIONS = 'notifications';
 
-	/**
-	 * @var string Everything related to the backup / restore
-	 * @since 3.1.0
-	 */
-	public const BACKUP = 'backup';
-
-	/**
-	 * @since 3.0.0
-	 */
 	public const CLI = 'CLI';
 
 	/**
@@ -569,36 +560,15 @@ class LogChannels
 	 */
 	public const CMDB_SOURCE = 'cmdbsource';
 
-	/**
-	 * @since 3.0.0
-	 */
-	public const CONSOLE = 'console';
+	public const CONSOLE      = 'console';
 
-	public const CORE = 'core';
+	public const CORE         = 'core';
 
-	/**
-	 * @var string Everything related to the datatable component
-	 * @since 3.1.0
-	 */
-	public const DATATABLE = 'Datatable';
-
-	public const DEADLOCK = 'DeadLock';
+	public const DEADLOCK     = 'DeadLock';
 
 	public const INLINE_IMAGE = 'InlineImage';
 
 	public const PORTAL       = 'portal';
-
-	/**
-	 * @var string Everything related to the event service
-	 * @since 3.1.0
-	 */
-	public const EVENT_SERVICE = 'EventService';
-
-	/**
-	 * @var string Everything related to the datamodel CRUD
-	 * @since 3.1.0
-	 */
-	public const DM_CRUD = 'DMCRUD';
 }
 
 
@@ -1042,16 +1012,10 @@ class DeadLockLog extends LogAPI
 class DeprecatedCallsLog extends LogAPI
 {
 	public const ENUM_CHANNEL_PHP_METHOD = 'deprecated-php-method';
-	/**
-	 * @var string
-	 * @since 3.1.0
-	 */
-	public const ENUM_CHANNEL_PHP_ENDPOINT = 'deprecated-php-endpoint';
 	public const ENUM_CHANNEL_PHP_LIBMETHOD = 'deprecated-php-libmethod';
 	public const ENUM_CHANNEL_FILE = 'deprecated-file';
 	public const CHANNEL_DEFAULT = self::ENUM_CHANNEL_PHP_METHOD;
 
-	/** @var string Warning this constant won't be used directly ! To see the real default level check {@see GetLevelDefault()} */
 	public const LEVEL_DEFAULT = self::LEVEL_ERROR;
 
 	/** @var \FileLog we want our own instance ! */
@@ -1126,12 +1090,7 @@ class DeprecatedCallsLog extends LogAPI
 		}
 
 		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 4);
-		$iStackDeprecatedMethodLevel = 2; // level 0 = current method, level 1 = @trigger_error, level 2 = method containing the `trigger_error` call (can be either 'trigger_deprecation' or the faulty method), level 3 = In some cases, method containing the 'trigger_deprecation' call
-		// In case current level is actually a 'trigger_deprecation' call, try to go one level further to get the real deprecated method
-		if (array_key_exists($iStackDeprecatedMethodLevel, $aStack) && ($aStack[$iStackDeprecatedMethodLevel]['function'] === 'trigger_deprecation') && array_key_exists($iStackDeprecatedMethodLevel + 1, $aStack)) {
-			$iStackDeprecatedMethodLevel++;
-		}
-
+		$iStackDeprecatedMethodLevel = 2; // level 0 = current method, level 1 = @trigger_error, level 2 = method containing the `trigger_error` call
 		$sDeprecatedObject = $aStack[$iStackDeprecatedMethodLevel]['class'];
 		$sDeprecatedMethod = $aStack[$iStackDeprecatedMethodLevel]['function'];
 		if (($sDeprecatedObject === __CLASS__) && ($sDeprecatedMethod === 'Log')) {
@@ -1176,6 +1135,7 @@ class DeprecatedCallsLog extends LogAPI
 	 * - else call parent method
 	 *
 	 * In other words, when in dev mode all deprecated calls will be logged to file
+	 *
 	 */
 	protected static function GetLevelDefault(string $sConfigKey)
 	{
@@ -1264,35 +1224,6 @@ class DeprecatedCallsLog extends LogAPI
 		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_METHOD);
 	}
 
-	/**
-	 * @param string|null $sAdditionalMessage
-	 * @since 3.1.0
-	 */
-	public static function NotifyDeprecatedPhpEndpoint(?string $sAdditionalMessage = null): void
-	{
-		try {
-			if (!static::IsLogLevelEnabled(self::LEVEL_WARNING, self::ENUM_CHANNEL_PHP_ENDPOINT)) {
-				return;
-			}
-		}
-		catch (ConfigException $e) {
-			return;
-		}
-
-		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
-		$iStackDeprecatedMethodLevel = 0; // level 0 = current method, level 1 = method containing the `NotifyDeprecatedPhpMethod` call
-		$sDeprecatedUrl = $_SERVER['REQUEST_URI'];
-		$sCallerFile = $aStack[$iStackDeprecatedMethodLevel]['file'];
-		$sCallerLine = $aStack[$iStackDeprecatedMethodLevel]['line'];
-		$sMessage = "Call to endpoint {$sDeprecatedUrl} in {$sCallerFile}#L{$sCallerLine}";
-
-		if (!is_null($sAdditionalMessage)) {
-			$sMessage .= ' : '.$sAdditionalMessage;
-		}
-
-		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_ENDPOINT);
-	}
-
 	public static function Log($sLevel, $sMessage, $sChannel = null, $aContext = array()): void
 	{
 		if (true === utils::IsDevelopmentEnvironment()) {

core/oql/expression.class.inc.php

@@ -107,7 +107,7 @@ abstract class Expression {
 	/**
 	 * recursive rendering
 	 *
-	 * @deprecated 3.0.0 use RenderExpression
+	 * @deprecated use RenderExpression
 	 *
 	 * @param array $aArgs used as input by default, or used as output if bRetrofitParams set to True
 	 * @param bool $bRetrofitParams
@@ -118,7 +118,7 @@ abstract class Expression {
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		// cannot notify depreciation for now as this is still MASSIVELY used in iTop core !
-		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use RenderExpression');
+		//DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use RenderExpression');
 
 		return $this->RenderExpression(false, $aArgs, $bRetrofitParams);
 	}
@@ -1765,7 +1765,6 @@ class FieldExpression extends UnaryExpression
 	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
-
 		$sAttCode = $this->GetName();
 		$sParentAlias = $this->GetParent();
 
@@ -2860,26 +2859,9 @@ class FunctionExpression extends Expression
 				{
 					throw new \Exception("Function {$this->m_sVerb} requires 1 argument");
 				}
-
-				// N°5985 - Since PHP 8.1+, a bug fix on \DateTimeInterval for a date anterior to "1937-05-23" now returns a different number of days. The workaround below aim at making the code work with PHP 7.4 => 8.2+
-				//
-				// $oDate = new DateTimeImmutable('2020-01-02');
-				// $oZero = new DateTimeImmutable('1937-05-22');
-				// $iRet = (int) $oDate->diff($oZero)->format('%a');
-				// echo $iRet."\n"; // 30174 (PHP 8.0) vs 30175 (PHP 8.1+)
-				//
-				// $oDate = new DateTimeImmutable('2020-01-02');
-				// $oZero = new DateTimeImmutable('1937-05-23');
-				// $iRet = (int) $oDate->diff($oZero)->format('%a');
-				// echo $iRet."\n"; // 30174 (PHP 8.0) vs 30174 (PHP 8.1+)
-				//
-				// To work around that we take 1970-01-01 as "zero date" and we offset it with the number of days between 1582-01-01 and 1970-01-01.
-				// Note that as the "target" date could be between 1582-01-01 and 1970-01-01 we have to format the interval with the "-"/"+" sign in order to correct the number of days.
-
 				$oDate = new DateTime($this->m_aArgs[0]->Evaluate($aArgs));
-				$oZero = new DateTime('1970-01-01');
-				$iDaysBetween19700101And15800101 = 141713;
-				$iRet = (int) $oZero->diff($oDate)->format('%R%a') + 577815 + $iDaysBetween19700101And15800101;
+				$oZero = new DateTime('1582-01-01');
+				$iRet = (int) $oDate->diff($oZero)->format('%a') + 577815;
 				return $iRet;
 
 			case 'FROM_DAYS':
@@ -3067,7 +3049,8 @@ class FunctionExpression extends Expression
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
 		static $aWeekDayToString = null;
-		if (is_null($aWeekDayToString)) {
+		if (is_null($aWeekDayToString))
+		{
 			// Init the correspondance table
 			$aWeekDayToString = array(
 				0 => Dict::S('DayOfWeek-Sunday'),
@@ -3076,7 +3059,7 @@ class FunctionExpression extends Expression
 				3 => Dict::S('DayOfWeek-Wednesday'),
 				4 => Dict::S('DayOfWeek-Thursday'),
 				5 => Dict::S('DayOfWeek-Friday'),
-				6 => Dict::S('DayOfWeek-Saturday'),
+				6 => Dict::S('DayOfWeek-Saturday')
 			);
 		}
 		static $aMonthToString = null;
@@ -3084,15 +3067,15 @@ class FunctionExpression extends Expression
 		{
 			// Init the correspondance table
 			$aMonthToString = array(
-				1  => Dict::S('Month-01'),
-				2  => Dict::S('Month-02'),
-				3  => Dict::S('Month-03'),
-				4  => Dict::S('Month-04'),
-				5  => Dict::S('Month-05'),
-				6  => Dict::S('Month-06'),
-				7  => Dict::S('Month-07'),
-				8  => Dict::S('Month-08'),
-				9  => Dict::S('Month-09'),
+				1 => Dict::S('Month-01'),
+				2 => Dict::S('Month-02'),
+				3 => Dict::S('Month-03'),
+				4 => Dict::S('Month-04'),
+				5 => Dict::S('Month-05'),
+				6 => Dict::S('Month-06'),
+				7 => Dict::S('Month-07'),
+				8 => Dict::S('Month-08'),
+				9 => Dict::S('Month-09'),
 				10 => Dict::S('Month-10'),
 				11 => Dict::S('Month-11'),
 				12 => Dict::S('Month-12'),
@@ -3100,22 +3083,30 @@ class FunctionExpression extends Expression
 		}
 
 		$sRes = $sDefault;
-		if (strtolower($this->m_sVerb) == 'date_format') {
+		if (strtolower($this->m_sVerb) == 'date_format')
+		{
 			$oFormatExpr = $this->m_aArgs[1];
-
-			if ($oFormatExpr->RenderExpression() == "'%w'") {
-				if (isset($aWeekDayToString[(int)$sValue])) {
+			if ($oFormatExpr->Render() == "'%w'")
+			{
+				if (isset($aWeekDayToString[(int)$sValue]))
+				{
 					$sRes = $aWeekDayToString[(int)$sValue];
 				}
-			} elseif ($oFormatExpr->RenderExpression() == "'%Y-%m'") {
+			}
+			elseif ($oFormatExpr->Render() == "'%Y-%m'")
+			{
 				// yyyy-mm => "yyyy month"
-				$iMonth = (int)substr($sValue, -2); // the two last chars
+				$iMonth = (int) substr($sValue, -2); // the two last chars
 				$sRes = substr($sValue, 0, 4).' '.$aMonthToString[$iMonth];
-			} elseif ($oFormatExpr->RenderExpression() == "'%Y-%m-%d'") {
+			}
+			elseif ($oFormatExpr->Render() == "'%Y-%m-%d'")
+			{
 				// yyyy-mm-dd => "month d"
-				$iMonth = (int)substr($sValue, 5, 2);
+				$iMonth = (int) substr($sValue, 5, 2);
 				$sRes = $aMonthToString[$iMonth].' '.(int)substr($sValue, -2);
-			} elseif ($oFormatExpr->RenderExpression() == "'%H'") {
+			}
+			elseif ($oFormatExpr->Render() == "'%H'")
+			{
 				// H => "H Hour(s)"
 				$sRes = $sValue.':00';
 			}

core/oql/oql-parser.php

@@ -33,19 +33,17 @@ class OQLParser_yyToken implements ArrayAccess
         return $this->string;
     }
 
-    function offsetExists($offset): bool
+    function offsetExists($offset)
     {
         return isset($this->metadata[$offset]);
     }
 
-	// Return type mixed is not supported by PHP 7.4, we can remove the following PHP attribute and add the return type once iTop min PHP version is PHP 8.0+
-	#[\ReturnTypeWillChange]
     function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
 
-    function offsetSet($offset, $value): void
+    function offsetSet($offset, $value)
     {
         if ($offset === null) {
             if (isset($value[0])) {
@@ -68,7 +66,7 @@ class OQLParser_yyToken implements ArrayAccess
         }
     }
 
-    function offsetUnset($offset): void
+    function offsetUnset($offset)
     {
         unset($this->metadata[$offset]);
     }

core/oql/oqlexception.class.inc.php

@@ -26,37 +26,6 @@
 
 class OQLException extends CoreException
 {
-	/**
-	 * @var string
-	 * @since 3.1.0
-	 */
-	protected $m_MyIssue;
-	/**
-	 * @var string
-	 * @since 3.1.0
-	 */
-	protected $m_sInput;
-	/**
-	 * @var int
-	 * @since 3.1.0
-	 */
-	protected $m_iLine;
-	/**
-	 * @var int
-	 * @since 3.1.0
-	 */
-	protected $m_iCol;
-	/**
-	 * @var string
-	 * @since 3.1.0
-	 */
-	protected $m_sUnexpected;
-	/**
-	 * @var array|null string
-	 * @since 3.1.0
-	 */
-	protected $m_aExpecting;
-
 	public function __construct($sIssue, $sInput, $iLine, $iCol, $sUnexpected, $aExpecting = null)
 	{
 		$this->m_MyIssue = $sIssue;
@@ -89,19 +58,22 @@ class OQLException extends CoreException
 
 	public function getHtmlDesc($sHighlightHtmlBegin = '<span style="font-weight: bolder">', $sHighlightHtmlEnd = '</span>')
 	{
-		$sRet = utils::EscapeHtml($this->m_MyIssue.", found '".$this->m_sUnexpected."' in: ");
-		$sRet .= utils::EscapeHtml(substr($this->m_sInput, 0, $this->m_iCol));
-		$sRet .= $sHighlightHtmlBegin.utils::EscapeHtml(substr($this->m_sInput, $this->m_iCol, strlen($this->m_sUnexpected))).$sHighlightHtmlEnd;
-		$sRet .= utils::EscapeHtml(substr($this->m_sInput, $this->m_iCol + strlen($this->m_sUnexpected)));
+		$sRet = htmlentities($this->m_MyIssue.", found '".$this->m_sUnexpected."' in: ", ENT_QUOTES, 'UTF-8');
+		$sRet .= htmlentities(substr($this->m_sInput, 0, $this->m_iCol), ENT_QUOTES, 'UTF-8');
+		$sRet .= $sHighlightHtmlBegin.htmlentities(substr($this->m_sInput, $this->m_iCol, strlen($this->m_sUnexpected)), ENT_QUOTES, 'UTF-8').$sHighlightHtmlEnd;
+		$sRet .= htmlentities(substr($this->m_sInput, $this->m_iCol + strlen($this->m_sUnexpected)), ENT_QUOTES, 'UTF-8');
 
-		if (!is_null($this->m_aExpecting) && (count($this->m_aExpecting) > 0)) {
-			if (count($this->m_aExpecting) < 30) {
+		if (!is_null($this->m_aExpecting) && (count($this->m_aExpecting) > 0))
+		{
+			if (count($this->m_aExpecting) < 30)
+			{
 				$sExpectations = '{'.implode(', ', $this->m_aExpecting).'}';
-				$sRet .= ", expecting ".utils::EscapeHtml($sExpectations);
-			}
+				$sRet .= ", expecting ".htmlentities($sExpectations, ENT_QUOTES, 'UTF-8');
+			} 
 			$sSuggest = self::FindClosestString($this->m_sUnexpected, $this->m_aExpecting);
-			if (strlen($sSuggest) > 0) {
-				$sRet .= ", I would suggest to use '$sHighlightHtmlBegin".utils::EscapeHtml($sSuggest)."$sHighlightHtmlEnd'";
+			if (strlen($sSuggest) > 0)
+			{
+				$sRet .= ", I would suggest to use '$sHighlightHtmlBegin".htmlentities($sSuggest, ENT_QUOTES, 'UTF-8')."$sHighlightHtmlEnd'";
 			}
 		}
 

core/ormcaselog.class.inc.php

@@ -252,7 +252,7 @@ class ormCaseLog {
 			if (!array_key_exists('format', $aIndex[$index]) || ($aIndex[$index]['format'] == static::ENUM_FORMAT_TEXT))
 			{
 				$sCSSClass = 'caselog_entry';
-				$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));
+				$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
 			}
 			else
 			{
@@ -292,15 +292,19 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (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));
+			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
 
-			if (count($this->m_aIndex) == 0) {
+			if (count($this->m_aIndex) == 0)
+			{
 				$sHtml .= '<div class="caselog_entry" style="'.$sStyleCaseLogEntry.'"">';
 				$sHtml .= $sTextEntry;
 				$sHtml .= '</div>';
-			} else {
+			}
+			else
+			{
 				$sHtml .= '<div class="caselog_header" style="'.$sStyleCaseLogHeader.'">';
 				$sHtml .= Dict::S('UI:CaseLog:InitialValue');
 				$sHtml .= '</div>';
@@ -323,18 +327,24 @@ class ormCaseLog {
 		$sHtml = '<ul class="case_log_simple_html">';
 		$iPos = 0;
 		$aIndex = $this->m_aIndex;
-		for($index=count($aIndex)-1 ; $index >= 0 ; $index--) {
+		for($index=count($aIndex)-1 ; $index >= 0 ; $index--)
+		{
 			$iPos += $aIndex[$index]['separator_length'];
 			$sTextEntry = substr($this->m_sLog, $iPos, $aIndex[$index]['text_length']);
 			$sCSSClass = 'case_log_simple_html_entry_html';
-			if (!array_key_exists('format', $aIndex[$index]) || ($aIndex[$index]['format'] == static::ENUM_FORMAT_TEXT)) {
+			if (!array_key_exists('format', $aIndex[$index]) || ($aIndex[$index]['format'] == static::ENUM_FORMAT_TEXT))
+			{
 				$sCSSClass = 'case_log_simple_html_entry';
-				$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));
-				if (!is_null($aTransfoHandler)) {
+				$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
+				if (!is_null($aTransfoHandler))
+				{
 					$sTextEntry = call_user_func($aTransfoHandler, $sTextEntry);
 				}
-			} else {
-				if (!is_null($aTransfoHandler)) {
+			}
+			else
+			{
+				if (!is_null($aTransfoHandler))
+				{
 					$sTextEntry = call_user_func($aTransfoHandler, $sTextEntry, true /* wiki "links" only */);
 				}
 				$sTextEntry = InlineImage::FixUrls($sTextEntry);
@@ -373,15 +383,19 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (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));
+			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
 
-			if (count($this->m_aIndex) == 0) {
+			if (count($this->m_aIndex) == 0)
+			{
 				$sHtml .= '<li>';
 				$sHtml .= $sTextEntry;
 				$sHtml .= '</li>';
-			} else {
+			}
+			else
+			{
 				$sHtml .= '<li>';
 				$sHtml .= Dict::S('UI:CaseLog:InitialValue');
 				$sHtml .= '<div class="case_log_simple_html_entry" style="'.$sStyleCaseLogEntry.'">';
@@ -423,9 +437,11 @@ class ormCaseLog {
 			}
 			$iPos += $aIndex[$index]['separator_length'];
 			$sTextEntry = substr($this->m_sLog, $iPos, $aIndex[$index]['text_length']);
-			if (!array_key_exists('format', $aIndex[$index]) || ($aIndex[$index]['format'] == static::ENUM_FORMAT_TEXT)) {
-				$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));
-				if (!is_null($aTransfoHandler)) {
+			if (!array_key_exists('format', $aIndex[$index]) || ($aIndex[$index]['format'] == static::ENUM_FORMAT_TEXT))
+			{
+				$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
+				if (!is_null($aTransfoHandler))
+				{
 					$sTextEntry = call_user_func($aTransfoHandler, $sTextEntry);
 				}
 			}
@@ -467,16 +483,19 @@ class ormCaseLog {
 			$oBlock->AddSubBlock($oCollapsibleBlock);
 		}
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (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));
-			if (!is_null($aTransfoHandler)) {
+			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
+			if (!is_null($aTransfoHandler))
+			{
 				$sTextEntry = call_user_func($aTransfoHandler, $sTextEntry);
 			}
 
-			if (count($this->m_aIndex) == 0) {
-				$oCollapsibleBlock = CollapsibleSectionUIBlockFactory::MakeStandard('');
+			if (count($this->m_aIndex) == 0)
+			{
+				$oCollapsibleBlock = CollapsibleSectionUIBlockFactory::MakeStandard(  '');
 				$oCollapsibleBlock->AddSubBlock(new Html($sTextEntry));
 				$oCollapsibleBlock->SetOpenedByDefault(true);
 				$oBlock->AddSubBlock($oCollapsibleBlock);
@@ -683,25 +702,30 @@ class ormCaseLog {
 	{
 		$sRes = '';
 		$aLastEntry = end($this->m_aIndex);
-		if ($aLastEntry !== false) {
-			$sRaw = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']);
-			switch ($sFormat) {
-				case static::ENUM_FORMAT_TEXT:
-					if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT) {
-						$sRes = $sRaw;
-					} else {
-						$sRes = utils::HtmlToText($sRaw);
-					}
-					break;
-
-				case static::ENUM_FORMAT_HTML:
-					if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT) {
-						$sRes = utils::TextToHtml($sRaw);
-					} else {
-						$sRes = InlineImage::FixUrls($sRaw);
-					}
-					break;
+		$sRaw = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']);
+		switch($sFormat)
+		{
+			case static::ENUM_FORMAT_TEXT:
+			if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT)
+			{
+				$sRes = $sRaw;
 			}
+			else
+			{
+				$sRes = utils::HtmlToText($sRaw);
+			}
+			break;
+			
+			case static::ENUM_FORMAT_HTML:
+			if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT)
+			{
+				$sRes = utils::TextToHtml($sRaw);
+			}
+			else
+			{
+				$sRes = InlineImage::FixUrls($sRaw);
+			}
+			break;
 		}
 		return $sRes;
 	}

core/ormdocument.class.inc.php

@@ -25,9 +25,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Service\Events\EventData;
-use Combodo\iTop\Service\Events\EventService;
-
 
 /**
  * ormDocument
@@ -112,14 +109,17 @@ class ormDocument
 	public function GetAsHTML()
 	{
 		$sResult = '';
-		if ($this->IsEmpty()) {
+		if ($this->IsEmpty())
+		{
 			// If the filename is not empty, display it, this is used
 			// by the creation wizard while the file has not yet been uploaded
-			$sResult = utils::EscapeHtml($this->GetFileName());
-		} else {
+			$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8');
+		}
+		else
+		{
 			$data = $this->GetData();
 			$sSize = utils::BytesToFriendlyFormat(strlen($data));
-			$sResult = utils::EscapeHtml($this->GetFileName()).' ('.$sSize.')<br/>';
+			$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8').' ('.$sSize.')<br/>';
 		}
 		return $sResult;
 	}
@@ -131,8 +131,7 @@ class ormDocument
 	public function GetDisplayLink($sClass, $Id, $sAttCode)
 	{
 		$sUrl = $this->GetDisplayURL($sClass, $Id, $sAttCode);
-
-		return "<a href=\"$sUrl\" target=\"_blank\" >".utils::EscapeHtml($this->GetFileName())."</a>\n";
+		return "<a href=\"$sUrl\" target=\"_blank\" >".htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8')."</a>\n";
 	}
 	
 	/**
@@ -142,8 +141,7 @@ class ormDocument
 	public function GetDownloadLink($sClass, $Id, $sAttCode)
 	{
 		$sUrl = $this->GetDownloadURL($sClass, $Id, $sAttCode);
-
-		return "<a href=\"$sUrl\">".utils::EscapeHtml($this->GetFileName())."</a>\n";
+		return "<a href=\"$sUrl\">".htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8')."</a>\n";
 	}
 
 	/**
@@ -196,6 +194,7 @@ class ormDocument
 	 * @param string $sContentDisposition Either 'inline' or 'attachment'
 	 * @param string $sSecretField The attcode of the field containing a "secret" to be provided in order to retrieve the file
 	 * @param string $sSecretValue The value of the secret to be compared with the value of the attribute $sSecretField
+	 * @return none
 	 */
 	public static function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisposition = 'attachment', $sSecretField = null, $sSecretValue = null)
 	{
@@ -214,12 +213,6 @@ class ormDocument
 			$oDocument = $oObj->Get($sAttCode);
 			if (is_object($oDocument))
 			{
-				$aEventData = array(
-					'debug_info' => $oDocument->GetFileName(),
-					'object' => $oObj,
-					'document' => $oDocument,
-					);
-				EventService::FireEvent(new EventData(EVENT_DOWNLOAD_DOCUMENT, $sClass, $aEventData));
 				$oPage->TrashUnexpectedOutput();
 				$oPage->SetContentType($oDocument->GetMimeType());
 				$oPage->SetContentDisposition($sContentDisposition,$oDocument->GetFileName());

core/ormlinkset.class.inc.php

@@ -153,7 +153,8 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
      */
 	public function AddObject(DBObject $oObject, $sClassAlias = '')
     {
-	    DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use \ormLinkSet::AddItem() instead');
+	    // cannot notify depreciation for now as this is still MASSIVELY used in iTop core !
+	    //DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use \ormLinkSet::AddItem() instead');
 	    $this->AddItem($oObject);
     }
 
@@ -311,7 +312,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
 	 */
-	public function Count(): int
+	public function Count()
 	{
 		$this->LoadOriginalIds();
 		$iRet = count($this->aPreserved) + count($this->aAdded) + count($this->aModified);
@@ -326,7 +327,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @throws Exception
 	 * @internal param int $iRow
 	 */
-	public function Seek($iPosition): void
+	public function Seek($iPosition)
 	{
 		$this->LoadOriginalIds();
 
@@ -374,8 +375,6 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
 	 */
-	// Return type mixed is not supported by PHP 7.4, we can remove the following PHP attribute and add the return type once iTop min PHP version is PHP 8.0+
-	#[\ReturnTypeWillChange]
 	public function current()
 	{
 		$this->LoadOriginalIds();
@@ -383,8 +382,9 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		$iPreservedCount = count($this->aPreserved);
 		if ($this->iCursor < $iPreservedCount)
 		{
-			$sId = key($this->aPreserved);
-			$oRet = MetaModel::GetObject($this->sClass, $sId);
+			$iRet = current($this->aPreserved);
+			$this->oOriginalSet->Seek($iRet);
+			$oRet = $this->oOriginalSet->Fetch();
 		}
 		else
 		{
@@ -410,7 +410,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
 	 */
-	public function next(): void
+	public function next()
 	{
 		$this->LoadOriginalIds();
 
@@ -440,8 +440,6 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @link http://php.net/manual/en/iterator.key.php
 	 * @return mixed scalar on success, or null on failure.
 	 */
-	// Return type mixed is not supported by PHP 7.4, we can remove the following PHP attribute and add the return type once iTop min PHP version is PHP 8.0+
-	#[\ReturnTypeWillChange]
 	public function key()
 	{
 		return $this->iCursor;
@@ -457,7 +455,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
 	 */
-	public function valid(): bool
+	public function valid()
 	{
 		$this->LoadOriginalIds();
 
@@ -475,7 +473,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
 	 */
-	public function rewind(): void
+	public function rewind()
 	{
 	    $this->LoadOriginalIds();
 
@@ -735,7 +733,6 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 					$oLink->DBClone();
 				}
 			}
-			$oLink->SetLinkHostObject($oHostObject);
 			$oLink->DBWrite();
 
 			$this->aPreserved[$oLink->GetKey()] = $oLink;
@@ -847,30 +844,11 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		}
 		$oLinkSet = new DBObjectSet($oLinkSearch);
 		$oLinkSet->SetShowObsoleteData($bShowObsolete);
-		if ($this->HasDelta()) {
+		if ($this->HasDelta())
+		{
 			$oLinkSet->AddObjectArray($this->aAdded);
 		}
 
 		return $oLinkSet;
 	}
-
-	/**
-	 * GetValues.
-	 *
-	 * @return array of tag codes
-	 */
-	public function GetValues()
-	{
-		$aValues = array();
-		foreach ($this->aPreserved as $sTagCode => $oTag) {
-			$aValues[] = $sTagCode;
-		}
-		foreach ($this->aAdded as $sTagCode => $oTag) {
-			$aValues[] = $sTagCode;
-		}
-
-		sort($aValues);
-
-		return $aValues;
-	}
 }

core/ormstopwatch.class.inc.php

@@ -242,7 +242,7 @@ class ormStopWatch
 		foreach ($aProperties as $sProperty => $sValue)
 		{
 			$sRes .= "<TR>";
-			$sCell = str_replace("\n", "<br>\n", $sValue ?? '');
+			$sCell = str_replace("\n", "<br>\n", $sValue);
 			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
 			$sRes .= "</TR>";
 		}
@@ -596,9 +596,10 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							$oSW = $oObj->Get($sAttCode);
 							$oSW->MarkThresholdAsTriggered($iThreshold);
 							$oObj->Set($sAttCode, $oSW);
-
-							if ($oObj->IsModified()) {
-								CMDBObject::SetCurrentChangeFromParams("Automatic - threshold triggered");
+		
+							if($oObj->IsModified())
+							{
+								CMDBObject::SetTrackInfo("Automatic - threshold triggered");
 
 								$oObj->DBUpdate();
 							}

core/ormtagset.class.inc.php

@@ -499,9 +499,9 @@ final class ormTagSet extends ormSet
 	}
 
 	/**
-	 * @param $sTagLabel
+	 * @param $sTagCode
 	 *
-	 * @return string Tag code
+	 * @return DBObject tag
 	 * @throws \CoreUnexpectedValue
 	 * @throws \CoreException
 	 */

core/pdfbulkexport.class.inc.php

@@ -21,19 +21,6 @@ use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactor
  */
 class PDFBulkExport extends HTMLBulkExport
 {
-	/**
-	 * @var string For sample purposes
-	 * @internal
-	 * @since 2.7.8
-	 */
-	const ENUM_OUTPUT_TYPE_SAMPLE = 'sample';
-	/**
-	 * @var string For the real export
-	 * @internal
-	 * @since 2.7.8
-	 */
-	const ENUM_OUTPUT_TYPE_REAL = 'real';
-
 	public function DisplayUsage(Page $oP)
 	{
 		$oP->p(" * pdf format options:");
@@ -75,7 +62,7 @@ class PDFBulkExport extends HTMLBulkExport
 				$aPossibleFormat = ['A3', 'A4', 'Letter'];
 				$sDefaultFormat = 'A4';
 				foreach ($aPossibleFormat as $sVal) {
-					$oSelectFormat->AddSubBlock(SelectOptionUIBlockFactory::MakeForSelectOption($sVal, utils::EscapeHtml(Dict::S('Core:BulkExport:PageSize-'.$sVal)), ($sVal == $sDefaultFormat)));
+					$oSelectFormat->AddSubBlock(SelectOptionUIBlockFactory::MakeForSelectOption($sVal, htmlentities(Dict::S('Core:BulkExport:PageSize-'.$sVal), ENT_QUOTES, 'UTF-8'), ($sVal == $sDefaultFormat)));
 				}
 				$oFieldSetFormat->AddSubBlock(new Html('</br>'));
 
@@ -88,7 +75,7 @@ class PDFBulkExport extends HTMLBulkExport
 				$aPossibleOrientation = ['P', 'L'];
 				$sDefaultOrientation = 'L';
 				foreach ($aPossibleOrientation as $sVal) {
-					$oSelectOrientation->AddSubBlock(SelectOptionUIBlockFactory::MakeForSelectOption($sVal, utils::EscapeHtml(Dict::S('Core:BulkExport:PageOrientation-'.$sVal)), ($sVal == $sDefaultOrientation)));
+					$oSelectOrientation->AddSubBlock(SelectOptionUIBlockFactory::MakeForSelectOption($sVal, htmlentities(Dict::S('Core:BulkExport:PageOrientation-'.$sVal), ENT_QUOTES, 'UTF-8'), ($sVal == $sDefaultOrientation)));
 				}
 
 				//date format
@@ -97,8 +84,8 @@ class PDFBulkExport extends HTMLBulkExport
 
 				$sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
 
-				$sDefaultFormat = utils::EscapeHtml((string)AttributeDateTime::GetFormat());
-				$sExample = utils::EscapeHtml(date((string)AttributeDateTime::GetFormat()));
+				$sDefaultFormat = htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
+				$sExample = htmlentities(date((string)AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
 				$oRadioDefault = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatDefault_Example', $sDefaultFormat, $sExample), "pdf_date_format_radio", "default", "pdf_date_time_format_default", "radio");
 				$oRadioDefault->GetInput()->SetIsChecked(($sDateTimeFormat == (string)AttributeDateTime::GetFormat()));
 				$oRadioDefault->SetBeforeInput(false);
@@ -106,7 +93,7 @@ class PDFBulkExport extends HTMLBulkExport
 				$oFieldSetDate->AddSubBlock($oRadioDefault);
 				$oFieldSetDate->AddSubBlock(new Html('</br>'));
 
-				$sFormatInput = '<input type="text" size="15" name="date_format" id="pdf_custom_date_time_format" title="" value="'.utils::EscapeHtml($sDateTimeFormat).'"/>';
+				$sFormatInput = '<input type="text" size="15" name="date_format" id="pdf_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "pdf_date_format_radio", "custom", "pdf_date_time_format_custom", "radio");
 				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
@@ -210,25 +197,6 @@ EOF
 		return $sPDF;
 	}
 
-	/**
-	 * @inheritDoc
-	 * @since 2.7.8
-	 */
-	protected function GetSampleData($oObj, $sAttCode)
-	{
-		if ($sAttCode !== 'id')
-		{
-			$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
-
-			// As sample data will be displayed in the web browser, AttributeImage needs to be rendered with a regular HTML format, meaning its "src" looking like "data:image/png;base64,iVBORw0KGgoAAAANSUh..."
-			// Whereas for the PDF generation it needs to be rendered with a TCPPDF-compatible format, meaning its "src" looking like "@iVBORw0KGgoAAAANSUh..."
-			if ($oAttDef instanceof AttributeImage) {
-				return $this->GetAttributeImageValue($oAttDef, $oObj->Get($sAttCode), static::ENUM_OUTPUT_TYPE_SAMPLE);
-			}
-		}
-		return parent::GetSampleData($oObj, $sAttCode);
-	}
-
 	protected function GetValue($oObj, $sAttCode)
 	{
 		switch($sAttCode)
@@ -244,7 +212,31 @@ EOF
 					$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
 					if ($oAttDef instanceof AttributeImage)
 					{
-						$sRet = $this->GetAttributeImageValue($oAttDef, $value, static::ENUM_OUTPUT_TYPE_REAL);
+						// To limit the image size in the PDF output, we have to enforce the size as height/width because max-width/max-height have no effect
+						//
+						$iDefaultMaxWidthPx = 48;
+						$iDefaultMaxHeightPx = 48;
+						if ($value->IsEmpty())
+						{
+							$iNewWidth = $iDefaultMaxWidthPx;
+							$iNewHeight = $iDefaultMaxHeightPx;
+
+							$sUrl = $oAttDef->Get('default_image');
+						}
+						else
+						{
+							list($iWidth, $iHeight) = utils::GetImageSize($value->GetData());
+							$iMaxWidthPx = min($iDefaultMaxWidthPx, $oAttDef->Get('display_max_width'));
+							$iMaxHeightPx = min($iDefaultMaxHeightPx, $oAttDef->Get('display_max_height'));
+
+							$fScale = min($iMaxWidthPx / $iWidth, $iMaxHeightPx / $iHeight);
+							$iNewWidth = $iWidth * $fScale;
+							$iNewHeight = $iHeight * $fScale;
+
+							$sUrl = 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
+						}
+						$sRet = ($sUrl !== null) ? '<img src="'.$sUrl.'" style="width: '.$iNewWidth.'px; height: '.$iNewHeight.'px">' : '';
+						$sRet = '<div class="ibo-input-image--image-view">'.$sRet.'</div>';
 					}
 					else
 					{
@@ -259,55 +251,6 @@ EOF
 		return $sRet;
 	}
 
-	/**
-	 * @param \AttributeImage $oAttDef Instance of image attribute
-	 * @param \ormDocument $oValue Value of image attribute
-	 * @param string $sOutputType {@see \PDFBulkExport::ENUM_OUTPUT_TYPE_SAMPLE}, {@see \PDFBulkExport::ENUM_OUTPUT_TYPE_REAL}
-	 *
-	 * @return string Rendered value of $oAttDef / $oValue according to the desired $sOutputType
-	 * @since 2.7.8
-	 */
-	protected function GetAttributeImageValue(AttributeImage $oAttDef, ormDocument $oValue, string $sOutputType)
-	{
-		// To limit the image size in the PDF output, we have to enforce the size as height/width because max-width/max-height have no effect
-		//
-		$iDefaultMaxWidthPx = 48;
-		$iDefaultMaxHeightPx = 48;
-		if ($oValue->IsEmpty()) {
-			$iNewWidth = $iDefaultMaxWidthPx;
-			$iNewHeight = $iDefaultMaxHeightPx;
-
-			$sUrl = $oAttDef->Get('default_image');
-		} else {
-			list($iWidth, $iHeight) = utils::GetImageSize($oValue->GetData());
-			$iMaxWidthPx = min($iDefaultMaxWidthPx, $oAttDef->Get('display_max_width'));
-			$iMaxHeightPx = min($iDefaultMaxHeightPx, $oAttDef->Get('display_max_height'));
-
-			$fScale = min($iMaxWidthPx / $iWidth, $iMaxHeightPx / $iHeight);
-			$iNewWidth = $iWidth * $fScale;
-			$iNewHeight = $iHeight * $fScale;
-
-			$sValueAsBase64 = base64_encode($oValue->GetData());
-			switch ($sOutputType) {
-				case static::ENUM_OUTPUT_TYPE_SAMPLE:
-					$sUrl = 'data:'.$oValue->GetMimeType().';base64,'.$sValueAsBase64;
-					break;
-
-				case static::ENUM_OUTPUT_TYPE_REAL:
-				default:
-					// TCPDF requires base64-encoded images to be rendered without the usual "data:<MIMETYPE>;base64" header but with an "@"
-					// @link https://tcpdf.org/examples/example_009/
-					$sUrl = '@'.$sValueAsBase64;
-					break;
-			}
-		}
-
-		$sRet = ($sUrl !== null) ? '<img src="'.$sUrl.'" style="width: '.$iNewWidth.'px; height: '.$iNewHeight.'px;">' : '';
-		$sRet = '<div class="ibo-input-image--image-view">'.$sRet.'</div>';
-
-		return $sRet;
-	}
-
 	public function GetSupportedFormats()
 	{
 		return array('pdf' => Dict::S('Core:BulkExport:PDFFormat'));

core/restservices.class.inc.php

@@ -30,40 +30,18 @@
 /**
  * Element of the response formed by RestResultWithObjects
  *
- * @package     RESTAPI
- * @api
+ * @package     REST Services
  */
 class ObjectResult
 {
-	/**
-	 * @var int
-	 * @api
-	 */
 	public $code;
-	/**
-	 * @var string
-	 * @api
-	 */
 	public $message;
-	/**
-	 * @var mixed|null
-	 * @api
-	 */
 	public $class;
-	/**
-	 * @var mixed|null
-	 * @api
-	 */
 	public $key;
-	/**
-	 * @var array
-	 * @api
-	 */
 	public $fields;
 	
 	/**
 	 * Default constructor
-	 * @api
 	 */
 	public function __construct($sClass = null, $iId = null)
 	{
@@ -76,17 +54,11 @@ class ObjectResult
 
 	/**
 	 * Helper to make an output value for a given attribute
-	 *
-	 * @api
+	 * 	 
 	 * @param DBObject $oObject The object being reported
 	 * @param string $sAttCode The attribute code (must be valid)
 	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 *
 	 * @return string A scalar representation of the value
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
 	 */
 	protected function MakeResultValue(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
 	{
@@ -140,17 +112,11 @@ class ObjectResult
 
 	/**
 	 * Report the value for the given object attribute
-	 *
-	 * @api
+	 * 	 
 	 * @param DBObject $oObject The object being reported
 	 * @param string $sAttCode The attribute code (must be valid)
 	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 *
 	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
 	 */
 	public function AddField(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
 	{
@@ -163,29 +129,23 @@ class ObjectResult
 /**
  * REST response for services managing objects. Derive this structure to add information and/or constants
  *
- * @package RESTAPI
+ * @package     Extensibility
+ * @package     REST Services
  * @api
  */
 class RestResultWithObjects extends RestResult
 {
-	/** @var array "DBObject_class:DBObject_key" as key, {@see \ObjectResult} as value */
 	public $objects;
 
 	/**
 	 * Report the given object
-	 *
-	 * @api
-	 * @param int $iCode An error code (RestResult::OK is no issue has been found)
+	 * 	 
+	 * @param int An error code (RestResult::OK is no issue has been found)
 	 * @param string $sMessage Description of the error if any, an empty string otherwise
 	 * @param DBObject $oObject The object being reported
-	 * @param array|null $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
+	 * @param array $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
 	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 *
 	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
 	 */
 	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
 	{
@@ -223,30 +183,16 @@ class RestResultWithObjects extends RestResult
 	}
 }
 
-/**
- * @package RESTAPI
- * @api
- */
 class RestResultWithRelations extends RestResultWithObjects
 {
 	public $relations;
-
-	/**
-	 * @api
-	 */
+	
 	public function __construct()
 	{
 		parent::__construct();
 		$this->relations = array();
 	}
-
-	/**
-	 * @param $sSrcKey
-	 * @param $sDestKey
-	 *
-	 * @return void
-	 * @api
-	 */
+	
 	public function AddRelation($sSrcKey, $sDestKey)
 	{
 		if (!array_key_exists($sSrcKey, $this->relations))
@@ -260,7 +206,7 @@ class RestResultWithRelations extends RestResultWithObjects
 /**
  * Deletion result codes for a target object (either deleted or updated)
  *
- * @package     RESTAPI
+ * @package     Extensibility
  * @api
  * @since 2.0.1  
  */
@@ -268,37 +214,30 @@ class RestDelete
 {
 	/**
 	 * Result: Object deleted as per the initial request
-	 * @api
 	 */
 	const OK = 0;
 	/**
-	 * Result: general issue (user rights or ... ?)
-	 * @api
+	 * Result: general issue (user rights or ... ?) 
 	 */
 	const ISSUE = 1;
 	/**
-	 * Result: Must be deleted to preserve database integrity
-	 * @api
+	 * Result: Must be deleted to preserve database integrity 
 	 */
 	const AUTO_DELETE = 2;
 	/**
-	 * Result: Must be deleted to preserve database integrity, but that is NOT possible
-	 * @api
+	 * Result: Must be deleted to preserve database integrity, but that is NOT possible 
 	 */
 	const AUTO_DELETE_ISSUE = 3;
 	/**
-	 * Result: Must be deleted to preserve database integrity, but this must be requested explicitly
-	 * @api
+	 * Result: Must be deleted to preserve database integrity, but this must be requested explicitely 
 	 */
 	const REQUEST_EXPLICITELY = 4;
 	/**
 	 * Result: Must be updated to preserve database integrity
-	 * @api
 	 */
 	const AUTO_UPDATE = 5;
 	/**
 	 * Result: Must be updated to preserve database integrity, but that is NOT possible
-	 * @api
 	 */
 	const AUTO_UPDATE_ISSUE = 6;
 }
@@ -635,7 +574,7 @@ class CoreServices implements iRestServiceProvider
 					$oObject = $oElement->GetProperty('object');
 					if ($oObject)
 					{
-						if ($bEnableRedundancy && $sDirection == 'down')
+						if ($bEnableRedundancy)
 						{
 							// Add only the "reached" objects
 							if ($oElement->GetProperty('is_reached'))