N°6218 - 1:n & n:n - Read mode: No refresh of tab count on Add/Remove in pop-up

- New CombodoJsActivity API
- Replace existing calls in NiceWebPage (ready scripts)
- Add calls in ready block in portal object create template (used in both create and edit)

.gitignore

@@ -37,7 +37,9 @@ tests/*/vendor/*
 
 # iTop extensions
 /extensions/**
+!/extensions/.htaccess
 !/extensions/readme.txt
+!/extensions/web.config
 
 # all logs but listing prevention
 /log/**
@@ -45,8 +47,10 @@ tests/*/vendor/*
 !/log/index.php
 !/log/web.config
 
-# PHPUnit cache file
+# PHPUnit: Cache file, local XML working copies
 /tests/php-unit-tests/.phpunit.result.cache
+/tests/php-unit-tests/phpunit.xml
+/tests/php-unit-tests/postbuild_integration.xml
 
 
 # Jetbrains

addons/userrights/userrightsprofile.class.inc.php

@@ -228,7 +228,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table"            => "priv_urp_userprofile",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
-			"is_link" 			  => true, /** @since 3.1.0 N°6482 N°5324 */
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
 			'uniqueness_rules'    => array(
 				'no_duplicate' => array(
 					'attributes'  => array(
@@ -446,6 +446,12 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		UR_ACTION_BULK_DELETE => 'bd',
 	);
 
+    /**
+     * @var array $aUsersProfilesList Cache of users' profiles. Hash array of user ID => [profile ID => profile friendlyname, profile ID => profile friendlyname, ...]
+     * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6887
+     */
+	private $aUsersProfilesList = [];
+
 	// Installation: create the very first user
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
@@ -502,6 +508,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	}
 
 	protected $m_aUserOrgs = array(); // userid -> array of orgid
+	protected $m_aAdministrators = null; // [user id]
 
 	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
 	protected $m_aObjectActionGrants = array();
@@ -558,6 +565,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 		// Cache
 		$this->m_aObjectActionGrants = array();
+		$this->m_aAdministrators = null;
 	}
 
 	public function LoadCache()
@@ -700,12 +708,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	private function GetAdministrators()
 	{
-		static $aAdministrators = null;
-
-		if ($aAdministrators === null)
+		if ($this->m_aAdministrators === null)
 		{
 			// Find all administrators
-			$aAdministrators = array();
+			$this->m_aAdministrators = array();
 			$oAdministratorsFilter = new DBObjectSearch('User');
 			$oLnkFilter = new DBObjectSearch('URP_UserProfile');
 			$oExpression = new FieldExpression('profileid', 'URP_UserProfile');
@@ -718,10 +724,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oSet->OptimizeColumnLoad(array('User' => array('login')));
 			while($oUser = $oSet->Fetch())
 			{
-				$aAdministrators[] = $oUser->GetKey();
+				$this->m_aAdministrators[] = $oUser->GetKey();
 			}
 		}
-		return $aAdministrators;
+		return $this->m_aAdministrators;
 	}
 
 	/**
@@ -758,8 +764,12 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
 		$bStatus = null;
+        // Cache user's profiles
+		if(false === array_key_exists($iUser, $this->aUsersProfilesList)){
+		     $this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
 		// Call the API of UserRights because it caches the list for us
-		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
+		foreach($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile)
 		{
 			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
 			if (!is_null($bGrant))
@@ -885,11 +895,16 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// Note: this code is VERY close to the code of IsActionAllowed()
 		$iUser = $oUser->GetKey();
 
+        // Cache user's profiles
+		if(false === array_key_exists($iUser, $this->aUsersProfilesList)){
+			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
+
 		// Note: The object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
 		$bStatus = null;
 		// Call the API of UserRights because it caches the list for us
-		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
+		foreach($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile)
 		{
 			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
 			if (!is_null($bGrant))

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

@@ -23,7 +23,7 @@ define('PORTAL_PROFILE_NAME', 'Portal user');
 class UserRightsBaseClassGUI extends cmdbAbstractObject
 {
 	// Whenever something changes, reload the privileges
-
+	
 	protected function AfterInsert()
 	{
 		UserRights::FlushPrivileges();
@@ -43,7 +43,7 @@ class UserRightsBaseClassGUI extends cmdbAbstractObject
 class UserRightsBaseClass extends DBObject
 {
 	// Whenever something changes, reload the privileges
-
+	
 	protected function AfterInsert()
 	{
 		UserRights::FlushPrivileges();
@@ -100,7 +100,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$this->m_bCheckReservedNames = false;
 	}
 
-
+	
 	protected static $m_aActions = array(
 		UR_ACTION_READ => 'Read',
 		UR_ACTION_MODIFY => 'Modify',
@@ -113,7 +113,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	protected static $m_aCacheActionGrants = null;
 	protected static $m_aCacheStimulusGrants = null;
 	protected static $m_aCacheProfiles = null;
-
+	
 	public static function DoCreateProfile($sName, $sDescription, $bReservedName = false)
 	{
 		if (is_null(self::$m_aCacheProfiles))
@@ -125,7 +125,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			{
 				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
 			}
-		}
+		}	
 
 		$sCacheKey = $sName;
 		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
@@ -137,17 +137,17 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$oNewObj->Set('description', $sDescription);
 		if ($bReservedName)
 		{
-			$oNewObj->DisableCheckOnReservedNames();
+			$oNewObj->DisableCheckOnReservedNames();			
 		}
 		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheProfiles[$sCacheKey] = $iId;
+		self::$m_aCacheProfiles[$sCacheKey] = $iId;	
 		return $iId;
 	}
-
+	
 	public static function DoCreateActionGrant($iProfile, $iAction, $sClass, $bPermission = true)
 	{
 		$sAction = self::$m_aActions[$iAction];
-
+	
 		if (is_null(self::$m_aCacheActionGrants))
 		{
 			self::$m_aCacheActionGrants = array();
@@ -157,7 +157,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			{
 				self::$m_aCacheActionGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('action').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
 			}
-		}
+		}	
 
 		$sCacheKey = "$iProfile-$sAction-$sClass";
 		if (isset(self::$m_aCacheActionGrants[$sCacheKey]))
@@ -171,10 +171,10 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$oNewObj->Set('class', $sClass);
 		$oNewObj->Set('action', $sAction);
 		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheActionGrants[$sCacheKey] = $iId;
+		self::$m_aCacheActionGrants[$sCacheKey] = $iId;	
 		return $iId;
 	}
-
+	
 	public static function DoCreateStimulusGrant($iProfile, $sStimulusCode, $sClass)
 	{
 		if (is_null(self::$m_aCacheStimulusGrants))
@@ -186,7 +186,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			{
 				self::$m_aCacheStimulusGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('stimulus').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
 			}
-		}
+		}	
 
 		$sCacheKey = "$iProfile-$sStimulusCode-$sClass";
 		if (isset(self::$m_aCacheStimulusGrants[$sCacheKey]))
@@ -199,13 +199,13 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$oNewObj->Set('class', $sClass);
 		$oNewObj->Set('stimulus', $sStimulusCode);
 		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheStimulusGrants[$sCacheKey] = $iId;
+		self::$m_aCacheStimulusGrants[$sCacheKey] = $iId;	
 		return $iId;
 	}
-
+	
 	/*
 	* Create the built-in Administrator profile with its reserved name
-	*/
+	*/	
 	public static function DoCreateAdminProfile()
 	{
 		self::DoCreateProfile(ADMIN_PROFILE_NAME, 'Has the rights on everything (bypassing any control)', true /* reserved name */);
@@ -213,7 +213,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 
 	/*
 	* Overload the standard behavior to preserve reserved names
-	*/
+	*/	
 	public function DoCheckToWrite()
 	{
 		parent::DoCheckToWrite();
@@ -255,7 +255,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 	}
-
+	
 	function DoShowGrantSumary($oPage)
 	{
 		if ($this->GetRawName() == "Administrator")
@@ -267,7 +267,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 
 		// Note: for sure, we assume that the instance is derived from UserRightsProfile
 		$oUserRights = UserRights::GetModuleInstance();
-
+	
 		$aDisplayData = array();
 		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
 		{
@@ -284,7 +284,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
-
+			
 			$aDisplayData[] = array(
 				'class' => MetaModel::GetName($sClass),
 				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'),
@@ -296,7 +296,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 				'stimuli' => $sStimuli,
 			);
 		}
-
+	
 		$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+'));
@@ -334,7 +334,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table"            => "priv_urp_userprofile",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
-			"is_link" 			  => true, /** @since 3.1.0 N°6482 N°5324 */
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -611,7 +611,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 				$oSearch->AllowAllData();
 				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
 				$oSearch->AddConditionExpression($oCondition);
-
+				
 				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
 				while ($oUserOrg = $oUserOrgSet->Fetch())
 				{
@@ -633,7 +633,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oSearch->AllowAllData();
 			$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
 			$oSearch->AddConditionExpression($oCondition);
-
+			
 			$this->m_aUserProfiles[$iUser] = array();
 			$oUserProfileSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
 			while ($oUserProfile = $oUserProfileSet->Fetch())
@@ -648,7 +648,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	public function ResetCache()
 	{
 		// Loaded by Load cache
-		$this->m_aProfiles = null;
+		$this->m_aProfiles = null; 
 		$this->m_aUserProfiles = array();
 		$this->m_aUserOrgs = array();
 
@@ -658,7 +658,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// Loaded on demand (time consuming as compared to the others)
 		$this->m_aClassActionGrants = null;
 		$this->m_aClassStimulusGrants = null;
-
+		
 		$this->m_aObjectActionGrants = array();
 	}
 
@@ -694,10 +694,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		}
 
 		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
-		$this->m_aProfiles = array();
+		$this->m_aProfiles = array(); 
 		while ($oProfile = $oProfileSet->Fetch())
 		{
-			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile;
+			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile; 
 		}
 
 		$this->m_aClassStimulusGrants = array();
@@ -871,7 +871,7 @@ exit;
 		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
 		return $aRes;
 	}
-
+	
 	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
 	{
 		$this->LoadCache();
@@ -1009,8 +1009,8 @@ exit;
 
 	/**
 	 * Find out which attribute is corresponding the the dimension 'owner org'
-	 * returns null if no such attribute has been found (no filtering should occur)
-	 */
+	 * returns null if no such attribute has been found (no filtering should occur)	 
+	 */	 	
 	public static function GetOwnerOrganizationAttCode($sClass)
 	{
 		$sAttCode = null;

addons/userrights/userrightsprojection.class.inc.php

@@ -22,9 +22,9 @@ define('ADMIN_PROFILE_ID', 1);
 class UserRightsBaseClass extends cmdbAbstractObject
 {
 	// Whenever something changes, reload the privileges
-
+	
 	// Whenever something changes, reload the privileges
-
+	
 	protected function AfterInsert()
 	{
 		UserRights::FlushPrivileges();
@@ -78,7 +78,7 @@ class URP_Profiles extends UserRightsBaseClass
 	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
 	{
 		$oGrant = $oUserRights->GetClassActionGrant($this->GetKey(), $sClass, $sAction);
-		if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
+		if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes')) 
 		{
 			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
 		}
@@ -87,7 +87,7 @@ class URP_Profiles extends UserRightsBaseClass
 			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 	}
-
+	
 	function DoShowGrantSumary($oPage)
 	{
 		if ($this->GetRawName() == "Administrator")
@@ -99,7 +99,7 @@ class URP_Profiles extends UserRightsBaseClass
 
 		// Note: for sure, we assume that the instance is derived from UserRightsProjection
 		$oUserRights = UserRights::GetModuleInstance();
-
+	
 		$aDisplayData = array();
 		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
 		{
@@ -116,7 +116,7 @@ class URP_Profiles extends UserRightsBaseClass
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
-
+			
 			$aDisplayData[] = array(
 				'class' => MetaModel::GetName($sClass),
 				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'),
@@ -128,7 +128,7 @@ class URP_Profiles extends UserRightsBaseClass
 				'stimuli' => $sStimuli,
 			);
 		}
-
+	
 		$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+'));
@@ -277,7 +277,7 @@ class URP_UserProfile extends UserRightsBaseClass
 			"db_table"            => "priv_urp_userprofile",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
-			"is_link" 			  => true, /** @since 3.1.0 N°6482 N°5324 */
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -356,7 +356,7 @@ class URP_ProfileProjection extends UserRightsBaseClass
 			{
 				$aRes = array($oUser->Get($sColumn));
 			}
-
+			
 		}
 		elseif (($sExpr == '<any>') || ($sExpr == ''))
 		{
@@ -427,14 +427,14 @@ class URP_ClassProjection extends UserRightsBaseClass
 			{
 				$aRes = array($oObject->Get($sColumn));
 			}
-
+			
 		}
 		elseif (($sExpr == '<any>') || ($sExpr == ''))
 		{
 			$aRes = null;
 		}
 		elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
-		{
+		{ 
 			$sColumn = $this->Get('attribute');
 			// SELECT...
 			$oValueSetDef = new ValueSetObjects($sExpr, $sColumn, array(), true /*allow all data*/);
@@ -585,14 +585,14 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		$oContact->Set('org_id', $iOrgId);
 		$oContact->Set('email', 'my.email@foo.org');
 		$iContactId = $oContact->DBInsertNoReload();
-
+		
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
 		$oUser->Set('contactid', $iContactId);
 		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
 		$iUserId = $oUser->DBInsertNoReload();
-
+		
 		// Add this user to the very specific 'admin' profile
 		$oUserProfile = new URP_UserProfile();
 		$oUserProfile->Set('userid', $iUserId);
@@ -643,24 +643,24 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		// Could be loaded in a shared memory (?)
 
 		$oDimensionSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Dimensions"));
-		$this->m_aDimensions = array();
+		$this->m_aDimensions = array(); 
 		while ($oDimension = $oDimensionSet->Fetch())
 		{
-			$this->m_aDimensions[$oDimension->GetKey()] = $oDimension;
+			$this->m_aDimensions[$oDimension->GetKey()] = $oDimension; 
 		}
-
+		
 		$oClassProjSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ClassProjection"));
-		$this->m_aClassProjs = array();
+		$this->m_aClassProjs = array(); 
 		while ($oClassProj = $oClassProjSet->Fetch())
 		{
-			$this->m_aClassProjs[$oClassProj->Get('class')][$oClassProj->Get('dimensionid')] = $oClassProj;
+			$this->m_aClassProjs[$oClassProj->Get('class')][$oClassProj->Get('dimensionid')] = $oClassProj; 
 		}
 
 		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
-		$this->m_aProfiles = array();
+		$this->m_aProfiles = array(); 
 		while ($oProfile = $oProfileSet->Fetch())
 		{
-			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile;
+			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile; 
 		}
 
 		$oUserProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_UserProfile"));
@@ -676,10 +676,10 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		}
 
 		$oProProSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ProfileProjection"));
-		$this->m_aProPros = array();
+		$this->m_aProPros = array(); 
 		while ($oProPro = $oProProSet->Fetch())
 		{
-			$this->m_aProPros[$oProPro->Get('profileid')][$oProPro->Get('dimensionid')] = $oProPro;
+			$this->m_aProPros[$oProPro->Get('profileid')][$oProPro->Get('dimensionid')] = $oProPro; 
 		}
 
 /*
@@ -707,7 +707,7 @@ exit;
 				// Authorize any for this dimension, then no additional criteria is required
 				continue;
 			}
-
+ 
 			// 1 - Get class projection info
 			//
 			$oExpression = null;
@@ -731,13 +731,13 @@ exit;
 			}
 			elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
 			{
-				throw new CoreException('Sorry, projections by the mean of OQL are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr));
+				throw new CoreException('Sorry, projections by the mean of OQL are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); 
 			}
 			else
 			{
 				// Constant value(s)
 				// unsupported
-				throw new CoreException('Sorry, constant projections are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr));
+				throw new CoreException('Sorry, constant projections are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); 
 //				$aRes = explode(';', trim($sExpr));
 			}
 
@@ -866,7 +866,7 @@ exit;
 		$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iObjectRef][$iActionCode] = $aRes;
 		return $aRes;
 	}
-
+	
 	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
 	{
 		if (is_null($oInstanceSet))
@@ -934,7 +934,7 @@ exit;
 			}
 			else
 			{
-				$iInstancePermission = UR_ALLOWED_NO;
+				$iInstancePermission = UR_ALLOWED_NO; 
 			}
 
 			if (isset($iGlobalPermission))
@@ -1140,7 +1140,7 @@ exit;
 	}
 
 	protected $m_aMatchingProfiles = array(); // cache of the matching profiles for a given user/object
-
+	
 	protected function GetMatchingProfiles($oUser, $sClass, /*DBObject*/ $oObject = null)
 	{
 		$iUser = $oUser->GetKey();
@@ -1186,7 +1186,7 @@ exit;
 					@$aProfileRes[$iProfile] += 1;
 				}
 			}
-
+	
 			$aRes = array();
 			$iDimCount = count($this->m_aDimensions);
 			foreach ($aProfileRes as $iProfile => $iMatches)
@@ -1200,7 +1200,7 @@ exit;
 
 		// store into the cache
 		$this->m_aMatchingProfiles[$iUser][$sClass][$iObjectRef] = $aRes;
-		return $aRes;
+		return $aRes; 
 	}
 
 	public function FlushPrivileges()

application/ajaxwebpage.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader
+ * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  */

application/applicationextension.inc.php

@@ -335,7 +335,6 @@ abstract class AbstractPreferencesExtension implements iPreferencesExtension
  * A recommended pattern is to cache data by the mean of static members.
  *
  * @api
- * @deprecated  3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method
  * @package     UIExtensibilityAPI
  */
 interface iApplicationUIExtension
@@ -487,7 +486,6 @@ interface iApplicationUIExtension
  * @api
  * @package     UIExtensibilityAPI
  * @since       2.7.0
- * @deprecated
  */
 abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
 {
@@ -560,6 +558,7 @@ abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
  * or through the GUI.
  *
  * @api
+ * @deprecated  3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method. More details on each method PHPDoc.
  * @package     ORMExtensibilityAPI
  */
 interface iApplicationObjectExtension
@@ -574,6 +573,7 @@ interface iApplicationObjectExtension
 	 * Otherwise, the answer is definitively "yes, the object has changed".
 	 *
 	 * @api
+	 * @deprecated 3.1.0 N°4756 No alternative available, this API was unstable and is abandoned
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return boolean True if something has changed for the target object
@@ -587,6 +587,7 @@ interface iApplicationObjectExtension
 	 * Anyhow, this API can be called in other contexts such as the CSV import tool.
 	 *
 	 * @api
+	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_CHECK_TO_WRITE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
@@ -601,6 +602,7 @@ interface iApplicationObjectExtension
 	 * Please not that it is not possible to cascade deletion by this mean: only stopper issues can be handled.
 	 *
 	 * @api
+	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_CHECK_TO_DELETE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
@@ -617,6 +619,7 @@ interface iApplicationObjectExtension
 	 * * {@see DBObject::Get()} : for a given attribute the new value that was persisted
 	 *
 	 * @api
+	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_WRITE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -633,6 +636,7 @@ interface iApplicationObjectExtension
 	 * The method is called right <b>after</b> the object has been written to the database.
 	 *
 	 * @api
+	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_WRITE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -647,6 +651,7 @@ interface iApplicationObjectExtension
 	 * The method is called right <b>before</b> the object will be deleted from the database.
 	 *
 	 * @api
+	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_DELETE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -660,6 +665,7 @@ interface iApplicationObjectExtension
  * Extend this class instead of iApplicationObjectExtension if you don't need to overload all methods
  *
  * @api
+ * @deprecated  3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method
  * @package     ORMExtensibilityAPI
  * @since       2.7.0
  */
@@ -2247,49 +2253,6 @@ interface iModuleExtension
 	public function __construct();
 }
 
-/**
- * Interface to provide messages to be displayed in the "Welcome Popup"
- *
- * @api
- * @private
- * @since 3.1.0
- */
-interface iWelcomePopup
-{
-	// Importance for ordering messages
-	// Just two levels since less important messages have nothing to do in the welcome popup
-	const IMPORTANCE_CRITICAL = 0;
-	const IMPORTANCE_HIGH = 1;
-	/**
-	 * @return [['importance' => IMPORTANCE_CRITICAL|IMPORTANCE_HIGH, 'id' => '...', 'title' => '', 'html' => '', 'twig' => '']]
-	 */
-	public function GetMessages();
-	/**
-	 * The message specified by the given Id has been acknowledged by the current user
-	 * @param string $sMessageId
-	 */
-	public function AcknowledgeMessage(string $sMessageId): void;
-}
-
-/**
- * Inherit from this class to provide messages to be displayed in the "Welcome Popup"
- *
- * @api
- * @since 3.1.0
- */
-abstract class AbstractWelcomePopup implements iWelcomePopup
-{
-	public function GetMessages()
-	{
-		return [];
-	}
-	public function AcknowledgeMessage(string $sMessageId): void
-	{
-		return;
-	}
-}
-
-
 /**
  * KPI logging extensibility point
  *
@@ -2297,19 +2260,19 @@ abstract class AbstractWelcomePopup implements iWelcomePopup
  */
 interface iKPILoggerExtension
 {
-	/**
-	 * Init the statistics collected
-	 *
-	 * @return void
-	 */
-	public function InitStats();
+    /**
+     * Init the statistics collected
+     *
+     * @return void
+     */
+    public function InitStats();
 
-	/**
-	 * Add a new KPI to the stats
-	 *
-	 * @param \Combodo\iTop\Core\Kpi\KpiLogData $oKpiLogData
-	 *
-	 * @return mixed
-	 */
-	public function LogOperation($oKpiLogData);
-}
+    /**
+     * Add a new KPI to the stats
+     *
+     * @param \Combodo\iTop\Core\Kpi\KpiLogData $oKpiLogData
+     *
+     * @return mixed
+     */
+    public function LogOperation($oKpiLogData);
+}

application/capturewebpage.class.inc.php

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

application/clipage.class.inc.php

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

application/cmdbabstract.class.inc.php

@@ -744,7 +744,13 @@ HTML
 			$oPage->SetCurrentTab($sTabCode, $oAttDef->GetLabel().$sCount, $sTabDescription);
 
 			$aArgs = array('this' => $this);
-			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
+			
+			$sEditWhen = $oAttDef->GetEditWhen();
+			// Calculate if edit_when allows to edit based on current $bEditMode
+			$bIsEditableBasedOnEditWhen =  ($sEditWhen === LINKSET_EDITWHEN_ALWAYS) || 
+				($bEditMode ? $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION : $sEditWhen === LINKSET_EDITWHEN_ON_HOST_DISPLAY);
+
+			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)) || !$bIsEditableBasedOnEditWhen;
 			if ($bEditMode && (!$bReadOnly)) {
 				$sInputId = $this->m_iFormId.'_'.$sAttCode;
 				$sDisplayValue = ''; // not used
@@ -754,9 +760,9 @@ HTML
 				$oPage->add($sHTMLValue);
 			} else {
 				if ($oAttDef->IsIndirect()) {
-					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
+					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				} else {
-					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
+					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				}
 				$oPage->AddUiBlock($oBlockLinkSetViewTable);
 			}

