Merge branch 'feature/5324-powerportaluser-repairprofiles' into saas/3.1.0

PR fix

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 */
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 N°5324 */
 			'uniqueness_rules'    => array(
 				'no_duplicate' => array(
 					'attributes'  => array(

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 */
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 N°5324 */
 		);
 		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 */
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 N°5324 */
 		);
 		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/applicationextension.inc.php

@@ -2246,3 +2246,45 @@ 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;
+	}
+}

application/datamodel.application.xml

@@ -40,6 +40,36 @@
       <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/menunode.class.inc.php

@@ -9,6 +9,7 @@ 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");
 
 
 /**
@@ -103,7 +104,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
@@ -273,12 +274,23 @@ class ApplicationMenu
 				continue;
 			}
 
+			$aSubMenuNodes = static::GetSubMenuNodes($sMenuGroupIdx, $aExtraParams);
+			if (! ParentMenuNodeCompiler::$bUseLegacyMenuCompilation && !($oMenuNode instanceof ShortcutMenuNode)){
+				if (is_array($aSubMenuNodes) && 0 === sizeof($aSubMenuNodes)){
+					IssueLog::Error('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' => static::GetSubMenuNodes($sMenuGroupIdx, $aExtraParams),
+				'aSubMenuNodes' => $aSubMenuNodes,
 			];
 		}
 
@@ -536,7 +548,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
@@ -544,7 +556,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();
@@ -654,7 +666,7 @@ abstract class MenuNode
 
 	/**
 	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
-	 */	
+	 */
 	protected $m_aEnableStimuli;
 
 	/**
@@ -814,7 +826,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
@@ -987,7 +999,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)
@@ -1058,7 +1070,7 @@ class OQLMenuNode extends MenuNode
 	 * @var bool|null
 	 */
 	protected $bSearchFormOpen;
-	
+
 	/**
 	 * Extra parameters to be passed to the display block to fine tune its appearence
 	 */
@@ -1091,7 +1103,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
@@ -1120,7 +1132,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
 		);
@@ -1354,10 +1366,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))
@@ -1366,7 +1378,7 @@ class NewObjectMenuNode extends MenuNode
 				break; // Enough for now
 			}
 		}
-		return $bActionIsAllowed;		
+		return $bActionIsAllowed;
 	}
 
 	/**
@@ -1508,7 +1520,7 @@ class DashboardMenuNode extends MenuNode
 			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-	
+
 }
 
 /**
@@ -1549,7 +1561,7 @@ class ShortcutContainerMenuNode extends MenuNode
 			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
 			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
 		}
-	
+
 		// Complete the tree
 		//
 		parent::PopulateChildMenus();

application/templates/welcome_popup.html

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

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;
 	}
 
@@ -664,7 +664,7 @@ class CMDBSource
 		);
 		DeadLockLog::Info($sMessage, $iMySqlErrorNo, $aLogContext);
 
-		IssueLog::Error($sMessage, LogChannels::DEADLOCK, $e->getMessage());
+		IssueLog::Error($sMessage, LogChannels::DEADLOCK, [$e->getMessage()]);
 	}
 
 	/**
@@ -923,7 +923,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-				
+
 		while ($aRow = $oResult->fetch_array($iMode))
 		{
 			$aData[] = $aRow;
@@ -1077,7 +1077,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)
@@ -1088,7 +1088,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)
@@ -1355,13 +1355,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)
@@ -1494,7 +1494,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-		
+
 		$aRows = array();
 		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
@@ -1503,7 +1503,7 @@ class CMDBSource
 		$oResult->free();
 		return $aRows;
 	}
-	
+
 	/**
 	 * Returns the value of the specified server variable
 	 * @param string $sVarName Name of the server variable
@@ -1519,7 +1519,7 @@ class CMDBSource
 	/**
 	 * Returns the privileges of the current user
 	 * @return string privileges in a raw format
-	 */	   	
+	 */
 	public static function GetRawPrivileges()
 	{
 		try
@@ -1545,8 +1545,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

@@ -1345,6 +1345,14 @@ 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',
@@ -1627,6 +1635,14 @@ 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

@@ -57,7 +57,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
@@ -299,9 +299,9 @@ abstract class DBObject implements iDisplay
 
     /**
      * Whether the object is already persisted in DB or not.
-     * 
+     *
      * @api
-     * 
+     *
      * @return bool
      */
 	public function IsNew()
@@ -311,9 +311,9 @@ abstract class DBObject implements iDisplay
 
     /**
      * Returns an Id for memory objects
-     * 
+     *
      * @internal
-     * 
+     *
      * @param string $sClass
      *
      * @return int
@@ -350,7 +350,7 @@ abstract class DBObject implements iDisplay
         $sRet .= "<b title=\"$sRootClass\">$sClass</b>::$iPKey ($sFriendlyname)<br/>\n";
         return $sRet;
 	}
-	
+
     /**
      * Alias of DBObject::Reload()
      *
@@ -373,7 +373,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see m_bFullyLoaded
-     * 
+     *
      * @return bool
      * @throws CoreException
      */
@@ -496,7 +496,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)
@@ -556,7 +556,7 @@ abstract class DBObject implements iDisplay
 				$bFullyLoaded = false;
 			}
 		}
-		
+
 		// Load extended data
 		if ($aExtendedDataSpec != null)
 		{
@@ -580,7 +580,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see Set()
-     * 
+     *
      * @param string $sAttCode
      * @param mixed $value
      */
@@ -785,11 +785,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
@@ -862,7 +862,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see Get
-     * 
+     *
      * @param string $sAttCode
      *
      * @return int|mixed|null
@@ -967,7 +967,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
@@ -988,12 +988,12 @@ abstract class DBObject implements iDisplay
      * @internal
      *
      * @return array|null
-	 */	 
+	 */
 	public function GetExtendedData()
 	{
 		return $this->m_aExtendedData;
 	}
-	
+
 	/**
      * Set the HighlightCode
      *
@@ -1015,7 +1015,7 @@ abstract class DBObject implements iDisplay
 		{
 			$fCurrentRank = $aHighlightScale[$this->m_sHighlightCode]['rank'];
 		}
-				
+
 		if (array_key_exists($sCode, $aHighlightScale))
 		{
 			$fRank = $aHighlightScale[$sCode]['rank'];
@@ -1025,13 +1025,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()
@@ -1080,7 +1080,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.
      *
@@ -1149,7 +1149,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * @api
-     * 
+     *
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1195,11 +1195,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
@@ -1229,7 +1229,7 @@ abstract class DBObject implements iDisplay
 				else
 				{
 					$sEditValue = 0;
-				}					
+				}
 			}
 			else
 			{
@@ -1245,14 +1245,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
      *
@@ -1290,10 +1290,10 @@ abstract class DBObject implements iDisplay
 	}
 
     /**
-     * 
+     *
      * @see GetAsHTML()
      * @see GetOriginal()
-     * 
+     *
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1468,7 +1468,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * @internal
-     * 
+     *
      * @param string $sClass
      *
      * @return mixed
@@ -1523,7 +1523,7 @@ abstract class DBObject implements iDisplay
      * Get the id
      *
      * @api
-     * 
+     *
      * @return string|null
      */
 	public function GetKey()
@@ -1534,7 +1534,7 @@ abstract class DBObject implements iDisplay
     /**
      * Primary key Setter
      * Usable only for not yet persisted DBObjects
-     * 
+     *
      * @internal
      *
      * @param int $iNewKey the desired identifier
@@ -1547,7 +1547,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");
@@ -1557,7 +1557,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)
@@ -1647,7 +1647,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)
 	 */
@@ -1714,7 +1714,7 @@ abstract class DBObject implements iDisplay
 
 	/**
      * Helper to get the state
-     * 
+     *
      * @api
      *
 	 * @return mixed|string '' if no state attribute, object representing its value otherwise
@@ -1736,9 +1736,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
@@ -1785,7 +1785,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;
@@ -1794,14 +1794,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;
@@ -1930,7 +1930,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
      *
@@ -2137,7 +2137,7 @@ abstract class DBObject implements iDisplay
 
 	/**
      * @internal
-     * 
+     *
 	 * @throws \CoreException
 	 * @throws \OQLException
      *
@@ -2509,7 +2509,7 @@ abstract class DBObject implements iDisplay
 	 *
 	 * an array of displayable error is added in {@see DBObject::$m_aDeleteIssues}
 	 *
-     * @internal 
+     * @internal
      *
 	 * @param \DeletionPlan $oDeletionPlan
 	 *
@@ -2626,7 +2626,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);
@@ -2748,7 +2748,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()
@@ -2856,7 +2856,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
@@ -2865,7 +2865,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())
@@ -2875,7 +2875,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())
@@ -2899,7 +2899,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
@@ -2984,7 +2984,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
@@ -3019,7 +3019,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())
@@ -3157,6 +3157,10 @@ 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);
@@ -3206,6 +3210,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 
+			$this->SetReadWrite();
 			$this->m_bIsInDB = true;
 			$this->m_bDirty = false;
 			foreach ($this->m_aCurrValues as $sAttCode => $value) {
@@ -3216,7 +3221,7 @@ abstract class DBObject implements iDisplay
 			}
 
 			// Prevent DBUpdate at this point (reentrance protection)
-			MetaModel::StartReentranceProtection($this);
+			//MetaModel::StartReentranceProtection($this);
 
 			try {
 				$this->PostInsertActions();
@@ -3293,7 +3298,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
@@ -3382,6 +3387,7 @@ abstract class DBObject implements iDisplay
 					}
 				}
 
+				$this->SetReadOnly('No modification allowed during transaction');
 				$iTransactionRetry = 1;
 				$bIsTransactionEnabled = MetaModel::GetConfig()->Get('db_core_transactions_enabled');
 				if ($bIsTransactionEnabled) {
@@ -3496,6 +3502,8 @@ 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();
@@ -3909,7 +3917,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
@@ -4332,7 +4340,7 @@ abstract class DBObject implements iDisplay
      *
      * @api
      *
-	 */	 	
+	 */
 	public function Reset($sAttCode)
 	{
 		$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
@@ -4344,7 +4352,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);
@@ -4674,7 +4682,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)
 			{
@@ -4692,14 +4700,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;
@@ -4886,7 +4894,7 @@ abstract class DBObject implements iDisplay
 		if ($oOwner)
 		{
 			$sLinkSetOwnerClass = get_class($oOwner);
-			
+
 			$oMyChangeOp = MetaModel::NewObject($sChangeOpClass);
 			$oMyChangeOp->Set("objclass", $sLinkSetOwnerClass);
 			$oMyChangeOp->Set("objkey", $iLinkSetOwnerId);
@@ -4913,7 +4921,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)
@@ -4983,7 +4991,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)
@@ -5132,7 +5140,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:
@@ -5314,7 +5322,7 @@ abstract class DBObject implements iDisplay
 				$aSynchroClasses[] = $sTarget;
 			}
 		}
-		
+
 		foreach($aSynchroClasses as $sClass)
 		{
 			if ($this instanceof $sClass)

core/metamodel.class.php

@@ -1241,7 +1241,7 @@ abstract class MetaModel
 			}
 			$sTable = self::DBGetTable($sClass);
 
-			// Could be completed later with all the classes that are using a given table 
+			// Could be completed later with all the classes that are using a given table
 			if (!array_key_exists($sTable, $aTables)) {
 				$aTables[$sTable] = array();
 			}
@@ -3522,7 +3522,7 @@ abstract class MetaModel
 		}
 
 		// Set the "host class" as soon as possible, since HierarchicalKeys use it for their 'target class' as well
-		// and this needs to be know early (for Init_IsKnowClass 19 lines below)		
+		// and this needs to be know early (for Init_IsKnowClass 19 lines below)
 		$oAtt->SetHostClass($sTargetClass);
 
 		// Some attributes could refer to a class
@@ -3564,7 +3564,7 @@ abstract class MetaModel
 
 		self::$m_aAttribDefs[$sTargetClass][$oAtt->GetCode()] = $oAtt;
 		self::$m_aAttribOrigins[$sTargetClass][$oAtt->GetCode()] = $sTargetClass;
-		// Note: it looks redundant to put targetclass there, but a mix occurs when inheritance is used		
+		// Note: it looks redundant to put targetclass there, but a mix occurs when inheritance is used
 	}
 
 	/**
@@ -3764,7 +3764,7 @@ abstract class MetaModel
 		self::$m_aStimuli[$sTargetClass][$oStimulus->GetCode()] = $oStimulus;
 
 		// I wanted to simplify the syntax of the declaration of objects in the biz model
-		// Therefore, the reference to the host class is set there 
+		// Therefore, the reference to the host class is set there
 		$oStimulus->SetHostClass($sTargetClass);
 	}
 
@@ -6470,7 +6470,7 @@ abstract class MetaModel
 				$aCache['m_aExtensionClassNames'] = self::$m_aExtensionClassNames;
 				$aCache['m_Category2Class'] = self::$m_Category2Class;
 				$aCache['m_aRootClasses'] = self::$m_aRootClasses; // array of "classname" => "rootclass"
-				$aCache['m_aParentClasses'] = self::$m_aParentClasses; // array of ("classname" => array of "parentclass") 
+				$aCache['m_aParentClasses'] = self::$m_aParentClasses; // array of ("classname" => array of "parentclass")
 				$aCache['m_aChildClasses'] = self::$m_aChildClasses; // array of ("classname" => array of "childclass")
 				$aCache['m_aClassParams'] = self::$m_aClassParams; // array of ("classname" => array of class information)
 				$aCache['m_aAttribDefs'] = self::$m_aAttribDefs; // array of ("classname" => array of attributes)
@@ -7567,6 +7567,20 @@ 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
 	 *

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,7 +17,9 @@ $ibo-welcome-popup--text--options--bottom: 10px !default;
 
 #welcome_popup{
   display: flex;
-  
+}
+.ibo-welcome-popup--columns{
+	display: flex;
 }
 .ibo-welcome-popup--image{
   display: flex;
@@ -44,7 +46,39 @@ $ibo-welcome-popup--text--options--bottom: 10px !default;
     }
   }
 }
-.ibo-welcome-popup--text--options{
-  position: absolute;
-  bottom: $ibo-welcome-popup--text--options--bottom;
+.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;
+	}
 }

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

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

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

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

@@ -0,0 +1,13 @@
+<?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,6 +36,7 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
+			'src/UserProfilesEventListener.php'
 		),
 		'webservice' => array(
 			//'webservices.itop-profiles-itil.php',

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

@@ -0,0 +1,394 @@
+<?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);
+			}
+		}
+	}
+}

dictionaries/en.dictionary.itop.ui.php

@@ -452,6 +452,7 @@ 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,6 +444,7 @@ 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,6 +433,7 @@ 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',

lib/composer/autoload_classmap.php

@@ -14,6 +14,7 @@ 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',
@@ -363,6 +364,8 @@ 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',
@@ -372,6 +375,7 @@ 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',
@@ -2982,6 +2986,7 @@ 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_static.php

@@ -378,6 +378,7 @@ 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',
@@ -727,6 +728,8 @@ 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',
@@ -736,6 +739,7 @@ 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',
@@ -3346,6 +3350,7 @@ 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/installed.php

@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'dbf3393c9729a20f0bf389d343507238d61fef56',
+        'reference' => '204a6d8e51619cd669c6d9d7722edaa36d1c3394',
         'name' => 'combodo/itop',
         'dev' => true,
     ),
@@ -25,7 +25,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'dbf3393c9729a20f0bf389d343507238d61fef56',
+            'reference' => '204a6d8e51619cd669c6d9d7722edaa36d1c3394',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(

pages/UI.php

@@ -20,6 +20,7 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Controller\Base\Layout\ObjectController;
 use Combodo\iTop\Service\Router\Router;
+use Combodo\iTop\Application\WelcomePopup\WelcomePopupService;
 
 /**
  * Displays a popup welcome message, once per session at maximum
@@ -29,19 +30,18 @@ use Combodo\iTop\Service\Router\Router;
  *
  * @return void
  */
-function DisplayWelcomePopup(WebPage $oP)
+function DisplayWelcomePopup(WebPage $oP): void
 {
 	if (!Session::IsSet('welcome'))
 	{
-		// Check, only once per session, if the popup should be displayed...
-		// If the user did not already ask for hiding it forever
-		$bPopup = appUserPreferences::GetPref('welcome_popup', true);
-		if ($bPopup)
+		$oWelcomePopupService = new WelcomePopupService();
+		$aMessages = $oWelcomePopupService->GetMessages();
+		if (count($aMessages) > 0)
 		{
-			TwigHelper::RenderIntoPage($oP, APPROOT.'/', 'templates/pages/backoffice/welcome_popup/welcome_popup');
-			Session::Set('welcome', 'ok');
+			TwigHelper::RenderIntoPage($oP, APPROOT.'/', 'templates/pages/backoffice/welcome_popup/welcome_popup', ['messages' => $aMessages]);
 		}
-	}	
+		Session::Set('welcome', 'ok'); // Try just once per session
+	}
 }
 
 /**
@@ -66,7 +66,7 @@ function ApplyNextAction(Webpage $oP, CMDBObject $oObj, $sNextAction)
 	}
 	// Get the list of missing mandatory fields for the target state, considering only the changes from the previous form (i.e don't prompt twice)
 	$aExpectedAttributes = $oObj->GetTransitionAttributes($sNextAction);
-	
+
 	if (count($aExpectedAttributes) == 0)
 	{
 		// If all the mandatory fields are already present, just apply the transition silently...
@@ -85,7 +85,7 @@ function ApplyNextAction(Webpage $oP, CMDBObject $oObj, $sNextAction)
 		// redirect to the 'stimulus' action
 		$oAppContext = new ApplicationContext();
 //echo "<p>Missing Attributes <pre>".print_r($aExpectedAttributes, true)."</pre></p>\n";
-		
+
 		$oP->add_header('Location: '.utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=stimulus&class='.get_class($oObj).'&stimulus='.$sNextAction.'&id='.$oObj->getKey().'&'.$oAppContext->GetForLink());
 	}
 }
@@ -243,7 +243,7 @@ function DisplayMultipleSelectionForm(WebPage $oP, DBSearch $oFilter, string $sN
 		$aExtraParams['surround_with_panel'] = true;
 		if(array_key_exists('icon', $aDisplayParams)){
 			$aExtraParams['panel_icon'] = $aDisplayParams['icon'];
-		}		
+		}
 		if(array_key_exists('title', $aDisplayParams)){
 			$aExtraParams['panel_title'] = $aDisplayParams['title'];
 		}
@@ -292,7 +292,7 @@ function DisplayNavigatorGroupTab($oP)
 }
 
 /***********************************************************************************
- * 
+ *
  * Main user interface page starts here
  *
  ***********************************************************************************/
@@ -700,7 +700,7 @@ try
 				break;
 
 			///////////////////////////////////////////////////////////////////////////////////////////
-			
+
 			/** @deprecated 3.1.0 Use the "object.new" route instead */
 			// Kept for backward compatibility
 			case 'new': // Form to create a new object
@@ -1638,4 +1638,4 @@ class UI
 		);
 		cmdbAbstractObject::DoBulkModify($oP, $sClass, $aSelectedObj, 'preview_or_modify_all', $bPreview, $sCancelUrl, $aContext);
 	}
-}
+}

pages/ajax.render.php

@@ -17,6 +17,7 @@ use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
 use Combodo\iTop\Service\Router\Router;
 use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
+use Combodo\iTop\Controller\WelcomePopupController;
 
 require_once('../approot.inc.php');
 
