N°5160 - Hiding a DashboardAttribute on the fly does not work - WIP

.doc/itop-version-history.md

@@ -1,61 +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"
-    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"
-    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"
-    branch support/2.5 order: 880
-    checkout develop
-    commit id: "2019-01-09" tag: "2.6.0"
-    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
-    branch support/2.7 order: 860
-    commit id: "2020-04-01" tag: "2.7.0-1"
-    checkout support/2.6
-    commit id: "2020-04-22" tag: "2.6.4"
-    checkout support/2.7
-    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"
-    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
-```

.gitattributes

@@ -1,48 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.bash text eol=lf
-*.bat text eol=lf
-*.cmd text eol=lf
-*.css text eol=lf
-*.scss text eol=lf
-*.dist text eol=lf
-.editorconfig text eol=lf
-.env* text eol=lf
-.gitignore text eol=lf
-.htaccess text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.ini text eol=lf
-*.js text eol=lf
-*.json text eol=lf
-*.lock text eol=lf
-*.md text eol=lf
-*.php text eol=lf
-*.php_cs text eol=lf
-*.php8 text eol=lf
-*.plex text eol=lf
-*.sh text eol=lf
-*.svg text eol=lf
-*.ts text eol=lf
-*.twig text eol=lf
-*.txt text eol=lf
-*.xml text eol=lf
-*.xsd text eol=lf
-*.yaml text eol=lf
-*.yml text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpeg binary
-*.jpg binary
-*.gif binary
-*.ico binary
-*.pdf binary
-*.swf binary
-*.zip binary
-*.ttf binary
-*.woff binary
-*.woff2 binary

.gitignore

@@ -51,7 +51,6 @@ test/vendor/*
 
 # Jetbrains
 /.idea/**
-!/.idea/IntelliLang.xml
 
 # doc. generation
 /.doc/vendor

.idea/IntelliLang.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="LanguageInjectionConfiguration">
-    <injection language="InjectablePHP" injector-id="xml">
-      <display-name>iTop - Class method code</display-name>
-      <place><![CDATA[xmlTag().withLocalName(string().equalTo("code"))]]></place>
-      <xpath-condition>name(..) = 'method' and count(/itop_design) = 1</xpath-condition>
-    </injection>
-    <injection language="InjectablePHP" injector-id="xml">
-      <display-name>iTop - Snippet code</display-name>
-      <place><![CDATA[xmlTag().withLocalName(string().equalTo("snippet"))]]></place>
-      <xpath-condition>name(..) = 'snippets' and count(/itop_design) = 1</xpath-condition>
-    </injection>
-  </component>
-</project>

.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/composer/rmDeniedTestDir.php

@@ -50,24 +50,14 @@ foreach ($aDeniedButStillPresent as $sDir)
 		continue;
 	}
 
-	try {
+	try
+	{
 		SetupUtils::rrmdir($sDir);
 		echo "OK Remove denied test dir: '$sDir'\n";
 	}
-	catch (\Exception $e) {
+	catch (\Exception $e)
+	{
 		echo "\nFAILED to remove denied test dir: '$sDir'\n";
 	}
-}
 
-
-$aAllowedAndDeniedDirs = array_merge(
-	$oiTopComposer->ListAllowedTestDir(),
-	$oiTopComposer->ListDeniedTestDir()
-);
-$aExistingDirs = $oiTopComposer->ListAllTestDir();
-$aMissing = array_diff($aExistingDirs, $aAllowedAndDeniedDirs);
-if (false === empty($aMissing)) {
-	echo "Some new tests dirs exists !\n"
-		.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
-		.'  List of dirs:'."\n".var_export($aMissing, true);
 }

CONTRIBUTING.md

@@ -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
@@ -68,7 +65,7 @@ In this example, when 3.1.0-beta is shipped that will become:
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.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)
@@ -114,9 +111,9 @@ Our tests are located in the `test/` directory, containing a PHPUnit config file
 * Use the present tense ("Add feature" not "Added feature")
 * Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
 * Limit the first line to 72 characters or less
-* Please start the commit message with an applicable emoji code (following the [Gitmoji guide](https://gitmoji.dev/)).  
-  Beware to use the code (for example `:bug:`) and not the character (🐛) as Unicode support in git clients is very poor for now...  
-  Emoji examples :
+* Please start the commit message with an applicable emoji code (following the [Gitmoji guide](https://gitmoji.carloscuesta.me/)).  
+ Beware to use the code (for example `:bug:`) and not the character (🐛) as Unicode support in git clients is very poor for now...  
+ Emoji examples :
     * 🌐 `:globe_with_meridians:` for translations
     * 🎨 `:art:` when improving the format/structure of the code
     * ⚡️ `:zap:` when improving performance
@@ -136,17 +133,19 @@ When your code is working, please:
 
 * stash as much as possible your commits,
 * rebase your branch on our repo last commit,
-* create a pull request
-* 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 !
+* 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/).
 
+You might check the ["Allow edits from maintainers" PR checkbox][allow_edits_checkbox] to ease review.
+
+[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 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!
+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! 
 
-We have one sticker per contribution type. You might get multiple stickers with one contribution though :)
+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
@@ -158,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)

README.md

@@ -1,11 +1,13 @@
 <p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
-    <img src="https://www.combodo.com/logos/logo-itop-baseline.svg" width=350>
+    <img src="https://www.combodo.com/logos/logo-itop.svg">
 </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 adds-on and web services to integrate with your IT.
-
-iTop also offers mass import tools to help you being even more efficient.
+# iTop - ITSM & CMDB
+ 
+iTop stands for *IT Operations Portal*.
+It is a complete open source, ITIL, web based service management tool including a fully customizable CMDB, a helpdesk system and a document management tool. 
+iTop also offers mass import tools and web services to integrate with your IT
 
 ## Features
 - Fully configurable [Configuration Management (CMDB)][10]
@@ -40,7 +42,6 @@ iTop also offers mass import tools to help you being 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 +50,6 @@ iTop also offers mass import tools to help you being 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
@@ -100,11 +100,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)
@@ -118,7 +115,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - DudekArtur
 - Karkoff1212
 - Laura
-- nv35
 - Purple Grape
 - Schlobinux
 - theBigOne

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

@@ -5,20 +5,16 @@
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  */
 
-// cannot notify depreciation for now as this is still load in 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/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;
 	}

application/applicationextension.inc.php

@@ -299,7 +299,6 @@ abstract class AbstractPreferencesExtension implements iPreferencesExtension
  *
  * @api
  * @package     Extensibility
- * @deprecated
  */
 interface iApplicationUIExtension
 {
@@ -442,7 +441,6 @@ interface iApplicationUIExtension
  * @api
  * @package     Extensibility
  * @since       2.7.0
- * @deprecated
  */
 abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
 {
@@ -1186,7 +1184,7 @@ interface iPageUIBlockExtension
  * @api
  * @package     Extensibility
  * @since       2.7.0
- * @deprecated 3.0.0 use AbstractPageUIBlockExtension instead
+ * @deprecated since 3.0.0 use AbstractPageUIBlockExtension instead
  */
 abstract class AbstractPageUIExtension implements iPageUIExtension
 {
@@ -2094,4 +2092,4 @@ class RestUtils
 interface iModuleExtension
 {
 	public function __construct();
-}
+}

application/cmdbabstract.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2022 Combodo SARL
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -42,7 +42,6 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
 
-
 define('OBJECT_PROPERTIES_TAB', 'ObjectProperties');
 
 define('HILIGHT_CLASS_CRITICAL', 'red');
@@ -342,17 +341,13 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
-	 *   When writing to the page, markup will be put above the real header of the panel.
-	 *   To insert something IN the panel, we now need to add UIBlocks in either the "subtitle" or "toolbar" sections of the array that will be returned.
-	 * @param bool $bEditMode Deprecated parameter in iTop 3.0.0, use {@see GetDisplayMode()} and ENUM_DISPLAY_MODE_* constants instead
+	 * Important: For compatibility reasons, this function still allows to manipulate the $oPage. In that case, markup will be put above the real header of the panel.
+	 * To insert something IN the panel, we now need to add UIBlocks in either the "subtitle" or "toolbar" sections of the array that will be returned.
 	 *
-	 * @return array{
-	 *       subtitle: \Combodo\iTop\Application\UI\Base\UIBlock[],
-	 *       toolbar: \Combodo\iTop\Application\UI\Base\UIBlock[]
-	 *    }
-	 *    blocks to be inserted in the "subtitle" and the "toolbar" sections of the ObjectDetails block.
-	 *    eg. ['subtitle' => [<BLOCK1>, <BLOCK2>], 'toolbar' => [<BLOCK3>]]
+	 * @param \WebPage $oPage
+	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
+	 *
+	 * @return array UIBlocks to be inserted in the "subtitle" and the "toolbar" sections of the ObjectDetails block. eg. ['subtitle' => [<BLOCK1>, <BLOCK2>], 'toolbar' => [<BLOCK3>]]
 	 *
 	 * @throws \ApplicationException
 	 * @throws \ArchivedObjectException
@@ -361,10 +356,7 @@ JS
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 *
-	 * @since 3.0.0 $bEditMode is deprecated, see param documentation above
-	 * @since 3.0.0 Changed signature: Method must return header content in an array (no more writing directly to the $oPage)
-	 *
-	 * @noinspection PhpUnusedParameterInspection
+	 * @since 3.0.0 $bEditMode is deprecated and no longer used
 	 */
 	public function DisplayBareHeader(WebPage $oPage, $bEditMode = false)
 	{
@@ -677,26 +669,33 @@ HTML
 				$sTargetClass = $oLinkingAttDef->GetTargetClass();
 				// n:n links => must be allowed to modify the linking class AND  read the target class in order to edit the linkedset
 				if (!UserRights::IsActionAllowed($sLinkedClass,
-						UR_ACTION_MODIFY) || !UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ)) {
+						UR_ACTION_MODIFY) || !UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ))
+				{
 					$iFlags |= OPT_ATT_READONLY;
 				}
 				// n:n links => must be allowed to read the linking class AND  the target class in order to display the linkedset
 				if (!UserRights::IsActionAllowed($sLinkedClass,
-						UR_ACTION_READ) || !UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ)) {
+						UR_ACTION_READ) || !UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ))
+				{
 					$iFlags |= OPT_ATT_HIDDEN;
 				}
-			} else {
+			}
+			else
+			{
 				// 1:n links => must be allowed to modify the linked class in order to edit the linkedset
-				if (!UserRights::IsActionAllowed($sLinkedClass, UR_ACTION_MODIFY)) {
+				if (!UserRights::IsActionAllowed($sLinkedClass, UR_ACTION_MODIFY))
+				{
 					$iFlags |= OPT_ATT_READONLY;
 				}
 				// 1:n links => must be allowed to read the linked class in order to display the linkedset
-				if (!UserRights::IsActionAllowed($sLinkedClass, UR_ACTION_READ)) {
+				if (!UserRights::IsActionAllowed($sLinkedClass, UR_ACTION_READ))
+				{
 					$iFlags |= OPT_ATT_HIDDEN;
 				}
 			}
 			// Non-readable/hidden linkedset... don't display anything
-			if ($iFlags & OPT_ATT_HIDDEN) {
+			if ($iFlags & OPT_ATT_HIDDEN)
+			{
 				continue;
 			}
 
@@ -705,23 +704,27 @@ HTML
 
 			$aArgs = array('this' => $this);
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
-			if ($bEditMode && (!$bReadOnly)) {
+			if ($bEditMode && (!$bReadOnly))
+			{
 				$sInputId = $this->m_iFormId.'_'.$sAttCode;
 
-				if ($oAttDef->IsIndirect()) {
+				if ($oAttDef->IsIndirect())
+				{
 					$oLinkingAttDef = MetaModel::GetAttributeDef($sLinkedClass, $oAttDef->GetExtKeyToRemote());
 					$sTargetClass = $oLinkingAttDef->GetTargetClass();
-				} else {
+				}
+				else
+				{
 					$sTargetClass = $sLinkedClass;
 				}
 
 				$oClassIcon = new MedallionIcon(MetaModel::GetClassIcon($sTargetClass, false));
 				$oClassIcon->SetDescription($oAttDef->GetDescription())->AddCSSClass('ibo-block-list--medallion');
 				$oPage->AddUiBlock($oClassIcon);
-
+				
 				$sDisplayValue = ''; // not used
 				$sHTMLValue = "<span id=\"field_{$sInputId}\">".self::GetFormElementForField($oPage, $sClass, $sAttCode,
-						$oAttDef, $oOrmLinkSet, $sDisplayValue, $sInputId, '', $iFlags, $aArgs).'</span>';
+						$oAttDef, $oLinkSet, $sDisplayValue, $sInputId, '', $iFlags, $aArgs).'</span>';
 				$this->AddToFieldsMap($sAttCode, $sInputId);
 				$oPage->add($sHTMLValue);
 			}
@@ -977,8 +980,10 @@ HTML
 												$this->GetSynchroReplicaFlags($sAttCode, $aReasons);
 												$sTip = '';
 												foreach ($aReasons as $aRow) {
-													$sDescription = utils::EscapeHtml($aRow['description']);
-													$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
+													$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>";
 													$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
@@ -1391,7 +1396,7 @@ HTML
 						} else {
 							if ($oAttDef instanceof AttributeCaseLog) {
 								$rawValue = $oObj->Get($sAttCodeEx);
-								$outputValue = str_replace("\n", "<br/>", utils::EscapeHtml($rawValue->__toString()));
+								$outputValue = str_replace("\n", "<br/>", htmlentities($rawValue->__toString(), ENT_QUOTES, 'UTF-8'));
 								// Trick for Excel: treat the content as text even if it begins with an equal sign
 								$aRow[$oAttDef->GetCode()] = $outputValue;
 							} else {
@@ -1405,9 +1410,9 @@ HTML
 									}
 								}
 								if ($bLocalize) {
-									$outputValue = utils::EscapeHtml($oFinalAttDef->GetEditValue($rawValue));
+									$outputValue = htmlentities($oFinalAttDef->GetEditValue($rawValue), ENT_QUOTES, 'UTF-8');
 								} else {
-									$outputValue = utils::EscapeHtml($rawValue);
+									$outputValue = htmlentities($rawValue, ENT_QUOTES, 'UTF-8');
 								}
 								$aRow[$oAttDef->GetCode()] = $outputValue;
 							}
@@ -1443,7 +1448,7 @@ HTML
 	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
-	 * @deprecated 3.0.0
+	 * @deprecated since 3.0.0
 	 */
 	public static function GetDisplayExtendedSet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
@@ -1883,7 +1888,7 @@ HTML
 							{
 								$rawValue = $oObj->Get($sAttCodeEx);
 								$outputValue = str_replace("\n", "<br/>",
-									utils::EscapeHtml($rawValue->__toString()));
+									htmlentities($rawValue->__toString(), ENT_QUOTES, 'UTF-8'));
 								// Trick for Excel: treat the content as text even if it begins with an equal sign
 								$aRow[] = '<td x:str>'.$outputValue.'</td>';
 							}
@@ -1900,11 +1905,14 @@ HTML
 										$rawValue = '';
 									}
 								}
-								if ($bLocalize) {
-									$outputValue = utils::EscapeHtml($oFinalAttDef->GetEditValue($rawValue));
+								if ($bLocalize)
+								{
+									$outputValue = htmlentities($oFinalAttDef->GetEditValue($rawValue), ENT_QUOTES,
+										'UTF-8');
 								}
-								else {
-									$outputValue = utils::EscapeHtml($rawValue);
+								else
+								{
+									$outputValue = htmlentities($rawValue, ENT_QUOTES, 'UTF-8');
 								}
 								$aRow[] = '<td>'.$outputValue.'</td>';
 							}
@@ -2123,7 +2131,7 @@ HTML;
 					$sDisplayValueForHtml = utils::EscapeHtml($sDisplayValue);
 					$sHTMLValue = <<<HTML
 <div class="field_input_zone field_input_datetime ibo-input-wrapper ibo-input-datetime-wrapper" data-validation="untouched">
-	<input title="{$sHelpText}" class="datetime-pick ibo-input ibo-input-datetime" type="text" size="19" {$sPlaceholderValue} name="attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}" value="{$sDisplayValueForHtml}" id="{$iId}" autocomplete="off" />
+	<input title="{$sHelpText}" class="datetime-pick ibo-input ibo-input-datetime" type="text" size="19" {$sPlaceholderValue} name="attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}" value="{$sDisplayValueForHtml}" id="{$iId}" autoomplete="off" />
 </div>{$sValidationSpan}{$sReloadSpan}
 HTML;
 					break;
@@ -2141,7 +2149,7 @@ HTML;
 					$sHours = "<input class=\"ibo-input ibo-input-duration\" title=\"$sHelpText\" type=\"text\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[h]{$sNameSuffix}\" value=\"{$aVal['hours']}\" id=\"{$iId}_h\"/>";
 					$sMinutes = "<input class=\"ibo-input ibo-input-duration\" title=\"$sHelpText\" type=\"text\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[m]{$sNameSuffix}\" value=\"{$aVal['minutes']}\" id=\"{$iId}_m\"/>";
 					$sSeconds = "<input class=\"ibo-input ibo-input-duration\" title=\"$sHelpText\" type=\"text\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[s]{$sNameSuffix}\" value=\"{$aVal['seconds']}\" id=\"{$iId}_s\"/>";
-					$sHidden = "<input type=\"hidden\" id=\"{$iId}\" value=\"".utils::EscapeHtml($value)."\"/>";
+					$sHidden = "<input type=\"hidden\" id=\"{$iId}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\"/>";
 					$sHTMLValue = Dict::Format('UI:DurationForm_Days_Hours_Minutes_Seconds', $sDays, $sHours, $sMinutes, $sSeconds).$sHidden."&nbsp;".$sValidationSpan.$sReloadSpan;
 					$oPage->add_ready_script("$('#{$iId}').on('update', function(evt, sFormId) { return ToggleDurationField('$iId'); });");
 					break;
@@ -2151,7 +2159,8 @@ HTML;
 					$aEventsList[] = 'validate';
 					$aEventsList[] = 'keyup';
 					$aEventsList[] = 'change';
-					$sHTMLValue = "<div class=\"field_input_zone field_input_password ibo-input-wrapper ibo-input-password-wrapper\" data-validation=\"untouched\"><input class=\"ibo-input ibo-input-password\" title=\"$sHelpText\" type=\"password\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"".utils::EscapeHtml($value)."\" id=\"$iId\"/></div>{$sValidationSpan}{$sReloadSpan}";
+					$sHTMLValue = "<div class=\"field_input_zone field_input_password ibo-input-wrapper ibo-input-password-wrapper\" data-validation=\"untouched\"><input class=\"ibo-input ibo-input-password\" title=\"$sHelpText\" type=\"password\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"".htmlentities($value,
+							ENT_QUOTES, 'UTF-8')."\" id=\"$iId\"/></div>{$sValidationSpan}{$sReloadSpan}";
 					break;
 
 				case 'OQLExpression':
@@ -2303,13 +2312,13 @@ EOF
 
 					$sHeader = '<div class="ibo-caselog-entry-form--actions"><div class="""ibo-caselog-entry-form--actions" data-role="ibo-caselog-entry-form--action-buttons--extra-actions"></div></div>'; // will be hidden in CSS (via :empty) if it remains empty
 					$sEditValue = is_object($value) ? $value->GetModifiedEntry('html') : '';
-					$sPreviousLog = is_object($value) ? $value->GetAsHTML($oPage, true /* bEditMode */, array('AttributeText', 'RenderWikiHtml')) : '';
+					$sPreviousLog = is_object($value) ? $value->GetAsHTML($oPage, true /* bEditMode */,  array('AttributeText', 'RenderWikiHtml')) : '';
 					$iEntriesCount = is_object($value) ? count($value->GetIndex()) : 0;
 					$sHidden = "<input type=\"hidden\" id=\"{$iId}_count\" value=\"$iEntriesCount\"/>"; // To know how many entries the case log already contains
 
 					$sHTMLValue = "$sHeader<div class=\"ibo-caselog-entry-form--text-input\" $sStyle data-role=\"ibo-caselog-entry-form--text-input\">";
-					$sHTMLValue .= "<textarea class=\"htmlEditor ibo-input-richtext-placeholder\" style=\"border:0;width:100%\" title=\"$sHelpText\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" rows=\"8\" cols=\"40\" id=\"$iId\">".utils::EscapeHtml($sEditValue)."</textarea>";
-					$sHTMLValue .= "$sPreviousLog</div>{$sValidationSpan}{$sReloadSpan}$sHidden";
+					$sHTMLValue .=	"<textarea class=\"htmlEditor ibo-input-richtext-placeholder\" style=\"border:0;width:100%\" title=\"$sHelpText\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" rows=\"8\" cols=\"40\" id=\"$iId\">".htmlentities($sEditValue,ENT_QUOTES,'UTF-8')."</textarea>";
+					$sHTMLValue .=	"$sPreviousLog</div>{$sValidationSpan}{$sReloadSpan}$sHidden";
 
 					// Note: This should be refactored for all types of attribute (see at the end of this function) but as we are doing this for a maintenance release, we are scheduling it for the next main release in to order to avoid regressions as much as possible.
 					$sNullValue = $oAttDef->GetNullValue();
@@ -2366,7 +2375,8 @@ EOF
 				case 'LinkedSet':
 					$sInputType = self::ENUM_INPUT_TYPE_LINKEDSET;
 					if ($oAttDef->IsIndirect()) {
-						$oWidget = new UILinksWidget($sClass, $sAttCode, $iId, $sNameSuffix, $oAttDef->DuplicatesAllowed());
+						$oWidget = new UILinksWidget($sClass, $sAttCode, $iId, $sNameSuffix,
+							$oAttDef->DuplicatesAllowed());
 					} else {
 						$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iId, $sNameSuffix);
 					}
@@ -2553,16 +2563,16 @@ JS
 
 				case 'Set':
 				case 'TagSet':
-				$sInputType = self::ENUM_INPUT_TYPE_TAGSET;
-				$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/selectize.min.js');
-				$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/selectize.default.css');
-				$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.itop-set-widget.js');
+					$sInputType = self::ENUM_INPUT_TYPE_TAGSET;
+					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/selectize.min.js');
+					$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/selectize.default.css');
+					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.itop-set-widget.js');
 
-				$oPage->add_dict_entry('Core:AttributeSet:placeholder');
+					$oPage->add_dict_entry('Core:AttributeSet:placeholder');
 
-				/** @var \ormSet $value */
+					/** @var \ormSet $value */
 				$sJson = $oAttDef->GetJsonForWidget($value, $aArgs);
-				$sEscapedJson = utils::EscapeHtml($sJson);
+				$sEscapedJson = htmlentities($sJson, ENT_QUOTES, 'UTF-8');
 				$sSetInputName = "attr_{$sFormPrefix}{$sAttCode}";
 
 				// handle form validation
@@ -3675,7 +3685,8 @@ HTML;
 						break;
 
 					default:
-						$oPage->add("<pre>".utils::EscapeHtml(MyHelpers::beautifulstr($data, 1000, true))."</pre>\n");
+						$oPage->add("<pre>".htmlentities(MyHelpers::beautifulstr($data, 1000, true), ENT_QUOTES,
+								'UTF-8')."</pre>\n");
 				}
 				break;
 
@@ -3918,7 +3929,7 @@ HTML;
 				}
 				elseif ($iFlags & OPT_ATT_SLAVE)
 				{
-					$aErrors[$sAttCode] = Dict::Format('UI:AttemptingToSetASlaveAttribute_Name', $oAttDef->GetLabel(), $sAttCode);
+					$aErrors[$sAttCode] = Dict::Format('UI:AttemptingToSetASlaveAttribute_Name', $oAttDef->GetLabel());
 				}
 				else
 				{
@@ -4013,14 +4024,18 @@ HTML;
 					$this->Set($sAttCode, $value);
 					break;
 				case 'LinkedSet':
-					if ($this->IsValueModified($value)) {
+					if ($this->IsValueModified($value))
+					{
 						$oLinkSet = $this->Get($sAttCode);
 						$sLinkedClass = $oAttDef->GetLinkedClass();
-						if (array_key_exists('to_be_created', $value) && (count($value['to_be_created']) > 0)) {
+						if (array_key_exists('to_be_created', $value) && (count($value['to_be_created']) > 0))
+						{
 							// Now handle the links to be created
-							foreach ($value['to_be_created'] as $aData) {
+							foreach ($value['to_be_created'] as $aData)
+							{
 								$sSubClass = $aData['class'];
-								if (($sLinkedClass == $sSubClass) || (is_subclass_of($sSubClass, $sLinkedClass))) {
+								if (($sLinkedClass == $sSubClass) || (is_subclass_of($sSubClass, $sLinkedClass)))
+								{
 									$aObjData = $aData['data'];
 									$oLink = MetaModel::NewObject($sSubClass);
 									$oLink->UpdateObjectFromArray($aObjData);
@@ -4232,20 +4247,28 @@ HTML;
 
 			case 'LinkedSet':
 				/** @var AttributeLinkedSet $oAttDef */
-				$aRawToBeCreated = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbc", '{}', 'raw_data'), true);
+				$aRawToBeCreated = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbc", '{}',
+					'raw_data'), true);
 				$aToBeCreated = array();
-				foreach ($aRawToBeCreated as $aData) {
+				foreach($aRawToBeCreated as $aData)
+				{
 					$sSubFormPrefix = $aData['formPrefix'];
 					$sObjClass = isset($aData['class']) ? $aData['class'] : $oAttDef->GetLinkedClass();
 					$aObjData = array();
-					foreach ($aData as $sKey => $value) {
-						if (preg_match("/^attr_$sSubFormPrefix(.*)$/", $sKey, $aMatches)) {
+					foreach($aData as $sKey => $value)
+					{
+						if (preg_match("/^attr_$sSubFormPrefix(.*)$/", $sKey, $aMatches))
+						{
 							$oLinkAttDef = MetaModel::GetAttributeDef($sObjClass, $aMatches[1]);
 							// Recursing over n:n link datetime attributes
 							// Note: We might need to do it with other attribute types, like Document or redundancy setting.
-							if ($oLinkAttDef instanceof AttributeDateTime) {
-								$aObjData[$aMatches[1]] = $this->PrepareValueFromPostedForm($sSubFormPrefix, $aMatches[1], $sObjClass, $aData);
-							} else {
+							if ($oLinkAttDef instanceof AttributeDateTime)
+							{
+								$aObjData[$aMatches[1]] = $this->PrepareValueFromPostedForm($sSubFormPrefix,
+									$aMatches[1], $sObjClass, $aData);
+							}
+							else
+							{
 								$aObjData[$aMatches[1]] = $value;
 							}
 						}
@@ -4253,20 +4276,28 @@ HTML;
 					$aToBeCreated[] = array('class' => $sObjClass, 'data' => $aObjData);
 				}
 
-				$aRawToBeModified = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbm", '{}', 'raw_data'), true);
+				$aRawToBeModified = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbm", '{}',
+					'raw_data'), true);
 				$aToBeModified = array();
-				foreach ($aRawToBeModified as $iObjKey => $aData) {
+				foreach($aRawToBeModified as $iObjKey => $aData)
+				{
 					$sSubFormPrefix = $aData['formPrefix'];
 					$sObjClass = isset($aData['class']) ? $aData['class'] : $oAttDef->GetLinkedClass();
 					$aObjData = array();
-					foreach ($aData as $sKey => $value) {
-						if (preg_match("/^attr_$sSubFormPrefix(.*)$/", $sKey, $aMatches)) {
+					foreach($aData as $sKey => $value)
+					{
+						if (preg_match("/^attr_$sSubFormPrefix(.*)$/", $sKey, $aMatches))
+						{
 							$oLinkAttDef = MetaModel::GetAttributeDef($sObjClass, $aMatches[1]);
 							// Recursing over n:n link datetime attributes
 							// Note: We might need to do it with other attribute types, like Document or redundancy setting.
-							if ($oLinkAttDef instanceof AttributeDateTime) {
-								$aObjData[$aMatches[1]] = $this->PrepareValueFromPostedForm($sSubFormPrefix, $aMatches[1], $sObjClass, $aData);
-							} else {
+							if ($oLinkAttDef instanceof AttributeDateTime)
+							{
+								$aObjData[$aMatches[1]] = $this->PrepareValueFromPostedForm($sSubFormPrefix,
+									$aMatches[1], $sObjClass, $aData);
+							}
+							else
+							{
 								$aObjData[$aMatches[1]] = $value;
 							}
 						}
@@ -4275,11 +4306,14 @@ HTML;
 				}
 
 				$value = array(
-					'to_be_created'  => $aToBeCreated,
+					'to_be_created' => $aToBeCreated,
 					'to_be_modified' => $aToBeModified,
-					'to_be_deleted'  => json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbd", '[]', 'raw_data'), true),
-					'to_be_added'    => json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tba", '[]', 'raw_data'), true),
-					'to_be_removed'  => json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbr", '[]', 'raw_data'), true),
+					'to_be_deleted' => json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbd", '[]',
+						'raw_data'), true),
+					'to_be_added' => json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tba", '[]',
+						'raw_data'), true),
+					'to_be_removed' => json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}_tbr", '[]',
+						'raw_data'), true),
 				);
 				break;
 
@@ -4445,13 +4479,13 @@ HTML;
 
 		// Protection against reentrance (e.g. cascading the update of ticket logs)
 		// Note: This is based on the fix made on r 3190 in DBObject::DBUpdate()
-		if (!MetaModel::StartReentranceProtection(Metamodel::REENTRANCE_TYPE_UPDATE, $this)) {
-			$sClass = get_class($this);
-			$sKey = $this->GetKey();
-			IssueLog::Debug("CRUD: DBUpdate $sClass::$sKey Rejected (reentrance)", LogChannels::DM_CRUD);
-
+		static $aUpdateReentrance = array();
+		$sKey = get_class($this).'::'.$this->GetKey();
+		if (array_key_exists($sKey, $aUpdateReentrance))
+		{
 			return $res;
 		}
+		$aUpdateReentrance[$sKey] = true;
 
 		try
 		{
@@ -4462,13 +4496,13 @@ HTML;
 				$oExtensionInstance->OnDBUpdate($this, self::GetCurrentChange());
 			}
 		}
+		catch (Exception $e)
+		{
+			throw $e;
+		}
 		finally
 		{
-			MetaModel::StopReentranceProtection(Metamodel::REENTRANCE_TYPE_UPDATE, $this);
-		}
-
-		if ($this->IsModified()) {
-			return $this->DBUpdate();
+			unset($aUpdateReentrance[$sKey]);
 		}
 
 		return $res;
@@ -4481,9 +4515,11 @@ HTML;
 	 */
 	protected function SetWarningsAsSessionMessages($sMessageIdPrefix)
 	{
-		if (!empty($this->m_aCheckWarnings) && is_array($this->m_aCheckWarnings)) {
+		if (!empty($this->m_aCheckWarnings) && is_array($this->m_aCheckWarnings))
+		{
 			$iMsgNb = 0;
-			foreach ($this->m_aCheckWarnings as $sWarningMessage) {
+			foreach ($this->m_aCheckWarnings as $sWarningMessage)
+			{
 				$iMsgNb++;
 				$sMessageId = "$sMessageIdPrefix-$iMsgNb"; // each message must have its own messageId !
 				$this->SetSessionMessageFromInstance($sMessageId, $sWarningMessage, 'warning', 0);
@@ -4491,6 +4527,12 @@ HTML;
 		}
 	}
 
+	protected static function BulkUpdateTracked_Internal(DBSearch $oFilter, array $aValues)
+	{
+		// Todo - invoke the extension
+		return parent::BulkUpdateTracked_Internal($oFilter, $aValues);
+	}
+
 	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
 		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
@@ -4693,8 +4735,9 @@ HTML;
 				{
 					$aReasons = array();
 					$sTip = '';
-					foreach($aReasons as $aRow) {
-						$sDescription = utils::EscapeHtml($aRow['description']);
+					foreach($aReasons as $aRow)
+					{
+						$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>";
@@ -4706,7 +4749,8 @@ HTML;
 
 				// Attribute is read-only
 				$sHTMLValue = $this->GetAsHTML($sAttCode);
-				$sHTMLValue .= '<input type="hidden" id="'.$sInputId.'" name="attr_'.$sPrefix.$sAttCode.'" value="'.utils::EscapeHtml($this->GetEditValue($sAttCode)).'"/>';
+				$sHTMLValue .= '<input type="hidden" id="'.$sInputId.'" name="attr_'.$sPrefix.$sAttCode.'" value="'.htmlentities($this->GetEditValue($sAttCode),
+						ENT_QUOTES, 'UTF-8').'"/>';
 				$aFieldsMap[$sAttCode] = $sInputId;
 			}
 			else
@@ -5042,7 +5086,7 @@ HTML
 							if ($sAttCode != MetaModel::GetStateAttributeCode($sClass) || !MetaModel::HasLifecycle($sClass)) {
 								$sValueCheckbox = '<input type="checkbox" class="ibo-field--enable-bulk--checkbox" id="enable_'.$iFormId.'_'.$sAttCode.'" onClick="ToggleField(this.checked, \''.$iFormId.'_'.$sAttCode.'\')"/>';
 							}
-							$aComments[$sAttCode] .= '<div class="multi_values ibo-field--enable-bulk ibo-pill ibo-is-failure" id="multi_values_'.$sAttCode.'" data-tooltip-content="'.$sTip.'" data-tooltip-html-enabled="true" data-tooltip-append-to="body">'.$iCount.$sValueCheckbox.'</div>';
+							$aComments[$sAttCode] .= '<div class="multi_values ibo-field--enable-bulk ibo-pill ibo-is-failure" id="multi_values_'.$sAttCode.'" data-tooltip-content="'.$sTip.'" data-tooltip-html-enabled="true">'.$iCount.$sValueCheckbox.'</div>';
 						}
 						$sReadyScript .= 'ToggleField('.(($iCount == 1) ? 'true' : 'false').', \''.$iFormId.'_'.$sAttCode.'\');'."\n";
 					}
@@ -5160,14 +5204,11 @@ EOF
 			} else {
 				$sStatus = $bResult ? Dict::S('UI:BulkModifyStatusModified') : Dict::S('UI:BulkModifyStatusSkipped');
 			}
-
-			$aErrorsToDisplay = array_map(function($sError) {
-				return utils::HtmlEntities($sError);
-			}, $aErrors);
+			$sChecked = $bResult ? 'checked' : '';
 			$aRows[] = array(
 				'object' => $oObj->GetHyperlink(),
 				'status' => $sStatus,
-				'errors' => '<p>'.($bResult ? '' : implode('</p><p>', $aErrorsToDisplay)).'</p>',
+				'errors' => '<p>'.($bResult ? '' : implode('</p><p>', $aErrors)).'</p>',
 			);
 			if ($bResult && (!$bPreview)) {
 				$oObj->DBUpdate();
@@ -5176,7 +5217,7 @@ EOF
 		set_time_limit(intval($iPreviousTimeLimit));
 		$oTable = DataTableUIBlockFactory::MakeForForm('BulkModify', $aHeaders, $aRows);
 		$oTable->AddOption("bFullscreen", true);
-
+		
 		$oPanel = PanelUIBlockFactory::MakeForClass($sClass, '');
 		$oPanel->SetIcon($sClassIcon);
 		$oPanel->SetTitle($sHeaderTitle);
@@ -5382,13 +5423,13 @@ EOF
 					$oFailAlertBlock = AlertUIBlockFactory::MakeForDanger('', Dict::S('UI:Delete:SorryDeletionNotAllowed'));
 					$oFailAlertBlock->SetIsClosable(false);
 					$oP->AddUiBlock($oFailAlertBlock);
-				}
+				} 
 				else {
 					$oWarningAlertBlock = AlertUIBlockFactory::MakeForWarning('', Dict::S('UI:Delete:PleaseDoTheManualOperations'));
 					$oWarningAlertBlock->SetIsClosable(false);
 					$oP->AddUiBlock($oWarningAlertBlock);
 				}
-
+				
 				$oForm = FormUIBlockFactory::MakeStandard('');
 				$oP->AddSubBlock($oForm);
 				$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('transaction_id', utils::ReadParam('transaction_id', '', false, 'transaction_id')));
@@ -5674,117 +5715,4 @@ JS
 			'AttributeOneWayPassword',
 		);
 	}
-
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventInsertRequested()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_INSERT_REQUESTED);
-	}
-
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventInsertBefore()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_ABOUT_TO_INSERT);
-	}
-
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventInsertAfter()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_INSERT_DONE);
-	}
-
-	final protected function EventComputeValues()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_COMPUTE_VALUES);
-	}
-
-	/**
-	 * @param array $aEventData
-	 *
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventCheckToWrite(array $aEventData)
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_CHECK_TO_WRITE, $aEventData);
-	}
-
-	/**
-	 * @param array $aEventData
-	 *
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventCheckToDelete(array $aEventData)
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_CHECK_TO_DELETE, $aEventData);
-	}
-
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventUpdateRequested()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_UPDATE_REQUESTED);
-	}
-
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventUpdateBefore()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_ABOUT_TO_UPDATE);
-	}
-
-	/**
-	 * @param array $aEventData
-	 *
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventUpdateAfter(array $aEventData)
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_UPDATE_DONE, $aEventData);
-	}
-
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventDeleteBefore()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_ABOUT_TO_DELETE);
-	}
-
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 */
-	final protected function EventDeleteAfter()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_DELETE_DONE);
-	}
-
-
-	final protected function EventArchive()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_ARCHIVE);
-	}
-
-	final protected function EventUnarchive()
-	{
-		$this->FireEvent(EVENT_SERVICE_DB_UNARCHIVE);
-	}
-
 }

application/dashlet.class.inc.php

@@ -262,7 +262,7 @@ abstract class Dashlet
 			}
 		} catch (OqlException $e) {
 			$oDashletContainer->AddCSSClass("dashlet-content");
-			$oDashletContainer->AddHtml('<p>'.utils::HtmlEntities($e->GetUserFriendlyDescription()).'</p>');
+			$oDashletContainer->AddHtml('<p>'.$e->GetUserFriendlyDescription().'</p>');
 		} catch (Exception $e) {
 			$oDashletContainer->AddCSSClass("dashlet-content");
 			$oDashletContainer->AddHtml('<p>'.$e->getMessage().'</p>');

application/datamodel.application.xml

@@ -185,384 +185,6 @@
 	    </style>
     </menu>
   </menus>
-  <events>
-    <event id="EVENT_SERVICE_DB_INSERT_REQUESTED" _delta="define">
-      <description>An object insert in the database has been requested. All changes to the object will be persisted automatically.</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::OnInsert</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_SERVICE_DB_ABOUT_TO_INSERT" _delta="define">
-      <description>An object is about to be inserted in the database (no change possible)</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::OnInsert</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_SERVICE_DB_INSERT_DONE" _delta="define">
-      <description>An object has been inserted into the database (but not reloaded). All changes to the object will be persisted automatically.</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_SERVICE_DB_UPDATE_REQUESTED" _delta="define">
-      <description>An object update has been requested. All changes to the object will be persisted automatically.</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::OnUpdate, DBObject::DoComputeValues</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_SERVICE_DB_ABOUT_TO_UPDATE" _delta="define">
-      <description>An object is about to be updated in the database (no change possible)</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::OnUpdate</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_SERVICE_DB_UPDATE_DONE" _delta="define">
-      <description>An object has been updated into the database and reloaded. All changes to the object will be persisted automatically.</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_SERVICE_DB_ABOUT_TO_DELETE" _delta="define">
-      <description>An object is about to be deleted in the database</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>DBObject::OnDelete</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_SERVICE_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_SERVICE_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_SERVICE_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_SERVICE_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_SERVICE_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_SERVICE_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_SERVICE_DB_CHECK_TO_WRITE" _delta="define">
-      <description>Check an object before it is written into the database (no change possible)</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="error_messages">
-          <description>Array of strings where all the errors found during the object checking are added</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_SERVICE_DB_CHECK_TO_DELETE" _delta="define">
-      <description>Check an object before it is deleted from the database (no change possible)</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="error_messages">
-          <description>Array of strings where all the errors found during the object checking are added</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_SERVICE_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_SERVICE_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_SERVICE_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_SERVICE_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

@@ -566,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) {
@@ -1207,7 +1207,6 @@ JS
 				$sTitle = Dict::Format($sFormat, $iTotalCount);
 				$oBlock = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
 				$oBlock->AddSubTitleBlock(new Html($sTitle));
-				$oBlock->AddCSSClass('ibo-datatable-panel');
 				if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
 					$oBlock->SetIcon($aExtraParams["panel_icon"]);
 				}

application/exceptions/CoreCannotSaveObjectException.php

@@ -44,15 +44,15 @@ class CoreCannotSaveObjectException extends CoreException
 	public function getHtmlMessage()
 	{
 		$sTitle = Dict::S('UI:Error:SaveFailed');
-		$sContent = "<span><strong>".utils::HtmlEntities($sTitle)."</strong></span>";
+		$sContent = "<span><strong>{$sTitle}</strong></span>";
 
 		if (count($this->aIssues) == 1) {
 			$sIssue = reset($this->aIssues);
-			$sContent .= " <span>".utils::HtmlEntities($sIssue)."</span>";
+			$sContent .= " <span>{$sIssue}</span>";
 		} else {
 			$sContent .= '<ul>';
 			foreach ($this->aIssues as $sError) {
-				$sContent .= "<li>".utils::HtmlEntities($sError)."</li>";
+				$sContent .= "<li>$sError</li>";
 			}
 			$sContent .= '</ul>';
 		}

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);
 	}
@@ -1267,7 +1272,7 @@ class DesignerComboField extends DesignerFormField
 		$sChecked = $this->defaultValue ? 'checked' : '';
 		$sMandatory = $this->bMandatory ? 'true' :  'false';
 		$sReadOnly = $this->IsReadOnly() ? 'disabled="disabled"' :  '';
-		if ($this->IsSorted() )
+		if ($this->IsSorted() && isset($this->aAllowedValues) )
 		{
 			asort($this->aAllowedValues);
 		}
@@ -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
 		{
@@ -1311,15 +1320,17 @@ class DesignerComboField extends DesignerFormField
 					$sHtml .= "<option value=\"\">".$this->sNullLabel."</option>";
 				}
 			}
-			foreach ($this->aAllowedValues as $sKey => $sDisplayValue) {
-				if ($this->bMultipleSelection) {
-					$sSelected = in_array($sKey, $this->defaultValue) ? 'selected' : '';
-				} else {
-					$sSelected = ($sKey == $this->defaultValue) ? 'selected' : '';
+			if ( isset($this->aAllowedValues) ) {
+				foreach ($this->aAllowedValues as $sKey => $sDisplayValue) {
+					if ($this->bMultipleSelection) {
+						$sSelected = in_array($sKey, $this->defaultValue) ? 'selected' : '';
+					} else {
+						$sSelected = ($sKey == $this->defaultValue) ? 'selected' : '';
+					}
+					// Quick and dirty: display the menu parents as a tree
+					$sHtmlValue = str_replace(' ', '&nbsp;', $sDisplayValue);
+					$sHtml .= "<option value=\"".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."\" $sSelected>$sHtmlValue</option>";
 				}
-				// 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 .= "</select></span>";
 			if ($this->bOtherChoices)
@@ -1370,9 +1381,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 +1452,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 +1520,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 +1667,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 +1763,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 +1772,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

@@ -6,4 +6,4 @@
  */
 
 // 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/loginbasic.class.inc.php

@@ -59,11 +59,9 @@ class LoginBasic extends AbstractLoginFSMExtension
 			list($sAuthUser, $sAuthPwd) = $this->GetAuthUserAndPassword();
 			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
 			{
-				$_SESSION['auth_user'] = $sAuthUser;
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			Session::Set('auth_user', $sAuthUser);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
@@ -72,7 +70,8 @@ class LoginBasic extends AbstractLoginFSMExtension
 	{
 		if (Session::Get('login_mode') == 'basic')
 		{
-			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode'));
+			list($sAuthUser) = $this->GetAuthUserAndPassword();
+			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}

application/loginexternal.class.inc.php

@@ -42,11 +42,9 @@ class LoginExternal extends AbstractLoginFSMExtension
 			$sAuthUser = $this->GetAuthUser();
 			if (!UserRights::CheckCredentials($sAuthUser, '', Session::Get('login_mode'), 'external'))
 			{
-				$_SESSION['auth_user'] = $sAuthUser;
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			Session::Set('auth_user', $sAuthUser);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
@@ -55,7 +53,8 @@ class LoginExternal extends AbstractLoginFSMExtension
 	{
 		if (Session::Get('login_mode') == 'external')
 		{
-			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'external', Session::Get('login_mode'));
+			$sAuthUser = $this->GetAuthUser();
+			LoginWebPage::OnLoginSuccess($sAuthUser, 'external', Session::Get('login_mode'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
@@ -89,4 +88,4 @@ class LoginExternal extends AbstractLoginFSMExtension
 		/** @var string $sAuthUser */
 		return $sAuthUser; // Retrieve the value
 	}
-}
+}

application/loginform.class.inc.php

@@ -68,11 +68,9 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 			$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
 			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
 			{
-				$_SESSION['auth_user'] = $sAuthUser;
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			Session::Set('auth_user', $sAuthUser);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
@@ -84,8 +82,17 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	{
 		if (Session::Get('login_mode') == 'form')
 		{
+			if (Session::IsSet('auth_user'))
+			{
+				// If FSM reenter this state (example 2FA) then the auth_user is not resubmitted
+				$sAuthUser = Session::Get('auth_user');
+			}
+			else
+			{
+				$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
+			}
 			// Store 'auth_user' in session for further use
-			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode'));
+			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}

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

@@ -57,11 +57,9 @@ class LoginURL extends AbstractLoginFSMExtension
 			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
 			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
 			{
-				$_SESSION['auth_user'] = $sAuthUser;
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			Session::Set('auth_user', $sAuthUser);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
@@ -70,7 +68,8 @@ class LoginURL extends AbstractLoginFSMExtension
 	{
 		if (Session::Get('login_mode') == 'url')
 		{
-			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode'));
+			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
@@ -93,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\EventData;
-use Combodo\iTop\Service\EventService;
 
 /**
  * Web page used for displaying the login form
@@ -114,7 +112,7 @@ class LoginWebPage extends NiceWebPage
 	 */
 	public static function SynchronizeProfiles(&$oUser, array $aProfiles, $sOrigin)
 	{
-		$oProfilesSet = $oUser->Get('profile_list');
+		$oProfilesSet = $oUser->Get(‘profile_list’);
 		//delete old profiles
 		$aExistingProfiles = [];
 		while ($oProfile = $oProfilesSet->Fetch())
@@ -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);
@@ -239,7 +241,7 @@ class LoginWebPage extends NiceWebPage
 				}
 
 				// This token allows the user to change the password without knowing the previous one
-				$sToken = bin2hex(random_bytes(32));
+				$sToken = substr(md5(APPROOT.uniqid()), 0, 16);
 				$oUser->Set('reset_pwd_token', $sToken);
 				CMDBObject::SetTrackInfo('Reset password');
 				$oUser->AllowWrite(true);
@@ -481,13 +483,11 @@ class LoginWebPage extends NiceWebPage
 					$iResponse = $oLoginFSMExtensionInstance->LoginAction($sLoginState, $iErrorCode);
 					if ($iResponse == self::LOGIN_FSM_RETURN)
 					{
-						EventService::FireEvent(new EventData(EVENT_SERVICE_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_SERVICE_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_SERVICE_LOGIN, null, ['state' => $_SESSION['login_state']]));
 				IssueLog::Error($e->getTraceAsString());
 				static::ResetSession();
 				die($e->getMessage());

application/menunode.class.inc.php

@@ -5,6 +5,8 @@
  */
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\UI\Base\Component\Title\Title;
+use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/application/template.class.inc.php');
@@ -265,14 +267,6 @@ class ApplicationMenu
 			/** @var \MenuGroup $oMenuNode */
 			$oMenuNode = static::GetMenuNode($sMenuGroupIdx);
 
-			if (!($oMenuNode instanceof MenuGroup)) {
-				IssueLog::Error('Menu node was not displayed as a menu group as it is actually not a menu group', LogChannels::CONSOLE, [
-					'menu_node_class' => get_class($oMenuNode),
-					'menu_node_label' => $oMenuNode->GetLabel(),
-				]);
-				continue;
-			}
-
 			$aMenuGroups[] = [
 				'sId' => $oMenuNode->GetMenuID(),
 				'sIconCssClasses' => $oMenuNode->GetDecorationClasses(),
@@ -661,7 +655,8 @@ abstract class MenuNode
 		$this->sMenuId = $sMenuId;
 		$this->iParentIndex = $iParentIndex;
 		$this->aReflectionProperties = array();
-		if (utils::IsNotNullOrEmptyString($sEnableClass)) {
+		if (strlen($sEnableClass) > 0)
+		{
 			$this->aReflectionProperties['enable_class'] = $sEnableClass;
 			$this->aReflectionProperties['enable_action'] = $iActionCode;
 			$this->aReflectionProperties['enable_permission'] = $iAllowedResults;

application/template.class.inc.php

@@ -229,6 +229,7 @@ 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>
@@ -351,7 +352,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 +360,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/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,36 +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 TwigFunction('get_config_parameter', function ($sParamName) {
+		$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 TwigFunction('get_module_setting', function (string $sModuleCode, string $sPropertyCode, $defaultValue = null) {
+		$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

@@ -211,23 +211,14 @@ class UIExtKeyWidget
 			$sClassAllowed = $oAllowedValues->GetClass();
 			$bAddingValue = false;
 
-			// N°4792 - load only the required fields
-			$aFieldsToLoad = [];
-
 			$aComplementAttributeSpec = MetaModel::GetNameSpec($oAllowedValues->GetClass(), FriendlyNameType::COMPLEMENTARY);
 			$sFormatAdditionalField = $aComplementAttributeSpec[0];
 			$aAdditionalField = $aComplementAttributeSpec[1];
 
 			if (count($aAdditionalField) > 0) {
 				$bAddingValue = true;
-				$aFieldsToLoad[$sClassAllowed] = $aAdditionalField;
 			}
 			$sObjectImageAttCode = MetaModel::GetImageAttributeCode($sClassAllowed);
-			if (!empty($sObjectImageAttCode)) {
-				$aFieldsToLoad[$sClassAllowed][] = $sObjectImageAttCode;
-			}
-			$aFieldsToLoad[$sClassAllowed][] = 'friendlyname';
-			$oAllowedValues->OptimizeColumnLoad($aFieldsToLoad);
 			$bInitValue = false;
 			while ($oObj = $oAllowedValues->Fetch()) {
 				$aOption = [];
@@ -307,7 +298,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 +610,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
@@ -778,14 +769,16 @@ JS
      * @param DBObject $oObj The current object for the OQL context
      * @param string $sContains The text of the autocomplete to filter the results
      * @param string $sOutputFormat
-     * @param null $sOperation for the values @see ValueSetObjects->LoadValues() not used since 3.0.0
+     * @param null $sOperation for the values @see ValueSetObjects->LoadValues()
      *
      * @throws CoreException
      * @throws OQLException
      *
      * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $oObj for PHP 8.0 compatibility
      */
-	public function AutoComplete(WebPage $oP, $sFilter, $oObj, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null	)
+	public function AutoComplete(
+		WebPage $oP, $sFilter, $oObj, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null
+	)
 	{
 		if (is_null($sFilter)) {
 			throw new Exception('Implementation: null value for allowed values definition');
@@ -799,13 +792,13 @@ JS
 		$oValuesSet->SetSort(false);
 		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oValuesSet->SetLimit($iMax);
-		$aValuesStartWith = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'start_with');
-		asort($aValuesStartWith);
-		$aValues = $aValuesStartWith;
+		$aValuesContains = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'start_with');
+		asort($aValuesContains);
+		$aValues = $aValuesContains;
 		if (sizeof($aValues) < $iMax) {
 			$aValuesContains = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains');
 			asort($aValuesContains);
-			$iSize = sizeof($aValues);
+			$iSize = sizeof($aValuesContains);
 			foreach ($aValuesContains as $sKey => $sFriendlyName)
 			{
 				if (!isset($aValues[$sKey]))
@@ -821,9 +814,7 @@ JS
 		elseif (!in_array($sContains, $aValues))
 		{
 			$aValuesEquals = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains,	'equals');
-			// Note: Here we cannot use array_merge as it would reindex the numeric keys starting from 0 when keys are actually the objects ID.
-			// As a workaround we use array_replace as it does preserve numeric keys. It's ok if some values from $aValuesEquals are replaced with values from $aValues as they contain the same data.
-			$aValues = array_replace($aValuesEquals, $aValues);
+			$aValues = array_merge($aValuesEquals, $aValues);
 		}
 
 		switch($sOutputFormat)
@@ -971,7 +962,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));
@@ -982,7 +973,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});
+$('#ac_create_{$this->iId}').dialog({ width: 'auto', 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);
 JS

application/ui.linksdirectwidget.class.inc.php

@@ -255,7 +255,7 @@ class UILinksWidgetDirect
 		$oDiv = UIContentBlockUIBlockFactory::MakeStandard($this->sInputid, ['listContainer']);
 		$oPage->AddSubBlock($oDiv);
 		$oDatatable = DataTableUIBlockFactory::MakeForForm($this->sInputid, $aAttribs, $aData);
-		$oDatatable->SetOptions(['select_mode' => 'custom', 'disable_hyperlinks' => true]);
+		$oDatatable->SetOptions(['select_mode' => 'custom']);
 		$oDiv->AddSubBlock($oDatatable);
 		$sInputName = $sFormPrefix.'attr_'.$this->sAttCode;
 		$aLabels = array(

application/ui.linkswidget.class.inc.php

@@ -108,14 +108,15 @@ class UILinksWidget
 	 * @throws \CoreUnexpectedValue
 	 * @throws \Exception
 	 */
-	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId, $aArgs, $oCurrentObj, $iUniqueId, $bReadOnly = false, $bModified = false)
+	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())) {
+		if (is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
+		{
 			$iKey = $linkObjOrId->GetKey();
 			$iRemoteObjKey = $linkObjOrId->Get($this->m_sExtKeyToRemote);
 			$sPrefix .= "[$iKey][";
@@ -124,44 +125,49 @@ class UILinksWidget
 			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$iKey}";
 			$aArgs['this'] = $linkObjOrId;
 
-			if ($bReadOnly) {
+			if ($bReadOnly)
+			{
 				$aRow['form::checkbox'] = "";
-				foreach ($this->m_aEditableFields as $sFieldCode) {
+				foreach ($this->m_aEditableFields as $sFieldCode)
+				{
 					$sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
 					$aRow[$sFieldCode] = $sDisplayValue;
 				}
-			} else {
+			}
+			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) {
+				foreach ($this->m_aEditableFields as $sFieldCode)
+				{
 					$sSafeFieldId = $this->GetFieldId($linkObjOrId->GetKey(), $sFieldCode);
 					$this->AddRowForFieldCode($aRow, $sFieldCode, $aArgs, $linkObjOrId, $oP, $sNameSuffix, $sSafeFieldId);
 					$aFieldsMap[$sFieldCode] = $sSafeFieldId;
-
-					if ($bModified) {
-						$oP->add_ready_script(
-							<<<EOF
-oWidget{$this->m_iInputId}.AddModified($iUniqueId, {$this->m_iInputId},  $sFieldCode, {$linkObjOrId->Get($sFieldCode)});
-EOF
-						);
-					}
 				}
 			}
 
 			$sState = $linkObjOrId->GetState();
 			$sRemoteKeySafeFieldId = $this->GetFieldId($aArgs['this']->GetKey(), $this->m_sExtKeyToRemote);;
-		} else {
+		}
+		else
+		{
 			// form for creating a new record
-			if (is_object($linkObjOrId)) {
+			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 {
+				$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
+				$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
@@ -171,7 +177,8 @@ EOF
 			$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) {
+			if ($iUniqueId > 0)
+			{
 				// Rows created with ajax call need OnLinkAdded call.
 				//
 				$oP->add_ready_script(
@@ -180,7 +187,9 @@ PrepareWidgets();
 oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
 EOF
 				);
-			} else {
+			}
+			else
+			{
 				// Rows added before loading the form don't have to call OnLinkAdded.
 				// Listeners are already present and DOM is not recreated
 				$iPositiveUniqueId = -$iUniqueId;
@@ -368,42 +377,33 @@ JS
 		$aForm = array();
 		$iMaxAddedId = 0;
 		$iAddedId = -1; // Unique id for new links
-		$oBlock->aRemoved = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$this->m_sAttCode}_tbd", '[]', 'raw_data'));
-		$oModified = $oValue->GetModified($this->m_sExtKeyToRemote);
-		while ($oCurrentLink = $oValue->Fetch()) {
+		while ($oCurrentLink = $oValue->Fetch())
+		{
 			// We try to retrieve the remote object as usual
-			if (!in_array($oCurrentLink->GetKey(), $oBlock->aRemoved)) {
-				$bModified = false;
-				if (array_key_exists($oCurrentLink->GetKey(), $oModified)) {
-					$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oModified[$oCurrentLink->GetKey()], false /* Must not be found */);
-					$bModified = true;
-				} else {
-					$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, $bModified);
+			$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);
 			}
-		}
-		$oBlock->iMaxAddedId = (int)$iMaxAddedId;
 
+			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', 'disable_hyperlinks' => true]);
+		$oDataTable->SetOptions(['select_mode' => 'custom']);
 		$oBlock->AddSubBlock($oDataTable);
 
 		$oBlock->AddControls();

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

@@ -21,8 +21,6 @@ use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
 use ScssPhp\ScssPhp\Compiler;
-use ScssPhp\ScssPhp\OutputStyle;
-use ScssPhp\ScssPhp\ValueConverter;
 
 
 /**
@@ -99,11 +97,6 @@ class utils
 	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_RAW_DATA = 'raw_data';
-	/**
-	 * @var string
-	 * @since 3.0.2, 3.1.0 N°4899
-	 */
-	public const ENUM_SANITIZATION_FILTER_URL = 'url';
 
 	/**
 	 * @var string
@@ -384,7 +377,6 @@ class utils
 	 * @since 2.5.2 2.6.0 new 'transaction_id' filter
 	 * @since 2.7.0 new 'element_identifier' filter
 	 * @since 3.0.0 new utils::ENUM_SANITIZATION_* const
-	 * @since 2.7.7, 3.0.2, 3.1.0 N°4899 - new 'url' filter
 	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
@@ -462,11 +454,6 @@ class utils
 				$retValue = preg_replace('/[^a-zA-Z0-9_]/', '', $value);
 				break;
 
-			// For URL
-			case static::ENUM_SANITIZATION_FILTER_URL:
-				$retValue = filter_var($value, FILTER_SANITIZE_URL);
-				break;
-
 			default:
 			case static::ENUM_SANITIZATION_FILTER_RAW_DATA:
 				$retValue = $value;
@@ -813,20 +800,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);
 		}
@@ -1826,7 +1814,7 @@ class utils
 	 */
 	public static function HtmlEntities($sValue)
 	{
-		return htmlentities($sValue ?? '', ENT_QUOTES, 'UTF-8');
+		return htmlentities($sValue, ENT_QUOTES, 'UTF-8');
 	}
 
 	/**
@@ -1842,7 +1830,7 @@ class utils
 	public static function EscapeHtml($sValue)
 	{
 		return htmlspecialchars(
-			$sValue ?? '',
+			$sValue,
 			ENT_QUOTES | ENT_DISALLOWED | ENT_HTML5,
 			WebPage::PAGES_CHARSET,
 			false
@@ -1891,8 +1879,7 @@ class utils
 	{
 		$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'));
 	}
 	
 	/**
@@ -1943,23 +1930,19 @@ class utils
 	public static function CompileCSSFromSASS($sSassContent, $aImportPaths = array(), $aVariables = array())
 	{
 		$oSass = new Compiler();
-		$oSass->setOutputStyle(OutputStyle::COMPRESSED);
+		$oSass->setFormatter('ScssPhp\\ScssPhp\\Formatter\\Compressed');
 		// Setting our variables
-		$aScssVariables = [];
-		foreach ($aVariables as $entry => $value) {
-			$aScssVariables[$entry] = ValueConverter::parseValue($value);
-		}
-		$oSass->addVariables($aScssVariables);
+		$oSass->setVariables($aVariables);
 		// Setting our imports paths
 		$oSass->setImportPaths($aImportPaths);
 		// Temporary disabling max exec time while compiling
 		$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
 		set_time_limit(0);
 		// Compiling SASS
-		$oCompilationRes = $oSass->compileString($sSassContent);
+		$sCss = $oSass->compile($sSassContent);
 		set_time_limit(intval($iCurrentMaxExecTime));
 
-		return $oCompilationRes->getCss();
+		return $sCss;
 	}
 
 	/**
@@ -2718,24 +2701,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(), '');
@@ -2743,7 +2712,7 @@ 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;
@@ -2840,54 +2809,6 @@ HTML;
 		return $aPrefs[$sShortcutId];
 	}
 
-	//----------------------------------------------
-	// PHP function helpers
-	//----------------------------------------------
-
-	/**
-	 * Helper around the native strlen() PHP method to keep allowing usage of null value when computing the length of a string as null value is no longer allowed with PHP 8.1+
-	 * @link https://www.php.net/releases/8.1/en.php#deprecations_and_bc_breaks "Passing null to non-nullable internal function parameters is deprecated"
-	 *
-	 * @param string|null $sString
-	 *
-	 * @return int Length of $sString, 0 if null
-	 * @since 3.0.2 N°5172
-	 */
-	public static function StrLen(?string $sString): int
-	{
-		return strlen($sString ?? '');
-	}
-
-	/**
-	 * Helper around the native strlen() PHP method to test a string for null or empty value
-	 *
-	 * @link https://www.php.net/releases/8.1/en.php#deprecations_and_bc_breaks "Passing null to non-nullable internal function parameters is deprecated"
-	 *
-	 * @param string|null $sString
-	 *
-	 * @return bool if string null or empty
-	 * @since 3.0.2 N°5302
-	 */
-	public static function IsNullOrEmptyString(?string $sString): bool
-	{
-		return $sString === null || strlen($sString) === 0;
-	}
-
-	/**
-	 * Helper around the native strlen() PHP method to test a string not null or empty value
-	 *
-	 * @link https://www.php.net/releases/8.1/en.php#deprecations_and_bc_breaks "Passing null to non-nullable internal function parameters is deprecated"
-	 *
-	 * @param string|null $sString
-	 *
-	 * @return bool if string is not null and not empty
-	 * @since 3.0.2 N°5302
-	 */
-	public static function IsNotNullOrEmptyString(?string $sString): bool
-	{
-		return !static::IsNullOrEmptyString($sString);
-	}
-
 	//----------------------------------------------
 	// Environment helpers
 	//----------------------------------------------
@@ -3143,55 +3064,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));
-	}
-  
-	public static function GetUniqId()
-	{
-		return hash('sha256', uniqid(sprintf('%x', rand()), true).sprintf('%x', rand()));
-	}
 }

application/wizardhelper.class.inc.php

@@ -359,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

composer.json

@@ -1,10 +1,8 @@
 {
-  "name": "combodo/itop",
-  "description": "IT Operations Portal",
   "type": "project",
-  "license": "AGPL-3.0-only",
+  "license": "AGPLv3",
   "require": {
-    "php": ">=7.4.0 <8.2.0",
+    "php": ">=7.1.3 <8.0.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -12,26 +10,23 @@
     "ext-json": "*",
     "ext-mysqli": "*",
     "ext-soap": "*",
-    "apereo/phpcas" : "~1.3",
-    "combodo/tcpdf": "~6.4.4",
-    "guzzlehttp/guzzle": "^7.4.5",
-    "laminas/laminas-mail": "^2.11",
+    "combodo/tcpdf": "6.3.5",
+    "laminas/laminas-mail": "^2.12",
     "laminas/laminas-servicemanager": "^3.5",
-    "league/oauth2-google": "^3.0",
-    "nikic/php-parser": "~4.14.0",
-    "pear/archive_tar": "~1.4.14",
-    "pelago/emogrifier": "^6.0.0",
-    "scssphp/scssphp": "^1.10.3",
-    "symfony/console": "5.4.*",
-    "symfony/dotenv": "5.4.*",
-    "symfony/framework-bundle": "5.4.*",
-    "symfony/twig-bundle": "5.4.*",
-    "symfony/yaml": "5.4.*",
-    "thenetworg/oauth2-azure": "^2.0"
+    "nikic/php-parser": "^4.12.0",
+    "pear/archive_tar": "1.4.14",
+    "pelago/emogrifier": "3.1.0",
+    "scssphp/scssphp": "1.0.6",
+    "symfony/console": "~3.4.47",
+    "symfony/dotenv": "~3.4.47",
+    "symfony/framework-bundle": "~3.4.47",
+    "symfony/polyfill-php70": "1.*",
+    "symfony/twig-bundle": "~3.4.47",
+    "symfony/yaml": "~3.4.47"
   },
   "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 +38,7 @@
   },
   "config": {
     "platform": {
-      "php": "7.4.0"
+      "php": "7.1.3"
     },
     "vendor-dir": "lib",
     "preferred-install": {
@@ -60,7 +55,12 @@
       "sources"
     ],
     "exclude-from-classmap": [
-      "application/twigextension.class.inc.php",
+      "core/dbobjectsearch.class.php",
+      "core/legacy/dbobjectsearchlegacy.class.php",
+      "core/querybuildercontext.class.inc.php",
+      "core/legacy/querybuildercontextlegacy.class.inc.php",
+      "core/querybuilderexpressions.class.inc.php",
+      "core/legacy/querybuilderexpressionslegacy.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

@@ -277,7 +277,7 @@ class ActionEmail extends ActionNotification
 	protected function FindRecipients($sRecipAttCode, $aArgs)
 	{
 		$sOQL = $this->Get($sRecipAttCode);
-		if (strlen($sOQL) === 0) return '';
+		if (strlen($sOQL) == '') return '';
 
 		try
 		{
@@ -566,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

@@ -293,7 +293,7 @@ abstract class AsyncTask extends DBObject
 			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
 		}
 
-		$this->SetTrim('last_error', $sErrorMessage);
+		$this->Set('last_error', $sErrorMessage);
 		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
 		$this->Set('last_attempt', time());
 

core/attributedef.class.inc.php

@@ -854,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();
@@ -1690,7 +1685,7 @@ class AttributeLinkedSet extends AttributeDefinition
 					{
 						if ($sObjClass == $this->GetLinkedClass())
 						{
-							// Simplify the output if the exact class could be determined implicitely
+							// Simplify the output if the exact class could be determined implicitely 
 							continue;
 						}
 					}
@@ -2012,7 +2007,7 @@ class AttributeLinkedSet extends AttributeDefinition
 					{
 						if ($sObjClass == $this->GetLinkedClass())
 						{
-							// Simplify the output if the exact class could be determined implicitely
+							// Simplify the output if the exact class could be determined implicitely 
 							continue;
 						}
 					}
@@ -2417,7 +2412,7 @@ class AttributeDBFieldVoid extends AttributeDefinition
 		return false;
 	}
 
-	//
+	// 
 	protected function ScalarToSQL($value)
 	{
 		return $value;
@@ -2457,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()
@@ -4179,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);
 					}
 				}
@@ -4230,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);
 							}
 						}
@@ -4593,13 +4587,7 @@ class AttributeCaseLog extends AttributeLongText
 			{
 				if (strlen($proposedValue) > 0)
 				{
-					//N°5135 - add impersonation information in caselog
-					if (UserRights::IsImpersonated()){
-						$sOnBehalfOf = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUserFriendlyName(), UserRights::GetUserFriendlyName());
-						$oCaseLog->AddLogEntry($proposedValue, $sOnBehalfOf, UserRights::GetConnectedUserId());
-					} else {
-						$oCaseLog->AddLogEntry($proposedValue);
-					}
+					$oCaseLog->AddLogEntry($proposedValue);
 				}
 			}
 			$ret = $oCaseLog;
@@ -5406,7 +5394,7 @@ class AttributeEnum extends AttributeString
 	{
 		if (is_null($sValue))
 		{
-			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label
+			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
 			$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue,
 				Dict::S('Enum:Undefined'));
 		}
@@ -5428,7 +5416,7 @@ class AttributeEnum extends AttributeString
 	{
 		if (is_null($sValue))
 		{
-			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label
+			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
 			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+',
 				Dict::S('Enum:Undefined'));
 		}
@@ -6022,9 +6010,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();
 	}
 
@@ -7227,7 +7213,7 @@ class AttributeExternalField extends AttributeDefinition
 
 	protected function GetSQLCol($bFullSpec = false)
 	{
-		// throw new CoreException("external attribute: does it make any sense to request its type ?");
+		// throw new CoreException("external attribute: does it make any sense to request its type ?");  
 		$oExtAttDef = $this->GetExtAttDef();
 
 		return $oExtAttDef->GetSQLCol($bFullSpec);
@@ -7500,7 +7486,7 @@ class AttributeExternalField extends AttributeDefinition
 
 	public function GetFilterDefinitions()
 	{
-		return array($this->GetCode() => $this->GetCode());
+		return array($this->GetCode() => new FilterFromAttribute($this));
 	}
 
 	public function GetBasicFilterOperators()
@@ -7814,7 +7800,7 @@ class AttributeBlob extends AttributeDefinition
 
 	public function GetDefaultValue(DBObject $oHostObject = null)
 	{
-		return new ormDocument('', '', '');
+		return "";
 	}
 
 	public function IsNullAllowed(DBObject $oHostObject = null)
@@ -8163,11 +8149,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}
@@ -8542,17 +8523,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;
@@ -9280,7 +9262,7 @@ class AttributeSubItem extends AttributeDefinition
 		return $res;
 	}
 
-	//
+	// 
 //	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
 
 	public function FromSQLToValue($aCols, $sPrefix = '')
@@ -9294,7 +9276,7 @@ class AttributeSubItem extends AttributeDefinition
 
 	public function GetFilterDefinitions()
 	{
-		return array($this->GetCode() => $this->GetCode());
+		return array($this->GetCode() => new FilterFromAttribute($this));
 	}
 
 	public function GetBasicFilterOperators()
@@ -11359,13 +11341,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))
@@ -11960,7 +11935,7 @@ class AttributeFriendlyName extends AttributeDefinition
 
 	public function GetFilterDefinitions()
 	{
-		return array($this->GetCode() => $this->GetCode());
+		return array($this->GetCode() => new FilterFromAttribute($this));
 	}
 
 	public function GetBasicFilterOperators()
@@ -12797,7 +12772,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;
@@ -13097,7 +13072,7 @@ class AttributeObsolescenceFlag extends AttributeBoolean
 
 	public function GetDefaultValue(DBObject $oHostObject = null)
 	{
-		return $this->MakeRealValue(false, $oHostObject);
+		return $this->MakeRealValue("", $oHostObject);
 	}
 
 	public function IsNullAllowed()

core/bulkchange.class.inc.php

@@ -11,7 +11,7 @@ define('UTF8_BOM', chr(239).chr(187).chr(191)); // 0xEF, 0xBB, 0xBF
 
 /**
  * CellChangeSpec
- * A series of classes, keeping the information about a given cell: could it be changed or not (and why)?
+ * A series of classes, keeping the information about a given cell: could it be changed or not (and why)?  
  *
  * @package     iTopORM
  */
@@ -42,17 +42,6 @@ abstract class CellChangeSpec
 		return $this->m_sOql;
 	}
 
-	/**
-	 * @since 3.1.0 N°5305
-	 */
-	public function GetDisplayableValueAndDescription(): string
-	{
-		return sprintf("%s%s",
-			$this->GetDisplayableValue(),
-			$this->GetDescription()
-		);
-	}
-
 	abstract public function GetDescription();
 }
 
@@ -97,90 +86,26 @@ class CellStatus_Issue extends CellStatus_Modify
 		parent::__construct($proposedValue, $previousValue);
 	}
 
-	public function GetDisplayableValue()
+	public function GetDescription()
 	{
 		if (is_null($this->m_proposedValue))
 		{
-			return Dict::Format('UI:CSVReport-Value-SetIssue');
+			return Dict::Format('UI:CSVReport-Value-SetIssue', $this->m_sReason);
 		}
-		return Dict::Format('UI:CSVReport-Value-ChangeIssue', \utils::EscapeHtml($this->m_proposedValue));
-	}
-
-	public function GetDescription()
-	{
-		return $this->m_sReason;
-	}
-	/*
-	 * @since 3.1.0 N°5305
-	 */
-	public function GetDisplayableValueAndDescription(): string
-	{
-		return sprintf("%s. %s",
-			$this->GetDisplayableValue(),
-			$this->GetDescription()
-		);
+		return Dict::Format('UI:CSVReport-Value-ChangeIssue', $this->m_proposedValue, $this->m_sReason);
 	}
 }
 
 class CellStatus_SearchIssue extends CellStatus_Issue
 {
-	/** @var string|null $m_sAllowedValues */
-	private $m_sAllowedValues;
-
-	/**
-	 * @since 3.1.0 N°5305
-	 * @var string $sSerializedSearch
-	 */
-	private $sSerializedSearch;
-
-	/** @var string|null $m_sTargetClass */
-	private $m_sTargetClass;
-
-	/**
-	 * CellStatus_SearchIssue constructor.
-	 * @since 3.1.0 N°5305
-	 *
-	 * @param string $sOql : main message
-	 * @param string $sReason : main message
-	 * @param null $sClass : used for additional message that provides allowed values for current class $sClass
-	 * @param null $sAllowedValues : used for additional message that provides allowed values $sAllowedValues for current class
-	 */
-	public function __construct($sSerializedSearch, $sReason, $sClass=null, $sAllowedValues=null)
+	public function __construct()
 	{
-		parent::__construct(null, null, $sReason);
-		$this->sSerializedSearch = $sSerializedSearch;
-		$this->m_sAllowedValues = $sAllowedValues;
-		$this->m_sTargetClass = $sClass;
-	}
-
-	public function GetDisplayableValue()
-	{
-		if (null === $this->m_sReason) {
-			return Dict::Format('UI:CSVReport-Value-NoMatch', '');
-		}
-
-		return $this->m_sReason;
+		parent::__construct(null, null, null);
 	}
 
 	public function GetDescription()
 	{
-		if (\utils::IsNullOrEmptyString($this->m_sAllowedValues) ||
-			\utils::IsNullOrEmptyString($this->m_sTargetClass)) {
-			return '';
-		}
-
-		return Dict::Format('UI:CSVReport-Value-NoMatch-PossibleValues', $this->m_sTargetClass, $this->m_sAllowedValues);
-	}
-
-	/**
-	 * @since 3.1.0 N°5305
-	 * @return string
-	 */
-	public function GetSearchLinkUrl()
-	{
-		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sSerializedSearch)
-		);
+		return Dict::S('UI:CSVReport-Value-NoMatch');
 	}
 }
 
@@ -201,24 +126,11 @@ class CellStatus_NullIssue extends CellStatus_Issue
 class CellStatus_Ambiguous extends CellStatus_Issue
 {
 	protected $m_iCount;
-	/**
-	 * @since 3.1.0 N°5305
-	 * @var string
-	 */
-	protected $sSerializedSearch;
 
-	/**
-	 * @since 3.1.0 N°5305
-	 *
-	 * @param $previousValue
-	 * @param int $iCount
-	 * @param string $sSerializedSearch
-	 *
-	 */
-	public function __construct($previousValue, $iCount, $sSerializedSearch)
+	public function __construct($previousValue, $iCount, $sOql)
 	{
 		$this->m_iCount = $iCount;
-		$this->sSerializedSearch = $sSerializedSearch;
+		$this->m_sQuery = $sOql;
 		parent::__construct(null, $previousValue, '');
 	}
 
@@ -227,23 +139,12 @@ class CellStatus_Ambiguous extends CellStatus_Issue
 		$sCount = $this->m_iCount;
 		return Dict::Format('UI:CSVReport-Value-Ambiguous', $sCount);
 	}
-
-	/**
-	 * @since 3.1.0 N°5305
-	 * @return string
-	 */
-	public function GetSearchLinkUrl()
-	{
-		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sSerializedSearch)
-		);
-	}
 }
 
 
 /**
  * RowStatus
- * A series of classes, keeping the information about a given row: could it be changed or not (and why)?
+ * A series of classes, keeping the information about a given row: could it be changed or not (and why)?  
  *
  * @package     iTopORM
  */
@@ -310,26 +211,6 @@ class RowStatus_Issue extends RowStatus
 	}
 }
 
-/**
- * class dedicated to testability
- * not used/ignored in csv imports UI/CLI
- * @since 3.1.0 N°5305
- */
-class RowStatus_Error extends RowStatus
-{
-	/** @var string */
-	protected $m_sError;
-
-	public function __construct($sError)
-	{
-		$this->m_sError = $sError;
-	}
-
-	public function GetDescription()
-	{
-		return $this->m_sError;
-	}
-}
 
 /**
  * BulkChange
@@ -339,35 +220,17 @@ class RowStatus_Error extends RowStatus
  */
 class BulkChange
 {
-	/** @var string */
-	protected $m_sClass;
+	protected $m_sClass; 
 	protected $m_aData; // Note: hereafter, iCol maybe actually be any acceptable key (string)
 	// #@# todo: rename the variables to sColIndex
-	/** @var array<string, string> attcode as key, iCol as value */
-	protected $m_aAttList;
-	/** @var array<string, array<string, string>> sExtKeyAttCode as key, array of sExtReconcKeyAttCode/iCol as value */
-	protected $m_aExtKeys;
-	/** @var string[] list of attcode (attcode = 'id' for the pkey) */
-	protected $m_aReconcilKeys;
-	/** @var string OQL - if specified, then the missing items will be reported */
-	protected $m_sSynchroScope;
-	/**
-	 * @var array<string, mixed> attcode as key, attvalue as value. Values to be set when an object gets out of scope
-	 *                          (ignored if no scope has been defined)
-	 */
-	protected $m_aOnDisappear;
-	/**
-	 * @see DateTime::createFromFormat
-	 * @var string Date format specification
-	 */
-	protected $m_sDateFormat;
-	/**
-	 * @see AttributeEnum
-	 * @var boolean true if Values in the data set are localized
-	 */
-	protected $m_bLocalizedValues;
-	/** @var array Cache for resolving external keys based on the given search criterias */
-	protected $m_aExtKeysMappingCache;
+	protected $m_aAttList; // attcode => iCol
+	protected $m_aExtKeys; // aExtKeys[sExtKeyAttCode][sExtReconcKeyAttCode] = iCol;
+	protected $m_aReconcilKeys; // attcode (attcode = 'id' for the pkey)
+	protected $m_sSynchroScope; // OQL - if specified, then the missing items will be reported
+	protected $m_aOnDisappear; // array of attcode => value, values to be set when an object gets out of scope (ignored if no scope has been defined)
+	protected $m_sDateFormat; // Date format specification, see DateTime::createFromFormat
+	protected $m_bLocalizedValues; // Values in the data set are localized (see AttributeEnum)
+	protected $m_aExtKeysMappingCache; // Cache for resolving external keys based on the given search criterias
 
 	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null, $sDateFormat = null, $bLocalize = false)
 	{
@@ -398,30 +261,30 @@ class BulkChange
 		$this->m_sReportCsvSep = $sSeparator;
 		$this->m_sReportCsvDelimiter = $sDelimiter;
 	}
-
+   
 	protected function ResolveExternalKey($aRowData, $sAttCode, &$aResults)
 	{
 		$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 		$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
-		foreach ($this->m_aExtKeys[$sAttCode] as $sReconKeyAttCode => $iCol)
+		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
 		{
-			if ($sReconKeyAttCode == 'id')
+			if ($sForeignAttCode == 'id')
 			{
 				$value = (int) $aRowData[$iCol];
 			}
 			else
 			{
 				// The foreign attribute is one of our reconciliation key
-				$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sReconKeyAttCode);
+				$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sForeignAttCode);
 				$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
 			}
-			$oReconFilter->AddCondition($sReconKeyAttCode, $value, '=');
+			$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
 			$aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 		}
 
 		$oExtObjects = new CMDBObjectSet($oReconFilter);
 		$aKeys = $oExtObjects->ToArray();
-		return array($oReconFilter, $aKeys);
+		return array($oReconFilter->ToOql(), $aKeys);
 	}
 
 	// Returns true if the CSV data specifies that the external key must be left undefined
@@ -455,10 +318,10 @@ class BulkChange
 	{
 		$aResults = array();
 		$aErrors = array();
-
+	
 		// External keys reconciliation
 		//
-		foreach($this->m_aExtKeys as $sAttCode => $aReconKeys)
+		foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
 		{
 			// Skip external keys used for the reconciliation process
 			// if (!array_key_exists($sAttCode, $this->m_aAttList)) continue;
@@ -467,7 +330,7 @@ class BulkChange
 
 			if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
 			{
-				foreach ($aReconKeys as $sReconKeyAttCode => $iCol)
+				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 				{
 					// Default reporting
 					// $aRowData[$iCol] is always null
@@ -489,24 +352,25 @@ class BulkChange
 				$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
 
 				$aCacheKeys = array();
-				foreach ($aReconKeys as $sReconKeyAttCode => $iCol)
+				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 				{
 					// The foreign attribute is one of our reconciliation key
-					if ($sReconKeyAttCode == 'id')
+					if ($sForeignAttCode == 'id')
 					{
 						$value = $aRowData[$iCol];
 					}
 					else
 					{
-						$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sReconKeyAttCode);
+						$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sForeignAttCode);
 						$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
 					}
 					$aCacheKeys[] = $value;
-					$oReconFilter->AddCondition($sReconKeyAttCode, $value, '=');
+					$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
 					$aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 				}
 				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
 				$iForeignKey = null;
+				$sOQL = '';
 				// TODO: check if *too long* keys can lead to collisions... and skip the cache in such a case...
 				if (!array_key_exists($sAttCode, $this->m_aExtKeysMappingCache))
 				{
@@ -515,8 +379,9 @@ class BulkChange
 				if (array_key_exists($sCacheKey, $this->m_aExtKeysMappingCache[$sAttCode]))
 				{
 					// Cache hit
-					$iObjectFoundCount = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['c'];
+					$iCount = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['c'];
 					$iForeignKey = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['k'];
+					$sOQL = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['oql'];
 					// Record the hit
 					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['h']++;
 				}
@@ -524,35 +389,34 @@ class BulkChange
 				{
 					// Cache miss, let's initialize it
 					$oExtObjects = new CMDBObjectSet($oReconFilter);
-					$iObjectFoundCount = $oExtObjects->Count();
-					if ($iObjectFoundCount == 1)
+					$iCount = $oExtObjects->Count();
+					if ($iCount == 1)
 					{
 						$oForeignObj = $oExtObjects->Fetch();
 						$iForeignKey = $oForeignObj->GetKey();
 					}
 					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey] = array(
-						'c' => $iObjectFoundCount,
+						'c' => $iCount,
 						'k' => $iForeignKey,
 						'oql' => $oReconFilter->ToOql(),
 						'h' => 0, // number of hits on this cache entry
 					);
 				}
-				switch($iObjectFoundCount)
+				switch($iCount)
 				{
 					case 0:
-						$oCellStatus_SearchIssue = $this->GetCellSearchIssue($oReconFilter);
-						$aResults[$sAttCode] = $oCellStatus_SearchIssue;
-						$aErrors[$sAttCode] = Dict::S('UI:CSVReport-Value-Issue-NotFound');
-						break;
-
+					$aErrors[$sAttCode] = Dict::S('UI:CSVReport-Value-Issue-NotFound');
+					$aResults[$sAttCode]= new CellStatus_SearchIssue();
+					break;
+					
 					case 1:
-						// Do change the external key attribute
-						$oTargetObj->Set($sAttCode, $iForeignKey);
-						break;
-
+					// Do change the external key attribute
+					$oTargetObj->Set($sAttCode, $iForeignKey);
+					break;
+					
 					default:
-						$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-FoundMany', $iObjectFoundCount);
-						$aResults[$sAttCode]= new CellStatus_Ambiguous($oTargetObj->Get($sAttCode), $iObjectFoundCount, $oReconFilter->serialize());
+					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-FoundMany', $iCount);
+					$aResults[$sAttCode]= new CellStatus_Ambiguous($oTargetObj->Get($sAttCode), $iCount, $sOQL);
 				}
 			}
 
@@ -569,7 +433,7 @@ class BulkChange
 					else
 					{
 						$aResults[$sAttCode]= new CellStatus_Modify($iForeignObj, $oTargetObj->GetOriginal($sAttCode));
-						foreach ($aReconKeys as $sReconKeyAttCode => $iCol)
+						foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 						{
 							// Report the change on reconciliation values as well
 							$aResults[$iCol] = new CellStatus_Modify(utils::HtmlEntities($aRowData[$iCol]));
@@ -582,7 +446,7 @@ class BulkChange
 				}
 			}
 		}
-
+	
 		// Set the object attributes
 		//
 		foreach ($this->m_aAttList as $sAttCode => $iCol)
@@ -623,13 +487,7 @@ class BulkChange
 				$value = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
 				if (is_null($value) && (strlen($aRowData[$iCol]) > 0))
 				{
-					if ($oAttDef instanceof AttributeEnum || $oAttDef instanceof AttributeTagSet){
-						/** @var AttributeDefinition $oAttributeDefinition */
-						$oAttributeDefinition = $oAttDef;
-						$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-AllowedValues', $sAttCode, implode(',', $oAttributeDefinition->GetAllowedValues()));
-					} else {
-						$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-NoMatch', $sAttCode);
-					}
+					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-NoMatch', $sAttCode);
 				}
 				else
 				{
@@ -646,7 +504,7 @@ class BulkChange
 				}
 			}
 		}
-
+	
 		// Reporting on fields
 		//
 		$aChangedFields = $oTargetObj->ListChanges();
@@ -698,7 +556,7 @@ class BulkChange
 				}
 			}
 		}
-
+	
 		// Checks
 		//
 		$res = $oTargetObj->CheckConsistency();
@@ -709,101 +567,12 @@ class BulkChange
 		}
 		return $aResults;
 	}
-
-	/**
-	 * search with current permissions did not match
-	 * let's search why and give some more feedbacks to the user through proper labels
-	 *
-	 * @param DBObjectSearch $oDbSearchWithConditions search used to find external key
-	 *
-	 * @return \CellStatus_SearchIssue
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 *
-	 * @since 3.1.0 N°5305
-	 */
-	protected function GetCellSearchIssue($oDbSearchWithConditions) : CellStatus_SearchIssue {
-		//current search with current permissions did not match
-		//let's search why and give some more feedback to the user
-
-		$sSerializedSearch = $oDbSearchWithConditions->serialize();
-
-		// Count all objects with all permissions without any condition
-		$oDbSearchWithoutAnyCondition = new DBObjectSearch($oDbSearchWithConditions->GetClass());
-		$oDbSearchWithoutAnyCondition->AllowAllData(true);
-		$oExtObjectSet = new CMDBObjectSet($oDbSearchWithoutAnyCondition);
-		$iAllowAllDataObjectCount = $oExtObjectSet->Count();
-
-		if ($iAllowAllDataObjectCount === 0) {
-			$sReason = Dict::Format('UI:CSVReport-Value-NoMatch-NoObject', $oDbSearchWithConditions->GetClass());
-			return new CellStatus_SearchIssue($sSerializedSearch, $sReason);
-		}
-
-		// Count all objects with current user permissions
-		$oDbSearchWithoutAnyCondition->AllowAllData(false);
-		$oExtObjectSetWithCurrentUserPermissions = new CMDBObjectSet($oDbSearchWithoutAnyCondition);
-		$iCurrentUserRightsObjectCount = $oExtObjectSetWithCurrentUserPermissions->Count();
-
-		if ($iCurrentUserRightsObjectCount === 0){
-			// No objects visible by current user
-			$sReason = Dict::Format('UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser', $oDbSearchWithConditions->GetClass());
-			return new CellStatus_SearchIssue($sSerializedSearch, $sReason);
-		}
-
-		try{
-			$aDisplayedAllowedValues = [];
-			// Possibles values are displayed to UI user. we have to limit the amount of displayed values
-			$oExtObjectSetWithCurrentUserPermissions->SetLimit(4);
-			for($i = 0; $i < 3; $i++){
-				/** @var \DBObject $oVisibleObject */
-				$oVisibleObject = $oExtObjectSetWithCurrentUserPermissions->Fetch();
-				if (is_null($oVisibleObject)){
-					break;
-				}
-
-				$aCurrentAllowedValueFields = [];
-				foreach ($oDbSearchWithConditions->GetInternalParams() as $sForeignAttCode => $sValue){
-					$aCurrentAllowedValueFields[] = $oVisibleObject->Get($sForeignAttCode);
-				}
-				$aDisplayedAllowedValues[] = implode(" ", $aCurrentAllowedValueFields);
-
-			}
-			$allowedValues = implode(", ", $aDisplayedAllowedValues);
-			if ($oExtObjectSetWithCurrentUserPermissions->Count() > 3){
-				$allowedValues .= "...";
-			}
-		} catch(Exception $e) {
-			IssueLog::Error("failure during CSV import when fetching few visible objects: ", null,
-				[ 'target_class' => $oDbSearchWithConditions->GetClass(), 'criteria' => $oDbSearchWithConditions->GetCriteria(), 'message' => $e->getMessage()]
-			);
-			$sReason = Dict::Format('UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser', $oDbSearchWithConditions->GetClass());
-			return new CellStatus_SearchIssue($sSerializedSearch, $sReason);
-		}
-
-		if ($iAllowAllDataObjectCount != $iCurrentUserRightsObjectCount) {
-			// No match and some objects NOT visible by current user. including current search maybe...
-			$sReason = Dict::Format('UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser', $oDbSearchWithConditions->GetClass());
-			return new CellStatus_SearchIssue($sSerializedSearch, $sReason, $oDbSearchWithConditions->GetClass(), $allowedValues);
-		}
-
-		// No match. This is not linked to any right issue
-		// Possible values: DD,DD
-		$aCurrentValueFields = [];
-		foreach ($oDbSearchWithConditions->GetInternalParams() as $sValue){
-			$aCurrentValueFields[] = $sValue;
-		}
-		$value =implode(" ", $aCurrentValueFields);
-		$sReason = Dict::Format('UI:CSVReport-Value-NoMatch', $value);
-		return new CellStatus_SearchIssue($sSerializedSearch, $sReason, $oDbSearchWithConditions->GetClass(), $allowedValues);
-	}
-
+	
 	protected function PrepareMissingObject(&$oTargetObj, &$aErrors)
 	{
 		$aResults = array();
 		$aErrors = array();
-
+	
 		// External keys
 		//
 		foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
@@ -816,7 +585,7 @@ class BulkChange
 				$aResults[$iCol] = new CellStatus_Void('?');
 			}
 		}
-
+	
 		// Update attributes
 		//
 		foreach($this->m_aOnDisappear as $sAttCode => $value)
@@ -827,7 +596,7 @@ class BulkChange
 			}
 			$oTargetObj->Set($sAttCode, $value);
 		}
-
+	
 		// Reporting on fields
 		//
 		$aChangedFields = $oTargetObj->ListChanges();
@@ -847,7 +616,7 @@ class BulkChange
 				$aResults[$iCol]= new CellStatus_Void($oTargetObj->Get($sAttCode));
 			}
 		}
-
+	
 		// Checks
 		//
 		$res = $oTargetObj->CheckConsistency();
@@ -905,16 +674,14 @@ class BulkChange
 		}
 
 		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
-
+	
 		if (count($aErrors) > 0)
 		{
 			$sErrors = implode(', ', $aErrors);
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
-			//__ERRORS__ used by tests only
-			$aResult[$iRow]["__ERRORS__"] = new RowStatus_Error($sErrors);
 			return $oTargetObj;
 		}
-
+	
 		// Check that any external key will have a value proposed
 		$aMissingKeys = array();
 		foreach (MetaModel::GetExternalKeys($this->m_sClass) as $sExtKeyAttCode => $oExtKey)
@@ -922,7 +689,7 @@ class BulkChange
 			if (!$oExtKey->IsNullAllowed())
 			{
 				if (!array_key_exists($sExtKeyAttCode, $this->m_aExtKeys) && !array_key_exists($sExtKeyAttCode, $this->m_aAttList))
-				{
+				{ 
 					$aMissingKeys[] = $oExtKey->GetLabel();
 				}
 			}
@@ -978,16 +745,14 @@ class BulkChange
 		{
 			$sErrors = implode(', ', $aErrors);
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
-			//__ERRORS__ used by tests only
-			$aResult[$iRow]["__ERRORS__"] = new RowStatus_Error($sErrors);
 			return;
 		}
-
+	
 		$aChangedFields = $oTargetObj->ListChanges();
 		if (count($aChangedFields) > 0)
 		{
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Modify(count($aChangedFields));
-
+	
 			// Optionaly record the results
 			//
 			if ($oChange)
@@ -1029,11 +794,9 @@ class BulkChange
 		{
 			$sErrors = implode(', ', $aErrors);
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
-			//__ERRORS__ used by tests only
-			$aResult[$iRow]["__ERRORS__"] = new RowStatus_Error($sErrors);
 			return;
 		}
-
+	
 		$aChangedFields = $oTargetObj->ListChanges();
 		if (count($aChangedFields) > 0)
 		{
@@ -1058,7 +821,7 @@ class BulkChange
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Disappeared(0);
 		}
 	}
-
+	
 	public function Process(CMDBChange $oChange = null)
 	{
 		if ($oChange)
@@ -1103,7 +866,7 @@ class BulkChange
 			foreach ($this->m_aAttList as $sAttCode => $iCol)
 			{
 				if ($sAttCode == 'id') continue;
-
+				
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 				if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
 				{
@@ -1118,18 +881,14 @@ class BulkChange
 								$sFormat = $sDateFormat;
 							}
 							$oFormat = new DateTimeFormat($sFormat);
-							$sDateExample = $oFormat->Format(new DateTime('2022-10-23 16:25:33'));
 							$sRegExp = $oFormat->ToRegExpr('/');
-							$sErrorMsg = Dict::Format('UI:CSVReport-Row-Issue-ExpectedDateFormat', $sDateExample);
-							if (!preg_match($sRegExp, $sValue))
+							if (!preg_match($sRegExp, $this->m_aData[$iRow][$iCol]))
 							{
 								$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
-								$aResult[$iRow][$iCol] = new CellStatus_Issue(utils::HtmlEntities($sValue), null, $sErrorMsg);
-
 							}
 							else
 							{
-								$oDate = DateTime::createFromFormat($sFormat, $sValue);
+								$oDate = DateTime::createFromFormat($sFormat, $this->m_aData[$iRow][$iCol]);
 								if ($oDate !== false)
 								{
 									$sNewDate = $oDate->format($oAttDef->GetInternalFormat());
@@ -1139,7 +898,7 @@ class BulkChange
 								{
 									// Leave the cell unchanged
 									$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
-									$aResult[$iRow][$iCol] = new CellStatus_Issue($sValue, null, $sErrorMsg);
+									$aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, utils::HtmlEntities($this->m_aData[$iRow][$iCol]), Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
 								}
 							}
 						}
@@ -1193,26 +952,23 @@ class BulkChange
 						else
 						{
 							// The value has to be found or verified
-
-							/** var DBObjectSearch $oReconFilter */
-							list($oReconFilter, $aMatches) = $this->ResolveExternalKey($aRowData, $sAttCode, $aResult[$iRow]);
-
+							list($sQuery, $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;
-							}
+								$aResult[$iRow][$sAttCode] = new CellStatus_SearchIssue();
+							} 					
 							else
 							{
-								$aResult[$iRow][$sAttCode] = new CellStatus_Ambiguous(null, count($aMatches), $oReconFilter->serialize());
+								$aResult[$iRow][$sAttCode] = new CellStatus_Ambiguous(null, count($aMatches), $sQuery);
 							}
-						}
+						} 					
 					}
 					else
 					{
@@ -1263,7 +1019,7 @@ class BulkChange
 					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]["id"]= new CellStatus_Ambiguous(0, $oReconciliationSet->Count(), $oReconciliationFilter->ToOql());
 						$aResult[$iRow]["finalclass"]= 'n/a';
 					}
 				}
@@ -1354,7 +1110,7 @@ class BulkChange
 			}
 		}
 		$oBulkChanges->Seek(0);
-
+	
 		$aDetails = array();
 		while ($oChange = $oBulkChanges->Fetch())
 		{
@@ -1518,7 +1274,7 @@ EOF
 							$oOldTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('oldvalue'));
 							$sOldValue = $oOldTarget->GetHyperlink();
 						}
-
+						
 						$sNewValue = Dict::S('UI:UndefinedObject');
 						if ($oOperation->Get('newvalue') != 0)
 						{
@@ -1544,11 +1300,11 @@ EOF
 				}
 				else
 				{
-					$aAttributes[$sAttCode] = 1;
+					$aAttributes[$sAttCode] = 1;				
 				}
 			}
 		}
-
+		
 		$aDetails = array();
 		foreach($aObjects as $iUId => $aObjData)
 		{
@@ -1600,6 +1356,6 @@ EOF
 			$aConfig[$sAttCode] = array('label' => MetaModel::GetLabel($sClass, $sAttCode), 'description' => MetaModel::GetDescription($sClass, $sAttCode));
 		}
 		$oPage->table($aConfig, $aDetails);
-	}
+	}	
 }
 

core/cmdbchangeop.class.inc.php

@@ -78,7 +78,7 @@ class CMDBChangeOp extends DBObject implements iCMDBChangeOp
 	}
 
 	/**
-	 * @inheritDoc
+	 * Describe (as a text string) the modifications corresponding to this change
 	 */
 	public function GetDescription()
 	{
@@ -350,30 +350,20 @@ 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" => '.*')));
-
+		MetaModel::Init_AddAttribute(new AttributeURL("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "target" => '_blank', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		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
@@ -885,7 +875,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 +1167,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

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   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.
@@ -214,12 +214,7 @@ abstract class CMDBObject extends DBObject
 		if (is_null(self::$m_sInfo)) {
 			return CMDBChange::GetCurrentUserName();
 		} else {
-			//N°5135 - add impersonation information in activity log/current cmdb change
-			if (UserRights::IsImpersonated()){
-				return sprintf("%s (%s)", CMDBChange::GetCurrentUserName(), self::$m_sInfo);
-			} else {
-				return self::$m_sInfo;
-			}
+			return self::$m_sInfo;
 		}
 	}
 
@@ -232,10 +227,7 @@ abstract class CMDBObject extends DBObject
 	 */
 	protected static function GetTrackUserId()
 	{
-		if (is_null(self::$m_sUserId)
-			//N°5135 - indicate impersonation inside changelogs
-			&& (false === UserRights::IsImpersonated())
-		)
+		if (is_null(self::$m_sUserId))
 		{
 			return CMDBChange::GetCurrentUserId();
 		}
@@ -244,10 +236,10 @@ abstract class CMDBObject extends DBObject
 			return self::$m_sUserId;
 		}
 	}
-
+	
 	/**
 	 * Get the 'origin' information (defaulting to 'interactive')
-	 */
+	 */	 	
 	protected static function GetTrackOrigin()
 	{
 		if (is_null(self::$m_sOrigin))
@@ -276,7 +268,7 @@ abstract class CMDBObject extends DBObject
 	 * @since 2.7.7 3.0.2 3.1.0 N°3717 {@see CMDBChange} **will be persisted later** in {@see \CMDBChangeOp::OnInsert} (was done previously directly here)
 	 *     This will avoid creating in DB CMDBChange lines without any corresponding CMDBChangeOp
 	 */
-	public static function CreateChange()
+	protected static function CreateChange()
 	{
 		self::$m_oCurrChange = MetaModel::NewObject("CMDBChange");
 		self::$m_oCurrChange->Set("date", time());
@@ -499,7 +491,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 +615,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);
@@ -635,11 +624,25 @@ abstract class CMDBObject extends DBObject
 	protected function DBCloneTracked_Internal($newKey = null)
 	{
 		$newKey = parent::DBClone($newKey);
-		$oClone = MetaModel::GetObject(get_class($this), $newKey);
+		$oClone = MetaModel::GetObject(get_class($this), $newKey); 
 
 		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 +677,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;
 	}
 
@@ -719,11 +761,11 @@ abstract class CMDBObject extends DBObject
 class CMDBObjectSet extends DBObjectSet
 {
 	// this is the public interface (?)
-
+	
 	// I have to define those constructors here... :-(
 	// just to get the right object class in return.
 	// I have to think again to those things: maybe it will work fine if a have a constructor define here (?)
-
+	
 	static public function FromScratch($sClass)
 	{
 		$oFilter = new DBObjectSearch($sClass);
@@ -732,7 +774,7 @@ class CMDBObjectSet extends DBObjectSet
 		// NOTE: THIS DOES NOT WORK IF m_bLoaded is private in the base class (and you will not get any error message)
 		$oRetSet->m_bLoaded = true; // no DB load
 		return $oRetSet;
-	}
+	} 
 
 	// create an object set ex nihilo
 	// input = array of objects
@@ -741,7 +783,7 @@ class CMDBObjectSet extends DBObjectSet
 		$oRetSet = self::FromScratch($sClass);
 		$oRetSet->AddObjectArray($aObjects, $sClass);
 		return $oRetSet;
-	}
+	} 
 
 	static public function FromArrayAssoc($aClasses, $aObjects)
 	{

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)
 			{
@@ -706,11 +707,7 @@ class CMDBSource
 	private static function Commit()
 	{
 		$aStackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT , 3);
-		if(isset($aStackTrace[2]['class']) && isset($aStackTrace[2]['function'])) {
-			$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].'): '.$aStackTrace[2]['class'].'->'.$aStackTrace[2]['function'].'()';
-		} else {
-			$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].') ';
-		}
+		$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].'): '.$aStackTrace[2]['class'].'->'.$aStackTrace[2]['function'].'()';
 		if (!self::IsInsideTransaction()) {
 			// should not happen !
 			IssueLog::Error("No Transaction COMMIT $sCaller", LogChannels::CMDB_SOURCE);
@@ -744,11 +741,7 @@ class CMDBSource
 	private static function Rollback()
 	{
 		$aStackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT , 3);
-		if(isset($aStackTrace[2]['class']) && isset($aStackTrace[2]['function'])) {
-			$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].'): '.$aStackTrace[2]['class'].'->'.$aStackTrace[2]['function'].'()';
-		} else {
-			$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].') ';
-		}
+		$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].'): '.$aStackTrace[2]['class'].'->'.$aStackTrace[2]['function'].'()';
 		if (!self::IsInsideTransaction()) {
 			// should not happen !
 			IssueLog::Error("No Transaction ROLLBACK $sCaller", LogChannels::CMDB_SOURCE);

core/config.class.inc.php

@@ -129,22 +129,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'event_service.debug.filter_events' => [
-			'type' => 'array',
-			'description' => 'Filter Event Service debug by events',
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'event_service.debug.filter_sources' => [
-			'type' => 'array',
-			'description' => 'Filter Event Service debug by event sources',
-			'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")',
@@ -546,7 +530,7 @@ class Config
 		],
 		'email_transport' => [
 			'type' => 'string',
-			'description' => 'Mean to send emails: PHPMail (uses the function mail()), SMTP (implements the client protocol) or SMTP_OAuth (connect to the server using OAuth 2.0)',
+			'description' => 'Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocol)',
 			'default' => "PHPMail",
 			'value' => "PHPMail",
 			'source_of_value' => '',
@@ -568,7 +552,7 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'email_transport_smtp.encryption'          => [
+		'email_transport_smtp.encryption' => [
 			'type' => 'string',
 			'description' => 'tls or ssl (optional)',
 			'default' => "",
@@ -576,28 +560,28 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'email_transport_smtp.username'            => [
-			'type'                => 'string',
-			'description'         => 'Authentication user (optional)',
-			'default'             => "",
-			'value'               => "",
-			'source_of_value'     => '',
+		'email_transport_smtp.username' => [
+			'type' => 'string',
+			'description' => 'Authentication user (optional)',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'email_transport_smtp.password'            => [
-			'type'                => 'string',
-			'description'         => 'Authentication password (optional)',
-			'default'             => "",
-			'value'               => "",
-			'source_of_value'     => '',
+		'email_transport_smtp.password' => [
+			'type' => 'string',
+			'description' => 'Authentication password (optional)',
+			'default' => "",
+			'value' => "",
+			'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'     => '',
+		'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' => [
@@ -1024,8 +1008,8 @@ class Config
 			'type' => 'integer',
 			'description' => 'Maximum length of the history table (in the "History" tab on each object) before it gets truncated. Latest modifications are displayed first.',
 			// examples... not used
-			'default' => 200,
-			'value' => 200,
+			'default' => 50,
+			'value' => 50,
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
@@ -1472,6 +1456,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'use_legacy_dbsearch' => [
+			'type' => 'bool',
+			'description' => 'If set, DBSearch will use legacy SQL query generation',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'query_cache_enabled' => [
 			'type' => 'bool',
 			'description' => 'If set, DBSearch will use cache for query generation',
@@ -1887,7 +1879,7 @@ class Config
 		{
 			// 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))

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

@@ -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

@@ -430,13 +430,17 @@ class DBObjectSearch extends DBSearch
 	 */
 	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 +1902,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 +1931,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 +2098,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 +2116,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

@@ -842,7 +842,7 @@ class DBObjectSet implements iDBObjectSetIterator
      * @throws \MySQLException
      * @throws \MySQLHasGoneAwayException
      */
-	public function Count(): int
+	public function Count()
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
@@ -1077,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();
 
@@ -1092,6 +1093,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		{
 			$this->m_oSQLResult->data_seek($this->m_iCurrRow);
 		}
+		return $this->m_iCurrRow;
 	}
 
     /**

core/dbsearch.class.php

@@ -18,6 +18,23 @@
  */
 
 
+$bUseLegacyDBSearch = utils::GetConfig()->Get('use_legacy_dbsearch');
+
+if ($bUseLegacyDBSearch)
+{
+	// excluded from autoload
+	require_once (APPROOT.'core/legacy/querybuilderexpressionslegacy.class.inc.php');
+	require_once (APPROOT.'core/legacy/querybuildercontextlegacy.class.inc.php');
+	require_once(APPROOT.'core/legacy/dbobjectsearchlegacy.class.php');
+}
+else
+{
+	// excluded from autoload
+	require_once (APPROOT.'core/querybuilderexpressions.class.inc.php');
+	require_once (APPROOT.'core/querybuildercontext.class.inc.php');
+	require_once(APPROOT.'core/dbobjectsearch.class.php');
+}
+
 /**
  * An object search
  *
@@ -1642,7 +1659,7 @@ abstract class DBSearch
 		$oSet = new DBObjectSet($this);
 		if (MetaModel::IsStandaloneClass($sClass))
 		{
-			$oSet->OptimizeColumnLoad(array($this->GetClassAlias() => array()));
+			$oSet->OptimizeColumnLoad(array($this->GetClassAlias() => array('')));
 			$aIds = array($sClass => $oSet->GetColumnAsArray('id'));
 		}
 		else
@@ -1707,16 +1724,4 @@ abstract class DBSearch
 	{
 		$this->SetShowObsoleteData(utils::ShowObsoleteData());
 	}
-
-	/**
-	 * To ease the debug of filters
-	 * @internal
-	 *
-	 * @return string
-	 *
-	 */
-	public function __toString()
-	{
-		return $this->ToOQL();
-	}
 }

core/designdocument.class.inc.php

@@ -26,10 +26,8 @@
 
 namespace Combodo\iTop;
 
-use DOMDocument;
-use DOMFormatException;
-use IssueLog;
-use LogAPI;
+use \DOMDocument;
+use \DOMFormatException;
 
 /**
  * Class \Combodo\iTop\DesignDocument
@@ -66,13 +64,9 @@ class DesignDocument extends DOMDocument
 	 * @param $filename
 	 * @param int $options
 	 */
-	public function load($filename, $options = null)
+	public function load($filename, $options = 0)
 	{
-		libxml_clear_errors();
-		if (parent::load($filename, LIBXML_NOBLANKS) === false) {
-			$aErrors = libxml_get_errors();
-			IssueLog::Error("Error loading $filename", LogAPI::CHANNEL_DEFAULT, $aErrors);
-		}
+		parent::load($filename, LIBXML_NOBLANKS);
 	}
 
 	/**
@@ -83,12 +77,10 @@ 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)
+	public function save($filename, $options = 0)
 	{
 		$this->documentElement->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
-		return parent::save($filename);
+		return parent::save($filename, LIBXML_NOBLANKS);
 	}
 
 	/**
@@ -99,12 +91,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 '';
@@ -182,26 +175,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
 	 *
@@ -217,13 +190,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/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/>';
 		}
@@ -1194,10 +1195,8 @@ class DisplayableGraph extends SimpleGraph
 	 * @param float $xMax Right coordinate of the bounding box to display the graph
 	 * @param float $yMin Top coordinate of the bounding box to display the graph
 	 * @param float $yMax Bottom coordinate of the bounding box to display the graph
-	 *
-	 * @since 2.7.7 3.0.2 3.1.0 N°4985 $sComments param is no longer optional
 	 */
-	function RenderAsPDF(PDFPage $oPage, $sComments, $sContextKey, $xMin = -1, $xMax = -1, $yMin = -1, $yMax = -1)
+	function RenderAsPDF(PDFPage $oPage, $sComments = '', $sContextKey, $xMin = -1, $xMax = -1, $yMin = -1, $yMax = -1)
 	{
 		$aContextDefs = static::GetContextDefinitions($sContextKey, false); // No need to develop the parameters
 		$oPdf = $oPage->get_tcpdf();
@@ -1334,17 +1333,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

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2022 Combodo SARL
+// Copyright (C) 2010-2021 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,72 +20,52 @@
 /**
  * Send an email (abstraction for synchronous/asynchronous modes)
  *
- * @copyright   Copyright (C) 2010-2022 Combodo SARL
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Core\Email\EmailFactory;
-use Combodo\iTop\Core\Email\iEMail;
+use Laminas\Mail\Header\ContentType;
+use Laminas\Mail\Message;
+use Laminas\Mail\Transport\File;
+use Laminas\Mail\Transport\FileOptions;
+use Laminas\Mail\Transport\SmtpOptions;
+use Laminas\Mail\Transport\Smtp;
+use Laminas\Mime\Mime;
+use Laminas\Mime\Part;
+use Pelago\Emogrifier\CssInliner;
+use Pelago\Emogrifier\HtmlProcessor\CssToAttributeConverter;
+use Pelago\Emogrifier\HtmlProcessor\HtmlPruner;
 
 define ('EMAIL_SEND_OK', 0);
 define ('EMAIL_SEND_PENDING', 1);
 define ('EMAIL_SEND_ERROR', 2);
 
-class EMail implements iEMail
+class EMail
 {
-	/**
-	 * @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
 	const ORIGINAL_FORMAT = 1; // Original format, consisting in serializing the whole object, inculding the Swift Mailer's object.
-	// Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
+							   // Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
 	const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
+	
+	protected static $m_oConfig = null;
+	protected $m_aData; // For storing data to serialize
+
+	public function LoadConfig($sConfigFile = ITOP_DEFAULT_CONFIG_FILE)
+	{
+		if (is_null(self::$m_oConfig))
+		{
+			self::$m_oConfig = new Config($sConfigFile);
+		}
+	}
+
+	protected $m_oMessage;
 
 	public function __construct()
 	{
-		$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')
-		);
+		$this->m_aData = array();
+		$this->m_oMessage = new Message();
+		$this->m_oMessage->setEncoding('UTF-8');
+		$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
 	}
 
 	/**
@@ -96,7 +76,7 @@ class EMail implements iEMail
 	 */
 	public function SerializeV2()
 	{
-		return $this->oMailer->SerializeV2();
+		return serialize($this->m_aData);
 	}
 
 	/**
@@ -104,34 +84,284 @@ class EMail implements iEMail
 	 *
 	 * @param string $sSerializedMessage The serialized representation of the message
 	 *
-	 * @return \Email
+	 * @return \EMail
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 * @throws \Symfony\Component\CssSelector\Exception\SyntaxErrorException
 	 */
 	public static function UnSerializeV2($sSerializedMessage)
 	{
-		return EmailFactory::GetMailer()::UnSerializeV2($sSerializedMessage);
+		$aData = unserialize($sSerializedMessage);
+		$oMessage = new Email();
+		
+		if (array_key_exists('body', $aData))
+		{
+			$oMessage->SetBody($aData['body']['body'], $aData['body']['mimeType']);
+		}
+		if (array_key_exists('message_id', $aData))
+		{
+			$oMessage->SetMessageId($aData['message_id']);
+		}
+		if (array_key_exists('bcc', $aData))
+		{
+			$oMessage->SetRecipientBCC($aData['bcc']);
+		}
+		if (array_key_exists('cc', $aData))
+		{
+			$oMessage->SetRecipientCC($aData['cc']);
+		}
+		if (array_key_exists('from', $aData))
+		{
+			$oMessage->SetRecipientFrom($aData['from']['address'], $aData['from']['label']);
+		}
+		if (array_key_exists('reply_to', $aData))
+		{
+			$oMessage->SetRecipientReplyTo($aData['reply_to']['address'], $aData['reply_to']['label']);
+		}
+		if (array_key_exists('to', $aData))
+		{
+			$oMessage->SetRecipientTO($aData['to']);
+		}
+		if (array_key_exists('subject', $aData))
+		{
+			$oMessage->SetSubject($aData['subject']);
+		}
+		
+		if (array_key_exists('headers', $aData))
+		{
+			foreach($aData['headers'] as $sKey => $sValue)
+			{
+				$oMessage->AddToHeader($sKey, $sValue);
+			}
+		}
+		if (array_key_exists('parts', $aData))
+		{
+			foreach($aData['parts'] as $aPart)
+			{
+				$oMessage->AddPart($aPart['text'], $aPart['mimeType']);
+			}
+		}
+		if (array_key_exists('attachments', $aData))
+		{
+			foreach($aData['attachments'] as $aAttachment)
+			{
+				$oMessage->AddAttachment(base64_decode($aAttachment['data']), $aAttachment['filename'], $aAttachment['mimeType']);
+			}
+		}
+		return $oMessage;
+	}
+	
+  	protected function SendAsynchronous(&$aIssues, $oLog = null)
+	{
+		try
+		{
+			AsyncSendEmail::AddToQueue($this, $oLog);
+		}
+		catch(Exception $e)
+		{
+			$aIssues = array($e->GetMessage());
+			return EMAIL_SEND_ERROR;
+		}
+		$aIssues = array();
+		return EMAIL_SEND_PENDING;
+	}
+
+	/**
+	 * @throws \Exception
+	 */
+	protected function SendSynchronous(&$aIssues, $oLog = null)
+	{
+		
+		$this->LoadConfig();
+
+		$sTransport = self::$m_oConfig->Get('email_transport');
+		switch ($sTransport)
+		{
+		case 'SMTP':
+			$sHost = self::$m_oConfig->Get('email_transport_smtp.host');
+			$sPort = self::$m_oConfig->Get('email_transport_smtp.port');
+			$sEncryption = self::$m_oConfig->Get('email_transport_smtp.encryption');
+			$sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
+			$sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
+
+			$oTransport = new Smtp();
+			$aOptions= [
+				'host'              => $sHost,
+				'port'              => $sPort,
+				'connection_class'  => 'login',
+				'connection_config' => [
+					'ssl' => $sEncryption,
+				],
+			];
+			if (strlen($sUserName) > 0)
+			{
+				$aOptions['connection_config']['username'] = $sUserName;
+				$aOptions['connection_config']['password'] = $sPassword;
+			}
+			$oOptions = new SmtpOptions($aOptions);
+			$oTransport->setOptions($oOptions);
+			break;
+
+		case 'Null':
+			$oTransport = new Smtp();
+			break;
+		
+		case 'LogFile':
+			$oTransport = new File();
+			$aOptions   = new FileOptions([
+				'path' => APPROOT.'log/mail.log',
+			]);
+			$oTransport->setOptions($aOptions);
+			break;
+			
+		case 'PHPMail':
+		default:
+			$oTransport = new Smtp();
+		}
+		
+		$oKPI = new ExecutionKPI();
+		try
+		{
+			$oTransport->send($this->m_oMessage);
+			$aIssues = array();
+			$oKPI->ComputeStats('Email Sent', 'Succeded');
+			return EMAIL_SEND_OK;
+		}
+		catch(Laminas\Mail\Transport\Exception\RuntimeException $e){
+			IssueLog::Warning('Email sending failed: Some recipients were invalid');
+			$aIssues = array('Some recipients were invalid.');
+			$oKPI->ComputeStats('Email Sent', 'Error received');
+			return EMAIL_SEND_ERROR;
+		}
+		catch (Exception $e)
+		{
+			$oKPI->ComputeStats('Email Sent', 'Error received');
+			throw $e;
+		}
+	}
+
+	/**
+	 * Reprocess the body of the message (if it is an HTML message)
+	 * to replace the URL of images based on attachments by a link
+	 * to an embedded image (i.e. cid:....) and returns images to be attached as an array
+	 *
+	 * @param string $sBody Email body to process/alter
+	 *
+	 * @return array Array of Part that needs to be added as inline attachment later to render as embed
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
+	protected function EmbedInlineImages(string &$sBody)
+	{
+		$oDOMDoc = new DOMDocument();
+		$oDOMDoc->preserveWhitespace = true;
+		@$oDOMDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sBody); // For loading HTML chunks where the character set is not specified
+
+		$oXPath = new DOMXPath($oDOMDoc);
+		$sXPath = '//img[@'.InlineImage::DOM_ATTR_ID.']';
+		$oImagesList = $oXPath->query($sXPath);
+		$oImagesContent = new \Laminas\Mime\Message();
+		$aImagesParts = [];
+		if ($oImagesList->length != 0)
+		{
+			foreach($oImagesList as $oImg)
+			{
+				$iAttId = $oImg->getAttribute(InlineImage::DOM_ATTR_ID);
+				$oAttachment = MetaModel::GetObject('InlineImage', $iAttId, false, true /* Allow All Data */);
+				if ($oAttachment)
+				{
+					$sImageSecret = $oImg->getAttribute('data-img-secret');
+					$sAttachmentSecret = $oAttachment->Get('secret');
+					if ($sImageSecret !== $sAttachmentSecret)
+					{
+						// @see N°1921
+						// If copying from another iTop we could get an IMG pointing to an InlineImage with wrong secret
+						continue;
+					}
+
+					$oDoc = $oAttachment->Get('contents');
+
+					$sCid = uniqid('', true);
+
+					$oNewAttachment = new Part($oDoc->GetData());
+					$oNewAttachment->id = $sCid;
+					$oNewAttachment->type = $oDoc->GetMimeType();
+					$oNewAttachment->filename = $oDoc->GetFileName();
+					$oNewAttachment->disposition = Mime::DISPOSITION_INLINE;
+					$oNewAttachment->encoding = Mime::ENCODING_BASE64;
+					
+					$oImagesContent->addPart($oNewAttachment);
+					$oImg->setAttribute('src', 'cid:'.$sCid);
+					$aImagesParts[] = $oNewAttachment;
+				}
+			}
+		}
+		$sBody = $oDOMDoc->saveHTML();
+		return $aImagesParts;
 	}
 
 	public function Send(&$aIssues, $bForceSynchronous = false, $oLog = null)
 	{
-		return $this->oMailer->Send($aIssues, $bForceSynchronous, $oLog);
+		//select a default sender if none is provided.
+		if(empty($this->m_aData['from']['address']) && !empty($this->m_aData['to'])){
+			$this->SetRecipientFrom($this->m_aData['to']);
+		}
+
+		if ($bForceSynchronous)
+		{
+			return $this->SendSynchronous($aIssues, $oLog);
+		}
+		else
+		{
+			$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
+			if ($bConfigASYNC)
+			{
+				return $this->SendAsynchronous($aIssues, $oLog);
+			}
+			else
+			{
+				return $this->SendSynchronous($aIssues, $oLog);
+			}
+		}
 	}
 
 	public function AddToHeader($sKey, $sValue)
 	{
-		$this->oMailer->AddToHeader($sKey, $sValue);
+		if (!array_key_exists('headers', $this->m_aData))
+		{
+			$this->m_aData['headers'] = array();
+		}
+		$this->m_aData['headers'][$sKey] = $sValue;
+		
+		if (strlen($sValue) > 0)
+		{
+			$oHeaders = $this->m_oMessage->getHeaders();
+			switch(strtolower($sKey))
+			{
+				case 'return-path':
+					$this->m_oMessage->setReturnPath($sValue);
+					break;
+
+				default:
+					$oHeaders->addHeaderLine($sKey, $sValue);
+			}
+		}
 	}
 
 	public function SetMessageId($sId)
 	{
-		$this->oMailer->SetMessageId($sId);
+		$this->m_aData['message_id'] = $sId;
+		
+		// Note: Swift will add the angle brackets for you
+		// so let's remove the angle brackets if present, for historical reasons
+		$sId = str_replace(array('<', '>'), '', $sId);
+
+		$this->m_oMessage->getHeaders()->addHeaderLine('Message-ID', $sId);
 	}
 
 	public function SetReferences($sReferences)
 	{
-		$this->oMailer->SetReferences($sReferences);
+		$this->AddToHeader('References', $sReferences);
 	}
 
 	/**
@@ -148,58 +378,241 @@ class EMail implements iEMail
 		$this->AddToHeader('In-Reply-To', $sMessageId);
 	}
 
-	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)
+	/**
+	 * Set current Email body and process inline images.
+	 * 
+	 * @param $sBody
+	 * @param string $sMimeType
+	 * @param $sCustomStyles
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \Symfony\Component\CssSelector\Exception\SyntaxErrorException
+	 */
+	public function SetBody($sBody, string $sMimeType = Mime::TYPE_HTML, $sCustomStyles = null)
 	{
-		$this->oMailer->SetBody($sBody, $sMimeType, $sCustomStyles);
+		$oBody = new Laminas\Mime\Message();
+		$aAdditionalParts = [];
+		
+		if (($sMimeType === Mime::TYPE_HTML) && ($sCustomStyles !== null)) {
+			$oDomDocument = CssInliner::fromHtml($sBody)->inlineCss($sCustomStyles)->getDomDocument();
+			HtmlPruner::fromDomDocument($oDomDocument)->removeElementsWithDisplayNone();
+			$sBody = CssToAttributeConverter::fromDomDocument($oDomDocument)->convertCssToVisualAttributes()->render(); // Adds html/body tags if not already present
+		}
+		$this->m_aData['body'] = array('body' => $sBody, 'mimeType' => $sMimeType);
+
+		// We don't want these modifications in m_aData['body'], otherwise it'll ruin asynchronous mail as they go through this method twice
+		if ($sMimeType === Mime::TYPE_HTML){
+			$aAdditionalParts = $this->EmbedInlineImages($sBody);
+	    }
+		
+		// Add body content to as a new part
+		$oNewPart = new Part($sBody);
+		$oNewPart->encoding = Mime::ENCODING_8BIT;
+		$oNewPart->type = $sMimeType;
+		$oBody->addPart($oNewPart);
+		
+		// Add additional images as new body parts
+		foreach ($aAdditionalParts as $oAdditionalPart) {
+			$oBody->addPart($oAdditionalPart);
 		}
 
-	public function AddPart($sText, $sMimeType = 'text/html')
+		if($oBody->isMultiPart()){
+			$oContentTypeHeader = $this->m_oMessage->getHeaders();
+			foreach ($oContentTypeHeader as $oHeader) {
+				if (!$oHeader instanceof ContentType) {
+					continue;
+				}
+
+				$oHeader->setType(Mime::MULTIPART_MIXED);
+				$oHeader->addParameter('boundary', $oBody->getMime()->boundary());
+				break;
+			}
+		}
+		
+		$this->m_oMessage->setBody($oBody);
+	}
+
+	/**
+	 * Add a new part to the existing body
+	 * @param $sText
+	 * @param string $sMimeType
+	 *
+	 * @return void
+	 */
+	public function AddPart($sText, string $sMimeType = Mime::TYPE_HTML)
 	{
-		$this->oMailer->AddPart($sText, $sMimeType);
+		if (!array_key_exists('parts', $this->m_aData))
+		{
+			$this->m_aData['parts'] = array();
+		}
+		$this->m_aData['parts'][] = array('text' => $sText, 'mimeType' => $sMimeType);
+		$oNewPart = new Part($sText);
+		$oNewPart->encoding = Mime::ENCODING_8BIT;
+		$oNewPart->type = $sMimeType;
+		$this->m_oMessage->getBody()->addPart($oNewPart);
 	}
 
 	public function AddAttachment($data, $sFileName, $sMimeType)
 	{
-		$this->oMailer->AddAttachment($data, $sFileName, $sMimeType);
+		$oBody = $this->m_oMessage->getBody();
+
+		if(!$oBody->isMultiPart()){
+			$multipart_content = new Part($oBody->generateMessage());
+			$multipart_content->setType($oBody->getParts()[0]->getType());
+			$multipart_content->setBoundary($oBody->getMime()->boundary());
+
+			$oBody = new Laminas\Mime\Message();
+			$oBody->addPart($multipart_content);
+		}
+
+		if (!array_key_exists('attachments', $this->m_aData))
+		{
+			$this->m_aData['attachments'] = array();
+		}
+		$this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType);
+		$oNewAttachment = new Part($data);
+		$oNewAttachment->type = $sMimeType;
+		$oNewAttachment->filename = $sFileName;
+		$oNewAttachment->disposition = Mime::DISPOSITION_ATTACHMENT;
+		$oNewAttachment->encoding = Mime::ENCODING_BASE64;
+
+
+		$oBody->addPart($oNewAttachment);
+
+		if($oBody->isMultiPart()){
+			$oContentTypeHeader = $this->m_oMessage->getHeaders();
+			foreach ($oContentTypeHeader as $oHeader) {
+				if (!$oHeader instanceof ContentType) {
+					continue;
+				}
+
+				$oHeader->setType(Mime::MULTIPART_MIXED);
+				$oHeader->addParameter('boundary', $oBody->getMime()->boundary());
+				break;
+			}
+		}
+
+		$this->m_oMessage->setBody($oBody);
 	}
 
 	public function SetSubject($sSubject)
 	{
-		$this->oMailer->SetSubject($sSubject);
+		$this->m_aData['subject'] = $sSubject;
+		$this->m_oMessage->setSubject($sSubject);
 	}
 
 	public function GetSubject()
 	{
-		return $this->oMailer->GetSubject();
+		return $this->m_oMessage->getSubject();
 	}
 
+	/**
+	 * Helper to transform and sanitize addresses
+	 * - get rid of empty addresses	 
+	 */	 	
+	protected function AddressStringToArray($sAddressCSVList)
+	{
+		$aAddresses = array();
+		foreach(explode(',', $sAddressCSVList) as $sAddress)
+		{
+			$sAddress = trim($sAddress);
+			if (strlen($sAddress) > 0)
+			{
+				$aAddresses[] = $sAddress;
+			}
+		}
+		return $aAddresses;
+	}
+	
 	public function SetRecipientTO($sAddress)
 	{
-		$this->oMailer->SetRecipientTO($sAddress);
+		$this->m_aData['to'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setTo($aAddresses);
+		}
 	}
 
 	public function GetRecipientTO($bAsString = false)
 	{
-		return $this->oMailer->GetRecipientTO($bAsString);
+		$aRes = $this->m_oMessage->getTo();
+		if ($aRes === null || $aRes->count() === 0)
+		{
+			// There is no "To" header field
+			$aRes = array();
+		}
+		if ($bAsString)
+		{
+			$aStrings = array();
+			foreach ($aRes as $oEmail)
+			{
+				$sName = $oEmail->getName();
+				$sEmail = $oEmail->getEmail();
+				if (is_null($sName))
+				{
+					$aStrings[] = $sEmail;
+				}
+				else
+				{
+					$sName = str_replace(array('<', '>'), '', $sName);
+					$aStrings[] = "$sName <$sEmail>";
+				}
+			}
+			return implode(', ', $aStrings);
+		}
+		else
+		{
+			return $aRes;
+		}
 	}
 
 	public function SetRecipientCC($sAddress)
 	{
-		$this->oMailer->SetRecipientCC($sAddress);
+		$this->m_aData['cc'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setCc($aAddresses);
+		}
 	}
 
 	public function SetRecipientBCC($sAddress)
 	{
-		$this->oMailer->SetRecipientBCC($sAddress);
+		$this->m_aData['bcc'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setBcc($aAddresses);
+		}
 	}
 
 	public function SetRecipientFrom($sAddress, $sLabel = '')
 	{
-		$this->oMailer->SetRecipientFrom($sAddress, $sLabel);
+		$this->m_aData['from'] = array('address' => $sAddress, 'label' => $sLabel);
+		if ($sLabel != '')
+		{
+			$this->m_oMessage->setFrom(array($sAddress => $sLabel));		
+		}
+		else if (!empty($sAddress))
+		{
+			$this->m_oMessage->setFrom($sAddress);
+		}
 	}
 
 	public function SetRecipientReplyTo($sAddress, $sLabel = '')
 	{
-		$this->oMailer->SetRecipientReplyTo($sAddress);
+		$this->m_aData['reply_to'] = array('address' => $sAddress, 'label' => $sLabel);
+		if ($sLabel != '')
+		{
+			$this->m_oMessage->setReplyTo(array($sAddress => $sLabel));
+		}
+		else if (!empty($sAddress))
+		{
+			$this->m_oMessage->setReplyTo($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

@@ -108,18 +108,6 @@ abstract class DOMSanitizer extends HTMLSanitizer
 {
 	/** @var DOMDocument */
 	protected $oDoc;
-	/**
-	 * @var string Class to use for InlineImage static method calls
-	 * @used-by \Combodo\iTop\Test\UnitTest\Core\Sanitizer\HTMLDOMSanitizerTest::testDoSanitizeCallInlineImageProcessImageTag
-	 */
-	protected $sInlineImageClassName;
-
-	public function __construct($sInlineImageClassName = InlineImage::class)
-	{
-		parent::__construct();
-
-		$this->sInlineImageClassName = $sInlineImageClassName;
-	}
 
 	abstract public function GetTagsWhiteList();
 
@@ -215,7 +203,7 @@ abstract class DOMSanitizer extends HTMLSanitizer
 					// Recurse
 					$this->CleanNode($oNode);
 					if (($oNode instanceof DOMElement) && (strtolower($oNode->tagName) == 'img')) {
-						$this->sInlineImageClassName::ProcessImageTag($oNode);
+						InlineImage::ProcessImageTag($oNode);
 					}
 				}
 			}
@@ -350,30 +338,6 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		'white-space',
 	);
 
-	public function __construct($sInlineImageClassName = InlineImage::class)
-	{
-		parent::__construct($sInlineImageClassName);
-
-		// Building href validation pattern from url and email validation patterns as the patterns are not used the same way in HTML content than in standard attributes value.
-		// eg. "foo@bar.com" vs "mailto:foo@bar.com?subject=Title&body=Hello%20world"
-		if (!array_key_exists('href', self::$aAttrsWhiteList)) {
-			// Regular urls
-			$sUrlPattern = utils::GetConfig()->Get('url_validation_pattern');
-
-			// Mailto urls
-			$sMailtoPattern = '(mailto:('.utils::GetConfig()->Get('email_validation_pattern').')(?:\?(?:subject|body)=([a-zA-Z0-9+\$_.-]*)(?:&(?:subject|body)=([a-zA-Z0-9+\$_.-]*))?)?)';
-
-			// Notification placeholders
-			// eg. $this->caller_id$, $this->hyperlink()$, $this->hyperlink(portal)$, $APP_URL$, $MODULES_URL$, ...
-			// Note: Authorize both $xxx$ and %24xxx%24 as the latter one is encoded when used in HTML attributes (eg. a[href])
-			$sPlaceholderPattern = '(\$|%24)[\w-]*(->[\w]*(\([\w-]*?\))?)?(\$|%24)';
-
-			$sPattern = $sUrlPattern.'|'.$sMailtoPattern.'|'.$sPlaceholderPattern;
-			$sPattern = '/'.str_replace('/', '\/', $sPattern).'/i';
-			self::$aAttrsWhiteList['href'] = $sPattern;
-		}
-	}
-
 	public function GetTagsWhiteList()
 	{
 		return static::$aTagsWhiteList;
@@ -399,6 +363,31 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		return static::$aStylesWhiteList;
 	}
 
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Building href validation pattern from url and email validation patterns as the patterns are not used the same way in HTML content than in standard attributes value.
+		// eg. "foo@bar.com" vs "mailto:foo@bar.com?subject=Title&body=Hello%20world"
+		if (!array_key_exists('href', self::$aAttrsWhiteList))
+		{
+			// Regular urls
+			$sUrlPattern = utils::GetConfig()->Get('url_validation_pattern');
+
+			// Mailto urls
+			$sMailtoPattern = '(mailto:(' . utils::GetConfig()->Get('email_validation_pattern') . ')(?:\?(?:subject|body)=([a-zA-Z0-9+\$_.-]*)(?:&(?:subject|body)=([a-zA-Z0-9+\$_.-]*))?)?)';
+
+			// Notification placeholders
+			// eg. $this->caller_id$, $this->hyperlink()$, $this->hyperlink(portal)$, $APP_URL$, $MODULES_URL$, ...
+			// Note: Authorize both $xxx$ and %24xxx%24 as the latter one is encoded when used in HTML attributes (eg. a[href])
+			$sPlaceholderPattern = '(\$|%24)[\w-]*(->[\w]*(\([\w-]*?\))?)?(\$|%24)';
+
+			$sPattern = $sUrlPattern . '|' . $sMailtoPattern . '|' . $sPlaceholderPattern;
+			$sPattern = '/'.str_replace('/', '\/', $sPattern).'/i';
+			self::$aAttrsWhiteList['href'] = $sPattern;
+		}
+	}
+
 	public function LoadDoc($sHTML)
 	{
 		@$this->oDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sHTML); // For loading HTML chunks where the character set is not specified

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/legacy/querybuildercontextlegacy.class.inc.php

@@ -0,0 +1,107 @@
+<?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/>
+
+/**
+ * Associated with the metamodel -> MakeQuery/MakeQuerySingleTable
+ *
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class QueryBuilderContext
+{
+	protected $m_oRootFilter;
+	protected $m_aClassAliases;
+	protected $m_aTableAliases;
+	protected $m_aModifierProperties;
+	protected $m_aSelectedClasses;
+	protected $m_aFilteredTables;
+
+	public $m_oQBExpressions;
+
+	public function __construct($oFilter, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
+	{
+		$this->m_oRootFilter = $oFilter;
+		$this->m_oQBExpressions = new QueryBuilderExpressions($oFilter, $aGroupByExpr, $aSelectExpr);
+
+		$this->m_aClassAliases = $oFilter->GetJoinedClasses();
+		$this->m_aTableAliases = array();
+		$this->m_aFilteredTables = array();
+
+		$this->m_aModifierProperties = $aModifierProperties;
+		if (is_null($aSelectedClasses))
+		{
+			$this->m_aSelectedClasses = $oFilter->GetSelectedClasses();
+		}
+		else
+		{
+			// For the unions, the selected classes can be upper in the hierarchy (lowest common ancestor)
+			$this->m_aSelectedClasses = $aSelectedClasses;
+		}
+	}
+
+	public function GetRootFilter()
+	{
+		return $this->m_oRootFilter;
+	}
+
+	public function GenerateTableAlias($sNewName, $sRealName)
+	{
+		return MetaModel::GenerateUniqueAlias($this->m_aTableAliases, $sNewName, $sRealName);
+	}
+
+	public function GenerateClassAlias($sNewName, $sRealName)
+	{
+		return MetaModel::GenerateUniqueAlias($this->m_aClassAliases, $sNewName, $sRealName);
+	}
+
+	public function GetModifierProperties($sPluginClass)
+	{
+		if (array_key_exists($sPluginClass, $this->m_aModifierProperties))
+		{
+			return $this->m_aModifierProperties[$sPluginClass];
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	public function GetSelectedClass($sAlias)
+	{
+		return $this->m_aSelectedClasses[$sAlias];
+	}
+
+	public function AddFilteredTable($sTableAlias, $oCondition)
+	{
+		if (array_key_exists($sTableAlias, $this->m_aFilteredTables))
+		{
+			$this->m_aFilteredTables[$sTableAlias][] = $oCondition;
+		}
+		else
+		{
+			$this->m_aFilteredTables[$sTableAlias] = array($oCondition);
+		}
+	}
+
+	public function GetFilteredTables()
+	{
+		return $this->m_aFilteredTables;
+	}
+}
+

core/legacy/querybuilderexpressionslegacy.class.inc.php

@@ -0,0 +1,186 @@
+<?php
+
+class QueryBuilderExpressions
+{
+	/**
+	 * @var Expression
+	 */
+	protected $m_oConditionExpr;
+	/**
+	 * @var Expression[]
+	 */
+	protected $m_aSelectExpr;
+	/**
+	 * @var Expression[]
+	 */
+	protected $m_aGroupByExpr;
+	/**
+	 * @var Expression[]
+	 */
+	protected $m_aJoinFields;
+	/**
+	 * @var string[]
+	 */
+	protected $m_aClassIds;
+
+	public function __construct(DBObjectSearch $oSearch, $aGroupByExpr = null, $aSelectExpr = null)
+	{
+		$this->m_oConditionExpr = $oSearch->GetCriteria();
+		if (!$oSearch->GetShowObsoleteData())
+		{
+			foreach ($oSearch->GetSelectedClasses() as $sAlias => $sClass)
+			{
+				if (MetaModel::IsObsoletable($sClass))
+				{
+					$oNotObsolete = new BinaryExpression(new FieldExpression('obsolescence_flag', $sAlias), '=', new ScalarExpression(0));
+					$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oNotObsolete);
+				}
+			}
+		}
+		$this->m_aSelectExpr = is_null($aSelectExpr) ? array() : $aSelectExpr;
+		$this->m_aGroupByExpr = $aGroupByExpr;
+		$this->m_aJoinFields = array();
+
+		$this->m_aClassIds = array();
+		foreach ($oSearch->GetJoinedClasses() as $sClassAlias => $sClass)
+		{
+			$this->m_aClassIds[$sClassAlias] = new FieldExpression('id', $sClassAlias);
+		}
+	}
+
+	public function GetSelect()
+	{
+		return $this->m_aSelectExpr;
+	}
+
+	public function GetGroupBy()
+	{
+		return $this->m_aGroupByExpr;
+	}
+
+	public function GetCondition()
+	{
+		return $this->m_oConditionExpr;
+	}
+
+	/**
+	 * @return Expression|mixed
+	 */
+	public function PopJoinField()
+	{
+		return array_pop($this->m_aJoinFields);
+	}
+
+	/**
+	 * @param string $sAttAlias
+	 * @param Expression $oExpression
+	 */
+	public function AddSelect($sAttAlias, Expression $oExpression)
+	{
+		$this->m_aSelectExpr[$sAttAlias] = $oExpression;
+	}
+
+	/**
+	 * @param Expression $oExpression
+	 */
+	public function AddCondition(Expression $oExpression)
+	{
+		$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oExpression);
+	}
+
+	/**
+	 * @param Expression $oExpression
+	 */
+	public function PushJoinField(Expression $oExpression)
+	{
+		array_push($this->m_aJoinFields, $oExpression);
+	}
+
+	/**
+	 * Get tables representing the queried objects
+	 * Could be further optimized: when the first join is an outer join, then the rest can be omitted
+	 *
+	 * @param array $aTables
+	 *
+	 * @return array
+	 */
+	public function GetMandatoryTables(&$aTables = null)
+	{
+		if (is_null($aTables))
+		{
+			$aTables = array();
+		}
+
+		foreach ($this->m_aClassIds as $sClass => $oExpression)
+		{
+			$oExpression->CollectUsedParents($aTables);
+		}
+
+		return $aTables;
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		$this->m_oConditionExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		foreach ($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+		if ($this->m_aGroupByExpr)
+		{
+			foreach ($this->m_aGroupByExpr as $sColAlias => $oExpr)
+			{
+				$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+			}
+		}
+		foreach ($this->m_aJoinFields as $oExpression)
+		{
+			$oExpression->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$this->m_oConditionExpr = $this->m_oConditionExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		foreach ($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$this->m_aSelectExpr[$sColAlias] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		if ($this->m_aGroupByExpr)
+		{
+			foreach ($this->m_aGroupByExpr as $sColAlias => $oExpr)
+			{
+				$this->m_aGroupByExpr[$sColAlias] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+			}
+		}
+		foreach ($this->m_aJoinFields as $index => $oExpression)
+		{
+			$this->m_aJoinFields[$index] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+
+		foreach ($this->m_aClassIds as $sClass => $oExpression)
+		{
+			$this->m_aClassIds[$sClass] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oConditionExpr->RenameParam($sOldName, $sNewName);
+		foreach ($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$this->m_aSelectExpr[$sColAlias] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+		if ($this->m_aGroupByExpr)
+		{
+			foreach ($this->m_aGroupByExpr as $sColAlias => $oExpr)
+			{
+				$this->m_aGroupByExpr[$sColAlias] = $oExpr->RenameParam($sOldName, $sNewName);
+			}
+		}
+		foreach ($this->m_aJoinFields as $index => $oExpression)
+		{
+			$this->m_aJoinFields[$index] = $oExpression->RenameParam($sOldName, $sNewName);
+		}
+	}
+}

core/log.class.inc.php

@@ -547,7 +547,6 @@ class LogChannels
 	/**
 	 * @var string
 	 * @since 3.0.1 N°4849
-	 * @since 2.7.7 N°4635
 	 */
 	public const NOTIFICATIONS = 'notifications';
 
@@ -569,14 +568,6 @@ class LogChannels
 	public const INLINE_IMAGE = 'InlineImage';
 
 	public const PORTAL       = 'portal';
-
-	/**
-	 * @var string
-	 * @since 3.1.0 specific channel for event service
-	 */
-	public const EVENT_SERVICE = 'EventService';
-
-	public const DM_CRUD = 'DMCRUD';
 }
 
 
@@ -719,7 +710,6 @@ abstract class LogAPI
 	/**
 	 * @throws \ConfigException if log wrongly configured
 	 * @uses GetMinLogLevel
-	 * @since 3.0.0 N°3731
 	 */
 	final public static function IsLogLevelEnabled(string $sLevel, string $sChannel, string $sConfigKey = self::ENUM_CONFIG_PARAM_FILE): bool
 	{

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();
 
@@ -2763,96 +2762,25 @@ class FunctionExpression extends Expression
 				return $iRet;
 
 			case 'DATE_FORMAT':
-				if (count($this->m_aArgs) != 2) {
+				if (count($this->m_aArgs) != 2)
+				{
 					throw new \Exception("Function {$this->m_sVerb} requires 2 arguments");
 				}
 				$oDate = new DateTime($this->m_aArgs[0]->Evaluate($aArgs));
-				$sFormatForMysqlDateFormat = $this->m_aArgs[1]->Evaluate($aArgs);
-
-				if (preg_match('/%[fUuVX]/', $sFormatForMysqlDateFormat)) {
+				$sFormat = $this->m_aArgs[1]->Evaluate($aArgs);
+				$sFormat = str_replace(
+					array('%y', '%x', '%w', '%W', '%v', '%T', '%S', '%r', '%p', '%M', '%l', '%k', '%I', '%h', '%b', '%a', '%D', '%c', '%e', '%Y', '%d', '%m', '%H', '%i', '%s'),
+					array('y', 'o', 'w', 'l', 'W', 'H:i:s', 's', 'h:i:s A', 'A', 'F', 'g', 'H', 'h', 'h','M', 'D', 'jS', 'n', 'j', 'Y', 'd', 'm', 'H', 'i', 's'),
+					$sFormat);
+				if (preg_match('/%j/', $sFormat))
+				{
+					$sFormat = str_replace('%j', date_format($oDate, 'z') + 1, $sFormat);
+				}
+				if (preg_match('/%[fUuVX]/', $sFormat))
+				{
 					throw new NotYetEvaluatedExpression("Expression ".$this->RenderExpression().' cannot be evaluated (known limitation)');
 				}
-
-				if (preg_match('/%j/', $sFormatForMysqlDateFormat)) {
-					$sFormatForMysqlDateFormat = str_replace('%j', 'z', $sFormatForMysqlDateFormat);
-					$sRet = date_format($oDate, $sFormatForMysqlDateFormat);
-					$sRet++;
-					/** @noinspection PhpUnnecessaryLocalVariableInspection */
-					$sRet = str_pad($sRet, 3, '0', STR_PAD_LEFT);
-
-					return $sRet;
-				}
-
-				/**
-				 * @var string[] $aFormatsForMysqlDateFormat
-				 * @link https://dev.mysql.com/doc/refman/5.7/en/date-and-time-functions.html#function_date-format
-				 */
-				//@formatter:off we want to keep every single item on its own line to ease comp between MySQL and PHP formats !
-				$aFormatsForMysqlDateFormat = [
-					'%y',
-					'%x',
-					'%w',
-					'%W',
-					'%v',
-					'%T',
-					'%S',
-					'%r',
-					'%p',
-					'%M',
-					'%l',
-					'%k',
-					'%I',
-					'%h',
-					'%b',
-					'%a',
-					'%D',
-					'%c',
-					'%e',
-					'%Y',
-					'%d',
-					'%m',
-					'%H',
-					'%i',
-					'%s'
-				];
-				//@formatter:on
-				/**
-				 * @var string[] $aFormatsForPhpDateFormat
-				 * @link https://www.php.net/manual/en/datetime.format.php
-				 */
-				//@formatter:off we want to keep every single item on its own line to ease comp between MySQL and PHP formats !
-				$aFormatsForPhpDateFormat = [
-					'y',
-					'o',
-					'w',
-					'l',
-					'W',
-					'H:i:s',
-					's',
-					'h:i:s A',
-					'A',
-					'F',
-					'g',
-					'G',
-					'h',
-					'h',
-					'M',
-					'D',
-					'jS',
-					'n',
-					'j',
-					'Y',
-					'd',
-					'm',
-					'H',
-					'i',
-					's'
-				];
-				//@formatter:on
-				$sFormatForPhpDateFormat = str_replace($aFormatsForMysqlDateFormat, $aFormatsForPhpDateFormat, $sFormatForMysqlDateFormat);
-				/** @noinspection PhpUnnecessaryLocalVariableInspection */
-				$sRet = date_format($oDate, $sFormatForPhpDateFormat);
-
+				$sRet = date_format($oDate, $sFormat);
 				return $sRet;
 
 			case 'TO_DAYS':
@@ -3050,7 +2978,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'),
@@ -3059,7 +2988,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;
@@ -3067,15 +2996,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'),
@@ -3083,22 +3012,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

@@ -58,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/ormStyle.class.inc.php

@@ -50,7 +50,7 @@ class ormStyle
 	 */
 	public function HasMainColor(): bool
 	{
-		return utils::IsNotNullOrEmptyString($this->sMainColor);
+		return strlen($this->sMainColor) > 0;
 	}
 
 	/**
@@ -68,7 +68,7 @@ class ormStyle
 	 */
 	public function SetMainColor(?string $sMainColor)
 	{
-		$this->sMainColor = utils::IsNullOrEmptyString($sMainColor) ? null : $sMainColor;
+		$this->sMainColor = (strlen($sMainColor) === 0) ? null : $sMainColor;
 		return $this;
 	}
 
@@ -78,7 +78,7 @@ class ormStyle
 	 */
 	public function HasComplementaryColor(): bool
 	{
-		return utils::IsNotNullOrEmptyString($this->sComplementaryColor);
+		return strlen($this->sComplementaryColor) > 0;
 	}
 
 	/**
@@ -96,7 +96,7 @@ class ormStyle
 	 */
 	public function SetComplementaryColor(?string $sComplementaryColor)
 	{
-		$this->sComplementaryColor = utils::IsNullOrEmptyString($sComplementaryColor) ? null : $sComplementaryColor;
+		$this->sComplementaryColor = (strlen($sComplementaryColor) === 0) ? null : $sComplementaryColor;
 		return $this;
 	}
 
@@ -116,7 +116,7 @@ class ormStyle
 	 */
 	public function HasStyleClass(): bool
 	{
-		return utils::IsNotNullOrEmptyString($this->sStyleClass);
+		return strlen($this->sStyleClass) > 0;
 	}
 
 	/**
@@ -134,7 +134,7 @@ class ormStyle
 	 */
 	public function SetStyleClass(?string $sStyleClass)
 	{
-		$this->sStyleClass = utils::IsNullOrEmptyString($sStyleClass) ? null : $sStyleClass;
+		$this->sStyleClass = (strlen($sStyleClass) === 0) ? null : $sStyleClass;
 		return $this;
 	}
 
@@ -144,7 +144,7 @@ class ormStyle
 	 */
 	public function HasAltStyleClass(): bool
 	{
-		return utils::IsNotNullOrEmptyString($this->sAltStyleClass);
+		return strlen($this->sAltStyleClass) > 0;
 	}
 
 	/**
@@ -162,7 +162,7 @@ class ormStyle
 	 */
 	public function SetAltStyleClass(?string $sAltStyleClass)
 	{
-		$this->sAltStyleClass = utils::IsNullOrEmptyString($sAltStyleClass) ? null : $sAltStyleClass;
+		$this->sAltStyleClass = (strlen($sAltStyleClass) === 0) ? null : $sAltStyleClass;
 		return $this;
 	}
 
@@ -172,7 +172,7 @@ class ormStyle
 	 */
 	public function HasDecorationClasses(): bool
 	{
-		return utils::IsNotNullOrEmptyString($this->sDecorationClasses);
+		return strlen($this->sDecorationClasses) > 0;
 	}
 
 	/**
@@ -190,7 +190,7 @@ class ormStyle
 	 */
 	public function SetDecorationClasses(?string $sDecorationClasses)
 	{
-		$this->sDecorationClasses = utils::IsNullOrEmptyString($sDecorationClasses) ? null : $sDecorationClasses;
+		$this->sDecorationClasses = (strlen($sDecorationClasses) === 0) ? null : $sDecorationClasses;
 		return $this;
 	}
 
@@ -200,7 +200,7 @@ class ormStyle
 	 */
 	public function HasIcon(): bool
 	{
-		return utils::IsNotNullOrEmptyString($this->sIcon);
+		return strlen($this->sIcon) > 0;
 	}
 
 	/**
@@ -210,7 +210,7 @@ class ormStyle
 	 */
 	public function SetIcon(?string $sIcon)
 	{
-		$this->sIcon = utils::IsNullOrEmptyString($sIcon) ? null : $sIcon;
+		$this->sIcon = (strlen($sIcon) === 0) ? null : $sIcon;
 		return $this;
 	}
 

core/ormcaselog.class.inc.php

@@ -155,7 +155,7 @@ class ormCaseLog {
 					break;
 
 				case static::ENUM_FORMAT_HTML:
-					$sHtmlEntry = InlineImage::FixUrls($sTextEntry);
+					$sHtmlEntry = $sTextEntry;
 					$sTextEntry = utils::HtmlToText($sHtmlEntry);
 					break;
 			}
@@ -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 = $sRaw;
+			}
+			break;
 		}
 		return $sRes;
 	}
@@ -734,6 +758,6 @@ class ormCaseLog {
 		}
 		$iPos += $this->m_aIndex[$index]['separator_length'];
 		$sText = substr($this->m_sLog, $iPos, $this->m_aIndex[$index]['text_length']);
-		return InlineImage::FixUrls($sText);
+		return $sText;
 	}
 }

core/ormdocument.class.inc.php

@@ -25,9 +25,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Service\EventData;
-use Combodo\iTop\Service\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_SERVICE_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();
 
@@ -608,32 +606,16 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		$aAdded = $this->aAdded;
 		$aModified = $this->aModified;
 		$aRemoved = array();
-		if (count($this->aRemoved) > 0) {
+		if (count($this->aRemoved) > 0)
+		{
 			$oSearch = new DBObjectSearch($this->sClass);
 			$oSearch->AddCondition('id', $this->aRemoved, 'IN');
 			$oSet = new DBObjectSet($oSearch);
 			$aRemoved = $oSet->ToArray();
 		}
-
 		return array_merge($aAdded, $aModified, $aRemoved);
 	}
 
-	/**
-	 * Get the list of all modified (added, modified and removed) links
-	 *
-	 * @return array of link objects
-	 * @throws \Exception
-	 */
-	public function GetModified($sExtKeyToMe)
-	{
-		$aModified = [];
-		foreach ($this->aModified as $oObj) {
-			$aModified[$oObj->GetKey()] = $oObj->Get($sExtKeyToMe);
-		}
-
-		return $aModified;
-	}
-
 	/**
 	 * @param DBObject $oHostObject
 	 *
@@ -677,7 +659,8 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		{
 			$aCheckLinks[] = $iLinkId;
 		}
-		foreach ($this->aModified as $iLinkId => $oLink) {
+		foreach ($this->aModified as $iLinkId => $oLink)
+		{
 			$aCheckLinks[] = $oLink->GetKey();
 		}
 
@@ -713,7 +696,8 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 
 		// Write the links according to the existing links
 		//
-		foreach ($this->aAdded as $oLink) {
+		foreach ($this->aAdded as $oLink)
+		{
 			// Make sure that the objects in the set point to "this"
 			$oLink->Set($sExtKeyToMe, $oHostObject->GetKey());
 
@@ -749,7 +733,6 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 					$oLink->DBClone();
 				}
 			}
-			$oLink->SetLinkHostObject($oHostObject);
 			$oLink->DBWrite();
 
 			$this->aPreserved[$oLink->GetKey()] = $oLink;

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/pdfbulkexport.class.inc.php

@@ -62,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>'));
 
@@ -75,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
@@ -84,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);
@@ -93,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());

core/simplegraph.class.inc.php

@@ -745,30 +745,26 @@ class RelationTypeIterator implements Iterator
 		}
 	}
 	
-	public function rewind(): void
+	public function rewind()
 	{
 		$this->iCurrentIdx = 0;
 	}
 	
-	public function valid(): bool
+	public function valid()
 	{
 		return array_key_exists($this->iCurrentIdx, $this->aList);
 	}
 	
-	public function next(): void
+	public function next()
 	{
 		$this->iCurrentIdx++;
 	}
 	
-	// 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()
 	{
 		return $this->aList[$this->iCurrentIdx];
 	}
 	
-	// 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->iCurrentIdx;

core/spreadsheetbulkexport.class.inc.php

@@ -73,8 +73,8 @@ class SpreadsheetBulkExport 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), "spreadsheet_date_format_radio", "default", "spreadsheet_date_time_format_default", "radio");
 				$oRadioDefault->GetInput()->SetIsChecked(($sDateTimeFormat == (string)AttributeDateTime::GetFormat()));
 				$oRadioDefault->GetInput()->AddCSSClass('ibo-input-checkbox');
@@ -82,7 +82,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
 				$oFieldSetDate->AddSubBlock($oRadioDefault);
 				$oFieldSetDate->AddSubBlock(new Html('</br>'));
 
-				$sFormatInput = '<input type="text" size="15" name="date_format" id="spreadsheet_custom_date_time_format" title="" value="'.utils::EscapeHtml($sDateTimeFormat).'"/>';
+				$sFormatInput = '<input type="text" size="15" name="date_format" id="spreadsheet_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "spreadsheet_date_format_radio", "custom", "spreadsheet_date_time_format_custom", "radio");
 				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
@@ -140,8 +140,7 @@ EOF
 			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);
@@ -159,13 +158,19 @@ EOF
 			default:
 				$value = $oObj->Get($sAttCode);
 				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
-				if ($value instanceof ormCaseLog) {
-					$sRet = str_replace("\n", "<br/>", utils::EscapeHtml($value->__toString()));
-				} elseif ($value instanceof ormStopWatch) {
+				if ($value instanceof ormCaseLog)
+				{
+					$sRet = str_replace("\n", "<br/>", htmlentities($value->__toString(), ENT_QUOTES, 'UTF-8'));
+				}
+				elseif ($value instanceof ormStopWatch)
+				{
 					$sRet = $value->GetTimeSpent();
-				} elseif ($value instanceof ormDocument) {
+				}
+				elseif ($value instanceof ormDocument)
+				{
 					$sRet = '';
-				} elseif ($oAttDef instanceof AttributeText)
+				}
+				elseif ($oAttDef instanceof AttributeText)
 				{
 					if ($bFormattedText)
 					{
@@ -186,11 +191,15 @@ EOF
 					// Stick to the weird implementation made in GetNextChunk
 					$sRet = utils::TextToHtml($oObj->GetEditValue($sAttCode));
 				}
-				else {
-					if ($this->bLocalizeOutput) {
-						$sRet = utils::EscapeHtml($oObj->GetEditValue());
-					} else {
-						$sRet = utils::EscapeHtml((string)$value);
+				else
+				{
+					if ($this->bLocalizeOutput)
+					{
+						$sRet = htmlentities($oObj->GetEditValue(), ENT_QUOTES, 'UTF-8');
+					}
+					else
+					{
+						$sRet = htmlentities((string)$value, ENT_QUOTES, 'UTF-8');
 					}
 				}
 		}
@@ -305,16 +314,22 @@ EOF
 							$sData .= "<td>$sDate</td>";
 							$sData .= "<td>$sTime</td>";
 						}
-						else if (get_class($oFinalAttDef) == 'AttributeDate') {
+						else if (get_class($oFinalAttDef) == 'AttributeDate')
+						{
 							$sDate = $oDateFormat->Format($oObj->Get($sAttCode));
 							$sData .= "<td>$sDate</td>";
-						} else if ($oAttDef instanceof AttributeCaseLog) {
+						}
+						else if($oAttDef instanceof AttributeCaseLog)
+						{
 							$rawValue = $oObj->Get($sAttCode);
-							$sField = str_replace("\n", "<br/>", utils::EscapeHtml($rawValue->__toString()));
+							$sField = str_replace("\n", "<br/>", htmlentities($rawValue->__toString(), ENT_QUOTES, 'UTF-8'));
 							// Trick for Excel: treat the content as text even if it begins with an equal sign
 							$sData .= "<td x:str>$sField</td>";
-						} elseif ($oAttDef instanceof AttributeText) {
-							if ($bFormattedText) {
+						}
+						elseif ($oAttDef instanceof AttributeText)
+						{
+							if ($bFormattedText)
+							{
 								// Replace paragraphs (<p...>...</p>, etc) by line breaks (<br/>) since Excel (pre-2016) splits the cells when there is a paragraph
 								$sField = static::HtmlToSpreadsheet($oObj->GetAsHTML($sAttCode));
 							}
@@ -341,12 +356,16 @@ EOF
 							$sField = utils::HtmlEntities($oObj->GetAsCSV($sAttCode, $this->bLocalizeOutput, ''));
 							$sData .= "<td x:str>$sField</td>";
 						}
-						else {
+						else
+						{
 							$rawValue = $oObj->Get($sAttCode);
-							if ($this->bLocalizeOutput) {
-								$sField = utils::EscapeHtml($oFinalAttDef->GetEditValue($rawValue));
-							} else {
-								$sField = utils::EscapeHtml($rawValue);
+							if ($this->bLocalizeOutput)
+							{
+								$sField = htmlentities($oFinalAttDef->GetEditValue($rawValue), ENT_QUOTES, 'UTF-8');
+							}
+							else
+							{
+								$sField = htmlentities($rawValue, ENT_QUOTES, 'UTF-8');
 							}
 							$sData .= "<td>$sField</td>";
 						}

core/userrights.class.inc.php

@@ -19,7 +19,7 @@ define('UR_ACTION_CREATE', 7); // Instantiate an object
 define('UR_ACTION_APPLICATION_DEFINED', 10000); // Application specific actions (CSV import, View schema...)
 
 /**
- * User management module API
+ * User management module API  
  *
  * @package     iTopORM
  */
@@ -139,7 +139,7 @@ abstract class UserRightsAddOnAPI
 		$oExpression = new FieldExpression($sAttCode, $sClass);
 		$oFilter  = new DBObjectSearch($sClass);
 		$oListExpr = ListExpression::FromScalars($aAllowedOrgs);
-
+		
 		$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
 		$oFilter->AddConditionExpression($oCondition);
 
@@ -156,7 +156,7 @@ abstract class UserRightsAddOnAPI
 				$oShareSearch = new DBObjectSearch('SharedObject');
 				$oOrgField = new FieldExpression('org_id', 'SharedObject');
 				$oShareSearch->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
-
+	
 				$oSearchSharers = new DBObjectSearch('Organization');
 				$oSearchSharers->AllowAllData();
 				$oSearchSharers->AddCondition_ReferencedBy($oShareSearch, 'sharing_org_id');
@@ -172,16 +172,16 @@ abstract class UserRightsAddOnAPI
 					$oFilter->MergeConditionExpression(new BinaryExpression($oExpression, 'IN', $oSharersList));
 				}
 			}
-
+	
 			$aShareProperties = SharedObject::GetSharedClassProperties($sClass);
 			if ($aShareProperties)
 			{
 				$sShareClass = $aShareProperties['share_class'];
 				$sShareAttCode = $aShareProperties['attcode'];
-
+	
 				$oSearchShares = new DBObjectSearch($sShareClass);
 				$oSearchShares->AllowAllData();
-
+	
 				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
 				$oOrgField = new FieldExpression('org_id', $sShareClass);
 				$oSearchShares->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
@@ -217,12 +217,11 @@ abstract class User extends cmdbAbstractObject
 			"category" => "core,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "login",
-			"state_attcode" => "status",
+			"state_attcode" => "",
 			"reconc_keys" => array(),
 			"db_table" => "priv_user",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"style" =>  new ormStyle("ibo-dm-class--User", "ibo-dm-class-alt--User", "var(--ibo-dm-class--User--main-color)", "var(--ibo-dm-class--User--complementary-color)", null, "itop-structure/../../images/icons/icons8-security-pass.svg"),
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -236,8 +235,8 @@ abstract class User extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("login", array("allowed_values"=>null, "sql"=>"login", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
 		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>"EN US", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values" => new ValueSetEnum('enabled,disabled'), "styled_values"=>['enabled' =>  new ormStyle('ibo-dm-enum--User-status-enabled', 'ibo-dm-enum-alt--User-status-enabled', 'var(--ibo-dm-enum--User-status-enabled--main-color)', 'var(--ibo-dm-enum--User-status-enabled--complementary-color)', null, null),'disabled' =>  new ormStyle('ibo-dm-enum--User-status-disabled', 'ibo-dm-enum-alt--User-status-disabled', 'var(--ibo-dm-enum--User-status-disabled--main-color)', 'var(--ibo-dm-enum--User-status-disabled--complementary-color)', null, null)], "sql"=>"status", "default_value"=>"enabled", "is_null_allowed"=>false, "depends_on"=>array())));
-
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values" => new ValueSetEnum('enabled,disabled'), "sql"=>"status", "default_value"=>"enabled", "is_null_allowed"=>false, "depends_on"=>array())));
+		
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"profileid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class"=>"URP_UserOrg", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"allowed_org_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
 
@@ -505,7 +504,7 @@ abstract class User extends cmdbAbstractObject
 			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 	}
-
+	
 	function DoShowGrantSumary($oPage, $sClassCategory)
 	{
 		if (UserRights::IsAdministrator($this))
@@ -528,7 +527,7 @@ abstract class User extends cmdbAbstractObject
 				{
 					if (UserRights::IsStimulusAllowed($sClass, $sStimulusCode, null, $this))
 					{
-						$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);
@@ -537,7 +536,7 @@ abstract class User extends cmdbAbstractObject
 			{
 				$sStimuli = '<em title="'.Dict::S('UI:UserManagement:NoLifeCycleApplicable+').'">'.Dict::S('UI:UserManagement:NoLifeCycleApplicable').'</em>';
 			}
-
+			
 			$aDisplayData[] = array(
 				'class' => MetaModel::GetName($sClass),
 				'read' => $this->GetGrantAsHtml($sClass, UR_ACTION_READ),
@@ -551,7 +550,7 @@ abstract class User extends cmdbAbstractObject
 		}
 
 		$oKPI->ComputeAndReport('Computation of user rights');
-
+	
 		$aDisplayConfig = array();
 		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
 		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
@@ -586,7 +585,7 @@ abstract class User extends cmdbAbstractObject
 
 		}
 	}
-
+	
   	public function CheckToDelete(&$oDeletionPlan)
   	{
   		if (MetaModel::GetConfig()->Get('demo_mode'))
@@ -598,8 +597,8 @@ abstract class User extends cmdbAbstractObject
 			return false;
 		}
 		return parent::CheckToDelete($oDeletionPlan);
-  	}
-
+  	} 
+	
 	protected function DBDeleteSingleObject()
 	{
 		if (MetaModel::GetConfig()->Get('demo_mode'))
@@ -634,7 +633,7 @@ abstract class User extends cmdbAbstractObject
  */
 abstract class UserInternal extends User
 {
-	// Nothing special, just a base class to categorize this type of authenticated users
+	// Nothing special, just a base class to categorize this type of authenticated users	
 	public static function Init()
 	{
 		$aParams = array
@@ -663,15 +662,15 @@ abstract class UserInternal extends User
 
 	/**
 	 * Use with care!
-	 */
+	 */	 	
 	public function SetPassword($sNewPassword)
 	{
 	}
 
 	/**
-	 * The email recipient is the person who is allowed to regain control when the password gets lost
+	 * The email recipient is the person who is allowed to regain control when the password gets lost	
 	 * Throws an exception if the feature cannot be available
-	 */
+	 */	
 	public function GetResetPasswordEmail()
 	{
 		if (!MetaModel::IsValidAttCode(get_class($this), 'contactid'))
@@ -704,7 +703,7 @@ abstract class UserInternal extends User
 }
 
 /**
- * Self register extension
+ * Self register extension  
  *
  * @package     iTopORM
  */
@@ -720,10 +719,10 @@ interface iSelfRegister
 	 * @return bool true if the user is a valid one, false otherwise
 	 */
 	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
-
+	
 	/**
 	 * Called after the user has been authenticated and found in iTop. This method can
-	 * Update the user's definition on the fly (profiles...) to keep it in sync with an external source
+	 * Update the user's definition on the fly (profiles...) to keep it in sync with an external source 
 	 * @param User $oUser The user to update/synchronize
 	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
 	 * @param string $sAuthentication The authentication method used
@@ -733,7 +732,7 @@ interface iSelfRegister
 }
 
 /**
- * User management core API
+ * User management core API  
  *
  * @package     iTopORM
  */
@@ -831,7 +830,7 @@ class UserRights
 		else
 		{
 			return true;
-		}
+		}	
 	}
 
 	/**
@@ -1054,11 +1053,6 @@ class UserRights
 				Dict::SetUserLanguage(self::GetUserLanguage());
 				Session::Set('impersonate_user', $sLogin);
 				self::_ResetSessionCache();
-
-				//N°5135 - Impersonate: history of changes versus log entries
-				//track impersonation inside changelogs
-				CMDBObject::SetTrackUserId(null);
-				CMDBObject::CreateChange();
 			}
 		}
 		return $bRet;
@@ -1072,15 +1066,9 @@ class UserRights
 		if (!is_null(self::$m_oRealUser))
 		{
 			self::$m_oUser = self::$m_oRealUser;
-			//N°5135 - fix IsImpersonated() after calling Deimpersonate()
-			self::$m_oRealUser = null;
 			Dict::SetUserLanguage(self::GetUserLanguage());
 			Session::Unset('impersonate_user');
 			self::_ResetSessionCache();
-
-			//N°5135 - Impersonate: history of changes versus log entries
-			//stop tracking impersonation inside changelogs
-			CMDBObject::CreateChange();
 		}
 	}
 
@@ -1148,7 +1136,7 @@ class UserRights
 		if (is_null(self::$m_oUser))
 		{
 			return 'EN US';
-
+		
 		}
 		else
 		{
@@ -1495,7 +1483,7 @@ class UserRights
 	{
 		if (!self::IsLoggedIn())
 		{
-			//throw new UserRightException('No user logged in', array());
+			//throw new UserRightException('No user logged in', array());	
 			return false;
 		}
 		return true;
@@ -1883,7 +1871,7 @@ class UserRights
 					case 'internal':
 					$sBaseClass = 'UserInternal';
 					break;
-
+					
 					default:
 					echo "<p>sAuthentication = $sAuthentication</p>\n";
 					assert(false); // should never happen
@@ -1948,7 +1936,7 @@ class UserRights
 		Session::Unset('profile_list');
 		Session::Unset('archive_allowed');
 	}
-
+	
 	/**
 	 * Fake error handler to silently discard fatal errors
 	 * @param int $iErrNo
@@ -1980,7 +1968,7 @@ class ActionChecker
 	var $iActionCode;
 	var $iAllowedCount = null;
 	var $aAllowedIDs = null;
-
+	
 	public function __construct(DBSearch $oFilter, $iActionCode)
 	{
 		$this->oFilter = $oFilter;
@@ -1988,7 +1976,7 @@ class ActionChecker
 		$this->iAllowedCount = null;
 		$this->aAllowedIDs = null;
 	}
-
+	
 	/**
 	 * returns the number of objects for which the action is allowed
 	 * @return integer The number of "allowed" objects 0..N
@@ -1998,7 +1986,7 @@ class ActionChecker
 		if ($this->iAllowedCount == null) $this->CheckObjects();
 		return $this->iAllowedCount;
 	}
-
+	
 	/**
 	 * If IsAllowed returned UR_ALLOWED_DEPENDS, this methods returns
 	 * an array of ObjKey => Status (true|false)
@@ -2009,7 +1997,7 @@ class ActionChecker
 		if ($this->aAllowedIDs == null) $this->IsAllowed();
 		return $this->aAllowedIDs;
 	}
-
+	
 	/**
 	 * Check if the speficied stimulus is allowed for the set of objects
 	 * @return UR_ALLOWED_YES, UR_ALLOWED_NO or UR_ALLOWED_DEPENDS
@@ -2060,7 +2048,7 @@ class ActionChecker
 class StimulusChecker extends ActionChecker
 {
 	var $sState = null;
-
+	
 	public function __construct(DBSearch $oFilter, $sState, $iStimulusCode)
 	{
 		parent::__construct($oFilter, $iStimulusCode);
@@ -2075,7 +2063,7 @@ class StimulusChecker extends ActionChecker
 	{
 		$sClass = $this->oFilter->GetClass();
 		if (MetaModel::IsAbstract($sClass)) return UR_ALLOWED_NO; // Safeguard, not implemented if the base class of the set is abstract !
-
+		
 		$oSet = new DBObjectSet($this->oFilter);
 		$iActionAllowed = UserRights::IsStimulusAllowed($sClass,  $this->iActionCode, $oSet);
 		if ($iActionAllowed == UR_ALLOWED_NO)
@@ -2087,7 +2075,7 @@ class StimulusChecker extends ActionChecker
 		{
 			// Hmmm, may not be needed right now because we limit the "multiple" action to object in
 			// the same state... may be useful later on if we want to extend this behavior...
-
+			
 			// Check for each object if the action is allowed or not
 			$this->aAllowedIDs = array();
 			$oSet->Rewind();
@@ -2112,15 +2100,15 @@ class StimulusChecker extends ActionChecker
 						$this->aAllowedIDs[$oObj->GetKey()] = true;
 						$this->iState = $oObj->GetState();
 						$this->iAllowedCount++;
-					}
+					}					
 				}
 				else
 				{
-					$this->aAllowedIDs[$oObj->GetKey()] = false;
-				}
+					$this->aAllowedIDs[$oObj->GetKey()] = false;					
+				}				
 			}
 		}
-
+		
 		if ($this->iAllowedCount == $oSet->Count())
 		{
 			$iActionAllowed = UR_ALLOWED_YES;
@@ -2132,9 +2120,9 @@ class StimulusChecker extends ActionChecker
 
 		return $iActionAllowed;
 	}
-
+	
 	public function GetState()
 	{
 		return $this->iState;
-	}
+	}		
 }

css/backoffice/README.md

@@ -49,10 +49,6 @@ css/backoffice/
 |   |- tabular-fields
 |   ...
 |
-|- *datamodel/           # SCSS / CSS3 variables and CSS classes for PHP classes of the DM that are part of the core (not in a module) and cannot be styled otherwise
-|   |- _user.scss
-|   ...
-|
 |– pages/
 |   |– _home.scss        # Home specific styles
 |   |– _contact.scss     # Contact specific styles

css/backoffice/_shame.scss

@@ -43,3 +43,23 @@
 .ibo-svg-illustration--container > svg *[fill="#6c63ff"]{
 	fill: $ibo-svg-illustration--fill;
 }
+
+// N°4481 - Restore HTML tables style identical between edition and visualization
+// This is a hack to compensate missing variables in the bulma lib, PR has been made here: https://github.com/jgthms/bulma/pull/3455
+// The following can't be reset to it's original value (from the browser stylesheet), so we have to hardcode it even though it might change in future browser versions...
+.ibo-is-html-content table {
+  &:not(:last-child) {
+    margin-bottom: 0;
+  }
+
+  tbody {
+    tr {
+      &:last-child {
+        td,
+        th {
+          border-bottom-width: 1px;
+        }
+      }
+    }
+  }
+}

css/backoffice/components/_datatable.scss

@@ -119,33 +119,10 @@ $ibo-fieldsorter--selected--background-color: $ibo-color-blue-200 !default;
     &.selected {
       background-color: $ibo-datatable--row--background-color--is-selected;
     }
-
-    .ibo-datatable--row-actions-toolbar{
-      justify-content: end;
-    }
   }
 }
 
 .ibo-datatable--selected-count, .ibo-datatable--result-count{
   padding-right: 0.2em;
   padding-left: 0.1em;
-}
-
-//
-.ibo-datatable[data-status="loading"]{
-  margin-top: $ibo-datatable--toolbar--table-spacing;
-  td, th {
-    position: relative;
-    padding: $ibo-vendors-datatables--cell--padding-y $ibo-vendors-datatables--cell--padding-x;
-  }
-  td{
-    @extend %ibo-font-ral-med-100;
-  }
-  tr:nth-child(even){
-    background-color: $ibo-vendors-datatables--row--background-color--is-even;
-  }
-  th {
-     @extend %ibo-font-ral-sembol-100;
-    border-bottom: $ibo-vendors-datatables--columns-header--border-bottom;
-   }
 }

css/backoffice/components/_field.scss

@@ -101,7 +101,7 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
 
   /* N°4318 - Visible scrollbar background for large fields overflowing to ease "limits" visualization by the user */
   .ibo-field--value > * {
-    --ibo-scrollbar--scrollbar-track-background-color: #{$ibo-field--value--scrollbar-track-background-color};
+    --ibo-scrollbar--scrollbar-track-background-color: $ibo-field--value--scrollbar-track-background-color;
   }
 
   /* Fullscreen mode */

css/backoffice/components/_panel.scss

@@ -89,7 +89,7 @@ $ibo-panel--collapsible-toggler--color: $ibo-color-grey-700 !default;
 
 
 .ibo-panel {
-  --ibo-main-color: #{map-get($ibo-panel-colors, 'neutral')}; /* --ibo-main-color is to allow overload from custom dynamic value from the DM. The overload will be done through an additional CSS class of a particular DM class or DM attribute */
+  --ibo-main-color: map-get($ibo-panel-colors, 'neutral'); /* --ibo-main-color is to allow overload from custom dynamic value from the DM. The overload will be done through an additional CSS class of a particular DM class or DM attribute */
 
   position: relative;
 

css/backoffice/components/_pill.scss

@@ -79,8 +79,8 @@ $ibo-pill-states-colors: (
 /* Rules */
 .ibo-pill {
   /* --ibo-main-color-xxx is to allow overload from custom dynamic value from the DM. The overload will be done through an additional CSS class of a particular DM class or DM attribute */
-  --ibo-main-color--100: #{map-get(map-get($ibo-pill-states-colors, 'neutral'), 'primary-color')};
-  --ibo-main-color--900: #{map-get(map-get($ibo-pill-states-colors, 'neutral'), 'secondary-color')};
+  --ibo-main-color--100: map-get(map-get($ibo-pill-states-colors, 'neutral'), 'primary-color');
+  --ibo-main-color--900: map-get(map-get($ibo-pill-states-colors, 'neutral'), 'secondary-color');
 
   @extend %ibo-fully-centered-content;
   max-width: $ibo-pill--max-width;

css/backoffice/components/_quick-create.scss

@@ -235,7 +235,7 @@ $ibo-quick-create--compartment--placeholder-hint--text-color: $ibo-color-grey-70
 	}
 	&:hover{
 		cursor: pointer;
-		@extend a;
+		@extend a:hover;
 	}
 
 	.highlight{

css/backoffice/components/input/_input-one-way-password.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/backoffice/datamodel/_all.scss

@@ -1,12 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2021 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**************************************************************************************************************************/
-/* SCSS / CSS3 variables and CSS classes are based on what the compiler generates and will be used across the application */
-/* In case you doubt what to put here, check the "env-xxx/branding/themes/datamodel-compiled-scss-rules.scss" file to     */
-/* to see what the compiler generates for XML DM classes.                                                                 */
-/**************************************************************************************************************************/
-
-@import "user";

css/backoffice/datamodel/_user.scss

@@ -1,64 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2021 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Class itself
-$ibo-dm-class--User--main-color: $ibo-color-blue-grey-600 !default;
-$ibo-dm-class--User--complementary-color: $ibo-color-white-100 !default;
-
-:root {
-  --ibo-dm-class--User--main-color: #{$ibo-dm-class--User--main-color};
-  --ibo-dm-class--User--complementary-color: #{$ibo-dm-class--User--complementary-color};
-}
-
-.ibo-dm-class--User {
-  --ibo-main-color:  #{$ibo-dm-class--User--main-color};
-  --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-class--User--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
-  --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-class--User--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
-  --ibo-complementary-color:  #{$ibo-dm-class--User--complementary-color};
-}
-.ibo-dm-class-alt--User {
-  --ibo-main-color:  #{$ibo-dm-class--User--complementary-color};
-  --ibo-complementary-color: #{$ibo-dm-class--User--main-color};
-}
-
-// State attribute, "enabled" value
-$ibo-dm-enum--User-status-enabled--main-color: $ibo-lifecycle-active-state-primary-color !default;
-$ibo-dm-enum--User-status-enabled--complementary-color: $ibo-lifecycle-active-state-secondary-color !default;
-
-:root {
-  --ibo-dm-enum--User-status-enabled--main-color: #{$ibo-dm-enum--User-status-enabled--main-color};
-  --ibo-dm-enum--User-status-enabled--complementary-color: #{$ibo-dm-enum--User-status-enabled--complementary-color};
-}
-
-.ibo-dm-enum--User-status-enabled {
-  --ibo-main-color:  #{$ibo-dm-enum--User-status-enabled--main-color};
-  --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--User-status-enabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
-  --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--User-status-enabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
-  --ibo-complementary-color:  #{$ibo-dm-enum--User-status-enabled--complementary-color};
-}
-.ibo-dm-enum-alt--User-status-enabled {
-  --ibo-main-color:  #{$ibo-dm-enum--User-status-enabled--complementary-color};
-  --ibo-complementary-color: #{$ibo-dm-enum--User-status-enabled--main-color};
-}
-
-// State attribute, "disabled" value
-$ibo-dm-enum--User-status-disabled--main-color: $ibo-lifecycle-inactive-state-primary-color !default;
-$ibo-dm-enum--User-status-disabled--complementary-color: $ibo-lifecycle-inactive-state-secondary-color !default;
-
-:root {
-  --ibo-dm-enum--User-status-disabled--main-color: #{$ibo-dm-enum--User-status-disabled--main-color};
-  --ibo-dm-enum--User-status-disabled--complementary-color: #{$ibo-dm-enum--User-status-disabled--complementary-color};
-}
-
-.ibo-dm-enum--User-status-disabled {
-  --ibo-main-color:  #{$ibo-dm-enum--User-status-disabled--main-color};
-  --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--User-status-disabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
-  --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--User-status-disabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
-  --ibo-complementary-color:  #{$ibo-dm-enum--User-status-disabled--complementary-color};
-}
-.ibo-dm-enum-alt--User-status-disabled {
-  --ibo-main-color:  #{$ibo-dm-enum--User-status-disabled--complementary-color};
-  --ibo-complementary-color: #{$ibo-dm-enum--User-status-disabled--main-color};
-}

css/backoffice/layout/tab-container/_tab-container.scss

@@ -118,14 +118,13 @@ $ibo-tab-container--tab-container--last--min-height: 60vh !default;
 }
 
 .ibo-tab-container--extra-tabs-list {
-  position: fixed;
-  z-index: 10; /* To be above linkedset datatables */
-  /* top: Must be computed on menu opening, if set back to absolute, value must be calc(100% + 6px); */
-  /* right: Must be computed on menu opening, if set back to absolute, value must be 12px; */
+  position: absolute;
+  z-index: 1;
+  top: calc(100% + 6px);
+  right: 12px;
   max-height: $ibo-tab-container--extra-tabs-list--max-height;
   display: flex;
   flex-direction: column;
-  overflow-y: auto;
 
   background-color: $ibo-tab-container--extra-tabs-list--background-color;
   border-radius: $ibo-tab-container--extra-tabs-list--border-radius;
@@ -137,9 +136,7 @@ $ibo-tab-container--tab-container--last--min-height: 60vh !default;
   max-width: $ibo-tab-container--extra-tab-toggler--max-width;
 
   color: $ibo-tab-container--extra-tab-toggler--text-color;
-
   @extend %ibo-text-truncated-with-ellipsis;
-  overflow-x: clip; /* For unknown reason yet, this is necessary otherwise the element will have almost no height */
 
   &:hover,
   &:active {

css/backoffice/main.scss

@@ -9,7 +9,6 @@
 @import "components/all";
 @import "layout/all";
 @import "application/all";
-@import "datamodel/all";
 @import "pages/all";
 @import "blocks-integrations/all";
 @import "themes/all";

css/backoffice/pages/_all.scss

@@ -14,5 +14,4 @@
 @import "csv-import";
 @import "global-search";
 @import "run-query";
-@import "welcome-popup";
-@import "oauth.wizard";
+@import "welcome-popup";

css/backoffice/pages/_csv-import.scss

@@ -27,6 +27,11 @@ tr.ibo-csv-import--row-unchanged td {
   border-bottom: 1px $ibo-color-grey-400 solid;
 }
 
+.wizContainer table tr.ibo-csv-import--row-error td {
+  border-bottom: 1px $ibo-color-grey-400 solid;
+  background-color: $ibo-color-red-200;
+}
+
 tr.ibo-csv-import--row-modified td {
   border-bottom: 1px $ibo-color-grey-400 solid;
 }
@@ -39,4 +44,4 @@ tr.ibo-csv-import--row-added td {
   font-size: 4em;
   color: $ibo-color-primary-400;
   margin: 20px;
-}
+}