application/csvpage.class.inc.php

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

application/dashboard.class.inc.php

@@ -1264,12 +1264,12 @@ EOF
 		$sOkButtonLabel = Dict::S('UI:Button:Save');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		
-		$sId = addslashes($this->sId);
-		$sLayoutClass = addslashes($this->sLayoutClass);
+		$sId = utils::HtmlEntities($this->sId);
+		$sLayoutClass = utils::HtmlEntities($this->sLayoutClass);
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
-		$sTitle = addslashes($this->sTitle);
-		$sFile = addslashes($this->GetDefinitionFile());
+		$sTitle = utils::HtmlEntities($this->sTitle);
+		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
 		$sReloadURL = $this->GetReloadURL();
 

application/datamodel.application.xml

@@ -40,36 +40,6 @@
       <presentation/>
       <methods/>
     </class>
-    <class id="WelcomePopupAcknowledge" _delta="define">
-      <parent>DBObject</parent>
-      <properties>
-        <comment>/* Acknowledge welcome popup messages */</comment>
-        <abstract>false</abstract>
-        <category></category>
-        <key_type>autoincrement</key_type>
-        <db_table>priv_welcome_popup_acknowledge</db_table>
-      </properties>
-      <fields>
-        <field id="message_uuid" xsi:type="AttributeString">
-          <sql>message_uuid</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="user_id" xsi:type="AttributeExternalKey">
-          <sql>user_id</sql>
-          <target_class>User</target_class>
-          <is_null_allowed>false</is_null_allowed>
-          <on_target_delete>DEL_SILENT</on_target_delete>
-        </field>
-        <field id="acknowledge_date" xsi:type="AttributeDateTime">
-          <sql>acknowledge_date</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-      </fields>
-      <presentation/>
-      <methods/>
-    </class>
   </classes>
   <portals>
     <portal id="backoffice" _delta="define">

application/displayblock.class.inc.php

@@ -2042,7 +2042,7 @@ class MenuBlock extends DisplayBlock
 			}
 
 			//----------------------------------------------------
-			// Any style but NOT "listInObject" (linksets) actions
+			// Any style but NOT \DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT (linksets) actions
 			//----------------------------------------------------
 			if ($this->m_sStyle !== static::ENUM_STYLE_LIST_IN_OBJECT) {
 				switch ($iSetCount) {

application/errorpage.class.inc.php

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

application/itopwebpage.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader
+ * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  */

application/itopwizardwebpage.class.inc.php

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

application/menunode.class.inc.php

@@ -9,7 +9,6 @@ use Combodo\iTop\Application\Helper\WebResourcesHelper;
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/application/template.class.inc.php');
 require_once(APPROOT."/application/user.dashboard.class.inc.php");
-require_once(APPROOT."/setup/parentmenunodecompiler.class.inc.php");
 
 
 /**
@@ -104,7 +103,7 @@ class ApplicationMenu
 	{
 		self::$sFavoriteSiloQuery = $sOQL;
 	}
-
+	
 	/**
 	 * Get the query used to limit the list of displayed organizations in the drop-down menu
 	 * @return string The OQL query returning a list of Organization objects
@@ -274,23 +273,12 @@ class ApplicationMenu
 				continue;
 			}
 
-			$aSubMenuNodes = static::GetSubMenuNodes($sMenuGroupIdx, $aExtraParams);
-			if (! ParentMenuNodeCompiler::$bUseLegacyMenuCompilation && !($oMenuNode instanceof ShortcutMenuNode)){
-				if (is_array($aSubMenuNodes) && 0 === sizeof($aSubMenuNodes)){
-					IssueLog::Debug('Empty menu node not displayed', LogChannels::CONSOLE, [
-						'menu_node_class' => get_class($oMenuNode),
-						'menu_node_label' => $oMenuNode->GetLabel(),
-					]);
-					continue;
-				}
-			}
-
 			$aMenuGroups[] = [
 				'sId' => $oMenuNode->GetMenuID(),
 				'sIconCssClasses' => $oMenuNode->GetDecorationClasses(),
 				'sInitials' => $oMenuNode->GetInitials(),
 				'sTitle' => $oMenuNode->GetTitle(),
-				'aSubMenuNodes' => $aSubMenuNodes,
+				'aSubMenuNodes' => static::GetSubMenuNodes($sMenuGroupIdx, $aExtraParams),
 			];
 		}
 
@@ -548,7 +536,7 @@ EOF
 
 		return -1;
 	}
-
+	
 	/**
 	 * Retrieves the currently active menu (if any, otherwise the first menu is the default)
 	 * @return string The Id of the currently active menu
@@ -556,7 +544,7 @@ EOF
 	public static function GetActiveNodeId()
 	{
 		$oAppContext = new ApplicationContext();
-		$sMenuId = $oAppContext->GetCurrentValue('menu', null);
+		$sMenuId = $oAppContext->GetCurrentValue('menu', null);		
 		if ($sMenuId  === null)
 		{
 			$sMenuId = self::GetDefaultMenuId();
@@ -666,7 +654,7 @@ abstract class MenuNode
 
 	/**
 	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
-	 */
+	 */	
 	protected $m_aEnableStimuli;
 
 	/**
@@ -826,7 +814,7 @@ abstract class MenuNode
 	{
 		return false;
 	}
-
+	
 	/**
 	 * Add a limiting display condition for the same menu node. The conditions will be combined with a AND
 	 * @param $oMenuNode MenuNode Another definition of the same menu node, with potentially different access restriction
@@ -999,7 +987,7 @@ class TemplateMenuNode extends MenuNode
 	 * @var string
 	 */
 	protected $sTemplateFile;
-
+	
 	/**
 	 * Create a menu item based on a custom template and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
@@ -1070,7 +1058,7 @@ class OQLMenuNode extends MenuNode
 	 * @var bool|null
 	 */
 	protected $bSearchFormOpen;
-
+	
 	/**
 	 * Extra parameters to be passed to the display block to fine tune its appearence
 	 */
@@ -1103,7 +1091,7 @@ class OQLMenuNode extends MenuNode
 		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
 		// of the class specified by the OQL...
 	}
-
+	
 	/**
 	 * Set some extra parameters to be passed to the display block to fine tune its appearence
 	 * @param array $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
@@ -1123,7 +1111,7 @@ class OQLMenuNode extends MenuNode
 	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
-		$oTag = new ContextTag(ContextTag::TAG_OBJECT_SEARCH);
+		ContextTag::AddContext(ContextTag::TAG_OBJECT_SEARCH);
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		OQLMenuNode::RenderOQLSearch
 		(
@@ -1132,7 +1120,7 @@ class OQLMenuNode extends MenuNode
 			'Menu_'.$this->GetMenuId(),
 			$this->bSearch, // Search pane
 			$this->bSearchFormOpen, // Search open
-			$oPage,
+			$oPage, 
 			array_merge($this->m_aParams, $aExtraParams),
 			true
 		);
@@ -1366,10 +1354,10 @@ class NewObjectMenuNode extends MenuNode
 	{
 		// Enable this menu, only if the current user has enough rights to create such an object, or an object of
 		// any child class
-
+	
 		$aSubClasses = MetaModel::EnumChildClasses($this->sClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
 		$bActionIsAllowed = false;
-
+	
 		foreach($aSubClasses as $sCandidateClass)
 		{
 			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
@@ -1378,7 +1366,7 @@ class NewObjectMenuNode extends MenuNode
 				break; // Enough for now
 			}
 		}
-		return $bActionIsAllowed;
+		return $bActionIsAllowed;		
 	}
 
 	/**
@@ -1520,7 +1508,7 @@ class DashboardMenuNode extends MenuNode
 			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-
+	
 }
 
 /**
@@ -1561,7 +1549,7 @@ class ShortcutContainerMenuNode extends MenuNode
 			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
 			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
 		}
-
+	
 		// Complete the tree
 		//
 		parent::PopulateChildMenus();

application/nicewebpage.class.inc.php

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

application/pdfpage.class.inc.php

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

application/templates/welcome_popup.html

@@ -0,0 +1,29 @@
+<div style="width:100%;background: #fff url(../images/welcome.jpg) top left no-repeat;">
+<style>
+.welcome_popup_cell {
+vertical-align:top;
+width:50%;
+border:0px solid #000;
+-moz-border-radius:10px;
+padding:5px;
+text-align:left;
+}
+tr td.welcome_popup_cell,  tr td.welcome_popup_cell ul {
+font-size:10pt;
+}
+</style>
+<p></p>
+<p></p>
+<p style="text-align:left; font-size:32px;padding-left:400px;padding-top:40px;margin-bottom:30px;margin-top:0;color:#FFFFFF;"><itopstring>UI:WelcomeMenu:Title</itopstring></p>
+<p></p>
+<table border="0" style="padding:10px;border-spacing: 10px;width:100%">
+<tr>
+<td class="welcome_popup_cell">
+<itopstring>UI:WelcomeMenu:LeftBlock</itopstring>
+</td>
+<td class="welcome_popup_cell">
+<itopstring>UI:WelcomeMenu:RightBlock</itopstring>
+</td>
+</tr>
+</table>
+</div>

application/ui.extkeywidget.class.inc.php

@@ -975,6 +975,10 @@ HTML
 		// Remove blob edition from creation form @see N°5863 to allow blob edition in modal context
 		FormHelper::DisableAttributeBlobInputs($this->sTargetClass, $aFormExtraParams);
 
+		if(FormHelper::HasMandatoryAttributeBlobInputs($oNewObj)){
+			$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal(FormHelper::ENUM_MANDATORY_BLOB_MODE_CREATE));
+		}
+		
 		cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), $aFormExtraParams);
 		$oPage->add(<<<HTML
 	</div>

application/ui.linksdirectwidget.class.inc.php

@@ -143,6 +143,10 @@ JS
 
 			// Remove blob edition from creation form @see N°5863 to allow blob edition in modal context
 			FormHelper::DisableAttributeBlobInputs($sRealClass, $aFormExtraParams);
+			
+			if(FormHelper::HasMandatoryAttributeBlobInputs($oObj)){
+				$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal(FormHelper::ENUM_MANDATORY_BLOB_MODE_CREATE));
+			}
 
 			cmdbAbstractObject::DisplayCreationForm($oPage, $sRealClass, $oObj, array(), $aFormExtraParams);
 		}

application/utils.inc.php

@@ -52,22 +52,31 @@ class utils
 {
 	/**
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_INTEGER = 'integer';
 	/**
+	 * Datamodel class
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
+	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6606 update PHPDoc
+	 * @uses MetaModel::IsValidClass()
 	 */
 	public const ENUM_SANITIZATION_FILTER_CLASS = 'class';
 	/**
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6606
+	 * @uses class_exists()
+	 */
+	public const ENUM_SANITIZATION_FILTER_PHP_CLASS = 'php_class';
+	/**
+	 * @var string
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_STRING = 'string';
 	/**
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_CONTEXT_PARAM = 'context_param';
 	/**
@@ -82,22 +91,22 @@ class utils
 	public const ENUM_SANITIZATION_FILTER_OPERATION = 'operation';
 	/**
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_PARAMETER = 'parameter';
 	/**
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_FIELD_NAME = 'field_name';
 	/**
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_TRANSACTION_ID = 'transaction_id';
 	/**
 	 * @var string For XML / HTML node identifiers
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER = 'element_identifier';
 	/**
@@ -107,12 +116,13 @@ class utils
 	public const ENUM_SANITIZATION_FILTER_VARIABLE_NAME = 'variable_name';
 	/**
 	 * @var string
-	 * @since 3.0.0
+	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_RAW_DATA = 'raw_data';
 	/**
 	 * @var string
-	 * @since 3.0.2, 3.1.0 N°4899
+	 * @since 3.0.2 3.1.0 N°4899
+	 * @since 2.7.10 N°6606
 	 */
 	public const ENUM_SANITIZATION_FILTER_URL = 'url';
 
@@ -155,6 +165,8 @@ class utils
 
 	private static $iNextId = 0;
 
+	private static $m_sAppRootUrl = null;
+
 	protected static function LoadParamFile($sParamFile)
 	{
 		if (!file_exists($sParamFile)) {
@@ -396,6 +408,10 @@ class utils
 	 * @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
+	 * @since 2.7.10 N°6606 use the utils::ENUM_SANITIZATION_* const
+	 * @since 2.7.10 N°6606 new case for ENUM_SANITIZATION_FILTER_PHP_CLASS
+	 *
+	 * @link https://www.php.net/manual/en/filter.filters.sanitize.php PHP sanitization filters
 	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
@@ -416,6 +432,13 @@ class utils
 				$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
 				break;
 
+			case static::ENUM_SANITIZATION_FILTER_PHP_CLASS:
+				$retValue = $value;
+				if (!class_exists($value)) {
+					$retValue = false;
+				}
+				break;
+
 			case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
 			case static::ENUM_SANITIZATION_FILTER_ROUTE:
 			case static::ENUM_SANITIZATION_FILTER_OPERATION:
@@ -481,6 +504,7 @@ class utils
 
 			// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
+                // N°6350 - returns only valid URLs
 				$retValue = filter_var($value, FILTER_VALIDATE_URL);
 				break;
 
@@ -1024,7 +1048,7 @@ class utils
      */
 	public static function GetAbsoluteUrlAppRoot($bForceTrustProxy = false)
 	{
-		static $sUrl = null;
+		$sUrl = static::$m_sAppRootUrl;
 		if ($sUrl === null || $bForceTrustProxy)
 		{
 			$sUrl = self::GetConfig()->Get('app_root_url');
@@ -1045,8 +1069,9 @@ class utils
 				}
 				$sUrl = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, $sUrl);
 			}
+			static::$m_sAppRootUrl = $sUrl;
 		}
-		return $sUrl;
+		return static::$m_sAppRootUrl;
 	}
 
 	/**

application/webpage.class.inc.php

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

application/wizardhelper.class.inc.php

@@ -351,6 +351,7 @@ class WizardHelper
 	/**
 	 * @return string JS code to be executed for fields update
 	 * @since 3.0.0 N°3198
+	 * @deprecated 3.0.3-2 3.0.4 3.1.1 3.2.0 Use {@see \WizardHelper::AddJsForUpdateFields()} instead
 	 */
 	public function GetJsForUpdateFields()
 	{
@@ -363,6 +364,32 @@ class WizardHelper
 JS;
 	}
 