@@ -201,10 +202,10 @@ try
 				$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
 				$oAppContext = new ApplicationContext();
 				$aPrefillFormParam = array(
-					'user'       => Session::Get("auth_user"),
-					'context'    => $oAppContext->GetAsHash(),
-					'att_code'   => $sAttCode,
-					'origin'     => 'console',
+					'user' => Session::Get("auth_user"),
+					'context' => $oAppContext->GetAsHash(),
+					'att_code' => $sAttCode,
+					'origin' => 'console',
 					'source_obj' => $oObj
 				);
 				$aAlreadyLinked = utils::ReadParam('aAlreadyLinked', array());
@@ -276,10 +277,10 @@ try
 				$oPage->SetContentType('text/html');
 				$oAppContext = new ApplicationContext();
 				$aPrefillFormParam = array(
-					'user'       => Session::Get('auth_user'),
-					'context'    => $oAppContext->GetAsHash(),
-					'att_code'   => $sAttCode,
-					'origin'     => 'console',
+					'user' => Session::Get('auth_user'),
+					'context' => $oAppContext->GetAsHash(),
+					'att_code' => $sAttCode,
+					'origin' => 'console',
 					'source_obj' => $oObj,
 				);
 				$aPrefillFormParam['dest_class'] = ($oObj === null ? '' : $oObj->Get($sAttCode)->GetClass());
@@ -303,10 +304,10 @@ try
 				}
 				$oAppContext = new ApplicationContext();
 				$aPrefillFormParam = array(
-					'user'       => Session::Get('auth_user'),
-					'context'    => $oAppContext->GetAsHash(),
-					'att_code'   => $sAttCode,
-					'origin'     => 'console',
+					'user' => Session::Get('auth_user'),
+					'context' => $oAppContext->GetAsHash(),
+					'att_code' => $sAttCode,
+					'origin' => 'console',
 					'source_obj' => $oObj,
 				);
 				$aPrefillFormParam['dest_class'] = ($oObj === null ? '' : $oObj->Get($sAttCode)->GetClass());
@@ -418,10 +419,10 @@ try
 				$iInputId = utils::ReadParam('iInputId', '');
 				$sAttCode = utils::ReadParam('sAttCode', '');
 				$sJson = utils::ReadParam('json', '', false, 'raw_data');
-	            $bTargetClassSelected = utils::ReadParam('bTargetClassSelected', '', false, 'raw_data');
-	            // Building form, if target class has child classes we ask the user for the desired leaf class, unless we've already done just that
+				$bTargetClassSelected = utils::ReadParam('bTargetClassSelected', '', false, 'raw_data');
+				// Building form, if target class has child classes we ask the user for the desired leaf class, unless we've already done just that
 				$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
-	            if(!$bTargetClassSelected && MetaModel::HasChildrenClasses($sTargetClass)){
+				if (!$bTargetClassSelected && MetaModel::HasChildrenClasses($sTargetClass)) {
 					$oWidget->GetClassSelectionForm($oPage);
 				} else {
 					$aPrefillFormParam = array();
@@ -430,11 +431,11 @@ try
 						$oObj = $oWizardHelper->GetTargetObject();
 						$oAppContext = new ApplicationContext();
 						$aPrefillFormParam = array(
-							'user'       => Session::Get('auth_user'),
-							'context'    => $oAppContext->GetAsHash(),
-							'att_code'   => $sAttCode,
+							'user' => Session::Get('auth_user'),
+							'context' => $oAppContext->GetAsHash(),
+							'att_code' => $sAttCode,
 							'source_obj' => $oObj,
-							'origin'     => 'console'
+							'origin' => 'console'
 						);
 					} else {
 						// Search form: no current object
@@ -527,7 +528,8 @@ try
 					$oObj->Set($sAttCode, $defaultValue);
 				}
 				$sFormPrefix = $oWizardHelper->GetFormPrefix();
-				$aExpectedAttributes = ($oWizardHelper->GetStimulus() === null) ? array() : $oObj->GetTransitionAttributes($oWizardHelper->GetStimulus(), $oWizardHelper->GetInitialState());
+				$aExpectedAttributes = ($oWizardHelper->GetStimulus() === null) ? array() : $oObj->GetTransitionAttributes($oWizardHelper->GetStimulus(),
+					$oWizardHelper->GetInitialState());
 				foreach ($oWizardHelper->GetFieldsForAllowedValues() as $sAttCode) {
 					$sId = $oWizardHelper->GetIdForField($sAttCode);
 					if ($sId != '') {
@@ -573,7 +575,8 @@ try
 				$sTargetState = utils::ReadParam('target_state', '');
 				$iTransactionId = utils::ReadParam('transaction_id', '', false, 'transaction_id');
 				$oObj->Set(MetaModel::GetStateAttributeCode($sClass), $sTargetState);
-				cmdbAbstractObject::DisplayCreationForm($oPage, $sClass, $oObj, array(), array('action' => utils::GetAbsoluteUrlAppRoot().'pages/UI.php', 'transaction_id' => $iTransactionId));
+				cmdbAbstractObject::DisplayCreationForm($oPage, $sClass, $oObj, array(),
+					array('action' => utils::GetAbsoluteUrlAppRoot().'pages/UI.php', 'transaction_id' => $iTransactionId));
 				break;
 
 			// DisplayBlock
@@ -600,8 +603,7 @@ try
 					} else {
 						try {
 							$oFilter = DBSearch::unserialize($sFilter);
-						}
-						catch (CoreException $e) {
+						} catch (CoreException $e) {
 							$sFilter = utils::HtmlEntities($sFilter);
 							$oPage->p("Invalid query (invalid filter) : <code>$sFilter</code>");
 							IssueLog::Error("ajax.render operation='ajax', invalid DBSearch filter param : $sFilter");
@@ -666,7 +668,8 @@ try
 								$aResult['JSURLs'] = str_replace('"', '\'', $oBlock->sJSURLs);
 								$aResult['js'] = 'charts['.$iRefresh.'].load({json: '.str_replace('"', '\'', $oBlock->sJson).
 									',keys: { x: \'label\', value:  [\'value\']'.
-									'},onclick: function (d) {  var aURLs = $.parseJSON('.str_replace('"', '\'', $oBlock->sJSURLs).'); window.location.href= aURLs[d.index]; }})';
+									'},onclick: function (d) {  var aURLs = $.parseJSON('.str_replace('"', '\'',
+										$oBlock->sJSURLs).'); window.location.href= aURLs[d.index]; }})';
 								break;
 
 							case 'pie':
@@ -677,7 +680,8 @@ try
 								$aResult['JSURLs'] = str_replace('"', '\'', $oBlock->sJSURLs);
 								$aResult['js'] = 'charts['.$iRefresh.'].load({columns: '.str_replace('"', '\'', $oBlock->sJSColumns).
 									',names: '.str_replace('"', '\'', $oBlock->sJSNames).
-									',onclick: function (d) {  var aURLs = $.parseJSON('.str_replace('"', '\'', $oBlock->sJSURLs).'); window.location.href= aURLs[d.index]; }})';
+									',onclick: function (d) {  var aURLs = $.parseJSON('.str_replace('"', '\'',
+										$oBlock->sJSURLs).'); window.location.href= aURLs[d.index]; }})';
 								break;
 						}
 					} else {
@@ -777,14 +781,14 @@ try
 				$oFilter = new DBObjectSearch($sClass);
 				$oSet = new CMDBObjectSet($oFilter);
 				$sHtml = cmdbAbstractObject::GetSearchForm($oPage, $oSet, array(
-					'currentId'                  => $currentId,
-					'baseClass'                  => $sRootClass,
-					'action'                     => $sAction,
-					'table_id'                   => $sTableId,
-					'selection_mode'             => $sSelectionMode,
+					'currentId' => $currentId,
+					'baseClass' => $sRootClass,
+					'action' => $sAction,
+					'table_id' => $sTableId,
+					'selection_mode' => $sSelectionMode,
 					'result_list_outer_selector' => $sResultListOuterSelector,
-					'cssCount'                   => $scssCount,
-					'table_inner_id'             => $sTableInnerId
+					'cssCount' => $scssCount,
+					'table_inner_id' => $sTableInnerId
 				));
 				$oPage->add($sHtml);
 				break;
@@ -821,13 +825,13 @@ try
 				TemporaryObjectManager::GetInstance()->CancelAllTemporaryObjects($iTransactionId);
 
 				IssueLog::Trace('on_form_cancel', $sObjClass, array(
-					'$iObjKey'        => $iObjKey,
+					'$iObjKey' => $iObjKey,
 					'$sTransactionId' => $iTransactionId,
-					'$sTempId'        => $sTempId,
-					'$sToken'         => $sToken,
-					'$sUser'          => UserRights::GetUser(),
-					'HTTP_REFERER'    => @$_SERVER['HTTP_REFERER'],
-					'REQUEST_URI'     => @$_SERVER['REQUEST_URI'],
+					'$sTempId' => $sTempId,
+					'$sToken' => $sToken,
+					'$sUser' => UserRights::GetUser(),
+					'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'],
+					'REQUEST_URI' => @$_SERVER['REQUEST_URI'],
 				));
 
 				break;
@@ -879,11 +883,9 @@ try
 						$oDoc = utils::ReadPostedDocument('dashboard_upload_file');
 						$oDashboard->FromXml($oDoc->GetData());
 						$oDashboard->Save();
-					}
-					catch (DOMException $e) {
+					} catch (DOMException $e) {
 						$aResult = array('error' => Dict::S('UI:Error:InvalidDashboardFile'));
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						$aResult = array('error' => $e->getMessage());
 					}
 				} else {
@@ -1054,7 +1056,8 @@ EOF
 					$oPage->add_script("$('#dashlet_$sDashletId').html('$sHtml');"); // in ajax web page add_script has the same effect as add_ready_script
 					// but is executed BEFORE all 'ready_scripts'
 					$oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed
-					$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property'));
+					$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php',
+						array('operation' => 'update_dashlet_property'));
 					$sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true /* bReturnHtml */, '.itop-dashboard'));
 					$sHtml = str_replace("\n", '', $sHtml);
 					$sHtml = str_replace("\r", '', $sHtml);
@@ -1113,7 +1116,8 @@ EOF
 					}
 					if ($oDashlet->IsFormRedrawNeeded()) {
 						$oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed
-						$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams));
+						$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php',
+							array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams));
 						$sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true, '.itop-dashboard'));
 						$sHtml = str_replace("\n", '', $sHtml);
 						$sHtml = str_replace("\r", '', $sHtml);
@@ -1359,7 +1363,8 @@ JS
 					}
 
 					$sFullTextJS = addslashes($sFullText);
-					$bEnableEnlarge = array_key_exists($sClassName, $aAccelerators) && array_key_exists('query', $aAccelerators[$sClassName]);
+					$bEnableEnlarge = array_key_exists($sClassName, $aAccelerators) && array_key_exists('query',
+							$aAccelerators[$sClassName]);
 					if (array_key_exists($sClassName, $aAccelerators) && array_key_exists('enable_enlarge', $aAccelerators[$sClassName])) {
 						$bEnableEnlarge &= $aAccelerators[$sClassName]['enable_enlarge'];
 					}
@@ -1393,9 +1398,11 @@ EOF;
 							$oPage->add("<div class=\"search-class-result search-class-$sClassName\">\n");
 							$oPage->add("<div class=\"page_header\">\n");
 							if (array_key_exists($sClassName, $aAccelerators)) {
-								$oPage->add('<h2 class="ibo-global-search--result--title">'.MetaModel::GetClassIcon($sClassName).Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aLeafs), Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
+								$oPage->add('<h2 class="ibo-global-search--result--title">'.MetaModel::GetClassIcon($sClassName).Dict::Format('UI:Search:Count_ObjectsOf_Class_Found',
+										count($aLeafs), Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
 							} else {
-								$oPage->add('<h2 class="ibo-global-search--result--title">'.MetaModel::GetClassIcon($sClassName).Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aLeafs), Metamodel::GetName($sClassName))."</h2>\n");
+								$oPage->add('<h2 class="ibo-global-search--result--title">'.MetaModel::GetClassIcon($sClassName).Dict::Format('UI:Search:Count_ObjectsOf_Class_Found',
+										count($aLeafs), Metamodel::GetName($sClassName))."</h2>\n");
 							}
 							$oPage->add("</div>\n");
 							$oLeafsFilter->AddCondition('id', $aLeafs, 'IN');
@@ -1411,7 +1418,8 @@ EOF;
 						if (array_key_exists($sClassName, $aAccelerators)) {
 							$oPage->add("<div class=\"search-class-result search-class-$sClassName\">\n");
 							$oPage->add("<div class=\"page_header\">\n");
-							$oPage->add('<h2 class="ibo-global-search--result--title">'.MetaModel::GetClassIcon($sClassName).Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', 0, Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
+							$oPage->add('<h2 class="ibo-global-search--result--title">'.MetaModel::GetClassIcon($sClassName).Dict::Format('UI:Search:Count_ObjectsOf_Class_Found',
+									0, Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
 							$oPage->add("</div>\n");
 							$oPage->add("</div>\n");
 							$oPage->p('&nbsp;'); // Some space ?
@@ -1491,7 +1499,8 @@ EOF
 				$oFilter->SetShowObsoleteData(utils::ShowObsoleteData());
 				$oSet = new DBObjectSet($oFilter);
 				$oPage->add("<div class=\"page_header\">\n");
-				$oPage->add("<h2>".MetaModel::GetClassIcon($sClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(), Metamodel::GetName($sClass))."</h2>\n");
+				$oPage->add("<h2>".MetaModel::GetClassIcon($sClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found',
+						$oSet->Count(), Metamodel::GetName($sClass))."</h2>\n");
 				$oPage->add("</div>\n");
 				if ($oSet->Count() > 0) {
 					$aLeafs = array();
@@ -1579,10 +1588,11 @@ EOF
 				$oPage->add('<div class="statistics"><div class="stats-toggle closed">'.Dict::S('ExcelExport:Statistics').'<div class="stats-data"></div></div></div>');
 				$oPage->add('</div>');
 				$aLabels = array(
-					'dialog_title'    => Dict::S('ExcelExporter:ExportDialogTitle'),
-					'cancel_button'   => Dict::S('UI:Button:Cancel'),
-					'export_button'   => Dict::S('ExcelExporter:ExportButton'),
-					'download_button' => Dict::Format('ExcelExporter:DownloadButton', 'export.xlsx'), //TODO: better name for the file (based on the class of the filter??)
+					'dialog_title' => Dict::S('ExcelExporter:ExportDialogTitle'),
+					'cancel_button' => Dict::S('UI:Button:Cancel'),
+					'export_button' => Dict::S('ExcelExporter:ExportButton'),
+					'download_button' => Dict::Format('ExcelExporter:DownloadButton', 'export.xlsx'),
+					//TODO: better name for the file (based on the class of the filter??)
 				);
 				$sJSLabels = json_encode($aLabels);
 				$sFilter = addslashes($sFilter);
@@ -1694,7 +1704,8 @@ EOF
 				if ($sDirection == 'up') {
 					$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aContexts);
 				} else {
-					$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects, $aContexts);
+					$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects,
+						$aContexts);
 				}
 
 				// Remove excluded classes from the graph
@@ -1754,9 +1765,11 @@ EOF
 						 $sIconUrl = MetaModel::GetClassIcon($sListClass, false);
 						$sIconUrl = str_replace(utils::GetAbsoluteUrlModulesRoot(), APPROOT.'env-'.utils::GetCurrentEnvironment().'/', $sIconUrl);
 						$oTitle = new Html("<img src=\"$sIconUrl\" style=\"vertical-align:middle;width: 24px; height: 24px;\"/> ".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(), Metamodel::GetName($sListClass)));*/
-						$oTitle = new Html(Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(), Metamodel::GetName($sListClass)));
+						$oTitle = new Html(Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(),
+							Metamodel::GetName($sListClass)));
 						$oPage->AddSubBlock(TitleUIBlockFactory::MakeStandard($oTitle, 2));
-						$oPage->AddSubBlock(cmdbAbstractObject::GetDataTableFromDBObjectSet($oSet, array('table_id' => $sSourceClass.'_'.$sRelation.'_'.$sDirection.'_'.$sListClass)));
+						$oPage->AddSubBlock(cmdbAbstractObject::GetDataTableFromDBObjectSet($oSet,
+							array('table_id' => $sSourceClass.'_'.$sRelation.'_'.$sDirection.'_'.$sListClass)));
 					}
 
 					// Then the content of the groups (one table per group)
@@ -1768,8 +1781,10 @@ EOF
 							$sListClass = get_class(current($aObjects));
 							$oSet = CMDBObjectSet::FromArray($sListClass, $aObjects);
 							$sIconUrl = MetaModel::GetClassIcon($sListClass, false);
-							$sIconUrl = str_replace(utils::GetAbsoluteUrlModulesRoot(), APPROOT.'env-'.utils::GetCurrentEnvironment().'/', $sIconUrl);
-							$oTitle = new Html("<img src=\"$sIconUrl\" style=\"vertical-align:middle;width: 24px; height: 24px;\"/> ".Dict::Format('UI:RelationGroupNumber_N', (1 + $idx)), Metamodel::GetName($sListClass));
+							$sIconUrl = str_replace(utils::GetAbsoluteUrlModulesRoot(), APPROOT.'env-'.utils::GetCurrentEnvironment().'/',
+								$sIconUrl);
+							$oTitle = new Html("<img src=\"$sIconUrl\" style=\"vertical-align:middle;width: 24px; height: 24px;\"/> ".Dict::Format('UI:RelationGroupNumber_N',
+									(1 + $idx)), Metamodel::GetName($sListClass));
 							$oPage->AddSubBlock(TitleUIBlockFactory::MakeStandard($oTitle, 2));
 							$oPage->AddSubBlock(cmdbAbstractObject::GetDataTableFromDBObjectSet($oSet));
 
@@ -1843,7 +1858,8 @@ EOF
 				if ($sDirection == 'up') {
 					$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aContexts);
 				} else {
-					$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects, $aContexts);
+					$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects,
+						$aContexts);
 				}
 
 				// Remove excluded classes from the graph
@@ -1874,13 +1890,15 @@ EOF
 					$oSearch = new DBObjectSearch($sListClass);
 					$oSearch->AddCondition('id', $aDefinition['keys'], 'IN');
 					$oSearch->SetShowObsoleteData(utils::ShowObsoleteData());
-					$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral(Dict::Format('UI:RelationGroupNumber_N', (1 + $idx)), 1, "relation_group_$idx"));
+					$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral(Dict::Format('UI:RelationGroupNumber_N', (1 + $idx)), 1,
+						"relation_group_$idx"));
 					$oBlock = new DisplayBlock($oSearch, 'list');
 					$oBlock->Display($oPage, 'group_'.$iBlock++, array(
 						'surround_with_panel' => true,
-						'panel_class'         => $sListClass,
-						'panel_title'         => Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aDefinition['keys']), Metamodel::GetName($sListClass)),
-						'panel_icon'          => MetaModel::GetClassIcon($sListClass, false),
+						'panel_class' => $sListClass,
+						'panel_title' => Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aDefinition['keys']),
+							Metamodel::GetName($sListClass)),
+						'panel_icon' => MetaModel::GetClassIcon($sListClass, false),
 					));
 				}
 				break;
@@ -1894,11 +1912,12 @@ EOF
 					$oSearch->SetShowObsoleteData(utils::ShowObsoleteData());
 					$oBlock = new DisplayBlock($oSearch, 'list');
 					$oBlock->Display($oPage, 'list_'.$iBlock++, array(
-						'table_id'            => 'ImpactAnalysis_'.$sListClass,
+						'table_id' => 'ImpactAnalysis_'.$sListClass,
 						'surround_with_panel' => true,
-						'panel_class'         => $sListClass,
-						'panel_title'         => Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aKeys), Metamodel::GetName($sListClass)),
-						'panel_icon'          => MetaModel::GetClassIcon($sListClass, false),
+						'panel_class' => $sListClass,
+						'panel_title' => Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aKeys),
+							Metamodel::GetName($sListClass)),
+						'panel_icon' => MetaModel::GetClassIcon($sListClass, false),
 					));
 				}
 				break;
@@ -1950,7 +1969,8 @@ EOF
 
 				$sContextKey = 'itop-tickets/relation_context/'.$sClass.'/'.$sRelation.'/'.$sDirection;
 				$oAppContext = new ApplicationContext();
-				$oGraph->Display($oPage, $aResults, $sRelation, $oAppContext, $aExcludedObjects, $sClass, $iId, $sContextKey, array('this' => $oTicket));
+				$oGraph->Display($oPage, $aResults, $sRelation, $oAppContext, $aExcludedObjects, $sClass, $iId, $sContextKey,
+					array('this' => $oTicket));
 				break;
 
 			case 'export_build':
@@ -2000,7 +2020,7 @@ EOF
 				$aLockData = iTopOwnershipLock::IsLocked($sObjClass, $iObjKey);
 
 				$aResult = [
-					'locked'  => $aLockData['locked'],
+					'locked' => $aLockData['locked'],
 					'message' => '',
 				];
 
@@ -2087,11 +2107,11 @@ EOF
 				$aResult = array(
 					'uploaded' => 0,
 					'fileName' => '',
-					'url'      => '',
-					'icon'     => '',
-					'msg'      => '',
-					'att_id'   => 0,
-					'preview'  => 'false',
+					'url' => '',
+					'icon' => '',
+					'msg' => '',
+					'att_id' => 0,
+					'preview' => 'false',
 				);
 
 				$sObjClass = stripslashes(utils::ReadParam('obj_class', '', false, 'class'));
@@ -2126,20 +2146,19 @@ EOF
 							}
 
 							IssueLog::Trace('InlineImage created', LogChannels::INLINE_IMAGE, array(
-								'$operation'   => $operation,
-								'$aResult'     => $aResult,
-								'secret'       => $oAttachment->Get('secret'),
-								'temp_id'      => $sTempId,
-								'item_class'   => $sObjClass,
-								'user'         => UserRights::GetUser(),
+								'$operation' => $operation,
+								'$aResult' => $aResult,
+								'secret' => $oAttachment->Get('secret'),
+								'temp_id' => $sTempId,
+								'item_class' => $sObjClass,
+								'user' => UserRights::GetUser(),
 								'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'],
-								'REQUEST_URI'  => @$_SERVER['REQUEST_URI'],
+								'REQUEST_URI' => @$_SERVER['REQUEST_URI'],
 							));
 						} else {
 							$aResult['error'] = $oDoc->GetFileName().' is not a valid image format.';
 						}
-					}
-					catch (FileUploadException $e) {
+					} catch (FileUploadException $e) {
 						$aResult['error'] = $e->GetMessage();
 					}
 				}
@@ -2156,8 +2175,8 @@ EOF
 					if (!InlineImage::IsImage($sDocMimeType)) {
 						LogErrorMessage('CKE : error when uploading image in ajax.render.php, not an image',
 							array(
-								'operation'   => 'cke_upload_and_browse',
-								'class'       => $sObjClass,
+								'operation' => 'cke_upload_and_browse',
+								'class' => $sObjClass,
 								'ImgMimeType' => $sDocMimeType,
 							));
 					} else {
@@ -2174,22 +2193,21 @@ EOF
 						$iAttId = $oAttachment->DBInsert();
 
 						IssueLog::Trace('InlineImage created', LogChannels::INLINE_IMAGE, array(
-							'$operation'   => $operation,
-							'secret'       => $oAttachment->Get('secret'),
-							'temp_id'      => $sTempId,
-							'item_class'   => $sObjClass,
-							'user'         => UserRights::GetUser(),
+							'$operation' => $operation,
+							'secret' => $oAttachment->Get('secret'),
+							'temp_id' => $sTempId,
+							'item_class' => $sObjClass,
+							'user' => UserRights::GetUser(),
 							'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'],
-							'REQUEST_URI'  => @$_SERVER['REQUEST_URI'],
+							'REQUEST_URI' => @$_SERVER['REQUEST_URI'],
 						));
 					}
 
-				}
-				catch (FileUploadException $e) {
+				} catch (FileUploadException $e) {
 					LogErrorMessage('CKE : error when uploading image in ajax.render.php, exception occured',
 						array(
-							'operation'    => 'cke_upload_and_browse',
-							'class'        => $sObjClass,
+							'operation' => 'cke_upload_and_browse',
+							'class' => $sObjClass,
 							'exceptionMsg' => $e,
 						));
 				}
@@ -2303,7 +2321,8 @@ $('.img-picker').magnificPopup({type: 'image', closeOnContentClick: true });
 EOF
 				);
 				$sOQL = "SELECT InlineImage WHERE ((temp_id = :temp_id) OR (item_class = :obj_class AND item_id = :obj_id))";
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('temp_id' => $sTempId, 'obj_class' => $sClass, 'obj_id' => $iObjectId));
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(),
+					array('temp_id' => $sTempId, 'obj_class' => $sClass, 'obj_id' => $iObjectId));
 				$oPage->add("<div><fieldset><legend>$sAvailableImagesLegend</legend>");
 
 				if ($oSet->Count() == 0) {
@@ -2360,7 +2379,8 @@ EOF
 						$aTriggerMentionedSearches = [];
 
 						$aTriggerSetParams = array('class_list' => MetaModel::EnumParentClasses($sHostClass, ENUM_PARENT_CLASSES_ALL));
-						$oTriggerSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObjectMention AS t WHERE t.target_class IN (:class_list)"), array(), $aTriggerSetParams);
+						$oTriggerSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObjectMention AS t WHERE t.target_class IN (:class_list)"),
+							array(), $aTriggerSetParams);
 						/** @var \TriggerOnObjectMention $oTrigger */
 						while ($oTrigger = $oTriggerSet->Fetch()) {
 							$sTriggerMentionedOQL = $oTrigger->Get('mentioned_filter');
@@ -2394,7 +2414,8 @@ EOF
 
 					// Add condition to filter on the friendlyname
 					$oSearch->AddConditionExpression(
-						new BinaryExpression(new FieldExpression('friendlyname', $sSearchMainClassAlias), 'LIKE', new VariableExpression('needle'))
+						new BinaryExpression(new FieldExpression('friendlyname', $sSearchMainClassAlias), 'LIKE',
+							new VariableExpression('needle'))
 					);
 
 					$oSet = new DBObjectSet($oSearch, [], $aSearchParams);
@@ -2413,8 +2434,8 @@ EOF
 						$sObjectClass = get_class($oObject);
 						$iObjectId = $oObject->GetKey();
 						$aMatch = [
-							'class'        => $sObjectClass,
-							'id'           => $iObjectId,
+							'class' => $sObjectClass,
+							'id' => $iObjectId,
 							'friendlyname' => $oObject->Get('friendlyname'),
 						];
 
@@ -2423,7 +2444,8 @@ EOF
 							/** @var \ormDocument $oImage */
 							$oImage = $oObject->Get($sObjectImageAttCode);
 							if (!$oImage->IsEmpty()) {
-								$aMatch['picture_style'] = "background-image: url('".$oImage->GetDisplayURL($sObjectClass, $iObjectId, $sObjectImageAttCode)."')";
+								$aMatch['picture_style'] = "background-image: url('".$oImage->GetDisplayURL($sObjectClass, $iObjectId,
+										$sObjectImageAttCode)."')";
 								$aMatch['initials'] = '';
 							} else {
 								// If no image found, fallback on initials
@@ -2460,8 +2482,7 @@ EOF
 					$aRenderRes = $oRenderer->Render($aRequestedFields);
 
 					$aResult['form']['updated_fields'] = $aRenderRes;
-				}
-				catch (Exception $e) {
+				} catch (Exception $e) {
 					$aResult['error'] = $e->getMessage();
 				}
 				$oPage->SetData($aResult);
@@ -2478,10 +2499,9 @@ EOF
 					$oController = new PreferencesController();
 					$aResult = $oController->SetUserPicture();
 					$aResult['success'] = true;
-				}
-				catch (Exception $oException) {
+				} catch (Exception $oException) {
 					$aResult = [
-						'success'       => false,
+						'success' => false,
 						'error_message' => $oException->getMessage(),
 					];
 				}
@@ -2500,10 +2520,9 @@ EOF
 					$aResult = [
 						'success' => true,
 					];
-				}
-				catch (Exception $oException) {
+				} catch (Exception $oException) {
 					$aResult = [
-						'success'       => false,
+						'success' => false,
 						'error_message' => $oException->getMessage(),
 					];
 				}
@@ -2516,10 +2535,9 @@ EOF
 				try {
 					$oController = new ActivityPanelController();
 					$aResult = $oController->AddCaseLogsEntries();
-				}
-				catch (Exception $oException) {
+				} catch (Exception $oException) {
 					$aResult = [
-						'success'       => false,
+						'success' => false,
 						'error_message' => $oException->getMessage(),
 					];
 				}
@@ -2532,10 +2550,9 @@ EOF
 				try {
 					$oController = new ActivityPanelController();
 					$aResult = $oController->LoadMoreEntries();
-				}
-				catch (Exception $oException) {
+				} catch (Exception $oException) {
 					$aResult = [
-						'success'       => false,
+						'success' => false,
 						'error_message' => $oException->getMessage(),
 					];
 				}
@@ -2551,6 +2568,24 @@ EOF
 				$oAjaxRenderController->GetMenusCount($oPage);
 				break;
 
+			//--------------------------------
+			// WelcomePopupMenu
+			//--------------------------------
+			case 'welcome_popup_acknowledge_message':
+				$oPage = new JsonPage();
+				try {
+					$oController = new WelcomePopupController();
+					$oController->AcknowledgeMessage();
+					$aResult = ['success' => true];
+				} catch (Exception $oException) {
+					$aResult = [
+						'success' => false,
+						'error_message' => $oException->getMessage(),
+					];
+				}
+				$oPage->SetData($aResult);
+				break;
+
 			//--------------------------------
 			// Object
 			//--------------------------------

pages/preferences.php

@@ -141,55 +141,58 @@ JS
 	//
 	//////////////////////////////////////////////////////////////////////////
 
-	$oFavoriteOrganizationsBlock = new Panel(Dict::S('UI:FavoriteOrganizations'), array(), 'grey', 'ibo-favorite-organizations');
-	$oFavoriteOrganizationsBlock->SetSubTitle(Dict::S('UI:FavoriteOrganizations+'));
-	$oFavoriteOrganizationsBlock->AddCSSClass('ibo-datatable-panel');
-	$oFavoriteOrganizationsForm = new Form();
-	$oFavoriteOrganizationsBlock->AddSubBlock($oFavoriteOrganizationsForm);
-	// Favorite organizations: the organizations listed in the drop-down menu
-	$sOQL = ApplicationMenu::GetFavoriteSiloQuery();
-	$oFilter = DBObjectSearch::FromOQL($sOQL);
-	$oBlock = new DisplayBlock($oFilter, 'list', false);
+	$bIsSiloSelectionEnabled = MetaModel::GetConfig()->Get('navigation_menu.show_organization_filter');
+	if ($bIsSiloSelectionEnabled)
+	{
+		$oFavoriteOrganizationsBlock = new Panel(Dict::S('UI:FavoriteOrganizations'), array(), 'grey', 'ibo-favorite-organizations');
+		$oFavoriteOrganizationsBlock->SetSubTitle(Dict::S('UI:FavoriteOrganizations+'));
+		$oFavoriteOrganizationsBlock->AddCSSClass('ibo-datatable-panel');
+		$oFavoriteOrganizationsForm = new Form();
+		$oFavoriteOrganizationsBlock->AddSubBlock($oFavoriteOrganizationsForm);
+		// Favorite organizations: the organizations listed in the drop-down menu
+		$sOQL = ApplicationMenu::GetFavoriteSiloQuery();
+		$oFilter = DBObjectSearch::FromOQL($sOQL);
+		$oBlock = new DisplayBlock($oFilter, 'list', false);
 
-	$aFavoriteOrgs = appUserPreferences::GetPref('favorite_orgs', null);
+		$aFavoriteOrgs = appUserPreferences::GetPref('favorite_orgs', null);
 
-	$sIdFavoriteOrganizations = 1;
-	$oFavoriteOrganizationsForm->AddSubBlock($oBlock->GetDisplay($oP, $sIdFavoriteOrganizations, [
-		'menu'                => false,
-		'selection_mode'      => true,
-		'selection_type'      => 'multiple',
-		'table_id'            => 'user_prefs',
-		'surround_with_panel' => false,
-		'selected_rows'       => $aFavoriteOrgs,
-	]));
-	$oFavoriteOrganizationsForm->AddSubBlock($oAppContext->GetForFormBlock());
+		$sIdFavoriteOrganizations = 1;
+		$oFavoriteOrganizationsForm->AddSubBlock($oBlock->GetDisplay($oP, $sIdFavoriteOrganizations, [
+			'menu'                => false,
+			'selection_mode'      => true,
+			'selection_type'      => 'multiple',
+			'table_id'            => 'user_prefs',
+			'surround_with_panel' => false,
+			'selected_rows'       => $aFavoriteOrgs,
+		]));
+		$oFavoriteOrganizationsForm->AddSubBlock($oAppContext->GetForFormBlock());
 
-	// Button toolbar
-	$oFavoriteOrganizationsToolBar = ToolbarUIBlockFactory::MakeForButton(null, ['ibo-is-fullwidth']);
-	$oFavoriteOrganizationsForm->AddSubBlock($oFavoriteOrganizationsToolBar);
+		// Button toolbar
+		$oFavoriteOrganizationsToolBar = ToolbarUIBlockFactory::MakeForButton(null, ['ibo-is-fullwidth']);
+		$oFavoriteOrganizationsForm->AddSubBlock($oFavoriteOrganizationsToolBar);
 
-	// - Cancel button
-	$oFavoriteOrganizationsCancelButton = ButtonUIBlockFactory::MakeForCancel(Dict::S('UI:Button:Cancel'));
-	$oFavoriteOrganizationsToolBar->AddSubBlock($oFavoriteOrganizationsCancelButton);
-	$oFavoriteOrganizationsCancelButton->SetOnClickJsCode("window.location.href = '$sURL'");
-	// - Submit button
-	$oFavoriteOrganizationsSubmitButton = ButtonUIBlockFactory::MakeForPrimaryAction(Dict::S('UI:Button:Apply'), 'operation', 'apply', true);
-	$oFavoriteOrganizationsToolBar->AddSubBlock($oFavoriteOrganizationsSubmitButton);
+		// - Cancel button
+		$oFavoriteOrganizationsCancelButton = ButtonUIBlockFactory::MakeForCancel(Dict::S('UI:Button:Cancel'));
+		$oFavoriteOrganizationsToolBar->AddSubBlock($oFavoriteOrganizationsCancelButton);
+		$oFavoriteOrganizationsCancelButton->SetOnClickJsCode("window.location.href = '$sURL'");
+		// - Submit button
+		$oFavoriteOrganizationsSubmitButton = ButtonUIBlockFactory::MakeForPrimaryAction(Dict::S('UI:Button:Apply'), 'operation', 'apply', true);
+		$oFavoriteOrganizationsToolBar->AddSubBlock($oFavoriteOrganizationsSubmitButton);
 
-	// TODO 3.0 have this code work again, currently it prevents the display of favorite organizations and shortcuts.
-	//	if ($aFavoriteOrgs == null) {
-	//		// All checked
-	//		$oP->add_ready_script(
-	//			<<<JS
-	//	$('#$sIdFavoriteOrganizations.checkAll').prop('checked', true);
-	//	checkAllDataTable('datatable_$sIdFavoriteOrganizations',true,'$sIdFavoriteOrganizations');
-	//JS
-	//		);
-	//
-	//	}
-
-	$oContentLayout->AddMainBlock($oFavoriteOrganizationsBlock);
+		// TODO 3.0 have this code work again, currently it prevents the display of favorite organizations and shortcuts.
+		//	if ($aFavoriteOrgs == null) {
+		//		// All checked
+		//		$oP->add_ready_script(
+		//			<<<JS
+		//	$('#$sIdFavoriteOrganizations.checkAll').prop('checked', true);
+		//	checkAllDataTable('datatable_$sIdFavoriteOrganizations',true,'$sIdFavoriteOrganizations');
+		//JS
+		//		);
+		//
+		//	}
 
+		$oContentLayout->AddMainBlock($oFavoriteOrganizationsBlock);
+	}
 	//////////////////////////////////////////////////////////////////////////
 	//
 	// Shortcuts

setup/backup.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.
@@ -146,18 +146,23 @@ class DBBackup
 	/**
 	 * Create a normalized backup name, depending on the current date/time and Database
 	 *
-	 * @param string $sNameSpec Name and path, eventually containing itop placeholders + time formatting following the strftime() format {@link https://www.php.net/manual/fr/function.strftime.php}
+	 * @param string|null $sNameSpec Name and path, eventually containing itop placeholders + time formatting following the strftime() format {@link https://www.php.net/manual/fr/function.strftime.php}
 	 * @param \DateTime|null $oDateTime Date time to use for the name
 	 *
-	 * @return string Name of the backup file WITHOUT the file extension (eg. `.tar.gz`)
+	 * @return ?string Name of the backup file WITHOUT the file extension (eg. `.tar.gz`)
 	 * @since 3.1.0 N°5279 Add $oDateTime parameter
 	 */