+	/**
+	 * Add necessary JS snippets (to the page) to be executed for fields update
+	 *
+	 * @param \WebPage $oPage
+	 * @return void
+	 * @since 3.0.3-2 3.0.4 3.1.1 3.2.0 N°6766
+	 */
+	public function AddJsForUpdateFields(WebPage $oPage)
+	{
+		$sWizardHelperJsVar = (!is_null($this->m_aData['m_sWizHelperJsVarName'])) ? utils::Sanitize($this->m_aData['m_sWizHelperJsVarName'], '', utils::ENUM_SANITIZATION_FILTER_PARAMETER) : 'oWizardHelper'.$this->GetFormPrefix();
+		$sWizardHelperJson = $this->ToJSON();
+
+		$oPage->add_script(<<<JS
+{$sWizardHelperJsVar}.m_oData = {$sWizardHelperJson};
+{$sWizardHelperJsVar}.UpdateFields();
+JS
+		);
+		$oPage->add_ready_script(<<<JS
+if ({$sWizardHelperJsVar}.m_oDependenciesUpdatedPromiseResolve !== null){
+    {$sWizardHelperJsVar}.m_oDependenciesUpdatedPromiseResolve();
+}
+JS
+		);
+
+	}
+
 	/*
 	 * Function with an old pattern of code
 	 * @deprecated 3.1.0
@@ -371,11 +398,9 @@ JS;
 	{
 		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
 		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
-		foreach ($aSet as $aLinkObj)
-		{
+		foreach ($aSet as $aLinkObj) {
 			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach ($aLinkObj as $sAttCode => $value)
-			{
+			foreach ($aLinkObj as $sAttCode => $value) {
 				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
 				if (($oAttDef->IsExternalKey()) && ($value != '') && ($value > 0))
 				{

application/xmlpage.class.inc.php

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

composer.lock

@@ -4476,16 +4476,16 @@
         },
         {
             "name": "symfony/twig-bridge",
-            "version": "v5.4.11",
+            "version": "v5.4.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bridge.git",
-                "reference": "63b8a50d48c9fe3d04e77307d4f1771dd848baa8"
+                "reference": "fc6ee0a3b672ea12ca1f26592d257bfc7f4ee942"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/63b8a50d48c9fe3d04e77307d4f1771dd848baa8",
-                "reference": "63b8a50d48c9fe3d04e77307d4f1771dd848baa8",
+                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/fc6ee0a3b672ea12ca1f26592d257bfc7f4ee942",
+                "reference": "fc6ee0a3b672ea12ca1f26592d257bfc7f4ee942",
                 "shasum": ""
             },
             "require": {
@@ -4498,22 +4498,22 @@
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/console": "<5.3",
-                "symfony/form": "<5.3",
+                "symfony/form": "<5.4.21|>=6,<6.2.7",
                 "symfony/http-foundation": "<5.3",
                 "symfony/http-kernel": "<4.4",
                 "symfony/translation": "<5.2",
                 "symfony/workflow": "<5.2"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.12",
-                "egulias/email-validator": "^2.1.10|^3",
+                "doctrine/annotations": "^1.12|^2",
+                "egulias/email-validator": "^2.1.10|^3|^4",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/asset": "^4.4|^5.0|^6.0",
                 "symfony/console": "^5.3|^6.0",
                 "symfony/dependency-injection": "^4.4|^5.0|^6.0",
                 "symfony/expression-language": "^4.4|^5.0|^6.0",
                 "symfony/finder": "^4.4|^5.0|^6.0",
-                "symfony/form": "^5.3|^6.0",
+                "symfony/form": "^5.4.21|^6.2.7",
                 "symfony/http-foundation": "^5.3|^6.0",
                 "symfony/http-kernel": "^4.4|^5.0|^6.0",
                 "symfony/intl": "^4.4|^5.0|^6.0",
@@ -4577,7 +4577,7 @@
             "description": "Provides integration for Twig with various Symfony components",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/twig-bridge/tree/v5.4.11"
+                "source": "https://github.com/symfony/twig-bridge/tree/v5.4.31"
             },
             "funding": [
                 {
@@ -4593,7 +4593,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-20T13:00:38+00:00"
+            "time": "2023-11-09T21:19:08+00:00"
         },
         {
             "name": "symfony/twig-bundle",
@@ -5276,5 +5276,5 @@
     "platform-overrides": {
         "php": "7.4.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

core/DbConnectionWrapper.php

@@ -60,6 +60,7 @@ class DbConnectionWrapper
 	 *
 	 * @param \mysqli|null $oMysqli
 	 * @since 3.0.4 3.1.1 3.2.0 Param $oMysqli becomes nullable
+	 * @since 3.1.0-4 N°6848 backport of restoring cnx on null parameter value
 	 */
 	public static function SetDbConnectionMockForQuery(?mysqli $oMysqli = null): void
 	{

core/attributedef.class.inc.php

@@ -91,6 +91,12 @@ define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
 define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
 define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
 
+define('LINKSET_EDITWHEN_NEVER', 0); // The linkset cannot be edited at all from inside this object
+define('LINKSET_EDITWHEN_ON_HOST_EDITION', 1); // The only possible action is to open a new window to create a new object
+define('LINKSET_EDITWHEN_ON_HOST_DISPLAY', 2); // Show the usual 'Actions' popup menu
+define('LINKSET_EDITWHEN_ALWAYS', 3); // Show the usual 'Actions' popup menu
+
+
 define('LINKSET_DISPLAY_STYLE_PROPERTY', 'property');
 define('LINKSET_DISPLAY_STYLE_TAB', 'tab');
 
@@ -791,7 +797,7 @@ abstract class AttributeDefinition
 	public function HasAValue($proposedValue): bool
 	{
 		// Default implementation, we don't really know what type $proposedValue will be
-		return is_null($proposedValue);
+		return !(is_null($proposedValue));
 	}
 
 	/**
@@ -1703,6 +1709,15 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
+	}	
+	
+	/**
+	 * @return int see LINKSET_EDITWHEN_* constants
+	 * @since 3.1.1 3.2.0 N°6385
+	 */
+	public function GetEditWhen(): int
+	{
+		return $this->GetOptional('edit_when', LINKSET_EDITWHEN_ALWAYS);
 	}
 
 	/**
@@ -8584,7 +8599,7 @@ class AttributeBlob extends AttributeDefinition
 	public function RecordAttChange(DBObject $oObject, $original, $value): void
 	{
 		// N°6502 Don't record history if only the download count has changed
-		if ($original->EqualsExceptDownloadsCount($value)) {
+		if ((null !== $original) && (null !== $value) && $original->EqualsExceptDownloadsCount($value)) {
 			return;
 		}
 

core/bulkexport.class.inc.php

@@ -149,7 +149,9 @@ abstract class BulkExport
 		$this->oSearch = null;
 		$this->iChunkSize = 0;
 		$this->sFormatCode = null;
-		$this->aStatusInfo = array();
+		$this->aStatusInfo = [
+			'show_obsolete_data' => utils::ShowObsoleteData(),
+		];
 		$this->oBulkExportResult = null;
 		$this->sTmpFile = '';
 		$this->bLocalizeOutput = false;
@@ -203,15 +205,17 @@ abstract class BulkExport
 		if ($oInfo && ($oInfo->Get('user_id') == UserRights::GetUserId()))
 		{
 			$sFormatCode = $oInfo->Get('format');
-			$oSearch = DBObjectSearch::unserialize($oInfo->Get('search'));
+			$aStatusInfo = json_decode($oInfo->Get('status_info'),true);
 
+			$oSearch = DBObjectSearch::unserialize($oInfo->Get('search'));
+			$oSearch->SetShowObsoleteData($aStatusInfo['show_obsolete_data']);
 			$oBulkExporter = self::FindExporter($sFormatCode, $oSearch);
 			if ($oBulkExporter)
 			{
 				$oBulkExporter->SetFormat($sFormatCode);
 				$oBulkExporter->SetObjectList($oSearch);
 				$oBulkExporter->SetChunkSize($oInfo->Get('chunk_size'));
-				$oBulkExporter->SetStatusInfo(json_decode($oInfo->Get('status_info'), true));
+				$oBulkExporter->SetStatusInfo($aStatusInfo);
 
                 $oBulkExporter->SetLocalizeOutput($oInfo->Get('localize_output'));
 
@@ -289,6 +293,7 @@ abstract class BulkExport
 	 */
 	public function SetObjectList(DBSearch $oSearch)
 	{
+		$oSearch->SetShowObsoleteData($this->aStatusInfo['show_obsolete_data']);
 		$this->oSearch = $oSearch;
 	}
 	

core/cmdbsource.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.
@@ -380,7 +380,7 @@ class CMDBSource
 	public static function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
-
+		
 		$sVersionComment = static::GetServerVariable('version') .  ' - ' . static::GetServerVariable('version_comment');
 		if(preg_match('/mariadb/i', $sVersionComment) === 1)
 		{
@@ -390,7 +390,7 @@ class CMDBSource
 		{
 			$sDBVendor = static::ENUM_DB_VENDOR_PERCONA;
 		}
-
+		
 		return $sDBVendor;
 	}
 
@@ -934,7 +934,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+				
 		while ($aRow = $oResult->fetch_array($iMode))
 		{
 			$aData[] = $aRow;
@@ -1088,7 +1088,7 @@ class CMDBSource
 		if (!array_key_exists($iKey, $aTableInfo["Fields"])) return false;
 		$aFieldData = $aTableInfo["Fields"][$iKey];
 		if (!array_key_exists("Key", $aFieldData)) return false;
-		return ($aFieldData["Key"] == "PRI");
+		return ($aFieldData["Key"] == "PRI"); 
 	}
 
 	public static function IsAutoIncrement($sTable, $sField)
@@ -1099,7 +1099,7 @@ class CMDBSource
 		$aFieldData = $aTableInfo["Fields"][$sField];
 		if (!array_key_exists("Extra", $aFieldData)) return false;
 		//MyHelpers::debug_breakpoint($aFieldData);
-		return (strstr($aFieldData["Extra"], "auto_increment"));
+		return (strstr($aFieldData["Extra"], "auto_increment")); 
 	}
 
 	public static function IsField($sTable, $sField)
@@ -1366,13 +1366,13 @@ class CMDBSource
 	public static function GetTableFieldsList($sTable)
 	{
 		assert(!empty($sTable));
-
+		
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return array(); // #@# or an error ?
 
 		return array_keys($aTableInfo["Fields"]);
 	}
-
+	
 	// Cache the information about existing tables, and their fields
 	private static $m_aTablesInfo = array();
 	private static function _TablesInfoCacheReset($sTableName = null)
@@ -1505,7 +1505,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+		
 		$aRows = array();
 		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
@@ -1514,7 +1514,7 @@ class CMDBSource
 		$oResult->free();
 		return $aRows;
 	}