-	public function MakeName(string $sNameSpec = "__DB__-%Y-%m-%d", DateTime $oDateTime = null)
+	public function MakeName(?string $sNameSpec = null, ?DateTime $oDateTime = null)
 	{
 		if ($oDateTime === null) {
 			$oDateTime = new DateTime();
 		}
 
+		//N°6640
+		if ($sNameSpec === null) {
+			$sNameSpec = "__DB__-%Y-%m-%d";
+		}
+
 		$sFileName = $sNameSpec;
 		$sFileName = str_replace('__HOST__', $this->sDBHost, $sFileName);
 		$sFileName = str_replace('__DB__', $this->sDBName, $sFileName);
@@ -222,7 +227,7 @@ class DBBackup
 	 *
 	 * @param string $sSourceConfigFile
 	 * @param string $sTmpFolder
-	 * @param bool $bSkipSQLDumpForTesting 
+	 * @param bool $bSkipSQLDumpForTesting
 	 *
 	 * @return array list of files to archive
 	 * @throws \Exception
@@ -273,7 +278,7 @@ class DBBackup
 				if(!file_exists(APPROOT.'/'.$sExtraFileOrDir)) {
 					continue; // Ignore non-existing files
 				}
-	
+
 				$sExtraFullPath = utils::RealPath(APPROOT.'/'.$sExtraFileOrDir, APPROOT);
 				if ($sExtraFullPath === false)
 				{

setup/compiler.class.inc.php

@@ -23,15 +23,15 @@ use Combodo\iTop\DesignElement;
 
 require_once(APPROOT.'setup/setuputils.class.inc.php');
 require_once(APPROOT.'setup/modelfactory.class.inc.php');
+require_once(APPROOT.'setup/parentmenunodecompiler.class.inc.php');
 require_once(APPROOT.'core/moduledesign.class.inc.php');
 
-
 class DOMFormatException extends Exception
 {
     /**
      * Overrides the Exception default constructor to automatically add informations about the concerned node (path and
      * line number)
-     * 
+     *
      * @param string $message
      * @param $code
      * @param $previous
@@ -49,7 +49,7 @@ class DOMFormatException extends Exception
 
 /**
  * Compiler class
- */ 
+ */
 class MFCompiler
 {
 	const DATA_PRECOMPILED_FOLDER = 'data'.DIRECTORY_SEPARATOR.'precompiled_styles'.DIRECTORY_SEPARATOR;
@@ -356,7 +356,7 @@ class MFCompiler
 			apc_clear_cache();
 		}
 	}
-	
+
 
 	/**
 	 * Perform the actual "Compilation" of all modules
@@ -368,21 +368,16 @@ class MFCompiler
 	 */
 	protected function DoCompile($sTempTargetDir, $sFinalTargetDir, $oP = null, $bUseSymbolicLinks = false)
 	{
-		$aAllClasses = array(); // flat list of classes
-		$aModulesInfo = array(); // Hash array of module_name => array('version' => string, 'root_dir' => string)
+		$aAllClasses = []; // flat list of classes
+		$aModulesInfo = []; // Hash array of module_name => array('version' => string, 'root_dir' => string)
 
 		// Determine the target modules for the MENUS
-		//
-		$aMenuNodes = array();
-		$aMenusByModule = array();
-		foreach ($this->oFactory->GetNodes('menus/menu') as $oMenuNode)
-		{
-			$sMenuId = $oMenuNode->getAttribute('id');
-			$aMenuNodes[$sMenuId] = $oMenuNode;
 
-			$sModuleMenu = $oMenuNode->getAttribute('_created_in');
-			$aMenusByModule[$sModuleMenu][] = $sMenuId;
-		}
+		/**
+		 * @since 3.1 N°4762
+		 */
+		$oParentMenuNodeCompiler = new ParentMenuNodeCompiler($this);
+		$oParentMenuNodeCompiler->LoadXmlMenus($this->oFactory);
 
 		// Determine the target module (exactly one!) for USER RIGHTS
 		// This used to be based solely on the module which created the user_rights node first
@@ -429,6 +424,7 @@ class MFCompiler
 
 		static::SetUseSymbolicLinksFlag($bUseSymbolicLinks);
 
+		$oParentMenuNodeCompiler->LoadModuleMenuInfo($aModules);
 		foreach ($aModules as $foo => $oModule) {
 			$sModuleName = $oModule->GetName();
 			$sModuleVersion = $oModule->GetVersion();
@@ -513,7 +509,7 @@ class MFCompiler
 				}
 			}
 
-			if (!array_key_exists($sModuleName, $aMenusByModule))
+			if (is_null($oParentMenuNodeCompiler->GetMenusByModule($sModuleName)))
 			{
 				$this->Log("Found module without menus declared: $sModuleName");
 			}
@@ -533,79 +529,19 @@ class $sMenuCreationClass extends ModuleHandlerAPI
 		global \$__comp_menus__; // ensure that the global variable is indeed global !
 
 EOF;
-				// Preliminary: determine parent menus not defined within the current module
-				$aMenusToLoad = array();
-				$aParentMenus = array();
-				foreach($aMenusByModule[$sModuleName] as $sMenuId)
-				{
-					$oMenuNode = $aMenuNodes[$sMenuId];
-					// compute parent hierarchy
-					$aParentIdHierarchy = [];
-					while ($sParent = $oMenuNode->GetChildText('parent', null)) {
-						array_unshift($aParentIdHierarchy, $sParent);
-						$oMenuNode = $aMenuNodes[$sParent];
-					}
-					$aMenusToLoad = array_merge($aMenusToLoad, $aParentIdHierarchy);
-					$aParentMenus = array_merge($aParentMenus, $aParentIdHierarchy);
-					// Note: the order matters: the parents must be defined BEFORE
-					$aMenusToLoad[] = $sMenuId;
-				}
-				$aMenusToLoad = array_unique($aMenusToLoad);
-				$aMenuLinesForAll = array();
-				$aMenuLinesForAdmins = array();
-				$aAdminMenus = array();
-				foreach($aMenusToLoad as $sMenuId)
-				{
-					$oMenuNode = $aMenuNodes[$sMenuId];
-					if (is_null($oMenuNode))
-					{
-						throw new Exception("Module '{$oModule->GetId()}' (location : '$sModuleRootDir') contains an unknown menuId :  '$sMenuId'");
-					}
-					if ($oMenuNode->getAttribute("xsi:type") == 'MenuGroup')
-					{
-						// Note: this algorithm is wrong
-						// 1 - the module may appear empty in the current module, while children are defined in other modules
-						// 2 - check recursively that child nodes are not empty themselves
-						// Future algorithm:
-						// a- browse the modules and build the menu tree
-						// b- browse the tree and blacklist empty menus
-						// c- before compiling, discard if blacklisted
-						if (!in_array($oMenuNode->getAttribute("id"), $aParentMenus))
-						{
-							// Discard empty menu groups
-							continue;
-						}
-					}
-					try
-					{
-						/** @var \iTopWebPage $oP */
-						$aMenuLines = $this->CompileMenu($oMenuNode, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP);
-					}
-					catch (DOMFormatException $e)
-					{
-						throw new Exception("Failed to process menu '$sMenuId', from '$sModuleRootDir': ".$e->getMessage());
-					}
-					$sParent = $oMenuNode->GetChildText('parent', null);
-					if (($oMenuNode->GetChildText('enable_admin_only') == '1') || isset($aAdminMenus[$sParent]))
-					{
-						$aMenuLinesForAdmins = array_merge($aMenuLinesForAdmins, $aMenuLines);
-						$aAdminMenus[$oMenuNode->getAttribute("id")] = true;
-					}
-					else
-					{
-						$aMenuLinesForAll = array_merge($aMenuLinesForAll, $aMenuLines);
-					}
-				}
+
+				$oParentMenuNodeCompiler->CompileModuleMenus($oModule, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP);
+
 				$sIndent = "\t\t";
-				foreach ($aMenuLinesForAll as $sPHPLine)
+				foreach ($oParentMenuNodeCompiler->GetMenuLinesForAll() as $sPHPLine)
 				{
 					$sCompiledCode .= $sIndent.$sPHPLine."\n";
 				}
-				if (count($aMenuLinesForAdmins) > 0)
+				if (count($oParentMenuNodeCompiler->GetMenuLinesForAdmins()) > 0)
 				{
 					$sCompiledCode .= $sIndent."if (UserRights::IsAdministrator())\n";
 					$sCompiledCode .= $sIndent."{\n";
-					foreach ($aMenuLinesForAdmins as $sPHPLine)
+					foreach ($oParentMenuNodeCompiler->GetMenuLinesForAdmins() as $sPHPLine)
 					{
 						$sCompiledCode .= $sIndent."\t".$sPHPLine."\n";
 					}
@@ -637,7 +573,7 @@ EOF;
 					$sCompiledCode .= $aSnippet['content']."\n";
 				}
 			}
-			
+
 			// Create (overwrite if existing) the compiled file
 			//
 			if (strlen($sCompiledCode) > 0)
@@ -741,7 +677,7 @@ PHP;
 				$this->sMainPHPCode .= $aSnippet['content']."\n";
 			}
 		}
-		
+
 		// Compile the portals
 		/** @var \MFElement $oPortalsNode */
 		$oPortalsNode = $this->oFactory->GetNodes('/itop_design/portals')->item(0);
@@ -755,7 +691,7 @@ PHP;
 		/** @var \MFElement $oParametersNode */
 		$oParametersNode = $this->oFactory->GetNodes('/itop_design/module_parameters')->item(0);
 		$this->CompileParameters($oParametersNode, $sTempTargetDir, $sFinalTargetDir);
-		
+
 		if (array_key_exists('_core_', $this->aSnippets))
 		{
 			foreach( $this->aSnippets['_core_']['after'] as $aSnippet)
@@ -789,7 +725,7 @@ PHP;
 		$sCurrDate = date(DATE_ISO8601);
 		// Autoload
 		$sPHPFile = $sTempTargetDir.'/autoload.php';
-		$sPHPFileContent = 
+		$sPHPFileContent =
 <<<EOF
 <?php
 //
@@ -798,7 +734,7 @@ PHP;
 //
 EOF
 		;
-		
+
 		$sPHPFileContent .= "\nMetaModel::IncludeModule(MODULESROOT.'/core/main.php');\n";
 		$sPHPFileContent .= implode("\n", $aDataModelFiles);
 		$sPHPFileContent .= implode("\n", $aWebservicesFiles);
@@ -806,14 +742,14 @@ EOF
 		$sModulesInfo = str_replace("'".$sRelFinalTargetDir."/", "\$sCurrEnv.'/", $sModulesInfo);
 		$sPHPFileContent .= "\nfunction GetModulesInfo()\n{\n\$sCurrEnv = 'env-'.utils::GetCurrentEnvironment();\nreturn ".$sModulesInfo.";\n}\n";
 		file_put_contents($sPHPFile, $sPHPFileContent);
-		
+
 	} // DoCompile()
 
 	/**
 	 * Helper to form a valid ZList from the array built by GetNodeAsArrayOfItems()
 	 *
 	 * @param array $aItems
-	 */	 	
+	 */
 	protected function ArrayOfItemsToZList(&$aItems)
 	{
 		// Note: $aItems can be null in some cases so we have to protect it otherwise a PHP warning will be thrown during the foreach
@@ -845,7 +781,7 @@ EOF
 	 * Helper to format the flags for an attribute, in a given state
 	 * @param object $oAttNode DOM node containing the information to build the flags
 	 * Returns string PHP flags, based on the OPT_ATT_ constants, or empty (meaning 0, can be omitted)
-	 */ 
+	 */
 	protected function FlagsToPHP($oAttNode)
 	{
 		static $aNodeAttributeToFlag = array(
@@ -855,7 +791,7 @@ EOF
 			'must_change' => 'OPT_ATT_MUSTCHANGE',
 			'hidden' => 'OPT_ATT_HIDDEN',
 		);
-	
+
 		$aFlags = array();
 		foreach ($aNodeAttributeToFlag as $sNodeAttribute => $sFlag)
 		{
@@ -867,7 +803,7 @@ EOF
 		}
 		if (empty($aFlags))
 		{
-			$aFlags[] = 'OPT_ATT_NORMAL'; // When no flag is defined, reset the state to "normal"	
+			$aFlags[] = 'OPT_ATT_NORMAL'; // When no flag is defined, reset the state to "normal"
 		}
 		$sRes = implode(' | ', $aFlags);
 		return $sRes;
@@ -889,7 +825,7 @@ EOF
 			'details' => 'LINKSET_TRACKING_DETAILS',
 			'all' => 'LINKSET_TRACKING_ALL',
 		);
-	
+
 		static $aXmlToPHP_Others = array(
 			'none' => 'ATTRIBUTE_TRACKING_NONE',
 			'all' => 'ATTRIBUTE_TRACKING_ALL',
@@ -930,7 +866,7 @@ EOF
 			'in_place' => 'LINKSET_EDITMODE_INPLACE',
 			'add_remove' => 'LINKSET_EDITMODE_ADDREMOVE',
 		);
-	
+
 		if (!array_key_exists($sEditMode, $aXmlToPHP))
 		{
 			throw new DOMFormatException("Edit mode: unknown value '$sEditMode'");
@@ -938,10 +874,10 @@ EOF
 		return $aXmlToPHP[$sEditMode];
 	}
 
-	
+
 	/**
 	 * Format a path (file or url) as an absolute path or relative to the module or the app
-	 */ 
+	 */
 	protected function PathToPHP($sPath, $sModuleRelativeDir, $bIsUrl = false)
 	{
 		if ($sPath == '')
@@ -1034,7 +970,7 @@ EOF
 		else
 		{
 			throw new DOMFormatException("missing (or empty) mandatory tag '$sTag' under the tag '".$oNode->nodeName."'");
-		}	
+		}
 	}
 
 	/**
@@ -1138,7 +1074,7 @@ EOF
 
 	/**
 	 * Adds quotes and escape characters
-	 */	 	
+	 */
 	protected function QuoteForPHP($sStr, $bSimpleQuotes = false)
 	{
 		if ($bSimpleQuotes)
@@ -1245,7 +1181,7 @@ EOF
 				$sScalar = (string)(int)$sText;
 			}
 			break;
-		
+
 		case 'float':
 			if (is_null($sText))
 			{
@@ -1257,7 +1193,7 @@ EOF
 				$sScalar = (string)(float)$sText;
 			}
 			break;
-		
+
 		case 'bool':
 			if (is_null($sText))
 			{
@@ -2723,7 +2659,7 @@ CSS;
 	 * @throws \DOMException
 	 * @throws \DOMFormatException
 	 */
-	protected function CompileMenu($oMenu, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir, $oP)
+	public function CompileMenu($oMenu, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir, $oP)
 	{
 		$this->CompileFiles($oMenu, $sTempTargetDir.'/'.$sModuleRelativeDir, $sFinalTargetDir.'/'.$sModuleRelativeDir, $sModuleRelativeDir);
 
@@ -2819,11 +2755,11 @@ CSS;
 				case '1':
 				$sSearchFormOpen = 'true';
 				break;
-				
+
 				case '0':
 				$sSearchFormOpen = 'false';
 				break;
-				
+
 				default:
 				$sSearchFormOpen = 'true';
 			}
@@ -2912,7 +2848,7 @@ CSS;
 				foreach($this->oFactory->ListFields($oClass) as $oField)
 				{
 					$sAttType = $oField->getAttribute('xsi:type');
-		
+
 					if (($sAttType == 'AttributeExternalKey') || ($sAttType == 'AttributeHierarchicalKey'))
 					{
 						$sOnTargetDel = $oField->GetChildText('on_target_delete');
@@ -2938,7 +2874,7 @@ CSS;
 			$oClasses = $oGroup->GetUniqueElement('classes');
 			foreach($oClasses->getElementsByTagName('class') as $oClass)
 			{
-				
+
 				$sClass = $oClass->getAttribute("id");
 				$aClasses[] = $sClass;
 
@@ -2956,7 +2892,7 @@ CSS;
 		$aProfiles[1] = array(
 			'name' => 'Administrator',
 			'description' => 'Has the rights on everything (bypassing any control)',
-		); 
+		);
 
 		$aGrants = array();
 		$oProfiles = $oUserRightsNode->GetUniqueElement('profiles');
@@ -2988,7 +2924,7 @@ CSS;
 					}
 					$sGrant = $oAction->GetText();
 					$bGrant = ($sGrant == 'allow');
-					
+
 					if ($sGroupId == '*')
 					{
 						$aGrantClasses = array('*');
@@ -3227,7 +3163,7 @@ Dict::SetLanguagesList(
 $sLanguagesDump
 );
 EOF;
-		
+
 		file_put_contents($sLanguagesFile, $sLanguagesFileContent);
 	}
 
@@ -3264,7 +3200,7 @@ EOF;
 				{
 					throw new DOMFormatException('Could not find the file with ref '.$sFileId);
 				}
-	
+
 				$sName = $oNodes->item(0)->GetChildText('name');
 				$sData = base64_decode($oNodes->item(0)->GetChildText('data'));
 				$aPathInfo = pathinfo($sName);
@@ -3278,7 +3214,7 @@ EOF;
 				}
 				$oParentNode = $oFileRef->parentNode;
 				$oParentNode->removeChild($oFileRef);
-				
+
 				$oTextNode = $oParentNode->ownerDocument->createTextNode($sRelativePath.'/images/'.$sFile);
 				$oParentNode->appendChild($oTextNode);
 			}
@@ -3359,7 +3295,7 @@ EOF;
 			'utility_imports' => array(),
 			'stylesheets' => array(),
 		);
-		
+
 		if($oThemesCommonNodes !== null) {
 			/** @var \DOMNodeList $oThemesCommonVariables */
 			$oThemesCommonVariables = $oThemesCommonNodes->GetNodes('variables/variable');
@@ -3367,7 +3303,7 @@ EOF;
 				$sVariableId = $oVariable->getAttribute('id');
 				$aThemesCommonParameters['variables'][$sVariableId] = $oVariable->GetText();
 			}
-	
+
 			/** @var \DOMNodeList $oThemesCommonImports */
 			$oThemesCommonImports = $oThemesCommonNodes->GetNodes('imports/import');
 			foreach ($oThemesCommonImports as $oImport) {
@@ -3381,7 +3317,7 @@ EOF;
 					SetupLog::Warning('CompileThemes: Theme common has an import (#'.$sImportId.') without explicit xsi:type, it will be ignored. Check Datamodel XML Reference to fix it.');
 				}
 			}
-	
+
 			// Stylesheets
 			// - Manually added in the XML
 			/** @var \DOMNodeList $oThemesCommonStylesheets */
@@ -3446,7 +3382,7 @@ EOF;
 					$aThemeParameters[$sThemeParameterName] = array_merge($aThemeParameter, $aThemesCommonParameters[$sThemeParameterName]);
 				}
 			}
-			
+
 			$aThemes[$sThemeId] = [
 				'theme_parameters' => $aThemeParameters,
 				'precompiled_stylesheet' => $oTheme->GetChildText('precompiled_stylesheet', ''),
@@ -3640,8 +3576,8 @@ EOF;
 			{
 				SetupUtils::rrmdir($sTempTargetDir.'/branding/images');
 			}
-			
-			// Compile themes 
+
+			// Compile themes
 			$this->CompileThemes($oBrandingNode, $sTempTargetDir);
 		}
 	}
@@ -3682,11 +3618,11 @@ EOF;
 					{
 						$aPortalsConfig[$sPortalId]['deny'][] = $oProfile->getAttribute('id');
 					}
-				}	
+				}
 			}
-			
+
 			uasort($aPortalsConfig, array(get_class($this), 'SortOnRank'));
-			
+
 			$this->sMainPHPCode .= "\n";
 			$this->sMainPHPCode .= "/**\n";
 			$this->sMainPHPCode .= " * Portal(s) definition(s) extracted from the XML definition at compile time\n";
@@ -3729,7 +3665,7 @@ EOF;
 				$oParamsReader = new MFParameters($oParams);
 				$aParametersConfig[$sModuleId] = $oParamsReader->GetAll();
 			}
-			
+
 			$this->sMainPHPCode .= "\n";
 			$this->sMainPHPCode .= "/**\n";
 			$this->sMainPHPCode .= " * Modules parameters extracted from the XML definition at compile time\n";

setup/parentmenunodecompiler.class.inc.php

@@ -0,0 +1,287 @@
+<?php
+
+/**
+ * @since 3.1 N°4762
+ */
+class ParentMenuNodeCompiler
+{
+	const COMPILED = 1;
+	const COMPILING = 2;
+
+	public static $bUseLegacyMenuCompilation = false;
+
+	/**
+	 * @var MFCompiler
+	 */
+	private $oMFCompiler;
+
+	/**
+	 * admin menus declaration lines: result of module menu compilation
+	 * @var array
+	 */
+	private $aMenuLinesForAdmins = [];
+
+	/**
+	 * non-admin menus declaration lines: result of module menu compilation
+	 * @var array
+	 */
+	private $aMenuLinesForAll = [];
+
+	/**
+	 * use to handle menu group compilation recurring algorithm
+	 * @var array
+	 */
+	private $aMenuProcessStatus = [];
+
+	/**
+	 * @var array
+	 */
+	private $aMenuNodes = [];
+
+	/**
+	 * @var array
+	 */
+	private $aMenusByModule = [];
+
+	/**
+	 * @var array
+	 */
+	private $aMenusToLoadByModule = [];
+
+	/**
+	 * @var array
+	 */
+	private $aParentMenusByModule = [];
+
+	/**
+	 * used by overall algo
+	 * @var array
+	 */
+	private $aParentMenuNodes = [];
+
+	/**
+	 * used by new algo
+	 * @var array
+	 */
+	private $aParentAdminMenus = [];
+
+	/**
+	 * used by overall algo
+	 * @var array
+	 */
+	private $aParentModuleRootDirs = [];
+
+	public function __construct(MFCompiler $oMFCompiler) {
+		$this->oMFCompiler = $oMFCompiler;
+	}
+
+	public static function UseLegacyMenuCompilation(){
+		self::$bUseLegacyMenuCompilation = true;
+	}
+
+	/**
+	 * @param \ModelFactory $oFactory
+	 * Initialize menu nodes arrays
+	 * @return void
+	 */
+	public function LoadXmlMenus(\ModelFactory $oFactory) : void {
+		foreach ($oFactory->GetNodes('menus/menu') as $oMenuNode) {
+			$sMenuId = $oMenuNode->getAttribute('id');
+			$this->aMenuNodes[$sMenuId] = $oMenuNode;
+
+			$sModuleMenu = $oMenuNode->getAttribute('_created_in');
+			$this->aMenusByModule[$sModuleMenu][] = $sMenuId;
+		}
+	}
+
+	/**
+	 * @param $aModules
+	 * Initialize arrays related to parent/child menus
+	 * @return void
+	 */
+	public function LoadModuleMenuInfo($aModules) : void
+	{
+		foreach ($aModules as $foo => $oModule) {
+			$sModuleRootDir = $oModule->GetRootDir();
+			$sModuleName = $oModule->GetName();
+
+			if (array_key_exists($sModuleName, $this->aMenusByModule)) {
+				$aMenusToLoad = [];
+				$aParentMenus = [];
+
+				foreach ($this->aMenusByModule[$sModuleName] as $sMenuId) {
+					$oMenuNode = $this->aMenuNodes[$sMenuId];
+
+					if (self::$bUseLegacyMenuCompilation){
+						if ($sParent = $oMenuNode->GetChildText('parent', null)) {
+							$aMenusToLoad[] = $sParent;
+							$aParentMenus[] = $sParent;
+						}
+					} else {
+						if ($oMenuNode->getAttribute("xsi:type") == 'MenuGroup') {
+							$this->aParentModuleRootDirs[$sMenuId] = $sModuleRootDir;
+						}
+
+						if ($sParent = $oMenuNode->GetChildText('parent', null)) {
+							$aMenusToLoad[] = $sParent;
+							$aParentMenus[] = $sParent;
+
+							$this->aParentModuleRootDirs[$sParent] = $sModuleRootDir;
+						}
+
+						if (array_key_exists($sMenuId, $this->aParentModuleRootDirs)){
+							$this->aParentMenuNodes[$sMenuId] = $oMenuNode;
+						}
+					}
+
+					// Note: the order matters: the parents must be defined BEFORE
+					$aMenusToLoad[] = $sMenuId;
+				}
+
+				$this->aMenusToLoadByModule[$sModuleName] = array_unique($aMenusToLoad);
+				$this->aParentMenusByModule[$sModuleName] = array_unique($aParentMenus);
+			}
+		}
+	}
+
+	/**
+	 * Perform the actual "Compilation" for one module at a time
+	 * @param \MFModule $oModule
+	 * @param string $sTempTargetDir
+	 * @param string $sFinalTargetDir
+	 * @param string $sRelativeDir
+	 * @param Page $oP
+	 *
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function CompileModuleMenus(MFModule $oModule, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP = null) : void
+	{
+		$this->aMenuLinesForAdmins = [];
+		$this->aMenuLinesForAll = [];
+		$aAdminMenus = [];
+
+		$sModuleRootDir = $oModule->GetRootDir();
+		$sModuleName = $oModule->GetName();
+
+		$aParentMenus = $this->aParentMenusByModule[$sModuleName];
+		foreach($this->aMenusToLoadByModule[$sModuleName] as $sMenuId)
+		{
+			$oMenuNode = $this->aMenuNodes[$sMenuId];
+			if (is_null($oMenuNode))
+			{
+				throw new Exception("Module '{$oModule->GetId()}' (location : '$sModuleRootDir') contains an unknown menuId :  '$sMenuId'");
+			}
+
+			if (self::$bUseLegacyMenuCompilation) {
+				if ($oMenuNode->getAttribute("xsi:type") == 'MenuGroup') {
+					// Note: this algorithm is wrong
+					// 1 - the module may appear empty in the current module, while children are defined in other modules
+					// 2 - check recursively that child nodes are not empty themselves
+					// Future algorithm:
+					// a- browse the modules and build the menu tree
+					// b- browse the tree and blacklist empty menus
+					// c- before compiling, discard if blacklisted
+					if (! in_array($oMenuNode->getAttribute("id"), $aParentMenus)) {
+						// Discard empty menu groups
+						continue;
+					}
+				}
+			} else {
+				if (array_key_exists($sMenuId, $this->aParentMenuNodes)) {
+					// compile parent menus recursively
+					$this->CompileParentMenuNode($sMenuId, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP);
+					continue;
+				}
+			}
+
+			try
+			{
+				//both new/legacy algo: compile leaf menu
+				$aMenuLines = $this->oMFCompiler->CompileMenu($oMenuNode, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP);
+			}
+			catch (DOMFormatException $e)
+			{
+				throw new Exception("Failed to process menu '$sMenuId', from '$sModuleRootDir': ".$e->getMessage());
+			}
+
+			$sParent = $oMenuNode->GetChildText('parent', null);
+			if (($oMenuNode->GetChildText('enable_admin_only') == '1') || isset($aAdminMenus[$sParent]) || isset($this->aParentAdminMenus[$sParent]))
+			{
+				$this->aMenuLinesForAdmins = array_merge($this->aMenuLinesForAdmins, $aMenuLines);
+				$aAdminMenus[$oMenuNode->getAttribute("id")] = true;
+			}
+			else
+			{
+				$this->aMenuLinesForAll = array_merge($this->aMenuLinesForAll, $aMenuLines);
+			}
+		}
+	}
+
+	/**
+	 * Perform parent menu compilation including its ancestrors (recursively)
+	 * @param string $sMenuId
+	 * @param string $sTempTargetDir
+	 * @param string $sFinalTargetDir
+	 * @param string $sRelativeDir
+	 * @param Page $oP
+	 *
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function CompileParentMenuNode(string $sMenuId, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP = null) : void
+	{
+		$oMenuNode = $this->aParentMenuNodes[$sMenuId];
+		$sStatus = array_key_exists($sMenuId, $this->aMenuProcessStatus) ? $this->aMenuProcessStatus[$sMenuId] : null;
+		if ($sStatus === self::COMPILED){
+			//node already processed before
+			return;
+		} else if ($sStatus === self::COMPILING){
+			throw new \Exception("Cyclic dependency between parent menus ($sMenuId)");
+		}
+
+		$this->aMenuProcessStatus[$sMenuId] = self::COMPILING;
+
+		try {
+			$sParent = $oMenuNode->GetChildText('parent', null);
+			if (! empty($sParent)){
+				//compile parents before (even parent of parents ... recursively)
+				$this->CompileParentMenuNode($sParent, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP);
+			}
+
+			if (! array_key_exists($sMenuId, $this->aParentModuleRootDirs)){
+				throw new Exception("Failed to process parent menu '$sMenuId' that is referenced by a child but not defined");
+			}
+			$sModuleRootDir = $this->aParentModuleRootDirs[$sMenuId];
+			$aMenuLines = $this->oMFCompiler->CompileMenu($oMenuNode, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $oP);
+		} catch (DOMFormatException $e) {
+			throw new Exception("Failed to process menu '$sMenuId', from '$sModuleRootDir': ".$e->getMessage());
+		}
+		$sParent = $oMenuNode->GetChildText('parent', null);
+		if (($oMenuNode->GetChildText('enable_admin_only') == '1') || isset($this->aParentAdminMenus[$sParent])) {
+			$this->aMenuLinesForAdmins = array_merge($this->aMenuLinesForAdmins, $aMenuLines);
+			$this->aParentAdminMenus[$oMenuNode->getAttribute("id")] = true;
+		} else {
+			$this->aMenuLinesForAll = array_merge($this->aMenuLinesForAll, $aMenuLines);
+		}
+
+		$this->aMenuProcessStatus[$sMenuId] = self::COMPILED;
+	}
+
+	public function GetMenusByModule(string $sModuleName) : ?array
+	{
+		if (array_key_exists($sModuleName, $this->aMenusByModule)) {
+			return $this->aMenusByModule[$sModuleName];
+		}
+
+		return null;
+	}
+
+	public function GetMenuLinesForAdmins(): array {
+		return $this->aMenuLinesForAdmins;
+	}
+
+	public function GetMenuLinesForAll(): array {
+		return $this->aMenuLinesForAll;
+	}
+}

sources/Application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php

@@ -49,6 +49,16 @@ class NewsroomMenuFactory
 		return $oMenu;
 	}
 
+	/**
+	 * Check if there is any Newsroom provider configured
+	 * @return boolean
+	 */	
+	public static function HasProviders()
+	{
+		$aProviders = MetaModel::EnumPlugins('iNewsroomProvider');
+		return count($aProviders) > 0;
+	}
+
 	/**
 	 * Prepare parameters for the newsroom JS widget
 	 *
@@ -100,4 +110,4 @@ class NewsroomMenuFactory
 		);
 		return $aParams;
 	}
-}
+}

sources/Application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php

@@ -21,6 +21,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu;
 
 
 
+use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItemFactory;
 use Dict;
 use JSPopupMenuItem;
@@ -56,30 +57,68 @@ class PopoverMenuFactory
 			->SetHorizontalPosition(PopoverMenu::ENUM_HORIZONTAL_POSITION_ALIGN_OUTER_RIGHT)
 			->SetVerticalPosition(PopoverMenu::ENUM_VERTICAL_POSITION_ABOVE);
 
+		$aUserMenuItems = [];
+
 		// Allowed portals
 		$aAllowedPortalsItems = static::PrepareAllowedPortalsItemsForUserMenu();
-		if (!empty($aAllowedPortalsItems)) {
-			$oMenu->AddSection('allowed_portals')
-				->SetItems('allowed_portals', $aAllowedPortalsItems);
-		}
+		self::AddPopoverMenuItems($aAllowedPortalsItems, $aUserMenuItems);
 
 		// User related pages
-		$oMenu->AddSection('user_related')
-			->SetItems('user_related', static::PrepareUserRelatedItemsForUserMenu());
+		self::AddPopoverMenuItems(static::PrepareUserRelatedItemsForUserMenu(), $aUserMenuItems);
 
 		// API: iPopupMenuExtension::MENU_USER_ACTIONS
 		$aAPIItems = static::PrepareAPIItemsForUserMenu($oMenu);
-		if (count($aAPIItems) > 0) {
-			$oMenu->AddSection('popup_menu_extension-menu_user_actions')
-				->SetItems('popup_menu_extension-menu_user_actions', $aAPIItems);
-		}
+		self::AddPopoverMenuItems($aAPIItems, $aUserMenuItems);
 
 		// Misc links
-		$oMenu->AddSection('misc')
-			->SetItems('misc', static::PrepareMiscItemsForUserMenu());
+		/*$oMenu->AddSection('misc')
+			->SetItems('misc', static::PrepareMiscItemsForUserMenu());*/
+		self::AddPopoverMenuItems(static::PrepareMiscItemsForUserMenu(), $aUserMenuItems);
 
+		self::SortPopoverMenuItems($aUserMenuItems);
+
+		$oMenu->AddSection('misc')
+			->AddItems('misc', $aUserMenuItems);
 		return $oMenu;
 	}
+
+	/**
+	 * @param PopoverMenuItem[] $aPopoverMenuItem
+	 * @param PopoverMenuItem[] $aUserMenuItems
+	 *
+	 * @return void
+	 */
+	private static function AddPopoverMenuItems(array $aPopoverMenuItem, array &$aUserMenuItems) : void {
+		foreach ($aPopoverMenuItem as $oPopoverMenuItem){
+			$aUserMenuItems[$oPopoverMenuItem->GetUID()] = $oPopoverMenuItem;
+		}
+	}
+
+	/**
+	 * @param PopoverMenuItem[] $aPopoverMenuItem
+	 * @param PopoverMenuItem[] $aUserMenuItems
+	 *
+	 * @return void
+	 */
+	private static function SortPopoverMenuItems(array &$aUserMenuItems) : void {
+		$aSortedMenusFromConfig = MetaModel::GetConfig()->Get('navigation_menu.sorted_popup_user_menu_items');
+		if (!is_array($aSortedMenusFromConfig) || empty($aSortedMenusFromConfig)){
+			return;
+		}
+
+		$aSortedMenus = [];
+		foreach ($aSortedMenusFromConfig as $sMenuUID){
+			if (array_key_exists($sMenuUID, $aUserMenuItems)){
+				$aSortedMenus[]=$aUserMenuItems[$sMenuUID];
+				unset($aUserMenuItems[$sMenuUID]);
+			}
+		}
+
+		foreach ($aUserMenuItems as $oMenu){
+			$aSortedMenus[]=$oMenu;
+		}
+		$aUserMenuItems = $aSortedMenus;
+	}
 	
 	/**
 	 * Return the allowed portals items for the current user
@@ -273,4 +312,4 @@ class PopoverMenuFactory
 
 		return $oMenu;
 	}
-}
+}

sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php

@@ -34,6 +34,7 @@ use MetaModel;
 use UIExtKeyWidget;
 use UserRights;
 use utils;
+use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenuFactory;
 
 /**
  * Class NavigationMenu
@@ -274,7 +275,7 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut
 	 */
 	public function IsNewsroomEnabled(): bool
 	{
-		return MetaModel::GetConfig()->Get('newsroom_enabled');
+		return (MetaModel::GetConfig()->Get('newsroom_enabled') && NewsroomMenuFactory::HasProviders());
 	}
 
 	/**

sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php

@@ -48,7 +48,7 @@ class NavigationMenuFactory
 	{
 		
 		$oNewsroomMenu = null;
-		if (MetaModel::GetConfig()->Get('newsroom_enabled'))
+		if (MetaModel::GetConfig()->Get('newsroom_enabled') && NewsroomMenuFactory::HasProviders())
 		{
 			$oNewsroomMenu = NewsroomMenuFactory::MakeNewsroomMenuForNavigationMenu();
 		}
@@ -57,4 +57,4 @@ class NavigationMenuFactory
 			new ApplicationContext(), PopoverMenuFactory::MakeUserMenuForNavigationMenu(), $oNewsroomMenu, NavigationMenu::BLOCK_CODE
 		);
 	}
-}
+}

sources/Application/WelcomePopup/DefaultWelcomePopup.php

@@ -0,0 +1,27 @@
+<?php
+namespace Combodo\iTop\Application\WelcomePopup;
+
+use Dict;
+use AbstractWelcomePopup;
+
+/**
+ * Implementation of the "default" Welcome Popup message
+ * @since 3.1.0
+ */
+class DefaultWelcomePopup extends AbstractWelcomePopup
+{
+	public function GetMessages()
+	{
+		return [
+			[
+				// Replacement of the welcome popup message which
+				// was hard-coded in the pages/UI.php
+				'id' => '0001',
+				'title' => Dict::S('UI:WelcomeMenu:Title'),
+				'twig' => '/templates/pages/backoffice/welcome_popup/default_welcome_popup',
+				'importance' => \iWelcomePopup::IMPORTANCE_HIGH,
+				'parameters' => [],
+			],
+		];
+	}
+}

sources/Application/WelcomePopup/WelcomePopupService.php