-
+	
 	/**
 	 * Returns the value of the specified server variable
 	 * @param string $sVarName Name of the server variable
@@ -1530,7 +1530,7 @@ class CMDBSource
 	/**
 	 * Returns the privileges of the current user
 	 * @return string privileges in a raw format
-	 */
+	 */	   	
 	public static function GetRawPrivileges()
 	{
 		try
@@ -1556,8 +1556,8 @@ class CMDBSource
 
 	/**
 	 * Determine the slave status of the server
-	 * @return bool true if the server is slave
-	 */
+	 * @return bool true if the server is slave 
+	 */	   	
 	public static function IsSlaveServer()
 	{
 		try

core/config.class.inc.php

@@ -1193,30 +1193,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'sessions_tracking.enabled' => [
-			'type' => 'bool',
-			'description' => 'Whether or not the whole mechanism to track active sessions is enabled. See PHP session.gc_maxlifetime setting to configure session expiration.',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_threshold' => [
-			'type' => 'integer',
-			'description'         => 'fallback in case cron is not active: probability in percent that session files are cleanup during any itop request (100 means always)',
-			'default'             => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_duration_in_seconds' => [
-			'type' => 'integer',
-			'description' => 'fallback in case cron is not active: when a cleanup is triggered cleanup duration will not exceed this duration (in seconds).',
-			'default' => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'transaction_storage' => [
 			'type' => 'string',
 			'description' => 'The type of mechanism to use for storing the unique identifiers for transactions (Session|File).',
@@ -1377,14 +1353,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'navigation_menu.sorted_popup_user_menu_items' => [
-			'type' => 'array',
-			'description' => 'Sort user menu items after setup on page load',
-			'default' => [],
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'quick_create.enabled' => [
 			'type' => 'bool',
 			'description' => 'Whether or not the quick create is enabled',
@@ -1667,14 +1635,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'security.single_profile_completion' => [
-			'type'                => 'array',
-			'description'         => 'Non standalone profiles can be completed by other profiles via this configuration. default configuration is equivalent to [\'Portal power user\' => \'Portal user\'] configuration. unless you have specific portal customization.',
-			'default'             => null,
-			'value'               => false,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'behind_reverse_proxy' => [
 			'type' => 'bool',
 			'description' => 'If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)',

core/dbobject.class.php

@@ -9,6 +9,7 @@ use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventException;
 use Combodo\iTop\Service\Events\EventService;
 use Combodo\iTop\Service\Events\EventServiceLog;
+use Combodo\iTop\Service\Module\ModuleService;
 use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
 
 /**
@@ -59,7 +60,7 @@ require_once('mutex.class.inc.php');
 
 
 /**
- * A persistent object, as defined by the metamodel
+ * A persistent object, as defined by the metamodel 
  *
  * @package     iTopORM
  * @api
@@ -307,9 +308,9 @@ abstract class DBObject implements iDisplay
 
     /**
      * Whether the object is already persisted in DB or not.
-     *
+     * 
      * @api
-     *
+     * 
      * @return bool
      */
 	public function IsNew()
@@ -319,9 +320,9 @@ abstract class DBObject implements iDisplay
 
     /**
      * Returns an Id for memory objects
-     *
+     * 
      * @internal
-     *
+     * 
      * @param string $sClass
      *
      * @return int
@@ -358,7 +359,7 @@ abstract class DBObject implements iDisplay
         $sRet .= "<b title=\"$sRootClass\">$sClass</b>::$iPKey ($sFriendlyname)<br/>\n";
         return $sRet;
 	}
-
+	
     /**
      * Alias of DBObject::Reload()
      *
@@ -381,7 +382,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see m_bFullyLoaded
-     *
+     * 
      * @return bool
      * @throws CoreException
      */
@@ -504,7 +505,7 @@ abstract class DBObject implements iDisplay
 		{
 			$aAttList = $aAttToLoad[$sClassAlias];
 		}
-
+		
 		foreach($aAttList as $sAttCode=>$oAttDef)
 		{
 			// Skip links (could not be loaded by the mean of this query)
@@ -564,7 +565,7 @@ abstract class DBObject implements iDisplay
 				$bFullyLoaded = false;
 			}
 		}
-
+		
 		// Load extended data
 		if ($aExtendedDataSpec != null)
 		{
@@ -588,7 +589,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see Set()
-     *
+     * 
      * @param string $sAttCode
      * @param mixed $value
      */
@@ -793,11 +794,11 @@ abstract class DBObject implements iDisplay
 
 	/**
      * Get the label of an attribute.
-     *
+     * 
      * Shortcut to the field's AttributeDefinition->GetLabel()
      *
      * @api
-     *
+     * 
      * @param string $sAttCode
      *
      * @return string
@@ -870,7 +871,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see Get
-     *
+     * 
      * @param string $sAttCode
      *
      * @return int|mixed|null
@@ -975,7 +976,7 @@ abstract class DBObject implements iDisplay
      * Returns the default value of the $sAttCode.
      *
      * Returns the default value of the given attribute.
-     *
+     * 
      * @internal
      *
      * @param string $sAttCode
@@ -996,12 +997,12 @@ abstract class DBObject implements iDisplay
      * @internal
      *
      * @return array|null
-	 */
+	 */	 
 	public function GetExtendedData()
 	{
 		return $this->m_aExtendedData;
 	}
-
+	
 	/**
      * Set the HighlightCode
      *
@@ -1023,7 +1024,7 @@ abstract class DBObject implements iDisplay
 		{
 			$fCurrentRank = $aHighlightScale[$this->m_sHighlightCode]['rank'];
 		}
-
+				
 		if (array_key_exists($sCode, $aHighlightScale))
 		{
 			$fRank = $aHighlightScale[$sCode]['rank'];
@@ -1033,13 +1034,13 @@ abstract class DBObject implements iDisplay
 			}
 		}
 	}
-
+	
 	/**
 	 * Get the current HighlightCode
-     *
+     * 
      * @internal
      * @used-by DBObject::ComputeHighlightCode()
-     *
+     * 
 	 * @return string|null The Hightlight code (null if none set, meaning rank = 0)
 	 */
 	protected function GetHighlightCode()
@@ -1088,7 +1089,7 @@ abstract class DBObject implements iDisplay
      * corresponding to the external key and getting the value from it
      *
      * UNUSED ?
-     *
+     * 
      * @internal
      * @todo: check if this is dead code.
      *
@@ -1159,7 +1160,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * @api
-     *
+     * 
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1205,11 +1206,11 @@ abstract class DBObject implements iDisplay
 
     /**
      * Get the value as it must be in the edit areas (forms)
-     *
+     * 
      * Makes a raw text representation of the value.
      *
      * @internal
-     *
+     * 
      * @param string $sAttCode
      *
      * @return int|mixed|string
@@ -1239,7 +1240,7 @@ abstract class DBObject implements iDisplay
 				else
 				{
 					$sEditValue = 0;
-				}
+				}					
 			}
 			else
 			{
@@ -1255,14 +1256,14 @@ abstract class DBObject implements iDisplay
 
     /**
      * Get $sAttCode formatted as XML
-     *
+     * 
      * The returned value is a text that is suitable for insertion into an XML node.
      * Depending on the type of attribute, the returned text is either:
      *   * A literal, with XML entities already escaped,
      *   * XML
      *
      * @api
-     *
+     * 
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1300,10 +1301,10 @@ abstract class DBObject implements iDisplay
 	}
 
     /**
-     *
+     * 
      * @see GetAsHTML()
      * @see GetOriginal()
-     *
+     * 
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1478,7 +1479,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * @internal
-     *
+     * 
      * @param string $sClass
      *
      * @return mixed
@@ -1533,7 +1534,7 @@ abstract class DBObject implements iDisplay
      * Get the id
      *
      * @api
-     *
+     * 
      * @return string|null
      */
 	public function GetKey()
@@ -1544,7 +1545,7 @@ abstract class DBObject implements iDisplay
     /**
      * Primary key Setter
      * Usable only for not yet persisted DBObjects
-     *
+     * 
      * @internal
      *
      * @param int $iNewKey the desired identifier
@@ -1557,7 +1558,7 @@ abstract class DBObject implements iDisplay
 		{
 			throw new CoreException("An object id must be an integer value ($iNewKey)");
 		}
-
+		
 		if ($this->m_bIsInDB && !empty($this->m_iKey) && ($this->m_iKey != $iNewKey))
 		{
 			throw new CoreException("Changing the key ({$this->m_iKey} to $iNewKey) on an object (class {".get_class($this).") wich already exists in the Database");
@@ -1567,7 +1568,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * Get the icon representing this object
-     *
+     * 
      * @api
      *
      * @param boolean $bImgTag If true the result is a full IMG tag (or an empty string if no icon is defined)
@@ -1657,7 +1658,7 @@ abstract class DBObject implements iDisplay
 	 *
 	 * Returns the label as defined in the dictionary for the language of the current user
      *
-     * @api
+     * @api 
      *
 	 * @return string (empty for default name scheme)
 	 */
@@ -1724,7 +1725,7 @@ abstract class DBObject implements iDisplay
 
 	/**
      * Helper to get the state
-     *
+     * 
      * @api
      *
 	 * @return mixed|string '' if no state attribute, object representing its value otherwise
@@ -1746,9 +1747,9 @@ abstract class DBObject implements iDisplay
     /**
      * Get the label (raw text) of the current state
      * helper for MetaModel::GetStateLabel()
-     *
+     * 
      * @api
-     *
+     * 
      * @return mixed|string
      *
      * @throws ArchivedObjectException
@@ -1795,7 +1796,7 @@ abstract class DBObject implements iDisplay
 	 * Define attributes read-only from the end-user perspective
 	 *
 	 * @return array|null List of attcodes
-	 */
+	 */	 	  	 	
 	public static function GetReadOnlyAttributes()
 	{
 		return null;
@@ -1804,14 +1805,14 @@ abstract class DBObject implements iDisplay
 
 	/**
 	 * Get predefined objects
-     *
+     * 
 	 * The predefined objects will be synchronized with the DB at each install/upgrade
      * As soon as a class has predefined objects, then nobody can create nor delete objects
      *
      * @internal
      *
 	 * @return array An array of id => array of attcode => php value(so-called "real value": integer, string, ormDocument, DBObjectSet, etc.)
-	 */
+	 */	 	  	 	
 	public static function GetPredefinedObjects()
 	{
 		return null;
@@ -1940,7 +1941,7 @@ abstract class DBObject implements iDisplay
      * Note: Attributes (and flags) from the target state and the transition are combined.
      *
      * @internal
-     *
+     * 
      * @param string $sStimulus
      * @param string $sOriginState Default is current state
      *
@@ -2147,7 +2148,7 @@ abstract class DBObject implements iDisplay
 
 	/**
      * @internal
-     *
+     * 
 	 * @throws \CoreException
 	 * @throws \OQLException
      *
@@ -2410,7 +2411,6 @@ abstract class DBObject implements iDisplay
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 * @throws \OQLException
-	 *
 	 */
 	public function DoCheckToWrite()
 	{
@@ -2462,7 +2462,6 @@ abstract class DBObject implements iDisplay
 	}
 
 	/**
-     *
      * @api
      * @api-advanced
      *
@@ -2478,9 +2477,8 @@ abstract class DBObject implements iDisplay
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 * @throws \OQLException
-	 *
 	 */
-	public final function CheckToWrite($bDoComputeValues = true)
+	final public function CheckToWrite($bDoComputeValues = true)
 	{
 		if (MetaModel::SkipCheckToWrite())
 		{
@@ -2519,7 +2517,7 @@ abstract class DBObject implements iDisplay
 	 *
 	 * an array of displayable error is added in {@see DBObject::$m_aDeleteIssues}
 	 *
-     * @internal
+     * @internal 
      *
 	 * @param \DeletionPlan $oDeletionPlan
 	 *
@@ -2636,7 +2634,7 @@ abstract class DBObject implements iDisplay
 			{
 				// The value is a scalar, the comparison must be 100% strict
 				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
-				{
+				{	
 					//echo "$sAtt:<pre>\n";
 					//var_dump($this->m_aOrigValues[$sAtt]);
 					//var_dump($proposedValue);
@@ -2758,7 +2756,7 @@ abstract class DBObject implements iDisplay
 
 	/**
 	 * Used only by insert, Meant to be overloaded
-     *
+     * 
      * @overwritable-hook You can extend this method in order to provide your own logic.
 	 */
 	protected function OnObjectKeyReady()
@@ -2866,7 +2864,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -2875,7 +2873,7 @@ abstract class DBObject implements iDisplay
 		}
 
 		$aHierarchicalKeys = array();
-
+		
 		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef) {
 			// Skip this attribute if not defined in this table
 			if ((!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode) && !$oAttDef->CopyOnAllTables())
@@ -2885,7 +2883,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -2909,7 +2907,7 @@ abstract class DBObject implements iDisplay
 					self::$m_aBulkInsertCols[$sClass][$sTable] = implode(', ', $aFieldsToWrite);
 				}
 				self::$m_aBulkInsertItems[$sClass][$sTable][] = '('.implode (', ', $aValuesToWrite).')';
-
+				
 				$iNewKey = 999999; // TODO - compute next id....
 			}
 			else
@@ -2994,7 +2992,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -3029,7 +3027,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($value);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -3169,10 +3167,6 @@ abstract class DBObject implements iDisplay
 					// First query built upon on the root class, because the ID must be created first
 					$this->m_iKey = $this->DBInsertSingleTable($sRootClass);
 
-					//since N°5324: issue with test and db links events
-					$this->SetReadOnly('No modification allowed during transaction');
-					MetaModel::StartReentranceProtection($this);
-
 					// Then do the leaf class, if different from the root class
 					if ($sClass != $sRootClass) {
 						$this->DBInsertSingleTable($sClass);
@@ -3224,7 +3218,6 @@ abstract class DBObject implements iDisplay
 				}
 			}
 
-			$this->SetReadWrite();
 			$this->m_bIsInDB = true;
 			$this->m_bDirty = false;
 			foreach ($this->m_aCurrValues as $sAttCode => $value) {
@@ -3235,7 +3228,7 @@ abstract class DBObject implements iDisplay
 			}
 
 			// Prevent DBUpdate at this point (reentrance protection)
-			//MetaModel::StartReentranceProtection($this);
+			MetaModel::StartReentranceProtection($this);
 
 			try {
 				$this->PostInsertActions();
@@ -3314,7 +3307,7 @@ abstract class DBObject implements iDisplay
 		$this->RecordObjCreation();
 		return $ret;
 	}
-
+	
 	/**
 	 * This function is automatically called after cloning an object with the "clone" PHP language construct
 	 * The purpose of this method is to reset the appropriate attributes of the object in
@@ -3405,7 +3398,6 @@ abstract class DBObject implements iDisplay
 					}
 				}
 
-				$this->SetReadOnly('No modification allowed during transaction');
 				$iTransactionRetry = 1;
 				$bIsTransactionEnabled = MetaModel::GetConfig()->Get('db_core_transactions_enabled');
 				if ($bIsTransactionEnabled) {
@@ -3520,8 +3512,6 @@ abstract class DBObject implements iDisplay
 				// following lines are resetting changes (so after this {@see DBObject::ListChanges()} won't return changes anymore)
 				// new values are already in the object (call {@see DBObject::Get()} to get them)
 				// call {@see DBObject::ListPreviousValuesForUpdatedAttributes()} to get changed fields and previous values
-
-				$this->SetReadWrite();
 				$this->m_bDirty = false;
 				$this->m_aTouchedAtt = array();
 				$this->m_aModifiedAtt = array();
@@ -3590,7 +3580,8 @@ abstract class DBObject implements iDisplay
 		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');
 
 		// - TriggerOnObjectUpdate
-		$aParams = array('class_list' => MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL));
+		$aClassList = MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL);
+		$aParams = array('class_list' => $aClassList);
 		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
 			array(), $aParams);
 		while ($oTrigger = $oSet->Fetch()) {
@@ -3604,6 +3595,44 @@ abstract class DBObject implements iDisplay
 			}
 		}
 
+		$sClass = get_class($this);
+		if (MetaModel::HasLifecycle($sClass))
+		{
+			$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
+			if (isset($this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode])) {
+				$sPreviousState = $this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode];
+				// Change state triggers...
+				$aParams = array(
+					'class_list'     => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
+					'previous_state' => $sPreviousState,
+					'new_state'      => $this->Get($sStateAttCode),
+				);
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state'), array(), $aParams);
+				while ($oTrigger = $oSet->Fetch()) {
+					/** @var \TriggerOnStateLeave $oTrigger */
+					try {
+						$oTrigger->DoActivate($this->ToArgs('this'));
+					}
+					catch (Exception $e) {
+						$oTrigger->LogException($e, $this);
+						utils::EnrichRaisedException($oTrigger, $e);
+					}
+				}
+
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state'), array(), $aParams);
+				while ($oTrigger = $oSet->Fetch()) {
+					/** @var \TriggerOnStateEnter $oTrigger */
+					try {
+						$oTrigger->DoActivate($this->ToArgs('this'));
+					}
+					catch (Exception $e) {
+						$oTrigger->LogException($e, $this);
+						utils::EnrichRaisedException($oTrigger, $e);
+					}
+				}
+			}
+		}
+
 		// Activate any existing trigger
 		// - TriggerOnObjectMention
 		// Forgotten by the fix of N°3245
@@ -3941,7 +3970,7 @@ abstract class DBObject implements iDisplay
      * First, checks if the object can be deleted regarding database integrity.
      * If the answer is yes, it performs any required cleanup (delete other objects or reset external keys) in addition to the object
      * deletion.
-     *
+     * 
      * @api
      *
      * @param \DeletionPlan $oDeletionPlan Do not use: aims at dealing with recursion
@@ -4299,36 +4328,6 @@ abstract class DBObject implements iDisplay
 				$this->DBWrite();
 			}
 
-			// Change state triggers...
-			$aParams = array(
-				'class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
-				'previous_state' => $sPreviousState,
-				'new_state' => $sNewState,
-			);
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state"), array(), $aParams);
-			while ($oTrigger = $oSet->Fetch()) {
-				/** @var \TriggerOnStateLeave $oTrigger */
-				try {
-					$oTrigger->DoActivate($this->ToArgs('this'));
-				}
-				catch (Exception $e) {
-					$oTrigger->LogException($e, $this);
-					utils::EnrichRaisedException($oTrigger, $e);
-				}
-			}
-
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state"), array(), $aParams);
-			while ($oTrigger = $oSet->Fetch()) {
-				/** @var \TriggerOnStateEnter $oTrigger */
-				try {
-					$oTrigger->DoActivate($this->ToArgs('this'));
-				}
-				catch (Exception $e) {
-					$oTrigger->LogException($e, $this);
-					utils::EnrichRaisedException($oTrigger, $e);
-				}
-			}
-
 			$this->FireEvent(EVENT_DB_AFTER_APPLY_STIMULUS, $aEventData);
 		}
 		else
@@ -4364,7 +4363,7 @@ abstract class DBObject implements iDisplay
      *
      * @api
      *
-	 */
+	 */	 	
 	public function Reset($sAttCode)
 	{
 		$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
@@ -4376,7 +4375,7 @@ abstract class DBObject implements iDisplay
      * Suitable for use as a lifecycle action
      *
      * @api
-	 */
+	 */	 	
 	public function Copy($sDestAttCode, $sSourceAttCode)
 	{
 		$oTypeValueToCopy = MetaModel::GetAttributeDef(get_class($this), $sSourceAttCode);
@@ -4706,7 +4705,7 @@ abstract class DBObject implements iDisplay
 			{
 				throw new CoreException("Unknown attribute '$sExtKeyAttCode' for the class ".get_class($this));
 			}
-
+			
 			$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
 			if (!$oKeyAttDef instanceof AttributeExternalKey)
 			{
@@ -4724,14 +4723,14 @@ abstract class DBObject implements iDisplay
 				$ret  = $oRemoteObj->GetForTemplate($sRemoteAttCode);
 			}
 		}
-		else
+		else 
 		{
 			switch($sPlaceholderAttCode)
 			{
 				case 'id':
 				$ret = $this->GetKey();
 				break;
-
+				
 				case 'name()':
 				$ret = $this->GetName();
 				break;
@@ -4918,7 +4917,7 @@ abstract class DBObject implements iDisplay
 		if ($oOwner)
 		{
 			$sLinkSetOwnerClass = get_class($oOwner);
-
+			
 			$oMyChangeOp = MetaModel::NewObject($sChangeOpClass);
 			$oMyChangeOp->Set("objclass", $sLinkSetOwnerClass);
 			$oMyChangeOp->Set("objkey", $iLinkSetOwnerId);
@@ -4945,7 +4944,7 @@ abstract class DBObject implements iDisplay
 		{
 			/** @var \AttributeLinkedSet $oLinkSet */
 			if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
-
+			
 			$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
 			$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
 			if ($oMyChangeOp)
@@ -5015,7 +5014,7 @@ abstract class DBObject implements iDisplay
 				// Keep track of link changes
 				//
 				if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_DETAILS) == 0) continue;
-
+				
 				$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
 				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksTune');
 				if ($oMyChangeOp)
@@ -5164,7 +5163,7 @@ abstract class DBObject implements iDisplay
 		$this->FireEventCheckToDelete($oDeletionPlan);
 		$this->DoCheckToDelete($oDeletionPlan);
 		$oDeletionPlan->SetDeletionIssues($this, $this->m_aDeleteIssues, $this->m_bSecurityIssue);
-
+	
 		$aDependentObjects = $this->GetReferencingObjects(true /* allow all data */);
 
 		// Getting and setting time limit are not symmetric:
@@ -5346,7 +5345,7 @@ abstract class DBObject implements iDisplay
 				$aSynchroClasses[] = $sTarget;
 			}
 		}
-
+		
 		foreach($aSynchroClasses as $sClass)
 		{
 			if ($this instanceof $sClass)
@@ -6284,7 +6283,10 @@ abstract class DBObject implements iDisplay
 				}
 			}
 			finally {
-				$oKPI->ComputeStats('FireEvent', $sEvent);
+				if (!$oKPI->ComputeStatsForExtension($this, $sCallback, "Event: $sEvent")) {
+					$sSignature = ModuleService::GetInstance()->GetModuleMethodSignature($this, $sCallback);
+					$oKPI->ComputeStats('FireEvent', "$sEvent callback: $sSignature");
+				}
 			}
 		}
 		if (!is_null($oFirstException)) {

core/expressioncache.class.inc.php

@@ -101,7 +101,7 @@ EOF;
 EOF;
 
 				SetupUtils::builddir(dirname($sFilePath));
-				file_put_contents($sFilePath, $content, LOCK_EX);
+				file_put_contents($sFilePath, $content);
 			}
 		}
 		Dict::SetUserLanguage($sUserLang);

core/kpi.class.inc.php

@@ -3,6 +3,7 @@
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
+
 use Combodo\iTop\Core\Kpi\KpiLogData;
 use Combodo\iTop\Service\Module\ModuleService;
 
@@ -404,16 +405,31 @@ class ExecutionKPI
 		$this->ResetCounters();
 	}
 
-    public function ComputeStatsForExtension($object, $sMethod)
+	/**
+	 * Compute statistics for a call to an extension
+	 * Note: not working in dev mode (with links to env-production)
+	 *
+	 * @param object|string $object object called
+	 * @param string $sMethod       method called on the object
+	 * @param string $sMessage      additional message
+	 *
+	 * @return bool true if an extension was found for this object::method
+	 * @throws \ReflectionException
+	 */
+	public function ComputeStatsForExtension($object, string $sMethod, string $sMessage = ''): bool
     {
         if (!self::IsEnabled()) {
-            return;
+            return true;
         }
 
         $sSignature = ModuleService::GetInstance()->GetModuleMethodSignature($object, $sMethod);
         if (utils::StartsWith($sSignature, '[')) {
-            $this->ComputeStats('Extension', $sSignature);
+            $this->ComputeStats('Extension', "$sSignature $sMessage");
+
+			return true;
         }
+
+		return false;
     }
 
 	public function ComputeStats($sOperation, $sArguments)

core/log.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.
@@ -576,11 +576,6 @@ class LogChannels
 	public const DATATABLE = 'Datatable';
 
 	public const DEADLOCK = 'DeadLock';
-	/**
-	 * @var string Everything related to PHP sessions tracking
-	 * @since 3.1.1 3.2.0 N°6901
-	 */
-	public const SESSIONTRACKER = 'SessionTracker';
 
 	/**
 	 * @var string Everything related to the datamodel CRUD
@@ -1676,6 +1671,8 @@ class ExceptionLog extends LogAPI
 	 */
 	private static function GetLastEventIssue()
 	{
-		return self::$oLastEventIssue;
+		$oRet = self::$oLastEventIssue;
+		self::$oLastEventIssue = null;
+		return $oRet;
 	}
 }

core/metamodel.class.php

@@ -6774,7 +6774,13 @@ abstract class MetaModel
 
 		if ($bMustBeFound && empty($aRow))
 		{
-			throw new CoreException("No result for the single row query: '$sSQL'");
+			$sNotFoundErrorMessage = "No result for the single row query";
+			IssueLog::Info($sNotFoundErrorMessage, LogChannels::CMDB_SOURCE, [
+				'class' => $sClass,
+				'key' => $iKey,
+				'sql_query' => $sSQL,
+				]);
+			throw new CoreException($sNotFoundErrorMessage);
 		}
 
 		return $aRow;
@@ -7623,20 +7629,6 @@ abstract class MetaModel
 		return false;
 	}
 
-	/**
-	 * @since 3.1.0 N°5324: to ease reentrance checks when using events on links (to avoid reentering if main link object ongoing operation)
-	 */
-	public static function GetReentranceObjectByChildClass(string $sParentClass, $sKey)
-	{
-		foreach (self::EnumChildClasses($sParentClass, ENUM_CHILD_CLASSES_ALL, false) as $sChildClass){
-			if (self::GetReentranceObject($sChildClass, $sKey)){
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	/**
 	 * @param \DBObject $oObject
 	 *

core/userrights.class.inc.php

@@ -856,6 +856,8 @@ class UserRights
 	}
 
 	/**
+	 * Set the current user (as part of the login process)
+	 *
 	 * @param string $sLogin Login of the concerned user
 	 * @param string $sAuthentication
 	 *
@@ -865,8 +867,6 @@ class UserRights
 	 */
 	public static function Login($sLogin, $sAuthentication = 'any')
 	{
-		static::Logoff();
-
 		$oUser = self::FindUser($sLogin, $sAuthentication);
 		if (is_null($oUser))
 		{
@@ -885,6 +885,8 @@ class UserRights
 	}
 
 	/**
+	 * Reset current user and cleanup associated SESSION data
+	 *
 	 * @return void
 	 * @since 3.0.4 3.1.1 3.2.0
 	 */

css/backoffice/pages/_csv-import.scss

@@ -51,4 +51,4 @@ tr.ibo-csv-import--row-added td {
   font-size: $ibo-csv-import--download-file--font-size;
   color: $ibo-csv-import--download-file--color;
   margin: $ibo-csv-import--download-file--margin;
-}
+}

css/backoffice/pages/_welcome-popup.scss

@@ -17,9 +17,7 @@ $ibo-welcome-popup--text--options--bottom: 10px !default;
 
 #welcome_popup{
   display: flex;
-}
-.ibo-welcome-popup--columns{
-	display: flex;
+  
 }
 .ibo-welcome-popup--image{
   display: flex;
@@ -46,39 +44,7 @@ $ibo-welcome-popup--text--options--bottom: 10px !default;
     }
   }
 }
-.ibo-welcome-popup--dialog {
-	width: 60rem;
-}
-.ibo-welcome-popup--content {
-	width: 100%; 
-	.ibo-welcome-popup--message {
-		width: 100%;
-		min-height: 12rem;
-	}
-	.ibo-welcome-popup--button {
-		width: 100%;
-		text-align: center;
-		padding-top: 1rem;
-		position: absolute;
-		bottom: 4.5rem;
-	}
-}
-.ibo-welcome-popup--indicators {
-	width: 100%;
-	display: block;
-	text-align: center;
-	padding-top: 1.5rem;
-	padding-bottom: 0;
-	height: 3rem;
-	.ibo-welcome-popup--indicator {
-		width: 1rem;
-		height: 1rem;
-		border-radius: 0.5rem;
-		background-color: $ibo-color-secondary-600;
-		display: inline-block;
-		cursor: pointer;
-	}
-	.ibo-welcome-popup--active {
-		background-color: $ibo-color-information-600 !important;
-	}
+.ibo-welcome-popup--text--options{
+  position: absolute;
+  bottom: $ibo-welcome-popup--text--options--bottom;
 }

css/backoffice/vendors/_bulma-variables-overload.scss

@@ -13,6 +13,9 @@ $body-overflow-x: hidden !default;
 $body-overflow-y: auto !default;
 
 
+/*N°5786 - Avoid strong text to always be grey (default Bulma color for this var.) so strong text can keep its color. This  is mostly for text within the .ibo-is-html-content. */
+$text-strong: inherit !default;
+
 /**
  * customize Bulma content variables
  * See https://bulma.io/documentation/elements/content/

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

@@ -355,4 +355,26 @@
       </presentation>
     </class>
   </classes>
+  <meta>
+    <classes>
+      <class id="UserInternal" _delta="define_if_not_exists">
+        <fields>
+          <field id="contactid" xsi:type="AttributeExternalKey">
+            <target_class>Contact</target_class>
+          </field>
+          <field id="first_name" xsi:type="AttributeExternalField"/>
+          <field id="last_name" xsi:type="AttributeExternalField"/>
+          <field id="status" xsi:type="AttributeEnum"/>
+          <field id="org_id" xsi:type="AttributeExternalField"/>
+          <field id="email" xsi:type="AttributeExternalField"/>
+          <field id="login" xsi:type="AttributeString"/>
+          <field id="language" xsi:type="AttributeApplicationLanguage"/>
+          <field id="status" xsi:type="AttributeEnum"/>
+          <field id="allowed_org_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="profile_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="log" xsi:type="AttributeCaseLog"/>
+        </fields>
+      </class>
+    </classes>
+  </meta>
 </itop_design>

datamodels/2.x/itop-backup/dbrestore.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.
@@ -34,7 +34,7 @@ class DBRestore extends DBBackup
 
 	protected function LogInfo($sMsg)
 	{
-		IssueLog::Info('non juste info: '.$sMsg);
+		//IssueLog::Info('non juste info: '.$sMsg);
 	}
 
 	protected function LogError($sMsg)
@@ -91,7 +91,7 @@ class DBRestore extends DBBackup
 			{
 				$this->LogError("mysql said: $sLine");
 			}
-			if (count($aOutput) == 1)
+			if (count($aOutput) == 1) 
 			{
 				$sMoreInfo = trim($aOutput[0]);
 			}
@@ -187,7 +187,7 @@ class DBRestore extends DBBackup
 				@chmod($sConfigFile, 0770); // Allow overwriting the file
 				rename($sDataDir.'/config-itop.php', $sConfigFile);
 				@chmod($sConfigFile, 0440); // Read-only
-
+				
 				$aExtraFiles = $this->ListExtraFiles($sDataDir);
 				foreach($aExtraFiles as $sSourceFilePath => $sDestinationFilePath) {
 					SetupUtils::builddir(dirname($sDestinationFilePath));

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -6354,17 +6354,7 @@
             <attribute id="connectableci_id"/>
           </attributes>
         </reconciliation>
-        <uniqueness_rules>
-          <rule id="no_duplicate">
-            <attributes>
-              <attribute id="networkdevice_id"/>
-              <attribute id="connectableci_id"/>
-            </attributes>
-            <filter><![CDATA[]]></filter>
-            <disabled>false</disabled>
-            <is_blocking>true</is_blocking>
-          </rule>
-        </uniqueness_rules>
+        <uniqueness_rules/>
       </properties>
       <fields>
         <field id="networkdevice_id" xsi:type="AttributeExternalKey">

datamodels/2.x/itop-portal-base/portal/public/css/portal.scss

@@ -1803,6 +1803,11 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 	text-decoration: line-through;
 }
 
+/* Tippy: Handle multi-line content */
+.tippy-content {
+	white-space: pre-line;
+}
+
 /**********************************************************/
 /* Shameful area (things that should be refactored soon) */
 /**********************************************************/

datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php

@@ -1105,7 +1105,11 @@ class ObjectController extends BrickController
 		// When reaching to an Attachment, we have to check security on its host object instead of the Attachment itself
 		if ($sObjectClass === 'Attachment')
 		{
-			$oAttachment = MetaModel::GetObject($sObjectClass, $sObjectId, true, true);
+			
+			$oAttachment = MetaModel::GetObject($sObjectClass, $sObjectId, false, true);
+			if ($oAttachment === null) {
+				throw new HttpException(Response::HTTP_NOT_FOUND, Dict::S('UI:ObjectDoesNotExist'));
+			}
 			$sHostClass = $oAttachment->Get('item_class');
 			$sHostId = $oAttachment->Get('item_id');
 			
@@ -1384,7 +1388,7 @@ class ObjectController extends BrickController
 		$aObjectIds = $oRequestManipulator->ReadParam('aObjectIds', array(), FILTER_UNSAFE_RAW);
 		$aObjectAttCodes = $oRequestManipulator->ReadParam('aObjectAttCodes', array(), FILTER_UNSAFE_RAW);
 		$aLinkAttCodes = $oRequestManipulator->ReadParam('aLinkAttCodes', array(), FILTER_UNSAFE_RAW);
-		$sDateTimePickerWidgetParent = $oRequestManipulator->ReadParam('sDateTimePickerWidgetParent', array(), FILTER_SANITIZE_STRING);
+		$sDateTimePickerWidgetParent = $oRequestManipulator->ReadParam('sDateTimePickerWidgetParent', array(), FILTER_UNSAFE_RAW);
 
 		if (empty($sObjectClass) || empty($aObjectIds) || empty($aObjectAttCodes)) {
 			IssueLog::Info(__METHOD__.' at line '.__LINE__.' : sObjectClass, aObjectIds and aObjectAttCodes expected, "'.$sObjectClass.'", "'.implode('/',

datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig

@@ -67,6 +67,8 @@
 
 <script type="text/javascript">
 	$(document).ready(function(){
+		CombodoJsActivity.AddOngoingScript();
+
 		// Form field set declaration
 		var oFieldSet_{{ sFormIdSanitized }} = $('#{{ sFormId }} > .form_fields').field_set({{ form.fieldset|json_encode()|raw }});
 		// Form handler declaration
@@ -149,5 +151,7 @@
 			$('#{{ sFormId }}').closest('.modal').scrollTop(0);
 			$('#{{ sFormId }}').closest('.modal').find('.modal-footer').hide();
 		{% endif %}
+
+		CombodoJsActivity.RemoveOngoingScript();
 	});
 </script>

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes/>
   <user_rights>
     <groups>
@@ -546,6 +546,5 @@
         <groups/>
       </profile>
     </profiles>
-  <dictionaries/>
   </user_rights>
 </itop_design>

datamodels/2.x/itop-profiles-itil/dictionaries/en.dict.itop-profiles-itil.php

@@ -1,13 +0,0 @@
-<?php
-/**
- * Localized data
- *
- * @copyright   Copyright (C) Combodo SARL 2022
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:User/NonStandaloneProfileWarning' => 'Profile %1$s cannot be standalone. You should add other profiles to user %2$s otherwise you may encounter access issue with this user.',
-	'Class:User/NonStandaloneProfileWarning-ReparationMessage' => 'Profile %1$s cannot be standalone. User %2$s has been completed with another profile: %3$s.',
-));
-

datamodels/2.x/itop-profiles-itil/dictionaries/fr.dict.itop-profiles-itil.php

@@ -1,13 +0,0 @@
-<?php
-/**
- * Localized data
- *
- * @copyright   Copyright (C) Combodo SARL 2022
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:User/NonStandaloneProfileWarning' => 'Le profil %1$s ne peut être seul. Sans le rajout d\'autres profiles, l\'utilisateur %2$s peut rencontrer des problèmes dans iTop.',
-	'Class:User/NonStandaloneProfileWarning-ReparationMessage' => 'Le profil %1$s ne peut être seul. Le user %2$s a été complété par le profil %3$s.',
-));
-

datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php

@@ -36,7 +36,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'src/UserProfilesEventListener.php'
 		),
 		'webservice' => array(
 			//'webservices.itop-profiles-itil.php',

datamodels/2.x/itop-profiles-itil/src/UserProfilesEventListener.php

@@ -1,394 +0,0 @@
-<?php
-/*
- * @copyright   Copyright (C) 2010-2023 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\ItilProfiles;
-
-use Combodo\iTop\Service\Events\EventData;
-use Combodo\iTop\Service\Events\EventService;
-use Combodo\iTop\Service\Events\iEventServiceSetup;
-use Exception;
-use IssueLog;
-use LogChannels;
-
-define('POWER_USER_PORTAL_PROFILE_NAME', 'Portal power user');
-
-/**
- * Class UserProfilesEventListener
- *
- * @package Combodo\iTop\Core\EventListener
- * @since 3.1 N°5324 - Avoid to have users with non-standalone power portal profile only
- *
- */
-class UserProfilesEventListener implements iEventServiceSetup
-{
-	const USERPROFILE_REPAIR_ITOP_PARAM_NAME = 'security.single_profile_completion';
-	private $bIsRepairmentEnabled = false;
-
-	//map: non standalone profile name => repairing profile id
-	private $aNonStandaloneProfilesMap = [];
-
-	/**
-	 * @inheritDoc
-	 */
-	public function RegisterEventsAndListeners()
-	{
-		$this->Init();
-
-		if (false === $this->bIsRepairmentEnabled){
-			IssueLog::Debug('UserProfilesEventListener bIsRepairmentEnabled disabled', LogChannels::DM_CRUD);
-			return;
-		}
-
-		$aEventSource = [\User::class, \UserExternal::class, \UserInternal::class];
-		EventService::RegisterListener(
-			EVENT_DB_BEFORE_WRITE,
-			[$this, 'OnUserEdition'],
-			$aEventSource
-		);
-
-		EventService::RegisterListener(
-			EVENT_DB_BEFORE_WRITE,
-			[ $this, 'OnUserProfileEdition' ],
-			[ \URP_UserProfile::class ],
-			[],
-			null
-		);
-
-		EventService::RegisterListener(
-			EVENT_DB_CHECK_TO_DELETE,
-			[ $this, 'OnUserProfileLinkDeletion' ],
-			[ \URP_UserProfile::class ],
-			[],
-			null
-		);
-	}
-
-	public function IsRepairmentEnabled() : bool
-	{
-		return $this->bIsRepairmentEnabled;
-	}
-
-
-	public function OnUserEdition(EventData $oEventData): void {
-		/** @var \User $oObject */
-		$oUser = $oEventData->Get('object');
-
-		try {
-			$this->ValidateThenRepairOrWarn($oUser);
-		} catch (Exception $e) {
-			IssueLog::Error('Exception occurred on RepairProfiles', LogChannels::DM_CRUD, [
-				'user_class' => get_class($oUser),
-				'user_id' => $oUser->GetKey(),
-				'exception_message' => $e->getMessage(),
-				'exception_stacktrace' => $e->getTraceAsString(),
-			]);
-			if ($e instanceof \CoreCannotSaveObjectException){
-				throw $e;
-			}
-		}
-	}
-
-	public function OnUserProfileEdition(EventData $oEventData): void {
-		$oURP_UserProfile = $oEventData->Get('object');
-
-		try {
-			$iUserId = $oURP_UserProfile->Get('userid');
-			$oUser = \MetaModel::GetReentranceObjectByChildClass(\User::class, $iUserId);
-			if (false !== $oUser){
-				IssueLog::Debug('OnUserProfileEdition user already being edited', LogChannels::DM_CRUD);
-				//user edition: handled by other event
-				return;
-			}
-
-			$oUser = \MetaModel::GetObject(\User::class, $iUserId);
-			$aChanges = $oURP_UserProfile->ListChanges();
-			if (array_key_exists('userid', $aChanges)) {
-				IssueLog::Debug('OnUserProfileEdition userid changed', LogChannels::DM_CRUD);
-				$iUserId = $oURP_UserProfile->GetOriginal('userid');
-				$oPreviousUser = \MetaModel::GetObject(\User::class, $iUserId);
-
-				$oProfileLinkSet = $oPreviousUser->Get('profile_list');
-				$oProfileLinkSet->Rewind();
-				$iCount = 0;
-				$sSingleProfileName = null;
-				while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
-					$sNewUserId = $oCurrentURP_UserProfile->Get('userid');
-					$sOriginalUserId = $oCurrentURP_UserProfile->GetOriginal('userid');
-					if ($sNewUserId !== $sOriginalUserId) {
-						$sRemovedProfileId = $oCurrentURP_UserProfile->GetOriginal('profileid');
-						IssueLog::Debug('OnUserProfileEdition profile moved does not count', LogChannels::DM_CRUD, [
-							'URP_UserProfile' => $oURP_UserProfile->GetKey(),
-							'sRemovedProfileId' => $sRemovedProfileId,
-							'sNewUserId' => $sNewUserId,
-							'sOriginalUserId' => $sOriginalUserId,
-						]);
-						continue;
-					}
-
-					$iCount++;
-					if ($iCount  > 1){
-						IssueLog::Debug('OnUserProfileEdition more than one user', LogChannels::DM_CRUD);
-						//more than one profile: no repairment needed
-						return;
-					}
-					$sSingleProfileName = $oCurrentURP_UserProfile->Get('profile');
-				}
-				$this->RepairProfileChangesOrWarn($oPreviousUser, $sSingleProfileName, $oURP_UserProfile, $sRemovedProfileId);
-			} else if (array_key_exists('profileid', $aChanges)){
-				IssueLog::Debug('OnUserProfileEdition profileid changed', LogChannels::DM_CRUD);
-				$oCurrentUserProfileSet = $oUser->Get('profile_list');
-				if ($oCurrentUserProfileSet->Count() === 1){
-					$oProfile = $oCurrentUserProfileSet->Fetch();
-
-					$this->RepairProfileChangesOrWarn($oUser, $oProfile->Get('profile'), $oURP_UserProfile, $oProfile->GetOriginal("profileid"));
-				}
-			}
-		} catch (Exception $e) {
-			IssueLog::Error('OnUserProfileEdition Exception', LogChannels::DM_CRUD, [
-				'user_id' => $iUserId,
-				'lnk_id' => $oURP_UserProfile->GetKey(),
-				'exception_message' => $e->getMessage(),
-				'exception_stacktrace' => $e->getTraceAsString(),
-			]);
-			if ($e instanceof \CoreCannotSaveObjectException){
-				throw $e;
-			}
-		}
-	}
-
-	public function OnUserProfileLinkDeletion(EventData $oEventData): void {
-		$oURP_UserProfile = $oEventData->Get('object');
-
-		try {
-			$iUserId = $oURP_UserProfile->Get('userid');
-			$oUser = \MetaModel::GetReentranceObjectByChildClass(\User::class, $iUserId);
-			if (false !== $oUser){
-				IssueLog::Debug('OnUserProfileLinkDeletion user being deleted already', LogChannels::DM_CRUD);
-				//user edition: handled by other event
-				return;
-			}
-
-			$oUser = \MetaModel::GetObject(\User::class, $iUserId);
-
-			/** @var \DeletionPlan $oDeletionPlan */
-			$oDeletionPlan = $oEventData->Get('deletion_plan');
-			$aDeletedURP_UserProfiles = [];
-			if (! is_null($oDeletionPlan)){
-				$aListDeletes = $oDeletionPlan->ListDeletes();
-				if (array_key_exists(\URP_UserProfile::class, $aListDeletes)) {
-					foreach ($aListDeletes[\URP_UserProfile::class] as $iId => $aDeletes) {
-						$aDeletedURP_UserProfiles []= $iId;
-					}
-				}
-			}
-
-			$oProfileLinkSet = $oUser->Get('profile_list');
-			$oProfileLinkSet->Rewind();
-			$sSingleProfileName = null;
-			$iCount = 0;
-			while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
-				if (in_array($oCurrentURP_UserProfile->GetKey(), $aDeletedURP_UserProfiles)) {
-					continue;
-				}
-				$iCount++;
-				if ($iCount  > 1){
-					IssueLog::Debug('OnUserProfileLinkDeletion more than one profile', LogChannels::DM_CRUD);
-					//more than one profile: no repairment needed
-					return;
-				}
-				$sSingleProfileName = $oCurrentURP_UserProfile->Get('profile');
-			}
-
-			$this->RepairProfileChangesOrWarn($oUser, $sSingleProfileName, $oURP_UserProfile, $oURP_UserProfile->Get('profileid'), true);
-		} catch (Exception $e) {
-			IssueLog::Error('OnUserProfileLinkDeletion Exception', LogChannels::DM_CRUD, [
-				'user_id' => $iUserId,
-				'profile_id' => $oURP_UserProfile->Get('profileid'),
-				'exception_message' => $e->getMessage(),
-				'exception_stacktrace' => $e->getTraceAsString(),
-			]);
-		}
-	}
-
-
-	/**
-	 * @param $aPortalDispatcherData: passed only for testing purpose
-	 *
-	 * @return void
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 */
-	public function Init($aPortalDispatcherData=null) : void {
-		if (is_null($aPortalDispatcherData)){
-			$aPortalDispatcherData = \PortalDispatcherData::GetData();
-		}
-
-		$aNonStandaloneProfiles = \utils::GetConfig()->Get(self::USERPROFILE_REPAIR_ITOP_PARAM_NAME, null);
-
-		//When there are several customized portals on an itop, choosing a specific profile means choosing which portal user will access
-		//In that case, itop administrator has to specify it via itop configuration. we dont use default profiles repairment otherwise
-		if (is_null($aNonStandaloneProfiles)){
-			if (count($aPortalDispatcherData) > 2){
-				IssueLog::Debug('Init repairment disabled as there are more than 2 portals (extended customer should decide on their own)', LogChannels::DM_CRUD);
-				$this->bIsRepairmentEnabled = false;
-				return;
-			}
-
-			$aPortalNames = array_keys($aPortalDispatcherData);
-			sort($aPortalNames);
-			if ($aPortalNames !== ['backoffice', 'itop-portal']){
-				IssueLog::Debug('Init repairment disabled there is a custom portal', LogChannels::DM_CRUD, [$aPortalNames]);
-				$this->bIsRepairmentEnabled = false;
-				return;
-			}
-		}
-
-		if (is_null($aNonStandaloneProfiles)){
-			//default configuration in the case there are no customized portals
-			$aNonStandaloneProfiles = [ POWER_USER_PORTAL_PROFILE_NAME => PORTAL_PROFILE_NAME ];
-		}
-
-		if (! is_array($aNonStandaloneProfiles)){
-			\IssueLog::Error(sprintf("%s is badly configured. it should be an array.", self::USERPROFILE_REPAIR_ITOP_PARAM_NAME),LogChannels::DM_CRUD, [self::USERPROFILE_REPAIR_ITOP_PARAM_NAME => $aNonStandaloneProfiles]);
-			$this->bIsRepairmentEnabled = false;
-			return;
-		}
-
-		if (empty($aNonStandaloneProfiles)){
-			//Feature specifically disabled in itop configuration
-			IssueLog::Debug('Init repairment disabled by conf on purpose', LogChannels::DM_CRUD);
-			$this->bIsRepairmentEnabled = false;
-			return;
-		}
-
-
-		$this->FetchRepairingProfileIds($aNonStandaloneProfiles);
-	}
-
-	public function FetchRepairingProfileIds(array $aNonStandaloneProfiles) : void {
-		$aProfiles = [];
-		try {
-			$aProfilesToSearch = array_unique(array_values($aNonStandaloneProfiles));
-			if(($iIndex = array_search(null, $aProfilesToSearch)) !== false) {
-				unset($aProfilesToSearch[$iIndex]);
-			}
-
-			if (1 === count($aProfilesToSearch)){
-				$sInCondition = sprintf('"%s"', array_pop($aProfilesToSearch));
-			} else {
-				$sInCondition = sprintf('"%s"', implode('","', $aProfilesToSearch));
-			}
-
-			$sOql = "SELECT URP_Profiles WHERE name IN ($sInCondition)";
-			$oSearch = \DBSearch::FromOQL($sOql);
-			$oSearch->AllowAllData();
-			$oSet = new \DBObjectSet($oSearch);
-			while(($oProfile = $oSet->Fetch()) != null) {
-				$sProfileName = $oProfile->Get('name');
-				$aProfiles[$sProfileName] = $oProfile->GetKey();
-			}
-
-			$this->aNonStandaloneProfilesMap = [];
-			foreach ($aNonStandaloneProfiles as $sNonStandaloneProfileName => $sRepairProfileName) {
-				if (is_null($sRepairProfileName)) {
-					$this->aNonStandaloneProfilesMap[$sNonStandaloneProfileName] = null;
-					continue;
-				}
-
-				if (! array_key_exists($sRepairProfileName, $aProfiles)) {
-					throw new \Exception(sprintf("%s is badly configured. profile $sRepairProfileName does not exist.", self::USERPROFILE_REPAIR_ITOP_PARAM_NAME));
-				}
-
-				$this->aNonStandaloneProfilesMap[$sNonStandaloneProfileName] = [ 'name' => $sRepairProfileName, 'id' => $aProfiles[$sRepairProfileName]];
-			}
-
-			$this->bIsRepairmentEnabled = true;
-		} catch (\Exception $e) {
-			IssueLog::Error('Exception when searching user portal profile', LogChannels::DM_CRUD, [
-				'exception_message' => $e->getMessage(),
-				'exception_stacktrace' => $e->getTraceAsString(),
-				'aProfiles' => $aProfiles,
-				'aNonStandaloneProfiles' => $aNonStandaloneProfiles,
-			]);
-			$this->bIsRepairmentEnabled = false;
-		}
-	}
-
-	public function ValidateThenRepairOrWarn(\User $oUser) : void
-	{
-		$oCurrentUserProfileSet = $oUser->Get('profile_list');
-		if ($oCurrentUserProfileSet->Count() === 1){
-			IssueLog::Debug('ValidateThenRepairOrWarn one profile found', LogChannels::DM_CRUD);
-			$oProfile = $oCurrentUserProfileSet->Fetch();
-
-			$this->RepairUserChangesOrWarn($oUser, $oProfile->Get('profile'));
-		}
-	}
-
-	public function RepairUserChangesOrWarn(\User $oUser, string $sSingleProfileName) : void {
-		IssueLog::Debug('RepairUserChangesOrWarn', LogChannels::DM_CRUD,
-			[
-				'aNonStandaloneProfilesMap' => $this->aNonStandaloneProfilesMap,
-				'sSingleProfileName' => $sSingleProfileName
-			]
-		);
-
-		if (array_key_exists($sSingleProfileName, $this->aNonStandaloneProfilesMap)) {
-			$aRepairingProfileInfo = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
-			if (is_null($aRepairingProfileInfo)){
-				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName, $oUser->Get('friendlyname'));
-				throw new \CoreCannotSaveObjectException(array('issues' => [$sMessage], 'class' => get_class($oUser), 'id' => $oUser->GetKey()));
-			} else {
-				//Completing profiles profiles by adding repairing one : by default portal user to a power portal user
-				$oUserProfile = new \URP_UserProfile();
-				$oUserProfile->Set('profileid', $aRepairingProfileInfo['id']);
-				$oCurrentUserProfileSet = $oUser->Get('profile_list');
-				$oCurrentUserProfileSet->AddItem($oUserProfile);
-				$oUser->Set('profile_list', $oCurrentUserProfileSet);
-				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning-ReparationMessage", $sSingleProfileName, $oUser->Get('friendlyname'), $aRepairingProfileInfo['name']);
-				$oUser::SetSessionMessage(get_class($oUser), $oUser->GetKey(), 1, $sMessage, 'WARNING', 1);
-			}
-		}
-	}
-
-	public function RepairProfileChangesOrWarn(\User $oUser, ?string $sSingleProfileName, \URP_UserProfile $oURP_UserProfile, string $sRemovedProfileId, $bIsRemoval=false) : void {
-		IssueLog::Debug('RepairUserChangesOrWarn', LogChannels::DM_CRUD,
-			[
-				'aNonStandaloneProfilesMap' => $this->aNonStandaloneProfilesMap,
-				'sSingleProfileName' => $sSingleProfileName
-			]
-		);
-
-		if (is_null($sSingleProfileName)){
-			return;
-		}
-
-		if (array_key_exists($sSingleProfileName, $this->aNonStandaloneProfilesMap)) {
-			$aRepairingProfileInfo = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
-			if (is_null($aRepairingProfileInfo)
-				|| ($aRepairingProfileInfo['id'] === $sRemovedProfileId) //cannot repair by readding same remove profile as it will raise uniqueness rule
-			){
-				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName, $oUser->Get('friendlyname'));
-				if ($bIsRemoval){
-					$oURP_UserProfile->AddDeleteIssue($sMessage);
-				} else {
-					throw new \CoreCannotSaveObjectException(array('issues' => [$sMessage], 'class' => get_class($oURP_UserProfile), 'id' => $oURP_UserProfile->GetKey()));
-				}
-			} else {
-				//Completing profiles profiles by adding repairing one : by default portal user to a power portal user
-				$oUserProfile = new \URP_UserProfile();
-				$oUserProfile->Set('profileid', $aRepairingProfileInfo['id']);
-				$oCurrentUserProfileSet = $oUser->Get('profile_list');
-				$oCurrentUserProfileSet->AddItem($oUserProfile);
-				$oUser->Set('profile_list', $oCurrentUserProfileSet);
-				$oUser->DBWrite();
-
-				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning-ReparationMessage", $sSingleProfileName, $oUser->Get('friendlyname'), $aRepairingProfileInfo['name']);
-				$oURP_UserProfile::SetSessionMessage(get_class($oURP_UserProfile), $oURP_UserProfile->GetKey(), 1, $sMessage, 'WARNING', 1);
-			}
-		}
-	}
-}

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -1748,48 +1748,15 @@ public function PrefillSearchForm(&$aContextParam)
           <ext_key_to_remote>slt_id</ext_key_to_remote>
           <duplicates/>
         </field>
-        <field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
+        <field id="customercontracts_list" xsi:type="AttributeLinkedSet">
           <linked_class>lnkCustomerContractToService</linked_class>
           <ext_key_to_me>sla_id</ext_key_to_me>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <ext_key_to_remote>customercontract_id</ext_key_to_remote>
-          <duplicates>true</duplicates>
+          <edit_mode>none</edit_mode>
         </field>
       </fields>
-      <methods>
-        <method id="DoCheckToWrite">
-          <static>false</static>
-          <access>public</access>
-          <code><![CDATA[
-					public function DoCheckToWrite()
-	{
-		parent::DoCheckToWrite();
-
-		$aCustomerContracts = $this->Get("customercontracts_list");
-		foreach ($aCustomerContracts as $sAttCode => $oCustomerContracts)
-		{
-			// Recurse inside the subdirectories
-			$sOql = "SELECT lnkCustomerContractToService AS ccs WHERE ccs.customercontract_id=:customercontract_id AND ccs.service_id=:service_id";
-			$aQueryParams['customercontract_id'] = $oCustomerContracts->Get("customercontract_id");
-			$aQueryParams['service_id'] = $oCustomerContracts->Get("service_id");
-			if ($this->Get("id") != null)
-			{
-				$sOql = $sOql." AND ccs.sla_id!=:sla_id";
-				$aQueryParams['sla_id'] = $this->Get("id");
-			}
-			$oQuery = DBSearch::FromOQL($sOql, $aQueryParams);
-			$oResultSql = new DBObjectSet($oQuery);
-			$oResultSql->OptimizeColumnLoad(['ccs' => ['customercontract_name','service_name']]);
-			if ($aCurrentRow = $oResultSql->Fetch())
-			{
-				$this->m_aCheckIssues[] = Dict::Format('Class:SLA/Error:UniqueLnkCustomerContractToService',$aCurrentRow->Get('customercontract_name'),$aCurrentRow->Get('service_name'));
-			}
-		}
-	}
-			     ]]></code>
-        </method>
-      </methods>
+      <methods/>
       <presentation>
         <details>
           <items>

datamodels/2.x/itop-structure/datamodel.itop-structure.xml

@@ -713,6 +713,7 @@
           <linked_class>User</linked_class>
           <ext_key_to_me>contactid</ext_key_to_me>
           <edit_mode>add_only</edit_mode>
+          <edit_when>on_host_display</edit_when>
           <count_min>0</count_min>
           <count_max>0</count_max>
         </field>

dictionaries/en.dictionary.itop.ui.php

@@ -248,7 +248,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:URP_UserOrg' => 'User organizations',
 	'Class:URP_UserOrg+' => 'Allowed organizations',
-	'Class:URP_UserOrg/Name' => 'LinkGG between %1$s and %2$s',
+	'Class:URP_UserOrg/Name' => 'Link between %1$s and %2$s',
 	'Class:URP_UserOrg/Attribute:userid' => 'User',
 	'Class:URP_UserOrg/Attribute:userid+' => 'user account',
 	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
@@ -452,7 +452,6 @@ Dict::Add('EN US', 'English', 'English', array(
 We hope you’ll enjoy this version as much as we enjoyed imagining and creating it.</div>
 
 <div>Customize your '.ITOP_APPLICATION.' preferences for a personalized experience.</div>',
-	'UI:WelcomePopup:Button:Acknowledge' => 'Ok, discard this message',
 	'UI:WelcomeMenu:AllOpenRequests' => 'Open requests: %1$d',
 	'UI:WelcomeMenu:MyCalls'         => 'My requests',
 	'UI:WelcomeMenu:OpenIncidents'   => 'Open incidents: %1$d',

dictionaries/es_cr.dictionary.itop.ui.php

@@ -444,7 +444,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.</div>
 
 <div>Configure las preferencias de '.ITOP_APPLICATION.' para una experiencia personalizada.</div>',
-	'UI:WelcomePopup:Button:Acknowledge' => 'Ok, descartar este mensaje',
 	'UI:WelcomeMenu:AllOpenRequests' => 'Requerimientos Abiertos: %1$d',
 	'UI:WelcomeMenu:MyCalls' => 'Mis Requerimientos',
 	'UI:WelcomeMenu:OpenIncidents' => 'Incidentes Abiertos: %1$d',

dictionaries/fr.dictionary.itop.ui.php

@@ -433,7 +433,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Nous espérons que vous aimerez cette version autant que nous avons eu du plaisir à l\'imaginer et à la créer.</div>
 
 <div>Configurez vos préférences '.ITOP_APPLICATION.' pour une expérience personnalisée.</div>',
-	'UI:WelcomePopup:Button:Acknowledge' => 'Ok, supprimer ce message',
 	'UI:WelcomeMenu:AllOpenRequests' => 'Requêtes en cours: %1$d',
 	'UI:WelcomeMenu:MyCalls' => 'Mes appels support',
 	'UI:WelcomeMenu:OpenIncidents' => 'Incidents en cours: %1$d',

dictionaries/ui/application/object/cs.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/da.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/de.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Object:Modal:Title' => 'Ein Objekt erstellen',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/en.dictionary.itop.object.php

@@ -19,4 +19,7 @@
 
 Dict::Add('EN US', 'English', 'English', array(
 	'UI:Object:Modal:Title' => 'Create an object',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.',
 ));

dictionaries/ui/application/object/es_cr.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/fr.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'Ce formulaire contient un attribut fichier obligatoire qui ne peut pas être renseigné en mode pop-up. La création de cet objet sera incomplète et pourra être complétée dans un formulaire en pleine page.',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'Ce formulaire contient un attribut fichier obligatoire qui ne peut pas être renseigné en mode pop-up. Cet objet est incomplet, il peut être complété dans un formulaire en pleine page.',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'Ce formulaire contient un attribut fichier obligatoire qui ne peut pas être modifié en mode pop-up.',
 ));

dictionaries/ui/application/object/hu.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/it.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/ja.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/nl.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/pl.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/pt_br.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/ru.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/sk.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/tr.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

dictionaries/ui/application/object/zh_cn.dictionary.itop.object.php

@@ -18,4 +18,7 @@
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Object:Modal:Title' => 'Create an object~~',
+	'UI:Object:Modal:Create:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. The creation of this object will be incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains a mandatory file attribute which cannot be set in modal mode. This object is incomplete, edit it in a full-page form to complete it.~~',
+	'UI:Object:Modal:Modify:Filled:MandatoryAttributeBlobInputs:Warning:Text' => 'This form contains mandatory file attribute which cannot be modified in modal mode.~~',
 ));

js/dataTables.settings.js

@@ -73,15 +73,19 @@ $(function () {
 				this.element.block();
 
 				$.post(this.options.sRenderUrl, oParams, function(data) {
+
+					let oTableElement = $('#'+me.options.sListId);
+					let oDataTable = oTableElement.DataTable();
+
 					// Nasty workaround to clear the pager's state for paginated lists !!!
 					// See jquery.tablesorter.pager.js / saveParams / restoreParams
 					if (window.pager_params) {
 						window.pager_params['pager'+me.options.sListId] = undefined;
 					}
-					var parentElt = $('#'+me.options.sListId).closest('.dataTables_wrapper').parent();
-					var aOptions = $('#'+me.options.sListId).DataTable().context[0].oInit;
+					var parentElt = oTableElement.closest('.dataTables_wrapper').parent();
+					var aOptions = oDataTable.context[0].oInit;
 					window['bSelectAllowed'+me.options.sListId] = false;
-					$('#'+me.options.sListId).DataTable().destroy(true);
+					oDataTable.destroy(true);
 					var sThead = "";
 					if (me.options.sSelectMode != "") {
 						sThead += "<th></th>";
@@ -127,7 +131,20 @@ $(function () {
 					aOptions["lengthMenu"] = [[oParams.end, oParams.end * 2, oParams.end * 3, oParams.end * 4, -1], [oParams.end, oParams.end * 2, oParams.end * 3, oParams.end * 4, aOptions["lengthMenu"]]];
 					aOptions["ajax"] = eval(aOptions["ajax"]);
 
-					$('#'+me.options.sListId).DataTable(aOptions);
+					//  Rebuild table
+					oTableElement = $('#'+me.options.sListId);
+					oDataTable = oTableElement.DataTable(aOptions);
+
+					// Update tab information (when data received)
+					oDataTable.on('xhr', ( e, settings, json, xhr) => {
+						const sPanelTitle = oParams['extra_params']['panel_title']; // retrieve panel title
+						const oTabsPanel =  oTableElement.closest('.ui-tabs-panel'); // search for tabs panel
+						if(oTabsPanel !== undefined){
+							const sLabelledBy = oTabsPanel.attr('aria-labelledby'); // key to search for corresponding tab
+							const oTab = $(`.ibo-tab-container .ui-tabs-tab[aria-labelledby="${sLabelledBy}"] a`); // tab
+							oTab.html(json.recordsTotal > 0 ? sPanelTitle +  ` (${json.recordsTotal})` : sPanelTitle); // update tab information
+						}
+					});
 
 					me.element.unblock();
 

js/search/search_form_criteria.js

@@ -152,7 +152,7 @@ $(function()
         _initChooseDefaultOperator: function()
 		{
             //if the class has an index, in order to maximize the performance, we force the default operator to "equal"
-            if (this.options.field.has_index && typeof this.options.available_operators['='] == 'object' && this.options.values.length == 0)
+			if (this.options.field.has_index && this.options.available_operators['='] != null && typeof this.options.available_operators['='] == 'object' && this.options.values.length == 0)
             {
                 this.options.operator = '=';
                 this.options.available_operators['='].rank = -1;//we want it to be the first displayed

js/selectize/plugin_combodo_multi_values_synthesis.js

@@ -154,6 +154,11 @@ Selectize.define("combodo_multi_values_synthesis", function (aOptions) {
 			// Listen item element click event
 			$item.on('click', function(){
 
+				// input disabled
+				if(oSelf.$input.is(':disabled')){
+					return;
+				}
+
 				// If element has operation
 				if(aOperations[sItem] === OPERATIONS.add || aOperations[sItem] === OPERATIONS.remove) {
 

js/selectize/plugin_combodo_update_operations.js

@@ -43,6 +43,24 @@ Selectize.define("combodo_update_operations", function (aOptions) {
 		};
 	})();
 
+	// Override enable function
+	oSelf.enable = (function () {
+		let oOriginal = oSelf.enable;
+		return function () {
+			oOriginal.apply(oSelf, arguments);
+			oSelf.$operationsInput.prop('disabled', false);
+		}
+	})();
+
+	// Override disable function
+	oSelf.disable = (function () {
+		let oOriginal = oSelf.disable;
+		return function () {
+			oOriginal.apply(oSelf, arguments);
+			oSelf.$operationsInput.prop('disabled', true);
+		}
+	})();
+
 	// Override addItem function
 	oSelf.addItem = (function () {
 		let oOriginal = oSelf.addItem;

js/utils.js

@@ -1137,6 +1137,34 @@ const CombodoJSConsole = {
 	}
 }
 
+/**
+ * Helper to reflect ongoing JS activity to other processes like BeHat
+ * @api
+ * @since 3.0.4 3.1.1 3.2.0 N°6765
+ */
+const CombodoJsActivity = {
+	BODY_DATA_ATTR_NAME_READY: "data-ready-scripts",
+
+	/**
+	 * Counter so that we set the flag as done only on the last call
+	 * @type number
+	 */
+	iOngoingScriptsCount: 0,
+
+	AddOngoingScript: function() {
+		this.iOngoingScriptsCount++;
+		$("body").attr(this.BODY_DATA_ATTR_NAME_READY, "start");
+	},
+
+	RemoveOngoingScript: function() {
+		this.iOngoingScriptsCount--;
+
+		if (this.iOngoingScriptsCount < 1) {
+			$("body").attr(this.BODY_DATA_ATTR_NAME_READY, "done");
+		}
+	}
+}
+
 /**
  * Helper to Sanitize string
  *

js/wizardhelper.js

@@ -74,6 +74,11 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 		'm_sWizHelperJsVarName': null // if set will use this name when server returns JS code in \WizardHelper::GetJsForUpdateFields
 	};
 	this.m_oData.m_sClass = sClass;
+	/**
+	 * Promise resolve callback when dependencies have been updated
+	 * @since 3.0.3-2 3.0.4 3.1.1 3.2.0 N°6766
+	 * */
+	this.m_oDependenciesUpdatedPromiseResolve = null;
 
 	// Setting optional transition data
 	if (sInitialState !== undefined)
@@ -152,6 +157,7 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 	};
 
 	this.UpdateFields = function () {
+		const me = this;
 		var aRefreshed = [];
 		//console.log('** UpdateFields **');
 		// Set the full HTML for the input field
@@ -185,10 +191,17 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 			}
 		}
 		// For each "refreshed" field, asynchronously trigger a change in case there are dependent fields to update
-		for (i = 0; i < aRefreshed.length; i++)
-		{
+		for (i = 0; i < aRefreshed.length; i++) {
 			var sString = "$('#"+aRefreshed[i]+"').trigger('change').trigger('update');";
-			window.setTimeout(sString, 1); // Synchronous 'trigger' does nothing, call it asynchronously
+			const oPromise = new Promise(function (resolve) {
+				// Store the resolve callback so we can call it later from outside
+				me.m_oDependenciesUpdatedPromiseResolve = resolve;
+			});
+			oPromise.then(function () {
+				window.setTimeout(sString, 1); // Synchronous 'trigger' does nothing, call it asynchronously
+				// Resolve callback is reinitialized in case the redirection fails for any reason and we might need to retry
+				me.m_oDependenciesUpdatedPromiseResolve = null;
+			});
 		}
 		if($('[data-field-status="blocked"]').length === 0) {
 			$('.disabledDuringFieldLoading').prop("disabled", false).removeClass('disabledDuringFieldLoading');

lib/autoload.php

@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit7f81b4a2a468a061c306af5e447a9a9f::getLoader();

lib/composer/ClassLoader.php

@@ -42,35 +42,37 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
-    /** @var ?string */
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
     private $vendorDir;
 
     // PSR-4
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
+     * @var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
+     * @var array<string, list<string>>
      */
     private $prefixDirsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
      */
     private $prefixesPsr0 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr0 = array();
 
@@ -78,8 +80,7 @@ class ClassLoader
     private $useIncludePath = false;
 
     /**
-     * @var string[]
-     * @psalm-var array<string, string>
+     * @var array<string, string>
      */
     private $classMap = array();
 
@@ -87,29 +88,29 @@ class ClassLoader
     private $classMapAuthoritative = false;
 
     /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
+     * @var array<string, bool>
      */
     private $missingClasses = array();
 
-    /** @var ?string */
+    /** @var string|null */
     private $apcuPrefix;
 
     /**
-     * @var self[]
+     * @var array<string, self>
      */
     private static $registeredLoaders = array();
 
     /**
-     * @param ?string $vendorDir
+     * @param string|null $vendorDir
      */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
     }
 
     /**
-     * @return string[]
+     * @return array<string, list<string>>
      */
     public function getPrefixes()
     {
@@ -121,8 +122,7 @@ class ClassLoader
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
+     * @return array<string, list<string>>
      */
     public function getPrefixesPsr4()
     {
@@ -130,8 +130,7 @@ class ClassLoader
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirs()
     {
@@ -139,8 +138,7 @@ class ClassLoader
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirsPsr4()
     {
@@ -148,8 +146,7 @@ class ClassLoader
     }
 
     /**
-     * @return string[] Array of classname => path
-     * @psalm-var array<string, string>
+     * @return array<string, string> Array of classname => path
      */
     public function getClassMap()
     {
@@ -157,8 +154,7 @@ class ClassLoader
     }
 
     /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
+     * @param array<string, string> $classMap Class to filename map
      *
      * @return void
      */
@@ -175,24 +171,25 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
 
@@ -201,19 +198,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -222,9 +219,9 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
      *
@@ -232,17 +229,18 @@ class ClassLoader
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -252,18 +250,18 @@ class ClassLoader
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -272,8 +270,8 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
      *
      * @return void
      */
@@ -290,8 +288,8 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
      *
@@ -425,7 +423,8 @@ class ClassLoader
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
@@ -476,9 +475,9 @@ class ClassLoader
     }
 
     /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
      *
-     * @return self[]
+     * @return array<string, self>
      */
     public static function getRegisteredLoaders()
     {
@@ -555,18 +554,26 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }

lib/composer/InstalledVersions.php

@@ -21,12 +21,14 @@ use Composer\Semver\VersionParser;
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {
     /**
      * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
      */
     private static $installed;
 
@@ -37,7 +39,7 @@ class InstalledVersions
 
     /**
      * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static $installedByVendor = array();
 
@@ -96,7 +98,7 @@ class InstalledVersions
     {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
             }
         }
 
@@ -117,7 +119,7 @@ class InstalledVersions
      */
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints($constraint);
+        $constraint = $parser->parseConstraints((string) $constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
         return $provided->matches($constraint);
@@ -241,7 +243,7 @@ class InstalledVersions
 
     /**
      * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
      */
     public static function getRootPackage()
     {
@@ -255,7 +257,7 @@ class InstalledVersions
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
      */
     public static function getRawData()
     {
@@ -278,7 +280,7 @@ class InstalledVersions
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     public static function getAllRawData()
     {
@@ -301,7 +303,7 @@ class InstalledVersions
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
      */
     public static function reload($data)
     {
@@ -311,7 +313,7 @@ class InstalledVersions
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static function getInstalled()
     {
@@ -326,7 +328,9 @@ class InstalledVersions
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
@@ -338,12 +342,17 @@ class InstalledVersions
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
             } else {
                 self::$installed = array();
             }
         }
-        $installed[] = self::$installed;
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
 
         return $installed;
     }

lib/composer/autoload_classmap.php

@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
@@ -14,7 +14,6 @@ return array(
     'AbstractPortalUIExtension' => $baseDir . '/application/applicationextension.inc.php',
     'AbstractPreferencesExtension' => $baseDir . '/application/applicationextension.inc.php',
     'AbstractWeeklyScheduledProcess' => $baseDir . '/core/backgroundprocess.inc.php',
-    'AbstractWelcomePopup' => $baseDir . '/application/applicationextension.inc.php',
     'Action' => $baseDir . '/core/action.class.inc.php',
     'ActionChecker' => $baseDir . '/core/userrights.class.inc.php',
     'ActionEmail' => $baseDir . '/core/action.class.inc.php',
@@ -364,8 +363,6 @@ return array(
     'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => $baseDir . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
     'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => $baseDir . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php',
     'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => $baseDir . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php',
-    'Combodo\\iTop\\Application\\WelcomePopup\\DefaultWelcomePopup' => $baseDir . '/sources/Application/WelcomePopup/DefaultWelcomePopup.php',
-    'Combodo\\iTop\\Application\\WelcomePopup\\WelcomePopupService' => $baseDir . '/sources/Application/WelcomePopup/WelcomePopupService.php',
     'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php',
     'Combodo\\iTop\\Controller\\AbstractController' => $baseDir . '/sources/Controller/AbstractController.php',
     'Combodo\\iTop\\Controller\\AjaxRenderController' => $baseDir . '/sources/Controller/AjaxRenderController.php',
@@ -375,7 +372,6 @@ return array(
     'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => $baseDir . '/sources/Controller/OAuth/OAuthLandingController.php',
     'Combodo\\iTop\\Controller\\PreferencesController' => $baseDir . '/sources/Controller/PreferencesController.php',
     'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => $baseDir . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php',
-    'Combodo\\iTop\\Controller\\WelcomePopupController' => $baseDir . '/sources/Controller/WelcomePopupController.php',
     'Combodo\\iTop\\Controller\\iController' => $baseDir . '/sources/Controller/iController.php',
     'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\IOAuthClientProvider' => $baseDir . '/sources/Core/Authentication/Client/OAuth/IOAuthClientProvider.php',
     'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAbstract' => $baseDir . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAbstract.php',
@@ -476,8 +472,6 @@ return array(
     'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectManager' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectManager.php',
     'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectRepository' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectRepository.php',
     'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectsEvents' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectsEvents.php',
-    'Combodo\\iTop\\SessionTracker\\SessionGC' => $baseDir . '/sources/SessionTracker/SessionGC.php',
-    'Combodo\\iTop\\SessionTracker\\SessionHandler' => $baseDir . '/sources/SessionTracker/SessionHandler.php',
     'CompileCSSService' => $baseDir . '/application/compilecssservice.class.inc.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'Config' => $baseDir . '/core/config.class.inc.php',
@@ -2991,7 +2985,6 @@ return array(
     'iTopWebPage' => $baseDir . '/sources/Application/WebPage/iTopWebPage.php',
     'iTopWizardWebPage' => $baseDir . '/sources/Application/WebPage/iTopWizardWebPage.php',
     'iTopXmlException' => $baseDir . '/application/exceptions/iTopXmlException.php',
-    'iWelcomePopup' => $baseDir . '/application/applicationextension.inc.php',
     'iWorkingTimeComputer' => $baseDir . '/core/computing.inc.php',
     'lnkAuditCategoryToAuditDomain' => $baseDir . '/application/audit.domain.class.inc.php',
     'lnkTriggerAction' => $baseDir . '/core/trigger.class.inc.php',

lib/composer/autoload_files.php

@@ -2,23 +2,23 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
     'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
+    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
     '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
-    '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
     '23c18046f52bef3eea034657bafda50f' => $vendorDir . '/symfony/polyfill-php81/bootstrap.php',
+    '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
     '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
-    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
-    'c9d07b32a2e02bc0fc582d4f0c1b56cc' => $vendorDir . '/laminas/laminas-servicemanager/src/autoload.php',
     '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
-    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
-    'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
+    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
+    'c9d07b32a2e02bc0fc582d4f0c1b56cc' => $vendorDir . '/laminas/laminas-servicemanager/src/autoload.php',
+    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
     '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
     'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
+    'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
 );

lib/composer/autoload_namespaces.php

@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

lib/composer/autoload_psr4.php

@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

lib/composer/autoload_real.php

@@ -25,46 +25,31 @@ class ComposerAutoloaderInit7f81b4a2a468a061c306af5e447a9a9f
         require __DIR__ . '/platform_check.php';
 
         spl_autoload_register(array('ComposerAutoloaderInit7f81b4a2a468a061c306af5e447a9a9f', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit7f81b4a2a468a061c306af5e447a9a9f', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths[] = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::getInitializer($loader));
-        } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire7f81b4a2a468a061c306af5e447a9a9f($fileIdentifier, $file);
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+                require $file;
+            }
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-function composerRequire7f81b4a2a468a061c306af5e447a9a9f($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}

lib/composer/autoload_static.php

@@ -7,21 +7,21 @@ namespace Composer\Autoload;
 class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
 {
     public static $files = array (
-        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
+        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
-        '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
         '23c18046f52bef3eea034657bafda50f' => __DIR__ . '/..' . '/symfony/polyfill-php81/bootstrap.php',
+        '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
-        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
-        'c9d07b32a2e02bc0fc582d4f0c1b56cc' => __DIR__ . '/..' . '/laminas/laminas-servicemanager/src/autoload.php',
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
-        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
-        'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
+        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
+        'c9d07b32a2e02bc0fc582d4f0c1b56cc' => __DIR__ . '/..' . '/laminas/laminas-servicemanager/src/autoload.php',
+        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
         '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
+        'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -378,7 +378,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'AbstractPortalUIExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'AbstractPreferencesExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'AbstractWeeklyScheduledProcess' => __DIR__ . '/../..' . '/core/backgroundprocess.inc.php',
-        'AbstractWelcomePopup' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'Action' => __DIR__ . '/../..' . '/core/action.class.inc.php',
         'ActionChecker' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
         'ActionEmail' => __DIR__ . '/../..' . '/core/action.class.inc.php',
@@ -728,8 +727,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
         'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => __DIR__ . '/../..' . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php',
         'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => __DIR__ . '/../..' . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php',
-        'Combodo\\iTop\\Application\\WelcomePopup\\DefaultWelcomePopup' => __DIR__ . '/../..' . '/sources/Application/WelcomePopup/DefaultWelcomePopup.php',
-        'Combodo\\iTop\\Application\\WelcomePopup\\WelcomePopupService' => __DIR__ . '/../..' . '/sources/Application/WelcomePopup/WelcomePopupService.php',
         'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php',
         'Combodo\\iTop\\Controller\\AbstractController' => __DIR__ . '/../..' . '/sources/Controller/AbstractController.php',
         'Combodo\\iTop\\Controller\\AjaxRenderController' => __DIR__ . '/../..' . '/sources/Controller/AjaxRenderController.php',
@@ -739,7 +736,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => __DIR__ . '/../..' . '/sources/Controller/OAuth/OAuthLandingController.php',
         'Combodo\\iTop\\Controller\\PreferencesController' => __DIR__ . '/../..' . '/sources/Controller/PreferencesController.php',
         'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => __DIR__ . '/../..' . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php',
-        'Combodo\\iTop\\Controller\\WelcomePopupController' => __DIR__ . '/../..' . '/sources/Controller/WelcomePopupController.php',
         'Combodo\\iTop\\Controller\\iController' => __DIR__ . '/../..' . '/sources/Controller/iController.php',
         'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\IOAuthClientProvider' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/IOAuthClientProvider.php',
         'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAbstract' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAbstract.php',
@@ -840,8 +836,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectManager' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectManager.php',
         'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectRepository' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectRepository.php',
         'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectsEvents' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectsEvents.php',
-        'Combodo\\iTop\\SessionTracker\\SessionGC' => __DIR__ . '/../..' . '/sources/SessionTracker/SessionGC.php',
-        'Combodo\\iTop\\SessionTracker\\SessionHandler' => __DIR__ . '/../..' . '/sources/SessionTracker/SessionHandler.php',
         'CompileCSSService' => __DIR__ . '/../..' . '/application/compilecssservice.class.inc.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'Config' => __DIR__ . '/../..' . '/core/config.class.inc.php',
@@ -3355,7 +3349,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'iTopWebPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/iTopWebPage.php',
         'iTopWizardWebPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/iTopWizardWebPage.php',
         'iTopXmlException' => __DIR__ . '/../..' . '/application/exceptions/iTopXmlException.php',
-        'iWelcomePopup' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'iWorkingTimeComputer' => __DIR__ . '/../..' . '/core/computing.inc.php',
         'lnkAuditCategoryToAuditDomain' => __DIR__ . '/../..' . '/application/audit.domain.class.inc.php',
         'lnkTriggerAction' => __DIR__ . '/../..' . '/core/trigger.class.inc.php',

lib/composer/include_paths.php

@@ -2,7 +2,7 @@
 
 // include_paths.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

lib/composer/installed.json

@@ -4712,17 +4712,17 @@
         },
         {
             "name": "symfony/twig-bridge",
-            "version": "v5.4.11",
-            "version_normalized": "5.4.11.0",
+            "version": "v5.4.31",
+            "version_normalized": "5.4.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bridge.git",
-                "reference": "63b8a50d48c9fe3d04e77307d4f1771dd848baa8"
+                "reference": "fc6ee0a3b672ea12ca1f26592d257bfc7f4ee942"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/63b8a50d48c9fe3d04e77307d4f1771dd848baa8",
-                "reference": "63b8a50d48c9fe3d04e77307d4f1771dd848baa8",
+                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/fc6ee0a3b672ea12ca1f26592d257bfc7f4ee942",
+                "reference": "fc6ee0a3b672ea12ca1f26592d257bfc7f4ee942",
                 "shasum": ""
             },
             "require": {
@@ -4735,22 +4735,22 @@
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/console": "<5.3",
-                "symfony/form": "<5.3",
+                "symfony/form": "<5.4.21|>=6,<6.2.7",
                 "symfony/http-foundation": "<5.3",
                 "symfony/http-kernel": "<4.4",
                 "symfony/translation": "<5.2",
                 "symfony/workflow": "<5.2"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.12",
-                "egulias/email-validator": "^2.1.10|^3",
+                "doctrine/annotations": "^1.12|^2",
+                "egulias/email-validator": "^2.1.10|^3|^4",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/asset": "^4.4|^5.0|^6.0",
                 "symfony/console": "^5.3|^6.0",
                 "symfony/dependency-injection": "^4.4|^5.0|^6.0",
                 "symfony/expression-language": "^4.4|^5.0|^6.0",
                 "symfony/finder": "^4.4|^5.0|^6.0",
-                "symfony/form": "^5.3|^6.0",
+                "symfony/form": "^5.4.21|^6.2.7",
                 "symfony/http-foundation": "^5.3|^6.0",
                 "symfony/http-kernel": "^4.4|^5.0|^6.0",
                 "symfony/intl": "^4.4|^5.0|^6.0",
@@ -4788,7 +4788,7 @@
                 "symfony/web-link": "For using the WebLinkExtension",
                 "symfony/yaml": "For using the YamlExtension"
             },
-            "time": "2022-07-20T13:00:38+00:00",
+            "time": "2023-11-09T21:19:08+00:00",
             "type": "symfony-bridge",
             "installation-source": "dist",
             "autoload": {
@@ -4816,7 +4816,7 @@
             "description": "Provides integration for Twig with various Symfony components",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/twig-bridge/tree/v5.4.11"
+                "source": "https://github.com/symfony/twig-bridge/tree/v5.4.31"
             },
             "funding": [
                 {

lib/composer/installed.php

@@ -1,40 +1,40 @@
 <?php return array(
     'root' => array(
+        'name' => 'combodo/itop',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
+        'reference' => '5465287089bacacae3304af6688ce5991893835a',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '204a6d8e51619cd669c6d9d7722edaa36d1c3394',
-        'name' => 'combodo/itop',
         'dev' => true,
     ),
     'versions' => array(
         'apereo/phpcas' => array(
             'pretty_version' => '1.6.0',
             'version' => '1.6.0.0',
+            'reference' => 'f817c72a961484afef95ac64a9257c8e31f063b9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../apereo/phpcas',
             'aliases' => array(),
-            'reference' => 'f817c72a961484afef95ac64a9257c8e31f063b9',
             'dev_requirement' => false,
         ),
         'combodo/itop' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
+            'reference' => '5465287089bacacae3304af6688ce5991893835a',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '204a6d8e51619cd669c6d9d7722edaa36d1c3394',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
             'pretty_version' => '6.4.4',
             'version' => '6.4.4.0',
+            'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../combodo/tcpdf',
             'aliases' => array(),
-            'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
             'dev_requirement' => false,
         ),
         'container-interop/container-interop' => array(
@@ -46,181 +46,181 @@
         'firebase/php-jwt' => array(
             'pretty_version' => 'v6.4.0',
             'version' => '6.4.0.0',
+            'reference' => '4dd1e007f22a927ac77da5a3fbb067b42d3bc224',
             'type' => 'library',
             'install_path' => __DIR__ . '/../firebase/php-jwt',
             'aliases' => array(),
-            'reference' => '4dd1e007f22a927ac77da5a3fbb067b42d3bc224',
             'dev_requirement' => false,
         ),
         'guzzlehttp/guzzle' => array(
             'pretty_version' => '7.7.0',
             'version' => '7.7.0.0',
+            'reference' => 'fb7566caccf22d74d1ab270de3551f72a58399f5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
             'aliases' => array(),
-            'reference' => 'fb7566caccf22d74d1ab270de3551f72a58399f5',
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
             'pretty_version' => '2.0.0',
             'version' => '2.0.0.0',
+            'reference' => '3a494dc7dc1d7d12e511890177ae2d0e6c107da6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/promises',
             'aliases' => array(),
-            'reference' => '3a494dc7dc1d7d12e511890177ae2d0e6c107da6',
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
             'pretty_version' => '2.5.0',
             'version' => '2.5.0.0',
+            'reference' => 'b635f279edd83fc275f822a1188157ffea568ff6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
-            'reference' => 'b635f279edd83fc275f822a1188157ffea568ff6',
             'dev_requirement' => false,
         ),
         'laminas/laminas-loader' => array(
             'pretty_version' => '2.8.0',
             'version' => '2.8.0.0',
+            'reference' => 'd0589ec9dd48365fd95ad10d1c906efd7711c16b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-loader',
             'aliases' => array(),
-            'reference' => 'd0589ec9dd48365fd95ad10d1c906efd7711c16b',
             'dev_requirement' => false,
         ),
         'laminas/laminas-mail' => array(
             'pretty_version' => '2.16.0',
             'version' => '2.16.0.0',
+            'reference' => '1ee1a384b96c8af29ecad9b3a7adc27a150ebc49',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-mail',
             'aliases' => array(),
-            'reference' => '1ee1a384b96c8af29ecad9b3a7adc27a150ebc49',
             'dev_requirement' => false,
         ),
         'laminas/laminas-mime' => array(
             'pretty_version' => '2.9.1',
             'version' => '2.9.1.0',
+            'reference' => '72d21a1b4bb7086d4a4d7058c0abca180b209184',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-mime',
             'aliases' => array(),
-            'reference' => '72d21a1b4bb7086d4a4d7058c0abca180b209184',
             'dev_requirement' => false,
         ),
         'laminas/laminas-servicemanager' => array(
             'pretty_version' => '3.16.0',
             'version' => '3.16.0.0',
+            'reference' => '863c66733740cd36ebf5e700f4258ef2c68a2a24',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-servicemanager',
             'aliases' => array(),
-            'reference' => '863c66733740cd36ebf5e700f4258ef2c68a2a24',
             'dev_requirement' => false,
         ),
         'laminas/laminas-stdlib' => array(
             'pretty_version' => '3.12.0',
             'version' => '3.12.0.0',
+            'reference' => 'c5aed3c798018e31fbb7b1e421b8d96bf2cda453',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-stdlib',
             'aliases' => array(),
-            'reference' => 'c5aed3c798018e31fbb7b1e421b8d96bf2cda453',
             'dev_requirement' => false,
         ),
         'laminas/laminas-validator' => array(
             'pretty_version' => '2.23.0',
             'version' => '2.23.0.0',
+            'reference' => '6d61b6cc3b222f13807a18d9247cdfb084958b03',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-validator',
             'aliases' => array(),
-            'reference' => '6d61b6cc3b222f13807a18d9247cdfb084958b03',
             'dev_requirement' => false,
         ),
         'league/oauth2-client' => array(
             'pretty_version' => '2.6.1',
             'version' => '2.6.1.0',
+            'reference' => '2334c249907190c132364f5dae0287ab8666aa19',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/oauth2-client',
             'aliases' => array(),
-            'reference' => '2334c249907190c132364f5dae0287ab8666aa19',
             'dev_requirement' => false,
         ),
         'league/oauth2-google' => array(
             'pretty_version' => '3.0.4',
             'version' => '3.0.4.0',
+            'reference' => '6b79441f244040760bed5fdcd092a2bda7cf34c6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/oauth2-google',
             'aliases' => array(),
-            'reference' => '6b79441f244040760bed5fdcd092a2bda7cf34c6',
             'dev_requirement' => false,
         ),
         'nikic/php-parser' => array(
             'pretty_version' => 'v4.14.0',
             'version' => '4.14.0.0',
+            'reference' => '34bea19b6e03d8153165d8f30bba4c3be86184c1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),
-            'reference' => '34bea19b6e03d8153165d8f30bba4c3be86184c1',
             'dev_requirement' => false,
         ),
         'paragonie/random_compat' => array(
             'pretty_version' => 'v9.99.100',
             'version' => '9.99.100.0',
+            'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/random_compat',
             'aliases' => array(),
-            'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
             'dev_requirement' => false,
         ),
         'pear/archive_tar' => array(
             'pretty_version' => '1.4.14',
             'version' => '1.4.14.0',
+            'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/archive_tar',
             'aliases' => array(),
-            'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa',
             'dev_requirement' => false,
         ),
         'pear/console_getopt' => array(
             'pretty_version' => 'v1.4.3',
             'version' => '1.4.3.0',
+            'reference' => 'a41f8d3e668987609178c7c4a9fe48fecac53fa0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/console_getopt',
             'aliases' => array(),
-            'reference' => 'a41f8d3e668987609178c7c4a9fe48fecac53fa0',
             'dev_requirement' => false,
         ),
         'pear/pear-core-minimal' => array(
             'pretty_version' => 'v1.10.11',
             'version' => '1.10.11.0',
+            'reference' => '68d0d32ada737153b7e93b8d3c710ebe70ac867d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/pear-core-minimal',
             'aliases' => array(),
-            'reference' => '68d0d32ada737153b7e93b8d3c710ebe70ac867d',
             'dev_requirement' => false,
         ),
         'pear/pear_exception' => array(
             'pretty_version' => 'v1.0.2',
             'version' => '1.0.2.0',
+            'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0',
             'type' => 'class',
             'install_path' => __DIR__ . '/../pear/pear_exception',
             'aliases' => array(),
-            'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0',
             'dev_requirement' => false,
         ),
         'pelago/emogrifier' => array(
             'pretty_version' => 'v6.0.0',
             'version' => '6.0.0.0',
+            'reference' => 'aa72d5407efac118f3896bcb995a2cba793df0ae',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pelago/emogrifier',
             'aliases' => array(),
-            'reference' => 'aa72d5407efac118f3896bcb995a2cba793df0ae',
             'dev_requirement' => false,
         ),
         'psr/cache' => array(
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/cache',
             'aliases' => array(),
-            'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
             'dev_requirement' => false,
         ),
         'psr/cache-implementation' => array(
@@ -232,10 +232,10 @@
         'psr/container' => array(
             'pretty_version' => '1.1.2',
             'version' => '1.1.2.0',
+            'reference' => '513e0666f7216c7459170d56df27dfcefe1689ea',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/container',
             'aliases' => array(),
-            'reference' => '513e0666f7216c7459170d56df27dfcefe1689ea',
             'dev_requirement' => false,
         ),
         'psr/container-implementation' => array(
@@ -248,10 +248,10 @@
         'psr/event-dispatcher' => array(
             'pretty_version' => '1.0.0',
             'version' => '1.0.0.0',
+            'reference' => 'dbefd12671e8a14ec7f180cab83036ed26714bb0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/event-dispatcher',
             'aliases' => array(),
-            'reference' => 'dbefd12671e8a14ec7f180cab83036ed26714bb0',
             'dev_requirement' => false,
         ),
         'psr/event-dispatcher-implementation' => array(
@@ -263,10 +263,10 @@
         'psr/http-client' => array(
             'pretty_version' => '1.0.2',
             'version' => '1.0.2.0',
+            'reference' => '0955afe48220520692d2d09f7ab7e0f93ffd6a31',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-client',
             'aliases' => array(),
-            'reference' => '0955afe48220520692d2d09f7ab7e0f93ffd6a31',
             'dev_requirement' => false,
         ),
         'psr/http-client-implementation' => array(
@@ -278,10 +278,10 @@
         'psr/http-factory' => array(
             'pretty_version' => '1.0.2',
             'version' => '1.0.2.0',
+            'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-factory',
             'aliases' => array(),
-            'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
             'dev_requirement' => false,
         ),
         'psr/http-factory-implementation' => array(
@@ -293,10 +293,10 @@
         'psr/http-message' => array(
             'pretty_version' => '2.0',
             'version' => '2.0.0.0',
+            'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-message',
             'aliases' => array(),
-            'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71',
             'dev_requirement' => false,
         ),
         'psr/http-message-implementation' => array(
@@ -308,10 +308,10 @@
         'psr/log' => array(
             'pretty_version' => '1.1.4',
             'version' => '1.1.4.0',
+            'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/log',
             'aliases' => array(),
-            'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
             'dev_requirement' => false,
         ),
         'psr/log-implementation' => array(
@@ -329,10 +329,10 @@
         'ralouphie/getallheaders' => array(
             'pretty_version' => '3.0.3',
             'version' => '3.0.3.0',
+            'reference' => '120b605dfeb996808c31b6477290a714d356e822',
             'type' => 'library',
             'install_path' => __DIR__ . '/../ralouphie/getallheaders',
             'aliases' => array(),
-            'reference' => '120b605dfeb996808c31b6477290a714d356e822',
             'dev_requirement' => false,
         ),
         'rsky/pear-core-min' => array(
@@ -344,37 +344,37 @@
         'sabberworm/php-css-parser' => array(
             'pretty_version' => '8.4.0',
             'version' => '8.4.0.0',
+            'reference' => 'e41d2140031d533348b2192a83f02d8dd8a71d30',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabberworm/php-css-parser',
             'aliases' => array(),
-            'reference' => 'e41d2140031d533348b2192a83f02d8dd8a71d30',
             'dev_requirement' => false,
         ),
         'scssphp/scssphp' => array(
             'pretty_version' => 'v1.10.5',
             'version' => '1.10.5.0',
+            'reference' => '6d44282ccf283e133ab70b6282f8e068ff2f9bf9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../scssphp/scssphp',
             'aliases' => array(),
-            'reference' => '6d44282ccf283e133ab70b6282f8e068ff2f9bf9',
             'dev_requirement' => false,
         ),
         'symfony/cache' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => '5a0fff46df349f0db3fe242263451fddf5277362',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/cache',
             'aliases' => array(),
-            'reference' => '5a0fff46df349f0db3fe242263451fddf5277362',
             'dev_requirement' => false,
         ),
         'symfony/cache-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => '64be4a7acb83b6f2bf6de9a02cee6dad41277ebc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/cache-contracts',
             'aliases' => array(),
-            'reference' => '64be4a7acb83b6f2bf6de9a02cee6dad41277ebc',
             'dev_requirement' => false,
         ),
         'symfony/cache-implementation' => array(
@@ -386,82 +386,82 @@
         'symfony/config' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => 'ec79e03125c1d2477e43dde8528535d90cc78379',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/config',
             'aliases' => array(),
-            'reference' => 'ec79e03125c1d2477e43dde8528535d90cc78379',
             'dev_requirement' => false,
         ),
         'symfony/console' => array(
             'pretty_version' => 'v5.4.19',
             'version' => '5.4.19.0',
+            'reference' => 'dccb8d251a9017d5994c988b034d3e18aaabf740',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/console',
             'aliases' => array(),
-            'reference' => 'dccb8d251a9017d5994c988b034d3e18aaabf740',
             'dev_requirement' => false,
         ),
         'symfony/css-selector' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => 'c1681789f059ab756001052164726ae88512ae3d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/css-selector',
             'aliases' => array(),
-            'reference' => 'c1681789f059ab756001052164726ae88512ae3d',
             'dev_requirement' => false,
         ),
         'symfony/dependency-injection' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => 'a8b9251016e9476db73e25fa836904bc0bf74c62',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/dependency-injection',
             'aliases' => array(),
-            'reference' => 'a8b9251016e9476db73e25fa836904bc0bf74c62',
             'dev_requirement' => false,
         ),
         'symfony/deprecation-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
             'aliases' => array(),
-            'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
             'dev_requirement' => false,
         ),
         'symfony/dotenv' => array(
             'pretty_version' => 'v5.4.19',
             'version' => '5.4.19.0',
+            'reference' => '38190ba62566afa26ca723a795d0a004e061bd2a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/dotenv',
             'aliases' => array(),
-            'reference' => '38190ba62566afa26ca723a795d0a004e061bd2a',
             'dev_requirement' => false,
         ),
         'symfony/error-handler' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => 'f75d17cb4769eb38cd5fccbda95cd80a054d35c8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/error-handler',
             'aliases' => array(),
-            'reference' => 'f75d17cb4769eb38cd5fccbda95cd80a054d35c8',
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher' => array(
             'pretty_version' => 'v5.4.9',
             'version' => '5.4.9.0',
+            'reference' => '8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/event-dispatcher',
             'aliases' => array(),
-            'reference' => '8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc',
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => 'f98b54df6ad059855739db6fcbc2d36995283fe1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/event-dispatcher-contracts',
             'aliases' => array(),
-            'reference' => 'f98b54df6ad059855739db6fcbc2d36995283fe1',
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher-implementation' => array(
@@ -473,145 +473,145 @@
         'symfony/filesystem' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => '6699fb0228d1bc35b12aed6dd5e7455457609ddd',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/filesystem',
             'aliases' => array(),
-            'reference' => '6699fb0228d1bc35b12aed6dd5e7455457609ddd',
             'dev_requirement' => false,
         ),
         'symfony/finder' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => '7872a66f57caffa2916a584db1aa7f12adc76f8c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/finder',
             'aliases' => array(),
-            'reference' => '7872a66f57caffa2916a584db1aa7f12adc76f8c',
             'dev_requirement' => false,
         ),
         'symfony/framework-bundle' => array(
             'pretty_version' => 'v5.4.19',
             'version' => '5.4.19.0',
+            'reference' => 'a208ee578000f9dedcb50a9784ec7ff8706a7bf1',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/framework-bundle',
             'aliases' => array(),
-            'reference' => 'a208ee578000f9dedcb50a9784ec7ff8706a7bf1',
             'dev_requirement' => false,
         ),
         'symfony/http-foundation' => array(
             'pretty_version' => 'v5.4.20',
             'version' => '5.4.20.0',
+            'reference' => 'd0435363362a47c14e9cf50663cb8ffbf491875a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-foundation',
             'aliases' => array(),
-            'reference' => 'd0435363362a47c14e9cf50663cb8ffbf491875a',
             'dev_requirement' => false,
         ),
         'symfony/http-kernel' => array(
             'pretty_version' => 'v5.4.20',
             'version' => '5.4.20.0',
+            'reference' => 'aaeec341582d3c160cc9ecfa8b2419ba6c69954e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-kernel',
             'aliases' => array(),
-            'reference' => 'aaeec341582d3c160cc9ecfa8b2419ba6c69954e',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-ctype' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => '6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
-            'reference' => '6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-grapheme' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => '433d05519ce6990bf3530fba6957499d327395c2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-grapheme',
             'aliases' => array(),
-            'reference' => '433d05519ce6990bf3530fba6957499d327395c2',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-idn' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => '59a8d271f00dd0e4c2e518104cc7963f655a1aa8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
             'aliases' => array(),
-            'reference' => '59a8d271f00dd0e4c2e518104cc7963f655a1aa8',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-normalizer' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => '219aa369ceff116e673852dce47c3a41794c14bd',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
             'aliases' => array(),
-            'reference' => '219aa369ceff116e673852dce47c3a41794c14bd',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-mbstring' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => '9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
             'aliases' => array(),
-            'reference' => '9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php72' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => 'bf44a9fd41feaac72b074de600314a93e2ae78e2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php72',
             'aliases' => array(),
-            'reference' => 'bf44a9fd41feaac72b074de600314a93e2ae78e2',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php73' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => 'e440d35fa0286f77fb45b79a03fedbeda9307e85',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php73',
             'aliases' => array(),
-            'reference' => 'e440d35fa0286f77fb45b79a03fedbeda9307e85',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php80' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => 'cfa0ae98841b9e461207c13ab093d76b0fa7bace',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php80',
             'aliases' => array(),
-            'reference' => 'cfa0ae98841b9e461207c13ab093d76b0fa7bace',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php81' => array(
             'pretty_version' => 'v1.26.0',
             'version' => '1.26.0.0',
+            'reference' => '13f6d1271c663dc5ae9fb843a8f16521db7687a1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php81',
             'aliases' => array(),
-            'reference' => '13f6d1271c663dc5ae9fb843a8f16521db7687a1',
             'dev_requirement' => false,
         ),
         'symfony/routing' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => '3e01ccd9b2a3a4167ba2b3c53612762300300226',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/routing',
             'aliases' => array(),
-            'reference' => '3e01ccd9b2a3a4167ba2b3c53612762300300226',
             'dev_requirement' => false,
         ),
         'symfony/service-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => '4b426aac47d6427cc1a1d0f7e2ac724627f5966c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/service-contracts',
             'aliases' => array(),
-            'reference' => '4b426aac47d6427cc1a1d0f7e2ac724627f5966c',
             'dev_requirement' => false,
         ),
         'symfony/service-implementation' => array(
@@ -623,82 +623,82 @@
         'symfony/stopwatch' => array(
             'pretty_version' => 'v5.4.19',
             'version' => '5.4.19.0',
+            'reference' => 'bd2b066090fd6a67039371098fa25a84cb2679ec',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/stopwatch',
             'aliases' => array(),
-            'reference' => 'bd2b066090fd6a67039371098fa25a84cb2679ec',
             'dev_requirement' => true,
         ),
         'symfony/string' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => '5eb661e49ad389e4ae2b6e4df8d783a8a6548322',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/string',
             'aliases' => array(),
-            'reference' => '5eb661e49ad389e4ae2b6e4df8d783a8a6548322',
             'dev_requirement' => false,
         ),
         'symfony/translation-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => '136b19dd05cdf0709db6537d058bcab6dd6e2dbe',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/translation-contracts',
             'aliases' => array(),
-            'reference' => '136b19dd05cdf0709db6537d058bcab6dd6e2dbe',
             'dev_requirement' => false,
         ),
         'symfony/twig-bridge' => array(
-            'pretty_version' => 'v5.4.11',
-            'version' => '5.4.11.0',
+            'pretty_version' => 'v5.4.31',
+            'version' => '5.4.31.0',
+            'reference' => 'fc6ee0a3b672ea12ca1f26592d257bfc7f4ee942',
             'type' => 'symfony-bridge',
             'install_path' => __DIR__ . '/../symfony/twig-bridge',
             'aliases' => array(),
-            'reference' => '63b8a50d48c9fe3d04e77307d4f1771dd848baa8',
             'dev_requirement' => false,
         ),
         'symfony/twig-bundle' => array(
             'pretty_version' => 'v5.4.19',
             'version' => '5.4.19.0',
+            'reference' => '286bd9e38b9bcb142f1eda0a75b0bbeb49ff34bd',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/twig-bundle',
             'aliases' => array(),
-            'reference' => '286bd9e38b9bcb142f1eda0a75b0bbeb49ff34bd',
             'dev_requirement' => false,
         ),
         'symfony/var-dumper' => array(
             'pretty_version' => 'v5.4.11',
             'version' => '5.4.11.0',
+            'reference' => 'b8f306d7b8ef34fb3db3305be97ba8e088fb4861',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/var-dumper',
             'aliases' => array(),
-            'reference' => 'b8f306d7b8ef34fb3db3305be97ba8e088fb4861',
             'dev_requirement' => false,
         ),
         'symfony/var-exporter' => array(
             'pretty_version' => 'v5.4.10',
             'version' => '5.4.10.0',
+            'reference' => '8fc03ee75eeece3d9be1ef47d26d79bea1afb340',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/var-exporter',
             'aliases' => array(),
-            'reference' => '8fc03ee75eeece3d9be1ef47d26d79bea1afb340',
             'dev_requirement' => false,
         ),
         'symfony/web-profiler-bundle' => array(
             'pretty_version' => 'v5.4.19',
             'version' => '5.4.19.0',
+            'reference' => 'cd83822071f2bc05583af1e53c1bc46be625a56d',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/web-profiler-bundle',
             'aliases' => array(),
-            'reference' => 'cd83822071f2bc05583af1e53c1bc46be625a56d',
             'dev_requirement' => true,
         ),
         'symfony/yaml' => array(
             'pretty_version' => 'v5.4.19',
             'version' => '5.4.19.0',
+            'reference' => '71c05db20cb9b54d381a28255f17580e2b7e36a5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/yaml',
             'aliases' => array(),
-            'reference' => '71c05db20cb9b54d381a28255f17580e2b7e36a5',
             'dev_requirement' => false,
         ),
         'tecnickcom/tcpdf' => array(
@@ -710,28 +710,28 @@
         'thenetworg/oauth2-azure' => array(
             'pretty_version' => 'v2.1.1',
             'version' => '2.1.1.0',
+            'reference' => '06fb2d620fb6e6c934f632c7ec7c5ea2e978a844',
             'type' => 'library',
             'install_path' => __DIR__ . '/../thenetworg/oauth2-azure',
             'aliases' => array(),
-            'reference' => '06fb2d620fb6e6c934f632c7ec7c5ea2e978a844',
             'dev_requirement' => false,
         ),
         'twig/twig' => array(
             'pretty_version' => 'v3.4.3',
             'version' => '3.4.3.0',
+            'reference' => 'c38fd6b0b7f370c198db91ffd02e23b517426b58',
             'type' => 'library',
             'install_path' => __DIR__ . '/../twig/twig',
             'aliases' => array(),
-            'reference' => 'c38fd6b0b7f370c198db91ffd02e23b517426b58',
             'dev_requirement' => false,
         ),
         'webmozart/assert' => array(
             'pretty_version' => '1.11.0',
             'version' => '1.11.0.0',
+            'reference' => '11cb2199493b2f8a3b53e7f19068fc6aac760991',
             'type' => 'library',
             'install_path' => __DIR__ . '/../webmozart/assert',
             'aliases' => array(),
-            'reference' => '11cb2199493b2f8a3b53e7f19068fc6aac760991',
             'dev_requirement' => false,
         ),
     ),

lib/symfony/twig-bridge/Extension/CodeExtension.php

@@ -42,8 +42,8 @@ final class CodeExtension extends AbstractExtension
     public function getFilters(): array
     {
         return [
-            new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]),
-            new TwigFilter('abbr_method', [$this, 'abbrMethod'], ['is_safe' => ['html']]),
+            new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html'], 'pre_escape' => 'html']),
+            new TwigFilter('abbr_method', [$this, 'abbrMethod'], ['is_safe' => ['html'], 'pre_escape' => 'html']),
             new TwigFilter('format_args', [$this, 'formatArgs'], ['is_safe' => ['html']]),
             new TwigFilter('format_args_as_text', [$this, 'formatArgsAsText']),
             new TwigFilter('file_excerpt', [$this, 'fileExcerpt'], ['is_safe' => ['html']]),
@@ -85,22 +85,23 @@ final class CodeExtension extends AbstractExtension
         $result = [];
         foreach ($args as $key => $item) {
             if ('object' === $item[0]) {
+                $item[1] = htmlspecialchars($item[1], \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset);
                 $parts = explode('\\', $item[1]);
                 $short = array_pop($parts);
                 $formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
             } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
+                $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset));
             } elseif ('null' === $item[0]) {
                 $formattedValue = '<em>null</em>';
             } elseif ('boolean' === $item[0]) {
-                $formattedValue = '<em>'.strtolower(var_export($item[1], true)).'</em>';
+                $formattedValue = '<em>'.strtolower(htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)).'</em>';
             } elseif ('resource' === $item[0]) {
                 $formattedValue = '<em>resource</em>';
             } else {
                 $formattedValue = str_replace("\n", '', htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset));
             }
 
-            $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
+            $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", htmlspecialchars($key, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $formattedValue);
         }
 
         return implode(', ', $result);
@@ -123,13 +124,25 @@ final class CodeExtension extends AbstractExtension
             // highlight_file could throw warnings
             // see https://bugs.php.net/25725
             $code = @highlight_file($file, true);
-            // remove main code/span tags
-            $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
-            // split multiline spans
-            $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', function ($m) {
-                return "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>';
-            }, $code);
-            $content = explode('<br />', $code);
+            if (\PHP_VERSION_ID >= 80300) {
+                // remove main pre/code tags
+                $code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
+                // split multiline code tags
+                $code = preg_replace_callback('#<code ([^>]++)>((?:[^<]*+\\n)++[^<]*+)</code>#', function ($m) {
+                    return "<code $m[1]>".str_replace("\n", "</code>\n<code $m[1]>", $m[2]).'</code>';
+                }, $code);
+                // Convert spaces to html entities to preserve indentation when rendered
+                $code = str_replace(' ', '&nbsp;', $code);
+                $content = explode("\n", $code);
+            } else {
+                // remove main code/span tags
+                $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
+                // split multiline spans
+                $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', function ($m) {
+                    return "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>';
+                }, $code);
+                $content = explode('<br />', $code);
+            }
 
             $lines = [];
             if (0 > $srcContext) {
@@ -154,11 +167,14 @@ final class CodeExtension extends AbstractExtension
         $file = trim($file);
 
         if (null === $text) {
-            $text = $file;
-            if (null !== $rel = $this->getFileRelative($text)) {
-                $rel = explode('/', $rel, 2);
-                $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->projectDir, $rel[0], '/'.($rel[1] ?? ''));
+            if (null !== $rel = $this->getFileRelative($file)) {
+                $rel = explode('/', htmlspecialchars($rel, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), 2);
+                $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', htmlspecialchars($this->projectDir, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $rel[0], '/'.($rel[1] ?? ''));
+            } else {
+                $text = htmlspecialchars($file, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset);
             }
+        } else {
+            $text = htmlspecialchars($text, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset);
         }
 
         if (0 < $line) {

lib/symfony/twig-bridge/Extension/TranslationExtension.php

@@ -116,6 +116,10 @@ final class TranslationExtension extends AbstractExtension
                 throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be a locale passed as a string when the message is a "%s", "%s" given.', __METHOD__, TranslatableInterface::class, get_debug_type($arguments)));
             }
 
+            if ($message instanceof TranslatableMessage && '' === $message->getMessage()) {
+                return '';
+            }
+
             return $message->trans($this->getTranslator(), $locale ?? (\is_string($arguments) ? $arguments : null));
         }
 

lib/symfony/twig-bridge/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2022 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

lib/symfony/twig-bridge/Mime/NotificationEmail.php

@@ -235,7 +235,7 @@ class NotificationEmail extends TemplatedEmail
      */
     public function __serialize(): array
     {
-        return [$this->context, parent::__serialize()];
+        return [$this->context, $this->theme, parent::__serialize()];
     }
 
     /**
@@ -243,7 +243,12 @@ class NotificationEmail extends TemplatedEmail
      */
     public function __unserialize(array $data): void
     {
-        [$this->context, $parentData] = $data;
+        if (3 === \count($data)) {
+            [$this->context, $this->theme, $parentData] = $data;
+        } else {
+            // Backwards compatibility for deserializing data structures that were serialized without the theme
+            [$this->context, $parentData] = $data;
+        }
 
         parent::__unserialize($parentData);
     }

lib/symfony/twig-bridge/Mime/WrappedTemplatedEmail.php

@@ -35,6 +35,12 @@ final class WrappedTemplatedEmail
         return $this->message->getTo()[0]->getName();
     }
 
+    /**
+     * @param string      $image       A Twig path to the image file. It's recommended to define
+     *                                 some Twig namespace for email images (e.g. '@email/images/logo.png').
+     * @param string|null $contentType The media type (i.e. MIME type) of the image file (e.g. 'image/png').
+     *                                 Some email clients require this to display embedded images.
+     */
     public function image(string $image, string $contentType = null): string
     {
         $file = $this->twig->getLoader()->getSourceContext($image);
@@ -47,6 +53,13 @@ final class WrappedTemplatedEmail
         return 'cid:'.$image;
     }
 
+    /**
+     * @param string      $file        A Twig path to the file. It's recommended to define
+     *                                 some Twig namespace for email files (e.g. '@email/files/contract.pdf').
+     * @param string|null $name        A custom file name that overrides the original name of the attached file
+     * @param string|null $contentType The media type (i.e. MIME type) of the file (e.g. 'application/pdf').
+     *                                 Some email clients require this to display attached files.
+     */
     public function attach(string $file, string $name = null, string $contentType = null): void
     {
         $file = $this->twig->getLoader()->getSourceContext($file);

lib/symfony/twig-bridge/Resources/views/Email/zurb_2/main.css

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2017 ZURB, inc. -- MIT License
  *
- * https://raw.githubusercontent.com/foundation/foundation-emails/v2.2.1/dist/foundation-emails.css
+ * https://github.com/foundation/foundation-emails/blob/v2.2.1/dist/foundation-emails.css
  */
 
 .wrapper {