@@ -0,0 +1,234 @@
+<?php
+namespace Combodo\iTop\Application\WelcomePopup;
+use AttributeDateTime;
+use DBObjectSearch;
+use DBObjectSet;
+use Exception;
+use IssueLog;
+use LogChannels;
+use MetaModel;
+use UserRights;
+use WelcomePopupAcknowledge;
+use iWelcomePopup;
+use utils;
+
+/**
+ * Handling of the messages displayed in the "Welcome Popup"
+ * @since 3.1.0
+ *
+ */
+class WelcomePopupService
+{
+	private const PROVIDER_KEY_LENGTH = 128;
+	/**
+	 * Array of acknowledged messages for the current user
+	 * @var string[]
+	 */
+	static $aAcknowledgedMessage = null;
+
+	/**
+	 * Array of "providers" of welcome popup messages
+	 * @var iWelcomePopup[]
+	 */
+	protected $aMessagesProviders = null;
+
+	/**
+	 * Get the list of messages to display in the Welcome popup dialog
+	 * @return string[][]
+	 */
+	public function GetMessages()
+	{
+		$this->LoadProviders();
+		return $this->ProcessMessages();
+	}
+	
+	/**
+	 * Get the messages to display from a list of iWelcomePopup instances
+	 * The messages are ordered by importance (CRITICAL first) then by ID
+	 * Invalid messages or acknowledged messages are removed from the list
+	 * @return array
+	 */
+	protected function ProcessMessages(): array
+	{
+		$this->LoadProviders();
+		$aMessages = [];
+		foreach($this->aMessagesProviders as $oProvider) {
+			$aProviderMessages = $oProvider->GetMessages();
+			if (count($aProviderMessages) === 0) {
+				IssueLog::Debug('Empty list of messages for '.get_class($oProvider), LogChannels::CONSOLE);
+			}
+			foreach($aProviderMessages as $aMessage) {
+				$aReasons = [];
+				if (!$this->IsMessageValid($aMessage, $aReasons)) {
+					IssueLog::Error('Invalid structure returned by '.get_class($oProvider).'::GetMessages()', LogChannels::CONSOLE, $aReasons);
+					continue; // Fail silently
+				}
+				$sUUID = $this->MakeStringFitIn(get_class($oProvider), static::PROVIDER_KEY_LENGTH).'::'.$aMessage['id'];
+				$aMessage['uuid'] = $sUUID;
+				$aMessages[] = $aMessage;
+			}
+		}
+		// Filter the acknowledged messages AFTER getting all messages
+		// This allows for "replacing" a message (from another provider for example)
+		// by automatically acknowledging it when called in GetMessages()
+		foreach($aMessages as $key => $aMessage) {
+			if ($this->IsMessageAcknowledged($aMessage['uuid'])) {
+				IssueLog::Debug('Ignoring already acknowledged message '.$aMessage['uuid'], LogChannels::CONSOLE);
+				unset($aMessages[$key]);
+			}
+		}
+		usort($aMessages,  array(get_class($this), 'SortOnImportance'));
+		return $aMessages;
+	}
+	
+	/**
+	 * Helper function for usort to compare two items based on their 'importance' field
+	 * @param string[] $aItem1
+	 * @param string[] $aItem2
+	 * @return int
+	 */	
+	public static function SortOnImportance($aItem1, $aItem2): int
+	{
+		if ($aItem1['importance'] === $aItem2['importance']) {
+			return strcmp($aItem1['id'], $aItem2['id']);
+		}
+		return ($aItem1['importance'] < $aItem2['importance'])  ? -1 : 1;
+	}
+	
+	public function AcknowledgeMessage(string $sMessageUUID): void
+	{
+		$this->LoadProviders();
+		$oAcknowledge = MetaModel::NewObject(WelcomePopupAcknowledge::class, [
+			'message_uuid' => $sMessageUUID,
+			'acknowledge_date' => date(AttributeDateTime::GetSQLFormat()),
+			'user_id' => UserRights::GetConnectedUserId(),
+		]);
+		try {
+			$oAcknowledge->DBInsert();
+			$oProvider = $this->GetProviderByUUID($sMessageUUID);
+			if (static::$aAcknowledgedMessage !== null) {
+				static::$aAcknowledgedMessage[] = $sMessageUUID; // Update the cache
+			}
+			// Notify the provider of the message
+			$sMessageId = substr($sMessageUUID, strpos($sMessageUUID, '::')+2);
+			if ($oProvider !== null) {
+				$oProvider->AcknowledgeMessage($sMessageId);
+			}
+		} catch(Exception $e) {
+			IssueLog::Error("Failed to acknowledge the message $sMessageUUID for user ".UserRights::GetConnectedUserId().". Reason: ".$e->getMessage(), LogChannels::CONSOLE);
+		}
+	}
+	
+	/**
+	 * Load the provider of messages, decoupled from the constructor for testability
+	 */
+	protected function LoadProviders(): void
+	{
+		if ($this->aMessagesProviders !== null) return;
+
+		$aProviders = [];
+		$aProviderClasses = utils::GetClassesForInterface(iWelcomePopup::class, '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
+		foreach($aProviderClasses as $sProviderClass) {
+			$aProviders[] = new $sProviderClass();
+		}
+		$this->SetMessagesProviders($aProviders);
+	}
+
+	/**
+	 * Check if a given message was acknowledged by the current user
+	 * @param string $sMessageId
+	 * @return bool
+	 */
+	protected function IsMessageAcknowledged(string $sMessageUUID): bool
+	{
+		$iUserId = UserRights::GetConnectedUserId();	
+		if (static::$aAcknowledgedMessage === null) {
+			
+			$oSearch = new DBObjectSearch(WelcomePopupAcknowledge::class);
+			$oSearch->AddCondition('user_id', $iUserId);
+			$oSet = new DBObjectSet($oSearch);
+			$aAcknowledgedMessages = $oSet->GetColumnAsArray('message_uuid');
+			$this->SetAcknowledgedMessagesCache($aAcknowledgedMessages);
+		}
+		return in_array($sMessageUUID, static::$aAcknowledgedMessage); 
+	}
+	
+	/**
+	 * Set the cache of acknowledged messages (useful for testing)
+	 * @param array $aAcknowledgedMessages
+	 */
+	protected function SetAcknowledgedMessagesCache(array $aAcknowledgedMessages): void
+	{
+		static::$aAcknowledgedMessage = $aAcknowledgedMessages;
+	}
+
+	/**
+	 * Set the cache of welcome popup message providers (useful for testing)
+	 * @param iWelcomePopup[] $aMessagesProviders
+	 */
+	protected function SetMessagesProviders(array $aMessagesProviders): void
+	{
+		$this->aMessagesProviders = $aMessagesProviders;
+	}
+	
+	/**
+	 * Retrieve the provider associated with a message
+	 * @param string $sMessageUUID
+	 * @return iWelcomePopup|NULL
+	 */
+	protected function GetProviderByUUID(string $sMessageUUID): ?iWelcomePopup
+	{
+		$this->LoadProviders();
+		$sProviderKey = substr($sMessageUUID, 0, strpos($sMessageUUID, '::'));
+		foreach($this->aMessagesProviders as $oProvider) {
+			if ($this->MakeStringFitIn(get_class($oProvider), static::PROVIDER_KEY_LENGTH) === $sProviderKey) {
+				return $oProvider;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Check if the structure of a given message is valid by checking
+	 * all its mandatory elements
+	 * @param string[] $aMessage
+	 * @param string[] $aReasons
+	 * @return bool
+	 */
+	protected function IsMessageValid($aMessage, array &$aReasons): bool
+	{
+		if (!is_array($aMessage)) {
+			$aReasons[] = 'GetMessage() must return an array of arrays.';
+			return false; // Stop checking immediately
+		}
+		$bRet = true;
+		foreach(['id', 'importance', 'title'] as $sKey) {
+			if (!array_key_exists($sKey, $aMessage)) {
+				$aReasons[] = "Field '$sKey' missing from the message structure.";
+				$bRet = false;
+			}
+		}
+		if (!array_key_exists('html', $aMessage) && !array_key_exists('twig', $aMessage)) {
+			$aReasons[] = "Message structure must contain either a field 'html' or a field 'twig'.";
+			$bRet = false;
+		}
+		return $bRet;
+	}
+	
+	/**
+	 * Shorten the given string (if needed) but preserving its uniqueness
+	 * @param string $sProviderClass
+	 * @param int $iLengthLimit
+	 * @return string
+	 */
+	protected function MakeStringFitIn(string $sProviderClass, int $iLengthLimit): string
+	{
+		if(mb_strlen($sProviderClass) <= $iLengthLimit) {
+			return $sProviderClass;
+		}
+		// Truncate the string to $iLimitLength and replace the first carahcters with the MD5 of the complete string 
+		$sMD5 = md5($sProviderClass, false);
+		return $sMD5.'-'.mb_substr($sProviderClass, -($iLengthLimit - strlen($sMD5) - 1)); // strlen is OK on the MD5 string, and '-' is not allowed in a class name
+	}
+}
+

sources/Controller/WelcomePopupController.php

@@ -0,0 +1,24 @@
+<?php
+namespace Combodo\iTop\Controller;
+
+use Combodo\iTop\Application\WelcomePopup\WelcomePopupService;
+use utils;
+
+/**
+ * Simple controller to acknowledge (via Ajax) welcome popup messages
+ * @since 3.1.0
+ *
+ */
+class WelcomePopupController
+{
+	/**
+	 * Operation: welcome_popup.acknowledge_message
+	 */
+	public function AcknowledgeMessage(): void
+	{
+		$oService = new WelcomePopupService();
+		$sMessageUUID = utils::ReadPostedParam('message_uuid', '', false, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
+		$oService->AcknowledgeMessage($sMessageUUID);
+	}
+}
+

sources/Service/Events/EventService.php

@@ -134,8 +134,8 @@ final class EventService
 			return;
 		}
 
-		$oLastException = null;
-		$sLastExceptionMessage = null;
+		$oFirstException = null;
+		$sFirstExceptionMessage = null;
 		$bEventFired = false;
 		foreach (self::GetListeners($sEvent, $eventSource) as $aEventCallback) {
 			if (!self::MatchContext($aEventCallback['context'])) {
@@ -153,9 +153,12 @@ final class EventService
 				throw $e;
 			}
 			catch (Exception $e) {
-				$sLastExceptionMessage = "Event '$sLogEventName' for '$sName' id {$aEventCallback['id']} failed with non-blocking error: ".$e->getMessage();
-				EventServiceLog::Error($sLastExceptionMessage);
-				$oLastException = $e;
+				$sExceptionMessage = "Event '$sLogEventName' for '$sName' id {$aEventCallback['id']} failed with non-blocking error: ".$e->getMessage();
+				EventServiceLog::Error($sExceptionMessage);
+				if (is_null($oFirstException)){
+					$oFirstException = $e;
+					$sFirstExceptionMessage = $sExceptionMessage;
+				}
 			}
 		}
 		if ($bEventFired) {
@@ -163,9 +166,9 @@ final class EventService
 		}
 		$oKPI->ComputeStats('FireEvent', $sEvent);
 
-		if (!is_null($oLastException)) {
-			EventServiceLog::Error("Throwing the last exception caught: $sLastExceptionMessage");
-			throw $oLastException;
+		if (!is_null($oFirstException)) {
+			EventServiceLog::Error("Throwing the last exception caught: $sFirstExceptionMessage");
+			throw $oFirstException;
 		}
 	}
 

templates/pages/backoffice/welcome_popup/default_welcome_popup.html.twig

@@ -0,0 +1,10 @@
+<div class="ibo-welcome-popup--columns">
+    <div class="ibo-welcome-popup--image ibo-svg-illustration--container">
+        {{ source("images/illustrations/undraw_relaunch_day.svg") }}
+    </div>
+    <div class="ibo-welcome-popup--text">
+        <div>
+            {{ 'UI:WelcomeMenu:Text'| dict_s|raw }}
+        </div>
+    </div>
+</div>

templates/pages/backoffice/welcome_popup/welcome_popup.html.twig

@@ -1,14 +1,25 @@
-<div id="welcome_popup">
-    <div class="ibo-welcome-popup--image ibo-svg-illustration--container">
-        {{ source("images/illustrations/undraw_relaunch_day.svg") }}
-    </div>
-    <div class="ibo-welcome-popup--text">
-        <div>
-            {{ 'UI:WelcomeMenu:Text'| dict_s|raw }}
-        </div>
-        <div class="ibo-welcome-popup--text--options">
-        <input type="checkbox" checked id="display_welcome_popup"/><label for="display_welcome_popup">{{'UI:DisplayThisMessageAtStartup'| dict_s}}</label>
-        </div>
-    </div>
-
+<div id="welcome_popup_dialog" class="ibo-welcome-popup--dialog ibo-is-hidden">
+<div class="ibo-welcome-popup--content">
+{% for message in messages %}
+	<div class="ibo-welcome-popup--message {% if not loop.first %}ibo-is-hidden{% endif %}" data-message-uuid="{{ message.uuid }}" data_role="welcome-popup-title" data-title="{{ message.title }}">
+	    {% if message.twig is defined %}
+	        {{ include([message.twig ~ '.html.twig', message.twig ~ '.twig', message.twig], message.parameters ?? {}, sandboxed = true) }}
+	    {% else %}
+	        {{ message.html|raw }}	    
+	    {% endif %}
+	    <div class="ibo-welcome-popup--button" data-message-uuid="{{ message.uuid }}">
+	    {% UIButton ForPrimaryAction{'sLabel':'UI:WelcomePopup:Button:Acknowledge'|dict_s,  'bIsSubmit': false } %}
+	    </div>
+	</div>
+{% endfor %}
 </div>
+<div class="ibo-welcome-popup--indicators">
+{% if messages|length > 1 %}
+    {% for message in messages %}
+    	<span class="ibo-welcome-popup--indicator {% if loop.first %}ibo-welcome-popup--active{% endif %}" data-message-uuid="{{ message.uuid }}"></span>
+    {% endfor %}
+{% endif %}
+</div>
+</div>
+
+

templates/pages/backoffice/welcome_popup/welcome_popup.ready.js.twig

@@ -1,14 +1,38 @@
-$('#welcome_popup').dialog( { width:'60%', height: 'auto', title: '{{ 'UI:WelcomeMenu:Title'|dict_s }}', autoOpen: true, modal:true,
-    close: function() {
-        var bDisplay = $('#display_welcome_popup:checked').length;
-        SetUserPreference('welcome_popup', bDisplay, true);
-    },
-    buttons: [{
-        text: "{{ 'UI:Button:Ok'|dict_s }}", click: function() {
-            $(this).dialog( "close" ); $(this).remove();
-        }}],
+$('#welcome_popup_dialog').removeClass('ibo-is-hidden');
+$('#welcome_popup_dialog').dialog({
+	modal: true,
+	width: '60%', 
+	autoOpen: true,
+	title: $('div[data_role=welcome-popup-title]').first().attr('data-title'),
+	close: function() { $('#welcome_popup_dialog').remove(); }
+ });
+$('.ui-widget-overlay').click(function() { $('#welcome_popup_dialog').dialog('close'); } );
+$('.ibo-welcome-popup--indicator').click(function() {
+	const id = $(this).attr('data-message-uuid');
+	const escaped_id = id.replace(/\\/g, '\\\\'); // All backslashes must be doubled in a jQuery selector 
+	const new_title = $('.ibo-welcome-popup--message[data-message-uuid="'+escaped_id+'"]').attr('data-title');
+	$('.ibo-welcome-popup--message').addClass('ibo-is-hidden');
+	$('.ibo-welcome-popup--indicator').removeClass('ibo-welcome-popup--active');
+	$('.ibo-welcome-popup--message[data-message-uuid="'+escaped_id+'"]').removeClass('ibo-is-hidden');
+	$('.ibo-welcome-popup--indicator[data-message-uuid="'+escaped_id+'"]').addClass('ibo-welcome-popup--active');
+	$('#welcome_popup_dialog').dialog('option', 'title', new_title);
+	$('.ibo-welcome-popup--message[data-message-uuid="'+escaped_id+'"] button').focus();
+});
+$('.ibo-welcome-popup--button').click('button', function() {
+	const id = $(this).attr('data-message-uuid');
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'welcome_popup_acknowledge_message', message_uuid: id});
+	const escaped_id = id.replace(/\\/g, '\\\\');;  // All backslashes must be doubled in a jQuery selector
+	$('.ibo-welcome-popup--message[data-message-uuid="'+escaped_id+'"]').remove();
+	if($('.ibo-welcome-popup--message').length == 0) {
+		// Last message, close the dialog
+		$('#welcome_popup_dialog').dialog('close');
+	} else {
+    	// Move the active state to the next message
+    	$('.ibo-welcome-popup--indicator[data-message-uuid="'+escaped_id+'"]').siblings().first().trigger('click');
+    	$('.ibo-welcome-popup--indicator[data-message-uuid="'+escaped_id+'"]').remove();
+    	if ($('.ibo-welcome-popup--indicator').length == 1) {
+    		// Last indicator, remove it
+    		$('.ibo-welcome-popup--indicator').remove();
+    	}
+	}
 });
-if ($('#welcome_popup').height() > ($(window).height()-70))
-{
-    $('#welcome_popup').height($(window).height()-70);
-}

tests/php-unit-tests/unitary-tests/application/UI/Base/Component/PopoverMenu/PopoverMenuFactoryTest.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace UI\Base\Component\PopoverMenu;
+
+use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuFactory;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+
+/**
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class PopoverMenuFactoryTest extends ItopDataTestCase {
+
+	public function MakeUserMenuForNavigationMenuProvider(){
+		$aNotSortedMenuUIDs = [
+			'portal_itop_portal',
+			'UI_Preferences',
+			'UI_Help',
+			'UI_AboutBox'
+		];
+
+		return [
+			'no conf' => [
+				'aConf' => null,
+				'aExpectedMenuUIDs' => $aNotSortedMenuUIDs
+			],
+			'not an array conf' => [
+				'aConf' => "wrong conf",
+				'aExpectedMenuUIDs' => $aNotSortedMenuUIDs
+			],
+			'default conf' => [
+				'aConf' => [],
+				'aExpectedMenuUIDs' => $aNotSortedMenuUIDs
+			],
+			'same order in conf' => [
+				'aConf' => [
+					'portal:itop-portal',
+					'UI:Preferences',
+					'UI:Help',
+					'UI:AboutBox',
+				],
+				'aExpectedMenuUIDs' => $aNotSortedMenuUIDs
+			],
+			'first menus sorted and last one missing in conf' => [
+				'aConf' => [
+					"portal:itop-portal",
+					"UI:Preferences",
+				],
+				'aExpectedMenuUIDs' => $aNotSortedMenuUIDs
+			],
+			'some menus but not all sorted' => [
+				'aConf' => [
+					'UI:Preferences',
+					'UI:AboutBox',
+				],
+				'aExpectedMenuUIDs' => [
+					'UI_Preferences',
+					'UI_AboutBox',
+					'portal_itop_portal',
+					'UI_Help',
+				]
+			],
+			'all user menu sorted' => [
+				'aConf' => [
+					'UI:Preferences',
+					'UI:AboutBox',
+					'portal:itop-portal',
+					'UI:Help',
+				],
+				'aExpectedMenuUIDs' => [
+					'UI_Preferences',
+					'UI_AboutBox',
+					'portal_itop_portal',
+					'UI_Help',
+				]
+			 ],
+		];
+	}
+	/**
+	 * @dataProvider MakeUserMenuForNavigationMenuProvider
+	 */
+	public function testMakeUserMenuForNavigationMenu($aConf, $aExpectedMenuUIDs){
+		if (! is_null($aConf)){
+			\MetaModel::GetConfig()->Set('navigation_menu.sorted_popup_user_menu_items', $aConf);
+		}
+
+		$aRes = PopoverMenuFactory::MakeUserMenuForNavigationMenu()->GetSections();
+		$this->assertTrue(array_key_exists('misc', $aRes));
+		$aUIDsWithDummyRandoString = array_keys($aRes['misc']['aItems']);
+		//replace ibo-popover-menu--item-6464cdca5ecf4214716943--UI_AboutBox by UI_AboutBox (for ex)
+		$aUIDs = preg_replace('/ibo-popover-menu--item-([^\-]+)--/', '', $aUIDsWithDummyRandoString);
+		$this->assertEquals($aExpectedMenuUIDs, $aUIDs);
+	}
+}

tests/php-unit-tests/unitary-tests/application/WelcomePopup/WelcomePopupTest.php

@@ -0,0 +1,221 @@
+<?php
+use Combodo\iTop\Application\WelcomePopup\WelcomePopupService;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class WelcomePopupTest extends ItopDataTestCase
+{
+	/**
+	 * @dataProvider sortOnImportanceDataProvider
+	 */
+	public function testSortOnImportance($aToSort, $aExpected)
+	{
+		$bResult = usort($aToSort, [WelcomePopupService::class, 'SortOnImportance']);
+		$this->assertTrue($bResult);
+		$this->assertEquals($aExpected, $aToSort);
+	}
+	
+	/**
+	 * Data provider for testSortOnImportance
+	 * @return array[][]|string[][][][]|number[][][][]
+	 */
+	public function sortOnImportanceDataProvider()
+	{
+		return [
+			'empty array' => [
+				'to-sort' => [],
+				'expected' => [],
+			],
+			'3-item array' => [
+				'to-sort' => [
+					['id' => 'aa1', 'title' => 'AA1', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'aa2', 'title' => 'AA2', 'importance' => 1 /*iWelcomePopup::IMPORTANCE_HIGH*/],
+					['id' => 'aa3', 'title' => 'AA3', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+				],
+				'expected' => [
+					['id' => 'aa1', 'title' => 'AA1', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'aa3', 'title' => 'AA3', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'aa2', 'title' => 'AA2', 'importance' => 1 /*iWelcomePopup::IMPORTANCE_HIGH*/],
+				],
+			],
+			'5-item array' => [
+				'to-sort' => [
+					['id' => 'aa1', 'title' => 'AA1', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'aa2', 'title' => 'AA2', 'importance' => 1 /*iWelcomePopup::IMPORTANCE_HIGH*/],
+					['id' => 'aa3', 'title' => 'AA3', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'zz1', 'title' => 'ZZ1', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'zz2', 'title' => 'ZZ2', 'importance' => 1 /*iWelcomePopup::IMPORTANCE_HIGH*/],
+				],
+				'expected' => [
+					['id' => 'aa1', 'title' => 'AA1', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'aa3', 'title' => 'AA3', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'zz1', 'title' => 'ZZ1', 'importance' => 0 /*iWelcomePopup::IMPORTANCE_CRITICAL*/],
+					['id' => 'aa2', 'title' => 'AA2', 'importance' => 1 /*iWelcomePopup::IMPORTANCE_HIGH*/],
+					['id' => 'zz2', 'title' => 'ZZ2', 'importance' => 1 /*iWelcomePopup::IMPORTANCE_HIGH*/],
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider isMessageAcknowledgedDataProvider
+	 */
+	public function testIsMessageAcknowledged($sMessageId, $aCache, $bExpected)
+	{
+		$oService = new WelcomePopupService();
+		$this->InvokeNonPublicMethod(WelcomePopupService::class, 'SetAcknowledgedMessagesCache', $oService, [$aCache]);
+		
+		$this->assertEquals($bExpected, $this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, [$sMessageId]));
+	}
+	
+	public function isMessageAcknowledgedDataProvider()
+	{
+		return [
+			'empty-cache' => [
+				'123', [], false,
+			],
+			'acknowledged' => [
+				'123', ['123'], true,
+			],
+			'non-acknowledged' => [
+				'456', ['123'], false,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider isMessageValidDataProvider
+	 */
+	public function testIsMessageValid($aMessage, $bExpected)
+	{
+		$oService = new WelcomePopupService();
+		$aReasons = [];
+		$bResult = $this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageValid', $oService, [$aMessage, &$aReasons]);
+		if ($bResult !== $bExpected) {
+			print_r($aReasons);
+		}
+		$this->assertEquals($bExpected, $bResult);
+		if ($bResult) {
+			$this->assertEquals(0, count($aReasons));
+		} else {
+		   $this->assertNotEquals(0, count($aReasons));
+		}
+	}
+	
+	public function isMessageValidDataProvider()
+	{
+		return [
+			'not an array' => [
+				'123', false,
+			],
+			'empty array' => [
+				[], false,
+			],
+			'missing id' => [
+				['title' => 'foo', 'importance' => 0, 'html' => '<p>Hello</p>'], false,
+			],
+			'message Ok (html)' => [
+				['id' => '123', 'title' => 'foo', 'importance' => 0, 'html' => '<p>Hello</p>'], true,
+			],
+			'message Ok (twig)' => [
+				['id' => '123', 'title' => 'foo', 'importance' => 0, 'twig' => '/some/path'], true,
+			],
+			'missing html and twig' => [
+				['id' => '123', 'title' => 'foo', 'importance' => 0], false,
+			],
+		];
+	}
+	
+	public function testProcessMessages()
+	{
+		// Mock a WelcomePopup message provider, with a fixed class name
+		$oProvider1 = $this->getMockBuilder(iWelcomePopup::class)->setMockClassName('Provider1')->getMock();
+		$oProvider1->expects($this->once())->method('GetMessages')->willReturn([
+			['id' => '123', 'title' => 'foo', 'importance' => 0, 'html' => '<p>Hello Foo</p>'],
+			['id' => '456', 'title' => 'bar', 'importance' => 1, 'html' => '<p>Hello Bar</p>'], // Already acknowledged will be skipped
+		]);
+		
+		// Mock another WelcomePopup message provider, with a different class name
+		$oProvider2 = $this->getMockBuilder(iWelcomePopup::class)->setMockClassName('Provider2')->getMock();
+		$oProvider2->expects($this->once())->method('GetMessages')->willReturn([
+			['id' => '789', 'title' => 'Ga', 'importance' => 1, 'html' => '<p>Hello Ga</p>'],
+			['id' => '012', 'title' => 'Bu', 'importance' => 0, 'twig' => 'ga/bu/zo'],
+			['id' => '000', 'title' => 'Bu', 'importance' => 0], // Invalid, will be ignored
+		]);
+		$oService = new WelcomePopupService();
+		$this->InvokeNonPublicMethod(WelcomePopupService::class, 'SetAcknowledgedMessagesCache', $oService, [[get_class($oProvider1).'::456']]);
+		$this->InvokeNonPublicMethod(WelcomePopupService::class, 'SetMessagesProviders', $oService, [[$oProvider1, $oProvider2]]);
+		
+		$aMessages = $this->InvokeNonPublicMethod(WelcomePopupService::class, 'ProcessMessages', $oService, []);
+		$this->assertEquals(
+			[
+				['id' => '012', 'title' => 'Bu', 'importance' => 0, 'twig' => 'ga/bu/zo', 'uuid' => 'Provider2::012'],
+				['id' => '123', 'title' => 'foo', 'importance' => 0, 'html' => '<p>Hello Foo</p>', 'uuid' => 'Provider1::123'],
+				['id' => '789', 'title' => 'Ga', 'importance' => 1, 'html' => '<p>Hello Ga</p>', 'uuid' => 'Provider2::789'],
+			],
+			$aMessages
+		);
+	}
+
+
+	public function testAcknowledgeMessage()
+	{
+		self::CreateUser('admin-testAcknowledgeMessage', 1, '-Passw0rd!Complex-');
+		UserRights::Login('admin-testAcknowledgeMessage');
+		
+		// Mock a WelcomePopup message provider, with a fixed class name
+		$oProvider1 = $this->getMockBuilder(iWelcomePopup::class)->setMockClassName('Provider1')->getMock();
+		$oProvider1->expects($this->exactly(2))->method('AcknowledgeMessage');
+			
+		// Mock another WelcomePopup message provider, with a different class name
+		$oProvider2 = $this->getMockBuilder(iWelcomePopup::class)->setMockClassName('Provider2')->getMock();
+		$oProvider2->expects($this->exactly(1))->method('AcknowledgeMessage');
+
+		$sMessageUUID1 = get_class($oProvider1).'::0123456';
+		$sMessageUUID2 = get_class($oProvider1).'::456789';
+		$sMessageUUID3 = get_class($oProvider2).'::456789'; // Same message id but different provider / UUID
+		$oService = new WelcomePopupService();
+		
+		$this->InvokeNonPublicMethod(WelcomePopupService::class, 'SetMessagesProviders', $oService, [[$oProvider1, $oProvider2]]);
+		
+		$oService->AcknowledgeMessage($sMessageUUID1);
+		$this->assertTrue($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, [$sMessageUUID1]));
+		$this->assertFalse($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, ['-This-Message-Id-Is-Not-Ack0ledg3dged!']));
+		$this->assertFalse($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, [$sMessageUUID3]));
+		
+		$oService->AcknowledgeMessage($sMessageUUID2);
+		$this->assertTrue($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, [$sMessageUUID1]));
+		$this->assertTrue($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, [$sMessageUUID2]));
+		$this->assertFalse($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, ['-This-Message-Id-Is-Not-Ack0ledg3dged!']));
+		$this->assertFalse($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, [$sMessageUUID3]));
+		
+		$oService->AcknowledgeMessage($sMessageUUID3);
+		$this->assertTrue($this->InvokeNonPublicMethod(WelcomePopupService::class, 'IsMessageAcknowledged', $oService, [$sMessageUUID3]));
+	}
+	
+	/**
+	 * @dataProvider makeStringFitInProvider
+	 */
+	public function testMakeStringFitIn($sInput, $iLimit, $sExpected)
+	{
+		$oService = new WelcomePopupService();
+		$sFitted = $this->InvokeNonPublicMethod(WelcomePopupService::class, 'MakeStringFitIn', $oService, [$sInput, $iLimit]);
+		$this->assertTrue(mb_strlen($sFitted) <= $iLimit);
+		$this->assertEquals($sExpected, $sFitted);
+	}
+	
+	public function makeStringFitInProvider()
+	{
+		return [
+			'Simple (no truncation)' => ['/Some/Short/EnoughName', 50, '/Some/Short/EnoughName'],
+			'Very long (truncated)' => ['/Some/Very/Loooooooooooooooooooooooooooong/Naaaaaaaaaaaaaaaaaaaaaaaaaame', 50, '4769a98d57a0f2e9b99483f780833faf-aaaaaaaaaaaaaaame'],
+			'Long More aggressive truncation' => ['/Some/Very/Loooooooooooooooooooooooooooong/Naaaaaaaaaaaaaaaaaaaaaaaaaame', 45, '4769a98d57a0f2e9b99483f780833faf-aaaaaaaaaame'],
+		];
+	}
+
+}
+

tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-profiles-itil/UserProfilesEventListenerTest.php

@@ -0,0 +1,657 @@
+<?php
+// Copyright (c) 2010-2023 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 25/01/2018
+ * Time: 11:12
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Module\iTopProfilesItil;
+
+use Combodo\iTop\Application\Helper\Session;
+use Combodo\iTop\Application\UI\Base\Layout\NavigationMenu\NavigationMenuFactory;
+use Combodo\iTop\ItilProfiles\UserProfilesEventListener;
+use Combodo\iTop\Service\Events\EventService;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use DBObjectSet;
+use URP_UserProfile;
+use UserRights;
+
+/**
+ * @since 3.1.0 N°5324
+ * @group itopRequestMgmt
+ * @group userRights
+ * @group defaultProfiles
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class UserProfilesEventListenerTest extends ItopDataTestCase
+{
+	public function setUp(): void {
+		parent::setUp();
+
+		//reset conf to have nominal behaviour
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME, null);
+	}
+
+	public function PortaPowerUserProvider(){
+		return [
+			'Portal power user only => user should be repaired by adding User portal profile' => [
+				'aAssociatedProfilesBeforeUserCreation' => [
+					'Portal power user'
+				],
+				'aExpectedAssociatedProfilesAfterUserCreation'=> [
+					'Portal power user',
+					'Portal user',
+				],
+				'bCheckSessionMessage' => true
+			],
+			'Portal power user + Configuration Manager => profiles untouched' => [
+				'aAssociatedProfilesBeforeUserCreation' => [
+					'Portal power user',
+					'Configuration Manager',
+				],
+				'aExpectedAssociatedProfilesAfterUserCreation'=> [
+					'Portal power user',
+					'Configuration Manager',
+				]
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider PortaPowerUserProvider
+	 */
+	public function testUserLocalCreation($aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
+	{
+		/*if ($bCheckSessionMessage){
+			$sLogin = "Admin-" . uniqid();
+			$oConnectedUser = $this->CreateContactlessUser($sLogin, 1,  "Iuytrez9876543ç_è-(");
+			$_SESSION = [];
+			\UserRights::Login($oConnectedUser->Get('login'));
+		}*/
+
+		$oUser = new \UserLocal();
+		$sLogin = 'testUserLocalCreationWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$oUser->Set('password', 'ABCD1234@gabuzomeu');
+		$oUser->Set('language', 'EN US');
+		$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
+
+		/*if ($bCheckSessionMessage){
+			$aObjMessages = Session::Get('obj_messages');
+			$this->assertNotEmpty($aObjMessages);
+			$sKey = sprintf("%s::%s", get_class($oUser), $oUser->GetKey());
+			$this->assertTrue(array_key_exists($sKey, $aObjMessages));
+
+			$sMsg = <<<TXT
+User profile Portal power user cannot be standalone. User has been completed with profile Portal power user.
+TXT;
+			$aExpectedMessages = [
+				[
+					'rank' => 1,
+					'severity' => 'WARNING',
+					'message' => $sMsg
+				]
+			];
+			$this->assertEquals($aExpectedMessages, array_values($aObjMessages[$sKey]), var_export($aObjMessages[$sKey], true));
+		}*/
+	}
+
+	/**
+	 * @dataProvider PortaPowerUserProvider
+	 */
+	public function testUserLocalUpdate($aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
+	{
+		$oUser = new \UserLocal();
+		$sLogin = 'testUserLocalUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$oUser->Set('password', 'ABCD1234@gabuzomeu');
+		$oUser->Set('language', 'EN US');
+		$this->commonUserUpdateTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
+	}
+
+	/**
+	 * @dataProvider PortaPowerUserProvider
+	 */
+	public function testUserLDAPCreation($aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
+	{
+		$oUser = new \UserLDAP();
+		$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
+	}
+
+	/**
+	 * @dataProvider PortaPowerUserProvider
+	 */
+	public function testUserLDAPUpdate($aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation)
+	{
+		$oUser = new \UserLDAP();
+		$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$this->commonUserUpdateTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
+	}
+
+	/**
+	 * @dataProvider PortaPowerUserProvider
+	 */
+	public function testUserExternalCreation($aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
+	{
+		$oUser = new \UserExternal();
+		$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
+	}
+
+	/**
+	 * @dataProvider PortaPowerUserProvider
+	 */
+	public function testUserExternalUpdate($aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
+	{
+		$oUser = new \UserExternal();
+		$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$this->commonUserUpdateTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
+	}
+
+	public function CreateUserForProfileTesting(\User $oUserToCreate, array $aAssociatedProfilesBeforeUserCreation, $bDbInsert=true) : array
+	{
+		$aProfiles = [];
+		$oSearch = \DBSearch::FromOQL("SELECT URP_Profiles");
+		$oProfileSet = new DBObjectSet($oSearch);
+		while (($oProfile = $oProfileSet->Fetch()) != null){
+			$aProfiles[$oProfile->Get('name')] = $oProfile;
+		}
+
+		$this->CreateTestOrganization();
+		$oContact = $this->CreatePerson("1");
+		$iContactid = $oContact->GetKey();
+
+		$oUserToCreate->Set('contactid', $iContactid);
+		$sUserClass = get_class($oUserToCreate);
+
+		$oUserProfileList = $oUserToCreate->Get('profile_list');
+		foreach ($aAssociatedProfilesBeforeUserCreation as $sProfileName){
+			$oUserProfile = new URP_UserProfile();
+			$oProfile = $aProfiles[$sProfileName];
+			$oUserProfile->Set('profileid', $oProfile->GetKey());
+			$oUserProfile->Set('reason', 'UNIT Tests');
+			$oUserProfileList->AddItem($oUserProfile);
+		}
+
+		$oUserToCreate->Set('profile_list', $oUserProfileList);
+		if ($bDbInsert){
+			$sId = $oUserToCreate->DBInsert();
+		} else {
+			$sId = -1;
+		}
+
+		return [ $sId, $aProfiles];
+	}
+
+	public function commonUserCreationTest($oUserToCreate, $aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation, $bTestUserItopAccess=true)
+	{
+		$sUserClass = get_class($oUserToCreate);
+		list ($sId, $aProfiles)  = $this->CreateUserForProfileTesting($oUserToCreate, $aAssociatedProfilesBeforeUserCreation);
+
+		$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation, $bTestUserItopAccess);
+	}
+
+	public function CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation, $bTestItopConnection=true){
+		$oUser = \MetaModel::GetObject($sUserClass, $sId);
+		$oUserProfileList = $oUser->Get('profile_list');
+		$aProfilesAfterCreation=[];
+		while (($oProfile = $oUserProfileList->Fetch()) != null){
+			$aProfilesAfterCreation[] = $oProfile->Get('profile');
+		}
+
+		foreach ($aExpectedAssociatedProfilesAfterUserCreation as $sExpectedProfileName){
+			$this->assertTrue(in_array($sExpectedProfileName, $aProfilesAfterCreation),
+				"profile \'$sExpectedProfileName\' should be asociated to user after creation. " .  var_export($aProfilesAfterCreation, true) );
+		}
+
+		if (! $bTestItopConnection){
+			return;
+		}
+
+		$_SESSION = [];
+
+		UserRights::Login($oUser->Get('login'));
+
+		if (! UserRights::IsPortalUser()) {
+			//calling this API triggers Fatal Error on below OQL used by \User->GetContactObject() for a user with only 'portal power user' profile
+			/**
+			 * Error: No result for the single row query: 'SELECT DISTINCT `Contact`.`id` AS `Contactid`, `Contact`.`name` AS `Contactname`, `Contact`.`status` AS `Contactstatus`, `Contact`.`org_id` AS `Contactorg_id`, `Organization_org_id`.`name` AS `Contactorg_name`, `Contact`.`email` AS `Contactemail`, `Contact`.`phone` AS `Contactphone`, `Contact`.`notify` AS `Contactnotify`, `Contact`.`function` AS `Contactfunction`, `Contact`.`finalclass` AS `Contactfinalclass`, IF((`Contact`.`finalclass` IN ('Team', 'Contact')), CAST(CONCAT(COALESCE(`Contact`.`name`, '')) AS CHAR), CAST(CONCAT(COALESCE(`Contact_poly_Person`.`first_name`, ''), COALESCE(' ', ''), COALESCE(`Contact`.`name`, '')) AS CHAR)) AS `Contactfriendlyname`, COALESCE((`Contact`.`status` = 'inactive'), 0) AS `Contactobsolescence_flag`, `Contact`.`obsolescence_date` AS `Contactobsolescence_date`, CAST(CONCAT(COALESCE(`Organization_org_id`.`name`, '')) AS CHAR) AS `Contactorg_id_friendlyname`, COALESCE((`Organization_org_id`.`status` = 'inactive'), 0) AS `Contactorg_id_obsolescence_flag` FROM `contact` AS `Contact` INNER JOIN `organization` AS `Organization_org_id` ON `Contact`.`org_id` = `Organization_org_id`.`id` LEFT JOIN `person` AS `Contact_poly_Person` ON `Contact`.`id` = `Contact_poly_Person`.`id` WHERE ((`Contact`.`id` = 40) AND 0) '.
+			 */
+			NavigationMenuFactory::MakeStandard();
+		}
+
+		$this->assertTrue(true, 'after fix N°5324 no exception raised');
+		// logout
+		$_SESSION = [];
+	}
+
+	public function commonUserUpdateTest($oUserToCreate, $aAssociatedProfilesBeforeUserCreation,
+		$aExpectedAssociatedProfilesAfterUserCreation)
+	{
+		$sUserClass = get_class($oUserToCreate);
+		list ($sId, $aProfiles)  = $this->CreateUserForProfileTesting($oUserToCreate, ["Administrator"]);
+
+		$oUserToUpdate = \MetaModel::GetObject($sUserClass, $sId);
+		$oProfileList = $oUserToUpdate->Get('profile_list');
+		while($oObj = $oProfileList->Fetch()){
+			$oProfileList->RemoveItem($oObj->GetKey());
+		}
+
+		foreach ($aAssociatedProfilesBeforeUserCreation as $sProfileName){
+			$oAdminUrpProfile = new URP_UserProfile();
+			$oProfile = $aProfiles[$sProfileName];
+			$oAdminUrpProfile->Set('profileid', $oProfile->GetKey());
+			$oAdminUrpProfile->Set('reason', 'UNIT Tests');
+			$oProfileList->AddItem($oAdminUrpProfile);
+		}
+
+		$oUserToUpdate->Set('profile_list', $oProfileList);
+		$oUserToUpdate->DBWrite();
+
+		$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation);
+	}
+
+	/**
+	 * @dataProvider ProfilesLinksProvider
+	 */
+	public function testProfilesLinksDBDelete(string $sProfileNameToRemove, $bRaiseException=false){
+		$aInitialProfiles = [ $sProfileNameToRemove, "Portal power user"];
+
+		$oUser = new \UserExternal();
+		$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+
+		$sUserClass = get_class($oUser);
+		list ($sId, $aProfiles)  = $this->CreateUserForProfileTesting($oUser, $aInitialProfiles);
+
+		if ($bRaiseException){
+			$this->expectException(\DeleteException::class);
+			$sMessage = <<<TXT
+Profile Portal power user cannot be standalone. You should add other profiles to user $sLogin otherwise you may encounter access issue with this user.
+TXT;
+
+			$this->expectExceptionMessage($sMessage);
+		}
+
+		$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
+		if (array_key_exists($sProfileNameToRemove, $aURPUserProfileByUser)){
+			$oURPUserProfile = $aURPUserProfileByUser[$sProfileNameToRemove];
+			$oURPUserProfile->DBDelete();
+		}
+
+		if (! $bRaiseException) {
+			$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
+			$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
+		}
+	}
+
+	/**
+	 * @dataProvider ProfilesLinksProvider
+	 */
+	public function testProfilesLinksEdit_ChangeProfileId(string $sInitialProfile, $bRaiseException=false){
+		$oUser = new \UserExternal();
+		$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+
+		$sUserClass = get_class($oUser);
+		list ($sId, $aProfiles)  = $this->CreateUserForProfileTesting($oUser, [$sInitialProfile]);
+
+		$oURP_Profile = \MetaModel::GetObjectByColumn("URP_Profiles", "name", "Portal power user");
+
+		$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
+
+		if ($bRaiseException){
+			$this->expectException(\CoreCannotSaveObjectException::class);
+		}
+
+		if (array_key_exists($sInitialProfile, $aURPUserProfileByUser)){
+			$oURPUserProfile = $aURPUserProfileByUser[$sInitialProfile];
+			$oURPUserProfile->Set('profileid', $oURP_Profile->GetKey());
+			$oURPUserProfile->DBWrite();
+		}
+
+		if (!$bRaiseException) {
+			$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
+			$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
+
+			//check warning
+			/*$aObjMessages = Session::Get('obj_messages');
+			$this->assertNotEmpty($aObjMessages);
+			$sKey = sprintf("%s::%s", get_class($oURPUserProfile), $oURPUserProfile->GetKey());
+			$this->assertTrue(array_key_exists($sKey, $aObjMessages));
+
+			$sMsg = <<<TXT
+User profile Portal power user cannot be standalone. User has been completed with profile Portal power user.
+TXT;
+			$aExpectedMessages = [
+				[
+					'rank' => 1,
+					'severity' => 'WARNING',
+					'message' => $sMsg
+				]
+			];
+			$this->assertEquals($aExpectedMessages, array_values($aObjMessages[$sKey]), var_export($aObjMessages[$sKey], true));*/
+			}
+	}
+
+	public function ProfilesLinksProvider() {
+		return [
+			"Administrator" => [ "sProfileNameToMove" => "Administrator" ],
+			"Portal user" => [ "sProfileNameToMove" => "Portal user", "bRaiseException" => true ],
+		];
+	}
+
+	/**
+	 * @dataProvider ProfilesLinksProvider
+	 */
+	public function testProfilesLinksEdit_ChangeUserId($sProfileNameToMove, $bRaiseException=false){
+		$aInitialProfiles = [ $sProfileNameToMove, "Portal power user"];
+
+		$oUser = new \UserExternal();
+		$sLogin1 = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin1);
+
+		$sUserClass = get_class($oUser);
+		list ($sId, $aProfiles)  = $this->CreateUserForProfileTesting($oUser, $aInitialProfiles);
+
+		$oUser = new \UserExternal();
+		$sLogin2 = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin2);
+		list ($sAnotherUserId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, ["Configuration Manager"]);
+
+		if ($bRaiseException){
+			$this->expectException(\CoreCannotSaveObjectException::class);
+			$sMessage = <<<TXT
+Profile Portal power user cannot be standalone. You should add other profiles to user $sLogin1 otherwise you may encounter access issue with this user.
+TXT;
+
+			$this->expectExceptionMessage($sMessage);
+		}
+
+		$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
+		if (array_key_exists($sProfileNameToMove, $aURPUserProfileByUser)){
+			$oURPUserProfile = $aURPUserProfileByUser[$sProfileNameToMove];
+			$oURPUserProfile->Set('userid', $sAnotherUserId);
+			$oURPUserProfile->DBWrite();
+		}
+
+		if (! $bRaiseException) {
+			$aExpectedProfilesAfterUpdate = [$sProfileNameToMove, "Configuration Manager"];
+			$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sAnotherUserId, $aExpectedProfilesAfterUpdate);
+
+			$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
+			$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
+		}
+	}
+
+	private function GetURPUserProfileByUser($iUserId) : array {
+		$aRes = [];
+		$oSearch = \DBSearch::FromOQL("SELECT URP_UserProfile WHERE userid=$iUserId");
+		$oSet = new DBObjectSet($oSearch);
+		while (($oURPUserProfile = $oSet->Fetch()) != null){
+			$aRes[$oURPUserProfile->Get('profile')] = $oURPUserProfile;
+		}
+
+		return $aRes;
+	}
+
+	public function testUserProfilesEventListenerInit_nominal(){
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+
+		$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testUserProfilesEventListenerInit_badlyconfigured(){
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME, "a string instead of an array");
+
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+
+		$this->assertFalse($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testUserProfilesEventListenerInit_specifically_disabled(){
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME, []);
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+
+		$this->assertFalse($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function CustomizedPortalsProvider(){
+		return [
+			'console + customized portal' => [
+				'aPortalDispatcherData' => [
+					'customer-portal',
+					'backoffice'
+				]],
+			'console + itop portal + customized portal' => [
+				'aPortalDispatcherData' => [
+					'itop-portal',
+					'customer-portal',
+					'backoffice'
+				]
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider CustomizedPortalsProvider
+	 */
+	public function testUserProfilesEventListenerInit_furtherportals_norepairmentconfigured($aPortalDispatcherData){
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init($aPortalDispatcherData);
+
+		$this->assertFalse($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testUserProfilesEventListenerInit_furtherportals_repairmentconfigured(){
+		$aPortalDispatcherData = [
+			'itop-portal',
+			'customer-portal',
+			'backoffice'
+		];
+
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME, ['Portal power user' => 'Portal user']);
+
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init($aPortalDispatcherData);
+
+		$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testUserProfilesEventListenerInit_with_unknownprofile(){
+		$aPortalDispatcherData = [
+			'itop-portal',
+			'customer-portal',
+			'backoffice'
+		];
+
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME, ['Portal power user' => 'Dummy Profile']);
+
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init($aPortalDispatcherData);
+
+		$this->assertFalse($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testInit_ConfWithOneWarningProfile() {
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
+			['Configuration Manager' => 'Administrator', 'Portal power user' => null]
+		);
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+		$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testInit_ConfWithFurtherWarningProfiles() {
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
+			['Configuration Manager' => null, 'Portal power user' => null]
+		);
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+		$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testInit_ConfWithFurtherWarningProfilesAndOneRepairment() {
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
+			['Portal power user' => null, 'Configuration Manager' => null, 'Administrator' => "Configuration Manager"]
+		);
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+		$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
+	}
+
+	public function testRepairProfiles_WithAnotherFallbackProfile()
+	{
+		$oUser = new \UserLocal();
+		$sLogin = 'testUserLocalCreationWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$oUser->Set('password', 'ABCD1234@gabuzomeu');
+		$oUser->Set('language', 'EN US');
+
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
+			['Portal power user' => 'Configuration Manager']
+		);
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+		$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
+
+		$this->CreateUserForProfileTesting($oUser, ['Portal power user'], false);
+		$oUserProfilesEventListener->ValidateThenRepairOrWarn($oUser);
+
+		$oUserProfileList = $oUser->Get('profile_list');
+		$aProfilesAfterCreation=[];
+		while (($oProfile = $oUserProfileList->Fetch()) != null){
+			$aProfilesAfterCreation[] = $oProfile->Get('profile');
+		}
+
+		$this->assertContains('Configuration Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+		$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+	}
+
+	public function testRepairProfiles_MultiRepairmentConf()
+	{
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
+			[
+				'Administrator' => 'Portal user',
+				'Portal power user' => 'Configuration Manager'
+			]
+		);
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->Init();
+		$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
+
+		$oUser = new \UserLocal();
+		$sLogin = 'testUserLocalCreationWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$oUser->Set('password', 'ABCD1234@gabuzomeu');
+		$oUser->Set('language', 'EN US');
+		$this->CreateUserForProfileTesting($oUser, ['Portal power user'], false);
+		$oUserProfilesEventListener->ValidateThenRepairOrWarn($oUser);
+
+		$oUserProfileList = $oUser->Get('profile_list');
+		$aProfilesAfterCreation=[];
+		while (($oProfile = $oUserProfileList->Fetch()) != null){
+			$aProfilesAfterCreation[] = $oProfile->Get('profile');
+		}
+
+		$this->assertContains('Configuration Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+		$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+
+		$oUser2 = new \UserLocal();
+		$sLogin = 'testUserLocalCreationWithPortalPowerUserProfile-'.uniqid();
+		$oUser2->Set('login', $sLogin);
+		$oUser2->Set('password', 'ABCD1234@gabuzomeu');
+		$oUser2->Set('language', 'EN US');
+
+		$this->CreateUserForProfileTesting($oUser2, ['Administrator'], false);
+		$oUserProfilesEventListener->ValidateThenRepairOrWarn($oUser2);
+
+		$oUserProfileList = $oUser2->Get('profile_list');
+		$aProfilesAfterCreation=[];
+		while (($oProfile = $oUserProfileList->Fetch()) != null){
+			$aProfilesAfterCreation[] = $oProfile->Get('profile');
+		}
+
+		$this->assertContains('Administrator', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+		$this->assertContains('Portal user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+	}
+
+	public function testUserCreationWithWarningMessageConf()
+	{
+		$_SESSION = [];
+		$oAdminUser = new \UserLocal();
+		$sLogin = 'testUserCreationWithWarningMessageConf-Admin'.uniqid();
+		$oAdminUser->Set('login', $sLogin);
+		$oAdminUser->Set('password', 'ABCD1234@gabuzomeu');
+		$oAdminUser->Set('language', 'EN US');
+		$aAssociatedProfilesBeforeUserCreation = ['Administrator'];
+		$this->commonUserCreationTest($oAdminUser, $aAssociatedProfilesBeforeUserCreation, $aAssociatedProfilesBeforeUserCreation, false);
+		UserRights::Login($oAdminUser->Get('login'));
+
+		$aAssociatedProfilesBeforeUserCreation = [
+			'Portal power user'
+		];
+
+		$oUser = new \UserLocal();
+		$sLogin = 'testUserCreationWithWarningMessageConf-'.uniqid();
+		$oUser->Set('login', $sLogin);
+		$oUser->Set('password', 'ABCD1234@gabuzomeu');
+		$oUser->Set('language', 'EN US');
+
+		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
+			['Portal power user' => null ]
+		);
+
+		$this->SetNonPublicStaticProperty(EventService::class, "aEventListeners", []);
+		$oUserProfilesEventListener = new UserProfilesEventListener();
+		$oUserProfilesEventListener->RegisterEventsAndListeners();
+
+		$this->expectException(\CoreCannotSaveObjectException::class);
+		$sMessage = <<<TXT
+Profile Portal power user cannot be standalone. You should add other profiles to user $sLogin otherwise you may encounter access issue with this user.
+TXT;
+
+		$this->expectExceptionMessage($sMessage);
+
+		$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aAssociatedProfilesBeforeUserCreation, false);
+
+		$_SESSION = [];
+	}
+}

tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php

@@ -118,7 +118,7 @@ class DBBackupTest extends ItopTestCase
 	 *
 	 * @return void
 	 */
-	public function testMakeName(string $sInputFormat, DateTime $oBackupDateTime, string $sExpectedFilename): void
+	public function testMakeName(?string $sInputFormat, ?DateTime $oBackupDateTime, string $sExpectedFilename): void
 	{
 		$oConfig = utils::GetConfig();
 
@@ -138,6 +138,11 @@ class DBBackupTest extends ItopTestCase
 		$oBackupDateTime = DateTime::createFromFormat('Y-m-d H:i:s', '1985-07-30 15:30:59');
 
 		return [
+			'Default format - no params' => [
+				'__DB__-%Y-%m-%d',
+				$oBackupDateTime,
+				static::DUMMY_DB_NAME.'-1985-07-30',
+			],
 			'Default format' => [
 				'__DB__-%Y-%m-%d',
 				$oBackupDateTime,
@@ -160,4 +165,28 @@ class DBBackupTest extends ItopTestCase
 			],
 		];
 	}
+
+	/**
+	 * N°6640 - Broken unattended setup with XML backup configuration
+	 */
+	public function testMakeNameWithoutParams(): void
+	{
+		$oConfig = utils::GetConfig();
+
+		// See https://github.com/Combodo/iTop/commit/f7ee21f1d7d1c23910506e9e31b57f33311bd5e0#diff-d693fb790e3463d1aa960c2b8b293532b1bbd12c3b8f885d568d315c404f926aR131
+		$oConfig->Set('db_host', static::DUMMY_DB_HOST);
+		$oConfig->Set('db_name', static::DUMMY_DB_NAME);
+		$oConfig->Set('db_subname', static::DUMMY_DB_SUBNAME);
+
+		$oDateTime = new DateTime();
+		$sExpectedFilename = static::DUMMY_DB_NAME . '-' . $oDateTime->format("Y-m-d");
+
+		$oBackup = new DBBackup($oConfig);
+
+		$sTestedFilename = $oBackup->MakeName(null);
+		$this->assertEquals($sExpectedFilename, $sTestedFilename, "Backup filename format doesn't match. Got '$sTestedFilename', expected '$sExpectedFilename'.");
+
+		$sTestedFilename = $oBackup->MakeName();
+		$this->assertEquals($sExpectedFilename, $sTestedFilename, "Backup filename format doesn't match. Got '$sTestedFilename', expected '$sExpectedFilename'.");
+	}
 }

tests/php-unit-tests/unitary-tests/setup/MFCompilerMenuTest.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace Combodo\iTop\Test\UnitTest\Setup;
+
+use ApplicationMenu;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use Config;
+use MetaModel;
+use MFCompiler;
+use ParentMenuNodeCompiler;
+use RunTimeEnvironment;
+
+/**
+ * @group menu_compilation
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ * @since 3.1 N°4762
+ * @covers \MFCompiler::DoCompile
+ */
+class MFCompilerMenuTest extends ItopTestCase {
+	private static $aPreviousEnvMenus;
+	private static $aPreviousEnvMenuCount;
+
+	public function setUp(): void {
+		parent::setUp();
+		require_once APPROOT.'setup/compiler.class.inc.php';
+		require_once APPROOT.'setup/modelfactory.class.inc.php';
+		require_once APPROOT.'application/utils.inc.php';
+	}
+
+	public function tearDown(): void {
+		parent::tearDown();
+	}
+
+	private function GetCurrentEnvDeltaXmlPath(string $sEnv) : string {
+		return APPROOT."data/$sEnv.delta.xml";
+	}
+
+	public function CompileMenusProvider(){
+		return [
+			'legacy_algo' => [ 'sEnv' => 'legacy_algo', 'bLegacyMenuCompilation' => true ],
+			'menu_compilation_fix' => [ 'sEnv' => 'menu_compilation_fix', 'bLegacyMenuCompilation' => false ],
+		];
+	}
+
+	/**
+	 * @dataProvider CompileMenusProvider
+	 */
+	public function testCompileMenus($sEnv, $bLegacyMenuCompilation){
+		$sConfigFilePath = \utils::GetConfigFilePath($sEnv);
+
+		//copy conf from production to phpunit context
+		$sDirPath = dirname($sConfigFilePath);
+		if (! is_dir($sDirPath)){
+			mkdir($sDirPath);
+		}
+		$oConfig = new Config(\utils::GetConfigFilePath());
+		$oConfig->WriteToFile($sConfigFilePath);
+
+		$oConfig = new Config($sConfigFilePath);
+		if ($bLegacyMenuCompilation){
+			ParentMenuNodeCompiler::UseLegacyMenuCompilation();
+		}
+		$oConfig->WriteToFile();
+		$oRunTimeEnvironment = new RunTimeEnvironment($sEnv);
+		$oRunTimeEnvironment->CompileFrom(\utils::GetCurrentEnvironment());
+		$oConfig->WriteToFile();
+
+		$sConfigFile = APPCONF.\utils::GetCurrentEnvironment().'/'.ITOP_CONFIG_FILE;
+		MetaModel::Startup($sConfigFile, false /* $bModelOnly */, true /* $bAllowCache */, false /* $bTraceSourceFiles */, $sEnv);
+
+		$aMenuGroups = ApplicationMenu::GetMenuGroups();
+		if (! is_null(static::$aPreviousEnvMenus)){
+			$this->assertEquals(static::$aPreviousEnvMenus, $aMenuGroups);
+		} else {
+			$this->assertNotEquals([], $aMenuGroups);
+		}
+		static::$aPreviousEnvMenus = $aMenuGroups;
+
+		$aMenuCount = ApplicationMenu::GetMenusCount();
+
+		if (! is_null(static::$aPreviousEnvMenuCount)){
+			$this->assertEquals(static::$aPreviousEnvMenuCount, $aMenuCount);
+		} else {
+			$this->assertNotEquals([], $aMenuCount);
+		}
+		static::$aPreviousEnvMenuCount = $aMenuCount;
+	}
+
+	public function CompileMenusWithDeltaProvider(){
+		return [
+			'Menus are broken with specific delta XML using LEGACY algo' => [ 'sDeltaFile' => 'delta_broken_menus.xml', 'sEnv' => 'broken_menus', 'bLegacyMenuCompilation' => true ],
+			'Menus repaired using same delta XML with NEW algo' => [ 'sDeltaFile' => 'delta_broken_menus.xml', 'sEnv' => 'fixed_menus', 'bLegacyMenuCompilation' => false ],
+		];
+	}
+
+	/**
+	 * @dataProvider CompileMenusWithDeltaProvider
+	 */
+	public function testCompileMenusWithDelta($sDeltaFile, $sEnv, $bLegacyMenuCompilation){
+		$sProvidedDeltaPath = __DIR__.'/ressources/datamodels/'.$sDeltaFile;
+		if (is_file($sProvidedDeltaPath)){
+			$sDeltaXmlPath = $this->GetCurrentEnvDeltaXmlPath($sEnv);
+			copy($sProvidedDeltaPath, $sDeltaXmlPath);
+		}
+		$sConfigFilePath = \utils::GetConfigFilePath($sEnv);
+
+		//copy conf from production to phpunit context
+		$sDirPath = dirname($sConfigFilePath);
+		if (! is_dir($sDirPath)){
+			mkdir($sDirPath);
+		}
+		$oConfig = new Config(\utils::GetConfigFilePath());
+		$oConfig->WriteToFile($sConfigFilePath);
+
+		$oConfig = new Config($sConfigFilePath);
+		if ($bLegacyMenuCompilation){
+			ParentMenuNodeCompiler::UseLegacyMenuCompilation();
+		}
+		$oConfig->WriteToFile();
+		$oRunTimeEnvironment = new RunTimeEnvironment($sEnv);
+		$oRunTimeEnvironment->CompileFrom(\utils::GetCurrentEnvironment());
+		$oConfig->WriteToFile();
+
+		if ($bLegacyMenuCompilation){
+			/**
+			 * PHP Notice:  Undefined index: ConfigManagement in /var/www/html/iTop/env-broken_menus/itop-structure/model.itop-structure.php on line 925
+			 */
+			error_reporting(E_ALL & ~E_NOTICE);
+			$this->expectErrorMessage("Call to a member function GetIndex() on null");
+		}
+		$sConfigFile = APPCONF.\utils::GetCurrentEnvironment().'/'.ITOP_CONFIG_FILE;
+		MetaModel::Startup($sConfigFile, false /* $bModelOnly */, true /* $bAllowCache */, false /* $bTraceSourceFiles */, $sEnv);
+
+		$this->assertNotEquals([], ApplicationMenu::GetMenuGroups());
+		$this->assertNotEquals([], ApplicationMenu::GetMenusCount());
+	}
+}

tests/php-unit-tests/unitary-tests/setup/ressources/datamodels/delta_broken_menus.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
+  <menus>
+    <menu id="Contact" xsi:type="DashboardMenuNode" _created_in="itop-config-mgmt" _delta="must_exist">
+      <parent _delta="redefine">ConfigManagementOverview</parent>
+    </menu>
+    <menu id="Location" xsi:type="OQLMenuNode" _created_in="itop-config-mgmt" _delta="delete">
+      <parent _delta="redefine">ConfigManagementOverview</parent>
+    </menu>
+    <menu id="Document" xsi:type="OQLMenuNode" _created_in="itop-config-mgmt" _delta="must_exist">
+      <parent _delta="redefine">ConfigManagementOverview</parent>
+    </menu>
+  </menus>
+</itop_design>