Fix rebase

# Conflicts:
#	sources/Core/Kpi/KpiLogData.php

.github/pull_request_template.md

@@ -9,7 +9,7 @@ Any PRs not following the guidelines or with missing information will not be con
 ## Base information
 | Question                                                      | Answer 
 |---------------------------------------------------------------|--------
-| Related to a SourceForge thead / Another PR / Combodo ticket? | <!-- Put the URL -->
+| Related to a SourceForge thread / Another PR / Combodo ticket? | <!-- Put the URL -->
 | Type of change?                                               | Bug fix / Enhancement / Translations
 
 

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

@@ -199,7 +199,7 @@ class DatamodelsXmlFiles extends AbstractGlobFileVersionUpdater
 		libxml_clear_errors();
 		$oFileXml->formatOutput = true;
 		$oFileXml->preserveWhiteSpace = false;
-		$oFileXml->loadXML($sFileContent);
+		$oFileXml->loadXML($sFileContent, LIBXML_BIGLINES);
 
 		$oFileItopFormat = new iTopDesignFormat($oFileXml);
 

.phpstorm.meta.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * @copyright   Copyright (C) 2010-2025 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace PHPSTORM_META
+{
+	override(\MetaModel::NewObject(0), map([
+		'' => '@',
+	]));
+	override(\MetaModel::GetObject(0), map([
+		'' => '@',
+	]));
+}

CONTRIBUTING.md

@@ -5,17 +5,6 @@ You want to contribute to iTop? Many thanks to you! 🎉 👍
 Here are some guidelines that will help us integrate your work!
 
 
-## Contributions
-
-
-```
-  _   _            _    _        _                __           _   
- | | | | __ _  ___| | _| |_ ___ | |__   ___ _ __ / _| ___  ___| |_ 
- | |_| |/ _` |/ __| |/ / __/ _ \| '_ \ / _ \ '__| |_ / _ \/ __| __|
- |  _  | (_| | (__|   <| || (_) | |_) |  __/ |  |  _|  __/\__ \ |_ 
- |_| |_|\__,_|\___|_|\_\\__\___/|_.__/ \___|_|  |_|  \___||___/\__|                                              
-```                                                                     
-This repository is part of Hacktoberfest. Contributions are welcome! Feel free to suggest improvements, add translation, fix bugs, or propose new features. Thank you for contributing !
 
 
 ### Subjects

addons/userrights/userrightsprofile.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -29,56 +30,52 @@ class UserRightsBaseClassGUI extends cmdbAbstractObject
 	}
 }
 
-
 class URP_Profiles extends UserRightsBaseClassGUI
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category"                   => "addon/userrights,grant_by_profile,filter",
 			"key_type"                   => "autoincrement",
 			"name_attcode"               => "name",
-			"complementary_name_attcode" => array('description'),
+			"complementary_name_attcode" => ['description'],
 			"state_attcode"              => "",
-			"reconc_keys"                => array(),
+			"reconc_keys"                => [],
 			"db_table"                   => "priv_urp_profiles",
 			"db_key_field"               => "id",
 			"db_finalclass_field"        => "",
-		);
+		];
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", ["allowed_values" => null, "sql" => "name", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", ["allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
 
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", ["linked_class" => "URP_UserProfile", "ext_key_to_me" => "profileid", "ext_key_to_remote" => "userid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => []]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['name', 'description', 'user_list']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name','description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['name','description']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array ('name','description'));
+		MetaModel::Init_SetZListItems('default_search', ['name','description']);
 	}
 
 	protected static $m_aCacheProfiles = null;
 
 	public static function DoCreateProfile($sName, $sDescription)
 	{
-		if (is_null(self::$m_aCacheProfiles))
+		if (is_null(self::$m_aCacheProfiles)) {
-		{
+			self::$m_aCacheProfiles = [];
-			self::$m_aCacheProfiles = array();
 			$oFilterAll = new DBObjectSearch('URP_Profiles');
 			$oSet = new DBObjectSet($oFilterAll);
-			while ($oProfile = $oSet->Fetch())
+			while ($oProfile = $oSet->Fetch()) {
-			{
 				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
 			}
 		}
 
 		$sCacheKey = $sName;
-		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
+		if (isset(self::$m_aCacheProfiles[$sCacheKey])) {
-		{
 			return self::$m_aCacheProfiles[$sCacheKey];
 		}
 		$oNewObj = MetaModel::NewObject("URP_Profiles");
@@ -89,27 +86,21 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		return $iId;
 	}
 
-	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
+	public function GetGrantAsHtml($oUserRights, $sClass, $sAction)
 	{
 		$bGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
-		if (is_null($bGrant))
+		if (is_null($bGrant)) {
-		{
+			return '<span class="ibo-user-rights ibo-is-failure">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
-			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+		} elseif ($bGrant) {
-		}
+			return '<span class="ibo-user-rights ibo-is-success">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
-		elseif ($bGrant)
+		} else {
-		{
+			return '<span class="ibo-user-rights ibo-is-failure">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
-			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
-		}
-		else
-		{
-			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 	}
 
-	function DoShowGrantSumary($oPage)
+	public function DoShowGrantSumary($oPage)
-	{
-		if ($this->GetRawName() == "Administrator")
 	{
+		if ($this->GetRawName() == "Administrator") {
 			// Looks dirty, but ok that's THE ONE
 			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
 			return;
@@ -118,21 +109,18 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		// Note: for sure, we assume that the instance is derived from UserRightsProfile
 		$oUserRights = UserRights::GetModuleInstance();
 
-		$aDisplayData = array();
+		$aDisplayData = [];
-		foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass)
+		foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass) {
-		{
+			$aStimuli = [];
-			$aStimuli = array();
+			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus) {
-			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
-			{
 				$bGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
-				if ($bGrant === true)
+				if ($bGrant === true) {
-				{
 					$aStimuli[] = '<span title="'.$sStimulusCode.': '.utils::EscapeHtml($oStimulus->GetDescription()).'">'.utils::EscapeHtml($oStimulus->GetLabel()).'</span>';
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
 
-			$aDisplayData[] = array(
+			$aDisplayData[] = [
 				'class' => MetaModel::GetName($sClass),
 				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'r'),
 				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'br'),
@@ -141,22 +129,22 @@ class URP_Profiles extends UserRightsBaseClassGUI
 				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'd'),
 				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'bd'),
 				'stimuli' => $sStimuli,
-			);
+			];
 		}
 
-		$aDisplayConfig = array();
+		$aDisplayConfig = [];
-		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
+		$aDisplayConfig['class'] = ['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+'));
+		$aDisplayConfig['read'] = ['label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+')];
-		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
+		$aDisplayConfig['bulkread'] = ['label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+')];
-		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
+		$aDisplayConfig['write'] = ['label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+')];
-		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
+		$aDisplayConfig['bulkwrite'] = ['label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+')];
-		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
+		$aDisplayConfig['delete'] = ['label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+')];
-		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
+		$aDisplayConfig['bulkdelete'] = ['label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+')];
-		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
+		$aDisplayConfig['stimuli'] = ['label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+')];
 		$oPage->table($aDisplayConfig, $aDisplayData);
 	}
 
-	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
 
@@ -166,10 +154,9 @@ class URP_Profiles extends UserRightsBaseClassGUI
 
 	public static function GetReadOnlyAttributes()
 	{
-		return array('name', 'description');
+		return ['name', 'description'];
 	}
 
-
 	// returns an array of id => array of column => php value(so-called "real value")
 	public static function GetPredefinedObjects()
 	{
@@ -181,15 +168,13 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	protected function OnDelete()
 	{
 		// Don't remove admin profile
-		if ($this->Get('name') === ADMIN_PROFILE_NAME)
+		if ($this->Get('name') === ADMIN_PROFILE_NAME) {
-		{
 			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
 		}
 
 		// Note: this may break the rule that says: "a user must have at least ONE profile" !
 		$oLnkSet = $this->Get('user_list');
-		while($oLnk = $oLnkSet->Fetch())
+		while ($oLnk = $oLnkSet->Fetch()) {
-		{
 			$oLnk->DBDelete();
 		}
 	}
@@ -202,11 +187,10 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
 	 * @return integer Flags: the binary combination of the flags applicable to this attribute
 	 */
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	public function GetAttributeFlags($sAttCode, &$aReasons = [], $sTargetState = '')
 	{
 		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-		if (MetaModel::GetConfig()->Get('demo_mode'))
+		if (MetaModel::GetConfig()->Get('demo_mode')) {
-		{
 			$aReasons[] = 'Sorry, profiles are read-only in the demonstration mode!';
 			$iFlags |= OPT_ATT_READONLY;
 		}
@@ -214,52 +198,52 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	}
 }
 
-
-
 class URP_UserProfile extends UserRightsBaseClassGUI
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category"            => "addon/userrights,grant_by_profile,filter",
 			"key_type"            => "autoincrement",
-			"name_attcode"        => array("userlogin", "profile"),
+			"name_attcode"        => ["userlogin", "profile"],
 			"state_attcode"       => "",
-			"reconc_keys"         => array(),
+			"reconc_keys"         => [],
 			"db_table"            => "priv_urp_userprofile",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
 			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
-			'uniqueness_rules'    => array(
+			'uniqueness_rules'    => [
-				'no_duplicate' => array(
+				'no_duplicate' => [
-					'attributes'  => array(
+					'attributes'  => [
 						0 => 'userid',
 						1 => 'profileid',
-					),
+					],
 					'filter'      => '',
 					'disabled'    => false,
 					'is_blocking' => true,
-				),
+				],
-			),
+			],
-		);
+		];
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", ["targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid",
+		MetaModel::Init_AddAttribute(new AttributeExternalKey(
-			array("targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array(), "allow_target_creation" => false)));
+			"profileid",
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name")));
+			["targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => [], "allow_target_creation" => false]
+		));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", ["allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name"]));
 
-		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("reason", ["allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => []]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['userid', 'profileid', 'reason']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('userid', 'profileid', 'reason')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['userid', 'profileid', 'reason']); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['userid', 'profileid']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('advanced_search', ['userid', 'profileid']); // Criteria of the advanced search form
 	}
 
 	public function CheckToDelete(&$oDeletionPlan)
@@ -267,15 +251,14 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 		if (MetaModel::GetConfig()->Get('demo_mode')) {
 			// Users deletion is NOT allowed in demo mode
 			$oDeletionPlan->AddToDelete($this, null);
-			$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
+			$oDeletionPlan->SetDeletionIssues($this, ['deletion not allowed in demo mode.'], true);
 			$oDeletionPlan->ComputeResults();
 
 			return false;
 		}
 		try {
 			$this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
-		}
+		} catch (SecurityException $e) {
-		catch (SecurityException $e) {
 			// Users deletion is NOT allowed
 			$oDeletionPlan->AddToDelete($this, null);
 			$oDeletionPlan->SetDeletionIssues($this, [$e->getMessage()], true);
@@ -292,15 +275,14 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 		if (MetaModel::GetConfig()->Get('demo_mode')) {
 			// Users deletion is NOT allowed in demo mode
 			$oDeletionPlan->AddToDelete($this, null);
-			$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
+			$oDeletionPlan->SetDeletionIssues($this, ['deletion not allowed in demo mode.'], true);
 			$oDeletionPlan->ComputeResults();
 
 			return false;
 		}
 		try {
 			$this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
-		}
+		} catch (SecurityException $e) {
-		catch (SecurityException $e) {
 			// Users deletion is NOT allowed
 			$oDeletionPlan->AddToDelete($this, null);
 			$oDeletionPlan->SetDeletionIssues($this, [$e->getMessage()], true);
@@ -336,29 +318,30 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 	protected function CheckIfProfileIsAllowed($iActionCode)
 	{
 		// When initializing or admin, we need to let everything pass trough
-		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
+		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) {
+			return;
+		}
 
 		// Only administrators can manage administrators
 		$iOrigUserId = $this->GetOriginal('userid');
-		if (!empty($iOrigUserId))
+		if (!empty($iOrigUserId)) {
-		{
 			$oUser = MetaModel::GetObject('User', $iOrigUserId, true, true);
-			if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
+			if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator()) {
-			{
 				throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
 			}
 		}
 		$oUser = MetaModel::GetObject('User', $this->Get('userid'), true, true);
-		if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
+		if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator()) {
-		{
 			throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
 		}
-		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, DBObjectSet::FromObject($this)))
+
-		{
+		$oSet = new \ormLinkSet(get_class($oUser), 'profile_list', \DBObjectSet::FromScratch(\URP_UserProfile::class));
+		$oSet->AddItem(MetaModel::NewObject('URP_UserProfile', ['profileid' => $this->GetKey(), 'reason' => 'CheckIfProfileIsAllowed']));
+
+		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, $oSet)) {
 			throw new SecurityException(Dict::Format('UI:Error:ObjectCannotBeUpdated'));
 		}
-		if (!UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME))
+		if (!UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME)) {
-		{
 			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
 		}
 	}
@@ -369,33 +352,33 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category" => "addon/userrights,grant_by_profile",
 			"key_type" => "autoincrement",
-			"name_attcode" => array("userlogin", "allowed_org_name"),
+			"name_attcode" => ["userlogin", "allowed_org_name"],
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => [],
 			"db_table" => "priv_urp_userorg",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-		);
+		];
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", ["targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("allowed_org_id", array("targetclass"=>"Organization", "jointype"=> "", "allowed_values"=>null, "sql"=>"allowed_org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("allowed_org_id", ["targetclass" => "Organization", "jointype" => "", "allowed_values" => null, "sql" => "allowed_org_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("allowed_org_name", array("allowed_values"=>null, "extkey_attcode"=> 'allowed_org_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("allowed_org_name", ["allowed_values" => null, "extkey_attcode" => 'allowed_org_id', "target_attcode" => "name"]));
 
-		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"reason", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("reason", ["allowed_values" => null, "sql" => "reason", "default_value" => null, "is_null_allowed" => true, "depends_on" => []]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'allowed_org_id', 'reason')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['userid', 'allowed_org_id', 'reason']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('allowed_org_id', 'reason')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['allowed_org_id', 'reason']); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('userid', 'allowed_org_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['userid', 'allowed_org_id']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('advanced_search', ['userid', 'allowed_org_id']); // Criteria of the advanced search form
 	}
 
 	protected function OnInsert()
@@ -418,35 +401,32 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 	 */
 	protected function CheckIfOrgIsAllowed()
 	{
-		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
+		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) {
+			return;
+		}
 
 		$oUser = UserRights::GetUserObject();
 		$oAddon = UserRights::GetModuleInstance();
 		$aOrgs = $oAddon->GetUserOrgs($oUser, '');
-		if (count($aOrgs) > 0)
+		if (count($aOrgs) > 0) {
-		{
 			$iOrigOrgId = $this->GetOriginal('allowed_org_id');
-			if ((!empty($iOrigOrgId) && !in_array($iOrigOrgId, $aOrgs)) || !in_array($this->Get('allowed_org_id'), $aOrgs))
+			if ((!empty($iOrigOrgId) && !in_array($iOrigOrgId, $aOrgs)) || !in_array($this->Get('allowed_org_id'), $aOrgs)) {
-			{
 				throw new SecurityException(Dict::Format('Class:User/Error:OrganizationNotAllowed'));
 			}
 		}
 	}
 }
 
-
-
-
 class UserRightsProfile extends UserRightsAddOnAPI
 {
-	static public $m_aActionCodes = array(
+	public static $m_aActionCodes = [
 		UR_ACTION_READ => 'r',
 		UR_ACTION_MODIFY => 'w',
 		UR_ACTION_DELETE => 'd',
 		UR_ACTION_BULK_READ => 'br',
 		UR_ACTION_BULK_MODIFY => 'bw',
 		UR_ACTION_BULK_DELETE => 'bd',
-	);
+	];
 
 	/**
 	 * @var array $aUsersProfilesList Cache of users' profiles. Hash array of user ID => [profile ID => profile friendlyname, profile ID => profile friendlyname, ...]
@@ -472,8 +452,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 				$oContact = MetaModel::NewObject('Person');
 				$oContact->Set('name', 'My last name');
 				$oContact->Set('first_name', 'My first name');
-				if (MetaModel::IsValidAttCode('Person', 'org_id'))
+				if (MetaModel::IsValidAttCode('Person', 'org_id')) {
-				{
 					$oContact->Set('org_id', $iOrgId);
 				}
 				$oContact->Set('email', 'my.email@foo.org');
@@ -481,24 +460,19 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			}
 		}
 
-
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
-		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0))
+		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0)) {
-		{
 			$oUser->Set('contactid', $iContactId);
 		}
 		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
 
 		// Add this user to the very specific 'admin' profile
-		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => ADMIN_PROFILE_NAME), true /*all data*/);
+		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", ['name' => ADMIN_PROFILE_NAME], true /*all data*/);
-		if (is_object($oAdminProfile))
+		if (is_object($oAdminProfile)) {
-		{
+			$oSet = new \ormLinkSet(UserLocal::class, 'profile_list', \DBObjectSet::FromScratch(\URP_UserProfile::class));
-			$oUserProfile = new URP_UserProfile();
+			$oSet->AddItem(MetaModel::NewObject('URP_UserProfile', ['profileid' => $oAdminProfile->GetKey(), 'reason' => 'CreateAdministrator']));
-			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
-			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-			$oSet = DBObjectSet::FromObject($oUserProfile);
 			$oUser->Set('profile_list', $oSet);
 		}
 		$iUserId = $oUser->DBInsertNoReload();
@@ -509,11 +483,11 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	{
 	}
 
-	protected $m_aUserOrgs = array(); // userid -> array of orgid
+	protected $m_aUserOrgs = []; // userid -> array of orgid
 	protected $m_aAdministrators = null; // [user id]
 
 	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
-	protected $m_aObjectActionGrants = array();
+	protected $m_aObjectActionGrants = [];
 
 	/**
 	 * Read and cache organizations allowed to the given user
@@ -528,31 +502,25 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	public function GetUserOrgs($oUser, $sClass)
 	{
 		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aUserOrgs))
+		if (!array_key_exists($iUser, $this->m_aUserOrgs)) {
-		{
+			$this->m_aUserOrgs[$iUser] = [];
-			$this->m_aUserOrgs[$iUser] = array();
 
 			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
-			if ($sHierarchicalKeyCode !== false)
+			if ($sHierarchicalKeyCode !== false) {
-			{
 				$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id WHERE UserOrg.userid = :userid';
-				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), array(), array('userid' => $iUser));
+				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), [], ['userid' => $iUser]);
-				while ($aRow = $oUserOrgSet->FetchAssoc())
+				while ($aRow = $oUserOrgSet->FetchAssoc()) {
-				{
 					$oOrg = $aRow['Org'];
 					$this->m_aUserOrgs[$iUser][] = $oOrg->GetKey();
 				}
-			}
+			} else {
-			else
-			{
 				$oSearch = new DBObjectSearch('URP_UserOrg');
 				$oSearch->AllowAllData();
 				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
 				$oSearch->AddConditionExpression($oCondition);
 
-				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
+				$oUserOrgSet = new DBObjectSet($oSearch, [], ['userid' => $iUser]);
-				while ($oUserOrg = $oUserOrgSet->Fetch())
+				while ($oUserOrg = $oUserOrgSet->Fetch()) {
-				{
 					$this->m_aUserOrgs[$iUser][] = $oUserOrg->Get('allowed_org_id');
 				}
 			}
@@ -563,21 +531,20 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	public function ResetCache()
 	{
 		// Loaded by Load cache
-		$this->m_aUserOrgs = array();
+		$this->m_aUserOrgs = [];
 
 		// Cache
-		$this->m_aObjectActionGrants = array();
+		$this->m_aObjectActionGrants = [];
 		$this->m_aAdministrators = null;
+		$this->aUsersProfilesList = [];
 	}
 
 	public function LoadCache()
 	{
 		static $bSharedObjectInitialized = false;
-		if (!$bSharedObjectInitialized)
+		if (!$bSharedObjectInitialized) {
-		{
 			$bSharedObjectInitialized = true;
-			if (self::HasSharing())
+			if (self::HasSharing()) {
-			{
 				SharedObject::InitSharedClassProperties();
 			}
 		}
@@ -615,45 +582,40 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	public function ListProfiles($oUser)
 	{
-		$aRet = array();
+		$aRet = [];
 		$oSearch = new DBObjectSearch('URP_UserProfile');
 		$oSearch->AllowAllData();
 		$oSearch->NoContextParameters();
 		$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
 		$oProfiles = new DBObjectSet($oSearch);
-		while ($oUserProfile = $oProfiles->Fetch())
+		while ($oUserProfile = $oProfiles->Fetch()) {
-		{
 			$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
 		}
 		return $aRet;
 	}
 
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	public function GetSelectFilter($oUser, $sClass, $aSettings = [])
 	{
 		$this->LoadCache();
 
 		// Let us pass an administrator for bypassing the grant matrix check in order to test this method without the need to set up a complex profile
 		// In the nominal case Administrators never end up here (since they completely bypass GetSelectFilter)
-		if (!static::IsAdministrator($oUser) && (MetaModel::HasCategory($sClass, 'silo') || MetaModel::HasCategory($sClass, 'bizmodel')))
+		if (!static::IsAdministrator($oUser) && (MetaModel::HasCategory($sClass, 'silo') || MetaModel::HasCategory($sClass, 'bizmodel'))) {
-		{
 			// N°4354 - Categories 'silo' and 'bizmodel' do check the grant matrix. Whereas 'filter' always allows to read (but the result can be filtered)
 			$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
-			if ($aObjectPermissions['permission'] == UR_ALLOWED_NO)
+			if ($aObjectPermissions['permission'] == UR_ALLOWED_NO) {
-			{
 				return false;
 			}
 		}
 
 		$oFilter = true;
-		$aConditions =  array();
+		$aConditions =  [];
 
 		// Determine if this class is part of a silo and build the filter for it
 		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
-		if (!is_null($sAttCode))
+		if (!is_null($sAttCode)) {
-		{
 			$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-			if (count($aUserOrgs) > 0)
+			if (count($aUserOrgs) > 0) {
-			{
 				$oFilter = $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
 			}
 			// else: No org means 'any org'
@@ -662,20 +624,15 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 		// Specific conditions to hide, for non-administrators, the Administrator Users, the Administrator Profile and related links
 		// Note: when logged as an administrator, GetSelectFilter is completely bypassed.
-		if ($this->AdministratorsAreHidden())
+		if ($this->AdministratorsAreHidden()) {
-		{
+			if ($sClass == 'URP_Profiles') {
-			if ($sClass == 'URP_Profiles')
-			{
 				$oExpression = new FieldExpression('id', $sClass);
 				$oScalarExpr = new ScalarExpression(1);
 
 				$aConditions[] = new BinaryExpression($oExpression, '!=', $oScalarExpr);
-			}
+			} elseif (($sClass == 'URP_UserProfile') || ($sClass == 'User') || (is_subclass_of($sClass, 'User'))) {
-			else if (($sClass == 'URP_UserProfile') || ($sClass == 'User') || (is_subclass_of($sClass, 'User')))
-			{
 				$aAdministrators = $this->GetAdministrators();
-				if (count($aAdministrators) > 0)
+				if (count($aAdministrators) > 0) {
-				{
 					$sAttCode = ($sClass == 'URP_UserProfile') ? 'userid' : 'id';
 					$oExpression = new FieldExpression($sAttCode, $sClass);
 					$oListExpr = ListExpression::FromScalars($aAdministrators);
@@ -685,17 +642,14 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		}
 
 		// Handling of the added conditions
-		if (count($aConditions) > 0)
+		if (count($aConditions) > 0) {
-		{
+			if ($oFilter === true) {
-			if($oFilter === true)
-			{
 				// No 'silo' filter, let's build a clean one
 				$oFilter = new DBObjectSearch($sClass);
 			}
 
 			// Add the conditions to the filter
-			foreach($aConditions as $oCondition)
+			foreach ($aConditions as $oCondition) {
-			{
 				$oFilter->AddConditionExpression($oCondition);
 			}
 		}
@@ -710,10 +664,9 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	private function GetAdministrators()
 	{
-		if ($this->m_aAdministrators === null)
+		if ($this->m_aAdministrators === null) {
-		{
 			// Find all administrators
-			$this->m_aAdministrators = array();
+			$this->m_aAdministrators = [];
 			$oAdministratorsFilter = new DBObjectSearch('User');
 			$oLnkFilter = new DBObjectSearch('URP_UserProfile');
 			$oExpression = new FieldExpression('profileid', 'URP_UserProfile');
@@ -723,9 +676,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oAdministratorsFilter->AddCondition_ReferencedBy($oLnkFilter, 'userid');
 			$oAdministratorsFilter->AllowAllData(true); // Mandatory to prevent infinite recursion !!
 			$oSet = new DBObjectSet($oAdministratorsFilter);
-			$oSet->OptimizeColumnLoad(array('User' => array('login')));
+			$oSet->OptimizeColumnLoad(['User' => ['login']]);
-			while($oUser = $oSet->Fetch())
+			while ($oUser = $oSet->Fetch()) {
-			{
 				$this->m_aAdministrators[] = $oUser->GetKey();
 			}
 		}
@@ -741,7 +693,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		return ((bool)MetaModel::GetConfig()->Get('security.hide_administrators'));
 	}
 
-
 	// This verb has been made public to allow the development of an accurate feedback for the current configuration
 	public function GetProfileActionGrant($iProfile, $sClass, $sAction)
 	{
@@ -758,33 +709,29 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// load and cache permissions for the current user on the given class
 		//
 		$iUser = $oUser->GetKey();
-		if (isset($this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode])){
+		if (isset($this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode])) {
 			$aTest = $this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
-			if (is_array($aTest)) return $aTest;
+			if (is_array($aTest)) {
+				return $aTest;
+			}
 		}
 
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
 		$bStatus = null;
 		// Cache user's profiles
-		if(false === array_key_exists($iUser, $this->aUsersProfilesList)){
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
 			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
 		}
 		// Call the API of UserRights because it caches the list for us
-		foreach($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile)
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
-		{
 			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
-			if (!is_null($bGrant))
+			if (!is_null($bGrant)) {
-			{
+				if ($bGrant) {
-				if ($bGrant)
+					if (is_null($bStatus)) {
-				{
-					if (is_null($bStatus))
-					{
 						$bStatus = true;
 					}
-				}
+				} else {
-				else
-				{
 					$bStatus = false;
 				}
 			}
@@ -792,9 +739,9 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 		$iPermission = $bStatus ? UR_ALLOWED_YES : UR_ALLOWED_NO;
 
-		$aRes = array(
+		$aRes = [
 			'permission' => $iPermission,
-		);
+		];
 		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
 		return $aRes;
 	}
@@ -809,20 +756,13 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// Note: In most cases the object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
 
-		if ($iPermission != UR_ALLOWED_YES)
+		if ($iPermission != UR_ALLOWED_YES) {
-		{
 			// It is already NO for everyone... that's the final word!
-		}
+		} elseif ($iActionCode == UR_ACTION_READ) {
-		elseif ($iActionCode == UR_ACTION_READ)
-		{
 			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
+		} elseif ($iActionCode == UR_ACTION_BULK_READ) {
-		elseif ($iActionCode == UR_ACTION_BULK_READ)
-		{
 			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
+		} elseif ($oInstanceSet) {
-		elseif ($oInstanceSet)
-		{
 			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
 			// We have to answer NO for objects shared for reading purposes
 			if (self::HasSharing() && SharedObject::GetSharedClassProperties($sClass)) {
@@ -887,7 +827,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$iUser = $oUser->GetKey();
 
 		// Cache user's profiles
-		if(false === array_key_exists($iUser, $this->aUsersProfilesList)){
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
 			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
 		}
 
@@ -895,20 +835,14 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		//       and acceptable to consider only the root class of the object set
 		$bStatus = null;
 		// Call the API of UserRights because it caches the list for us
-		foreach($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile)
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
-		{
 			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
-			if (!is_null($bGrant))
+			if (!is_null($bGrant)) {
-			{
+				if ($bGrant) {
-				if ($bGrant)
+					if (is_null($bStatus)) {
-				{
-					if (is_null($bStatus))
-					{
 						$bStatus = true;
 					}
-				}
+				} else {
-				else
-				{
 					$bStatus = false;
 				}
 			}
@@ -932,22 +866,16 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	{
 		$sAttCode = null;
 
-		$aCallSpec = array($sClass, 'MapContextParam');
+		$aCallSpec = [$sClass, 'MapContextParam'];
-		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization'))
+		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization')) {
-		{
 			$sAttCode = 'id';
-		}
+		} elseif (is_callable($aCallSpec)) {
-		elseif (is_callable($aCallSpec))
-		{
 			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode)) {
-			{
 				// Skip silently. The data model checker will tell you something about this...
 				$sAttCode = null;
 			}
-		}
+		} elseif (MetaModel::IsValidAttCode($sClass, 'org_id')) {
-		elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
-		{
 			$sAttCode = 'org_id';
 		}
 
@@ -960,14 +888,11 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	protected static function HasSharing()
 	{
 		static $bHasSharing;
-		if (!isset($bHasSharing))
+		if (!isset($bHasSharing)) {
-		{
 			$bHasSharing = class_exists('SharedObject');
 		}
 		return $bHasSharing;
 	}
 }
 
-
 UserRights::SelectModule('UserRightsProfile');
-

application/DBSearchHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -48,8 +49,7 @@ class DBSearchHelper
 								$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
 								$oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
 							}
-						}
+						} catch (Exception $e) {
-						catch (Exception $e) {
 							// If filtering fails just ignore it
 						}
 					}

application/application.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/applicationcontext.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -16,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * Class ApplicationContext
  *
@@ -86,7 +86,6 @@ class PortalURLMaker implements iDBObjectURLMaker
 	}
 }
 
-
 /**
  * Helper class to store and manipulate the parameters that make the application's context
  *
@@ -115,11 +114,10 @@ class ApplicationContext
 	 */
 	public function __construct($bReadContext = true)
 	{
-		$this->aNames = array(
+		$this->aNames = [
-			'org_id', 'menu'
+			'org_id', 'menu',
-		);
+		];
-		if ($bReadContext)
+		if ($bReadContext) {
-		{
 			$this->ReadContext();
 		}
 
@@ -133,36 +131,29 @@ class ApplicationContext
 	 */
 	protected function ReadContext()
 	{
-		if (!isset(self::$aDefaultValues))
+		if (!isset(self::$aDefaultValues)) {
-		{
+			self::$aDefaultValues = [];
-			self::$aDefaultValues = array();
+			$aContext = utils::ReadParam('c', [], false, 'context_param');
-			$aContext = utils::ReadParam('c', array(), false, 'context_param');
+			foreach ($this->aNames as $sName) {
-			foreach($this->aNames as $sName)
-			{
 				$sValue = isset($aContext[$sName]) ? $aContext[$sName] : '';
 				// TO DO: check if some of the context parameters are mandatory (or have default values)
-				if (!empty($sValue))
+				if (!empty($sValue)) {
-				{
 					self::$aDefaultValues[$sName] = $sValue;
 				}
 				// Hmm, there must be a better (more generic) way to handle the case below:
 				// When there is only one possible (allowed) organization, the context must be
 				// fixed to this org unless there is only one organization in the system then
 				// no filter is applied
-				if ($sName == 'org_id')
+				if ($sName == 'org_id') {
-				{
+					if (MetaModel::IsValidClass('Organization')) {
-					if (MetaModel::IsValidClass('Organization'))
-					{
 						$oSearchFilter = new DBObjectSearch('Organization');
 						$oSet = new CMDBObjectSet($oSearchFilter);
 						$iCount = $oSet->CountWithLimit(2);
-						if ($iCount > 1)
+						if ($iCount > 1) {
-						{
 							$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 							$oSet = new CMDBObjectSet($oSearchFilter);
 							$iCount = $oSet->CountWithLimit(2);
-							if ($iCount == 1)
+							if ($iCount == 1) {
-							{
 								// Only one possible value for org_id, set it in the context
 								$oOrg = $oSet->Fetch();
 								self::$aDefaultValues[$sName] = $oOrg->GetKey();
@@ -185,8 +176,7 @@ class ApplicationContext
 	 */
 	public function GetCurrentValue($sParamName, $defaultValue = '')
 	{
-		if (isset($this->aValues[$sParamName]))
+		if (isset($this->aValues[$sParamName])) {
-		{
 			return $this->aValues[$sParamName];
 		}
 		return $defaultValue;
@@ -200,21 +190,20 @@ class ApplicationContext
 	public function GetForLink(bool $bWithLeadingAmpersand = false)
 	{
 		// If there are no parameters, return an empty string
-		if(empty($this->aValues)){
+		if (empty($this->aValues)) {
 			return '';
 		}
 
 		// Build the query string with ampersand separated parameters
-		$aParams = array();
+		$aParams = [];
-		foreach($this->aValues as $sName => $sValue)
+		foreach ($this->aValues as $sName => $sValue) {
-		{
 			$aParams[] = "c[$sName]".'='.urlencode($sValue);
 		}
 		$sReturnValue = implode('&', $aParams);
 
 		// add the leading ampersand if requested
-		if($bWithLeadingAmpersand){
+		if ($bWithLeadingAmpersand) {
-			$sReturnValue = '&' . $sReturnValue;
+			$sReturnValue = '&'.$sReturnValue;
 		}
 
 		return $sReturnValue;
@@ -278,9 +267,8 @@ class ApplicationContext
 	 */
 	public function GetAsHash()
 	{
-		$aReturn = array();
+		$aReturn = [];
-		foreach($this->aValues as $sName => $sValue)
+		foreach ($this->aValues as $sName => $sValue) {
-		{
 			$aReturn["c[$sName]"] = $sValue;
 		}
 		return $aReturn;
@@ -301,8 +289,7 @@ class ApplicationContext
 	 */
 	public function Reset($sParamName)
 	{
-		if (isset($this->aValues[$sParamName]))
+		if (isset($this->aValues[$sParamName])) {
-		{
 			unset($this->aValues[$sParamName]);
 		}
 	}
@@ -318,21 +305,16 @@ class ApplicationContext
 	public function InitObjectFromContext(DBObject &$oObj)
 	{
 		$sClass = get_class($oObj);
-		foreach($this->GetNames() as $key)
+		foreach ($this->GetNames() as $key) {
-		{
+			$aCallSpec = [$sClass, 'MapContextParam'];
-			$aCallSpec = array($sClass, 'MapContextParam');
+			if (is_callable($aCallSpec)) {
-			if (is_callable($aCallSpec))
-			{
 				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter
 
-				if (MetaModel::IsValidAttCode($sClass, $sAttCode))
+				if (MetaModel::IsValidAttCode($sClass, $sAttCode)) {
-				{
 					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-					if ($oAttDef->IsWritable())
+					if ($oAttDef->IsWritable()) {
-					{
 						$value = $this->GetCurrentValue($key, null);
-						if (!is_null($value))
+						if (!is_null($value)) {
-						{
 							$oObj->Set($sAttCode, $value);
 						}
 					}
@@ -362,14 +344,10 @@ class ApplicationContext
 	 */
 	public static function GetUrlMakerClass()
 	{
-		if (is_null(self::$m_sUrlMakerClass))
+		if (is_null(self::$m_sUrlMakerClass)) {
-		{
+			if (Session::IsSet('UrlMakerClass')) {
-			if (Session::IsSet('UrlMakerClass'))
-			{
 				self::$m_sUrlMakerClass = Session::Get('UrlMakerClass');
-			}
+			} else {
-			else
-			{
 				self::$m_sUrlMakerClass = 'iTopStandardURLMaker';
 			}
 		}
@@ -394,7 +372,7 @@ class ApplicationContext
 		if (is_null($sUrlMakerClass)) {
 			$sUrlMakerClass = self::GetUrlMakerClass();
 		}
-		$sUrl = call_user_func(array($sUrlMakerClass, 'MakeObjectUrl'), $sObjClass, $sObjKey);
+		$sUrl = call_user_func([$sUrlMakerClass, 'MakeObjectUrl'], $sObjClass, $sObjKey);
 		if (utils::StrLen($sUrl) > 0) {
 			if ($bWithNavigationContext) {
 				return $sUrl.$oAppContext->GetForLink(true);
@@ -412,13 +390,10 @@ class ApplicationContext
 	 */
 	protected static function LoadPluginProperties()
 	{
-		if (Session::IsSet('PluginProperties'))
+		if (Session::IsSet('PluginProperties')) {
-		{
 			self::$m_aPluginProperties = Session::Get('PluginProperties');
-		}
+		} else {
-		else
+			self::$m_aPluginProperties = [];
-		{
-			self::$m_aPluginProperties = array();
 		}
 	}
 
@@ -431,7 +406,9 @@ class ApplicationContext
 	 */
 	public static function SetPluginProperty($sPluginClass, $sProperty, $value)
 	{
-		if (is_null(self::$m_aPluginProperties)) self::LoadPluginProperties();
+		if (is_null(self::$m_aPluginProperties)) {
+			self::LoadPluginProperties();
+		}
 
 		self::$m_aPluginProperties[$sPluginClass][$sProperty] = $value;
 		Session::Set(['PluginProperties', $sPluginClass, $sProperty], $value);
@@ -444,15 +421,14 @@ class ApplicationContext
 	 */
 	public static function GetPluginProperties($sPluginClass)
 	{
-		if (is_null(self::$m_aPluginProperties)) self::LoadPluginProperties();
+		if (is_null(self::$m_aPluginProperties)) {
-
+			self::LoadPluginProperties();
-		if (array_key_exists($sPluginClass, self::$m_aPluginProperties))
-		{
-			return self::$m_aPluginProperties[$sPluginClass];
 		}
-		else
+
-		{
+		if (array_key_exists($sPluginClass, self::$m_aPluginProperties)) {
-			return array();
+			return self::$m_aPluginProperties[$sPluginClass];
+		} else {
+			return [];
 		}
 	}
 

application/applicationextension.inc.php

@@ -74,7 +74,3 @@ require_once(APPROOT.'application/applicationextension/rest/iRestInputSanitizer.
 require_once(APPROOT.'application/applicationextension/rest/iRestServiceProvider.php');
 require_once(APPROOT.'application/applicationextension/rest/RestResult.php');
 require_once(APPROOT.'application/applicationextension/rest/RestUtils.php');
-
-
-
-

application/applicationextension/backoffice/AbstractApplicationUIExtension.php

@@ -42,7 +42,7 @@ abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
 	 */
 	public function EnumUsedAttributes($oObject)
 	{
-        return array();
+		return [];
 	}
 
 	/**
@@ -66,7 +66,7 @@ abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
 	 */
 	public function EnumAllowedActions(DBObjectSet $oSet)
 	{
-        return array();
+		return [];
 	}
 
 }

application/applicationextension/backoffice/ApplicationPopupMenuItem.php

@@ -33,7 +33,7 @@ abstract class ApplicationPopupMenuItem
 		$this->sLabel = $sLabel;
 		$this->sTooltip = '';
 		$this->sIconClass = '';
-        $this->aCssClasses = array();
+		$this->aCssClasses = [];
 	}
 
 	/**
@@ -89,7 +89,6 @@ abstract class ApplicationPopupMenuItem
 		$this->aCssClasses[] = $sCssClass;
 	}
 
-
 	/**
 	 * @param $sTooltip
 	 *
@@ -145,6 +144,6 @@ abstract class ApplicationPopupMenuItem
 	/** @ignore */
 	public function GetLinkedScripts()
 	{
-        return array();
+		return [];
 	}
 }

application/applicationextension/backoffice/JSButtonItem.php

@@ -9,5 +9,4 @@
  */
 class JSButtonItem extends JSPopupMenuItem
 {
-
 }

application/applicationextension/backoffice/JSPopupMenuItem.php

@@ -28,7 +28,7 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 	 * @param array $aIncludeJSFiles An array of file URLs to be included (once) to provide some JS libraries for the page.
 	 * @api
 	 */
-    public function __construct($sUID, $sLabel, $sJSCode, $aIncludeJSFiles = array())
+	public function __construct($sUID, $sLabel, $sJSCode, $aIncludeJSFiles = [])
 	{
 		parent::__construct($sUID, $sLabel);
 		$this->sJsCode = $sJSCode;
@@ -40,14 +40,14 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 	public function GetMenuItem()
 	{
 		// Note: the semicolumn is a must here!
-        return array(
+		return [
 			'label' => $this->GetLabel(),
-            'onclick' => $this->GetJsCode() . '; return false;',
+			'onclick' => $this->GetJsCode().'; return false;',
 			'url' => $this->GetUrl(),
 			'css_classes' => $this->GetCssClasses(),
 			'icon_class' => $this->sIconClass,
-            'tooltip' => $this->sTooltip
+			'tooltip' => $this->sTooltip,
-        );
+		];
 	}
 
 	/** @ignore */

application/applicationextension/backoffice/SeparatorPopupMenuItem.php

@@ -10,7 +10,7 @@
  */
 class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
 {
-    static $idx = 0;
+	public static $idx = 0;
 
 	/**
 	 * Constructor
@@ -18,12 +18,12 @@ class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
 	 */
 	public function __construct()
 	{
-        parent::__construct('_separator_' . (self::$idx++), '');
+		parent::__construct('_separator_'.(self::$idx++), '');
 	}
 
 	/** @ignore */
 	public function GetMenuItem()
 	{
-        return array('label' => '<hr class="menu-separator">', 'url' => '', 'css_classes' => $this->aCssClasses);
+		return ['label' => '<hr class="menu-separator">', 'url' => '', 'css_classes' => $this->aCssClasses];
 	}
 }

application/applicationextension/backoffice/URLButtonItem.php

@@ -9,5 +9,4 @@
  */
 class URLButtonItem extends URLPopupMenuItem
 {
-
 }

application/applicationextension/backoffice/URLPopupMenuItem.php

@@ -35,13 +35,13 @@ class URLPopupMenuItem extends ApplicationPopupMenuItem
 	/** @ignore */
 	public function GetMenuItem()
 	{
-        return array('label' => $this->GetLabel(),
+		return ['label' => $this->GetLabel(),
 			'url' => $this->GetUrl(),
 			'target' => $this->GetTarget(),
 			'css_classes' => $this->aCssClasses,
 			'icon_class' => $this->sIconClass,
-            'tooltip' => $this->sTooltip
+			'tooltip' => $this->sTooltip,
-        );
+		];
 	}
 
 	/** @ignore */

application/applicationextension/backoffice/iPopupMenuExtension.php

@@ -19,21 +19,21 @@ interface iPopupMenuExtension
 	 * $param is a DBObjectSet containing the list of objects
 	 * @api
 	 */
-    const MENU_OBJLIST_ACTIONS = 1;
+	public const MENU_OBJLIST_ACTIONS = 1;
 	/**
 	 * Insert an item into the Toolkit menu of a list
 	 *
 	 * $param is a DBObjectSet containing the list of objects
 	 * @api
 	 */
-    const MENU_OBJLIST_TOOLKIT = 2;
+	public const MENU_OBJLIST_TOOLKIT = 2;
 	/**
 	 * Insert an item into the Actions menu on an object details page
 	 *
 	 * $param is a DBObject instance: the object currently displayed
 	 * @api
 	 */
-    const MENU_OBJDETAILS_ACTIONS = 3;
+	public const MENU_OBJDETAILS_ACTIONS = 3;
 	/**
 	 * Insert an item into the Dashboard menu
 	 *
@@ -43,14 +43,14 @@ interface iPopupMenuExtension
 	 * $param is a Dashboard instance: the dashboard currently displayed
 	 * @api
 	 */
-    const MENU_DASHBOARD_ACTIONS = 4;
+	public const MENU_DASHBOARD_ACTIONS = 4;
 	/**
 	 * Insert an item into the User menu (upper right corner)
 	 *
 	 * $param is null
 	 * @api
 	 */
-    const MENU_USER_ACTIONS = 5;
+	public const MENU_USER_ACTIONS = 5;
 	/**
 	 * Insert an item into the Action menu on an object item in an objects list in the portal
 	 *
@@ -58,7 +58,7 @@ interface iPopupMenuExtension
 	 * the current line)
 	 * @api
 	 */
-    const PORTAL_OBJLISTITEM_ACTIONS = 7;
+	public const PORTAL_OBJLISTITEM_ACTIONS = 7;
 	/**
 	 * Insert an item into the Action menu on an object details page in the portal
 	 *
@@ -66,7 +66,7 @@ interface iPopupMenuExtension
 	 * currently displayed)
 	 * @api
 	 */
-    const PORTAL_OBJDETAILS_ACTIONS = 8;
+	public const PORTAL_OBJDETAILS_ACTIONS = 8;
 
 	/**
 	 * Insert an item into the Actions menu of a list in the portal
@@ -76,7 +76,7 @@ interface iPopupMenuExtension
 	 *
 	 * @todo
 	 */
-    const PORTAL_OBJLIST_ACTIONS = 6;
+	public const PORTAL_OBJLIST_ACTIONS = 6;
 	/**
 	 * Insert an item into the user menu of the portal
 	 * Note: This is not implemented yet !
@@ -85,7 +85,7 @@ interface iPopupMenuExtension
 	 *
 	 * @todo
 	 */
-    const PORTAL_USER_ACTIONS = 9;
+	public const PORTAL_USER_ACTIONS = 9;
 	/**
 	 * Insert an item into the navigation menu of the portal
 	 * Note: This is not implemented yet !
@@ -94,7 +94,7 @@ interface iPopupMenuExtension
 	 *
 	 * @todo
 	 */
-    const PORTAL_MENU_ACTIONS = 10;
+	public const PORTAL_MENU_ACTIONS = 10;
 
 	/**
 	 * Get the list of items to be added to a menu.

application/applicationextension/portal/AbstractPortalUIExtension.php

@@ -14,7 +14,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	 */
 	public function GetCSSFiles(\Symfony\Component\DependencyInjection\Container $oContainer)
 	{
-        return array();
+		return [];
 	}
 
 	/**
@@ -30,7 +30,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	 */
 	public function GetJSFiles(\Symfony\Component\DependencyInjection\Container $oContainer)
 	{
-        return array();
+		return [];
 	}
 
 	/**

application/applicationextension/portal/iPortalUIExtension.php

@@ -11,9 +11,9 @@
  */
 interface iPortalUIExtension
 {
-    const ENUM_PORTAL_EXT_UI_BODY = 'Body';
+	public const ENUM_PORTAL_EXT_UI_BODY = 'Body';
-    const ENUM_PORTAL_EXT_UI_NAVIGATION_MENU = 'NavigationMenu';
+	public const ENUM_PORTAL_EXT_UI_NAVIGATION_MENU = 'NavigationMenu';
-    const ENUM_PORTAL_EXT_UI_MAIN_CONTENT = 'MainContent';
+	public const ENUM_PORTAL_EXT_UI_MAIN_CONTENT = 'MainContent';
 
 	/**
 	 * Returns an array of CSS file urls

application/applicationextension/rest/RestResult.php

@@ -13,62 +13,62 @@ class RestResult
 	 * Result: no issue has been encountered
 	 * @api
 	 */
-    const OK = 0;
+	public const OK = 0;
 	/**
 	 * Result: missing/wrong credentials or the user does not have enough rights to perform the requested operation
 	 * @api
 	 */
-    const UNAUTHORIZED = 1;
+	public const UNAUTHORIZED = 1;
 	/**
 	 * Result: the parameter 'version' is missing
 	 * @api
 	 */
-    const MISSING_VERSION = 2;
+	public const MISSING_VERSION = 2;
 	/**
 	 * Result: the parameter 'json_data' is missing
 	 * @api
 	 */
-    const MISSING_JSON = 3;
+	public const MISSING_JSON = 3;
 	/**
 	 * Result: the input structure is not a valid JSON string
 	 * @api
 	 */
-    const INVALID_JSON = 4;
+	public const INVALID_JSON = 4;
 	/**
 	 * Result: the parameter 'auth_user' is missing, authentication aborted
 	 * @api
 	 */
-    const MISSING_AUTH_USER = 5;
+	public const MISSING_AUTH_USER = 5;
 	/**
 	 * Result: the parameter 'auth_pwd' is missing, authentication aborted
 	 * @api
 	 */
-    const MISSING_AUTH_PWD = 6;
+	public const MISSING_AUTH_PWD = 6;
 	/**
 	 * Result: no operation is available for the specified version
 	 * @api
 	 */
-    const UNSUPPORTED_VERSION = 10;
+	public const UNSUPPORTED_VERSION = 10;
 	/**
 	 * Result: the requested operation is not valid for the specified version
 	 * @api
 	 */
-    const UNKNOWN_OPERATION = 11;
+	public const UNKNOWN_OPERATION = 11;
 	/**
 	 * Result: the requested operation cannot be performed because it can cause data (integrity) loss
 	 * @api
 	 */
-    const UNSAFE = 12;
+	public const UNSAFE = 12;
 	/**
 	 * Result: the request page number is not valid. It must be an integer greater than 0
 	 * @api
 	 */
-    const INVALID_PAGE = 13;
+	public const INVALID_PAGE = 13;
 	/**
 	 * Result: the operation could not be performed, see the message for troubleshooting
 	 * @api
 	 */
-    const INTERNAL_ERROR = 100;
+	public const INTERNAL_ERROR = 100;
 
 	/**
 	 * Default constructor - ok!

application/applicationextension/rest/RestUtils.php

@@ -44,7 +44,6 @@ class RestUtils
 		}
 	}
 
-
 	/**
 	 * Read an optional parameter from a Rest/Json structure.
 	 *
@@ -66,7 +65,6 @@ class RestUtils
 		}
 	}
 
-
 	/**
 	 * Read a class from a Rest/Json structure.
 	 *
@@ -87,7 +85,6 @@ class RestUtils
 		return $sClass;
 	}
 
-
 	/**
 	 * Read a list of attribute codes from a Rest/Json structure.
 	 *
@@ -100,33 +97,77 @@ class RestUtils
 	 * @throws Exception
 	 * @api
 	 */
-    public static function GetFieldList($sClass, $oData, $sParamName)
+	public static function GetFieldList($sClass, $oData, $sParamName, $bFailIfNotFound = true)
 	{
 		$sFields = self::GetOptionalParam($oData, $sParamName, '*');
-        $aShowFields = array();
+		return match($sFields) {
-        if ($sFields == '*') {
+			'*' => self::GetFieldListForClass($sClass),
-            foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) {
+			'*+' => self::GetFieldListForParentClass($sClass),
-                $aShowFields[$sClass][] = $sAttCode;
+			default => self::GetLimitedFieldListForClass($sClass, $sFields, $sParamName, $bFailIfNotFound),
+		};
 	}
-        } elseif ($sFields == '*+') {
+
+	public static function HasRequestedExtendedOutput(string $sFields): bool
+	{
+		return match($sFields) {
+			'*' => false,
+			'*+' => true,
+			default => substr_count($sFields, ':') > 1,
+		};
+	}
+
+	public static function HasRequestedAllOutputFields(string $sFields): bool
+	{
+		return match($sFields) {
+			'*', '*+' => true,
+			default => false,
+		};
+	}
+
+	protected static function GetFieldListForClass(string $sClass): array
+	{
+		return [$sClass => array_keys(MetaModel::ListAttributeDefs($sClass))];
+	}
+
+	protected static function GetFieldListForParentClass(string $sClass): array
+	{
+		$aFieldList = array();
 		foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass) {
-                foreach (MetaModel::ListAttributeDefs($sRefClass) as $sAttCode => $oAttDef) {
+			$aFieldList = array_merge($aFieldList, self::GetFieldListForClass($sRefClass));
-                    $aShowFields[$sRefClass][] = $sAttCode;
 		}
+		return $aFieldList;
 	}
-        } else {
+
+	protected static function GetLimitedFieldListForSingleClass(string $sClass, string $sFields, string $sParamName, bool $bFailIfNotFound = true): array
+	{
+		$aFieldList = [$sClass => []];
 		foreach (explode(',', $sFields) as $sAttCode) {
 			$sAttCode = trim($sAttCode);
-                if (($sAttCode != 'id') && (!MetaModel::IsValidAttCode($sClass, $sAttCode))) {
+			if (($sAttCode == 'id') || (MetaModel::IsValidAttCode($sClass, $sAttCode))) {
-                    throw new Exception("$sParamName: invalid attribute code '$sAttCode'");
+				$aFieldList[$sClass][] = $sAttCode;
+			} else {
+				if ($bFailIfNotFound) {
+					throw new Exception("$sParamName: invalid attribute code '$sAttCode' for class '$sClass'");
 				}
-                $aShowFields[$sClass][] = $sAttCode;
 			}
 		}
+		return $aFieldList;
+	}
 
-        return $aShowFields;
+	protected static function GetLimitedFieldListForClass(string $sClass, string $sFields, string $sParamName, bool $bFailIfNotFound = true): array
+	{
+		if (!str_contains($sFields, ':')) {
+			return self::GetLimitedFieldListForSingleClass($sClass, $sFields, $sParamName, $bFailIfNotFound);
 		}
 
+		$aFieldList = [];
+		$aFieldListParts = explode(';', $sFields);
+		foreach ($aFieldListParts as $sClassFields) {
+			list($sSubClass, $sSubClassFields) = explode(':', $sClassFields);
+			$aFieldList = array_merge($aFieldList, self::GetLimitedFieldListForSingleClass(trim($sSubClass), trim($sSubClassFields), $sParamName, $bFailIfNotFound));
+		}
+		return $aFieldList;
+	}
 	/**
 	 * Read and interpret object search criteria from a Rest/Json structure
 	 *
@@ -140,13 +181,13 @@ class RestUtils
 	 */
 	protected static function FindObjectFromCriteria($sClass, $oCriteria)
 	{
-        $aCriteriaReport = array();
+		$aCriteriaReport = [];
 		if (isset($oCriteria->finalclass)) {
 			if (!MetaModel::IsValidClass($oCriteria->finalclass)) {
-                throw new Exception("finalclass: Unknown class '" . $oCriteria->finalclass . "'");
+				throw new Exception("finalclass: Unknown class '".$oCriteria->finalclass."'");
 			}
 			if (!MetaModel::IsParentClass($sClass, $oCriteria->finalclass)) {
-                throw new Exception("finalclass: '" . $oCriteria->finalclass . "' is not a child class of '$sClass'");
+				throw new Exception("finalclass: '".$oCriteria->finalclass."' is not a child class of '$sClass'");
 			}
 			$sClass = $oCriteria->finalclass;
 		}
@@ -162,16 +203,15 @@ class RestUtils
 		$oSet = new DBObjectSet($oSearch);
 		$iCount = $oSet->Count();
 		if ($iCount == 0) {
-            throw new Exception("No item found with criteria: " . implode(', ', $aCriteriaReport));
+			throw new Exception("No item found with criteria: ".implode(', ', $aCriteriaReport));
 		} elseif ($iCount > 1) {
-            throw new Exception("Several items found ($iCount) with criteria: " . implode(', ', $aCriteriaReport));
+			throw new Exception("Several items found ($iCount) with criteria: ".implode(', ', $aCriteriaReport));
 		}
 		$res = $oSet->Fetch();
 
 		return $res;
 	}
 
-
 	/**
 	 * Find an object from a polymorph search specification (Rest/Json)
 	 *
@@ -260,7 +300,7 @@ class RestUtils
 		} else {
 			throw new Exception("Wrong format for key");
 		}
-        $oObjectSet = new DBObjectSet($oSearch, array(), array(), null, $iLimit, $iOffset);
+		$oObjectSet = new DBObjectSet($oSearch, [], [], null, $iLimit, $iOffset);
 
 		return $oObjectSet;
 	}
@@ -291,7 +331,7 @@ class RestUtils
 					throw new Exception("A link set must be defined by an array of objects");
 				}
 				$sLnkClass = $oAttDef->GetLinkedClass();
-                $aLinks = array();
+				$aLinks = [];
 				foreach ($value as $oValues) {
 					$oLnk = static::MakeObjectFromFields($sLnkClass, $oValues);
 					// Fix for N°1939
@@ -310,7 +350,7 @@ class RestUtils
 				$value = $oAttDef->FromJSONToValue($value);
 			}
 		} catch (Exception $e) {
-            throw new Exception("$sAttCode: " . $e->getMessage(), $e->getCode());
+			throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
 		}
 
 		return $value;
@@ -334,7 +374,7 @@ class RestUtils
 			try {
 				$oObject->Set($sAttCode, $realValue);
 			} catch (Exception $e) {
-                throw new Exception("$sAttCode: " . $e->getMessage(), $e->getCode());
+				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
 			}
 		}
 
@@ -359,7 +399,7 @@ class RestUtils
 			try {
 				$oObject->Set($sAttCode, $realValue);
 			} catch (Exception $e) {
-                throw new Exception("$sAttCode: " . $e->getMessage(), $e->getCode());
+				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
 			}
 		}
 

application/audit.category.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -16,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * This class manages the audit "categories". Each category defines a set of objects
  * to check and is linked to a set of rules that determine the valid or invalid objects
@@ -32,34 +32,36 @@ class AuditCategory extends cmdbAbstractObject
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category"            => "application,grant_by_profile",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "name",
 			"state_attcode"       => "",
-			"reconc_keys"         => array('name'),
+			"reconc_keys"         => ['name'],
 			"db_table"            => "priv_auditcategory",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
 			'style'               => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit-folder.svg'),
-		);
+		];
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", ["description" => "Short name for this category", "allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", ["allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeOQL("definition_set", array("allowed_values"=>null, "sql"=>"definition_set", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("definition_set", ["allowed_values" => null, "sql" => "definition_set", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSet("rules_list", array("linked_class"=>"AuditRule", "ext_key_to_me"=>"category_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(), "edit_mode" => LINKSET_EDITMODE_INPLACE, "tracking_level" => LINKSET_TRACKING_ALL)));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSet("rules_list", ["linked_class" => "AuditRule", "ext_key_to_me" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => [], "edit_mode" => LINKSET_EDITMODE_INPLACE, "edit_when" => LINKSET_EDITWHEN_ALWAYS, "tracking_level" => LINKSET_TRACKING_ALL]));
-		MetaModel::Init_AddAttribute(new AttributeInteger("ok_error_tolerance", array("allowed_values"=>null, "sql"=>"ok_error_tolerance", "default_value"=>5, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("ok_error_tolerance", ["allowed_values" => null, "sql" => "ok_error_tolerance", "default_value" => 5, "is_null_allowed" => true, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeInteger("warning_error_tolerance", array("allowed_values" => null, "sql" => "warning_error_tolerance", "default_value" => 25, "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("warning_error_tolerance", ["allowed_values" => null, "sql" => "warning_error_tolerance", "default_value" => 25, "is_null_allowed" => true, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("domains_list",
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect(
-			array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "category_id", "ext_key_to_remote" => "domain_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array(), "display_style" => 'property')));
+			"domains_list",
+			["linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "category_id", "ext_key_to_remote" => "domain_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => [], "display_style" => 'property']
+		));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'ok_error_tolerance', 'warning_error_tolerance', 'rules_list', 'domains_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['name', 'description', 'definition_set', 'ok_error_tolerance', 'warning_error_tolerance', 'rules_list', 'domains_list']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description', ]); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['description', 'definition_set']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+		MetaModel::Init_SetZListItems('default_search', ['name', 'description']); // Criteria of the default search form
 	}
 
 	/**
@@ -74,9 +76,9 @@ class AuditCategory extends cmdbAbstractObject
 	public function GetReportColor($iTotal, $iErrors)
 	{
 		$sResult = 'red';
-		if ( ($iTotal == 0) || ($iErrors / $iTotal) <= ($this->Get('ok_error_tolerance') / 100) ) {
+		if (($iTotal == 0) || ($iErrors / $iTotal) <= ($this->Get('ok_error_tolerance') / 100)) {
 			$sResult = 'green';
-		} else if (($iErrors / $iTotal) <= ($this->Get('warning_error_tolerance') / 100)) {
+		} elseif (($iErrors / $iTotal) <= ($this->Get('warning_error_tolerance') / 100)) {
 			$sResult = 'orange';
 		}
 
@@ -93,4 +95,3 @@ class AuditCategory extends cmdbAbstractObject
 		return $aShortcutActions;
 	}
 }
-?>

application/audit.domain.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -16,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * This class manages the audit "categories". Each category defines a set of objects
  * to check and is linked to a set of rules that determine the valid or invalid objects
@@ -33,32 +33,34 @@ class AuditDomain extends cmdbAbstractObject
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category"                   => "application,grant_by_profile",
 			"key_type"                   => "autoincrement",
 			"name_attcode"               => "name",
-			"complementary_name_attcode" => array('description'),
+			"complementary_name_attcode" => ['description'],
 			"state_attcode"              => "",
-			"reconc_keys"                => array('name'),
+			"reconc_keys"                => ['name'],
 			"db_table"                   => "priv_auditdomain",
 			"db_key_field"               => "id",
 			"db_finalclass_field"        => "",
 			'style'                      => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit-album.svg'),
-		);
+		];
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("description" => "Short name for this category", "allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", ["description" => "Short name for this category", "allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", ["allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeImage("icon", array("is_null_allowed" => true, "depends_on" => array(), "display_max_width" => 96, "display_max_height" => 96, "storage_max_width" => 256, "storage_max_height" => 256, "default_image" => null, "always_load_in_tables" => false)));
+		MetaModel::Init_AddAttribute(new AttributeImage("icon", ["is_null_allowed" => true, "depends_on" => [], "display_max_width" => 96, "display_max_height" => 96, "storage_max_width" => 256, "storage_max_height" => 256, "default_image" => null, "always_load_in_tables" => false]));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("categories_list",
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect(
-			array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));
+			"categories_list",
+			["linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => []]
+		));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'icon', 'categories_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['name', 'description', 'icon', 'categories_list']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description',)); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description',]); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['description']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+		MetaModel::Init_SetZListItems('default_search', ['name', 'description']); // Criteria of the default search form
 	}
 
 	public static function GetShortcutActions($sFinalClass)
@@ -84,40 +86,39 @@ class lnkAuditCategoryToAuditDomain extends cmdbAbstractObject
 	 */
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category"            => "application,grant_by_profile",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "",
 			"state_attcode"       => "",
-			"reconc_keys"         => array('category_id', 'domain_id'),
+			"reconc_keys"         => ['category_id', 'domain_id'],
 			"db_table"            => "priv_link_audit_category_domain",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
 			"is_link"             => true,
-			'uniqueness_rules'    => array(
+			'uniqueness_rules'    => [
-				'no_duplicate' => array(
+				'no_duplicate' => [
-					'attributes'  => array(
+					'attributes'  => [
 						0 => 'category_id',
 						1 => 'domain_id',
-					),
+					],
 					'filter'      => '',
 					'disabled'    => false,
 					'is_blocking' => true,
-				),
+				],
-			),
+			],
-		);
+		];
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("targetclass" => "AuditCategory", "jointype" => '', "allowed_values" => null, "sql" => "category_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", ["targetclass" => "AuditCategory", "jointype" => '', "allowed_values" => null, "sql" => "category_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values" => null, "extkey_attcode" => 'category_id', "target_attcode" => "name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", ["allowed_values" => null, "extkey_attcode" => 'category_id', "target_attcode" => "name"]));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("domain_id", array("targetclass" => "AuditDomain", "jointype" => '', "allowed_values" => null, "sql" => "domain_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("domain_id", ["targetclass" => "AuditDomain", "jointype" => '', "allowed_values" => null, "sql" => "domain_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("domain_name", array("allowed_values" => null, "extkey_attcode" => 'domain_id', "target_attcode" => "name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("domain_name", ["allowed_values" => null, "extkey_attcode" => 'domain_id', "target_attcode" => "name"]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('category_id', 'domain_id'));
+		MetaModel::Init_SetZListItems('details', ['category_id', 'domain_id']);
-		MetaModel::Init_SetZListItems('list', array('category_id', 'domain_id'));
+		MetaModel::Init_SetZListItems('list', ['category_id', 'domain_id']);
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'domain_id'));
+		MetaModel::Init_SetZListItems('standard_search', ['category_id', 'domain_id']);
 	}
 }
-

application/audit.rule.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -16,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * This class manages the audit "rule" linked to a given audit category.
  * Each rule is based on an OQL expression that returns either the "good" objects
@@ -33,35 +33,35 @@ class AuditRule extends cmdbAbstractObject
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category"            => "application,grant_by_profile",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "name",
 			"state_attcode"       => "",
-			"reconc_keys"         => array('name'),
+			"reconc_keys"         => ['name'],
 			"db_table"            => "priv_auditrule",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
 			'style'               => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit.svg'),
-		);
+		];
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", ["allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", ["allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeOQL("query", array("allowed_values" => null, "sql" => "query", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("query", ["allowed_values" => null, "sql" => "query", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", array("allowed_values" => new ValueSetEnum('true,false'), "sql" => "valid_flag", "default_value" => "true", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", ["allowed_values" => new ValueSetEnum('true,false'), "sql" => "valid_flag", "default_value" => "true", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("allowed_values" => null, "sql" => "category_id", "targetclass" => "AuditCategory", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", ["allowed_values" => null, "sql" => "category_id", "targetclass" => "AuditCategory", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values" => null, "extkey_attcode" => 'category_id', "target_attcode" => "name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", ["allowed_values" => null, "extkey_attcode" => 'category_id', "target_attcode" => "name"]));
-
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contact_id", ["allowed_values" => null, "sql" => "contact_id", "targetclass" => "Contact", "is_null_allowed" => true, "on_target_delete" => DEL_MANUAL, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeHTML("process", ["allowed_values" => null, "sql" => "process", "default_value" => "", "is_null_allowed" => true, "depends_on" => []]));
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['category_id', 'name', 'description', 'query', 'valid_flag', 'process', 'contact_id']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('category_id', 'description', 'valid_flag')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['category_id', 'description', 'query']); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['category_id', 'name', 'description', 'valid_flag', 'query']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'category_id')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('default_search', ['name', 'description', 'category_id', 'contact_id', 'query']); // Criteria of the advanced search form
 	}
 
-
 	public static function GetShortcutActions($sFinalClass)
 	{
 		$aShortcutActions = parent::GetShortcutActions($sFinalClass);
@@ -72,4 +72,3 @@ class AuditRule extends cmdbAbstractObject
 		return $aShortcutActions;
 	}
 }
-?>

application/compilecssservice.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2024 Combodo SAS
  *
@@ -32,7 +33,8 @@ class CompileCSSService
 	{
 	}
 
-	public function CompileCSSFromSASS($sSassContent, $aImportPaths =  [], $aVariables = []){
+	public function CompileCSSFromSASS($sSassContent, $aImportPaths =  [], $aVariables = [])
+	{
 		return utils::CompileCSSFromSASS($sSassContent, $aImportPaths, $aVariables);
 	}
 }

application/dashboard.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -53,7 +54,7 @@ abstract class Dashboard
 		$this->sLayoutClass = 'DashboardLayoutOneCol';
 		$this->bAutoReload = false;
 		$this->iAutoReloadSec = MetaModel::GetConfig()->GetStandardReloadInterval();
-		$this->aCells = array();
+		$this->aCells = [];
 		$this->oDOMNode = null;
 		$this->sId = $sId;
 	}
@@ -65,8 +66,8 @@ abstract class Dashboard
 	 */
 	public function FromXml($sXml)
 	{
-		$this->aCells = array(); // reset the content of the dashboard
+		$this->aCells = []; // reset the content of the dashboard
-		set_error_handler(array('Dashboard', 'ErrorHandler'));
+		set_error_handler(['Dashboard', 'ErrorHandler']);
 		$oDoc = new DOMDocument();
 		$oDoc->loadXML($sXml);
 		restore_error_handler();
@@ -80,86 +81,68 @@ abstract class Dashboard
 	{
 		$this->oDOMNode = $oDoc->getElementsByTagName('dashboard')->item(0);
 
-		if ($oLayoutNode = $this->oDOMNode->getElementsByTagName('layout')->item(0))
+		if ($oLayoutNode = $this->oDOMNode->getElementsByTagName('layout')->item(0)) {
-		{
 			$this->sLayoutClass = $oLayoutNode->textContent;
-		}
+		} else {
-		else
-		{
 			$this->sLayoutClass = 'DashboardLayoutOneCol';
 		}
 
-		if ($oTitleNode = $this->oDOMNode->getElementsByTagName('title')->item(0))
+		if ($oTitleNode = $this->oDOMNode->getElementsByTagName('title')->item(0)) {
-		{
 			$this->sTitle = $oTitleNode->textContent;
-		}
+		} else {
-		else
-		{
 			$this->sTitle = '';
 		}
 
 		$this->bAutoReload = false;
 		$this->iAutoReloadSec = MetaModel::GetConfig()->GetStandardReloadInterval();
-		if ($oAutoReloadNode = $this->oDOMNode->getElementsByTagName('auto_reload')->item(0))
+		if ($oAutoReloadNode = $this->oDOMNode->getElementsByTagName('auto_reload')->item(0)) {
-		{
+			if ($oAutoReloadEnabled = $oAutoReloadNode->getElementsByTagName('enabled')->item(0)) {
-			if ($oAutoReloadEnabled = $oAutoReloadNode->getElementsByTagName('enabled')->item(0))
-			{
 				$this->bAutoReload = ($oAutoReloadEnabled->textContent == 'true');
 			}
-			if ($oAutoReloadInterval = $oAutoReloadNode->getElementsByTagName('interval')->item(0))
+			if ($oAutoReloadInterval = $oAutoReloadNode->getElementsByTagName('interval')->item(0)) {
-			{
 				$this->iAutoReloadSec = max(MetaModel::GetConfig()->Get('min_reload_interval'), (int)$oAutoReloadInterval->textContent);
 			}
 		}
 
-		if ($oCellsNode = $this->oDOMNode->getElementsByTagName('cells')->item(0))
+		if ($oCellsNode = $this->oDOMNode->getElementsByTagName('cells')->item(0)) {
-		{
 			$oCellsList = $oCellsNode->getElementsByTagName('cell');
-			$aCellOrder = array();
+			$aCellOrder = [];
 			$iCellRank = 0;
 			/** @var \DOMElement $oCellNode */
-			foreach($oCellsList as $oCellNode)
+			foreach ($oCellsList as $oCellNode) {
-			{
 				$oCellRank = $oCellNode->getElementsByTagName('rank')->item(0);
-				if ($oCellRank)
+				if ($oCellRank) {
-				{
 					$iCellRank = (float)$oCellRank->textContent;
 				}
 				$oDashletsNode = $oCellNode->getElementsByTagName('dashlets')->item(0);
 				{
 					$oDashletList = $oDashletsNode->getElementsByTagName('dashlet');
 					$iRank = 0;
-					$aDashletOrder = array();
+					$aDashletOrder = [];
 					/** @var \DOMElement $oDomNode */
-					foreach($oDashletList as $oDomNode)
+					foreach ($oDashletList as $oDomNode) {
-					{
 						$oRank =  $oDomNode->getElementsByTagName('rank')->item(0);
-						if ($oRank)
+						if ($oRank) {
-						{
 							$iRank = (float)$oRank->textContent;
 						}
 
 						$oNewDashlet = $this->InitDashletFromDOMNode($oDomNode);
-						$aDashletOrder[] = array('rank' => $iRank, 'dashlet' => $oNewDashlet);
+						$aDashletOrder[] = ['rank' => $iRank, 'dashlet' => $oNewDashlet];
 					}
-					usort($aDashletOrder, array(get_class($this), 'SortOnRank'));
+					usort($aDashletOrder, [get_class($this), 'SortOnRank']);
-					$aDashletList = array();
+					$aDashletList = [];
-					foreach($aDashletOrder as $aItem)
+					foreach ($aDashletOrder as $aItem) {
-					{
 						$aDashletList[] = $aItem['dashlet'];
 					}
-					$aCellOrder[] = array('rank' => $iCellRank, 'dashlets' => $aDashletList);
+					$aCellOrder[] = ['rank' => $iCellRank, 'dashlets' => $aDashletList];
 				}
 			}
-			usort($aCellOrder, array(get_class($this), 'SortOnRank'));
+			usort($aCellOrder, [get_class($this), 'SortOnRank']);
-			foreach($aCellOrder as $aItem)
+			foreach ($aCellOrder as $aItem) {
-			{
 				$this->aCells[] = $aItem['dashlets'];
 			}
-		}
+		} else {
-		else
+			$this->aCells = [];
-		{
-			$this->aCells = array();
 		}
 	}
 
@@ -208,12 +191,9 @@ abstract class Dashboard
 	 */
 	public static function ErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if ($errno == E_WARNING && (substr_count($errstr,"DOMDocument::loadXML()")>0))
+		if ($errno == E_WARNING && (substr_count($errstr, "DOMDocument::loadXML()") > 0)) {
-		{
 			throw new DOMException($errstr);
-		}
+		} else {
-		else
-		{
 			return false;
 		}
 	}
@@ -263,8 +243,7 @@ abstract class Dashboard
 		$oDefinition->appendChild($oCellsNode);
 
 		$iCellRank = 0;
-		foreach ($this->aCells as $aCell)
+		foreach ($this->aCells as $aCell) {
-		{
 			$oCellNode = $oDoc->createElement('cell');
 			$oCellNode->setAttribute('id', $iCellRank);
 			$oCellsNode->appendChild($oCellNode);
@@ -276,8 +255,7 @@ abstract class Dashboard
 			$oDashletsNode = $oDoc->createElement('dashlets');
 			$oCellNode->appendChild($oDashletsNode);
 			/** @var \Dashlet $oDashlet */
-			foreach ($aCell as $oDashlet)
+			foreach ($aCell as $oDashlet) {
-			{
 				$oNode = $oDoc->createElement('dashlet');
 				$oDashletsNode->appendChild($oNode);
 				$oNode->setAttribute('id', $oDashlet->GetID());
@@ -296,16 +274,16 @@ abstract class Dashboard
 	public function FromParams($aParams)
 	{
 		$this->sLayoutClass = $aParams['layout_class'];
-		if (!is_subclass_of($this->sLayoutClass,DashboardLayout::class)) {
+		if (!is_subclass_of($this->sLayoutClass, DashboardLayout::class)) {
 			throw new InvalidParameterException('Invalid parameter layout_class "'.$aParams['layout_class'].'"');
 		}
 		$this->sTitle = $aParams['title'];
 		$this->bAutoReload = $aParams['auto_reload'] == 'true';
 		$this->iAutoReloadSec = max(MetaModel::GetConfig()->Get('min_reload_interval'), (int) $aParams['auto_reload_sec']);
 
-		foreach($aParams['cells'] as $aCell) {
+		foreach ($aParams['cells'] as $aCell) {
-			$aCellDashlets = array();
+			$aCellDashlets = [];
-			foreach($aCell as $aDashletParams) {
+			foreach ($aCell as $aDashletParams) {
 				$sDashletClass = $aDashletParams['dashlet_class'];
 				$sId = $aDashletParams['dashlet_id'];
 				/** @var \Dashlet $oNewDashlet */
@@ -420,7 +398,7 @@ abstract class Dashboard
 	{
 		$sId = $this->GetNewDashletId();
 		$oDashlet->SetId($sId);
-		$this->aCells[] = array($oDashlet);
+		$this->aCells[] = [$oDashlet];
 	}
 
 	/**
@@ -430,7 +408,7 @@ abstract class Dashboard
 	 * @throws \ReflectionException
 	 * @throws \Exception
 	 */
-	public function RenderProperties($oPage, $aExtraParams = array())
+	public function RenderProperties($oPage, $aExtraParams = [])
 	{
 		// menu to pick a layout and edit other properties of the dashboard
 		$oPage->add('<div class="ui-widget-content ui-corner-all ibo-dashboard-editor--properties"><div class="ui-widget-header ui-corner-all ibo-dashboard-editor--properties-title">'.Dict::S('UI:DashboardEdit:Properties').'</div>');
@@ -442,7 +420,7 @@ abstract class Dashboard
 			if (is_subclass_of($sLayoutClass, 'DashboardLayout')) {
 				$oReflection = new ReflectionClass($sLayoutClass);
 				if (!$oReflection->isAbstract()) {
-					$aCallSpec = array($sLayoutClass, 'GetInfo');
+					$aCallSpec = [$sLayoutClass, 'GetInfo'];
 					$aInfo = call_user_func($aCallSpec);
 					$sChecked = ($this->sLayoutClass == $sLayoutClass) ? 'checked' : '';
 					$oPage->add('<input type="radio" name="layout_class" '.$sChecked.' value="'.$sLayoutClass.'" id="layout_'.$sLayoutClass.'"><label for="layout_'.$sLayoutClass.'"><img src="'.$sUrl.$aInfo['icon'].'" class="ibo-dashboard--properties--icon" data-role="ibo-dashboard--properties--icon"/></label>'); // title="" on either the img or the label does nothing !
@@ -466,7 +444,6 @@ abstract class Dashboard
 		$oField->SetBoundaries(MetaModel::GetConfig()->Get('min_reload_interval'), null); // no upper limit
 		$oForm->AddField($oField);
 
-
 		$this->SetFormParams($oForm, $aExtraParams);
 		$oForm->RenderAsPropertySheet($oPage, false, '.itop-dashboard');
 
@@ -474,7 +451,7 @@ abstract class Dashboard
 
 		$sRateTitle = addslashes(Dict::Format('UI:DashboardEdit:AutoReloadSec+', MetaModel::GetConfig()->Get('min_reload_interval')));
 		$oPage->add_ready_script(
-<<<EOF
+			<<<EOF
 	// Note: the title gets deleted by the validation mechanism
 	$("#attr_auto_reload_sec").attr('data-tooltip-content', '$sRateTitle');
 	CombodoTooltip.InitTooltipFromMarkup($("#attr_auto_reload_sec"));
@@ -522,7 +499,7 @@ EOF
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout
 	 */
-	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
+	public function Render($oPage, $bEditMode = false, $aExtraParams = [], $bCanEdit = true)
 	{
 		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? null, $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
 
@@ -551,7 +528,8 @@ EOF
 
 				$oToolbar->AddHtml($sHtml);
 			} else {
-				$oPage->add_script(<<<JS
+				$oPage->add_script(
+					<<<JS
 $(".ibo-top-bar--toolbar-dashboard-title").html("$sTitleForHTML").attr("title",  $('<div>').html("$sTitleForHTML").text());
 JS
 				);
@@ -595,7 +573,7 @@ JS
 	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 */
-	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = array())
+	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = [])
 	{
 		// Toolbox/palette to edit the properties of each dashlet
 		$oPage->add('<div class="ui-widget-content ui-corner-all ibo-dashlet--properties"><div class="ui-widget-header ui-corner-all ibo-dashlet--properties--title">'.Dict::S('UI:DashboardEdit:DashletProperties').'</div>');
@@ -604,13 +582,10 @@ JS
 		$oLayout = new $this->sLayoutClass();
 
 		$oPage->add('<div id="dashlet_properties">');
-		foreach($this->aCells as $iCellIdx => $aCell)
+		foreach ($this->aCells as $iCellIdx => $aCell) {
-		{
 			/** @var \Dashlet $oDashlet */
-			foreach($aCell as $oDashlet)
+			foreach ($aCell as $oDashlet) {
-			{
+				if ($oDashlet->IsVisible()) {
-				if ($oDashlet->IsVisible())
-				{
 					$oPage->add('<div class="dashlet_properties" id="dashlet_properties_'.$oDashlet->GetID().'" style="display:none">');
 					$oForm = $oDashlet->GetForm();
 					$this->SetFormParams($oForm, $aExtraParams);
@@ -632,18 +607,17 @@ JS
 	 */
 	protected function GetAvailableDashlets()
 	{
-		$aDashlets = array();
+		$aDashlets = [];
 
-		foreach( get_declared_classes() as $sDashletClass)
+		foreach (get_declared_classes() as $sDashletClass) {
-		{
 			// DashletUnknown is not among the selection as it is just a fallback for dashlets that can't instantiated.
-			if (is_subclass_of($sDashletClass, 'Dashlet') && !in_array($sDashletClass, array('DashletUnknown', 'DashletProxy'))) {
+			if (is_subclass_of($sDashletClass, 'Dashlet') && !in_array($sDashletClass, ['DashletUnknown', 'DashletProxy'])) {
 				$oReflection = new ReflectionClass($sDashletClass);
 				if (!$oReflection->isAbstract()) {
-					$aCallSpec = array($sDashletClass, 'IsVisible');
+					$aCallSpec = [$sDashletClass, 'IsVisible'];
 					$bVisible = call_user_func($aCallSpec);
 					if ($bVisible) {
-						$aCallSpec = array($sDashletClass, 'GetInfo');
+						$aCallSpec = [$sDashletClass, 'GetInfo'];
 						$aInfo = call_user_func($aCallSpec);
 						$aDashlets[$sDashletClass] = $aInfo;
 					}
@@ -660,11 +634,9 @@ JS
 	protected function GetNewDashletId()
 	{
 		$iNewId = 0;
-		foreach($this->aCells as $aDashlets)
+		foreach ($this->aCells as $aDashlets) {
-		{
 			/** @var \Dashlet $oDashlet */
-			foreach($aDashlets as $oDashlet)
+			foreach ($aDashlets as $oDashlet) {
-			{
 				$iNewId = max($iNewId, (int)$oDashlet->GetID());
 			}
 		}
@@ -681,7 +653,7 @@ JS
 	 *
 	 * @return void
 	 */
-	abstract protected function PrepareDashletForRendering(Dashlet $oDashlet, $aCoordinates, $aExtraParams = array());
+	abstract protected function PrepareDashletForRendering(Dashlet $oDashlet, $aCoordinates, $aExtraParams = []);
 
 	/**
 	 * @param \DesignerForm $oForm
@@ -689,7 +661,7 @@ JS
 	 *
 	 * @return mixed
 	 */
-	abstract protected function SetFormParams($oForm, $aExtraParams = array());
+	abstract protected function SetFormParams($oForm, $aExtraParams = []);
 
 	/**
 	 * @param string $sType
@@ -699,8 +671,7 @@ JS
 	 */
 	public static function GetDashletClassFromType($sType, $oFactory = null)
 	{
-		if (is_subclass_of($sType, 'Dashlet'))
+		if (is_subclass_of($sType, 'Dashlet')) {
-		{
 			return $sType;
 		}
 		return 'DashletUnknown';
@@ -723,14 +694,12 @@ JS
 	 */
 	public static function GetDashletUniqueId($bIsCustomized, $sDashboardDivId, $iRow, $iCol, $sDashletOrigId)
 	{
-		if(strpos($sDashletOrigId, '_ID_row') !== false)
+		if (strpos($sDashletOrigId, '_ID_row') !== false) {
-		{
 			return $sDashletOrigId;
 		}
 
 		$sDashletId = $sDashboardDivId."_ID_row".$iRow."_col".$iCol."_".$sDashletOrigId;
-		if ($bIsCustomized)
+		if ($bIsCustomized) {
-		{
 			$sDashletId = 'CUSTOM_'.$sDashletId;
 		}
 
@@ -782,9 +751,9 @@ class RuntimeDashboard extends Dashboard
 	 * @inheritDoc
 	 * @throws \Exception
 	 */
-	protected function SetFormParams($oForm, $aExtraParams = array())
+	protected function SetFormParams($oForm, $aExtraParams = [])
 	{
-		$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams));
+		$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', ['operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams]);
 	}
 
 	/**
@@ -800,14 +769,11 @@ class RuntimeDashboard extends Dashboard
 		$oUDSearch->AddCondition('menu_code', $this->sId, '=');
 		$oUDSet = new DBObjectSet($oUDSearch);
 		$bIsNew = false;
-		if ($oUDSet->Count() > 0)
+		if ($oUDSet->Count() > 0) {
-		{
 			// Assuming there is at most one couple {user, menu}!
 			$oUserDashboard = $oUDSet->Fetch();
 			$oUserDashboard->Set('contents', $sXml);
-		}
+		} else {
-		else
-		{
 			// No such customized dashboard for the current user, let's create a new record
 			$oUserDashboard = new UserDashboard();
 			$oUserDashboard->Set('user_id', UserRights::GetUserId());
@@ -838,8 +804,7 @@ class RuntimeDashboard extends Dashboard
 		$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
 		$oUDSearch->AddCondition('menu_code', $this->sId, '=');
 		$oUDSet = new DBObjectSet($oUDSearch);
-		if ($oUDSet->Count() > 0)
+		if ($oUDSet->Count() > 0) {
-		{
 			// Assuming there is at most one couple {user, menu}!
 			$oUserDashboard = $oUDSet->Fetch();
 			utils::PushArchiveMode(false);
@@ -883,14 +848,11 @@ class RuntimeDashboard extends Dashboard
 			} else {
 				$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
 			}
-		}
+		} else {
-		else
-		{
 			$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
 		}
 
-		if ($sDashboardDefinition !== false)
+		if ($sDashboardDefinition !== false) {
-		{
 			$oDashboard = new RuntimeDashboard($sDashBoardId);
 			$oDashboard->FromXml($sDashboardDefinition);
 			$oDashboard->SetCustomFlag($bCustomized);
@@ -937,7 +899,6 @@ class RuntimeDashboard extends Dashboard
 			$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
 		}
 
-
 		if ($sDashboardDefinition !== false) {
 			$oDashboard = new RuntimeDashboard($sDashBoardId);
 			$oDashboard->FromXml($sDashboardDefinition);
@@ -954,11 +915,11 @@ class RuntimeDashboard extends Dashboard
 	 * @inheritDoc
 	 * @throws \Exception
 	 */
-	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
+	public function Render($oPage, $bEditMode = false, $aExtraParams = [], $bCanEdit = true)
 	{
 		if (!isset($aExtraParams['query_params']) && isset($aExtraParams['this->class'])) {
 			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
-			$aRenderParams = array('query_params' => $oObj->ToArgsForQuery());
+			$aRenderParams = ['query_params' => $oObj->ToArgsForQuery()];
 		} else {
 			$aRenderParams = $aExtraParams;
 		}
@@ -968,7 +929,7 @@ class RuntimeDashboard extends Dashboard
 		if (isset($aExtraParams['query_params']['this->object()'])) {
 			/** @var \DBObject $oObj */
 			$oObj = $aExtraParams['query_params']['this->object()'];
-			$aAjaxParams = array('this->class' => get_class($oObj), 'this->id' => $oObj->GetKey());
+			$aAjaxParams = ['this->class' => get_class($oObj), 'this->id' => $oObj->GetKey()];
 			if (isset($aExtraParams['from_dashboard_page'])) {
 				$aAjaxParams['from_dashboard_page'] = $aExtraParams['from_dashboard_page'];
 			}
@@ -1001,9 +962,7 @@ class RuntimeDashboard extends Dashboard
 				}
 JS
 				);
-			}
+			} else {
-			else
-			{
 				$oPage->add_script(
 					<<<EOF
 				if (typeof(AutoReloadDashboardId$sDivId) !== 'undefined')
@@ -1032,7 +991,7 @@ EOF
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
 	 */
-	protected function RenderSelector(WebPage $oPage, DashboardLayoutUIBlock $oDashboard, $aAjaxParams = array())
+	protected function RenderSelector(WebPage $oPage, DashboardLayoutUIBlock $oDashboard, $aAjaxParams = [])
 	{
 		if (!$this->HasCustomDashboard()) {
 			return;
@@ -1092,8 +1051,7 @@ JS
 	 */
 	protected function HasCustomDashboard()
 	{
-		try
+		try {
-		{
 			// Search for an eventual user defined dashboard
 			$oUDSearch = new DBObjectSearch('UserDashboard');
 			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
@@ -1101,9 +1059,7 @@ JS
 			$oUDSet = new DBObjectSet($oUDSearch);
 
 			return ($oUDSet->Count() > 0);
-		}
+		} catch (Exception $e) {
-		catch (Exception $e)
-		{
 			return false;
 		}
 	}
@@ -1139,21 +1095,23 @@ JS
 			->AddCSSClass('ibo-action-button');
 
 		$oToolbar->AddSubBlock($oActionButton);
-		$aActions = array();
+		$aActions = [];
 		$sFile = addslashes(utils::LocalPath($this->sDefinitionFile));
 		$sJSExtraParams = json_encode($aExtraParams);
 		if ($this->HasCustomDashboard()) {
 			$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:EditCustom'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
 			$aActions[$oEdit->GetUID()] = $oEdit->GetMenuItem();
-			$oRevert = new JSPopupMenuItem('UI:Dashboard:RevertConfirm', Dict::S('UI:Dashboard:DeleteCustom'),
+			$oRevert = new JSPopupMenuItem(
-				"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false");
+				'UI:Dashboard:RevertConfirm',
+				Dict::S('UI:Dashboard:DeleteCustom'),
+				"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false"
+			);
 			$aActions[$oRevert->GetUID()] = $oRevert->GetMenuItem();
 		} else {
 			$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:CreateCustom'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
 			$aActions[$oEdit->GetUID()] = $oEdit->GetMenuItem();
 		}
 
-
 		utils::GetPopupMenuItems($oPage, iPopupMenuExtension::MENU_DASHBOARD_ACTIONS, $this, $aActions);
 
 		$oActionsMenu = $oPage->GetPopoverMenu($sPopoverMenuId, $aActions)
@@ -1193,12 +1151,12 @@ EOF
 	/**
 	 * @inheritDoc
 	 */
-	public function RenderProperties($oPage, $aExtraParams = array())
+	public function RenderProperties($oPage, $aExtraParams = [])
 	{
 		parent::RenderProperties($oPage, $aExtraParams);
 
 		$oPage->add_ready_script(
-<<<EOF
+			<<<EOF
 	$('#select_layout input').on('click', function() {
 		var sLayoutClass = $(this).val();
 		$('.itop-dashboard').runtimedashboard('option', {layout_class: sLayoutClass});
@@ -1225,7 +1183,6 @@ EOF
 		);
 	}
 
-
 	/**
 	 * @param WebPage $oPage
 	 *
@@ -1236,11 +1193,11 @@ EOF
 	 * @throws \ReflectionException
 	 * @throws \Exception
 	 */
-	public function RenderEditor($oPage, $aExtraParams = array())
+	public function RenderEditor($oPage, $aExtraParams = [])
 	{
 		if (isset($aExtraParams['this->class'])) {
 			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
-			$aRenderParams = array('query_params' => $oObj->ToArgsForQuery());
+			$aRenderParams = ['query_params' => $oObj->ToArgsForQuery()];
 		} else {
 			$aRenderParams = $aExtraParams;
 		}
@@ -1277,7 +1234,7 @@ EOF
 		$sAutoApplyConfirmationMessage = addslashes(Dict::S('UI:AutoApplyConfirmationMessage'));
 
 		$oPage->add_ready_script(
-<<<JS
+			<<<JS
 window.bLeavingOnUserAction = false;
 
 $('#dashboard_editor').dialog({
@@ -1389,51 +1346,41 @@ JS
 		// Get the list of all 'dashboard' menus in which we can insert a dashlet
 		$aAllMenus = ApplicationMenu::ReflectionMenuNodes();
 		$sRootMenuId = ApplicationMenu::GetRootMenuId($sContextMenuId);
-		$aAllowedDashboards = array();
+		$aAllowedDashboards = [];
 		$sDefaultDashboard = null;
 
 		// Store the parent menus for acces check
-        $aParentMenus = array();
+		$aParentMenus = [];
-        foreach($aAllMenus as $idx => $aMenu)
+		foreach ($aAllMenus as $idx => $aMenu) {
-        {
 			/** @var MenuNode $oMenu */
 			$oMenu = $aMenu['node'];
-            if (count(ApplicationMenu::GetChildren($oMenu->GetIndex())) > 0)
+			if (count(ApplicationMenu::GetChildren($oMenu->GetIndex())) > 0) {
-            {
 				$aParentMenus[$oMenu->GetMenuId()] = $aMenu;
 			}
 		}
 
-        foreach($aAllMenus as $idx => $aMenu)
+		foreach ($aAllMenus as $idx => $aMenu) {
-		{
 			$oMenu = $aMenu['node'];
-            if ($oMenu instanceof DashboardMenuNode)
+			if ($oMenu instanceof DashboardMenuNode) {
-            {
 				// Get the root parent for access check
 				$sParentId = $aMenu['parent'];
 				$aParentMenu = $aParentMenus[$sParentId];
-                while (isset($aParentMenus[$aParentMenu['parent']]))
+				while (isset($aParentMenus[$aParentMenu['parent']])) {
-                {
 					// grand parent exists
 					$sParentId = $aParentMenu['parent'];
 					$aParentMenu = $aParentMenus[$sParentId];
 				}
 				/** @var \MenuNode $oParentMenu */
 				$oParentMenu = $aParentMenu['node'];
-                if ($oMenu->IsEnabled() && $oParentMenu->IsEnabled())
+				if ($oMenu->IsEnabled() && $oParentMenu->IsEnabled()) {
-                {
 					$sMenuLabel = $oMenu->GetTitle();
 					$sParentLabel = Dict::S('Menu:'.$sParentId);
-                    if ($sParentLabel != $sMenuLabel)
+					if ($sParentLabel != $sMenuLabel) {
-                    {
 						$aAllowedDashboards[$oMenu->GetMenuId()] = $sParentLabel.' - '.$sMenuLabel;
-                    }
+					} else {
-                    else
-                    {
 						$aAllowedDashboards[$oMenu->GetMenuId()] = $sMenuLabel;
 					}
-                    if (empty($sDefaultDashboard) && ($sRootMenuId == ApplicationMenu::GetRootMenuId($oMenu->GetMenuId())))
+					if (empty($sDefaultDashboard) && ($sRootMenuId == ApplicationMenu::GetRootMenuId($oMenu->GetMenuId()))) {
-                    {
 						$sDefaultDashboard = $oMenu->GetMenuId();
 					}
 				}
@@ -1448,21 +1395,17 @@ JS
 
 		// Get the list of possible dashlets that support a creation from
 		// an OQL
-		$aDashlets = array();
+		$aDashlets = [];
-		foreach(get_declared_classes() as $sDashletClass)
+		foreach (get_declared_classes() as $sDashletClass) {
-		{
+			if (is_subclass_of($sDashletClass, 'Dashlet')) {
-			if (is_subclass_of($sDashletClass, 'Dashlet'))
-			{
 				$oReflection = new ReflectionClass($sDashletClass);
-				if (!$oReflection->isAbstract())
+				if (!$oReflection->isAbstract()) {
-				{
+					$aCallSpec = [$sDashletClass, 'CanCreateFromOQL'];
-					$aCallSpec = array($sDashletClass, 'CanCreateFromOQL');
 					$bShorcutMode = call_user_func($aCallSpec);
-					if ($bShorcutMode)
+					if ($bShorcutMode) {
-					{
+						$aCallSpec = [$sDashletClass, 'GetInfo'];
-						$aCallSpec = array($sDashletClass, 'GetInfo');
 						$aInfo = call_user_func($aCallSpec);
-						$aDashlets[$sDashletClass] = array('label' => $aInfo['label'], 'class' => $sDashletClass, 'icon' => $aInfo['icon']);
+						$aDashlets[$sDashletClass] = ['label' => $aInfo['label'], 'class' => $sDashletClass, 'icon' => $aInfo['icon']];
 					}
 				}
 			}
@@ -1470,8 +1413,7 @@ JS
 
 		$oSelectorField = new DesignerFormSelectorField('dashlet_class', Dict::S('UI:DashletCreation:DashletType'), '');
 		$oForm->AddField($oSelectorField);
-		foreach($aDashlets as $sDashletClass => $aDashletInfo)
+		foreach ($aDashlets as $sDashletClass => $aDashletInfo) {
-		{
 			$oSubForm = new DesignerForm();
 			$oMetaModel = new ModelReflectionRuntime();
 			/** @var \Dashlet $oDashlet */
@@ -1603,7 +1545,7 @@ JS
 	/**
 	 * @inheritDoc
 	 */
-	protected function PrepareDashletForRendering(Dashlet $oDashlet, $aCoordinates, $aExtraParams = array())
+	protected function PrepareDashletForRendering(Dashlet $oDashlet, $aCoordinates, $aExtraParams = [])
 	{
 		$sDashletIdOrig = $oDashlet->GetID();
 		$sDashboardSanitizedId = $this->GetSanitizedId();
@@ -1630,31 +1572,27 @@ JS
 	private function UpdateDashletUserPrefs(Dashlet $oDashlet, $sDashletIdOrig, array $aExtraParams)
 	{
 		$bIsDashletWithListPref = ($oDashlet instanceof  DashletObjectList);
-		if (!$bIsDashletWithListPref)
+		if (!$bIsDashletWithListPref) {
-		{
 			return;
 		}
 		/** @var \DashletObjectList $oDashlet */
 
 		$bDashletIdInNewFormat = ($sDashletIdOrig === $oDashlet->GetID());
-		if ($bDashletIdInNewFormat)
+		if ($bDashletIdInNewFormat) {
-		{
 			return;
 		}
 
 		$sNewPrefKey = $this->GetDashletObjectListAppUserPreferencesPrefix($oDashlet, $aExtraParams, $oDashlet->GetID());
 		$sPrefValueForNewKey = appUserPreferences::GetPref($sNewPrefKey, null);
 		$bHasPrefInNewFormat = ($sPrefValueForNewKey !== null);
-		if ($bHasPrefInNewFormat)
+		if ($bHasPrefInNewFormat) {
-		{
 			return;
 		}
 
 		$sOldPrefKey = $this->GetDashletObjectListAppUserPreferencesPrefix($oDashlet, $aExtraParams, $sDashletIdOrig);
 		$sPrefValueForOldKey = appUserPreferences::GetPref($sOldPrefKey, null);
 		$bHasPrefInOldFormat = ($sPrefValueForOldKey !== null);
-		if (!$bHasPrefInOldFormat)
+		if (!$bHasPrefInOldFormat) {
-		{
 			return;
 		}
 
@@ -1673,7 +1611,7 @@ JS
 	private function GetDashletObjectListAppUserPreferencesPrefix(DashletObjectList $oDashlet, $aExtraParams, $sDashletId)
 	{
 		$sDataTableId = Dashlet::APPUSERPREFERENCES_PREFIX.$sDashletId;
-		$aClassAliases = array();
+		$aClassAliases = [];
 		try {
 			$oFilter = $oDashlet->GetDBSearch($aExtraParams);
 			$aClassAliases = $oFilter->GetSelectedClasses();

application/dashboardlayout.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -41,11 +42,11 @@ abstract class DashboardLayout
 
 	public static function GetInfo()
 	{
-		return array(
+		return [
 			'label' => '',
 			'icon' => '',
 			'description' => '',
-		);
+		];
 	}
 }
 
@@ -63,16 +64,12 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 		$aKeys = array_reverse(array_keys($aDashlets));
 		$idx = 0;
 		$bNoVisibleFound = true;
-		while($idx < count($aKeys) && $bNoVisibleFound)
+		while ($idx < count($aKeys) && $bNoVisibleFound) {
-		{
 			/** @var \Dashlet $oDashlet */
 			$oDashlet = $aDashlets[$aKeys[$idx]];
-			if ($oDashlet::IsVisible())
+			if ($oDashlet::IsVisible()) {
-			{
 				$bNoVisibleFound = false;
-			}
+			} else {
-			else
-			{
 				unset($aDashlets[$aKeys[$idx]]);
 			}
 			$idx++;
@@ -82,22 +79,17 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 
 	protected function TrimCellsArray($aCells)
 	{
-		foreach($aCells as $key => $aDashlets)
+		foreach ($aCells as $key => $aDashlets) {
-		{
 			$aCells[$key] = $this->TrimCell($aDashlets);
 		}
 		$aKeys = array_reverse(array_keys($aCells));
 		$idx = 0;
 		$bNoVisibleFound = true;
-		while($idx < count($aKeys) && $bNoVisibleFound)
+		while ($idx < count($aKeys) && $bNoVisibleFound) {
-		{
 			$aDashlets = $aCells[$aKeys[$idx]];
-			if (count($aDashlets) > 0)
+			if (count($aDashlets) > 0) {
-			{
 				$bNoVisibleFound = false;
-			}
+			} else {
-			else
-			{
 				unset($aCells[$aKeys[$idx]]);
 			}
 			$idx++;
@@ -112,7 +104,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 */
-	public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = array())
+	public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = [])
 	{
 		// Trim the list of cells to remove the invisible/empty ones at the end of the array
 		$aCells = $this->TrimCellsArray($aCells);
@@ -157,8 +149,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 
 		$oPage->add_script("function updateDashboard".$aExtraParams['dashboard_div_id']."(){".$sJSReload."}");
 
-		if ($bEditMode) // Add one row for extensibility
+		if ($bEditMode) { // Add one row for extensibility
-		{
 			$oDashboardRow = new DashboardRow();
 			$oDashboardLayout->AddDashboardRow($oDashboardRow);
 
@@ -180,7 +171,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 		$iColNumber = (int) $iCellIdx % $this->iNbCols;
 		$iRowNumber = (int) floor($iCellIdx / $this->iNbCols);
 
-		return array($iColNumber, $iRowNumber);
+		return [$iColNumber, $iRowNumber];
 	}
 }
 
@@ -191,13 +182,13 @@ class DashboardLayoutOneCol extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 1;
 	}
-	static public function GetInfo()
+	public static function GetInfo()
 	{
-		return array(
+		return [
 			'label' => 'One Column',
 			'icon' => 'images/layout_1col.png',
 			'description' => '',
-		);
+		];
 	}
 }
 
@@ -208,13 +199,13 @@ class DashboardLayoutTwoCols extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 2;
 	}
-	static public function GetInfo()
+	public static function GetInfo()
 	{
-		return array(
+		return [
 			'label' => 'Two Columns',
 			'icon' =>  'images/layout_2col.png',
 			'description' => '',
-		);
+		];
 	}
 }
 
@@ -225,12 +216,12 @@ class DashboardLayoutThreeCols extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 3;
 	}
-	static public function GetInfo()
+	public static function GetInfo()
 	{
-		return array(
+		return [
 			'label' => 'Two Columns',
 			'icon' =>  'images/layout_3col.png',
 			'description' => '',
-		);
+		];
 	}
 }

application/datamodel.application.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:noNamespaceSchemaLocation="https://www.combodo.com/itop-schema/3.3"
+             version="3.3">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
-        <comment>/* Resource access control abstraction. Can be herited by abstract resource access control classes. Generaly controlled using UR_ACTION_MODIFY access right. */</comment>
+        <comment>/* Resource access control abstraction. Can be herited by abstract resource access control classes. Generally controlled using UR_ACTION_MODIFY access right. */</comment>
         <abstract>true</abstract>
       </properties>
       <presentation/>
@@ -552,7 +554,7 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
       <description><![CDATA[Inform the listeners about the connection states]]></description>
       <event_data>
         <event_datum id="code">
-          <description>The login step result code (LoginWebPage::EXIT_CODE_...) </description>
+          <description>The login step result code (LoginWebPage::EXIT_CODE_...)</description>
           <type>integer</type>
         </event_datum>
         <event_datum id="state">
@@ -849,5 +851,168 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
         </methods>
       </class>
     </classes>
+    <property_types _delta="define">
+      <property_type id="Dashlet" xsi:type="Combodo-AbstractPropertyType"/>
+      <property_type id="DashletGroupBy" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletGroupBy:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletGroupBy:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletGroupBy:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttributeGroupBy">
+              <label>UI:DashletGroupBy:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+            </node>
+            <node id="style" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashletGroupBy:Prop-Style</label>
+              <values>
+                <value id="bars">
+                  <label>UI:DashletGroupByBars:Label</label>
+                </value>
+                <value id="pie">
+                  <label>UI:DashletGroupByPie:Label</label>
+                </value>
+                <value id="table">
+                  <label>UI:DashletGroupByTable:Label</label>
+                </value>
+              </values>
+            </node>
+            <node id="aggregation_function" xsi:type="Combodo-ValueType-AggregateFunction">
+              <label>UI:DashletGroupBy:Prop-Function</label>
+              <class>{{query.selected_class}}</class> <!-- pour savoir si il y a des attributs additionnables -->
+            </node>
+            <node id="aggregation_attribute" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletGroupBy:Prop-FunctionAttribute</label>
+              <relevance-condition>{{aggregation_function.value != 'count'}}</relevance-condition>
+              <class>{{query.selected_class}}</class>
+              <category>numeric</category>
+            </node>
+            <node id="order_by" xsi:type="Combodo-ValueType-ChoiceFromInput">
+              <label>UI:DashletGroupBy:Prop-OrderField</label>
+              <values>
+                <value id="attribute">
+                  <label>{{aggregation_attribute.label}}</label>
+                </value>
+                <value id="function">
+                  <label>{{aggregation_function.label}}</label>
+                </value>
+              </values>
+            </node>
+            <node id="limit" xsi:type="Combodo-ValueType-Integer">
+              <label>UI:DashletGroupBy:Prop-Limit</label>
+              <relevance-condition>{{order_by.value = 'function'}}</relevance-condition>
+            </node>
+            <node id="order_direction" xsi:type="Combodo-ValueType-Choice">
+              <label>UI:DashletGroupBy:Prop-OrderDirection</label>
+              <values>
+                <value id="asc">
+                  <label>UI:DashletGroupBy:Order:asc</label>
+                </value>
+                <value id="desc">
+                  <label>UI:DashletGroupBy:Order:desc</label>
+                </value>
+              </values>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletBadge" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="class" xsi:type="Combodo-ValueType-Class">
+              <label>UI:DashletBadge:Prop-Class</label>
+              <categories-csv>bizmodel</categories-csv>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletHeaderDynamic" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletHeaderDynamic:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletHeaderDynamic:Prop-Title</label>
+            </node>
+            <node id="icon" xsi:type="Combodo-ValueType-Icon">
+              <label>UI:DashletHeaderDynamic:Prop-Icon</label>
+            </node>
+            <node id="subtitle" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletHeaderDynamic:Prop-Subtitle</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletHeaderDynamic:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletHeaderDynamic:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+              <category>enum</category>
+            </node>
+            <node id="values" xsi:type="Combodo-ValueType-CollectionOfValues">
+              <label>UI:DashletHeaderDynamic:Prop-Values</label>
+              <xml-format xsi:type="Combodo-XMLFormat-CSV"/>
+              <value-type xsi:type="Combodo-ValueType-ClassAttributeValue">
+                <class>{{query.selected_class}}</class>
+                <attribute>{{group_by.attribute}}</attribute>
+              </value-type>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletHeaderStatic" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletHeaderStatic:Prop-Title</label>
+            </node>
+            <node id="icon" xsi:type="Combodo-ValueType-Icon">
+              <label>UI:DashletHeaderStatic:Prop-Icon</label>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletObjectList" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletObjectList:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletObjectList:Prop-Query</label>
+            </node>
+            <node id="menu" xsi:type="Combodo-ValueType-Boolean">
+              <label>UI:DashletObjectList:Prop-Menu</label>
+              <on>
+                <!-- not so cute, but matches exactly 3.2 implementation of boolean fields -->
+                <label>UI:UserManagement:ActionAllowed:Yes</label>
+                <value>true</value>
+              </on>
+              <off>
+                <label>UI:UserManagement:ActionAllowed:No</label>
+                <value>false</value>
+              </off>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletPlainText" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="text" xsi:type="Combodo-ValueType-Text">
+              <label>UI:DashletPlainText:Prop-Text</label>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+    </property_types>
   </meta>
 </itop_design>

application/displayblock.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -104,7 +105,7 @@ class DisplayBlock
 	 */
 	public const ENUM_STYLE_CHART_AJAX = 'chart_ajax';
 
-	const TAG_BLOCK = 'itopblock';
+	public const TAG_BLOCK = 'itopblock';
 	/** @var \DBSearch */
 	protected $m_oFilter;
 	protected $m_aConditions; // Conditions added to the filter -> avoid duplicate conditions
@@ -137,20 +138,18 @@ class DisplayBlock
 	 *
 	 * @throws \ApplicationException
 	 */
-	public function __construct(DBSearch $oFilter, $sStyle = self::ENUM_STYLE_LIST, $bAsynchronous = false, $aParams = array(), $oSet = null)
+	public function __construct(DBSearch $oFilter, $sStyle = self::ENUM_STYLE_LIST, $bAsynchronous = false, $aParams = [], $oSet = null)
 	{
 		$this->m_oFilter = $oFilter->DeepClone();
-		$this->m_aConditions = array();
+		$this->m_aConditions = [];
 		$this->m_sStyle = $sStyle;
 		$this->m_bAsynchronous = $bAsynchronous;
 		$this->m_aParams = $aParams;
 		$this->m_oSet = $oSet;
-		if (array_key_exists('show_obsolete_data', $aParams))
+		if (array_key_exists('show_obsolete_data', $aParams)) {
-		{
 			$this->m_bShowObsoleteData = $aParams['show_obsolete_data'];
 		}
-		if ($this->m_bShowObsoleteData === null)
+		if ($this->m_bShowObsoleteData === null) {
-		{
 			// User defined
 			$this->m_bShowObsoleteData = utils::ShowObsoleteData();
 		}
@@ -412,22 +411,18 @@ class DisplayBlock
 	 * @throws \CoreException
 	 * @throws \Exception
 	 */
-	public static function FromObjectSet(DBObjectSet $oSet, $sStyle, $aParams = array())
+	public static function FromObjectSet(DBObjectSet $oSet, $sStyle, $aParams = [])
 	{
 		$oDummyFilter = new DBObjectSearch($oSet->GetClass());
-		$aKeys = array();
+		$aKeys = [];
-		$oSet->OptimizeColumnLoad(array($oSet->GetClassAlias() => array())); // No need to load all the columns just to get the id
+		$oSet->OptimizeColumnLoad([$oSet->GetClassAlias() => []]); // No need to load all the columns just to get the id
-		while($oObject = $oSet->Fetch())
+		while ($oObject = $oSet->Fetch()) {
-		{
 			$aKeys[] = $oObject->GetKey();
 		}
 		$oSet->Rewind();
-		if (count($aKeys) > 0)
+		if (count($aKeys) > 0) {
-		{
 			$oDummyFilter->AddCondition('id', $aKeys, 'IN');
-		}
+		} else {
-		else
-		{
 			$oDummyFilter->AddCondition('id', 0, '=');
 		}
 		$oBlock = new DisplayBlock($oDummyFilter, $sStyle, false, $aParams); // DisplayBlocks built this way are synchronous
@@ -448,7 +443,7 @@ class DisplayBlock
 		$iStartPos = stripos($sTemplate, '<'.self::TAG_BLOCK.' ', 0);
 		$iEndPos = stripos($sTemplate, '</'.self::TAG_BLOCK.'>', $iStartPos);
 		$iEndTag = stripos($sTemplate, '>', $iStartPos);
-		$aParams = array();
+		$aParams = [];
 
 		if (($iStartPos === false) || ($iEndPos === false)) {
 			return null;
@@ -456,7 +451,7 @@ class DisplayBlock
 		$sITopData = substr($sTemplate, 1 + $iEndTag, $iEndPos - $iEndTag - 1);
 		$sITopTag = substr($sTemplate, $iStartPos + strlen('<'.self::TAG_BLOCK), $iEndTag - $iStartPos - strlen('<'.self::TAG_BLOCK));
 
-		$aMatches = array();
+		$aMatches = [];
 		$sBlockClass = "DisplayBlock";
 		$bAsynchronous = false;
 		$sBlockType = 'list';
@@ -522,25 +517,28 @@ class DisplayBlock
 		return new $sBlockClass($oFilter, $sBlockType, $bAsynchronous, $aParams);
 	}
 
-	public function DisplayIntoContentBlock(UIContentBlock $oContentBlock, WebPage $oPage, $sId, $aExtraParams = array())
+	public function DisplayIntoContentBlock(UIContentBlock $oContentBlock, WebPage $oPage, $sId, $aExtraParams = [])
 	{
 		$oContentBlock->AddSubBlock($this->GetDisplay($oPage, $sId, $aExtraParams));
 	}
 
-	public function Display(WebPage $oPage, $sId, $aExtraParams = array())
+	public function Display(WebPage $oPage, $sId, $aExtraParams = [])
 	{
 		$oPage->AddUiBlock($this->GetDisplay($oPage, $sId, $aExtraParams));
 	}
 
-	public function GetDisplay(WebPage $oPage, $sId, $aExtraParams = array()): UIContentBlock
+	public function GetDisplay(WebPage $oPage, $sId, $aExtraParams = []): UIContentBlock
 	{
 		$oHtml = new UIContentBlock($sId);
 
 		$oHtml->AddCSSClass("display_block");
 		$aExtraParams = array_merge($aExtraParams, $this->m_aParams);
 		$aExtraParams['currentId'] = $sId;
-		$sExtraParams = addslashes(str_replace('"', "'",
+		$sExtraParams = addslashes(str_replace(
-			json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
+			'"',
+			"'",
+			json_encode($aExtraParams)
+		)); // JSON encode, change the style of the quotes and escape them
 
 		if (isset($aExtraParams['query_params'])) {
 			$aQueryParams = $aExtraParams['query_params'];
@@ -549,9 +547,9 @@ class DisplayBlock
 				$sClass = $aExtraParams['this->class'];
 				$iKey = $aExtraParams['this->id'];
 				$oObj = MetaModel::GetObject($sClass, $iKey);
-				$aQueryParams = array('this->object()' => $oObj);
+				$aQueryParams = ['this->object()' => $oObj];
 			} else {
-				$aQueryParams = array();
+				$aQueryParams = [];
 			}
 		}
 
@@ -587,8 +585,7 @@ class DisplayBlock
 			 ');
 		}
 
-		if ($this->m_sStyle == static::ENUM_STYLE_LIST) // Search form need to extract result list extra data, the simplest way is to expose this configuration
+		if ($this->m_sStyle == static::ENUM_STYLE_LIST) { // Search form need to extract result list extra data, the simplest way is to expose this configuration
-		{
 			$listJsonExtraParams = json_encode(json_encode($aExtraParams));
 			$oPage->add_ready_script("
             $('#$sId').data('sExtraParams', ".$listJsonExtraParams.");
@@ -608,7 +605,7 @@ class DisplayBlock
 	 * @throws \DictExceptionMissingString
 	 * @throws \MySQLException
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		if (!isset($aExtraParams['currentId'])) {
 			$sId = utils::GetUniqueId(); // Works only if the page is not an Ajax one !
@@ -640,7 +637,7 @@ class DisplayBlock
 		$this->CheckParams($this->m_sStyle, $aExtraParams);
 		// Add the extra params into the filter if they make sense for such a filter
 		$bDoSearch = utils::ReadParam('dosearch', false);
-		$aQueryParams = array();
+		$aQueryParams = [];
 		if (isset($aExtraParams['query_params'])) {
 			$aQueryParams = $aExtraParams['query_params'];
 		} else {
@@ -648,7 +645,7 @@ class DisplayBlock
 				$sClass = $aExtraParams['this->class'];
 				$iKey = $aExtraParams['this->id'];
 				$oObj = MetaModel::GetObject($sClass, $iKey);
-				$aQueryParams = array('this->object()' => $oObj);
+				$aQueryParams = ['this->object()' => $oObj];
 			}
 		}
 		if ($this->m_oSet == null) {
@@ -658,7 +655,7 @@ class DisplayBlock
 				$oAppContext = new ApplicationContext();
 				$sClass = $this->m_oFilter->GetClass();
 				$aFilterCodes = MetaModel::GetFiltersList($sClass);
-				$aCallSpec = array($sClass, 'MapContextParam');
+				$aCallSpec = [$sClass, 'MapContextParam'];
 				if (is_callable($aCallSpec)) {
 					foreach ($oAppContext->GetNames() as $sContextParam) {
 						$sParamCode = call_user_func($aCallSpec, $sContextParam); //Map context parameter to the value/filter code depending on the class
@@ -693,11 +690,9 @@ class DisplayBlock
 						}
 					}
 
-					if (!is_null($condition))
+					if (!is_null($condition)) {
-					{
 						$sOpCode = null; // default operator
-						if (is_array($condition))
+						if (is_array($condition)) {
-						{
 							// Multiple values, add them as AND X IN (v1, v2, v3...)
 							$sOpCode = 'IN';
 						}
@@ -705,26 +700,22 @@ class DisplayBlock
 						$this->AddCondition($sFilterCode, $condition, $sOpCode, $bParseSearchString);
 					}
 				}
-				if ($bDoSearch)
+				if ($bDoSearch) {
-				{
 					// Keep the table_id identifying this table if we're performing a search
 					$sTableId = utils::ReadParam('_table_id_', null, false, utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
-					if ($sTableId != null)
+					if ($sTableId != null) {
-					{
 						$aExtraParams['table_id'] = $sTableId;
 					}
 				}
 			}
-			$aOrderBy = array();
+			$aOrderBy = [];
-			if (isset($aExtraParams['order_by']))
+			if (isset($aExtraParams['order_by'])) {
-			{
 				// Convert the string describing the order_by parameter into an array
 				// The syntax is +attCode1,-attCode2
 				// attCode1 => ascending, attCode2 => descending
 				$aTemp = explode(',', $aExtraParams['order_by']);
-				foreach($aTemp as $sTemp)
+				foreach ($aTemp as $sTemp) {
-				{
+					$aMatches = [];
-					$aMatches = array();
 					if (preg_match('/^([+-])?(.+)$/', $sTemp, $aMatches)) {
 						$bAscending = true;
 						if ($aMatches[1] == '-') {
@@ -740,7 +731,7 @@ class DisplayBlock
 		}
 		$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
 
-		switch($this->m_sStyle) {
+		switch ($this->m_sStyle) {
 			case static::ENUM_STYLE_LIST_SEARCH:
 			case static::ENUM_STYLE_LIST:
 				break;
@@ -801,43 +792,35 @@ class DisplayBlock
 				$sHtml .= Dict::format('UI:Error:UnsupportedStyleOfBlock', $this->m_sStyle);
 		}
 
-
 		$bAutoReload = false;
-		if (isset($aExtraParams['auto_reload']))
+		if (isset($aExtraParams['auto_reload'])) {
-		{
+			if ($aExtraParams['auto_reload'] === true) {
-			if ($aExtraParams['auto_reload'] === true)
-			{
 				// Note: does not work in the switch (case true) because a positive number evaluates to true!!!
 				$aExtraParams['auto_reload'] = 'standard';
 			}
-			switch($aExtraParams['auto_reload'])
+			switch ($aExtraParams['auto_reload']) {
-			{
 				case 'fast':
 					$bAutoReload = true;
-					$iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval()*1000;
+					$iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval() * 1000;
 					break;
 
 				case 'standard':
 				case 'true':
 					$bAutoReload = true;
-					$iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval()*1000;
+					$iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval() * 1000;
 					break;
 
 				default:
-					if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0))
+					if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0)) {
-					{
 						$bAutoReload = true;
-						$iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload'])*1000;
+						$iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload']) * 1000;
-					}
+					} else {
-					else
-					{
 						// incorrect config, ignore it
 						$bAutoReload = false;
 					}
 			}
 		}
-		if (($bAutoReload) && ($this->m_sStyle != static::ENUM_STYLE_SEARCH)) // Search form do NOT auto-reload
+		if (($bAutoReload) && ($this->m_sStyle != static::ENUM_STYLE_SEARCH)) { // Search form do NOT auto-reload
-		{
 			// Used either for asynchronous or auto_reload
 			// does a json_encode twice to get a string usable as function parameter
 			$sFilterBefore = $this->m_oFilter->serialize();
@@ -884,8 +867,7 @@ JS
 	{
 		// Workaround to an issue revealed whenever a condition on org_id is applied twice (with a hierarchy of organizations)
 		// Moreover, it keeps the query as simple as possible
-		if (isset($this->m_aConditions[$sFilterCode]) && $condition == $this->m_aConditions[$sFilterCode])
+		if (isset($this->m_aConditions[$sFilterCode]) && $condition == $this->m_aConditions[$sFilterCode]) {
-		{
 			// Skip
 			return;
 		}
@@ -895,51 +877,40 @@ JS
 		$bConditionAdded = false;
 
 		// If the condition is an external key with a class having a hierarchy, use a "below" criteria
-		if (MetaModel::IsValidAttCode($sClass, $sFilterCode))
+		if (MetaModel::IsValidAttCode($sClass, $sFilterCode)) {
-		{
 			$oAttDef = MetaModel::GetAttributeDef($sClass, $sFilterCode);
 
-			if ($oAttDef->IsExternalKey())
+			if ($oAttDef->IsExternalKey()) {
-			{
 				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
 
-				if ($sHierarchicalKeyCode !== false)
+				if ($sHierarchicalKeyCode !== false) {
-				{
 					$oFilter = new DBObjectSearch($oAttDef->GetTargetClass());
-					if (($sOpCode == 'IN') && is_array($condition))
+					if (($sOpCode == 'IN') && is_array($condition)) {
-					{
 						$oFilter->AddConditionExpression(self::GetConditionIN($oFilter, 'id', $condition));
-					}
+					} else {
-					else
-					{
 						$oFilter->AddCondition('id', $condition);
 					}
 					$oHKFilter = new DBObjectSearch($oAttDef->GetTargetClass());
 					$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
 					$this->m_oFilter->AddCondition_PointingTo($oHKFilter, $sFilterCode);
 					$bConditionAdded = true;
-				}
+				} elseif (($sOpCode == 'IN') && is_array($condition)) {
-				else if (($sOpCode == 'IN') && is_array($condition))
-				{
 					$this->m_oFilter->AddConditionExpression(self::GetConditionIN($this->m_oFilter, $sFilterCode, $condition));
 					$bConditionAdded = true;
 				}
-			}
+			} elseif (($sOpCode == 'IN') && is_array($condition)) {
-			else if (($sOpCode == 'IN') && is_array($condition))
-			{
 				$this->m_oFilter->AddConditionExpression(self::GetConditionIN($this->m_oFilter, $sFilterCode, $condition));
 				$bConditionAdded = true;
 			}
 		}
 
 		// In all other cases, just add the condition directly
-		if (!$bConditionAdded)
+		if (!$bConditionAdded) {
-		{
 			$this->m_oFilter->AddCondition($sFilterCode, $condition, null); // Use the default 'loose' operator
 		}
 	}
 
-	static protected function GetConditionIN($oFilter, $sFilterCode, $condition)
+	protected static function GetConditionIN($oFilter, $sFilterCode, $condition)
 	{
 		$oField = new FieldExpression($sFilterCode, $oFilter->GetClassAlias());
 		$sListExpr = '('.implode(', ', CMDBSource::Quote($condition)).')';
@@ -972,13 +943,10 @@ JS
 	protected function MakeGroupByQuery(&$aExtraParams, &$oGroupByExp, &$sGroupByLabel, &$aGroupBy, &$sAggregationFunction, &$sFctVar, &$sAggregationAttr, &$sSql)
 	{
 		$sAlias = $this->m_oFilter->GetClassAlias();
-		if (isset($aExtraParams['group_by_label']))
+		if (isset($aExtraParams['group_by_label'])) {
-		{
 			$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);
 			$sGroupByLabel = $aExtraParams['group_by_label'];
-		}
+		} else {
-		else
-		{
 			// Backward compatibility: group_by is simply a field id
 			$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
 			$sGroupByLabel = MetaModel::GetLabel($this->m_oFilter->GetClass(), $aExtraParams['group_by']);
@@ -986,61 +954,52 @@ JS
 
 		// Security filtering
 		$aFields = $oGroupByExp->ListRequiredFields();
-		foreach($aFields as $sFieldAlias)
+		foreach ($aFields as $sFieldAlias) {
-		{
+			$aMatches = [];
-			$aMatches = array();
+			if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches)) {
-			if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
-			{
 				$sFieldClass = $this->m_oFilter->GetClassName($aMatches[1]);
 				$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
-				if ($oAttDef instanceof AttributeOneWayPassword)
+				if ($oAttDef instanceof AttributeOneWayPassword) {
-				{
 					throw new Exception('Grouping on password fields is not supported.');
 				}
 			}
 		}
 
-		$aGroupBy = array();
+		$aGroupBy = [];
 		$aGroupBy['grouped_by_1'] = $oGroupByExp;
-		$aQueryParams = array();
+		$aQueryParams = [];
-		if (isset($aExtraParams['query_params']))
+		if (isset($aExtraParams['query_params'])) {
-		{
 			$aQueryParams = $aExtraParams['query_params'];
 		}
-		$aFunctions = array();
+		$aFunctions = [];
 		$sAggregationFunction = 'count';
 		$sFctVar = '_itop_count_';
 		$sAggregationAttr = '';
-		if (isset($aExtraParams['aggregation_function']) && !empty($aExtraParams['aggregation_attribute']))
+		if (isset($aExtraParams['aggregation_function']) && !empty($aExtraParams['aggregation_attribute'])) {
-		{
 			$sAggregationFunction = $aExtraParams['aggregation_function'];
 			$sAggregationAttr = $aExtraParams['aggregation_attribute'];
 			$oAttrExpr = Expression::FromOQL('`'.$sAlias.'`.`'.$sAggregationAttr.'`');
-			$oFctExpr = new FunctionExpression(strtoupper($sAggregationFunction), array($oAttrExpr));
+			$oFctExpr = new FunctionExpression(strtoupper($sAggregationFunction), [$oAttrExpr]);
 			$sFctVar = '_itop_'.$sAggregationFunction.'_';
-			$aFunctions = array($sFctVar => $oFctExpr);
+			$aFunctions = [$sFctVar => $oFctExpr];
 		}
 
-		if (!empty($sAggregationAttr))
+		if (!empty($sAggregationAttr)) {
-		{
 			$sClass = $this->m_oFilter->GetClass();
 			$sAggregationAttr = MetaModel::GetLabel($sClass, $sAggregationAttr);
 		}
 		$iLimit = 0;
-		if (isset($aExtraParams['limit']))
+		if (isset($aExtraParams['limit'])) {
-		{
 			$iLimit = intval($aExtraParams['limit']);
 		}
-		$aOrderBy = array();
+		$aOrderBy = [];
-		if (isset($aExtraParams['order_direction']) && isset($aExtraParams['order_by']))
+		if (isset($aExtraParams['order_direction']) && isset($aExtraParams['order_by'])) {
-		{
+			switch ($aExtraParams['order_by']) {
-			switch ($aExtraParams['order_by'])
-			{
 				case 'attribute':
-					$aOrderBy = array('grouped_by_1' => ($aExtraParams['order_direction'] === 'asc'));
+					$aOrderBy = ['grouped_by_1' => ($aExtraParams['order_direction'] === 'asc')];
 					break;
 				case 'function':
-					$aOrderBy = array($sFctVar => ($aExtraParams['order_direction'] === 'asc'));
+					$aOrderBy = [$sFctVar => ($aExtraParams['order_direction'] === 'asc')];
 					break;
 			}
 		}
@@ -1076,31 +1035,31 @@ JS
 					$this->AddCondition($sFilterCode, $sContextParamValue);
 				}
 			}
-			$aQueryParams = array();
+			$aQueryParams = [];
 			if (isset($aExtraParams['query_params'])) {
 				$aQueryParams = $aExtraParams['query_params'];
 			}
-			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, array(), $aQueryParams);
+			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, [], $aQueryParams);
 			$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
 		}
 
 		// Summary details
-		$aCounts = array();
+		$aCounts = [];
-		$aStateLabels = array();
+		$aStateLabels = [];
 		if (!empty($sStateAttrCode) && !empty($sStatesList)) {
 			$aStates = explode(',', $sStatesList);
 
 			// Generate one count + group by query [#1330]
 			$sClassAlias = $this->m_oFilter->GetClassAlias();
 			$oGroupByExpr = Expression::FromOQL($sClassAlias.'.'.$sStateAttrCode);
-			$aGroupBy = array('group1' => $oGroupByExpr);
+			$aGroupBy = ['group1' => $oGroupByExpr];
 			$oGroupBySearch = $this->m_oFilter->DeepClone();
 			if (isset($this->m_bShowObsoleteData)) {
 				$oGroupBySearch->SetShowObsoleteData($this->m_bShowObsoleteData);
 			}
 			$sCountGroupByQuery = $oGroupBySearch->MakeGroupByQuery($aQueryParams, $aGroupBy, false);
 			$aCountGroupByResults = CMDBSource::QueryToArray($sCountGroupByQuery);
-			$aCountsQueryResults = array();
+			$aCountsQueryResults = [];
 			foreach ($aCountGroupByResults as $aCountGroupBySingleResult) {
 				$aCountsQueryResults[$aCountGroupBySingleResult[0]] = $aCountGroupBySingleResult[1];
 			}
@@ -1114,7 +1073,8 @@ JS
 					: 0;
 
 				if ($aCounts[$sStateValue] == 0) {
-					$aCounts[$sStateValue] = ['link' => '-', 'label' => $aCounts[$sStateValue]];;
+					$aCounts[$sStateValue] = ['link' => '-', 'label' => $aCounts[$sStateValue]];
+					;
 				} else {
 					$oSingleGroupByValueFilter = $this->m_oFilter->DeepClone();
 					$oSingleGroupByValueFilter->AddCondition($sStateAttrCode, $sStateValue, '=');
@@ -1164,7 +1124,7 @@ JS
 			$oBlock->AddSubBlock($oPill);
 		}
 		$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
-		if(isset($aExtraParams['query_params']['this->object()'])){
+		if (isset($aExtraParams['query_params']['this->object()'])) {
 			$aExtraParams['query_params']['this->class'] = get_class($aExtraParams['query_params']['this->object()']);
 			$aExtraParams['query_params']['this->id'] = 	$aExtraParams['query_params']['this->object()']->GetKey();
 			unset($aExtraParams['query_params']['this->object()']);
@@ -1178,7 +1138,8 @@ JS
 					 $('#".$oBlock->GetId()."').html(data);
 					 $('#".$oBlock->GetId()."').unblock();
 					});
-				$('#".$oBlock->GetId()."').unblock();");
+				$('#".$oBlock->GetId()."').unblock();"
+		);
 
 		return $oBlock;
 	}
@@ -1220,11 +1181,11 @@ JS
 					$this->AddCondition($sFilterCode, $sContextParamValue);
 				}
 			}
-			$aQueryParams = array();
+			$aQueryParams = [];
 			if (isset($aExtraParams['query_params'])) {
 				$aQueryParams = $aExtraParams['query_params'];
 			}
-			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, array(), $aQueryParams);
+			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, [], $aQueryParams);
 			$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
 		}
 		$iCount = $this->m_oSet->Count();
@@ -1241,8 +1202,15 @@ JS
 		if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY)) {
 			$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.$oAppContext->GetForLink(true);
 			$sCreateActionLabel = Dict::Format('UI:Button:Create');
-			$oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, $sCreateActionUrl,
+			$oBlock = DashletFactory::MakeForDashletBadge(
-				$sCreateActionLabel, $aRefreshParams);
+				$sClassIconUrl,
+				$sHyperlink,
+				$iCount,
+				$sClassLabel,
+				$sCreateActionUrl,
+				$sCreateActionLabel,
+				$aRefreshParams
+			);
 		} else {
 			$oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, null, null, $aRefreshParams);
 		}
@@ -1272,9 +1240,9 @@ JS
 
 			$aRes = CMDBSource::QueryToArray($sSql);
 
-			$aGroupBy = array();
+			$aGroupBy = [];
-			$aLabels = array();
+			$aLabels = [];
-			$aValues = array();
+			$aValues = [];
 			$iTotalCount = 0;
 			foreach ($aRes as $iRow => $aRow) {
 				$sValue = $aRow['grouped_by_1'];
@@ -1285,7 +1253,7 @@ JS
 				$iTotalCount += $aRow['_itop_count_'];
 			}
 
-			$aData = array();
+			$aData = [];
 			$oAppContext = new ApplicationContext();
 			$sParams = $oAppContext->GetForLink(true);
 			foreach ($aGroupBy as $iRow => $iCount) {
@@ -1296,22 +1264,22 @@ JS
 				if (isset($aExtraParams['query_params'])) {
 					$aQueryParams = $aExtraParams['query_params'];
 				} else {
-					$aQueryParams = array();
+					$aQueryParams = [];
 				}
 				$sFilter = rawurlencode($oSubsetSearch->serialize(false, $aQueryParams));
 
-				$aData[] = array(
+				$aData[] = [
 					'group' => $aLabels[$iRow],
-					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1$sParams&filter=$sFilter\">$iCount</a>"
+					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1$sParams&filter=$sFilter\">$iCount</a>",
-				); // TO DO: add the context information
+				]; // TO DO: add the context information
 			}
-			$aAttribs = array(
+			$aAttribs = [
-				'group' => array('label' => $sGroupByLabel, 'description' => ''),
+				'group' => ['label' => $sGroupByLabel, 'description' => ''],
-				'value' => array(
+				'value' => [
 					'label' => Dict::S('UI:GroupBy:'.$sAggregationFunction),
 					'description' => Dict::Format('UI:GroupBy:'.$sAggregationFunction.'+', $sAggregationAttr),
-				),
+				],
-			);
+			];
 			$sFormat = isset($aExtraParams['format']) ? $aExtraParams['format'] : 'UI:Pagination:HeaderNoSelection';
 
 			$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
@@ -1322,7 +1290,7 @@ JS
 				$oBlock = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
 				$oBlock->AddSubTitleBlock(new Html($sTitle));
 				$oBlock->AddCSSClass('ibo-datatable-panel');
-				if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+				if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
 					$oBlock->SetIcon($aExtraParams["panel_icon"]);
 				}
 				$oDataTable = DataTableUIBlockFactory::MakeForStaticData("", $aAttribs, $aData, null, $aExtraParams, $this->m_oFilter->ToOQL(), $aOption);
@@ -1341,7 +1309,7 @@ JS
 			}
 			if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) {
 				$oBlock = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
-				if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+				if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
 					$oBlock->SetIcon($aExtraParams["panel_icon"]);
 				}
 				$oBlock->AddSubBlock(new Html('<p>'.Dict::Format($sFormat, $iCount).'</p>'));
@@ -1351,7 +1319,7 @@ JS
 		}
 
 		return $oBlock;
-}
+	}
 
 	/**
 	 * @param WebPage $oPage
@@ -1409,7 +1377,6 @@ JS
 		$oBlock->aExtraParams = $aExtraParams;
 		$oBlock->sFilter = $this->m_oFilter->ToOQL();
 
-
 		// Check the classes that can be read (i.e authorized) by this user...
 		foreach ($aClasses as $sAlias => $sClassName) {
 			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) != UR_ALLOWED_NO) {
@@ -1431,7 +1398,7 @@ JS
 			$sSearchFilter = $this->m_oSet->GetFilter()->serialize();
 			// Limit the size of the URL (N°1585 - request uri too long)
 			if (strlen($sSearchFilter) < SERVER_MAX_URL_LENGTH) {
-				$oBlock->sEventAttachedData = json_encode(array(
+				$oBlock->sEventAttachedData = json_encode([
 					'filter' => $sSearchFilter,
 					'breadcrumb_id' => "ui-search-".$this->m_oSet->GetClass(),
 					'breadcrumb_label' => MetaModel::GetName($this->m_oSet->GetClass()),
@@ -1439,7 +1406,7 @@ JS
 					'breadcrumb_instance_id' => MetaModel::GetConfig()->GetItopInstanceid(),
 					'breadcrumb_icon' => 'fas fa-search',
 					'breadcrumb_icon_type' => iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES,
-				));
+				]);
 			}
 		}
 
@@ -1472,25 +1439,25 @@ JS
 		$oContentBlock = new UIContentBlock();
 		$oHtml = new Html();
 		$oContentBlock->AddSubBlock($oHtml);
-		$aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : array();
+		$aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : [];
 		if (!isset($aExtraParams['group_by'])) {
 			$oHtml->AddHtml('<p>'.Dict::S('UI:Error:MandatoryTemplateParameter_group_by').'</p>');
 		} else {
-			$aGroupByFields = array();
+			$aGroupByFields = [];
 			$aGroupBy = explode(',', $aExtraParams['group_by']);
 			foreach ($aGroupBy as $sGroupBy) {
-				$aMatches = array();
+				$aMatches = [];
 				if (preg_match('/^(.+)\.(.+)$/', $sGroupBy, $aMatches) > 0) {
-					$aGroupByFields[] = array('alias' => $aMatches[1], 'att_code' => $aMatches[2]);
+					$aGroupByFields[] = ['alias' => $aMatches[1], 'att_code' => $aMatches[2]];
 				}
 			}
 			if (count($aGroupByFields) == 0) {
 				$oHtml->AddHtml('<p>'.Dict::Format('UI:Error:InvalidGroupByFields', $aExtraParams['group_by']).'</p>');
 			} else {
-				$aResults = array();
+				$aResults = [];
-				$aCriteria = array();
+				$aCriteria = [];
 				while ($aObjects = $this->m_oSet->FetchAssoc()) {
-					$aKeys = array();
+					$aKeys = [];
 					foreach ($aGroupByFields as $aField) {
 						$sAlias = $aField['alias'];
 						if (is_null($aObjects[$sAlias])) {
@@ -1507,7 +1474,7 @@ JS
 				$oHtml->AddHtml("<table>\n");
 				// Construct a new (parametric) query that will return the content of this block
 				$oBlockFilter = $this->m_oFilter->DeepClone();
-				$aExpressions = array();
+				$aExpressions = [];
 				$index = 0;
 				foreach ($aGroupByFields as $aField) {
 					$aExpressions[] = '`'.$aField['alias'].'`.`'.$aField['att_code'].'` = :param'.$index++;
@@ -1519,7 +1486,7 @@ JS
 				foreach ($aResults as $sCategory => $aObjects) {
 					$oHtml->AddHtml("<tr><td><h1>$sCategory</h1></td></tr>\n");
 					if (count($aDisplayAliases) == 1) {
-						$aSimpleArray = array();
+						$aSimpleArray = [];
 						foreach ($aObjects as $aRow) {
 							$oObj = $aRow[$aDisplayAliases[0]];
 							if (!is_null($oObj)) {
@@ -1535,12 +1502,12 @@ JS
 						$oHtml->AddHtml("</td></tr>\n");
 					} else {
 						$index = 0;
-						$aArgs = array();
+						$aArgs = [];
 						foreach ($aGroupByFields as $aField) {
 							$aArgs['param'.$index] = $aCriteria[$sCategory][$aField['alias'].'.'.$aField['att_code']];
 							$index++;
 						}
-						$oSet = new CMDBObjectSet($oBlockFilter, array(), $aArgs);
+						$oSet = new CMDBObjectSet($oBlockFilter, [], $aArgs);
 						if (empty($aExtraParams['currentId'])) {
 							$iListId = utils::GetUniqueId(); // Works only if not in an Ajax page !!
 						} else {
@@ -1603,7 +1570,7 @@ JS
 
 		if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) {
 			$oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
-			if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+			if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
 				$oPanel->SetIcon($aExtraParams["panel_icon"]);
 			}
 			$oPanel->AddSubBlock($oBlock);
@@ -1627,7 +1594,7 @@ JS
 	{
 		$sChartType = isset($aExtraParams['chart_type']) ? $aExtraParams['chart_type'] : 'pie';
 		$sId = utils::ReadParam('id', '');
-		$aValues = array();
+		$aValues = [];
 		$oBlock = null;
 		$sJSURLs = '';
 
@@ -1638,21 +1605,18 @@ JS
 			$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
 			$aRes = CMDBSource::QueryToArray($sSql);
 
-
-
 			$iTotalCount = 0;
-			$aURLs = array();
+			$aURLs = [];
 
 			foreach ($aRes as $iRow => $aRow) {
 				$sValue = $aRow['grouped_by_1'];
 				$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
 				$iTotalCount += $aRow['_itop_count_'];
-				$aValues[] = array(
+				$aValues[] = [
 					'label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'),
 					'label_html' => $sHtmlValue,
 					'value' => (float)$aRow[$sFctVar],
-				);
+				];
-
 
 				// Build the search for this subset
 				$oSubsetSearch = $this->m_oFilter->DeepClone();
@@ -1691,7 +1655,7 @@ JS
 				$aColumns = [];
 				$aNames = [];
 				foreach ($aValues as $idx => $aValue) {
-					$aColumns[] = array('series_'.$idx, (float)$aValue['value']);
+					$aColumns[] = ['series_'.$idx, (float)$aValue['value']];
 					$aNames['series_'.$idx] = $aValue['label'];
 				}
 
@@ -1713,7 +1677,7 @@ JS
 		}
 		if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) {
 			$oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
-			if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+			if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
 				$oPanel->SetIcon($aExtraParams["panel_icon"]);
 			}
 			$oPanel->AddSubBlock($oBlock);
@@ -1740,12 +1704,12 @@ JS
 		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
 		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
 		// Pass the parameters via POST, since expression may be very long
-		$aParamsToPost = array(
+		$aParamsToPost = [
 			'expression' => $this->m_oFilter->ToOQL(true),
 			'format' => 'csv',
 			'filename' => $oBlock->sCsvFile,
 			'charset' => 'UTF-8',
-		);
+		];
 		if ($oBlock->bAdvancedMode) {
 			$oBlock->sDownloadLink .= '&fields_advanced=1';
 			$aParamsToPost['fields_advanced'] = 1;
@@ -1804,8 +1768,7 @@ class MenuBlock extends DisplayBlock
 		$oRouter = Router::GetInstance();
 		$oRenderBlock = new UIContentBlock();
 
-		if ($this->m_sStyle == 'popup') // popup is a synonym of 'list' for backward compatibility
+		if ($this->m_sStyle == 'popup') { // popup is a synonym of 'list' for backward compatibility
-		{
 			$this->m_sStyle = static::ENUM_STYLE_LIST;
 		}
 
@@ -1813,7 +1776,7 @@ class MenuBlock extends DisplayBlock
 		$aSelectedClasses = $this->GetFilter()->GetSelectedClasses();
 		$bIsForLinkset = isset($aExtraParams['target_attr']);
 		$oSet = new CMDBObjectSet($this->GetFilter());
-		if(isset($aExtraParams['object_count'])){
+		if (isset($aExtraParams['object_count'])) {
 			$iSetCount = $aExtraParams['object_count'];
 		} else {
 			$iSetCount = $oSet->Count();
@@ -1844,7 +1807,6 @@ class MenuBlock extends DisplayBlock
 			$oAppContext = new ApplicationContext();
 			$sContext = $oAppContext->GetForLink(true);
 
-
 			$sFilter = $this->GetFilter()->serialize();
 			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
 			$sRootUrl = utils::GetAbsoluteUrlAppRoot();
@@ -1902,7 +1864,7 @@ class MenuBlock extends DisplayBlock
 			$iLimit = MetaModel::GetConfig()->Get('complex_actions_limit');
 			if (
 				($iSetCount > 0) && (false === $bLocked) && MetaModel::HasLifecycle($sClass) &&
-				( ($iLimit == 0) || ($iSetCount < $iLimit) )
+				(($iLimit == 0) || ($iSetCount < $iLimit))
 			) {
 				$aTransitions = [];
 				// Processing (optimizations) and endpoints are not exactly the same depending on if there is only 1 object or a set
@@ -1922,8 +1884,8 @@ class MenuBlock extends DisplayBlock
 					// Life cycle actions may be available... if all objects are in the same state
 					// Group by <state>
 					$oGroupByExp = new FieldExpression(MetaModel::GetStateAttributeCode($sClass), $this->m_oFilter->GetClassAlias());
-					$aGroupBy = array('__state__' => $oGroupByExp);
+					$aGroupBy = ['__state__' => $oGroupByExp];
-					$aQueryParams = array();
+					$aQueryParams = [];
 					if (isset($aExtraParams['query_params'])) {
 						$aQueryParams = $aExtraParams['query_params'];
 					}
@@ -1955,10 +1917,10 @@ class MenuBlock extends DisplayBlock
 						switch ($iActionAllowed) {
 							case UR_ALLOWED_YES:
 							case UR_ALLOWED_DEPENDS:
-								$aTransitionActions[$sStimulusCode] = array(
+								$aTransitionActions[$sStimulusCode] = [
 										'label' => $aStimuli[$sStimulusCode]->GetLabel(),
 										'url' => "{$sRootUrl}pages/UI.php?stimulus=$sStimulusCode&class=$sLifecycleClass&{$sUrlQueryString}",
-									) + $aActionParams;
+									] + $aActionParams;
 								break;
 
 							default:
@@ -2020,16 +1982,16 @@ class MenuBlock extends DisplayBlock
 							// Just one object in the set, possible actions are "new / clone / modify and delete"
 							if (!isset($aExtraParams['link_attr'])) {
 								if ($bIsModifyAllowed) {
-									$aRegularActions['UI:Menu:Modify'] = array(
+									$aRegularActions['UI:Menu:Modify'] = [
 											'label' => Dict::S('UI:Menu:Modify'),
-											'url'   => $oRouter->GenerateUrl('object.modify', ['class' => $sClass, 'id' => $id]) . "{$sContext}#",
+											'url'   => $oRouter->GenerateUrl('object.modify', ['class' => $sClass, 'id' => $id])."{$sContext}#",
-										) + $aActionParams;
+										] + $aActionParams;
 								}
 								if ($bIsDeleteAllowed) {
-									$aRegularActions['UI:Menu:Delete'] = array(
+									$aRegularActions['UI:Menu:Delete'] = [
 											'label' => Dict::S('UI:Menu:Delete'),
 											'url' => "{$sRootUrl}pages/$sUIPage?operation=delete&class=$sClass&id=$id{$sContext}",
-										) + $aActionParams;
+										] + $aActionParams;
 								}
 
 								// Relations...
@@ -2038,16 +2000,16 @@ class MenuBlock extends DisplayBlock
 									$this->AddMenuSeparator($aRegularActions);
 									foreach ($aRelations as $sRelationCode => $aRelationInfo) {
 										if (array_key_exists('down', $aRelationInfo)) {
-											$aRegularActions[$sRelationCode.'_down'] = array(
+											$aRegularActions['UI:Menu:'.$sRelationCode.'_down'] = [
 													'label' => $aRelationInfo['down'],
 													'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}",
-												) + $aActionParams;
+												] + $aActionParams;
 										}
 										if (array_key_exists('up', $aRelationInfo)) {
-											$aRegularActions[$sRelationCode.'_up'] = array(
+											$aRegularActions['UI:Menu:'.$sRelationCode.'_up'] = [
 													'label' => $aRelationInfo['up'],
 													'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}",
-												) + $aActionParams;
+												] + $aActionParams;
 										}
 									}
 								}
@@ -2059,7 +2021,7 @@ class MenuBlock extends DisplayBlock
 									$bCanKill = false;
 
 									$oUser = UserRights::GetUserObject();
-									$aUserProfiles = array();
+									$aUserProfiles = [];
 									if (!is_null($oUser)) {
 										$oProfileSet = $oUser->Get('profile_list');
 										while ($oProfile = $oProfileSet->Fetch()) {
@@ -2081,10 +2043,10 @@ class MenuBlock extends DisplayBlock
 
 									if ($bCanKill) {
 										$this->AddMenuSeparator($aRegularActions);
-										$aRegularActions['concurrent_lock_unlock'] = array(
+										$aRegularActions['concurrent_lock_unlock'] = [
 											'label' => Dict::S('UI:Menu:KillConcurrentLock'),
 											'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}",
-										);
+										];
 									}
 								}
 							}
@@ -2092,7 +2054,7 @@ class MenuBlock extends DisplayBlock
 							$this->AddMenuSeparator($aRegularActions);
 
 							$this->GetEnumAllowedActions($oSet, function ($sLabel, $data) use (&$aRegularActions, $aActionParams) {
-								$aRegularActions[$sLabel] = array('label' => $sLabel, 'url' => $data) + $aActionParams;
+								$aRegularActions[$sLabel] = ['label' => $sLabel, 'url' => $data] + $aActionParams;
 							});
 						}
 						break;
@@ -2289,6 +2251,16 @@ class MenuBlock extends DisplayBlock
 						$sIconClass = 'fas fa-file-pdf fa-lg';
 						$sLabel = '';
 						break;
+					case 'UI:Menu:impacts_up':
+						$sIconClass = 'fas fa-sitemap fa-rotate-180';
+						$sLabel = '';
+						$aAction['tooltip'] = Dict::S('Relation:impacts/UpStream');
+						break;
+					case 'UI:Menu:impacts_down':
+						$sIconClass = 'fas fa-sitemap';
+						$sLabel = '';
+						$aAction['tooltip'] = Dict::S('Relation:impacts/DownStream');
+						break;
 
 					default:
 						if (isset($aAction['icon_class']) && (strlen($aAction['icon_class']) > 0)) {
@@ -2299,7 +2271,7 @@ class MenuBlock extends DisplayBlock
 
 				$sTarget = isset($aAction['target']) ? $aAction['target'] : '';
 				if (!empty($aAction['onclick'])) {
-					$oActionButton = ButtonUIBlockFactory::MakeIconAction($sIconClass, $aAction['label'], $aAction['label'], $sLabel,false); //utils::Sanitize($sActionId.md5($aAction['onclick']), '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER))
+					$oActionButton = ButtonUIBlockFactory::MakeIconAction($sIconClass, $aAction['label'], $aAction['label'], $sLabel, false); //utils::Sanitize($sActionId.md5($aAction['onclick']), '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER))
 					$oActionButton->SetOnClickJsCode($aAction['onclick']);
 				} else {
 					$oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, utils::Sanitize($sActionId, '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER));
@@ -2458,13 +2430,11 @@ class MenuBlock extends DisplayBlock
 	protected function AddMenuSeparator(&$aActions)
 	{
 		$sSeparator = '<hr class="menu-separator"/>';
-		if (count($aActions) > 0) // Make sure that the separator is not the first item in the menu
+		if (count($aActions) > 0) { // Make sure that the separator is not the first item in the menu
-		{
 			$aKeys = array_keys($aActions);
 			$sLastKey = array_pop($aKeys);
-			if ($aActions[$sLastKey]['label'] != $sSeparator) // Make sure there are no 2 consecutive separators
+			if ($aActions[$sLastKey]['label'] != $sSeparator) { // Make sure there are no 2 consecutive separators
-			{
+				$aActions['sep_'.(count($aActions) - 1)] = ['label' => $sSeparator, 'url' => ''];
-				$aActions['sep_'.(count($aActions)-1)] = array('label' => $sSeparator, 'url' => '');
 			}
 		}
 	}
@@ -2524,10 +2494,10 @@ class MenuBlock extends DisplayBlock
 	 */
 	protected function AddBulkDeleteObjectsMenuAction(array &$aActions, string $sClass, string $sFilter, string $sActionIdentifier = 'UI:Menu:BulkDelete', $sActionLabel = 'UI:Menu:BulkDelete')
 	{
-		$aActions[$sActionIdentifier] = array(
+		$aActions[$sActionIdentifier] = [
 			'label' => Dict::S($sActionLabel),
 			'url' => $this->PrepareUrlForStandardMenuAction($sClass, "operation=select_for_deletion&filter=".urlencode($sFilter)),
-		) + $this->GetDefaultParamsForMenuAction();
+		] + $this->GetDefaultParamsForMenuAction();
 	}
 
 	/**
@@ -2564,6 +2534,6 @@ class MenuBlock extends DisplayBlock
 		$oAppContext = new ApplicationContext();
 		$sContext = $oAppContext->GetForLink(true);
 
-		return $sUrl . $sContext;
+		return $sUrl.$sContext;
 	}
 }

application/excelexporter.class.inc.php

@@ -22,31 +22,28 @@ class ExcelExporter
 
 	public function __construct($sToken = null)
 	{
-		$this->aStatistics = array(
+		$this->aStatistics = [
 			'objects_count' => 0,
 			'total_duration' => 0,
 			'data_retrieval_duration' => 0,
 			'excel_build_duration' => 0,
 			'excel_write_duration' => 0,
 			'peak_memory_usage' => 0,
-		);
+		];
 		$this->fStartTime = microtime(true);
 		$this->oSearch = null;
 
 		$this->sState = 'new';
-		$this->aObjectsIDs = array();
+		$this->aObjectsIDs = [];
 		$this->iPosition = 0;
 		$this->aAuthorizedClasses = null;
 		$this->aTableHeaders = null;
 		$this->sOutputFilePath = null;
 		$this->bAdvancedMode = false;
 		$this->CheckDataDir();
-		if ($sToken == null)
+		if ($sToken == null) {
-		{
 			$this->sToken = $this->GetNewToken();
-		}
+		} else {
-		else
-		{
 			$this->sToken = $sToken;
 			$this->ReloadState();
 		}
@@ -54,13 +51,10 @@ class ExcelExporter
 
 	public function __destruct()
 	{
-		if (($this->sState != 'done') && ($this->sState != 'error') && ($this->sToken != null))
+		if (($this->sState != 'done') && ($this->sState != 'error') && ($this->sToken != null)) {
-		{
 			// Operation in progress, save the state
 			$this->SaveState();
-		}
+		} else {
-		else
-		{
 			// Operation completed, cleanup the temp files
 			@unlink($this->GetStateFile());
 			@unlink($this->GetDataFile());
@@ -85,7 +79,7 @@ class ExcelExporter
 
 	public function SaveState()
 	{
-		$aState = array(
+		$aState = [
 			'state' => $this->sState,
 			'statistics' => $this->aStatistics,
 			'filter' => $this->oSearch->serialize(),
@@ -94,7 +88,7 @@ class ExcelExporter
 			'object_ids' => $this->aObjectsIDs,
 			'output_file_path' => $this->sOutputFilePath,
 			'advanced_mode' => $this->bAdvancedMode,
-		);
+		];
 
 		file_put_contents($this->GetStateFile(), json_encode($aState));
 
@@ -103,19 +97,16 @@ class ExcelExporter
 
 	public function ReloadState()
 	{
-		if ($this->sToken == null)
+		if ($this->sToken == null) {
-		{
 			throw new Exception('ExcelExporter not initialized with a token, cannot reload state');
 		}
 
-		if (!file_exists($this->GetStateFile()))
+		if (!file_exists($this->GetStateFile())) {
-		{
 			throw new Exception("ExcelExporter: missing status file '".$this->GetStateFile()."', cannot reload state.");
 		}
 		$sJson = file_get_contents($this->GetStateFile());
 		$aState = json_decode($sJson, true);
-		if ($aState === null)
+		if ($aState === null) {
-		{
 			throw new Exception("ExcelExporter:corrupted status file '".$this->GetStateFile()."', not a JSON, cannot reload state.");
 		}
 
@@ -141,16 +132,13 @@ class ExcelExporter
 		$sMessage = Dict::Format('ExcelExporter:ErrorUnexpected_State', $this->sState);
 		$fTime = microtime(true);
 
-		try
+		try {
-		{
+			switch ($this->sState) {
-			switch($this->sState)
-			{
 				case 'new':
 					$oIDSet = new DBObjectSet($this->oSearch);
-				$oIDSet->OptimizeColumnLoad(array('id'));
+					$oIDSet->OptimizeColumnLoad(['id']);
-				$this->aObjectsIDs = array();
+					$this->aObjectsIDs = [];
-				while($oObj = $oIDSet->Fetch())
+					while ($oObj = $oIDSet->Fetch()) {
-				{
 						$this->aObjectsIDs[] = $oObj->GetKey();
 					}
 					$sCode = 'retrieving-data';
@@ -164,8 +152,7 @@ class ExcelExporter
 					$this->GetFieldsList($oIDSet, $this->bAdvancedMode);
 					$sRow = json_encode($this->aTableHeaders);
 					$hFile = @fopen($this->GetDataFile(), 'ab');
-				if ($hFile === false)
+					if ($hFile === false) {
-				{
 						throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
 					}
 					fwrite($hFile, $sRow."\n");
@@ -181,32 +168,24 @@ class ExcelExporter
 
 					$oCurrentSearch->AddCondition('id', $aIDs, 'IN');
 					$hFile = @fopen($this->GetDataFile(), 'ab');
-				if ($hFile === false)
+					if ($hFile === false) {
-				{
 						throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
 					}
 					$oSet = new DBObjectSet($oCurrentSearch);
 					$this->GetFieldsList($oSet, $this->bAdvancedMode);
-				while($aObjects = $oSet->FetchAssoc())
+					while ($aObjects = $oSet->FetchAssoc()) {
-				{
+						$aRow = [];
-					$aRow = array();
+						foreach ($this->aAuthorizedClasses as $sAlias => $sClassName) {
-					foreach($this->aAuthorizedClasses as $sAlias => $sClassName)
-					{
 							$oObj = $aObjects[$sAlias];
-						if ($this->bAdvancedMode)
+							if ($this->bAdvancedMode) {
-						{
 								$aRow[] = $oObj->GetKey();
 							}
-						foreach($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef)
+							foreach ($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef) {
-						{
 								$value = $oObj->Get($sAttCodeEx);
-							if ($value instanceOf ormCaseLog)
+								if ($value instanceof ormCaseLog) {
-							{
 									// Extract the case log as text and remove the "===" which make Excel think that the cell contains a formula the next time you edit it!
 									$sExcelVal = trim(preg_replace('/========== ([^=]+) ============/', '********** $1 ************', $value->GetText()));
-							}
+								} else {
-							else
-							{
 									$sExcelVal =  $oAttDef->GetEditValue($value, $oObj);
 								}
 								$aRow[] = $sExcelVal;
@@ -217,16 +196,13 @@ class ExcelExporter
 					}
 					fclose($hFile);
 
-				if (($this->iPosition + $this->iChunkSize) > count($this->aObjectsIDs))
+					if (($this->iPosition + $this->iChunkSize) > count($this->aObjectsIDs)) {
-				{
 						// Next state
 						$this->sState = 'building-excel';
 						$sCode = 'building-excel';
 						$iPercentage = 80;
 						$sMessage = Dict::S('ExcelExporter:BuildingExcelFile');
-				}
+					} else {
-				else
-				{
 						$sCode = 'retrieving-data';
 						$this->iPosition += $this->iChunkSize;
 						$iPercentage = 5 + round(75 * ($this->iPosition / count($this->aObjectsIDs)));
@@ -236,16 +212,14 @@ class ExcelExporter
 
 				case 'building-excel':
 					$hFile = @fopen($this->GetDataFile(), 'rb');
-				if ($hFile === false)
+					if ($hFile === false) {
-				{
 						throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for reading.');
 					}
 					$sHeaders = fgets($hFile);
 					$aHeaders = json_decode($sHeaders, true);
 
-				$aData = array();
+					$aData = [];
-				while($sLine = fgets($hFile))
+					while ($sLine = fgets($hFile)) {
-				{
 						$aRow = json_decode($sLine);
 						$aData[] = $aRow;
 					}
@@ -255,7 +229,7 @@ class ExcelExporter
 					$fStartExcel = microtime(true);
 					$writer = new XLSXWriter();
 					$writer->setAuthor(UserRights::GetUserFriendlyName());
-				$writer->writeSheet($aData,'Sheet1', $aHeaders);
+					$writer->writeSheet($aData, 'Sheet1', $aHeaders);
 					$fExcelTime = microtime(true) - $fStartExcel;
 					$this->aStatistics['excel_build_duration'] = $fExcelTime;
 
@@ -278,35 +252,29 @@ class ExcelExporter
 					$sMessage = Dict::S('ExcelExporter:Done');
 					break;
 			}
-		}
+		} catch (Exception $e) {
-		catch(Exception $e)
-		{
 			$sCode = 'error';
 			$sMessage = $e->getMessage();
 		}
 
 		$this->aStatistics['total_duration'] += microtime(true) - $fTime;
 		$peak_memory = memory_get_peak_usage(true);
-		if ($peak_memory > $this->aStatistics['peak_memory_usage'])
+		if ($peak_memory > $this->aStatistics['peak_memory_usage']) {
-		{
 			$this->aStatistics['peak_memory_usage'] = $peak_memory;
 		}
 
-		return array(
+		return [
 			'code' => $sCode,
 			'message' => $sMessage,
 			'percentage' => $iPercentage,
-		);
+		];
 	}
 
 	public function GetExcelFilePath()
 	{
-		if ($this->sOutputFilePath == null)
+		if ($this->sOutputFilePath == null) {
-		{
 			return utils::GetDataPath().'bulk_export/'.$this->sToken.'.xlsx';
-		}
+		} else {
-		else
-		{
 			return $this->sOutputFilePath;
 		}
 	}
@@ -337,14 +305,11 @@ class ExcelExporter
 		$aFiles = glob(utils::GetDataPath().'bulk_export/*.*');
 		$iDelay = MetaModel::GetConfig()->Get('xlsx_exporter_cleanup_old_files_delay');
 
-		if($iDelay > 0)
+		if ($iDelay > 0) {
-		{
+			foreach ($aFiles as $sFile) {
-			foreach($aFiles as $sFile)
-			{
 				$iModificationTime = filemtime($sFile);
 
-				if($iModificationTime < (time() - $iDelay))
+				if ($iModificationTime < (time() - $iDelay)) {
-				{
 					// Temporary files older than one day are deleted
 					//echo "Supposed to delete: '".$sFile." (Unix Modification Time: $iModificationTime)'\n";
 					@unlink($sFile);
@@ -355,21 +320,18 @@ class ExcelExporter
 
 	public function DisplayStatistics(Page $oPage)
 	{
-		$aStats = array(
+		$aStats = [
 				'Number of objects exported' => $this->aStatistics['objects_count'],
 				'Total export duration' => sprintf('%.3f s', $this->aStatistics['total_duration']),
 				'Data retrieval duration' => sprintf('%.3f s', $this->aStatistics['data_retrieval_duration']),
 				'Excel build duration' => sprintf('%.3f s', $this->aStatistics['excel_build_duration']),
 				'Excel write duration' => sprintf('%.3f s', $this->aStatistics['excel_write_duration']),
 				'Peak memory usage' => self::HumanDisplay($this->aStatistics['peak_memory_usage']),
-		);
+		];
 
-		if ($oPage instanceof CLIPage)
+		if ($oPage instanceof CLIPage) {
-		{
 			$oPage->add($this->GetStatistics('text'));
-		}
+		} else {
-		else
-		{
 			$oPage->add($this->GetStatistics('html'));
 		}
 	}
@@ -377,29 +339,24 @@ class ExcelExporter
 	public function GetStatistics($sFormat = 'html')
 	{
 		$sStats = '';
-		$aStats = array(
+		$aStats = [
 				'Number of objects exported' => $this->aStatistics['objects_count'],
 				'Total export duration' => sprintf('%.3f s', $this->aStatistics['total_duration']),
 				'Data retrieval duration' => sprintf('%.3f s', $this->aStatistics['data_retrieval_duration']),
 				'Excel build duration' => sprintf('%.3f s', $this->aStatistics['excel_build_duration']),
 				'Excel write duration' => sprintf('%.3f s', $this->aStatistics['excel_write_duration']),
 				'Peak memory usage' => self::HumanDisplay($this->aStatistics['peak_memory_usage']),
-		);
+		];
 
-		if ($sFormat == 'text')
+		if ($sFormat == 'text') {
-		{
+			foreach ($aStats as $sLabel => $sValue) {
-			foreach($aStats as $sLabel => $sValue)
-			{
 				$sStats .= "+------------------------------+----------+\n";
 				$sStats .= sprintf("|%-30s|%10s|\n", $sLabel, $sValue);
 			}
 			$sStats .= "+------------------------------+----------+";
-		}
+		} else {
-		else
-		{
 			$sStats .= '<table><tbody>';
-			foreach($aStats as $sLabel => $sValue)
+			foreach ($aStats as $sLabel => $sValue) {
-			{
 				$sStats .= "<tr><td>$sLabel</td><td>$sValue</td></tr>";
 			}
 			$sStats .= '</tbody></table>';
@@ -410,27 +367,24 @@ class ExcelExporter
 
 	public static function HumanDisplay($iSize)
 	{
-		$aUnits = array('B','KB','MB','GB','TB','PB');
+		$aUnits = ['B','KB','MB','GB','TB','PB'];
-		return @round($iSize/pow(1024,($i=floor(log($iSize,1024)))),2).' '.$aUnits[$i];
+		return @round($iSize / pow(1024, ($i = floor(log($iSize, 1024)))), 2).' '.$aUnits[$i];
 	}
 
 	protected function CheckDataDir()
 	{
-		if(!is_dir(utils::GetDataPath()."bulk_export"))
+		if (!is_dir(utils::GetDataPath()."bulk_export")) {
-		{
 			@mkdir(utils::GetDataPath()."bulk_export", 0777, true /* recursive */);
 			clearstatcache();
 		}
-		if (!is_writable(utils::GetDataPath()."bulk_export"))
+		if (!is_writable(utils::GetDataPath()."bulk_export")) {
-		{
 			throw new Exception('Data directory "'.utils::GetDataPath().'bulk_export" could not be written.');
 		}
 	}
 
 	protected function GetStateFile($sToken = null)
 	{
-		if ($sToken == null)
+		if ($sToken == null) {
-		{
 			$sToken = $this->sToken;
 		}
 		return utils::GetDataPath()."bulk_export/$sToken.status";
@@ -444,14 +398,12 @@ class ExcelExporter
 	protected function GetNewToken()
 	{
 		$iNum = rand();
-		do
+		do {
-		{
 			$iNum++;
 			$sToken = sprintf("%08x", $iNum);
 			$sFileName = $this->GetStateFile($sToken);
 			$hFile = @fopen($sFileName, 'x');
-		}
+		} while ($hFile === false);
-		while($hFile === false);
 
 		fclose($hFile);
 		return $sToken;
@@ -459,82 +411,61 @@ class ExcelExporter
 
 	protected function GetFieldsList($oSet, $bFieldsAdvanced = false, $bLocalize = true, $aFields = null)
 	{
-		$this->aFieldsList = array();
+		$this->aFieldsList = [];
 
 		$oAppContext = new ApplicationContext();
 		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
-		$this->aAuthorizedClasses = array();
+		$this->aAuthorizedClasses = [];
-		foreach($aClasses as $sAlias => $sClassName)
+		foreach ($aClasses as $sAlias => $sClassName) {
-		{
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) {
-			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO)
-			{
 				$this->aAuthorizedClasses[$sAlias] = $sClassName;
 			}
 		}
-		$aAttribs = array();
+		$aAttribs = [];
-		$this->aTableHeaders = array();
+		$this->aTableHeaders = [];
-		foreach($this->aAuthorizedClasses as $sAlias => $sClassName)
+		foreach ($this->aAuthorizedClasses as $sAlias => $sClassName) {
-		{
+			$aList[$sAlias] = [];
-			$aList[$sAlias] = array();
 
-			foreach(MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef)
+			foreach (MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef) {
-			{
+				if (is_null($aFields) || (count($aFields) == 0)) {
-				if (is_null($aFields) || (count($aFields) == 0))
-				{
 					// Standard list of attributes (no link sets)
-					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField()))
+					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField())) {
-					{
 						$sAttCodeEx = $oAttDef->IsExternalField() ? $oAttDef->GetKeyAttCode().'->'.$oAttDef->GetExtAttCode() : $sAttCode;
 
-						if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
+						if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) {
-						{
+							if ($bFieldsAdvanced) {
-							if ($bFieldsAdvanced)
-							{
 								$aList[$sAlias][$sAttCodeEx] = $oAttDef;
 
-								if ($oAttDef->IsExternalKey(EXTKEY_RELATIVE))
+								if ($oAttDef->IsExternalKey(EXTKEY_RELATIVE)) {
-								{
 									$sRemoteClass = $oAttDef->GetTargetClass();
-									foreach(MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode)
+									foreach (MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode) {
-								  	{
 										$this->aFieldsList[$sAlias][$sAttCode.'->'.$sRemoteAttCode] = MetaModel::GetAttributeDef($sRemoteClass, $sRemoteAttCode);
 									}
 								}
 							}
-						}
+						} else {
-						else
-						{
 							// Any other attribute
 							$this->aFieldsList[$sAlias][$sAttCodeEx] = $oAttDef;
 						}
 					}
-				}
+				} else {
-				else
-				{
 					// User defined list of attributes
-					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields))
+					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields)) {
-					{
 						$this->aFieldsList[$sAlias][$sAttCode] = $oAttDef;
 					}
 				}
 			}
-			if ($bFieldsAdvanced)
+			if ($bFieldsAdvanced) {
-			{
 				$this->aTableHeaders['id'] = '0';
 			}
-			foreach($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef)
+			foreach ($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef) {
-			{
 				$sLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx, isset($aParams['showMandatoryFields'])) : $sAttCodeEx;
-				if($oAttDef instanceof AttributeDateTime)
+				if ($oAttDef instanceof AttributeDateTime) {
-				{
 					$this->aTableHeaders[$sLabel] = 'datetime';
-				}
+				} else {
-				else
-				{
 					$this->aTableHeaders[$sLabel] = 'string';
 				}
 			}
 		}
 	}
 }
-

application/exceptions/ApplicationException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/ArchivedObjectException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/BulkChangeException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/CSVParserException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/ConfigException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/CoreCannotSaveObjectException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -70,14 +71,13 @@ class CoreCannotSaveObjectException extends CoreException
 			$sContent .= $sIssue;
 		} else {
 			foreach ($this->aIssues as $sError) {
-                $sContent .= " " . $sError . ", ";
+				$sContent .= " ".$sError.", ";
 			}
 		}
 
 		return $sContent;
 	}
 
-
 	public function getIssues()
 	{
 		return $this->aIssues;

application/exceptions/CoreException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -35,10 +36,10 @@ class CoreException extends Exception
 		}
 		if (count($this->m_aContextData) > 0) {
 			$sMessage .= ": ";
-			$aContextItems = array();
+			$aContextItems = [];
 			foreach ($this->m_aContextData as $sKey => $value) {
 				if (is_array($value)) {
-					$aPairs = array();
+					$aPairs = [];
 					foreach ($value as $key => $val) {
 						if (is_array($val)) {
 							$aPairs[] = $key.'=>('.implode(', ', $val).')';

application/exceptions/CorePortalInvalidActionRuleException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -9,5 +10,4 @@
  */
 class CorePortalInvalidActionRuleException extends CoreException
 {
-
 }

application/exceptions/CoreTemplateException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/CoreUnexpectedValue.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/CoreWarning.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/DeleteException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/InvalidConfigParamException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/InvalidExternalKeyValueException.php

@@ -12,13 +12,13 @@ class InvalidExternalKeyValueException extends CoreUnexpectedValue
 
 	public function __construct($oObject, $sAttCode, $aContextData = null, $oPrevious = null)
 	{
-		$aContextData[self::ENUM_PARAMS_OBJECT] = get_class($oObject) . '::' . $oObject->GetKey();
+		$aContextData[self::ENUM_PARAMS_OBJECT] = get_class($oObject).'::'.$oObject->GetKey();
 		$aContextData[self::ENUM_PARAMS_ATTCODE] = $sAttCode;
 		$aContextData[self::ENUM_PARAMS_ATTVALUE] = $oObject->Get($sAttCode);
 
 		$oCurrentUser = UserRights::GetUserObject();
 		if (false === is_null($oCurrentUser)) {
-			$aContextData[self::ENUM_PARAMS_USER] = get_class($oCurrentUser) . '::' . $oCurrentUser->GetKey();
+			$aContextData[self::ENUM_PARAMS_USER] = get_class($oCurrentUser).'::'.$oCurrentUser->GetKey();
 		}
 
 		parent::__construct('Attribute pointing to an object that is either non existing or not readable by the current user', $aContextData, '', $oPrevious);

application/exceptions/InvalidPasswordAttributeOneWayPassword.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/PageNotFoundException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/SecurityException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/SynchroExceptionNotStarted.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/UserRightException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/dict/DictException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/dict/DictExceptionMissingString.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -8,7 +9,7 @@ class DictExceptionMissingString extends DictException
 {
 	public function __construct($sLanguageCode, $sStringCode)
 	{
-		$aContext = array();
+		$aContext = [];
 		$aContext['language_code'] = $sLanguageCode;
 		$aContext['string_code'] = $sStringCode;
 		parent::__construct('Missing localized string', $aContext);

application/exceptions/dict/DictExceptionUnknownLanguage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -8,7 +9,7 @@ class DictExceptionUnknownLanguage extends DictException
 {
 	public function __construct($sLanguageCode)
 	{
-		$aContext = array();
+		$aContext = [];
 		$aContext['language_code'] = $sLanguageCode;
 		parent::__construct('Unknown localization language', $aContext);
 	}

application/exceptions/iTopXmlException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -6,5 +7,4 @@
 
 class iTopXmlException extends CoreException
 {
-
 }

application/exceptions/mysql/MySQLException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -20,7 +21,7 @@ class MySQLException extends CoreException
 			$aContext['mysql_errno'] = $oException->getCode();
 			$this->code = $oException->getCode();
 			$aContext['mysql_error'] = $oException->getMessage();
-		} else if ($oMysqli != null) {
+		} elseif ($oMysqli != null) {
 			$aContext['mysql_errno'] = $oMysqli->errno;
 			$this->code = $oMysqli->errno;
 			$aContext['mysql_error'] = $oMysqli->error;

application/exceptions/mysql/MySQLHasGoneAwayException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -19,10 +20,10 @@ class MySQLHasGoneAwayException extends MySQLException
 	 */
 	public static function getErrorCodes()
 	{
-		return array(
+		return [
 			2006,
 			2013,
-		);
+		];
 	}
 
 	public function __construct($sIssue, $aContext)

application/exceptions/mysql/MySQLNoTransactionException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -9,5 +10,4 @@
  */
 class MySQLNoTransactionException extends MySQLException
 {
-
 }

application/exceptions/mysql/MySQLQueryHasNoResultException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -11,5 +12,4 @@
  */
 class MySQLQueryHasNoResultException extends MySQLException
 {
-
 }

application/exceptions/mysql/MySQLTransactionNotClosedException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -9,5 +10,4 @@
  */
 class MySQLTransactionNotClosedException extends MySQLException
 {
-
 }

application/exceptions/oql/CoreOqlException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -9,5 +10,4 @@
  */
 class CoreOqlException extends CoreException
 {
-
 }

application/exceptions/oql/CoreOqlMultipleResultsForbiddenException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -9,5 +10,4 @@
  */
 class CoreOqlMultipleResultsForbiddenException extends CoreOqlException
 {
-
 }

application/exceptions/process/ProcessException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/process/ProcessFatalException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/exceptions/process/ProcessInvalidConfigException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0

application/findstylesheetobject.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2024 Combodo SAS
  *
@@ -22,8 +23,8 @@
  * @author Olivier DAIN <olivier.dain@combodo.com>
  * @since 3.0.0 N°3588
  */
-class FindStylesheetObject{
+class FindStylesheetObject
-
+{
 	//file URIs
 	private $aStylesheetFileURIs;
 
@@ -64,7 +65,7 @@ class FindStylesheetObject{
 		return $this->aStylesheetFileURIs;
 	}
 
-	public function GetLastModified() : int
+	public function GetLastModified(): int
 	{
 		return $this->iLastModified;
 	}
@@ -92,7 +93,8 @@ class FindStylesheetObject{
 		$this->sLastStyleSheetPath = $sStylesheetFilePath;
 	}
 
-	public function AlreadyFetched(string $sStylesheetFilePath) : bool {
+	public function AlreadyFetched(string $sStylesheetFilePath): bool
+	{
 		return in_array($sStylesheetFilePath, $this->aAllStylesheetFilePaths);
 	}
 

application/iotask.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -16,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * Persistent class InputOutputTask
  *
@@ -34,36 +34,37 @@ class InputOutputTask extends cmdbAbstractObject
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category"            => "application",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "name",
 			"state_attcode"       => "",
-			"reconc_keys"         => array(),
+			"reconc_keys"         => [],
 			"db_table"            => "priv_iotask",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
-		);
+		];
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", ["allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", ["allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values" => new ValueSetEnum('Input, Ouput'), "sql" => "category", "default_value" => "Input", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("category", ["allowed_values" => new ValueSetEnum('Input, Ouput'), "sql" => "category", "default_value" => "Input", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values" => new ValueSetEnum('File, Database, Web Service'), "sql" => "source_type", "default_value" => "File", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", ["allowed_values" => new ValueSetEnum('File, Database, Web Service'), "sql" => "source_type", "default_value" => "File", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype",
+		MetaModel::Init_AddAttribute(new AttributeEnum(
-			array("allowed_values" => new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql" => "source_subtype", "default_value" => "CSV", "is_null_allowed" => false, "depends_on" => array())));
+			"source_subtype",
-		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values" => null, "sql" => "source_path", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+			["allowed_values" => new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql" => "source_subtype", "default_value" => "CSV", "is_null_allowed" => false, "depends_on" => []]
-		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category" => "", "more_values" => "", "sql" => "objects_class", "default_value" => null, "is_null_allowed" => true, "depends_on" => array(), "class_exclusion_list" => null)));
+		));
-		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "test_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("source_path", ["allowed_values" => null, "sql" => "source_path", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "verbose_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", ["class_category" => "", "more_values" => "", "sql" => "objects_class", "default_value" => null, "is_null_allowed" => true, "depends_on" => [], "class_exclusion_list" => null]));
-		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values" => new ValueSetEnum('Full, Update Only, Creation Only'), "sql" => "options", "default_value" => 'Full', "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", ["allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "test_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", ["allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "verbose_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeEnum("options", ["allowed_values" => new ValueSetEnum('Full, Update Only, Creation Only'), "sql" => "options", "default_value" => 'Full', "is_null_allowed" => true, "depends_on" => []]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path', 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path', 'options', 'test_mode', 'verbose_mode']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options']); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['name', 'category', 'objects_class', 'source_type', 'source_subtype']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('advanced_search', ['name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype']); // Criteria of the advanced search form
 	}
 }
-?>

application/loginbasic.class.inc.php

@@ -18,23 +18,17 @@ class LoginBasic extends AbstractLoginFSMExtension
 	 */
 	public function ListSupportedLoginModes()
 	{
-		return array('basic');
+		return ['basic'];
 	}
 
 	protected function OnModeDetection(&$iErrorCode)
 	{
-		if (!Session::IsSet('login_mode'))
+		if (!Session::IsSet('login_mode')) {
-		{
+			if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
-			if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
-			{
 				Session::Set('login_mode', 'basic');
-			}
+			} elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-			elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']))
-			{
 				Session::Set('login_mode', 'basic');
-			}
+			} elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-			elseif (isset($_SERVER['PHP_AUTH_USER']))
-			{
 				Session::Set('login_mode', 'basic');
 			}
 		}
@@ -43,22 +37,18 @@ class LoginBasic extends AbstractLoginFSMExtension
 
 	protected function OnReadCredentials(&$iErrorCode)
 	{
-		if (!Session::IsSet('login_mode') || Session::Get('login_mode') == 'basic')
+		if (!Session::IsSet('login_mode') || Session::Get('login_mode') == 'basic') {
-		{
 			list($sAuthUser) = $this->GetAuthUserAndPassword();
 			Session::Set('login_temp_auth_user', $sAuthUser);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
-
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'basic')
+		if (Session::Get('login_mode') == 'basic') {
-		{
 			list($sAuthUser, $sAuthPwd) = $this->GetAuthUserAndPassword();
-			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
+			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal')) {
-			{
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
@@ -69,8 +59,7 @@ class LoginBasic extends AbstractLoginFSMExtension
 
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'basic')
+		if (Session::Get('login_mode') == 'basic') {
-		{
 			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -78,11 +67,9 @@ class LoginBasic extends AbstractLoginFSMExtension
 
 	protected function OnError(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'basic')
+		if (Session::Get('login_mode') == 'basic') {
-		{
 			$iOnExit = LoginWebPage::getIOnExit();
-            if ($iOnExit === LoginWebPage::EXIT_RETURN)
+			if ($iOnExit === LoginWebPage::EXIT_RETURN) {
-            {
 				return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
 			}
 			LoginWebPage::HTTP401Error();
@@ -92,8 +79,7 @@ class LoginBasic extends AbstractLoginFSMExtension
 
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'basic')
+		if (Session::Get('login_mode') == 'basic') {
-		{
 			Session::Set('can_logoff', true);
 			return LoginWebPage::CheckLoggedUser($iErrorCode);
 		}
@@ -105,42 +91,33 @@ class LoginBasic extends AbstractLoginFSMExtension
 		$sAuthUser = '';
 		$sAuthPwd = null;
 		$sAuthorization = '';
-		if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
+		if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
-		{
 			$sAuthorization = $_SERVER['HTTP_AUTHORIZATION'];
-		}
+		} elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-		elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']))
-		{
 			$sAuthorization = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
 		}
 
-		if (!empty($sAuthorization))
+		if (!empty($sAuthorization)) {
-		{
 			list($sAuthUser, $sAuthPwd) = explode(':', base64_decode(substr($sAuthorization, 6)));
-		}
+		} else {
-		else
+			if (isset($_SERVER['PHP_AUTH_USER'])) {
-		{
-			if (isset($_SERVER['PHP_AUTH_USER']))
-			{
 				$sAuthUser = $_SERVER['PHP_AUTH_USER'];
 				// Unfortunately, the RFC is not clear about the encoding...
 				// IE and FF supply the user and password encoded in ISO-8859-1 whereas Chrome provides them encoded in UTF-8
 				// So let's try to guess if it's an UTF-8 string or not... fortunately all encodings share the same ASCII base
-				if (!LoginWebPage::LooksLikeUTF8($sAuthUser))
+				if (!LoginWebPage::LooksLikeUTF8($sAuthUser)) {
-				{
 					// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
 					// Supposed to be harmless in case of a plain ASCII string...
 					$sAuthUser = iconv('iso-8859-1', 'utf-8', $sAuthUser);
 				}
 				$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
-				if (!LoginWebPage::LooksLikeUTF8($sAuthPwd))
+				if (!LoginWebPage::LooksLikeUTF8($sAuthPwd)) {
-				{
 					// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
 					// Supposed to be harmless in case of a plain ASCII string...
 					$sAuthPwd = iconv('iso-8859-1', 'utf-8', $sAuthPwd);
 				}
 			}
 		}
-		return array($sAuthUser, $sAuthPwd);
+		return [$sAuthUser, $sAuthPwd];
 	}
 }

application/logindefault.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -18,7 +19,7 @@ class LoginDefaultBefore extends AbstractLoginFSMExtension
 	 */
 	public function ListSupportedLoginModes()
 	{
-		return array('before');
+		return ['before'];
 	}
 
 	protected function OnStart(&$iErrorCode)
@@ -31,13 +32,10 @@ class LoginDefaultBefore extends AbstractLoginFSMExtension
 		$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
 		$sProposedLoginMode = utils::ReadParam('login_mode', '');
 		$index = array_search($sProposedLoginMode, $aAllowedLoginTypes);
-		if ($index !== false)
+		if ($index !== false) {
-		{
 			// Force login mode
 			Session::Set('login_mode', $sProposedLoginMode);
-		}
+		} else {
-		else
-		{
 			Session::Unset('login_mode');
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -49,8 +47,7 @@ class LoginDefaultBefore extends AbstractLoginFSMExtension
 		$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
 		$sProposedLoginMode = utils::ReadParam('login_mode', '');
 		$index = array_search($sProposedLoginMode, $aAllowedLoginTypes);
-		if ($index !== false)
+		if ($index !== false) {
-		{
 			// Force login mode
 			LoginWebPage::SetLoginModeAndReload($sProposedLoginMode);
 		} else {
@@ -69,8 +66,6 @@ class LoginDefaultBefore extends AbstractLoginFSMExtension
  */
 class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExtension
 {
-
-
 	/**
 	 * Must be executed after the other login plugins
 	 *
@@ -78,19 +73,16 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	 */
 	public function ListSupportedLoginModes()
 	{
-		return array('after');
+		return ['after'];
 	}
 
 	protected function OnError(&$iErrorCode)
 	{
 		self::ResetLoginSession();
 		$iOnExit = LoginWebPage::getIOnExit();
-		if ($iOnExit === LoginWebPage::EXIT_RETURN)
+		if ($iOnExit === LoginWebPage::EXIT_RETURN) {
-		{
 			return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
-		}
+		} elseif ($iOnExit == LoginWebPage::EXIT_HTTP_401) {
-		elseif ($iOnExit == LoginWebPage::EXIT_HTTP_401)
-		{
 			LoginWebPage::HTTP401Error(); // Error, exit
 		}
 		// LoginWebPage::EXIT_PROMPT
@@ -99,8 +91,7 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 
 	protected function OnCredentialsOk(&$iErrorCode)
 	{
-		if (!Session::IsSet('login_mode'))
+		if (!Session::IsSet('login_mode')) {
-		{
 			// N°6358 - if EXIT_RETURN was asked, send an error
 			if (LoginWebPage::getIOnExit() === LoginWebPage::EXIT_RETURN) {
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
@@ -125,7 +116,7 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	protected function OnConnected(&$iErrorCode)
 	{
 		Session::Unset('login_temp_auth_user');
-		if (is_null(UserRights::GetUserObject())){
+		if (is_null(UserRights::GetUserObject())) {
 			//N°7085 avoid infinite loop
 			IssueLog::Error("No user logged in. exit");
 			exit(-1);
@@ -137,10 +128,8 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	private static function ResetLoginSession()
 	{
 		LoginWebPage::ResetSession();
-		foreach (Session::ListVariables() as $sKey)
+		foreach (Session::ListVariables() as $sKey) {
-		{
+			if (utils::StartsWith($sKey, 'login_')) {
-			if (utils::StartsWith($sKey, 'login_'))
-			{
 				Session::Unset($sKey);
 			}
 		}

application/loginexternal.class.inc.php

@@ -11,7 +11,6 @@ use Combodo\iTop\Application\Helper\Session;
 
 class LoginExternal extends AbstractLoginFSMExtension
 {
-
 	/**
 	 * Return the list of supported login modes for this plugin
 	 *
@@ -19,16 +18,14 @@ class LoginExternal extends AbstractLoginFSMExtension
 	 */
 	public function ListSupportedLoginModes()
 	{
-		return array('external');
+		return ['external'];
 	}
 
 	protected function OnModeDetection(&$iErrorCode)
 	{
-		if (!Session::IsSet('login_mode'))
+		if (!Session::IsSet('login_mode')) {
-		{
 			$sAuthUser = $this->GetAuthUser();
-			if ($sAuthUser && (strlen($sAuthUser) > 0))
+			if ($sAuthUser && (strlen($sAuthUser) > 0)) {
-			{
 				Session::Set('login_mode', 'external');
 			}
 		}
@@ -37,11 +34,9 @@ class LoginExternal extends AbstractLoginFSMExtension
 
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'external')
+		if (Session::Get('login_mode') == 'external') {
-		{
 			$sAuthUser = $this->GetAuthUser();
-			if (!UserRights::CheckCredentials($sAuthUser, '', Session::Get('login_mode'), 'external'))
+			if (!UserRights::CheckCredentials($sAuthUser, '', Session::Get('login_mode'), 'external')) {
-			{
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
@@ -52,8 +47,7 @@ class LoginExternal extends AbstractLoginFSMExtension
 
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'external')
+		if (Session::Get('login_mode') == 'external') {
-		{
 			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'external', Session::Get('login_mode'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -61,8 +55,7 @@ class LoginExternal extends AbstractLoginFSMExtension
 
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'external')
+		if (Session::Get('login_mode') == 'external') {
-		{
 			Session::Set('can_logoff', false);
 			return LoginWebPage::CheckLoggedUser($iErrorCode);
 		}
@@ -71,11 +64,9 @@ class LoginExternal extends AbstractLoginFSMExtension
 
 	protected function OnError(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'external')
+		if (Session::Get('login_mode') == 'external') {
-		{
 			$iOnExit = LoginWebPage::getIOnExit();
-            if ($iOnExit === LoginWebPage::EXIT_RETURN)
+			if ($iOnExit === LoginWebPage::EXIT_RETURN) {
-            {
 				return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
 			}
 			LoginWebPage::HTTP401Error();

application/loginform.class.inc.php

@@ -23,7 +23,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	public function ListSupportedLoginModes()
 	{
-		return array('form');
+		return ['form'];
 	}
 
 	/**
@@ -34,10 +34,8 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 		if (!Session::IsSet('login_mode') || Session::Get('login_mode') == 'form') {
 			$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
 			$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
-			if ($this->bForceFormOnError || empty($sAuthUser) || empty($sAuthPwd))
+			if ($this->bForceFormOnError || empty($sAuthUser) || empty($sAuthPwd)) {
-			{
+				if (array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER)) {
-				if (array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER))
-				{
 					// X-Combodo-Ajax is a special header automatically added to all ajax requests
 					// Let's reply that we're currently logged-out
 					header('HTTP/1.0 401 Unauthorized');
@@ -66,12 +64,10 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'form')
+		if (Session::Get('login_mode') == 'form') {
-		{
 			$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
 			$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
-			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
+			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal')) {
-			{
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
@@ -85,8 +81,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'form')
+		if (Session::Get('login_mode') == 'form') {
-		{
 			// Store 'auth_user' in session for further use
 			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode'));
 		}
@@ -98,8 +93,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnError(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'form')
+		if (Session::Get('login_mode') == 'form') {
-		{
 			$this->bForceFormOnError = true;
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -110,8 +104,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'form')
+		if (Session::Get('login_mode') == 'form') {
-		{
 			Session::Set('can_logoff', true);
 			return LoginWebPage::CheckLoggedUser($iErrorCode);
 		}
@@ -131,24 +124,23 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
 		$sAuthPwd = utils::ReadParam('suggest_pwd', '', true, 'raw_data');
 
-		$aData = array(
+		$aData = [
 			'sAuthUser' => $sAuthUser,
 			'sAuthPwd' => $sAuthPwd,
-		);
+		];
 		$oLoginContext->AddBlockExtension('login_input', new LoginBlockExtension('extensionblock/loginforminput.html.twig', $aData));
 		$oLoginContext->AddBlockExtension('login_submit', new LoginBlockExtension('extensionblock/loginformsubmit.html.twig'));
 		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('extensionblock/loginformfooter.html.twig'));
 
 		$bEnableResetPassword = MetaModel::GetConfig()->Get('forgot_password');
 		$sResetPasswordUrl = MetaModel::GetConfig()->Get('forgot_password.url');
-		if ($sResetPasswordUrl == '')
+		if ($sResetPasswordUrl == '') {
-		{
+			$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=forgot_pwd';
-			$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
 		}
-		$aData = array(
+		$aData = [
 			'bEnableResetPassword' => $bEnableResetPassword,
 			'sResetPasswordUrl' => $sResetPasswordUrl,
-		);
+		];
 		$oLoginContext->AddBlockExtension('login_links', new LoginBlockExtension('extensionblock/loginformlinks.html.twig', $aData));
 
 		return $oLoginContext;

application/logintwig.class.inc.php

@@ -6,7 +6,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\TwigBase\Twig\Extension;
 use Combodo\iTop\Application\WebPage\NiceWebPage;
@@ -41,11 +40,11 @@ class LoginTwigContext
 	 */
 	public function __construct()
 	{
-		$this->aBlockExtension = array();
+		$this->aBlockExtension = [];
-		$this->aPostedVars = array();
+		$this->aPostedVars = [];
 		$this->sTwigLoaderPath = null;
-		$this->aCSSFiles = array();
+		$this->aCSSFiles = [];
-		$this->aJsFiles = array();
+		$this->aJsFiles = [];
 		$this->sTwigNameSpace = null;
 	}
 
@@ -179,7 +178,7 @@ class LoginBlockExtension
 	 * @param array $aData Data given to the twig template (into the variable {{ aData }})
 	 * @api
 	 */
-	public function __construct($sTwig, $aData = array())
+	public function __construct($sTwig, $aData = [])
 	{
 		$this->sTwig = $sTwig;
 		$this->aData = $aData;
@@ -210,21 +209,18 @@ class LoginTwigRenderer
 	public function __construct()
 	{
 		$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginUIExtension', false);
-		$this->aPluginFormData = array();
+		$this->aPluginFormData = [];
-		$aTwigLoaders = array();
+		$aTwigLoaders = [];
-		$this->aPostedVars = array();
+		$this->aPostedVars = [];
-		foreach ($this->aLoginPluginList as $oLoginPlugin)
+		foreach ($this->aLoginPluginList as $oLoginPlugin) {
-		{
 			/** @var \iLoginUIExtension $oLoginPlugin */
 			$oLoginContext = $oLoginPlugin->GetTwigContext();
-			if (is_null($oLoginContext))
+			if (is_null($oLoginContext)) {
-			{
 				continue;
 			}
 			$this->aPluginFormData[] = $oLoginContext;
 			$sTwigLoaderPath = $oLoginContext->GetTwigLoaderPath();
-			if ($sTwigLoaderPath != null)
+			if ($sTwigLoaderPath != null) {
-			{
 				$oExtensionLoader = new FilesystemLoader();
 				$oExtensionLoader->setPaths($sTwigLoaderPath);
 				$aTwigLoaders[] = $oExtensionLoader;
@@ -232,8 +228,8 @@ class LoginTwigRenderer
 			$this->aPostedVars = array_merge($this->aPostedVars, $oLoginContext->GetPostedVars());
 		}
 
-		$oCoreLoader = new FilesystemLoader(array(), APPROOT.'templates');
+		$oCoreLoader = new FilesystemLoader([], APPROOT.'templates');
-		$aCoreTemplatesPaths = array('pages/login', 'pages/login/password');
+		$aCoreTemplatesPaths = ['pages/login', 'pages/login/password'];
 		// Having this path declared after the plugins let the plugins replace the core templates
 		$oCoreLoader->setPaths($aCoreTemplatesPaths);
 		// Having the core templates accessible within a different namespace offer the possibility to extend them while replacing them
@@ -251,19 +247,19 @@ class LoginTwigRenderer
 		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
 		$sDisplayIcon = Branding::GetLoginLogoAbsoluteUrl();
 
-		$aVars = array(
+		$aVars = [
 			'sAppRootUrl' => utils::GetAbsoluteUrlAppRoot(),
 			'aPluginFormData' => $this->GetPluginFormData(),
 			'sItopVersion' => ITOP_VERSION,
 			'sVersionShort' => $sVersionShort,
 			'sIconUrl' => $sIconUrl,
 			'sDisplayIcon' => $sDisplayIcon,
-		);
+		];
 
 		return $aVars;
 	}
 
-	public function Render(NiceWebPage $oPage, $sTwigFile, $aVars = array())
+	public function Render(NiceWebPage $oPage, $sTwigFile, $aVars = [])
 	{
 		$oTemplate = $this->GetTwig()->load($sTwigFile);
 		$oPage->add($oTemplate->renderBlock('body', $aVars));
@@ -272,17 +268,14 @@ class LoginTwigRenderer
 		$oPage->add_style($oTemplate->renderBlock('css', $aVars));
 
 		// Render CSS links
-		foreach ($this->aPluginFormData as $oFormData)
+		foreach ($this->aPluginFormData as $oFormData) {
-		{
 			/** @var \LoginTwigContext $oFormData */
 			$aCSSFiles = $oFormData->GetCSSFiles();
-			foreach ($aCSSFiles as $sCSSFile)
+			foreach ($aCSSFiles as $sCSSFile) {
-			{
 				$oPage->LinkStylesheetFromURI($sCSSFile);
 			}
 			$aJsFiles = $oFormData->GetJsFiles();
-			foreach ($aJsFiles as $sJsFile)
+			foreach ($aJsFiles as $sJsFile) {
-			{
 				$oPage->LinkScriptFromURI($sJsFile);
 
 			}

application/loginurl.class.inc.php

@@ -23,17 +23,15 @@ class LoginURL extends AbstractLoginFSMExtension
 	 */
 	public function ListSupportedLoginModes()
 	{
-		return array('url');
+		return ['url'];
 	}
 
 	protected function OnModeDetection(&$iErrorCode)
 	{
-		if (!Session::IsSet('login_mode') && !$this->bErrorOccurred)
+		if (!Session::IsSet('login_mode') && !$this->bErrorOccurred) {
-		{
 			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-			if (!empty($sAuthUser) && !empty($sAuthPwd))
+			if (!empty($sAuthUser) && !empty($sAuthPwd)) {
-			{
 				Session::Set('login_mode', 'url');
 			}
 		}
@@ -42,8 +40,7 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnReadCredentials(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'url')
+		if (Session::Get('login_mode') == 'url') {
-		{
 			Session::Set('login_temp_auth_user', utils::ReadParam('auth_user', '', false, 'raw_data'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -51,12 +48,10 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'url')
+		if (Session::Get('login_mode') == 'url') {
-		{
 			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
+			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal')) {
-			{
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
@@ -67,8 +62,7 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'url')
+		if (Session::Get('login_mode') == 'url') {
-		{
 			LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode'));
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -76,8 +70,7 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnError(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'url')
+		if (Session::Get('login_mode') == 'url') {
-		{
 			$this->bErrorOccurred = true;
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -85,8 +78,7 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'url')
+		if (Session::Get('login_mode') == 'url') {
-		{
 			Session::Set('can_logoff', true);
 			return LoginWebPage::CheckLoggedUser($iErrorCode);
 		}

application/loginwebpage.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -16,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * Class LoginWebPage
  *
@@ -37,33 +37,33 @@ use Combodo\iTop\Service\Events\EventService;
 
 class LoginWebPage extends NiceWebPage
 {
-	const EXIT_PROMPT = 0;
+	public const EXIT_PROMPT = 0;
-	const EXIT_HTTP_401 = 1;
+	public const EXIT_HTTP_401 = 1;
-	const EXIT_RETURN = 2;
+	public const EXIT_RETURN = 2;
 
-	const EXIT_CODE_OK = 0;
+	public const EXIT_CODE_OK = 0;
-	const EXIT_CODE_MISSINGLOGIN = 1;
+	public const EXIT_CODE_MISSINGLOGIN = 1;
-	const EXIT_CODE_MISSINGPASSWORD = 2;
+	public const EXIT_CODE_MISSINGPASSWORD = 2;
-	const EXIT_CODE_WRONGCREDENTIALS = 3;
+	public const EXIT_CODE_WRONGCREDENTIALS = 3;
-	const EXIT_CODE_MUSTBEADMIN = 4;
+	public const EXIT_CODE_MUSTBEADMIN = 4;
-	const EXIT_CODE_PORTALUSERNOTAUTHORIZED = 5;
+	public const EXIT_CODE_PORTALUSERNOTAUTHORIZED = 5;
-	const EXIT_CODE_NOTAUTHORIZED = 6;
+	public const EXIT_CODE_NOTAUTHORIZED = 6;
 
 	// Login FSM States
-	const LOGIN_STATE_START = 'start';                          // Entry state
+	public const LOGIN_STATE_START = 'start';                          // Entry state
-	const LOGIN_STATE_MODE_DETECTION = 'login mode detection';  // Detect which login plugin to use
+	public const LOGIN_STATE_MODE_DETECTION = 'login mode detection';  // Detect which login plugin to use
-	const LOGIN_STATE_READ_CREDENTIALS = 'read credentials';    // Read the credentials
+	public const LOGIN_STATE_READ_CREDENTIALS = 'read credentials';    // Read the credentials
-	const LOGIN_STATE_CHECK_CREDENTIALS = 'check credentials';  // Check if the credentials are valid
+	public const LOGIN_STATE_CHECK_CREDENTIALS = 'check credentials';  // Check if the credentials are valid
-	const LOGIN_STATE_CREDENTIALS_OK = 'credentials ok';        // User provisioning
+	public const LOGIN_STATE_CREDENTIALS_OK = 'credentials ok';        // User provisioning
-	const LOGIN_STATE_USER_OK = 'user ok';                      // Additional check (2FA)
+	public const LOGIN_STATE_USER_OK = 'user ok';                      // Additional check (2FA)
-	const LOGIN_STATE_CONNECTED = 'connected';                  // User connected
+	public const LOGIN_STATE_CONNECTED = 'connected';                  // User connected
-	const LOGIN_STATE_SET_ERROR = 'prepare for error';	        // Internal state to trigger ERROR state
+	public const LOGIN_STATE_SET_ERROR = 'prepare for error';	        // Internal state to trigger ERROR state
-	const LOGIN_STATE_ERROR = 'error';                          // An error occurred, next state will be NONE
+	public const LOGIN_STATE_ERROR = 'error';                          // An error occurred, next state will be NONE
 
 	// Login FSM Returns
-	const LOGIN_FSM_RETURN = 0;           // End the FSM OK (connected)
+	public const LOGIN_FSM_RETURN = 0;           // End the FSM OK (connected)
-	const LOGIN_FSM_ERROR = 1;        // Error signaled
+	public const LOGIN_FSM_ERROR = 1;        // Error signaled
-	const LOGIN_FSM_CONTINUE = 2;     // Continue FSM
+	public const LOGIN_FSM_CONTINUE = 2;     // Continue FSM
 
 	protected static $sHandlerClass = __class__;
 	private static $iOnExit;
@@ -78,7 +78,7 @@ class LoginWebPage extends NiceWebPage
 	 */
 	public static function NewLoginWebPage()
 	{
-		return new self::$sHandlerClass;
+		return new self::$sHandlerClass();
 	}
 
 	protected static $m_sLoginFailedMessage = '';
@@ -128,23 +128,18 @@ class LoginWebPage extends NiceWebPage
 		$oProfilesSet = $oUser->Get('profile_list');
 		//delete old profiles
 		$aExistingProfiles = [];
-		while ($oProfile = $oProfilesSet->Fetch())
+		while ($oProfile = $oProfilesSet->Fetch()) {
-		{
 			array_push($aExistingProfiles, $oProfile->Get('profileid'));
 			$iArrayKey = array_search($oProfile->Get('profileid'), $aProfiles);
-			if (!$iArrayKey)
+			if (!$iArrayKey) {
-			{
 				$oProfilesSet->RemoveItem($oProfile->Get('profileid'));
-			}
+			} else {
-			else
-			{
 				unset($aProfiles[$iArrayKey]);
 			}
 		}
 		//add profiles not already linked with user
-		foreach ($aProfiles as $iProfileId)
+		foreach ($aProfiles as $iProfileId) {
-		{
+			$oProfilesSet->AddItem(MetaModel::NewObject('URP_UserProfile', ['profileid' => $iProfileId, 'reason' => $sOrigin]));
-			$oProfilesSet->AddItem(MetaModel::NewObject('URP_UserProfile', array('profileid' => $iProfileId, 'reason' => $sOrigin)));
 		}
 		$oUser->Set('profile_list', $oProfilesSet);
 	}
@@ -154,56 +149,49 @@ class LoginWebPage extends NiceWebPage
 		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
 		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
 		$sDisplayIcon = Branding::GetLoginLogoAbsoluteUrl();
-		$this->add("<div id=\"login-logo\"><a href=\"".htmlentities($sIconUrl, ENT_QUOTES,
+		$this->add("<div id=\"login-logo\"><a href=\"".htmlentities(
-				self::PAGES_CHARSET)."\"><img title=\"$sVersionShort\" src=\"$sDisplayIcon\"></a></div>\n");
+			$sIconUrl,
+			ENT_QUOTES,
+			self::PAGES_CHARSET
+		)."\"><img title=\"$sVersionShort\" src=\"$sDisplayIcon\"></a></div>\n");
 	}
 
 	public function DisplayLoginForm($bFailedLogin = false)
 	{
 		$oTwigContext = new LoginTwigRenderer();
-		$aPostedVars = array_merge(array('login_mode', 'loginop'), $oTwigContext->GetPostedVars());
+		$aPostedVars = array_merge(['login_mode', 'loginop'], $oTwigContext->GetPostedVars());
 
 		$sMessage = Dict::S('UI:Login:IdentifyYourself');
 
 		// Error message
-		if ($bFailedLogin)
+		if ($bFailedLogin) {
-		{
+			if (self::$m_sLoginFailedMessage != '') {
-			if (self::$m_sLoginFailedMessage != '')
-			{
 				$sMessage = self::$m_sLoginFailedMessage;
-			}
+			} else {
-			else
-			{
 				$sMessage = Dict::S('UI:Login:IncorrectLoginPassword');
 			}
 		}
 
 		// Keep the OTHER parameters posted
-		$aPreviousPostedVars = array();
+		$aPreviousPostedVars = [];
-		foreach($_POST as $sPostedKey => $postedValue)
+		foreach ($_POST as $sPostedKey => $postedValue) {
-		{
+			if (!in_array($sPostedKey, $aPostedVars)) {
-			if (!in_array($sPostedKey, $aPostedVars))
+				if (is_array($postedValue)) {
-			{
+					foreach ($postedValue as $sKey => $sValue) {
-				if (is_array($postedValue))
-				{
-					foreach($postedValue as $sKey => $sValue)
-					{
 						$sName = "{$sPostedKey}[{$sKey}]";
 						$aPreviousPostedVars[$sName] = $sValue;
 					}
-				}
+				} else {
-				else
-				{
 					$aPreviousPostedVars[$sPostedKey] = $postedValue;
 				}
 			}
 		}
 
-		$aVars = array(
+		$aVars = [
 			'bFailedLogin' => $bFailedLogin,
 			'sMessage' => $sMessage,
 			'aPreviousPostedVars' => $aPreviousPostedVars,
-		);
+		];
 		$aVars = array_merge($aVars, $oTwigContext->GetDefaultVars());
 
 		$oTwigContext->Render($this, 'login.html.twig', $aVars);
@@ -226,26 +214,21 @@ class LoginWebPage extends NiceWebPage
 	{
 		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
 
-		try
+		try {
-		{
 			UserRights::Login($sAuthUser); // Set the user's language (if possible!)
 			/** @var UserInternal $oUser */
 			$oUser = UserRights::GetUserObject();
 
-			if ($oUser != null)
+			if ($oUser != null) {
-			{
+				if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token')) {
-				if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token'))
-				{
 					throw new Exception(Dict::S('UI:ResetPwd-Error-NotPossible'));
 				}
-				if (!$oUser->CanChangePassword())
+				if (!$oUser->CanChangePassword()) {
-				{
 					throw new Exception(Dict::S('UI:ResetPwd-Error-FixedPwd'));
 				}
 
 				$sTo = $oUser->GetResetPasswordEmail(); // throws Exceptions if not allowed
-				if ($sTo == '')
+				if ($sTo == '') {
-				{
 					throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmail'));
 				}
 
@@ -265,8 +248,7 @@ class LoginWebPage extends NiceWebPage
 				$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
 				$oEmail->SetBody(Dict::Format('UI:ResetPwd-EmailBody', $sResetUrl, $oUser->Get('login')));
 				$iRes = $oEmail->Send($aIssues, true /* force synchronous exec */);
-				switch ($iRes)
+				switch ($iRes) {
-				{
 					//case EMAIL_SEND_PENDING:
 					case EMAIL_SEND_OK:
 						break;
@@ -278,13 +260,10 @@ class LoginWebPage extends NiceWebPage
 				}
 			}
 
-
 			$oTwigContext = new LoginTwigRenderer();
 			$aVars = $oTwigContext->GetDefaultVars();
 			$oTwigContext->Render($this, 'forgotpwdsent.html.twig', $aVars);
-		}
+		} catch (Exception $e) {
-		catch(Exception $e)
-		{
 			$this->DisplayForgotPwdForm(true, $e->getMessage());
 		}
 	}
@@ -304,22 +283,16 @@ class LoginWebPage extends NiceWebPage
 		$aVars['sToken'] = $sToken;
 		$aVars['sErrorMessage'] = $sErrorMessage;
 
-		if (($oUser == null))
+		if (($oUser == null)) {
-		{
 			$aVars['bNoUser'] = true;
-		}
+		} else {
-		else
-		{
 			$aVars['bNoUser'] = false;
 			$aVars['sUserName'] = $oUser->GetFriendlyName();
 			$oEncryptedToken = $oUser->Get('reset_pwd_token');
 
-			if (!$oEncryptedToken->CheckPassword($sToken))
+			if (!$oEncryptedToken->CheckPassword($sToken)) {
-			{
 				$aVars['bBadToken'] = true;
-			}
+			} else {
-			else
-			{
 				$aVars['bBadToken'] = false;
 			}
 		}
@@ -342,21 +315,15 @@ class LoginWebPage extends NiceWebPage
 
 		$aVars['sAuthUser'] = $sAuthUser;
 		$aVars['sToken'] = $sToken;
-		if (($oUser == null))
+		if (($oUser == null)) {
-		{
 			$aVars['bNoUser'] = true;
-		}
+		} else {
-		else
-		{
 			$aVars['bNoUser'] = false;
 			$oEncryptedToken = $oUser->Get('reset_pwd_token');
 
-			if (!$oEncryptedToken->CheckPassword($sToken))
+			if (!$oEncryptedToken->CheckPassword($sToken)) {
-			{
 				$aVars['bBadToken'] = true;
-			}
+			} else {
-			else
-			{
 				$aVars['bBadToken'] = false;
 				// Trash the token and change the password
 				$oUser->Set('reset_pwd_token', new ormPassword());
@@ -413,7 +380,7 @@ class LoginWebPage extends NiceWebPage
 		// Note: This will destroy the session, and not just the session data!
 	}
 
-	static function SecureConnectionRequired()
+	public static function SecureConnectionRequired()
 	{
 		return MetaModel::GetConfig()->GetSecureConnectionRequired();
 	}
@@ -423,7 +390,7 @@ class LoginWebPage extends NiceWebPage
 	 * @param string $sString
 	 * @return bool True if the string contains some typical UTF-8 multi-byte sequences
 	 */
-	static function LooksLikeUTF8($sString)
+	public static function LooksLikeUTF8($sString)
 	{
 		return preg_match('%(?:
         			[\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
@@ -446,22 +413,19 @@ class LoginWebPage extends NiceWebPage
 	protected static function Login($iOnExit)
 	{
 		self::$iOnExit = $iOnExit;
-		if (self::SecureConnectionRequired() && !utils::IsConnectionSecure())
+		if (self::SecureConnectionRequired() && !utils::IsConnectionSecure()) {
-		{
 			// Non secured URL... request for a secure connection
 			throw new Exception('Secure connection required!');
 		}
 		$bLoginDebug = MetaModel::GetConfig()->Get('login_debug');
 
-		if (Session::Get('login_state') == self::LOGIN_STATE_ERROR)
+		if (Session::Get('login_state') == self::LOGIN_STATE_ERROR) {
-		{
 			Session::Set('login_state', self::LOGIN_STATE_START);
 		}
 		$sLoginState = Session::Get('login_state');
 
 		$sSessionLog = '';
-		if ($bLoginDebug)
+		if ($bLoginDebug) {
-		{
 			IssueLog::Info("---------------------------------");
 			IssueLog::Info($_SERVER['REQUEST_URI']);
 			IssueLog::Info("--> Entering Login FSM with state: [$sLoginState]");
@@ -472,38 +436,30 @@ class LoginWebPage extends NiceWebPage
 		$iErrorCode = self::EXIT_CODE_OK;
 
 		// Finite state machine loop
-		while (true)
+		while (true) {
-		{
+			try {
-			try
-			{
 				$aLoginPlugins = self::GetLoginPluginList();
-				if (empty($aLoginPlugins))
+				if (empty($aLoginPlugins)) {
-				{
 					throw new Exception("Missing login classes");
 				}
 
 				/** @var iLoginFSMExtension $oLoginFSMExtensionInstance */
-				foreach ($aLoginPlugins as $oLoginFSMExtensionInstance)
+				foreach ($aLoginPlugins as $oLoginFSMExtensionInstance) {
-				{
+					if ($bLoginDebug) {
-					if ($bLoginDebug)
-					{
 						$sCurrSessionLog = session_id().' '.utils::GetSessionLog();
-						if ($sCurrSessionLog != $sSessionLog)
+						if ($sCurrSessionLog != $sSessionLog) {
-						{
 							$sSessionLog = $sCurrSessionLog;
 							IssueLog::Info("SESSION: $sSessionLog");
 						}
 						IssueLog::Info("Login: state: [$sLoginState] call: ".get_class($oLoginFSMExtensionInstance));
 					}
 					$iResponse = $oLoginFSMExtensionInstance->LoginAction($sLoginState, $iErrorCode);
-					if ($iResponse == self::LOGIN_FSM_RETURN)
+					if ($iResponse == self::LOGIN_FSM_RETURN) {
-					{
 						EventService::FireEvent(new EventData(EVENT_LOGIN, null, ['code' => $iErrorCode, 'state' => $sLoginState]));
 						Session::WriteClose();
 						return $iErrorCode; // Asked to exit FSM, generally login OK
 					}
-					if ($iResponse == self::LOGIN_FSM_ERROR)
+					if ($iResponse == self::LOGIN_FSM_ERROR) {
-					{
 						EventService::FireEvent(new EventData(EVENT_LOGIN, null, ['code' => $iErrorCode, 'state' => $sLoginState]));
 						$sLoginState = self::LOGIN_STATE_SET_ERROR; // Next state will be error
 						// An error was detected, skip the other plugins turn
@@ -515,9 +471,7 @@ class LoginWebPage extends NiceWebPage
 				// Every plugin has nothing else to do in this state, go forward
 				$sLoginState = self::AdvanceLoginFSMState($sLoginState);
 				Session::Set('login_state', $sLoginState);
-			}
+			} catch (Exception $e) {
-			catch (Exception $e)
-			{
 				EventService::FireEvent(new EventData(EVENT_LOGIN, null, ['state' => $_SESSION['login_state']]));
 				IssueLog::Error($e->getTraceAsString());
 				static::ResetSession();
@@ -537,30 +491,23 @@ class LoginWebPage extends NiceWebPage
 	 */
 	public static function GetLoginPluginList($sInterface = 'iLoginFSMExtension', $bFilterWithMode = true)
 	{
-		$aAllPlugins = array();
+		$aAllPlugins = [];
 
-		if ($bFilterWithMode)
+		if ($bFilterWithMode) {
-		{
 			$sCurrentLoginMode = Session::Get('login_mode', '');
-		}
+		} else {
-		else
-		{
 			$sCurrentLoginMode = '';
 		}
 
 		/** @var iLoginExtension $oLoginExtensionInstance */
-		foreach (MetaModel::EnumPlugins($sInterface) as $oLoginExtensionInstance)
+		foreach (MetaModel::EnumPlugins($sInterface) as $oLoginExtensionInstance) {
-		{
 			$aLoginModes = $oLoginExtensionInstance->ListSupportedLoginModes();
-			$aLoginModes = (is_array($aLoginModes) ? $aLoginModes : array());
+			$aLoginModes = (is_array($aLoginModes) ? $aLoginModes : []);
-			foreach ($aLoginModes as $sLoginMode)
+			foreach ($aLoginModes as $sLoginMode) {
-			{
 				// Keep only the plugins for the current login mode + before + after
-				if (empty($sCurrentLoginMode) || ($sLoginMode == $sCurrentLoginMode) || ($sLoginMode == 'before') || ($sLoginMode == 'after'))
+				if (empty($sCurrentLoginMode) || ($sLoginMode == $sCurrentLoginMode) || ($sLoginMode == 'before') || ($sLoginMode == 'after')) {
-				{
+					if (!isset($aAllPlugins[$sLoginMode])) {
-					if (!isset($aAllPlugins[$sLoginMode]))
+						$aAllPlugins[$sLoginMode] = [];
-					{
-						$aAllPlugins[$sLoginMode] = array();
 					}
 					$aAllPlugins[$sLoginMode][] = $oLoginExtensionInstance;
 					break; // Stop here to avoid registering a plugin twice
@@ -569,12 +516,10 @@ class LoginWebPage extends NiceWebPage
 		}
 
 		// Order and filter by the config list of allowed types (allowed_login_types)
-		$aAllowedLoginModes = array_merge(array('before'), MetaModel::GetConfig()->GetAllowedLoginTypes(), array('after'));
+		$aAllowedLoginModes = array_merge(['before'], MetaModel::GetConfig()->GetAllowedLoginTypes(), ['after']);
-		$aPlugins = array();
+		$aPlugins = [];
-		foreach ($aAllowedLoginModes as $sAllowedMode)
+		foreach ($aAllowedLoginModes as $sAllowedMode) {
-		{
+			if (isset($aAllPlugins[$sAllowedMode])) {
-			if (isset($aAllPlugins[$sAllowedMode]))
-			{
 				$aPlugins = array_merge($aPlugins, $aAllPlugins[$sAllowedMode]);
 			}
 		}
@@ -590,8 +535,7 @@ class LoginWebPage extends NiceWebPage
 	 */
 	private static function AdvanceLoginFSMState($sLoginState)
 	{
-		switch ($sLoginState)
+		switch ($sLoginState) {
-		{
 			case self::LOGIN_STATE_START:
 				return self::LOGIN_STATE_MODE_DETECTION;
 
@@ -638,8 +582,7 @@ class LoginWebPage extends NiceWebPage
 	public static function CheckUser($sAuthUser, $sAuthPassword = '', $sAuthentication = 'external')
 	{
 		$oUser = self::FindUser($sAuthUser, true, ucfirst(strtolower($sAuthentication)));
-		if (is_null($oUser))
+		if (is_null($oUser)) {
-		{
 			return false;
 		}
 
@@ -668,8 +611,7 @@ class LoginWebPage extends NiceWebPage
 	{
 		// User is Ok, let's save it in the session and proceed with normal login
 		$bLoginSuccess = UserRights::Login($sAuthUser, $sAuthentication); // Login & set the user's language
-		if (!$bLoginSuccess)
+		if (!$bLoginSuccess) {
-		{
 			throw new Exception("Bad user");
 		}
 		if (MetaModel::GetConfig()->Get('log_usage')) {
@@ -696,12 +638,10 @@ class LoginWebPage extends NiceWebPage
 	 */
 	public static function CheckLoggedUser(&$iErrorCode)
 	{
-		if (Session::IsSet('auth_user'))
+		if (Session::IsSet('auth_user')) {
-		{
 			// Already authenticated
 			$bRet = UserRights::Login(Session::Get('auth_user')); // Login & set the user's language
-			if ($bRet)
+			if ($bRet) {
-			{
 				$iErrorCode = self::EXIT_CODE_OK;
 				return self::LOGIN_FSM_RETURN;
 			}
@@ -727,8 +667,7 @@ class LoginWebPage extends NiceWebPage
 
 	public static function SetLoginModeAndReload($sNewLoginMode)
 	{
-		if (Session::Get('login_mode') == $sNewLoginMode)
+		if (Session::Get('login_mode') == $sNewLoginMode) {
-		{
 			return;
 		}
 		Session::Set('login_mode', $sNewLoginMode);
@@ -738,8 +677,7 @@ class LoginWebPage extends NiceWebPage
 	public static function HTTPReload()
 	{
 		$sOriginURL = utils::GetCurrentAbsoluteUrl();
-		if (!utils::StartsWith($sOriginURL, utils::GetAbsoluteUrlAppRoot()))
+		if (!utils::StartsWith($sOriginURL, utils::GetAbsoluteUrlAppRoot())) {
-		{
 			// If the found URL does not start with the configured AppRoot URL
 			$sOriginURL = utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
 		}
@@ -753,7 +691,6 @@ class LoginWebPage extends NiceWebPage
 		exit;
 	}
 
-
 	/**
 	 * Provisioning API: Find a User
 	 *
@@ -767,26 +704,21 @@ class LoginWebPage extends NiceWebPage
 	 */
 	public static function FindUser($sAuthUser, $bMustBeValid = true, $sType = 'External')
 	{
-		try
+		try {
-		{
+			$aArgs = ['login' => $sAuthUser];
-			$aArgs = array('login' => $sAuthUser);
 			$sUserClass = "User$sType";
 			$oSearch = DBObjectSearch::FromOQL("SELECT $sUserClass WHERE login = :login");
-			if ($bMustBeValid)
+			if ($bMustBeValid) {
-			{
 				$oSearch->AddCondition('status', 'enabled');
 			}
-			$oSet = new DBObjectSet($oSearch, array(), $aArgs);
+			$oSet = new DBObjectSet($oSearch, [], $aArgs);
-			if ($oSet->CountExceeds(0))
+			if ($oSet->CountExceeds(0)) {
-			{
 				/** @var User $oUser */
 				$oUser = $oSet->Fetch();
 
 				return $oUser;
 			}
-		}
+		} catch (Exception $e) {
-		catch (Exception $e)
-		{
 			IssueLog::Error($e->getMessage());
 		}
 		return null;
@@ -805,19 +737,15 @@ class LoginWebPage extends NiceWebPage
 	{
 		/** @var \Person $oPerson */
 		$oPerson = null;
-		try
+		try {
-		{
 			$oSearch = new DBObjectSearch('Person');
 			$oSearch->AddCondition('email', $sEmail);
 			$oSet = new DBObjectSet($oSearch);
-			if ($oSet->CountExceeds(1))
+			if ($oSet->CountExceeds(1)) {
-			{
 				throw new Exception(Dict::S('UI:Login:Error:MultipleContactsHaveSameEmail'));
 			}
 			$oPerson = $oSet->Fetch();
-		}
+		} catch (Exception $e) {
-		catch (Exception $e)
-		{
 			IssueLog::Error($e->getMessage());
 		}
 		return $oPerson;
@@ -836,16 +764,14 @@ class LoginWebPage extends NiceWebPage
 	 *
 	 * @return \Person
 	 */
-	public static function ProvisionPerson($sFirstName, $sLastName, $sEmail, $sOrganization, $aAdditionalParams = array())
+	public static function ProvisionPerson($sFirstName, $sLastName, $sEmail, $sOrganization, $aAdditionalParams = [])
 	{
 		/** @var Person $oPerson */
 		$oPerson = null;
-		try
+		try {
-		{
 			CMDBObject::SetTrackOrigin('custom-extension');
 			$sInfo = 'External User provisioning';
-			if (Session::IsSet('login_mode'))
+			if (Session::IsSet('login_mode')) {
-			{
 				$sInfo .= " (".Session::Get('login_mode').")";
 			}
 			CMDBObject::SetTrackInfo($sInfo);
@@ -855,19 +781,15 @@ class LoginWebPage extends NiceWebPage
 			$oPerson->Set('name', $sLastName);
 			$oPerson->Set('email', $sEmail);
 			$oOrg = MetaModel::GetObjectByName('Organization', $sOrganization, false);
-			if (is_null($oOrg))
+			if (is_null($oOrg)) {
-			{
 				throw new Exception(Dict::S('UI:Login:Error:WrongOrganizationName'));
 			}
 			$oPerson->Set('org_id', $oOrg->GetKey());
-			foreach ($aAdditionalParams as $sAttCode => $sValue)
+			foreach ($aAdditionalParams as $sAttCode => $sValue) {
-			{
 				$oPerson->Set($sAttCode, $sValue);
 			}
 			$oPerson->DBInsert();
-		}
+		} catch (Exception $e) {
-		catch (Exception $e)
-		{
 			IssueLog::Error($e->getMessage());
 		}
 		return $oPerson;
@@ -886,27 +808,23 @@ class LoginWebPage extends NiceWebPage
 	 */
 	public static function ProvisionUser($sAuthUser, $oPerson, $aRequestedProfiles)
 	{
-		if (!MetaModel::IsValidClass('URP_Profiles'))
+		if (!MetaModel::IsValidClass('URP_Profiles')) {
-		{
 			IssueLog::Error("URP_Profiles is not a valid class. Automatic creation of Users is not supported in this context, sorry.");
 			return null;
 		}
 
 		/** @var UserExternal $oUser */
 		$oUser = null;
-		try
+		try {
-		{
 			CMDBObject::SetTrackOrigin('custom-extension');
 			$sInfo = 'External User provisioning';
-			if (Session::IsSet('login_mode'))
+			if (Session::IsSet('login_mode')) {
-			{
 				$sInfo .= " (".Session::Get('login_mode').")";
 			}
 			CMDBObject::SetTrackInfo($sInfo);
 
 			$oUser = MetaModel::GetObjectByName('UserExternal', $sAuthUser, false);
-			if (is_null($oUser))
+			if (is_null($oUser)) {
-			{
 				$oUser = MetaModel::NewObject('UserExternal');
 				$oUser->Set('login', $sAuthUser);
 				$oUser->Set('contactid', $oPerson->GetKey());
@@ -916,41 +834,33 @@ class LoginWebPage extends NiceWebPage
 			// read all the existing profiles
 			$oProfilesSearch = new DBObjectSearch('URP_Profiles');
 			$oProfilesSet = new DBObjectSet($oProfilesSearch);
-			$aAllProfiles = array();
+			$aAllProfiles = [];
-			while ($oProfile = $oProfilesSet->Fetch())
+			while ($oProfile = $oProfilesSet->Fetch()) {
-			{
 				$aAllProfiles[mb_strtolower($oProfile->GetName())] = $oProfile->GetKey();
 			}
 
-			$aProfiles = array();
+			$aProfiles = [];
-			foreach ($aRequestedProfiles as $sRequestedProfile)
+			foreach ($aRequestedProfiles as $sRequestedProfile) {
-			{
 				$sRequestedProfile = mb_strtolower($sRequestedProfile);
-				if (isset($aAllProfiles[$sRequestedProfile]))
+				if (isset($aAllProfiles[$sRequestedProfile])) {
-				{
 					$aProfiles[] = $aAllProfiles[$sRequestedProfile];
 				}
 			}
 
-			if (empty($aProfiles))
+			if (empty($aProfiles)) {
-			{
 				throw new Exception(Dict::S('UI:Login:Error:NoValidProfiles'));
 			}
 
 			// Now synchronize the profiles
 			$sOrigin = 'External User provisioning';
-			if (Session::IsSet('login_mode'))
+			if (Session::IsSet('login_mode')) {
-			{
 				$sOrigin .= " (".Session::Get('login_mode').")";
 			}
 			$aExistingProfiles = self::SynchronizeProfiles($oUser, $aProfiles, $sOrigin);
-			if ($oUser->IsModified())
+			if ($oUser->IsModified()) {
-			{
 				$oUser->DBWrite();
 			}
-		}
+		} catch (Exception $e) {
-		catch (Exception $e)
-		{
 			IssueLog::Error($e->getMessage());
 		}
 
@@ -964,23 +874,15 @@ class LoginWebPage extends NiceWebPage
 	 */
 	protected static function ChangeLocation($sRequestedPortalId = null, $iOnExit = self::EXIT_PROMPT)
 	{
-		$ret = call_user_func(array(self::$sHandlerClass, 'Dispatch'), $sRequestedPortalId);
+		$ret = call_user_func([self::$sHandlerClass, 'Dispatch'], $sRequestedPortalId);
-		if ($ret === true)
+		if ($ret === true) {
-		{
 			return self::EXIT_CODE_OK;
-		}
+		} elseif ($ret === false) {
-		else if($ret === false)
-		{
 			throw new Exception('Nowhere to go: Your combination of user Profiles denies you access to any '.ITOP_APPLICATION_SHORT.' portal. Please contact your administrator');
-		}
+		} else {
-		else
+			if ($iOnExit == self::EXIT_RETURN) {
-		{
-			if ($iOnExit == self::EXIT_RETURN)
-			{
 				return self::EXIT_CODE_PORTALUSERNOTAUTHORIZED;
-			}
+			} else {
-			else
-			{
 				// No rights to be here, redirect to the portal
 				header('Location: '.$ret);
 				die();
@@ -1002,7 +904,7 @@ class LoginWebPage extends NiceWebPage
 	 * @return int|mixed|string
 	 * @throws \Exception
 	 */
-	static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false, $iOnExit = self::EXIT_PROMPT)
+	public static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false, $iOnExit = self::EXIT_PROMPT)
 	{
 		$sRequestedPortalId = $bIsAllowedToPortalUsers ? 'legacy_portal' : 'backoffice';
 		return self::DoLoginEx($sRequestedPortalId, $bMustBeAdmin, $iOnExit);
@@ -1019,23 +921,18 @@ class LoginWebPage extends NiceWebPage
 	 * @return int|mixed|string
 	 * @throws \Exception
 	 */
-	static function DoLoginEx($sRequestedPortalId = null, $bMustBeAdmin = false, $iOnExit = self::EXIT_PROMPT)
+	public static function DoLoginEx($sRequestedPortalId = null, $bMustBeAdmin = false, $iOnExit = self::EXIT_PROMPT)
 	{
 		$operation = utils::ReadParam('loginop', '');
 
 		$sMessage = self::HandleOperations($operation); // May exit directly
 
 		$iRet = self::Login($iOnExit);
-		if ($iRet == self::EXIT_CODE_OK)
+		if ($iRet == self::EXIT_CODE_OK) {
-		{
+			if ($bMustBeAdmin && !UserRights::IsAdministrator()) {
-			if ($bMustBeAdmin && !UserRights::IsAdministrator())
+				if ($iOnExit == self::EXIT_RETURN) {
-			{
-				if ($iOnExit == self::EXIT_RETURN)
-				{
 					return self::EXIT_CODE_MUSTBEADMIN;
-				}
+				} else {
-				else
-				{
 					require_once(APPROOT.'/setup/setuppage.class.inc.php');
 					$oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError'));
 					$oP->add("<h1>".Dict::S('UI:Login:Error:AccessAdmin')."</h1>\n");
@@ -1044,69 +941,52 @@ class LoginWebPage extends NiceWebPage
 					exit;
 				}
 			}
-			$iRet = call_user_func(array(self::$sHandlerClass, 'ChangeLocation'), $sRequestedPortalId, $iOnExit);
+			$iRet = call_user_func([self::$sHandlerClass, 'ChangeLocation'], $sRequestedPortalId, $iOnExit);
 		}
-		if ($iOnExit == self::EXIT_RETURN)
+		if ($iOnExit == self::EXIT_RETURN) {
-		{
 			return $iRet;
-		}
+		} else {
-		else
-		{
 			return $sMessage;
 		}
 	}
 	protected static function HandleOperations($operation)
 	{
 		$sMessage = ''; // most of the operations never return, but some can return a message to be displayed
-		if ($operation == 'logoff')
+		if ($operation == 'logoff') {
-		{
 			self::ResetSession();
 			$oPage = self::NewLoginWebPage();
 			$oPage->DisplayLoginForm(false /* not a failed attempt */);
 			$oPage->output();
 			exit;
-		}
+		} elseif ($operation == 'forgot_pwd') {
-		else if ($operation == 'forgot_pwd')
-		{
 			$oPage = self::NewLoginWebPage();
 			$oPage->DisplayForgotPwdForm();
 			$oPage->output();
 			exit;
-		}
+		} elseif ($operation == 'forgot_pwd_go') {
-		else if ($operation == 'forgot_pwd_go')
-		{
 			$oPage = self::NewLoginWebPage();
 			$oPage->ForgotPwdGo();
 			$oPage->output();
 			exit;
-		}
+		} elseif ($operation == 'reset_pwd') {
-		else if ($operation == 'reset_pwd')
-		{
 			$oPage = self::NewLoginWebPage();
 			$oPage->DisplayResetPwdForm();
 			$oPage->output();
 			exit;
-		}
+		} elseif ($operation == 'do_reset_pwd') {
-		else if ($operation == 'do_reset_pwd')
-		{
 
 			try {
 				$oPage = self::NewLoginWebPage();
 				$oPage->DoResetPassword();
-			}
+			} catch (CoreCannotSaveObjectException $e) {
-			catch (CoreCannotSaveObjectException $e)
-			{
 				$oPage = self::NewLoginWebPage();
 				$oPage->DisplayResetPwdForm($e->getIssue());
 			}
 
 			$oPage->output();
 			exit;
-		}
+		} elseif ($operation == 'change_pwd') {
-		else if ($operation == 'change_pwd')
+			if (Session::IsSet('auth_user')) {
-		{
-			if (Session::IsSet('auth_user'))
-			{
 				$sAuthUser = Session::Get('auth_user');
 				$sIssue = Session::Get('pwd_issue');
 				Session::Unset('pwd_issue');
@@ -1118,16 +998,13 @@ class LoginWebPage extends NiceWebPage
 				$oPage->output();
 				exit;
 			}
-		}
+		} elseif ($operation == 'check_pwd_policy') {
-		else if ($operation == 'check_pwd_policy')
-		{
 			$sAuthUser = Session::Get('auth_user');
 			UserRights::Login($sAuthUser); // Set the user's language
 
-			$aPwdMap = array();
+			$aPwdMap = [];
 
-			foreach (array('new_pwd', 'retype_new_pwd') as $postedPwd)
+			foreach (['new_pwd', 'retype_new_pwd'] as $postedPwd) {
-			{
 				$oUser = new UserLocal();
 				$oUser->ValidatePassword($_POST[$postedPwd]);
 
@@ -1137,27 +1014,21 @@ class LoginWebPage extends NiceWebPage
 			echo json_encode($aPwdMap);
 			die();
 		}
-		if ($operation == 'do_change_pwd')
+		if ($operation == 'do_change_pwd') {
-		{
+			if (Session::IsSet('auth_user')) {
-			if (Session::IsSet('auth_user'))
-			{
 				$sAuthUser = Session::Get('auth_user');
 				UserRights::Login($sAuthUser); // Set the user's language
 				$sOldPwd = utils::ReadPostedParam('old_pwd', '', 'raw_data');
 				$sNewPwd = utils::ReadPostedParam('new_pwd', '', 'raw_data');
 
-				try
+				try {
-				{
+					if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd)))) {
-					if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
-					{
 						$oPage = self::NewLoginWebPage();
 						$oPage->DisplayChangePwdForm(true); // old pwd was wrong
 						$oPage->output();
 						exit;
 					}
-				}
+				} catch (CoreCannotSaveObjectException $e) {
-				catch (CoreCannotSaveObjectException $e)
-				{
 					$oPage = self::NewLoginWebPage();
 					$oPage->DisplayChangePwdForm(true, $e->getIssue()); // password policy was not met.
 					$oPage->output();
@@ -1171,23 +1042,24 @@ class LoginWebPage extends NiceWebPage
 
 	protected static function Dispatch($sRequestedPortalId)
 	{
-		if ($sRequestedPortalId === null) return true; // allowed to any portal => return true
+		if ($sRequestedPortalId === null) {
+			return true;
+		} // allowed to any portal => return true
 
 		$aPortalsConf = PortalDispatcherData::GetData();
-		$aDispatchers = array();
+		$aDispatchers = [];
-		foreach($aPortalsConf as $sPortalId => $aConf)
+		foreach ($aPortalsConf as $sPortalId => $aConf) {
-		{
 			$sHandlerClass = $aConf['handler'];
 			$aDispatchers[$sPortalId] = new $sHandlerClass($sPortalId);
 		}
 
-		if (array_key_exists($sRequestedPortalId, $aDispatchers) && $aDispatchers[$sRequestedPortalId]->IsUserAllowed())
+		if (array_key_exists($sRequestedPortalId, $aDispatchers) && $aDispatchers[$sRequestedPortalId]->IsUserAllowed()) {
-		{
 			return true;
 		}
-		foreach($aDispatchers as $sPortalId => $oDispatcher)
+		foreach ($aDispatchers as $sPortalId => $oDispatcher) {
-		{
+			if ($oDispatcher->IsUserAllowed()) {
-			if ($oDispatcher->IsUserAllowed()) return $oDispatcher->GetUrl();
+				return $oDispatcher->GetUrl();
+			}
 		}
 		return false; // nothing matched !!
 	}

application/maintenancemsg.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2024 Combodo SAS
  *
@@ -17,7 +18,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-
 //
 // Maintenance message display functions
 // Only included by approot.inc.php
@@ -33,21 +33,17 @@ function _MaintenanceSetupPageMessage($sTitle, $sMessage)
 {
 	// Web Page
 	@include_once(APPROOT.'setup/setuppage.class.inc.php');
-	if (class_exists('SetupPage'))
+	if (class_exists('SetupPage')) {
-	{
 		$oP = new ErrorPage($sTitle);
 		$oP->p("<h2 class=\"center\">$sMessage</h2>");
 		$oP->add_ready_script(
-<<<JS
+			<<<JS
 // Reload in 30s to check if maintenance is over
 setTimeout(function(){ window.location.reload(); }, 30000);
 JS
-
 		);
 		$oP->output();
-	}
+	} else {
-	else
-	{
 		_MaintenanceTextMessage($sMessage);
 	}
 }
@@ -78,14 +74,13 @@ function _MaintenanceHtmlMessage($sMessage)
  */
 function _MaintenanceJsonMessage($sTitle, $sMessage)
 {
-	if (class_exists('JsonPage'))
+	if (class_exists('JsonPage')) {
-	{
 		$oP = new JsonPage($sTitle);
 		$oP->add_header('Access-Control-Allow-Origin: *');
 
 		$aMessage = [
 			'code' => 100,
-			'message' =>$sMessage
+			'message' => $sMessage,
 		];
 
 		$oP->AddData($aMessage);

application/menunode.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -12,7 +13,6 @@ use Combodo\iTop\Application\WebPage\WebPage;
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT."/application/user.dashboard.class.inc.php");
 
-
 /**
  * This class manipulates, stores and displays the navigation menu used in the application
  * In order to improve the modularity of the data model and to ease the update/migration
@@ -51,43 +51,40 @@ class ApplicationMenu
 	/**
 	 * @var bool
 	 */
-	static $bAdditionalMenusLoaded = false;
+	public static $bAdditionalMenusLoaded = false;
 	/**
 	 * @var array
 	 */
-	static $aRootMenus = array();
+	public static $aRootMenus = [];
 	/**
 	 * @var array
 	 */
-	static $aMenusIndex = array();
+	public static $aMenusIndex = [];
 	/**
 	 * @var array
 	 */
-	static $aMenusById = [];
+	public static $aMenusById = [];
 	/**
 	 * @var string
 	 */
-	static $sFavoriteSiloQuery = 'SELECT Organization';
+	public static $sFavoriteSiloQuery = 'SELECT Organization';
 
 	/**
 	 * @return void
 	 */
 	public static function LoadAdditionalMenus()
 	{
-		if (!self::$bAdditionalMenusLoaded)
+		if (!self::$bAdditionalMenusLoaded) {
-		{
 			// Build menus from module handlers
 			//
 			/** @var \ModuleHandlerApiInterface $oPHPClass */
-			foreach(MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass)
+			foreach (MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass) {
-            {
 				$oPHPClass::OnMenuCreation();
 			}
 
 			// Build menus from the menus themselves (e.g. the ShortcutContainerMenuNode will do that)
 			//
-			foreach(self::$aRootMenus as $aMenu)
+			foreach (self::$aRootMenus as $aMenu) {
-			{
 				$oMenuNode = self::GetMenuNode($aMenu['index']);
 				$oMenuNode->PopulateChildMenus();
 			}
@@ -124,8 +121,7 @@ class ApplicationMenu
 	 */
 	public static function CheckMenuIdEnabled($sMenuId)
 	{
-		if (self::IsMenuIdEnabled($sMenuId) === false)
+		if (self::IsMenuIdEnabled($sMenuId) === false) {
-		{
 			require_once(APPROOT.'/setup/setuppage.class.inc.php');
 			$oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError'));
 			$oP->add("<h1>".Dict::S('UI:Login:Error:AccessRestricted')."</h1>\n");
@@ -141,7 +137,7 @@ class ApplicationMenu
 	 * @return bool true if the menu exists and current user is allowed to see the menu
 	 * @since 3.2.0
 	 */
-	public static function IsMenuIdEnabled($sMenuId):bool
+	public static function IsMenuIdEnabled($sMenuId): bool
 	{
 		self::LoadAdditionalMenus();
 		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
@@ -159,22 +155,18 @@ class ApplicationMenu
 	public static function InsertMenu(MenuNode $oMenuNode, $iParentIndex, $fRank)
 	{
 		$index = self::GetMenuIndexById($oMenuNode->GetMenuId());
-		if ($index == -1)
+		if ($index == -1) {
-		{
 			// The menu does not already exist, insert it
 			$index = count(self::$aMenusIndex);
 
-			if ($iParentIndex == -1)
+			if ($iParentIndex == -1) {
-			{
 				$sParentId = '';
-				self::$aRootMenus[] = array ('rank' => $fRank, 'index' => $index);
+				self::$aRootMenus[] =  ['rank' => $fRank, 'index' => $index];
-			}
+			} else {
-			else
-			{
 				/** @var \MenuNode $oNode */
 				$oNode = self::$aMenusIndex[$iParentIndex]['node'];
 				$sParentId = $oNode->GetMenuId();
-				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
+				self::$aMenusIndex[$iParentIndex]['children'][] =  ['rank' => $fRank, 'index' => $index];
 			}
 
 			// Note: At the time when 'parent', 'rank' and 'source_file' have been added for the reflection API,
@@ -182,11 +174,9 @@ class ApplicationMenu
 			//
 			$aBacktrace = debug_backtrace();
 			$sFile = isset($aBacktrace[2]["file"]) ? $aBacktrace[2]["file"] : $aBacktrace[1]["file"];
-			self::$aMenusIndex[$index] = array('node' => $oMenuNode, 'children' => array(), 'parent' => $sParentId, 'rank' => $fRank, 'source_file' => $sFile);
+			self::$aMenusIndex[$index] = ['node' => $oMenuNode, 'children' => [], 'parent' => $sParentId, 'rank' => $fRank, 'source_file' => $sFile];
 			self::$aMenusById[$oMenuNode->GetMenuId()] = $index;
-		}
+		} else {
-		else
-		{
 			// the menu already exists, let's combine the conditions that make it visible
 			/** @var \MenuNode $oNode */
 			$oNode = self::$aMenusIndex[$index]['node'];
@@ -216,7 +206,7 @@ class ApplicationMenu
 	 * @throws \DictExceptionMissingString
 	 * @since 3.0.0
 	 */
-	public static function GetMenusCount($aExtraParams = array())
+	public static function GetMenusCount($aExtraParams = [])
 	{
 		$aMenuGroups = static::GetMenuGroups($aExtraParams);
 
@@ -259,18 +249,16 @@ class ApplicationMenu
 	 * @throws \DictExceptionMissingString
 	 * @since 3.0.0
 	 */
-	public static function GetMenuGroups($aExtraParams = array())
+	public static function GetMenuGroups($aExtraParams = [])
 	{
 		self::LoadAdditionalMenus();
 
 		// Sort the root menu based on the rank
-		usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
+		usort(self::$aRootMenus, ['ApplicationMenu', 'CompareOnRank']);
 
 		$aMenuGroups = [];
-		foreach(static::$aRootMenus as $aMenuGroup)
+		foreach (static::$aRootMenus as $aMenuGroup) {
-		{
+			if (!static::CanDisplayMenu($aMenuGroup)) {
-			if(!static::CanDisplayMenu($aMenuGroup))
-			{
 				continue;
 			}
 
@@ -321,26 +309,23 @@ class ApplicationMenu
 	 * @throws \Exception
 	 * @since 3.0.0
 	 */
-	public static function GetSubMenuNodes($sMenuGroupIdx, $aExtraParams = array())
+	public static function GetSubMenuNodes($sMenuGroupIdx, $aExtraParams = [])
 	{
 		$aSubMenuItems = self::GetChildren($sMenuGroupIdx);
 
 		// Sort the children based on the rank
-		usort($aSubMenuItems, array('ApplicationMenu', 'CompareOnRank'));
+		usort($aSubMenuItems, ['ApplicationMenu', 'CompareOnRank']);
 
 		$aSubMenuNodes = [];
-		foreach($aSubMenuItems as $aSubMenuItem)
+		foreach ($aSubMenuItems as $aSubMenuItem) {
-		{
+			if (!static::CanDisplayMenu($aSubMenuItem)) {
-			if(!static::CanDisplayMenu($aSubMenuItem))
-			{
 				continue;
 			}
 
 			$sSubMenuItemIdx = $aSubMenuItem['index'];
 			$oSubMenuNode = static::GetMenuNode($sSubMenuItemIdx);
 
-			if(!$oSubMenuNode->IsEnabled())
+			if (!$oSubMenuNode->IsEnabled()) {
-			{
 				continue;
 			}
 
@@ -366,21 +351,15 @@ class ApplicationMenu
 	private static function CanDisplayMenu($aMenu)
 	{
 		$oMenuNode = self::GetMenuNode($aMenu['index']);
-		if ($oMenuNode->IsEnabled())
+		if ($oMenuNode->IsEnabled()) {
-		{
 			$aChildren = self::GetChildren($aMenu['index']);
-			if (count($aChildren) > 0)
+			if (count($aChildren) > 0) {
-			{
+				foreach ($aChildren as $aSubMenu) {
-				foreach($aChildren as $aSubMenu)
+					if (self::CanDisplayMenu($aSubMenu)) {
-				{
-					if (self::CanDisplayMenu($aSubMenu))
-					{
 						return true;
 					}
 				}
-			}
+			} else {
-			else
-			{
 				return true;
 			}
 		}
@@ -396,12 +375,10 @@ class ApplicationMenu
 	public static function CompareOnRank($a, $b)
 	{
 		$result = 1;
-		if ($a['rank'] == $b['rank'])
+		if ($a['rank'] == $b['rank']) {
-		{
 			$result = 0;
 		}
-		if ($a['rank'] < $b['rank'])
+		if ($a['rank'] < $b['rank']) {
-		{
 			$result = -1;
 		}
 		return $result;
@@ -449,8 +426,7 @@ class ApplicationMenu
 	{
 		$oAppContext = new ApplicationContext();
 		$sMenuId = $oAppContext->GetCurrentValue('menu', null);
-		if ($sMenuId  === null)
+		if ($sMenuId  === null) {
-		{
 			$sMenuId = self::GetDefaultMenuId();
 		}
 		return $sMenuId;
@@ -462,13 +438,12 @@ class ApplicationMenu
 	public static function GetDefaultMenuId()
 	{
 		static $sDefaultMenuId = null;
-		if (is_null($sDefaultMenuId))
+		if (is_null($sDefaultMenuId)) {
-		{
 			// Make sure the root menu is sorted on 'rank'
-			usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
+			usort(self::$aRootMenus, ['ApplicationMenu', 'CompareOnRank']);
 			$oFirstGroup = self::GetMenuNode(self::$aRootMenus[0]['index']);
 			$aChildren = self::$aMenusIndex[$oFirstGroup->GetIndex()]['children'];
-			usort($aChildren, array('ApplicationMenu', 'CompareOnRank'));
+			usort($aChildren, ['ApplicationMenu', 'CompareOnRank']);
 			$oMenuNode = self::GetMenuNode($aChildren[0]['index']);
 			$sDefaultMenuId = $oMenuNode->GetMenuId();
 		}
@@ -482,13 +457,11 @@ class ApplicationMenu
 	public static function GetRootMenuId($sMenuId)
 	{
 		$iMenuIndex = self::GetMenuIndexById($sMenuId);
-		if ($iMenuIndex == -1)
+		if ($iMenuIndex == -1) {
-		{
 			return '';
 		}
 		$oMenu = ApplicationMenu::GetMenuNode($iMenuIndex);
-		while ($oMenu->GetParentIndex() != -1)
+		while ($oMenu->GetParentIndex() != -1) {
-		{
 			$oMenu = ApplicationMenu::GetMenuNode($oMenu->GetParentIndex());
 		}
 		return $oMenu->GetMenuId();
@@ -575,17 +548,17 @@ abstract class MenuNode
 	{
 		$this->sMenuId = $sMenuId;
 		$this->iParentIndex = $iParentIndex;
-		$this->aReflectionProperties = array();
+		$this->aReflectionProperties = [];
 		if (utils::IsNotNullOrEmptyString($sEnableClass)) {
 			$this->aReflectionProperties['enable_class'] = $sEnableClass;
 			$this->aReflectionProperties['enable_action'] = $iActionCode;
 			$this->aReflectionProperties['enable_permission'] = $iAllowedResults;
 			$this->aReflectionProperties['enable_stimulus'] = $sEnableStimulus;
 		}
-		$this->m_aEnableClasses = array($sEnableClass);
+		$this->m_aEnableClasses = [$sEnableClass];
-		$this->m_aEnableActions = array($iActionCode);
+		$this->m_aEnableActions = [$iActionCode];
-		$this->m_aEnableActionResults = array($iAllowedResults);
+		$this->m_aEnableActionResults = [$iAllowedResults];
-		$this->m_aEnableStimuli = array($sEnableStimulus);
+		$this->m_aEnableStimuli = [$sEnableStimulus];
 		$this->index = ApplicationMenu::InsertMenu($this, $iParentIndex, $fRank);
 	}
 
@@ -639,7 +612,6 @@ abstract class MenuNode
 		$oSearch->SetShowObsoleteData(utils::ShowObsoleteData());
 		DBSearchHelper::AddContextFilter($oSearch);
 
-
 		$oSet = new DBObjectSet($oSearch);
 		$iCount = $oSet->CountWithLimit(99);
 		if ($iCount > 99) {
@@ -690,8 +662,7 @@ abstract class MenuNode
 	 */
 	public function PopulateChildMenus()
 	{
-		foreach (ApplicationMenu::GetChildren($this->GetIndex()) as $aMenu)
+		foreach (ApplicationMenu::GetChildren($this->GetIndex()) as $aMenu) {
-		{
 			$index = $aMenu['index'];
 			$oMenu = ApplicationMenu::GetMenuNode($index);
 			$oMenu->PopulateChildMenus();
@@ -726,8 +697,7 @@ abstract class MenuNode
 	 */
 	public function AddCondition(MenuNode $oMenuNode)
 	{
-		foreach($oMenuNode->m_aEnableClasses as $index => $sClass )
+		foreach ($oMenuNode->m_aEnableClasses as $index => $sClass) {
-		{
 			$this->m_aEnableClasses[] = $sClass;
 			$this->m_aEnableActions[] = $oMenuNode->m_aEnableActions[$index];
 			$this->m_aEnableActionResults[] = $oMenuNode->m_aEnableActionResults[$index];
@@ -740,33 +710,24 @@ abstract class MenuNode
 	 */
 	public function IsEnabled()
 	{
-		foreach($this->m_aEnableClasses as $index => $sClass)
+		foreach ($this->m_aEnableClasses as $index => $sClass) {
-		{
+			if ($sClass != null) {
-			if ($sClass != null)
+				if (MetaModel::IsValidClass($sClass)) {
-			{
+					if ($this->m_aEnableStimuli[$index] != null) {
-				if (MetaModel::IsValidClass($sClass))
+						if (!UserRights::IsStimulusAllowed($sClass, $this->m_aEnableStimuli[$index])) {
-				{
-					if ($this->m_aEnableStimuli[$index] != null)
-					{
-						if (!UserRights::IsStimulusAllowed($sClass, $this->m_aEnableStimuli[$index]))
-						{
 							return false;
 						}
 					}
-					if ($this->m_aEnableActions[$index] != null)
+					if ($this->m_aEnableActions[$index] != null) {
-					{
 						// Menus access rights ignore the archive mode
 						utils::PushArchiveMode(false);
 						$iResult = UserRights::IsActionAllowed($sClass, $this->m_aEnableActions[$index]);
 						utils::PopArchiveMode();
-						if (!($iResult & $this->m_aEnableActionResults[$index]))
+						if (!($iResult & $this->m_aEnableActionResults[$index])) {
-						{
 							return false;
 						}
 					}
-				}
+				} else {
-				else
-				{
 					return false;
 				}
 			}
@@ -779,7 +740,7 @@ abstract class MenuNode
 	 * @param array $aExtraParams
 	 * @return mixed
 	 */
-	public abstract function RenderContent(WebPage $oPage, $aExtraParams = array());
+	abstract public function RenderContent(WebPage $oPage, $aExtraParams = []);
 
 	/**
 	 * @param string $sHyperlink
@@ -788,16 +749,13 @@ abstract class MenuNode
 	 */
 	protected function AddParams($sHyperlink, $aExtraParams)
 	{
-		if (count($aExtraParams) > 0)
+		if (count($aExtraParams) > 0) {
-		{
+			$aQuery = [];
-			$aQuery = array();
 			$sSeparator = '?';
-			if (strpos($sHyperlink, '?') !== false)
+			if (strpos($sHyperlink, '?') !== false) {
-			{
 				$sSeparator = '&';
 			}
-			foreach($aExtraParams as $sName => $sValue)
+			foreach ($aExtraParams as $sName => $sValue) {
-			{
 				$aQuery[] = urlencode($sName).'='.urlencode($sValue);
 			}
 			$sHyperlink .= $sSeparator.implode('&', $aQuery);
@@ -813,7 +771,7 @@ abstract class MenuNode
 class MenuGroup extends MenuNode
 {
 	/** @var string DEFAULT_DECORATION_CLASSES Set to null by default so it is replaced by initials when none is specified */
-	const DEFAULT_DECORATION_CLASSES = null;
+	public const DEFAULT_DECORATION_CLASSES = null;
 
 	/** @var string The CSS classes used to display the menu group's icon */
 	protected $sDecorationClasses = self::DEFAULT_DECORATION_CLASSES;
@@ -833,8 +791,7 @@ class MenuGroup extends MenuNode
 	{
 		parent::__construct($sMenuId, -1 /* no parent, groups are at root level */, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 
-		if(!empty($sDecorationClasses))
+		if (!empty($sDecorationClasses)) {
-		{
 			$this->sDecorationClasses = $sDecorationClasses;
 		}
 	}
@@ -875,7 +832,7 @@ class MenuGroup extends MenuNode
 	/**
 	 * @inheritDoc
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		assert(false); // Shall never be called, groups do not display any content
 	}
@@ -887,7 +844,6 @@ class MenuGroup extends MenuNode
  */
 class TemplateMenuNode extends MenuNode
 {
-
 	/**
 	 * 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)
@@ -903,12 +859,18 @@ class TemplateMenuNode extends MenuNode
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 	}
-
+	/**
+	 * @inheritDoc
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		return '';
+	}
 	/**
 	 * @inheritDoc
 	 * @throws \Exception
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		//DO NOTHING this type of menu is only used for title not clickable
 	}
@@ -942,7 +904,6 @@ class OQLMenuNode extends MenuNode
 	 */
 	protected $m_aParams;
 
-
 	/**
 	 * Create a menu item based on an OQL query 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)
@@ -963,7 +924,7 @@ class OQLMenuNode extends MenuNode
 		$this->sOQL = $sOQL;
 		$this->bSearch = $bSearch;
 		$this->bSearchFormOpen = $bSearchFormOpen;
-		$this->m_aParams = array();
+		$this->m_aParams = [];
 		$this->aReflectionProperties['oql'] = $sOQL;
 		$this->aReflectionProperties['do_search'] = $bSearch;
 		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
@@ -977,8 +938,7 @@ class OQLMenuNode extends MenuNode
 	public function SetParameters($aParams)
 	{
 		$this->m_aParams = $aParams;
-		foreach($aParams as $sKey => $value)
+		foreach ($aParams as $sKey => $value) {
-		{
 			$this->aReflectionProperties[$sKey] = $value;
 		}
 	}
@@ -987,12 +947,11 @@ class OQLMenuNode extends MenuNode
 	 * @inheritDoc
 	 * @throws \Exception
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		$oTag = new ContextTag(ContextTag::TAG_OBJECT_SEARCH);
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
-		OQLMenuNode::RenderOQLSearch
+		OQLMenuNode::RenderOQLSearch(
-		(
 			$this->sOQL,
 			Dict::S($this->sPageTitle),
 			'Menu_'.$this->GetMenuId(),
@@ -1017,26 +976,25 @@ class OQLMenuNode extends MenuNode
 	 * @throws DictExceptionMissingString
 	 * @throws OQLException
 	 */
-	public static function RenderOQLSearch($sOql, $sTitle, $sUsageId, $bSearchPane, $bSearchOpen, WebPage $oPage, $aExtraParams = array(), $bEnableBreadcrumb = false)
+	public static function RenderOQLSearch($sOql, $sTitle, $sUsageId, $bSearchPane, $bSearchOpen, WebPage $oPage, $aExtraParams = [], $bEnableBreadcrumb = false)
 	{
 		$sUsageId = utils::GetSafeId($sUsageId);
 		$oSearch = DBObjectSearch::FromOQL($sOql);
-		$sClass= $oSearch->GetClass();
+		$sClass = $oSearch->GetClass();
 		$sIcon = MetaModel::GetClassIcon($sClass, false);
 		if ($bSearchPane) {
 			$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams);
 			$oBlock = new DisplayBlock($oSearch, DisplayBlock::ENUM_STYLE_SEARCH, false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
 			$oPage->add("<div class='sf_results_area ibo-add-margin-top-250' data-target='search_results'>");
-		}
+		} else {
-		else {
 			$oPage->add("<div class='sf_results_area' data-target='search_results'>");
 		}
-		$aExtraParams['panel_class'] =$sClass;
+		$aExtraParams['panel_class'] = $sClass;
 		$aExtraParams['panel_title'] = $sTitle;
 		$aExtraParams['panel_icon'] = $sIcon;
 
-		$aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
+		$aParams = array_merge(['table_id' => $sUsageId], $aExtraParams);
 		$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
 		$oBlock->Display($oPage, $sUsageId);
 
@@ -1101,14 +1059,14 @@ class SearchMenuNode extends MenuNode
 	 * @throws \DictExceptionMissingString
 	 * @throws \Exception
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', 'fas fa-search', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
 
 		$oSearch = new DBObjectSearch($this->sClass);
 		$sUsageId =  'Menu_'.utils::GetSafeId($this->GetMenuId());
-		$aParams = array_merge(array('table_id' =>$sUsageId), $aExtraParams);
+		$aParams = array_merge(['table_id' => $sUsageId], $aExtraParams);
 		$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 		$oBlock->Display($oPage, 0);
 	}
@@ -1145,10 +1103,16 @@ class WebPageMenuNode extends MenuNode
 	 * @param bool $bIsLinkInNewWindow for the {@link WebPageMenuNode::IsHyperLinkInNewWindow} method
 	 */
 	public function __construct(
-		$sMenuId, $sHyperlink, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null,
+		$sMenuId,
-		$iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null, $bIsLinkInNewWindow = false
+		$sHyperlink,
-	)
+		$iParentIndex,
-	{
+		$fRank = 0.0,
+		$sEnableClass = null,
+		$iActionCode = null,
+		$iAllowedResults = UR_ALLOWED_YES,
+		$sEnableStimulus = null,
+		$bIsLinkInNewWindow = false
+	) {
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sHyperlink = $sHyperlink;
 		$this->aReflectionProperties['url'] = $sHyperlink;
@@ -1161,7 +1125,7 @@ class WebPageMenuNode extends MenuNode
 	public function GetHyperlink($aExtraParams)
 	{
 		$aExtraParams['c[menu]'] = $this->GetMenuId();
-		return $this->AddParams( $this->sHyperlink, $aExtraParams);
+		return $this->AddParams($this->sHyperlink, $aExtraParams);
 	}
 
 	/**
@@ -1175,7 +1139,7 @@ class WebPageMenuNode extends MenuNode
 	/**
 	 * @inheritDoc
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		assert(false); // Shall never be called, the external web page will handle the display by itself
 	}
@@ -1236,10 +1200,8 @@ class NewObjectMenuNode extends MenuNode
 		$aSubClasses = MetaModel::EnumChildClasses($this->sClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
 		$bActionIsAllowed = false;
 
-		foreach($aSubClasses as $sCandidateClass)
+		foreach ($aSubClasses as $sCandidateClass) {
-		{
+			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES)) {
-			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
-			{
 				$bActionIsAllowed = true;
 				break; // Enough for now
 			}
@@ -1250,7 +1212,7 @@ class NewObjectMenuNode extends MenuNode
 	/**
 	 * @inheritDoc
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		assert(false); // Shall never be called, the external web page will handle the display by itself
 	}
@@ -1290,7 +1252,9 @@ class DashboardMenuNode extends MenuNode
 	 */
 	public function GetHyperlink($aExtraParams)
 	{
-		if ($this->sDashboardFile == '') return '';
+		if ($this->sDashboardFile == '') {
+			return '';
+		}
 		return parent::GetHyperlink($aExtraParams);
 	}
 
@@ -1308,12 +1272,11 @@ class DashboardMenuNode extends MenuNode
 	 * @inheritDoc
 	 * @throws \Exception
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null)
+		if ($oDashboard != null) {
-		{
 			WebResourcesHelper::EnableC3JSToWebPage($oPage);
 
 			$sDivId = utils::Sanitize($this->sMenuId, '', 'element_identifier');
@@ -1344,9 +1307,7 @@ class DashboardMenuNode extends MenuNode
 				}
 				$oPage->SetBreadCrumbEntry("ui-dashboard-".$this->sMenuId, $this->GetTitle(), $sDescription, '', $sIcon, iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
 			}
-		}
+		} else {
-		else
-		{
 			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
@@ -1359,12 +1320,9 @@ class DashboardMenuNode extends MenuNode
 	public function RenderEditor(WebPage $oPage)
 	{
 		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null)
+		if ($oDashboard != null) {
-		{
 			$oDashboard->RenderEditor($oPage);
-		}
+		} else {
-		else
-		{
 			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
@@ -1376,13 +1334,10 @@ class DashboardMenuNode extends MenuNode
 	public function AddDashlet($oDashlet)
 	{
 		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null)
+		if ($oDashboard != null) {
-		{
 			$oDashboard->AddDashlet($oDashlet);
 			$oDashboard->Save();
-		}
+		} else {
-		else
-		{
 			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
@@ -1405,7 +1360,7 @@ class ShortcutContainerMenuNode extends MenuNode
 	/**
 	 * @inheritDoc
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 	}
 
@@ -1420,10 +1375,9 @@ class ShortcutContainerMenuNode extends MenuNode
 		//
 		$oBMSearch = new DBObjectSearch('Shortcut');
 		$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-		$oBMSet = new DBObjectSet($oBMSearch, array('friendlyname' => true)); // ascending on friendlyname
+		$oBMSet = new DBObjectSet($oBMSearch, ['friendlyname' => true]); // ascending on friendlyname
 		$fRank = 1;
-		while ($oShortcut = $oBMSet->Fetch())
+		while ($oShortcut = $oBMSet->Fetch()) {
-		{
 			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
 			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
 		}
@@ -1434,7 +1388,6 @@ class ShortcutContainerMenuNode extends MenuNode
 	}
 }
 
-
 require_once(APPROOT.'application/shortcut.class.inc.php');
 /**
  * This class defines a menu item which content is a shortcut.
@@ -1471,12 +1424,10 @@ class ShortcutMenuNode extends MenuNode
 	{
 		$sContext = $this->oShortcut->Get('context');
 		$aContext = unserialize($sContext);
-		if (isset($aContext['menu']))
+		if (isset($aContext['menu'])) {
-		{
 			unset($aContext['menu']);
 		}
-		foreach ($aContext as $sArgName => $sArgValue)
+		foreach ($aContext as $sArgName => $sArgValue) {
-		{
 			$aExtraParams[$sArgName] = $sArgValue;
 		}
 		return parent::GetHyperlink($aExtraParams);
@@ -1486,7 +1437,7 @@ class ShortcutMenuNode extends MenuNode
 	 * @inheritDoc
 	 * @throws \Exception
 	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		$this->oShortcut->RenderContent($oPage, $aExtraParams);
@@ -1523,11 +1474,9 @@ class ShortcutMenuNode extends MenuNode
 		return true;
 	}
 
-
 	public function GetEntriesCount()
 	{
 		return $this->GetEntriesCountFromOQL($this->oShortcut->Get('oql'));
 	}
 
 }
-

application/newsroomprovider.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -118,25 +119,25 @@ abstract class NewsroomProviderBase implements iNewsroomProvider
 	 * {@inheritDoc}
 	 * @see iNewsroomProvider::GetLabel()
 	 */
-	public abstract function GetLabel();
+	abstract public function GetLabel();
 
 	/**
 	 * {@inheritDoc}
 	 * @see iNewsroomProvider::GetFetchURL()
 	 */
-	public abstract function GetFetchURL();
+	abstract public function GetFetchURL();
 
 	/**
 	 * {@inheritDoc}
 	 * @see iNewsroomProvider::GetMarkAllURL()
 	 */
-	public abstract function GetMarkAllAsReadURL();
+	abstract public function GetMarkAllAsReadURL();
 
 	/**
 	 * {@inheritDoc}
 	 * @see iNewsroomProvider::GetViewAllURL()
 	 */
-	public abstract function GetViewAllURL();
+	abstract public function GetViewAllURL();
 
 	public function IsApplicable(User $oUser = null)
 	{
@@ -149,11 +150,11 @@ abstract class NewsroomProviderBase implements iNewsroomProvider
 	 */
 	public function GetPlaceholders()
 	{
-		return array(); // By default, empty set of placeholders
+		return []; // By default, empty set of placeholders
 	}
 
 	public function GetTTL()
 	{
-		return 10*60; // Refresh every 10 minutes
+		return 10 * 60; // Refresh every 10 minutes
 	}
 }

application/portaldispatcher.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 class PortalDispatcher
 {
 	protected $sPortalid;
@@ -21,25 +22,20 @@ class PortalDispatcher
 		$bRet = true;
 		$aProfiles = UserRights::ListProfiles($oUser);
 
-		foreach($this->aData['deny'] as $sDeniedProfile)
+		foreach ($this->aData['deny'] as $sDeniedProfile) {
-		{
 			// If one denied profile is present, it's enough => return false
-			if (in_array($sDeniedProfile, $aProfiles))
+			if (in_array($sDeniedProfile, $aProfiles)) {
-			{
 				return false;
 			}
 		}
 		// If there are some "allow" profiles, then by default the result is false
 		// since the user must have at least one of the profiles to be allowed
-		if (count($this->aData['allow']) > 0)
+		if (count($this->aData['allow']) > 0) {
-		{
 			$bRet = false;
 		}
-		foreach($this->aData['allow'] as $sAllowProfile)
+		foreach ($this->aData['allow'] as $sAllowProfile) {
-		{
 			// If one "allow" profile is present, it's enough => return true
-			if (in_array($sAllowProfile, $aProfiles))
+			if (in_array($sAllowProfile, $aProfiles)) {
-			{
 				return true;
 			}
 		}
@@ -49,12 +45,9 @@ class PortalDispatcher
 	public function GetURL()
 	{
 		$aOverloads = MetaModel::GetConfig()->Get('portal_dispatch_urls');
-		if (array_key_exists($this->sPortalid, $aOverloads))
+		if (array_key_exists($this->sPortalid, $aOverloads)) {
-		{
 			$sRet = $aOverloads[$this->sPortalid];
-		}
+		} else {
-		else
-		{
 			$sRet = utils::GetAbsoluteUrlAppRoot().$this->aData['url'];
 		}
 		return $sRet;

application/query.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright (C) 2010-2024 Combodo SAS
  *
@@ -31,111 +32,117 @@ abstract class Query extends cmdbAbstractObject
 	 */
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => [],
 			"db_table" => "priv_query",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-		);
+		];
 		MetaModel::Init_Params($aParams);
 
-		MetaModel::Init_AddAttribute(new AttributeString("name", array(
+		MetaModel::Init_AddAttribute(new AttributeString("name", [
 			"allowed_values" => null,
 			"sql" => "name",
 			"default_value" => null,
 			"is_null_allowed" => false,
-			"depends_on" => array(),
+			"depends_on" => [],
-		)));
+		]));
 
-		MetaModel::Init_AddAttribute(new AttributeText("description", array(
+		MetaModel::Init_AddAttribute(new AttributeText("description", [
 			"allowed_values" => null,
 			"sql" => "description",
 			"default_value" => null,
 			"is_null_allowed" => false,
-			"depends_on" => array(),
+			"depends_on" => [],
-		)));
+		]));
 
-		MetaModel::Init_AddAttribute(new AttributeEnum("is_template", array(
+		MetaModel::Init_AddAttribute(new AttributeEnum("is_template", [
 			'allowed_values' => new ValueSetEnum('yes,no'),
 			'sql' => 'is_template',
 			'default_value' => 'no',
 			'is_null_allowed' => false,
 			'depends_on' => [],
 			'display_style' => 'radio_horizontal',
-		)));
+		]));
 
-		MetaModel::Init_AddAttribute(new AttributeInteger("export_count", array(
+		MetaModel::Init_AddAttribute(new AttributeInteger("export_count", [
 			"allowed_values" => null,
 			"sql" => "export_count",
 			"default_value" => 0,
 			"is_null_allowed" => false,
-			"depends_on" => array(),
+			"depends_on" => [],
 			"tracking_level" => ATTRIBUTE_TRACKING_NONE,
-		)));
+		]));
 
-		MetaModel::Init_AddAttribute(new AttributeDateTime("export_last_date", array(
+		MetaModel::Init_AddAttribute(new AttributeDateTime("export_last_date", [
 			"allowed_values" => null,
 			"sql" => "export_last_date",
 			"default_value" => null,
 			"is_null_allowed" => true,
-			"depends_on" => array(),
+			"depends_on" => [],
 			"tracking_level" => ATTRIBUTE_TRACKING_NONE,
-		)));
+		]));
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("export_last_user_id",
+		MetaModel::Init_AddAttribute(new AttributeExternalKey(
-			array(
+			"export_last_user_id",
-				"targetclass"=>'User',
+			[
-				"allowed_values"=>null,
+				"targetclass" => 'User',
-				"sql"=>'user_id',
+				"allowed_values" => null,
-				"is_null_allowed"=>true,
+				"sql" => 'user_id',
-				"depends_on"=>array(),
+				"is_null_allowed" => true,
-				"display_style"=>'select',
+				"depends_on" => [],
-				"always_load_in_tables"=>false,
+				"display_style" => 'select',
-				"on_target_delete"=>DEL_SILENT,
+				"always_load_in_tables" => false,
+				"on_target_delete" => DEL_SILENT,
 				"tracking_level" => ATTRIBUTE_TRACKING_NONE,
-			)));
+			]
+		));
 
-		MetaModel::Init_AddAttribute(new AttributeExternalField("export_last_user_contact",
+		MetaModel::Init_AddAttribute(new AttributeExternalField(
-			array(
+			"export_last_user_contact",
-				"allowed_values"=>null,
+			[
-				"extkey_attcode"=> "export_last_user_id",
+				"allowed_values" => null,
-				"target_attcode"=>"contactid",
+				"extkey_attcode" => "export_last_user_id",
+				"target_attcode" => "contactid",
 				"tracking_level" => ATTRIBUTE_TRACKING_NONE,
-			)));
+			]
+		));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details',
+		MetaModel::Init_SetZListItems(
-			array('name', 'is_template', 'description')); // Attributes to be displayed for the complete details
+			'details',
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+			['name', 'is_template', 'description']
+		); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'is_template')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', ['name', 'description', 'is_template']); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search',
+		MetaModel::Init_SetZListItems(
-			array('name', 'description', 'is_template')); // Criteria of the default search form
+			'default_search',
+			['name', 'description', 'is_template']
+		); // Criteria of the default search form
 		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 
-
 	/**
 	 * @inheritdoc
 	 *
 	 * @since 3.1.0
 	 */
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	public function GetAttributeFlags($sAttCode, &$aReasons = [], $sTargetState = '')
 	{
 		// read only attribute
-		if (in_array($sAttCode, ['export_count', 'export_last_date', 'export_last_user_id'])){
+		if (in_array($sAttCode, ['export_count', 'export_last_date', 'export_last_user_id'])) {
 			return OPT_ATT_READONLY;
 		}
 
 		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
 	}
 
-
 	/**
 	 * Return export url.
 	 *
@@ -144,7 +151,7 @@ abstract class Query extends cmdbAbstractObject
 	 * @return string|null
 	 * @since 3.1.0
 	 */
-	abstract public function GetExportUrl(array $aValues = null) : ?string;
+	abstract public function GetExportUrl(array $aValues = null): ?string;
 
 	/**
 	 * Update last export information.
@@ -156,7 +163,7 @@ abstract class Query extends cmdbAbstractObject
 	 * @throws \MySQLException
 	 * @since 3.1.0
 	 */
-	public function UpdateLastExportInformation() : void
+	public function UpdateLastExportInformation(): void
 	{
 		// last export information
 		$this->Set('export_last_date', date(AttributeDateTime::GetSQLFormat()));
@@ -173,53 +180,56 @@ class QueryOQL extends Query
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array('oql', 'is_template'),
+			"reconc_keys" => ['oql', 'is_template'],
 			"db_table" => "priv_query_oql",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-		);
+		];
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array(
+		MetaModel::Init_AddAttribute(new AttributeOQL("oql", [
 			"allowed_values" => null,
 			"sql" => "oql",
 			"default_value" => null,
 			"is_null_allowed" => false,
-			"depends_on" => array(),
+			"depends_on" => [],
-		)));
+		]));
-		MetaModel::Init_AddAttribute(new AttributeText("fields", array(
+		MetaModel::Init_AddAttribute(new AttributeText("fields", [
 			"allowed_values" => null,
 			"sql" => "fields",
 			"default_value" => null,
 			"is_null_allowed" => true,
-			"depends_on" => array(),
+			"depends_on" => [],
-		)));
+		]));
 		// Rolled back to AttributeText until AttributeQueryAttCodeSet can manage fields order correctly
 		//MetaModel::Init_AddAttribute(new AttributeQueryAttCodeSet("fields", array("allowed_values"=>null,"max_items" => 1000, "query_field" => "oql", "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array('oql'))));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details',
+		MetaModel::Init_SetZListItems(
-			array(
+			'details',
-				'col:col1' => array('fieldset:Query:baseinfo' => array('name', 'is_template', 'description', 'oql', 'fields')),
+			[
-				'col:col2' => array('fieldset:Query:exportInfo' => array('export_count', 'export_last_date', 'export_last_user_id', 'export_last_user_contact'))
+				'col:col1' => ['fieldset:Query:baseinfo' => ['name', 'is_template', 'description', 'oql', 'fields']],
-			)
+				'col:col2' => ['fieldset:Query:exportInfo' => ['export_count', 'export_last_date', 'export_last_user_id', 'export_last_user_contact']],
+			]
 		); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search',
+		MetaModel::Init_SetZListItems(
-			array('name', 'description', 'is_template', 'fields', 'oql')); // Criteria of the std search form
+			'standard_search',
+			['name', 'description', 'is_template', 'fields', 'oql']
+		); // Criteria of the std search form
 	}
 
 	/** @inheritdoc */
-	public function GetExportUrl(array $aValues = null) : ?string
+	public function GetExportUrl(array $aValues = null): ?string
 	{
-		try{
+		try {
 			// retrieve attributes
 			$sOql = $this->Get('oql');
 
@@ -233,17 +243,16 @@ class QueryOQL extends Query
 			$aParameters = $oSearch->GetQueryParams();
 			foreach ($aParameters as $sParam => $val) {
 				$paramValue = ($aValues === null || $aValues[$sParam] === null) ? $sParam : $aValues[$sParam];
-				$sUrl .= '&arg_' . $sParam . '=' . $paramValue;
+				$sUrl .= '&arg_'.$sParam.'='.$paramValue;
 			}
 
 			return $sUrl;
-		}
+		} catch (Exception $e) {
-		catch(Exception $e){
 			return null;
 		}
 	}
 
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = [])
 	{
 		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
 		$oPage->add_script("$('[name=\"attr_oql\"]').addClass('ibo-query-oql ibo-is-code'); $('[data-attribute-code=\"oql\"]').addClass('ibo-query-oql ibo-is-code');");
@@ -267,16 +276,14 @@ class QueryOQL extends Query
 
 				if (count($aParameters) == 0) {
 					$oBlock = new DisplayBlock($oSearch, 'list');
-					$aExtraParams = array(
+					$aExtraParams = [
 						//'menu' => $sShowMenu,
 						'table_id' => 'query_preview_'.$this->getKey(),
-					);
+					];
 					$sBlockId = 'block_query_preview_'.$this->GetKey(); // make a unique id (edition occuring in the same DOM)
 					$oBlock->Display($oPage, $sBlockId, $aExtraParams);
 				}
-			}
+			} catch (OQLException $e) {
-			catch
-			(OQLException $e) {
 				$oAlert = AlertUIBlockFactory::MakeForFailure(Dict::S('UI:RunQuery:Error'), $e->getHtmlDesc())
 					->SetIsClosable(false)
 					->SetIsCollapsible(false);
@@ -287,41 +294,38 @@ class QueryOQL extends Query
 		return $aFieldsMap;
 	}
 
-
+	// Rolled back until 'fields' can be properly managed by AttributeQueryAttCodeSet
-// Rolled back until 'fields' can be properly managed by AttributeQueryAttCodeSet
+	//
-//
+	//	public function ComputeValues()
-//	public function ComputeValues()
+	//	{
-//	{
+	//		parent::ComputeValues();
-//		parent::ComputeValues();
+	//
-//
+	//		// Remove unwanted attribute codes
-//		// Remove unwanted attribute codes
+	//		$aChanges = $this->ListChanges();
-//		$aChanges = $this->ListChanges();
+	//		if (isset($aChanges['fields']))
-//		if (isset($aChanges['fields']))
+	//		{
-//		{
+	//			$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'fields');
-//			$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'fields');
+	//			$aArgs = array('this' => $this);
-//			$aArgs = array('this' => $this);
+	//			$aAllowedValues = $oAttDef->GetAllowedValues($aArgs);
-//			$aAllowedValues = $oAttDef->GetAllowedValues($aArgs);
+	//
-//
+	//			/** @var \ormSet $oValue */
-//			/** @var \ormSet $oValue */
+	//			$oValue = $this->Get('fields');
-//			$oValue = $this->Get('fields');
+	//			$aValues = $oValue->GetValues();
-//			$aValues = $oValue->GetValues();
+	//			$bChanged = false;
-//			$bChanged = false;
+	//			foreach($aValues as $key => $sValue)
-//			foreach($aValues as $key => $sValue)
+	//			{
-//			{
+	//				if (!isset($aAllowedValues[$sValue]))
-//				if (!isset($aAllowedValues[$sValue]))
+	//				{
-//				{
+	//					unset($aValues[$key]);
-//					unset($aValues[$key]);
+	//					$bChanged = true;
-//					$bChanged = true;
+	//				}
-//				}
+	//			}
-//			}
+	//			if ($bChanged)
-//			if ($bChanged)
+	//			{
-//			{
+	//				$oValue->SetValues($aValues);
-//				$oValue->SetValues($aValues);
+	//				$this->Set('fields', $oValue);
-//				$this->Set('fields', $oValue);
+	//			}
-//			}
+	//		}
-//		}
+	//	}
-//	}
 
 }
-
-?>

application/shortcut.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -18,7 +19,6 @@
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
 use Combodo\iTop\Application\WebPage\WebPage;
 
-
 /**
  * Persistent class Shortcut and derived
  * Shortcuts of any kind
@@ -31,32 +31,32 @@ abstract class Shortcut extends DBObject implements iDisplay
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category" => "gui,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => [],
 			"db_table" => "priv_shortcut",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-		);
+		];
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", ["targetclass" => "User", "allowed_values" => null, "sql" => "user_id", "is_null_allowed" => true, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", ["allowed_values" => null, "sql" => "name", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeText("context", array("allowed_values"=>null, "sql"=>"context", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("context", ["allowed_values" => null, "sql" => "context", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'context')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['name', 'context']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['name']); // Attributes to be displayed for a list
 		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+		//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 
-	abstract public function RenderContent(WebPage $oPage, $aExtraParams = array());
+	abstract public function RenderContent(WebPage $oPage, $aExtraParams = []);
 
 	protected function OnInsert()
 	{
@@ -81,7 +81,7 @@ abstract class Shortcut extends DBObject implements iDisplay
 		$iShortcut = $this->GetKey();
 
 		$oPage->add_ready_script(
-<<<EOF
+			<<<EOF
 function ShortcutRenameOK() 
 {
 	var oForm = $(this).find('form');
@@ -137,13 +137,13 @@ EOF
 		return '';
 	}
 
-	function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	public function DisplayDetails(WebPage $oPage, $bEditMode = false)
 	{
 	}
 
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = [])
 	{
-		return array();
+		return [];
 	}
 	// End of the minimal implementation of iDisplay
 }
@@ -152,41 +152,39 @@ class ShortcutOQL extends Shortcut
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category" => "gui,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => [],
 			"db_table" => "priv_shortcut_oql",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-		);
+		];
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("oql", ["allowed_values" => null, "sql" => "oql", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeEnum("auto_reload", array("allowed_values"=>new ValueSetEnum('none,custom'), "sql"=>"auto_reload", "default_value"=>"none", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("auto_reload", ["allowed_values" => new ValueSetEnum('none,custom'), "sql" => "auto_reload", "default_value" => "none", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeInteger("auto_reload_sec", array("allowed_values"=>null, "sql"=>"auto_reload_sec", "default_value"=>60, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("auto_reload_sec", ["allowed_values" => null, "sql" => "auto_reload_sec", "default_value" => 60, "is_null_allowed" => false, "depends_on" => []]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'context', 'oql')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', ['name', 'context', 'oql']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['name']); // Attributes to be displayed for a list
 		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+		//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
 		$oPage->set_title($this->Get('name'));
 
-		switch($this->Get('auto_reload'))
+		switch ($this->Get('auto_reload')) {
-		{
 			case 'custom':
 				$iRate = (int)$this->Get('auto_reload_sec');
-			if ($iRate > 0)
+				if ($iRate > 0) {
-			{
 					// Must a string otherwise it can be evaluated to 'true' and defaults to "standard" refresh rate!
 					$aExtraParams['auto_reload'] = (string)$iRate;
 				}
@@ -198,12 +196,9 @@ class ShortcutOQL extends Shortcut
 
 		$bSearchPane = true;
 		$bSearchOpen = true;
-		try
+		try {
-		{
 			OQLMenuNode::RenderOQLSearch($this->Get('oql'), $this->Get('name'), 'shortcut_'.$this->GetKey(), $bSearchPane, $bSearchOpen, $oPage, $aExtraParams, true);
-		}
+		} catch (Exception $e) {
-		catch (Exception $e)
-		{
 			throw new Exception("The OQL shortcut '".$this->Get('name')."' (id: ".$this->GetKey().") could not be displayed: ".$e->getMessage());
 		}
 
@@ -226,12 +221,9 @@ class ShortcutOQL extends Shortcut
 
 		// Find a unique default name
 		// -> The class of the query + an index if necessary
-		if ($sOQL == null)
+		if ($sOQL == null) {
-		{
 			$sDefault = '';
-		}
+		} else {
-		else
-		{
 			$oBMSearch = new DBObjectSearch('Shortcut');
 			$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
 			$oBMSet = new DBObjectSet($oBMSearch);
@@ -287,7 +279,7 @@ class ShortcutOQL extends Shortcut
 		$sRateTitle = addslashes(Dict::Format('Class:ShortcutOQL/Attribute:auto_reload_sec/tip', MetaModel::GetConfig()->Get('min_reload_interval')));
 
 		$oPage->add_ready_script(
-<<<JS
+			<<<JS
 // Note: the title gets deleted by the validation mechanism
 $("#attr_auto_reload_sec").attr('data-tooltip-content', '$sRateTitle');
 CombodoTooltip.InitTooltipFromMarkup($("#attr_auto_reload_sec"));

application/startup.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -23,7 +24,6 @@ require_once(APPROOT.'core/contexttag.class.inc.php');
 require_once(APPROOT.'core/kpi.class.inc.php');
 require_once(APPROOT.'setup/setuputils.class.inc.php');
 
-
 /**
  * File to include to initialize the datamodel in memory
  *
@@ -36,12 +36,10 @@ ExecutionKPI::EnableMemory(1);
 
 // This storage is freed on error (case of allowed memory exhausted)
 $sReservedMemory = str_repeat('*', 1024 * 1024);
-register_shutdown_function(function()
+register_shutdown_function(function () {
-{
 	global $sReservedMemory;
 	$sReservedMemory = null;
-	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
+	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR)) {
-	{
 		// Remove stack trace from MySQLException (since 2.7.2 see N°3174)
 		$sMessage = $err['message'];
 		if (strpos($sMessage, 'MySQLException') !== false) {
@@ -71,38 +69,30 @@ $oKPI->ComputeAndReport("Session Start");
 
 $sSwitchEnv = utils::ReadParam('switch_env', null);
 $bAllowCache = true;
-if (($sSwitchEnv != null) && file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE) &&( Session::Get('itop_env') !== $sSwitchEnv))
+if (($sSwitchEnv != null) && file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE) && (Session::Get('itop_env') !== $sSwitchEnv)) {
-{
 	Session::Set('itop_env', $sSwitchEnv);
 	$sEnv = $sSwitchEnv;
 	$bAllowCache = false;
 	// Reset the opcache since otherwise the PHP "model" files may still be cached !!
-    if (function_exists('opcache_reset'))
+	if (function_exists('opcache_reset')) {
-    {
 		// Zend opcode cache
 		opcache_reset();
 	}
-    if (function_exists('apc_clear_cache'))
+	if (function_exists('apc_clear_cache')) {
-    {
 		// APC(u) cache
 		apc_clear_cache();
 	}
 	// TODO: reset the credentials as well ??
-}
+} elseif (Session::IsSet('itop_env')) {
-else if (Session::IsSet('itop_env'))
-{
 	$sEnv = Session::Get('itop_env');
-}
+} else {
-else
-{
 	$sEnv = ITOP_DEFAULT_ENV;
 	Session::Set('itop_env', ITOP_DEFAULT_ENV);
 }
 $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
 try {
 	MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);
-}
+} catch (MySQLException $e) {
-catch (MySQLException $e) {
 	IssueLog::Debug($e->getMessage());
 	throw new MySQLException('Could not connect to the DB server', []);
 }

application/themehandler.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2024 Combodo SAS
  *
@@ -25,7 +26,7 @@
  */
 class ThemeHandler
 {
-	const IMAGE_EXTENSIONS = ['png', 'gif', 'jpg', 'jpeg'];
+	public const IMAGE_EXTENSIONS = ['png', 'gif', 'jpg', 'jpeg'];
 
 	/** @var \CompileCSSService */
 	private static $oCompileCSSService;
@@ -50,7 +51,7 @@ class ThemeHandler
 				'imports' => [],
 				'stylesheets' => [
 					'main' => '../css/backoffice/main.scss',
-				]
+				],
 			],
 		];
 	}
@@ -63,8 +64,7 @@ class ThemeHandler
 	{
 		try {
 			$sThemeId = utils::GetConfig()->Get('backoffice_default_theme');
-		}
+		} catch (CoreException $oCompileException) {
-		catch (CoreException $oCompileException) {
 			// Fallback on our default theme in case the config. is not available yet
 			$aDefaultTheme = ThemeHandler::GetDefaultThemeInformation();
 			$sThemeId = $aDefaultTheme['name'];
@@ -85,8 +85,7 @@ class ThemeHandler
 			if (true === utils::GetConfig()->Get('user_preferences.allow_backoffice_theme_override')) {
 				$sThemeId = appUserPreferences::GetPref('backoffice_theme', null);
 			}
-		}
+		} catch (Exception $oException) {
-		catch (Exception $oException) {
 			// Do nothing, already handled by $sThemeId null by default
 		}
 
@@ -201,8 +200,7 @@ class ThemeHandler
 			if (static::ShouldThemeSignatureCheckBeForced($sThemeId)) {
 				static::CompileTheme($sThemeId);
 			}
-		}
+		} catch (CoreException $oCompileException) {
-		catch (CoreException $oCompileException) {
 			// Fallback on our default theme (should always be compilable) in case the previous theme doesn't exists
 			$aDefaultTheme = ThemeHandler::GetDefaultThemeInformation();
 			$sThemeId = $aDefaultTheme['name'];
@@ -258,13 +256,16 @@ class ThemeHandler
 	 * @throws \CoreException
 	 * @return boolean: indicate whether theme compilation occured
 	 */
-	public static function CompileTheme($sThemeId, $bSetup=false, $sSetupCompilationTimestamp="", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null) {
+	public static function CompileTheme($sThemeId, $bSetup = false, $sSetupCompilationTimestamp = "", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null)
+	{
 		if ($sSetupCompilationTimestamp === "") {
 			$sSetupCompilationTimestamp = microtime(true);
 		}
 
-		$sSetupCompilationTimestampInSecunds = (strpos($sSetupCompilationTimestamp, '.') !== false) ? explode('.',
+		$sSetupCompilationTimestampInSecunds = (strpos($sSetupCompilationTimestamp, '.') !== false) ? explode(
-			$sSetupCompilationTimestamp)[0] : $sSetupCompilationTimestamp;
+			'.',
+			$sSetupCompilationTimestamp
+		)[0] : $sSetupCompilationTimestamp;
 
 		$sEnv = APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
 
@@ -317,7 +318,7 @@ class ThemeHandler
 			}
 		}
 
-		foreach ($oFindStylesheetObject->GetStylesheetFileURIs() as $sStylesheet){
+		foreach ($oFindStylesheetObject->GetStylesheetFileURIs() as $sStylesheet) {
 			$sTmpThemeScssContent .= '@import "'.$sStylesheet.'";'."\n";
 		}
 
@@ -329,11 +330,9 @@ class ThemeHandler
 
 		$iStyleLastModified = $oFindStylesheetObject->GetLastModified();
 
-		$aIncludedImages=static::GetIncludedImages($aThemeParametersWithVersion, $oFindStylesheetObject->GetAllStylesheetPaths(), $sThemeId);
+		$aIncludedImages = static::GetIncludedImages($aThemeParametersWithVersion, $oFindStylesheetObject->GetAllStylesheetPaths(), $sThemeId);
-		foreach ($aIncludedImages as $sImage)
+		foreach ($aIncludedImages as $sImage) {
-		{
+			if (is_file($sImage)) {
-			if (is_file($sImage))
-			{
 				$iStylesheetLastModified = @filemtime($sImage);
 				$iStyleLastModified = $iStyleLastModified < $iStylesheetLastModified ? $iStylesheetLastModified : $iStyleLastModified;
 			}
@@ -342,34 +341,28 @@ class ThemeHandler
 		// Checking if our compiled css is outdated
 		$iFilemetime = @filemtime($sThemeCssPath);
 		$bFileExists = file_exists($sThemeCssPath);
-		$bVarSignatureChanged=false;
+		$bVarSignatureChanged = false;
-		if ($bFileExists && $bSetup)
+		if ($bFileExists && $bSetup) {
-		{
 			$sPrecompiledSignature = static::GetSignature($sThemeCssPath);
 			//check variable signature has changed which is independant from any file modification
-			if (!empty($sPrecompiledSignature)){
+			if (!empty($sPrecompiledSignature)) {
 				$sPreviousVariableSignature = static::GetVarSignature($sPrecompiledSignature);
 				$sCurrentVariableSignature = md5(json_encode($aThemeParameters['variables']));
-				$bVarSignatureChanged= ($sPreviousVariableSignature!==$sCurrentVariableSignature);
+				$bVarSignatureChanged = ($sPreviousVariableSignature !== $sCurrentVariableSignature);
 			}
 		}
 
-		if (!$bFileExists || $bVarSignatureChanged || (is_writable($sThemeFolderPath) && ($iFilemetime < $iStyleLastModified)))
+		if (!$bFileExists || $bVarSignatureChanged || (is_writable($sThemeFolderPath) && ($iFilemetime < $iStyleLastModified))) {
-		{
 			// Dates don't match. Second chance: check if the already compiled stylesheet exists and is consistent based on its signature
 			$sActualSignature = static::ComputeSignature($aThemeParameters, $aImportsPaths, $aIncludedImages);
 
-			if ($bFileExists && !$bSetup)
+			if ($bFileExists && !$bSetup) {
-			{
 				$sPrecompiledSignature = static::GetSignature($sThemeCssPath);
 			}
 
-			if (!empty($sPrecompiledSignature) && $sActualSignature == $sPrecompiledSignature)
+			if (!empty($sPrecompiledSignature) && $sActualSignature == $sPrecompiledSignature) {
-			{
 				touch($sThemeCssPath); // Stylesheet is up to date, mark it as more recent to speedup next time
-			}
+			} else {
-			else
-			{
 				// Alas, we really need to recompile
 				// Add the signature to the generated CSS file so that the file can be used as a precompiled stylesheet if needed
 				$sSignatureComment =
@@ -381,14 +374,16 @@ $sActualSignature
 */
 
 CSS;
-				if (!static::$oCompileCSSService)
+				if (!static::$oCompileCSSService) {
-				{
 					static::$oCompileCSSService = new CompileCSSService();
 				}
 				//store it again to change $version with latest compiled time
 				SetupLog::Info("Compiling theme $sThemeId...");
-				$sTmpThemeCssContent = static::$oCompileCSSService->CompileCSSFromSASS($sTmpThemeScssContent, $aImportsPaths,
+				$sTmpThemeCssContent = static::$oCompileCSSService->CompileCSSFromSASS(
-					$aThemeParametersWithVersion);
+					$sTmpThemeScssContent,
+					$aImportsPaths,
+					$aThemeParametersWithVersion
+				);
 				SetupLog::Info("$sThemeId theme compilation done.");
 				file_put_contents($sThemeFolderPath.'/theme-parameters.json', json_encode($aThemeParameters));
 				file_put_contents($sThemeCssPath, $sSignatureComment.$sTmpThemeCssContent);
@@ -413,13 +408,14 @@ CSS;
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function ComputeSignature($aThemeParameters, $aImportsPaths, $aIncludedImages) {
+	public static function ComputeSignature($aThemeParameters, $aImportsPaths, $aIncludedImages)
+	{
 		$aSignature = [
 			'variables' => md5(json_encode($aThemeParameters['variables'])),
 			'stylesheets' => [],
 			'variable_imports' => [],
 			'images' => [],
-			'utility_imports' => []
+			'utility_imports' => [],
 		];
 
 		$oFindStylesheetObject = new FindStylesheetObject();
@@ -461,8 +457,7 @@ CSS;
 			}
 		}
 
-		foreach ($aIncludedImages as $sImage)
+		foreach ($aIncludedImages as $sImage) {
-		{
 			if (is_file($sImage)) {
 				$sUri = str_replace(self::GetAppRootWithSlashes(), '', $sImage);
 				$aSignature['images'][$sUri] = md5_file($sImage);
@@ -489,7 +484,7 @@ CSS;
 		$aCompleteUrls = [];
 		$aToCompleteUrls = [];
 		$aMissingVariables = [];
-		$aFoundVariables = ['version'=>''];
+		$aFoundVariables = ['version' => ''];
 		$aMap = [
 			'aCompleteUrls' => $aCompleteUrls,
 			'aToCompleteUrls' => $aToCompleteUrls,
@@ -497,14 +492,11 @@ CSS;
 			'aFoundVariables' => $aFoundVariables,
 		];
 
-		foreach ($aStylesheetFiles as $sStylesheetFile)
+		foreach ($aStylesheetFiles as $sStylesheetFile) {
-		{
 			$aRes = static::GetAllUrlFromScss($aThemeParametersVariables, $sStylesheetFile);
 			/** @var array $aVal */
-			foreach($aMap as $key => $aVal)
+			foreach ($aMap as $key => $aVal) {
-			{
+				if (array_key_exists($key, $aMap)) {
-				if (array_key_exists($key, $aMap))
-				{
 					$aMap[$key] = array_merge($aVal, $aRes[$key]);
 				}
 			}
@@ -513,17 +505,14 @@ CSS;
 		$aMap = static::ResolveUncompleteUrlsFromScss($aMap, $aThemeParametersVariables, $aStylesheetFiles);
 		$aImages = [];
 
-		foreach ($aMap ['aCompleteUrls'] as $sUri => $sUrl)
+		foreach ($aMap ['aCompleteUrls'] as $sUri => $sUrl) {
-		{
 			$sImg = $sUrl;
-			if (preg_match("/(.*)\?/", $sUrl, $aMatches))
+			if (preg_match("/(.*)\?/", $sUrl, $aMatches)) {
-			{
+				$sImg = $aMatches[1];
-				$sImg=$aMatches[1];
 			}
 
 			if (static::HasImageExtension($sImg)
-				&& ! array_key_exists($sImg, $aImages))
+				&& ! array_key_exists($sImg, $aImages)) {
-			{
 				$sFilePath = utils::RealPath($sImg, APPROOT);
 				if ($sFilePath !== false) {
 					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
@@ -554,8 +543,8 @@ CSS;
 	 */
 	public static function CanonicalizePath($path)
 	{
-		$path = explode('/', str_replace('//','/', $path));
+		$path = explode('/', str_replace('//', '/', $path));
-		$stack = array();
+		$stack = [];
 		foreach ($path as $seg) {
 			if ($seg == '..') {
 				// Ignore this segment, remove last segment from stack
@@ -585,25 +574,23 @@ CSS;
 	 */
 	public static function ResolveUncompleteUrlsFromScss($aMap, $aThemeParametersVariables, $aStylesheetFile)
 	{
-		$sContent="";
+		$sContent = "";
-		foreach ($aStylesheetFile as $sStylesheetFile)
+		foreach ($aStylesheetFile as $sStylesheetFile) {
-		{
+			if (is_file($sStylesheetFile)) {
-			if (is_file($sStylesheetFile))
+				$sContent .= '\n'.file_get_contents($sStylesheetFile);
-			{
-				$sContent .= '\n' . file_get_contents($sStylesheetFile);
 			}
 		}
 
-		$aMissingVariables=$aMap['aMissingVariables'];
+		$aMissingVariables = $aMap['aMissingVariables'];
-		$aFoundVariables=$aMap['aFoundVariables'];
+		$aFoundVariables = $aMap['aFoundVariables'];
-		$aToCompleteUrls=$aMap['aToCompleteUrls'];
+		$aToCompleteUrls = $aMap['aToCompleteUrls'];
-		$aCompleteUrls=$aMap['aCompleteUrls'];
+		$aCompleteUrls = $aMap['aCompleteUrls'];
 		list($aMissingVariables, $aFoundVariables) = static::FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent, true);
 		list($aToCompleteUrls, $aCompleteUrls) = static::ResolveUrls($aFoundVariables, $aToCompleteUrls, $aCompleteUrls);
-		$aMap['aMissingVariables']=$aMissingVariables;
+		$aMap['aMissingVariables'] = $aMissingVariables;
-		$aMap['aFoundVariables']=$aFoundVariables;
+		$aMap['aFoundVariables'] = $aFoundVariables;
-		$aMap['aToCompleteUrls']=$aToCompleteUrls;
+		$aMap['aToCompleteUrls'] = $aToCompleteUrls;
-		$aMap['aCompleteUrls']=$aCompleteUrls;
+		$aMap['aCompleteUrls'] = $aCompleteUrls;
 		return $aMap;
 	}
 
@@ -619,43 +606,29 @@ CSS;
 	 *
 	 * @return array
 	 */
-	public static function FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent, $bForceEmptyValueWhenNotFound=false)
+	public static function FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent, $bForceEmptyValueWhenNotFound = false)
 	{
 		$aNewMissingVars = [];
-		if (!empty($aMissingVariables))
+		if (!empty($aMissingVariables)) {
-		{
+			foreach ($aMissingVariables as $var) {
-			foreach ($aMissingVariables as $var)
+				if (array_key_exists($var, $aThemeParametersVariables)) {
-			{
-				if (array_key_exists($var, $aThemeParametersVariables))
-				{
 					$aFoundVariables[$var] = $aThemeParametersVariables[$var];
-				}
+				} else {
-				else
+					if (preg_match_all("/\\\$$var\s*:\s*[\"']{0,1}(.*)[\"']{0,1};/", $sContent, $aValues)) {
-				{
-					if (preg_match_all("/\\\$$var\s*:\s*[\"']{0,1}(.*)[\"']{0,1};/", $sContent, $aValues))
-					{
 						$sValue = $aValues[1][0];
-						if (preg_match_all("/([^!]+)!/", $sValue, $aSubValues))
+						if (preg_match_all("/([^!]+)!/", $sValue, $aSubValues)) {
-						{
 							$sValue = trim($aSubValues[1][0], ' "\'');
 						}
 
-						if (strpos($sValue, '$') === false)
+						if (strpos($sValue, '$') === false) {
-						{
 							$aFoundVariables[$var] = $sValue;
-						}
+						} else {
-						else{
 							$aNewMissingVars[] = $var;
 						}
-					}
+					} else {
-					else
+						if ($bForceEmptyValueWhenNotFound) {
-					{
-						if ($bForceEmptyValueWhenNotFound)
-						{
 							$aFoundVariables[$var] = '';
-						}
+						} else {
-						else
-						{
 							$aNewMissingVars[] = $var;
 						}
 					}
@@ -676,32 +649,23 @@ CSS;
 	 */
 	public static function ResolveUrls($aFoundVariables, array $aToCompleteUrls, array $aCompleteUrls)
 	{
-		if (!empty($aFoundVariables))
+		if (!empty($aFoundVariables)) {
-		{
 			$aFoundVariablesWithEmptyValue = [];
-			foreach ($aFoundVariables as $aFoundVariable => $sValue)
+			foreach ($aFoundVariables as $aFoundVariable => $sValue) {
-			{
 				$aFoundVariablesWithEmptyValue[$aFoundVariable] = '';
 			}
 
-			foreach ($aToCompleteUrls as $sUrlTemplate)
+			foreach ($aToCompleteUrls as $sUrlTemplate) {
-			{
 				unset($aToCompleteUrls[$sUrlTemplate]);
 				$sResolvedUrl = static::ResolveUrl($sUrlTemplate, $aFoundVariables);
-				if ($sResolvedUrl == false)
+				if ($sResolvedUrl == false) {
-				{
 					$aToCompleteUrls[$sUrlTemplate] = $sUrlTemplate;
-				}
+				} else {
-				else
-				{
 					$sUri = static::ResolveUrl($sUrlTemplate, $aFoundVariablesWithEmptyValue);
 					$aExplodedUri = explode('?', $sUri);
-					if (empty($aExplodedUri))
+					if (empty($aExplodedUri)) {
-					{
 						$aCompleteUrls[$sUri] = $sResolvedUrl;
-					}
+					} else {
-					else
-					{
 						$aCompleteUrls[$aExplodedUri[0]] = $sResolvedUrl;
 					}
 				}
@@ -726,41 +690,31 @@ CSS;
 		$aMissingVariables = [];
 		$aFoundVariables = [];
 
-		if (is_file($sStylesheetFile))
+		if (is_file($sStylesheetFile)) {
-		{
 			$sContent = file_get_contents($sStylesheetFile);
-			if (preg_match_all("/url\s*\((.*)\)/", $sContent, $aMatches))
+			if (preg_match_all("/url\s*\((.*)\)/", $sContent, $aMatches)) {
-			{
+				foreach ($aMatches[1] as $path) {
-				foreach ($aMatches[1] as $path)
-				{
 					$iRemainingClosingParenthesisPos = strpos($path, ')');
-					if ($iRemainingClosingParenthesisPos !== false){
+					if ($iRemainingClosingParenthesisPos !== false) {
 						$path = substr($path, 0, $iRemainingClosingParenthesisPos);
 					}
 					if (!array_key_exists($path, $aCompleteUrls)
-						&& !array_key_exists($path, $aToCompleteUrls))
+						&& !array_key_exists($path, $aToCompleteUrls)) {
-					{
+						if (preg_match_all("/\\$([\w\-_]+)/", $path, $aCurrentVars)) {
-						if (preg_match_all("/\\$([\w\-_]+)/", $path, $aCurrentVars))
-						{
 							/** @var string $aCurrentVars */
-							foreach ($aCurrentVars[1] as $var)
+							foreach ($aCurrentVars[1] as $var) {
-							{
+								if (!array_key_exists($var, $aMissingVariables)) {
-								if (!array_key_exists($var, $aMissingVariables))
-								{
 									$aMissingVariables[$var] = $var;
 								}
 							}
 							$aToCompleteUrls[$path] = $path;
-						}
+						} else {
-						else
-						{
 							$aCompleteUrls[$path] = trim($path, "\"'");
 						}
 					}
 				}
 			}
-			if (!empty($aMissingVariables))
+			if (!empty($aMissingVariables)) {
-			{
 				list($aMissingVariables, $aFoundVariables) = static::FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent);
 				list($aToCompleteUrls, $aCompleteUrls) = static::ResolveUrls($aFoundVariables, $aToCompleteUrls, $aCompleteUrls);
 			}
@@ -770,7 +724,7 @@ CSS;
 			'aCompleteUrls' => $aCompleteUrls,
 			'aToCompleteUrls' => $aToCompleteUrls,
 			'aMissingVariables' => $aMissingVariables,
-			'aFoundVariables' => $aFoundVariables
+			'aFoundVariables' => $aFoundVariables,
 		];
 	}
 
@@ -784,23 +738,21 @@ CSS;
 	 */
 	public static function ResolveUrl($sUrlTemplate, $aFoundVariables)
 	{
-		$aPattern= [];
+		$aPattern = [];
-		$aReplacement= [];
+		$aReplacement = [];
-		foreach ($aFoundVariables as $aFoundVariable => $aFoundVariableValue)
+		foreach ($aFoundVariables as $aFoundVariable => $aFoundVariableValue) {
-		{
 			//XX + $key + YY
-			$aPattern[]="/['\"]\s*\+\s*\\\$" . $aFoundVariable . "[\s\+]+\s*['\"]/";
+			$aPattern[] = "/['\"]\s*\+\s*\\\$".$aFoundVariable."[\s\+]+\s*['\"]/";
-			$aReplacement[]=$aFoundVariableValue;
+			$aReplacement[] = $aFoundVariableValue;
 			//$key + YY
-			$aPattern[]="/\\\$" . $aFoundVariable. "[\s\+]+\s*['\"]/";
+			$aPattern[] = "/\\\$".$aFoundVariable."[\s\+]+\s*['\"]/";
-			$aReplacement[]=$aFoundVariableValue;
+			$aReplacement[] = $aFoundVariableValue;
 			//XX + $key
-			$aPattern[]="/['\"]\s*[\+\s]+\\\$" . $aFoundVariable . "$/";
+			$aPattern[] = "/['\"]\s*[\+\s]+\\\$".$aFoundVariable."$/";
-			$aReplacement[]=$aFoundVariableValue;
+			$aReplacement[] = $aFoundVariableValue;
 		}
-		$sResolvedUrl=preg_replace($aPattern, $aReplacement, $sUrlTemplate);
+		$sResolvedUrl = preg_replace($aPattern, $aReplacement, $sUrlTemplate);
-		if (strpos($sResolvedUrl, "+")!==false)
+		if (strpos($sResolvedUrl, "+") !== false) {
-		{
 			return false;
 		}
 		return trim($sResolvedUrl, "\"'");
@@ -814,17 +766,14 @@ CSS;
 	 */
 	private static function HasImageExtension($path)
 	{
-		foreach (static::IMAGE_EXTENSIONS as $sExt)
+		foreach (static::IMAGE_EXTENSIONS as $sExt) {
-		{
+			if (endsWith($path, $sExt)) {
-			if (endsWith($path, $sExt))
-			{
 				return true;
 			}
 		}
 		return false;
 	}
 
-
 	/**
 	 * @since 3.0.0 N°2982
 	 * Extract the signature for a generated CSS file.
@@ -843,16 +792,13 @@ CSS;
 		$iCount = 0;
 		$sPreviousLine = '';
 		$hFile = @fopen($sFilepath, "r");
-		if ($hFile !== false)
+		if ($hFile !== false) {
-		{
 			$sLine = '';
-			do
+			do {
-			{
 				$iCount++;
 				$sPreviousLine = $sLine;
 				$sLine = rtrim(fgets($hFile)); // Remove the trailing \n
-			}
+			} while (($sLine !== false) && ($sLine != '=== SIGNATURE END ===') && ($iCount <= 100));
-			while (($sLine !== false) && ($sLine != '=== SIGNATURE END ===') && ($iCount <= 100));
 			fclose($hFile);
 		}
 		return $sPreviousLine;
@@ -867,8 +813,7 @@ CSS;
 	public static function GetVarSignature($JsonSignature)
 	{
 		$aJsonArray = json_decode($JsonSignature, true);
-		if (array_key_exists('variables', $aJsonArray))
+		if (array_key_exists('variables', $aJsonArray)) {
-		{
 			return $aJsonArray['variables'];
 		}
 		return false;
@@ -892,23 +837,22 @@ CSS;
 			$oFindStylesheetObject->ResetLastStyleSheet();
 		}
 
-		foreach($aImportsPaths as $sPath)
+		foreach ($aImportsPaths as $sPath) {
-		{
 			$sAlterableFileURI = $sFileURI;
 			$sFilePath = $sPath.'/'.$sAlterableFileURI;
 			$sImportedFile = realpath($sFilePath);
-			if ($sImportedFile === false){
+			if ($sImportedFile === false) {
 				// Handle shortcut syntax : @import "typo" ;
 				// file matched: typo.scss
 				$sFilePath2 = "$sFilePath.scss";
 				$sImportedFile = realpath($sFilePath2);
-				if ($sImportedFile){
+				if ($sImportedFile) {
 					self::FindStylesheetFile("$sAlterableFileURI.scss", [ $sPath ], $oFindStylesheetObject, $bImports);
 					$sImportedFile = false;
 				}
 			}
 
-			if ($sImportedFile === false){
+			if ($sImportedFile === false) {
 				// Handle shortcut syntax : @import "typo" ;
 				// file matched: _typo.scss
 				$sShortCut = substr($sFilePath, strrpos($sFilePath, '/') + 1);
@@ -918,11 +862,10 @@ CSS;
 			}
 
 			if ((file_exists($sImportedFile))
-				&& (!$oFindStylesheetObject->AlreadyFetched($sImportedFile)))
+				&& (!$oFindStylesheetObject->AlreadyFetched($sImportedFile))) {
-			{
+				if ($bImports) {
-				if ($bImports){
 					$oFindStylesheetObject->AddImport($sAlterableFileURI, $sImportedFile);
-				}else{
+				} else {
 					$oFindStylesheetObject->AddStylesheet($sAlterableFileURI, $sImportedFile);
 				}
 				$oFindStylesheetObject->UpdateLastModified($sImportedFile);
@@ -930,8 +873,8 @@ CSS;
 				//Regexp matching on all included scss files : @import 'XXX.scss';
 				$sDirUri = dirname($sAlterableFileURI);
 				preg_match_all('/@import \s*[\"\']([^\"\']*)\s*[\"\']\s*;/', file_get_contents($sImportedFile), $aMatches);
-				if ( (is_array($aMatches)) && (count($aMatches)!==0) ){
+				if ((is_array($aMatches)) && (count($aMatches) !== 0)) {
-					foreach ($aMatches[1] as $sImportedFile){
+					foreach ($aMatches[1] as $sImportedFile) {
 						self::FindStylesheetFile("$sDirUri/$sImportedFile", [ $sPath ], $oFindStylesheetObject, true);
 					}
 				}
@@ -952,8 +895,7 @@ CSS;
 	{
 		$iPos = strrpos($sSubject, $sSearch);
 
-		if($iPos !== false)
+		if ($iPos !== false) {
-		{
 			$sSubject = substr_replace($sSubject, $sReplace, $iPos, strlen($sSearch));
 		}
 
@@ -982,18 +924,14 @@ CSS;
 	public static function CloneThemeParameterAndIncludeVersion($aThemeParameters, $bSetupCompilationTimestamp, $aImportsPaths)
 	{
 		$aThemeParametersVariable = [];
-		if (array_key_exists('variables', $aThemeParameters))
+		if (array_key_exists('variables', $aThemeParameters)) {
-		{
+			if (is_array($aThemeParameters['variables'])) {
-			if (is_array($aThemeParameters['variables']))
-			{
 				$aThemeParametersVariable = array_merge([], $aThemeParameters['variables']);
 			}
 		}
 
-		if (array_key_exists('variable_imports', $aThemeParameters))
+		if (array_key_exists('variable_imports', $aThemeParameters)) {
-		{
+			if (is_array($aThemeParameters['variable_imports'])) {
-			if (is_array($aThemeParameters['variable_imports']))
-			{
 				$aThemeParametersVariable = array_merge($aThemeParametersVariable, static::GetVariablesFromFile($aThemeParameters['variable_imports'], $aImportsPaths));
 			}
 		}
@@ -1009,11 +947,11 @@ CSS;
 	 * @return array
 	 * @since 3.0.0 N°3593
 	 */
-	public static function GetVariablesFromFile($aVariableFiles, $aImportsPaths){
+	public static function GetVariablesFromFile($aVariableFiles, $aImportsPaths)
-		$aVariablesResults = [];
-		foreach ($aVariableFiles as $sVariableFile)
 	{
-			foreach($aImportsPaths as $sPath) {
+		$aVariablesResults = [];
+		foreach ($aVariableFiles as $sVariableFile) {
+			foreach ($aImportsPaths as $sPath) {
 				$sFilePath = $sPath.'/'.$sVariableFile;
 				$sImportedFile = realpath($sFilePath);
 				if ($sImportedFile !== false) {
@@ -1029,9 +967,8 @@ CSS;
 				}
 			}
 		}
-		array_map( function($sVariableValue) { return ltrim($sVariableValue); }, $aVariablesResults );
+		array_map(function ($sVariableValue) { return ltrim($sVariableValue); }, $aVariablesResults);
 		return $aVariablesResults;
 	}
 
 }
-

application/themehandlerservice.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2024 Combodo SAS
  *
@@ -29,7 +30,8 @@ class ThemeHandlerService
 	{
 	}
 
-	public function CompileTheme($sThemeId, $bSetup = false, $sSetupCompilationTimestamp = "", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null){
+	public function CompileTheme($sThemeId, $bSetup = false, $sSetupCompilationTimestamp = "", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null)
+	{
 		return ThemeHandler::CompileTheme($sThemeId, $bSetup, $sSetupCompilationTimestamp, $aThemeParameters, $aImportsPaths, $sWorkingPath);
 	}
 }

application/transaction.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -37,13 +38,11 @@ class privUITransaction
 	public static function GetNewTransactionId()
 	{
 		$bTransactionsEnabled = MetaModel::GetConfig()->Get('transactions_enabled');
-		if (!$bTransactionsEnabled)
+		if (!$bTransactionsEnabled) {
-		{
 			return 'notransactions'; // Any value will do
 		}
 		$sClass = 'privUITransaction'.MetaModel::GetConfig()->Get('transaction_storage');
-		if (!class_exists($sClass, false))
+		if (!class_exists($sClass, false)) {
-		{
 			IssueLog::Error("Incorrect value '".MetaModel::GetConfig()->Get('transaction_storage')."' for 'transaction_storage', the class '$sClass' does not exists. Using privUITransactionSession instead for storing sessions.");
 			$sClass = 'privUITransactionSession';
 		}
@@ -62,13 +61,11 @@ class privUITransaction
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
 		$bTransactionsEnabled = MetaModel::GetConfig()->Get('transactions_enabled');
-		if (!$bTransactionsEnabled)
+		if (!$bTransactionsEnabled) {
-		{
 			return true; // All values are valid
 		}
 		$sClass = 'privUITransaction'.MetaModel::GetConfig()->Get('transaction_storage');
-		if (!class_exists($sClass, false))
+		if (!class_exists($sClass, false)) {
-		{
 			$sClass = 'privUITransactionSession';
 		}
 
@@ -83,13 +80,11 @@ class privUITransaction
 	public static function RemoveTransaction($id)
 	{
 		$bTransactionsEnabled = MetaModel::GetConfig()->Get('transactions_enabled');
-		if (!$bTransactionsEnabled)
+		if (!$bTransactionsEnabled) {
-		{
 			return; // Nothing to do
 		}
 		$sClass = 'privUITransaction'.MetaModel::GetConfig()->Get('transaction_storage');
-		if (!class_exists($sClass, false))
+		if (!class_exists($sClass, false)) {
-		{
 			$sClass = 'privUITransactionSession';
 		}
 
@@ -114,14 +109,13 @@ class privUITransactionSession
 	 */
 	public static function GetNewTransactionId()
 	{
-		if (!Session::IsSet('transactions'))
+		if (!Session::IsSet('transactions')) {
-		{
 			Session::Set('transactions', []);
 		}
 		// Strictly speaking, the two lines below should be grouped together
 		// by a critical section
 		// sem_acquire($rSemIdentified);
-		$id = static::GetUserPrefix() . str_replace(array('.', ' '), '', microtime());
+		$id = static::GetUserPrefix().str_replace(['.', ' '], '', microtime());
 		Session::Set(['transactions', $id], true);
 		// sem_release($rSemIdentified);
 
@@ -139,16 +133,13 @@ class privUITransactionSession
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
 		$bResult = false;
-		if (Session::IsSet('transactions'))
+		if (Session::IsSet('transactions')) {
-		{
 			// Strictly speaking, the eight lines below should be grouped together
 			// inside the same critical section as above
 			// sem_acquire($rSemIdentified);
-			if (Session::IsSet(['transactions', $id]))
+			if (Session::IsSet(['transactions', $id])) {
-			{
 				$bResult = true;
-				if ($bRemoveTransaction)
+				if ($bRemoveTransaction) {
-				{
 					Session::Unset(['transactions', $id]);
 				}
 			}
@@ -164,13 +155,11 @@ class privUITransactionSession
 	 */
 	public static function RemoveTransaction($id)
 	{
-		if (Session::IsSet('transactions'))
+		if (Session::IsSet('transactions')) {
-		{
 			// Strictly speaking, the three lines below should be grouped together
 			// inside the same critical section as above
 			// sem_acquire($rSemIdentified);
-			if (Session::IsSet(['transactions', $id]))
+			if (Session::IsSet(['transactions', $id])) {
-			{
 				Session::Unset(['transactions', $id]);
 			}
 			// sem_release($rSemIdentified);
@@ -197,7 +186,7 @@ class privUITransactionSession
 class privUITransactionFile
 {
 	/** @var int Value to use when no user logged */
-	const UNAUTHENTICATED_USER_ID = -666;
+	public const UNAUTHENTICATED_USER_ID = -666;
 
 	/**
 	 * @return int current user id, or {@see self::UNAUTHENTICATED_USER_ID} if no user logged
@@ -228,22 +217,18 @@ class privUITransactionFile
 	 */
 	public static function GetNewTransactionId()
 	{
-		if (!is_dir(utils::GetDataPath().'transactions'))
+		if (!is_dir(utils::GetDataPath().'transactions')) {
-		{
+			if (!is_writable(APPROOT.'data')) {
-			if (!is_writable(APPROOT.'data'))
-			{
 				throw new Exception('The directory "'.APPROOT.'data" must be writable to the application.');
 			}
 			// condition avoids race condition N°2345
 			// See https://github.com/kalessil/phpinspectionsea/blob/master/docs/probable-bugs.md#mkdir-race-condition
-			if (!mkdir($concurrentDirectory = utils::GetDataPath().'transactions') && !is_dir($concurrentDirectory))
+			if (!mkdir($concurrentDirectory = utils::GetDataPath().'transactions') && !is_dir($concurrentDirectory)) {
-			{
 				throw new Exception('Failed to create the directory "'.utils::GetDataPath().'transactions". Ajust the rights on the parent directory or let an administrator create the transactions directory and give the web sever enough rights to write into it.');
 			}
 		}
 
-		if (!is_writable(utils::GetDataPath().'transactions'))
+		if (!is_writable(utils::GetDataPath().'transactions')) {
-		{
 			throw new Exception('The directory "'.utils::GetDataPath().'transactions" must be writable to the application.');
 		}
 
@@ -277,8 +262,7 @@ class privUITransactionFile
 		// Constraint the transaction file within utils::GetDataPath().'transactions'
 		$sTransactionDir = realpath(utils::GetDataPath().'transactions');
 		$sFilepath = utils::RealPath($sTransactionDir.'/'.$id, $sTransactionDir);
-		if (($sFilepath === false) || (strlen($sTransactionDir) == strlen($sFilepath)))
+		if (($sFilepath === false) || (strlen($sTransactionDir) == strlen($sFilepath))) {
-		{
 			return false;
 		}
 
@@ -297,15 +281,11 @@ class privUITransactionFile
 			return false;
 		}
 
-		if ($bRemoveTransaction)
+		if ($bRemoveTransaction) {
-		{
 			$bResult = @unlink($sFilepath);
-			if (!$bResult)
+			if (!$bResult) {
-			{
 				self::Error('IsTransactionValid: FAILED to remove transaction '.$id);
-			}
+			} else {
-			else
-			{
 				self::Info('IsTransactionValid: OK. Removed transaction: '.$id);
 			}
 		}
@@ -347,13 +327,11 @@ class privUITransactionFile
 		}
 
 		clearstatcache();
-		$iLimit = time() - 24*3600;
+		$iLimit = time() - 24 * 3600;
 		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : utils::GetDataPath().'transactions/*';
 		$aTransactions = glob($sPattern);
-		foreach($aTransactions as $sFileName)
+		foreach ($aTransactions as $sFileName) {
-		{
+			if (filemtime($sFileName) < $iLimit) {
-			if (filemtime($sFileName) < $iLimit)
-			{
 				@unlink($sFileName);
 				self::Info('CleanupOldTransactions: Deleted transaction: '.$sFileName);
 			}
@@ -367,10 +345,9 @@ class privUITransactionFile
 	protected static function GetPendingTransactions()
 	{
 		clearstatcache();
-		$aResult = array();
+		$aResult = [];
 		$aTransactions = glob(utils::GetDataPath().'transactions/'.self::GetUserPrefix().'*');
-		foreach($aTransactions as $sFileName)
+		foreach ($aTransactions as $sFileName) {
-		{
 			$aResult[] = date('Y-m-d H:i:s', filemtime($sFileName)).' - '.basename($sFileName);
 		}
 		sort($aResult);
@@ -404,7 +381,8 @@ class privUITransactionFile
 		self::Write('Error | '.$sText);
 	}
 
-	protected static function IsLogEnabled() {
+	protected static function IsLogEnabled()
+	{
 		$oConfig = MetaModel::GetConfig();
 		if (is_null($oConfig)) {
 			return false;

application/ui.extkeywidget.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -54,8 +55,8 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
  */
 class UIExtKeyWidget
 {
-	const ENUM_OUTPUT_FORMAT_CSV = 'csv';
+	public const ENUM_OUTPUT_FORMAT_CSV = 'csv';
-	const ENUM_OUTPUT_FORMAT_JSON = 'json';
+	public const ENUM_OUTPUT_FORMAT_JSON = 'json';
 
 	protected $iId;
 	protected $sTargetClass;
@@ -87,10 +88,20 @@ class UIExtKeyWidget
 	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Add default value for $aArgs for PHP 8.0 compat
 	 */
 	public static function DisplayFromAttCode(
-		$oPage, $sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName = '', $sFormPrefix = '',
+		$oPage,
-		$aArgs = [], $bSearchMode = false, &$sInputType = ''
+		$sAttCode,
-	)
+		$sClass,
-	{
+		$sTitle,
+		$oAllowedValues,
+		$value,
+		$iInputId,
+		$bMandatory,
+		$sFieldName = '',
+		$sFormPrefix = '',
+		$aArgs = [],
+		$bSearchMode = false,
+		&$sInputType = ''
+	) {
 		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 		$sTargetClass = $oAttDef->GetTargetClass();
 		$iMaxComboLength = $oAttDef->GetMaximumComboLength();
@@ -102,8 +113,7 @@ class UIExtKeyWidget
 		}
 		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
 		if (!$bSearchMode) {
-			switch ($sDisplayStyle)
+			switch ($sDisplayStyle) {
-			{
 				case 'radio':
 				case 'radio_horizontal':
 				case 'radio_vertical':
@@ -114,12 +124,38 @@ class UIExtKeyWidget
 				case 'select':
 				case 'list':
 				default:
-					return $oWidget->DisplaySelect($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value,
+					return $oWidget->DisplaySelect(
-						$bMandatory, $sFieldName, $sFormPrefix, $aArgs, $sInputType);
+						$oPage,
+						$iMaxComboLength,
+						$bAllowTargetCreation,
+						$sTitle,
+						$oAllowedValues,
+						$value,
+						$bMandatory,
+						$sFieldName,
+						$sFormPrefix,
+						$aArgs,
+						$sInputType
+					);
 			}
 		} else {
-			return $oWidget->Display($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId,
+			return $oWidget->Display(
-				$bMandatory, $sFieldName, $sFormPrefix, $aArgs, null, $sDisplayStyle, true, $sInputType);
+				$oPage,
+				$iMaxComboLength,
+				$bAllowTargetCreation,
+				$sTitle,
+				$oAllowedValues,
+				$value,
+				$iInputId,
+				$bMandatory,
+				$sFieldName,
+				$sFormPrefix,
+				$aArgs,
+				null,
+				$sDisplayStyle,
+				true,
+				$sInputType
+			);
 		}
 	}
 
@@ -158,7 +194,7 @@ class UIExtKeyWidget
 	 * @since 3.0.0 N°2508 - Include Obsolescence icon within list and autocomplete
 	 * @since 3.0.0 N°3750 new $sInputType parameter
 	 */
-	public function DisplaySelect(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), &$sInputType = '')
+	public function DisplaySelect(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = [], &$sInputType = '')
 	{
 		$sTitle = addslashes($sTitle);
 		$oPage->LinkScriptFromAppRoot('js/extkeywidget.js');
@@ -281,21 +317,17 @@ EOF
 				$oPage->add_ready_script("$('#$this->iId').one('validate', function() { $(this).trigger('change'); } );");
 			}
 			$sHTMLValue .= "<div class=\"ibo-input-select--action-buttons\">";
-		}
+		} else {
-		else
-		{
 			// Too many choices, use an autocomplete
 			// Check that the given value is allowed
 			$oSearch = $oAllowedValues->GetFilter();
 			$oSearch->AddCondition('id', $value);
 			$oSet = new DBObjectSet($oSearch);
-			if ($oSet->Count() == 0)
+			if ($oSet->Count() == 0) {
-			{
 				$value = null;
 			}
 
-			if (is_null($value) || ($value == 0)) // Null values are displayed as ''
+			if (is_null($value) || ($value == 0)) { // Null values are displayed as ''
-			{
 				$sDisplayValue = isset($aArgs['sDefaultValue']) ? $aArgs['sDefaultValue'] : '';
 			} else {
 				$sDisplayValue = $this->GetObjectName($value);
@@ -376,36 +408,30 @@ JS
 
 		$sHTMLValue = "<div class=\"field_input_zone field_input_extkey\">";
 
-		if (is_null($oAllowedValues))
+		if (is_null($oAllowedValues)) {
-		{
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
 		$oAllowedValues->SetShowObsoleteData(utils::ShowObsoleteData());
 
 		// We just need to compare the number of entries with MaxComboLength, so no need to get the real count.
-		if (!$oAllowedValues->CountExceeds($iMaxComboLength))
+		if (!$oAllowedValues->CountExceeds($iMaxComboLength)) {
-		{
 			// Discrete list of values, use a SELECT or RADIO buttons depending on the config
 			$sValidationField = null;
 
 			$bVertical = ($sDisplayStyle != 'radio_horizontal');
 			$bExtensions = false;
 			$oAllowedValues->Rewind();
-			$aAllowedValues = array();
+			$aAllowedValues = [];
-			while($oObj = $oAllowedValues->Fetch())
+			while ($oObj = $oAllowedValues->Fetch()) {
-			{
 				$aAllowedValues[$oObj->GetKey()] = $oObj->GetName();
 			}
 			$sHTMLValue .= $oPage->GetRadioButtons($aAllowedValues, $value, $this->iId, "{$sAttrFieldPrefix}{$sFieldName}", false /*  $bMandatory will be placed manually */, $bVertical, $sValidationField);
-			$aEventsList[] ='change';
+			$aEventsList[] = 'change';
-		}
+		} else {
-		else
-		{
 			$sHTMLValue .= "unable to display. Too much values";
 		}
 		$sHTMLValue .= '<div class="ibo-input-select--action-buttons">';
-		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false)
+		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false) {
-		{
 			$sHTMLValue .= "<span class=\"field_input_btn\"><div class=\"mini_button\" id=\"mini_tree_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"><i class=\"fas fa-sitemap\"></i></div></span>";
 			$oPage->add_ready_script(
 				<<<JS
@@ -416,8 +442,7 @@ JS
 JS
 			);
 		}
-		if ($bCreate && $bExtensions)
+		if ($bCreate && $bExtensions) {
-		{
 			$sCallbackName = (MetaModel::IsAbstract($this->sTargetClass)) ? 'SelectObjectClass' : 'CreateObject';
 
 			$sHTMLValue .= "<span class=\"field_input_btn\"><div class=\"mini_button\" id=\"mini_add_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"><i class=\"fas fa-plus\"></i></div></span>";
@@ -471,7 +496,7 @@ JS
 	 *
 	 * @since 3.0.0 N°3750 new $sInputType parameter
 	 */
-	public function Display(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), $bSearchMode = null, $sDisplayStyle = 'select', $bSearchMultiple = true, &$sInputType = '')
+	public function Display(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = [], $bSearchMode = null, $sDisplayStyle = 'select', $bSearchMultiple = true, &$sInputType = '')
 	{
 		if (!is_null($bSearchMode)) {
 			$this->bSearchMode = $bSearchMode;
@@ -521,7 +546,7 @@ JS
 					$bVertical = ($sDisplayStyle != 'radio_horizontal');
 					$bExtensions = false;
 					$oAllowedValues->Rewind();
-					$aAllowedValues = array();
+					$aAllowedValues = [];
 					while ($oObj = $oAllowedValues->Fetch()) {
 						$aAllowedValues[$oObj->GetKey()] = $oObj->GetName();
 					}
@@ -574,14 +599,14 @@ EOF
 					$sInputType = CmdbAbstractObject::ENUM_INPUT_TYPE_DROPDOWN_RAW;
 					if (($this->bSearchMode) && $bSearchMultiple) {
 						$sInputType = CmdbAbstractObject::ENUM_INPUT_TYPE_DROPDOWN_MULTIPLE_CHOICES;
-					$aOptions = array(
+						$aOptions = [
 							'header' => true,
 							'checkAllText' => Dict::S('UI:SearchValue:CheckAll'),
 							'uncheckAllText' => Dict::S('UI:SearchValue:UncheckAll'),
 							'noneSelectedText' => Dict::S('UI:SearchValue:Any'),
 							'selectedText' => Dict::S('UI:SearchValue:NbSelected'),
 							'selectedList' => 1,
-					);
+						];
 						$sJSOptions = json_encode($aOptions);
 						$oPage->add_ready_script("$('.multiselect').multiselect($sJSOptions);");
 					}
@@ -606,8 +631,7 @@ EOF
 				$value = null;
 			}
 
-			if (is_null($value) || ($value == 0)) // Null values are displayed as ''
+			if (is_null($value) || ($value == 0)) { // Null values are displayed as ''
-			{
 				$sDisplayValue = isset($aArgs['sDefaultValue']) ? $aArgs['sDefaultValue'] : '';
 			} else {
 				$sDisplayValue = $this->GetObjectName($value);
@@ -673,20 +697,22 @@ JS
 			$oAttDef = MetaModel::GetAttributeDef(get_class($oCurrObject), $this->sAttCode);
 			/** @var \DBObject $oCurrObject */
 			$aArgs = $oCurrObject->ToArgsForQuery();
-			$aParams = array('query_params' => $aArgs);
+			$aParams = ['query_params' => $aArgs];
 			$oSet = $oAttDef->GetAllowedValuesAsObjectSet($aArgs);
 			$oFilter = $oSet->GetFilter();
-		} else if (!empty($this->sFilter)) {
+		} elseif (!empty($this->sFilter)) {
-			$aParams = array();
+			$aParams = [];
 			$oFilter = DBObjectSearch::FromOQL($this->sFilter);
 		} else {
-			$aParams = array();
+			$aParams = [];
 			$oFilter = new DBObjectSearch($this->sTargetClass);
 		}
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
-		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, 'dtc_'.$this->iId,
+		$oPage->AddUiBlock($oBlock->GetDisplay(
-			array(
+			$oPage,
+			'dtc_'.$this->iId,
+			[
 				'menu'           => false,
 				'currentId'      => $this->iId,
 				'table_id'       => "dr_{$this->iId}",
@@ -694,12 +720,13 @@ JS
 				'selection_mode' => true,
 				'selection_type' => 'single',
 				'cssCount'       => '#count_'.$this->iId.'_results',
-			)
+			]
 		));
 		$sCancel = Dict::S('UI:Button:Cancel');
 		$sOK = Dict::S('UI:Button:Ok');
 		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
-		$oPage->add(<<<HTML
+		$oPage->add(
+			<<<HTML
 <form id="fr_{$this->iId}" OnSubmit="return oACWidget_{$this->iId}.DoOk();">
 		<div id="dr_{$this->iId}">
 		<div><p>{$sEmptyList}</p></div>
@@ -711,7 +738,8 @@ HTML
 		);
 
 		$sDialogTitleSanitized = addslashes(utils::HtmlToText($sTitle));
-		$oPage->add_ready_script(<<<JS
+		$oPage->add_ready_script(
+			<<<JS
 		$('#ac_dlg_{$this->iId}').dialog({ 
 				width: $(window).width()*0.8, 
 				height: $(window).height()*0.8, 
@@ -751,14 +779,12 @@ JS
 	 */
 	public function SearchObjectsToSelect(WebPage $oP, $sFilter, $sRemoteClass = '', $oObj = null)
 	{
-		if (is_null($sFilter))
+		if (is_null($sFilter)) {
-		{
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
 
 		$oFilter = DBObjectSearch::FromOQL($sFilter);
-		if (strlen($sRemoteClass) > 0)
+		if (strlen($sRemoteClass) > 0) {
-		{
 			$oFilter->ChangeClass($sRemoteClass);
 		}
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
@@ -766,8 +792,8 @@ JS
 		// Current extkey value, so we can display event if it is not available anymore (eg. archived).
 		$iCurrentExtKeyId = (is_null($oObj)) ? 0 : $oObj->Get($this->sAttCode);
 
-		$oBlock = new DisplayBlock($oFilter, 'list_search', false, array('query_params' => array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId)));
+		$oBlock = new DisplayBlock($oFilter, 'list_search', false, ['query_params' => ['this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId]]);
-		$oBlock->Display($oP, $this->iId.'_results', array('this' => $oObj, 'cssCount'=> '#count_'.$this->iId.'_results', 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single', 'table_id' => 'select_'.$this->sAttCode)); // Don't display the 'Actions' menu on the results
+		$oBlock->Display($oP, $this->iId.'_results', ['this' => $oObj, 'cssCount' => '#count_'.$this->iId.'_results', 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single', 'table_id' => 'select_'.$this->sAttCode]); // Don't display the 'Actions' menu on the results
 	}
 
 	/**
@@ -785,7 +811,7 @@ JS
 	 *
 	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $oObj for PHP 8.0 compatibility
 	 */
-	public function AutoComplete(WebPage $oP, $sFilter, $oObj, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null	)
+	public function AutoComplete(WebPage $oP, $sFilter, $oObj, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null)
 	{
 		if (is_null($sFilter)) {
 			throw new Exception('Implementation: null value for allowed values definition');
@@ -799,38 +825,32 @@ JS
 		$oValuesSet->SetSort(false);
 		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oValuesSet->SetLimit($iMax);
-		$aValuesStartWith = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'start_with');
+		$aValuesStartWith = $oValuesSet->GetValuesForAutocomplete(['this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId], $sContains, 'start_with');
 		asort($aValuesStartWith);
 		$aValues = $aValuesStartWith;
 		if (sizeof($aValues) < $iMax) {
-			$aValuesContains = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains');
+			$aValuesContains = $oValuesSet->GetValuesForAutocomplete(['this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId], $sContains, 'contains');
 			asort($aValuesContains);
 			$iSize = sizeof($aValues);
-			foreach ($aValuesContains as $sKey => $sFriendlyName)
+			foreach ($aValuesContains as $sKey => $sFriendlyName) {
-			{
+				if (!isset($aValues[$sKey])) {
-				if (!isset($aValues[$sKey]))
-				{
 					$aValues[$sKey] = $sFriendlyName;
-					if (++$iSize >= $iMax)
+					if (++$iSize >= $iMax) {
-					{
 						break;
 					}
 				}
 			}
-		}
+		} elseif (!in_array($sContains, $aValues)) {
-		elseif (!in_array($sContains, $aValues))
+			$aValuesEquals = $oValuesSet->GetValuesForAutocomplete(['this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId], $sContains, 'equals');
-		{
-			$aValuesEquals = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains,	'equals');
 			// Note: Here we cannot use array_merge as it would reindex the numeric keys starting from 0 when keys are actually the objects ID.
 			// As a workaround we use array_replace as it does preserve numeric keys. It's ok if some values from $aValuesEquals are replaced with values from $aValues as they contain the same data.
 			$aValues = array_replace($aValuesEquals, $aValues);
 		}
 
-		switch($sOutputFormat)
+		switch ($sOutputFormat) {
-		{
 			case static::ENUM_OUTPUT_FORMAT_JSON:
 
-				$aJsonMap = array();
+				$aJsonMap = [];
 				foreach ($aValues as $sKey => $aValue) {
 					$aElt = ['value' => $sKey, 'label' => utils::EscapeHtml($aValue['label']), 'obsolescence_flag' => $aValue['obsolescence_flag']];
 					if ($aValue['additional_field'] != '') {
@@ -851,8 +871,7 @@ JS
 				break;
 
 			case static::ENUM_OUTPUT_FORMAT_CSV:
-				foreach($aValues as $sKey => $aValue)
+				foreach ($aValues as $sKey => $aValue) {
-				{
 					$oP->add(trim($aValue['label'])."\t".$sKey."\n");
 				}
 				break;
@@ -874,7 +893,7 @@ JS
 	 */
 	public function GetObjectName($iObjId, $sFormAttCode = null)
 	{
-		$aModifierProps = array();
+		$aModifierProps = [];
 		$aModifierProps['UserRightsGetSelectFilter']['bSearchMode'] = $this->bSearchMode;
 
 		$oObj = MetaModel::GetObject($this->sTargetClass, $iObjId, false, false, $aModifierProps);
@@ -884,9 +903,7 @@ JS
 			} else {
 				return $oObj->Get($sFormAttCode);
 			}
-		}
+		} else {
-		else
-		{
 			return '';
 		}
 	}
@@ -905,22 +922,21 @@ JS
 		// For security reasons: check that the "proposed" class is actually a subclass of the linked class
 		// and that the current user is allowed to create objects of this class
 		$aSubClasses = MetaModel::EnumChildClasses($this->sTargetClass, ENUM_CHILD_CLASSES_ALL);
-        $aPossibleClasses = array();
+		$aPossibleClasses = [];
-        foreach($aSubClasses as $sCandidateClass)
+		foreach ($aSubClasses as $sCandidateClass) {
-        {
+			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES)) {
-            if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
-            {
 				$aPossibleClasses[$sCandidateClass] = MetaModel::GetName($sCandidateClass);
 			}
 		}
 
 		$sClassLabel = MetaModel::GetName($this->sTargetClass);
-        $sDialogTitle = Dict::Format('UI:CreationTitle_Class', $sClassLabel);;
+		$sDialogTitle = Dict::Format('UI:CreationTitle_Class', $sClassLabel);
-        $oBlock = UIContentBlockUIBlockFactory::MakeStandard('ac_create_'.$this->iId,['ibo-is-visible']);
+		;
+		$oBlock = UIContentBlockUIBlockFactory::MakeStandard('ac_create_'.$this->iId, ['ibo-is-visible']);
 		$oPage->AddSubBlock($oBlock);
 		$oClassForm = FormUIBlockFactory::MakeStandard();
 		$oBlock->AddSubBlock($oClassForm);
-		$oClassForm->AddSubBlock(cmdbAbstractObject::DisplayBlockSelectClassToCreate( $sClassLabel, $this->sTargetClass,   $aPossibleClasses));
+		$oClassForm->AddSubBlock(cmdbAbstractObject::DisplayBlockSelectClassToCreate($sClassLabel, $this->sTargetClass, $aPossibleClasses));
 		$sDialogTitleEscaped = addslashes($sDialogTitle);
 		$oPage->add_ready_script("$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true, title: '$sDialogTitleEscaped'});\n");
 		$oPage->add_ready_script("$('#ac_create_{$this->iId} form').removeAttr('onsubmit');");
@@ -941,16 +957,14 @@ JS
 		$oAppContext->InitObjectFromContext($oNewObj);
 		$oNewObj->PrefillForm('creation_from_extkey', $aPrefillFormParam);
 		// 2nd set the default values from the constraint on the external key... if any
-		if ( ($oCurrObject != null) && ($this->sAttCode != ''))
+		if (($oCurrObject != null) && ($this->sAttCode != '')) {
-		{
 			$oAttDef = MetaModel::GetAttributeDef(get_class($oCurrObject), $this->sAttCode);
-			$aParams = array('this' => $oCurrObject);
+			$aParams = ['this' => $oCurrObject];
 			$oSet = $oAttDef->GetAllowedValuesAsObjectSet($aParams);
 			$aConsts = $oSet->ListConstantFields();
 			$sClassAlias = $oSet->GetFilter()->GetClassAlias();
-			if (isset($aConsts[$sClassAlias]))
+			if (isset($aConsts[$sClassAlias])) {
-			{
+				foreach ($aConsts[$sClassAlias] as $sAttCode => $value) {
-				foreach($aConsts[$sClassAlias] as $sAttCode => $value) {
 					$oNewObj->Set($sAttCode, $value);
 				}
 			}
@@ -962,32 +976,35 @@ JS
 		$sClassLabel = MetaModel::GetName($this->sTargetClass);
 		$sHeaderTitleEscaped = utils::EscapeHtml(Dict::Format('UI:CreationTitle_Class', $sClassLabel));
 
-		$oPage->add(<<<HTML
+		$oPage->add(
+			<<<HTML
 <div id="ac_create_{$this->iId}" title="{$sHeaderTitleEscaped}">
 	<div id="dcr_{$this->iId}">
 HTML
 		);
 
-		$aFormExtraParams = array(
+		$aFormExtraParams = [
 			'formPrefix'  => $this->iId,
 			'noRelations' => true,
-		);
+		];
 
 		// Remove blob edition from creation form @see N°5863 to allow blob edition in modal context
 		FormHelper::DisableAttributeBlobInputs($this->sTargetClass, $aFormExtraParams);
 
-		if(FormHelper::HasMandatoryAttributeBlobInputs($oNewObj)){
+		if (FormHelper::HasMandatoryAttributeBlobInputs($oNewObj)) {
 			$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal(FormHelper::ENUM_MANDATORY_BLOB_MODE_CREATE));
 		}
 
-		cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), $aFormExtraParams);
+		cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, [], $aFormExtraParams);
-		$oPage->add(<<<HTML
+		$oPage->add(
+			<<<HTML
 	</div>
 </div>
 HTML
 		);
 
-		$oPage->add_ready_script(<<<JS
+		$oPage->add_ready_script(
+			<<<JS
 $('#ac_create_{$this->iId}').dialog({ width: $(window).width() * 0.6, height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true});
 $('#dcr_{$this->iId} form').removeAttr('onsubmit');
 $('#dcr_{$this->iId} form').find('button[type="submit"]').on('click', oACWidget_{$this->iId}.DoCreateObject);
@@ -1003,14 +1020,13 @@ JS
 		$sDialogTitle = addslashes(Dict::Format('UI:HierarchyOf_Class', MetaModel::GetName($this->sTargetClass)));
 		$oPage->add('<div id="dlg_tree_'.$this->iId.'"><div class="wizContainer" style="vertical-align:top;"><div style="margin-bottom:5px;" id="tree_'.$this->iId.'">');
 		$oPage->add('<table style="width:100%"><tr><td>');
-		if (is_null($sFilter))
+		if (is_null($sFilter)) {
-		{
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
 
 		$oFilter = DBObjectSearch::FromOQL($sFilter);
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-		$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj, 'current_extkey_id' => $currValue));
+		$oSet = new DBObjectSet($oFilter, [], ['this' => $oObj, 'current_extkey_id' => $currValue]);
 
 		$oSet->SetShowObsoleteData(utils::ShowObsoleteData());
 
@@ -1020,8 +1036,7 @@ JS
 		$oPage->add('</td></tr></table>');
 		$oPage->add('</div>');
 
-		if ($bHasChildLeafs)
+		if ($bHasChildLeafs) {
-		{
 			$oPage->add('<span class="treecontrol ibo-button-group" id="treecontrolid"><a class="ibo-button ibo-is-regular ibo-is-neutral" href="?#">'.Dict::S("UI:Treeview:CollapseAll").'</a><a class="ibo-button ibo-is-regular ibo-is-neutral" href="?#">'.Dict::S("UI:Treeview:ExpandAll").'</a></span>');
 		}
 
@@ -1030,7 +1045,8 @@ JS
 		$sOkButtonLabel = Dict::S('UI:Button:Ok');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		$oPage->add_ready_script("\$('#tree_$this->iId ul').treeview({ control: '#treecontrolid',	persist: 'false'});\n");
-		$oPage->add_ready_script(<<<JS
+		$oPage->add_ready_script(
+			<<<JS
 $('#dlg_tree_$this->iId').dialog({
 	width: 'auto',
 	height: 'auto',
@@ -1069,8 +1085,7 @@ JS
 	 */
 	public function DoCreateObject($oPage)
 	{
-		try
+		try {
-		{
 			$oObj = MetaModel::NewObject($this->sTargetClass);
 			$aErrors = $oObj->UpdateObjectFromPostedForm($this->iId);
 			if (count($aErrors) == 0) {
@@ -1088,13 +1103,12 @@ JS
 				]);
 				$oObj->DBInsertNoReload();
 
-				return array('name' => $oObj->GetName(), 'id' => $oObj->GetKey());
+				return ['name' => $oObj->GetName(), 'id' => $oObj->GetKey()];
 			} else {
-				return array('error' => implode(' ', $aErrors), 'id' => 0);
+				return ['error' => implode(' ', $aErrors), 'id' => 0];
 			}
-		}
+		} catch (Exception $e) {
-		catch (Exception $e) {
+			return ['error' => $e->getMessage(), 'id' => 0];
-			return array('error' => $e->getMessage(), 'id' => 0);
 		}
 	}
 
@@ -1110,32 +1124,27 @@ JS
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
 	 */
-	function DumpTree($oP, $oSet, $sParentAttCode, $currValue)
+	public function DumpTree($oP, $oSet, $sParentAttCode, $currValue)
-	{
-		$aTree = array();
-		$aNodes = array();
-		while($oObj = $oSet->Fetch())
 	{
+		$aTree = [];
+		$aNodes = [];
+		while ($oObj = $oSet->Fetch()) {
 			$iParentId = $oObj->Get($sParentAttCode);
-			if (!isset($aTree[$iParentId]))
+			if (!isset($aTree[$iParentId])) {
-			{
+				$aTree[$iParentId] = [];
-				$aTree[$iParentId] = array();
 			}
 			$aTree[$iParentId][$oObj->GetKey()] = $oObj->GetName();
 			$aNodes[$oObj->GetKey()] = $oObj;
 		}
 
 		$aParents = array_keys($aTree);
-		$aRoots = array();
+		$aRoots = [];
-		foreach($aParents as $id)
+		foreach ($aParents as $id) {
-		{
+			if (!array_key_exists($id, $aNodes)) {
-			if (!array_key_exists($id, $aNodes))
-			{
 				$aRoots[] = $id;
 			}
 		}
-		foreach($aRoots as $iRootId)
+		foreach ($aRoots as $iRootId) {
-		{
 			$this->DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue);
 		}
 
@@ -1143,28 +1152,22 @@ JS
 		return !$bHasOnlyRootNodes;
 	}
 
-	function DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue)
+	public function DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue)
 	{
 		$bSelect = true;
 		$bMultiple = false;
 		$sSelect = '';
-		if (array_key_exists($iRootId, $aTree))
+		if (array_key_exists($iRootId, $aTree)) {
-		{
 			$aSortedRoots = $aTree[$iRootId];
 			asort($aSortedRoots);
 			$oP->add("<ul>\n");
 			$fUniqueId = microtime(true);
-			foreach($aSortedRoots as $id => $sName)
+			foreach ($aSortedRoots as $id => $sName) {
-			{
+				if ($bSelect) {
-				if ($bSelect)
-				{
 					$sChecked = ($aNodes[$id]->GetKey() == $currValue) ? 'checked' : '';
-					if ($bMultiple)
+					if ($bMultiple) {
-					{
 						$sSelect = '<input id="input_'.$fUniqueId.'_'.$aNodes[$id]->GetKey().'" type="checkbox" value="'.$aNodes[$id]->GetKey().'" name="selectObject[]" '.$sChecked.'>&nbsp;';
-					}
+					} else {
-					else
-					{
 						$sSelect = '<input id="input_'.$fUniqueId.'_'.$aNodes[$id]->GetKey().'" type="radio" value="'.$aNodes[$id]->GetKey().'" name="selectObject" '.$sChecked.'>&nbsp;';
 					}
 				}

application/ui.htmleditorwidget.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -63,7 +64,7 @@ class UIHTMLEditorWidget
 	 *
 	 * @return string The HTML fragment to be inserted into the page
 	 */
-	public function Display(WebPage $oPage, array $aArgs = array()) : string
+	public function Display(WebPage $oPage, array $aArgs = []): string
 	{
 		$iId = $this->m_iId;
 		$sCode = $this->m_sAttCode.$this->m_sNameSuffix;

application/ui.linksdirectwidget.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -38,7 +39,7 @@ class UILinksWidgetDirect
 		$this->sAttCode = $sAttCode;
 		$this->sInputid = $sInputId;
 		$this->sNameSuffix = $sNameSuffix;
-		$this->aZlist = array();
+		$this->aZlist = [];
 		$this->sLinkedClass = '';
 
 		// Compute the list of attributes visible from the given objet:
@@ -47,8 +48,7 @@ class UILinksWidgetDirect
 		$oLinksetDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 		$this->sLinkedClass = $oLinksetDef->GetLinkedClass();
 		$sExtKeyToMe = $oLinksetDef->GetExtKeyToMe();
-		switch($oLinksetDef->GetEditMode())
+		switch ($oLinksetDef->GetEditMode()) {
-		{
 			case LINKSET_EDITMODE_INPLACE: // The whole linkset can be edited 'in-place'
 				$aZList = MetaModel::FlattenZList(MetaModel::GetZListItems($this->sLinkedClass, 'details'));
 				break;
@@ -57,15 +57,12 @@ class UILinksWidgetDirect
 				$aZList = MetaModel::FlattenZList(MetaModel::GetZListItems($this->sLinkedClass, 'list'));
 				array_unshift($aZList, 'friendlyname');
 		}
-		foreach($aZList as $sLinkedAttCode)
+		foreach ($aZList as $sLinkedAttCode) {
-		{
+			if ($sLinkedAttCode != $sExtKeyToMe) {
-			if ($sLinkedAttCode != $sExtKeyToMe)
-			{
 				$oAttDef = MetaModel::GetAttributeDef($this->sLinkedClass, $sLinkedAttCode);
 
 				if ((!$oAttDef->IsExternalField() || ($oAttDef->GetKeyAttCode() != $sExtKeyToMe)) &&
-					(!$oAttDef->IsLinkSet()) )
+					(!$oAttDef->IsLinkSet())) {
-				{
 					$this->aZlist[] = $sLinkedAttCode;
 				}
 			}
@@ -101,21 +98,17 @@ class UILinksWidgetDirect
 		$sRealClass = '';
 		//$oPage->add('<div class="wizContainer" style="vertical-align:top;"><div>');
 		$aSubClasses = MetaModel::EnumChildClasses($this->sLinkedClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
-		$aPossibleClasses = array();
+		$aPossibleClasses = [];
-		foreach($aSubClasses as $sCandidateClass)
+		foreach ($aSubClasses as $sCandidateClass) {
-		{
+			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES)) {
-			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
+				if ($sCandidateClass == $sProposedRealClass) {
-			{
-				if ($sCandidateClass == $sProposedRealClass)
-				{
 					$sRealClass = $sProposedRealClass;
 				}
 				$aPossibleClasses[$sCandidateClass] = MetaModel::GetName($sCandidateClass);
 			}
 		}
 		// Only one of the subclasses can be instantiated...
-		if (count($aPossibleClasses) == 1)
+		if (count($aPossibleClasses) == 1) {
-		{
 			$aKeys = array_keys($aPossibleClasses);
 			$sRealClass = $aKeys[0];
 		}
@@ -123,11 +116,11 @@ class UILinksWidgetDirect
 		if ($sRealClass != '') {
 			$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 			$sExtKeyToMe = $oLinksetDef->GetExtKeyToMe();
-			$aFieldsFlags = array($sExtKeyToMe => OPT_ATT_HIDDEN);
+			$aFieldsFlags = [$sExtKeyToMe => OPT_ATT_HIDDEN];
 			$oObj = DBObject::MakeDefaultInstance($sRealClass);
-			$aPrefillParam = array('source_obj' => $oSourceObj);
+			$aPrefillParam = ['source_obj' => $oSourceObj];
 			$oObj->PrefillForm('creation_from_editinplace', $aPrefillParam);
-			$aFormExtraParams = array(
+			$aFormExtraParams = [
 				'formPrefix'  => $this->sInputid,
 				'noRelations' => true,
 				'fieldsFlags' => $aFieldsFlags,
@@ -140,25 +133,22 @@ class UILinksWidgetDirect
 JS
 					,
 				],
-			);
+			];
 
 			// Remove blob edition from creation form @see N°5863 to allow blob edition in modal context
 			FormHelper::DisableAttributeBlobInputs($sRealClass, $aFormExtraParams);
 
-			if(FormHelper::HasMandatoryAttributeBlobInputs($oObj)){
+			if (FormHelper::HasMandatoryAttributeBlobInputs($oObj)) {
 				$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal(FormHelper::ENUM_MANDATORY_BLOB_MODE_CREATE));
 			}
 
-			cmdbAbstractObject::DisplayCreationForm($oPage, $sRealClass, $oObj, array(), $aFormExtraParams);
+			cmdbAbstractObject::DisplayCreationForm($oPage, $sRealClass, $oObj, [], $aFormExtraParams);
-		}
+		} else {
-		else
-		{
 			$sClassLabel = MetaModel::GetName($this->sLinkedClass);
 			$oPage->add('<p>'.Dict::Format('UI:SelectTheTypeOf_Class_ToCreate', $sClassLabel));
 			$oPage->add('<nobr><select name="class">');
 			asort($aPossibleClasses);
-			foreach($aPossibleClasses as $sClassName => $sClassLabel)
+			foreach ($aPossibleClasses as $sClassName => $sClassLabel) {
-			{
 				$oPage->add("<option value=\"$sClassName\">$sClassLabel</option>");
 			}
 			$oPage->add('</select>');
@@ -178,7 +168,7 @@ JS
 	 * @throws \MissingQueryArgument
 	 * @throws \OQLException
 	 */
-	public function GetObjectsSelectionDlg($oPage, $oCurrentObj, $aAlreadyLinked, $aPrefillFormParam = array())
+	public function GetObjectsSelectionDlg($oPage, $oCurrentObj, $aAlreadyLinked, $aPrefillFormParam = [])
 	{
 		//$oPage->add("<div class=\"wizContainer\" style=\"vertical-align:top;\">\n");
 
@@ -199,8 +189,7 @@ JS
 
 		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$valuesDef = $oLinkSetDef->GetValuesDef();
-		if ($valuesDef === null)
+		if ($valuesDef === null) {
-		{
 			$oFilter = new DBObjectSearch($this->sLinkedClass);
 		} else {
 			if (!$valuesDef instanceof ValueSetObjects) {
@@ -218,8 +207,10 @@ JS
 			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
 		}
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
+		$oPage->AddUiBlock($oBlock->GetDisplay(
-			array(
+			$oPage,
+			"SearchFormToAdd_{$this->sInputid}",
+			[
 				'result_list_outer_selector' => "SearchResultsToAdd_{$this->sInputid}",
 				'table_id' => "add_{$this->sInputid}",
 				'table_inner_id' => "ResultsToAdd_{$this->sInputid}",
@@ -227,13 +218,14 @@ JS
 				'cssCount' => "#count_{$this->sInputid}",
 				'query_params' => $oFilter->GetInternalParams(),
 				'hidden_criteria' => $sHiddenCriteria,
-			)
+			]
 		));
 		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
 		$sCancel = Dict::S('UI:Button:Cancel');
 		$sAdd = Dict::S('UI:Button:Add');
 
-		$oPage->add(<<<HTML
+		$oPage->add(
+			<<<HTML
 <form id="ObjectsAddForm_{$this->sInputid}">
     <div id="SearchResultsToAdd_{$this->sInputid}">
         <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
@@ -256,38 +248,30 @@ HTML
 	 * @throws \CoreException
 	 * @throws \OQLException
 	 */
-	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinked = array(), $oCurrentObj = null, $aPrefillFormParam = array())
+	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinked = [], $oCurrentObj = null, $aPrefillFormParam = [])
-	{
-		if ($sRemoteClass == '')
 	{
+		if ($sRemoteClass == '') {
 			$sRemoteClass = $this->sLinkedClass;
 		}
 		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$valuesDef = $oLinkSetDef->GetValuesDef();
-		if ($valuesDef === null)
+		if ($valuesDef === null) {
-		{
 			$oFilter = new DBObjectSearch($sRemoteClass);
-		}
+		} else {
-		else
+			if (!$valuesDef instanceof ValueSetObjects) {
-		{
-			if (!$valuesDef instanceof ValueSetObjects)
-			{
 				throw new Exception('Error: only ValueSetObjects are supported for "allowed_values" in AttributeLinkedSet ('.$this->sClass.'/'.$this->sAttCode.').');
 			}
 			$oFilter = DBObjectSearch::FromOQL($valuesDef->GetFilterExpression());
 		}
 
-		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($sRemoteClass, $this->sClass))
+		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($sRemoteClass, $this->sClass)) {
-		{
 			// Prevent linking to self if the linked object is of the same family
 			// and already present in the database
-			if (!$oCurrentObj->IsNew())
+			if (!$oCurrentObj->IsNew()) {
-			{
 				$oFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
 			}
 		}
-		if ($oCurrentObj != null)
+		if ($oCurrentObj != null) {
-		{
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 
 			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
@@ -296,12 +280,11 @@ HTML
 			$aPrefillFormParam['filter'] = $oFilter;
 			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
 		}
-		if (count($aAlreadyLinked) > 0)
+		if (count($aAlreadyLinked) > 0) {
-		{
 			$oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
 		}
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, "ResultsToAdd_{$this->sInputid}", array('menu' => false, 'cssCount'=> '#count_'.$this->sInputid , 'selection_mode' => true, 'table_id' => 'add_'.$this->sInputid)); // Don't display the 'Actions' menu on the results
+		$oBlock->Display($oP, "ResultsToAdd_{$this->sInputid}", ['menu' => false, 'cssCount' => '#count_'.$this->sInputid , 'selection_mode' => true, 'table_id' => 'add_'.$this->sInputid]); // Don't display the 'Actions' menu on the results
 	}
 
 	/**
@@ -311,8 +294,7 @@ HTML
 	public function DoAddObjects(WebPage $oP, $oFullSetFilter)
 	{
 		$aLinkedObjectIds = utils::ReadMultipleSelection($oFullSetFilter);
-		foreach($aLinkedObjectIds as $iObjectId)
+		foreach ($aLinkedObjectIds as $iObjectId) {
-		{
 			$oLinkObj = MetaModel::GetObject($this->sLinkedClass, $iObjectId);
 			$oP->add($this->GetObjectRow($oP, $oLinkObj, $oLinkObj->GetKey()));
 		}
@@ -325,15 +307,15 @@ HTML
 
 	public function GetTableConfig()
 	{
-		$aAttribs = array();
+		$aAttribs = [];
-		$aAttribs['form::select'] = array(
+		$aAttribs['form::select'] = [
 			'label'       => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->sInputid}:not(:disabled)', this.checked);oWidget".$this->sInputid.".directlinks('instance')._onSelectChange();\" class=\"checkAll\"></input>",
 			'description' => Dict::S('UI:SelectAllToggle+'),
-		);
+		];
 
 		foreach ($this->aZlist as $sLinkedAttCode) {
 			$oAttDef = MetaModel::GetAttributeDef($this->sLinkedClass, $sLinkedAttCode);
-			$aAttribs[$sLinkedAttCode] = array('label' => MetaModel::GetLabel($this->sLinkedClass, $sLinkedAttCode), 'description' => $oAttDef->GetOrderByHint());
+			$aAttribs[$sLinkedAttCode] = ['label' => MetaModel::GetLabel($this->sLinkedClass, $sLinkedAttCode), 'description' => $oAttDef->GetOrderByHint()];
 		}
 
 		return $aAttribs;
@@ -348,8 +330,7 @@ HTML
 	 */
 	public function GetRow($oPage, $sRealClass, $aValues, $iTempId)
 	{
-		if ($sRealClass == '')
+		if ($sRealClass == '') {
-		{
 			$sRealClass = $this->sLinkedClass;
 		}
 		$oLinkObj = new $sRealClass();
@@ -367,10 +348,9 @@ HTML
 	protected function GetObjectRow($oPage, $oLinkObj, $iTempId)
 	{
 		$aAttribs = $this->GetTableConfig();
-		$aRow = array();
+		$aRow = [];
 		$aRow['form::select'] = '<input type="checkbox" class="selectList'.$this->sInputid.'" value="'.($iTempId).'"/>';
-		foreach($this->aZlist as $sLinkedAttCode)
+		foreach ($this->aZlist as $sLinkedAttCode) {
-		{
 			$aRow[$sLinkedAttCode] = $oLinkObj->GetAsHTML($sLinkedAttCode);
 		}
 		return $oPage->GetTableRow($aRow, $aAttribs);
@@ -386,18 +366,16 @@ HTML
 	 */
 	public function GetFormRow($oPage, $sRealClass, $aValues, $iTempId)
 	{
-		if ($sRealClass == '')
+		if ($sRealClass == '') {
-		{
 			$sRealClass = $this->sLinkedClass;
 		}
 		$oLinkObj = new $sRealClass();
 		$oLinkObj->UpdateObjectFromPostedForm($this->sInputid);
 
 		$aAttribs = $this->GetTableConfig();
-		$aRow = array();
+		$aRow = [];
 		$aRow[] = '<input type="checkbox" class="selectList'.$this->sInputid.'" value="'.($iTempId).'"/>';
-		foreach($this->aZlist as $sLinkedAttCode)
+		foreach ($this->aZlist as $sLinkedAttCode) {
-		{
 			$aRow[] = $oLinkObj->GetAsHTML($sLinkedAttCode);
 		}
 		return $aRow;
@@ -413,26 +391,22 @@ HTML
 		$oAppContext = new ApplicationContext();
 		$sSrcClass = get_class($oSourceObj);
 		$sDestClass = $oSearch->GetClass();
-		foreach($oAppContext->GetNames() as $key)
+		foreach ($oAppContext->GetNames() as $key) {
-		{
 			// Find the value of the object corresponding to each 'context' parameter
-			$aCallSpec = array($sSrcClass, 'MapContextParam');
+			$aCallSpec = [$sSrcClass, 'MapContextParam'];
 			$sAttCode = '';
-			if (is_callable($aCallSpec))
+			if (is_callable($aCallSpec)) {
-			{
 				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter
 			}
 
-			if (MetaModel::IsValidAttCode($sSrcClass, $sAttCode))
+			if (MetaModel::IsValidAttCode($sSrcClass, $sAttCode)) {
-			{
 				$defaultValue = $oSourceObj->Get($sAttCode);
 
 				// Find the attcode for the same 'context' parameter in the destination class
 				// and sets its value as the default value for the search condition
-				$aCallSpec = array($sDestClass, 'MapContextParam');
+				$aCallSpec = [$sDestClass, 'MapContextParam'];
 				$sAttCode = '';
-				if (is_callable($aCallSpec))
+				if (is_callable($aCallSpec)) {
-				{
 					$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter
 				}
 
@@ -443,7 +417,6 @@ HTML
 		}
 	}
 
-
 	public function GetClass(): string
 	{
 		return $this->sClass;

application/ui.linkswidget.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
@@ -54,7 +55,7 @@ class UILinksWidget
 		$this->m_sNameSuffix = $sNameSuffix;
 		$this->m_bDuplicatesAllowed = $bDuplicatesAllowed;
 
-		$this->m_aEditableFields = array();
+		$this->m_aEditableFields = [];
 
 		/** @var AttributeLinkedSetIndirect $oAttDef */
 		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
@@ -67,34 +68,33 @@ class UILinksWidget
 		$oLinkingAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
 		$this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
 
-		$this->m_aEditableFields = array();
+		$this->m_aEditableFields = [];
-		$this->m_aTableConfig = array();
+		$this->m_aTableConfig = [];
-		$this->m_aTableConfig['form::checkbox'] = array(
+		$this->m_aTableConfig['form::checkbox'] = [
 			'label'       => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_sInputId.".OnSelectChange();\">",
 			'description' => Dict::S('UI:SelectAllToggle+'),
-		);
+		];
 
 		$aLnkAttDefsToDisplay = MetaModel::GetZListAttDefsFilteredForIndirectLinkClass($sClass, $sAttCode);
-		foreach ($aLnkAttDefsToDisplay as $oLnkAttDef)
+		foreach ($aLnkAttDefsToDisplay as $oLnkAttDef) {
-		{
 			$sLnkAttCode = $oLnkAttDef->GetCode();
 			$this->m_aEditableFields[] = $sLnkAttCode;
-			$this->m_aTableConfig[$sLnkAttCode] = array('label' => $oLnkAttDef->GetLabel(), 'description' => $oLnkAttDef->GetDescription());
+			$this->m_aTableConfig[$sLnkAttCode] = ['label' => $oLnkAttDef->GetLabel(), 'description' => $oLnkAttDef->GetDescription()];
 		}
 
-		$this->m_aTableConfig['static::key'] = array(
+		$this->m_aTableConfig['static::key'] = [
 			'label' => MetaModel::GetName($this->m_sRemoteClass),
 			'description' => MetaModel::GetClassDescription($this->m_sRemoteClass),
-		);
+		];
 		$this->m_aEditableFields[] = $this->m_sExtKeyToRemote;
 
 		$aRemoteAttDefsToDisplay = MetaModel::GetZListAttDefsFilteredForIndirectRemoteClass($this->m_sRemoteClass);
 		foreach ($aRemoteAttDefsToDisplay as $oRemoteAttDef) {
 			$sRemoteAttCode = $oRemoteAttDef->GetCode();
-			$this->m_aTableConfig['static::'.$sRemoteAttCode] = array(
+			$this->m_aTableConfig['static::'.$sRemoteAttCode] = [
 				'label' => $oRemoteAttDef->GetLabel(),
 				'description' => $oRemoteAttDef->GetDescription(),
-			);
+			];
 		}
 	}
 
@@ -105,7 +105,6 @@ class UILinksWidget
 		return ($bSafe) ? utils::GetSafeId($sFieldId) : $sFieldId;
 	}
 
-
 	/**
 	 * Display the table with the form for editing all the links at once
 	 *
@@ -119,7 +118,6 @@ class UILinksWidget
 		return DataTableUIBlockFactory::MakeForForm("{$this->m_sAttCode}{$this->m_sNameSuffix}", $aConfig, $aData);
 	}
 
-
 	/**
 	 * Get the HTML fragment corresponding to the linkset editing widget
 	 *
@@ -157,7 +155,7 @@ class UILinksWidget
 	 * @throws DictExceptionMissingString
 	 * @throws Exception
 	 */
-	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array(), $aPrefillFormParam = array())
+	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = [], $aPrefillFormParam = [])
 	{
 		$oAlreadyLinkedFilter = new DBObjectSearch($this->m_sRemoteClass);
 		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0) {
@@ -183,7 +181,9 @@ class UILinksWidget
 		$sLinkedSetId = $oBlock->oUILinksWidget->GetLinkedSetId();
 
 		$oDisplayBlock = new DisplayBlock($oFilter, 'search', false);
-		$oBlock->AddSubBlock($oDisplayBlock->GetDisplay($oPage, "SearchFormToAdd_{$sLinkedSetId}",
+		$oBlock->AddSubBlock($oDisplayBlock->GetDisplay(
+			$oPage,
+			"SearchFormToAdd_{$sLinkedSetId}",
 			[
 				'menu'                       => false,
 				'result_list_outer_selector' => "SearchResultsToAdd_{$sLinkedSetId}",
@@ -195,7 +195,8 @@ class UILinksWidget
 				'query_params'               => $oFilter->GetInternalParams(),
 				'hidden_criteria'            => $sAlreadyLinkedExpression,
 				'submit_on_load'             => false,
-			]));
+			]
+		));
 
 		$oBlock->AddForm();
 	}
@@ -212,25 +213,21 @@ class UILinksWidget
 	 * @throws \CoreException
 	 * @throws \Exception
 	 */
-	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array(), $oCurrentObj = null)
+	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = [], $oCurrentObj = null)
-	{
-		if ($sRemoteClass != '')
 	{
+		if ($sRemoteClass != '') {
 			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
 			$oFilter = new DBObjectSearch($sRemoteClass);
-		}
+		} else {
-		else
-		{
 			// No remote class specified use the one defined in the linkedset
 			$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 		}
-		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
+		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0) {
-		{
 			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
 		}
 		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}", array('menu' => false, 'cssCount'=> '#count_'.$this->m_sAttCode.$this->m_sNameSuffix , 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode)); // Don't display the 'Actions' menu on the results
+		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}", ['menu' => false, 'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix , 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode]); // Don't display the 'Actions' menu on the results
 	}
 
 	/**
@@ -251,7 +248,7 @@ class UILinksWidget
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
 			if (is_object($oLinkedObj)) {
 				$oBlock = new BlockIndirectLinkSetEditTable($this);
-				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
+				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, [], $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
 				$oRow = new FormTableRow("{$this->m_sAttCode}{$this->m_sNameSuffix}", $this->m_aTableConfig, $aRow, -$iAdditionId);
 				$oP->AddUiBlock($oRow);
 				$iAdditionId++;
@@ -280,7 +277,7 @@ class UILinksWidget
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
 			if (is_object($oLinkedObj)) {
 				$oBlock = new BlockIndirectLinkSetEditTable($this);
-				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId, false /* Default value */, $bAllowRemoteExtKeyEdit); // Not yet created link get negative Ids
+				$aRow = $oBlock->GetFormRow($oP, $oLinkedObj, $iObjectId, [], $oCurrentObj, $iAdditionId, false /* Default value */, $bAllowRemoteExtKeyEdit); // Not yet created link get negative Ids
 				$aData = [];
 				foreach ($aRow as $item) {
 					$aData[] = $item;
@@ -307,37 +304,30 @@ class UILinksWidget
 		$oAppContext = new ApplicationContext();
 		$sSrcClass = get_class($oSourceObj);
 		$sDestClass = $oSearch->GetClass();
-		foreach($oAppContext->GetNames() as $key)
+		foreach ($oAppContext->GetNames() as $key) {
-		{
 			// Find the value of the object corresponding to each 'context' parameter
-			$aCallSpec = array($sSrcClass, 'MapContextParam');
+			$aCallSpec = [$sSrcClass, 'MapContextParam'];
 			$sAttCode = '';
-			if (is_callable($aCallSpec))
+			if (is_callable($aCallSpec)) {
-			{
 				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter
 			}
 
-			if (MetaModel::IsValidAttCode($sSrcClass, $sAttCode))
+			if (MetaModel::IsValidAttCode($sSrcClass, $sAttCode)) {
-			{
 				$defaultValue = $oSourceObj->Get($sAttCode);
 
 				// Find the attcode for the same 'context' parameter in the destination class
 				// and sets its value as the default value for the search condition
-				$aCallSpec = array($sDestClass, 'MapContextParam');
+				$aCallSpec = [$sDestClass, 'MapContextParam'];
 				$sAttCode = '';
-				if (is_callable($aCallSpec))
+				if (is_callable($aCallSpec)) {
-				{
 					$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter
 				}
 
-				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue))
+				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue)) {
-				{
 					// Add Hierarchical condition if hierarchical key
 					$oAttDef = MetaModel::GetAttributeDef($sDestClass, $sAttCode);
-					if (isset($oAttDef) && ($oAttDef->IsExternalKey()))
+					if (isset($oAttDef) && ($oAttDef->IsExternalKey())) {
-					{
+						try {
-						try
-						{
 							/** @var AttributeExternalKey $oAttDef */
 							$sTargetClass = $oAttDef->GetTargetClass();
 							$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sTargetClass);
@@ -348,8 +338,7 @@ class UILinksWidget
 								$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
 								$oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
 							}
-						}
+						} catch (Exception $e) {
-						catch (Exception $e) {
 						}
 					} else {
 						$oSearch->AddCondition($sAttCode, $defaultValue);

application/ui.passwordwidget.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -49,7 +50,7 @@ class UIPasswordWidget
 	 * @param Hash $aArgs Extra context arguments
 	 * @return string The HTML fragment to be inserted into the page
 	 */
-	public function Display(WebPage $oPage, $aArgs = array())
+	public function Display(WebPage $oPage, $aArgs = [])
 	{
 		$oPage->add_dict_entry('UI:Component:Input:Password:DoesNotMatch');
 
@@ -94,4 +95,3 @@ class UIPasswordWidget
 		return $sHtmlValue;
 	}
 }
-?>

application/ui.searchformforeignkeys.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  *
  * Copyright (C) 2010-2024 Combodo SAS
@@ -20,7 +21,6 @@
  *
  */
 
-
 use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'/application/displayblock.class.inc.php');
@@ -46,8 +46,10 @@ class UISearchFormForeignKeys
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_iInputId}",
+		$oPage->AddUiBlock($oBlock->GetDisplay(
-			array(
+			$oPage,
+			"SearchFormToAdd_{$this->m_iInputId}",
+			[
 				'menu' => false,
 				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_iInputId}",
 				'table_id' => "add_{$this->m_iInputId}",
@@ -55,12 +57,14 @@ class UISearchFormForeignKeys
 				'selection_mode' => true,
 				'cssCount' => "#count_{$this->m_iInputId}",
 				'query_params' => $oFilter->GetInternalParams(),
-			)));
+			]
+		));
 		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
 		$sCancel = Dict::S('UI:Button:Cancel');
 		$sAdd = Dict::S('UI:Button:Add');
 
-		$oPage->add(<<<HTML
+		$oPage->add(
+			<<<HTML
 <form id="ObjectsAddForm_{$this->m_iInputId}">
     <div id="SearchResultsToAdd_{$this->m_iInputId}" style="vertical-align:top;height:100%;overflow:auto;padding:0;border:0;">
         <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
@@ -101,20 +105,17 @@ $('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});
 $('#SearchFormToAdd_{$this->m_iInputId} form').on('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);
 $('#SearchFormToAdd_{$this->m_iInputId}').on('resize', oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);
 JS
-);
+		);
 	}
 
 	public function GetFullListForeignKeysFromSelection($oPage, $oFullSetFilter)
 	{
-		try
+		try {
-		{
 			$aLinkedObjects = utils::ReadMultipleSelectionWithFriendlyname($oFullSetFilter);
 			$oPage->add(json_encode($aLinkedObjects));
-		}
+		} catch (CoreException $e) {
-		catch (CoreException $e)
-		{
 			http_response_code(500);
-			$oPage->add(json_encode(array('error' => $e->GetMessage())));
+			$oPage->add(json_encode(['error' => $e->GetMessage()]));
 			IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
 		}
 	}
@@ -129,20 +130,20 @@ JS
 	 */
 	public function ListResultsSearchForeignKeys(WebPage $oP, $sRemoteClass = '')
 	{
-		if ($sRemoteClass != '')
+		if ($sRemoteClass != '') {
-		{
 			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
 			$oFilter = new DBObjectSearch($sRemoteClass);
-		}
+		} else {
-		else
-		{
 			// No remote class specified use the one defined in the linkedset
 			$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 		}
 
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, "ResultsToAdd_{$this->m_iInputId}",
+		$oBlock->Display(
-			array('menu' => false, 'cssCount' => "#count_{$this->m_iInputId}", 'selection_mode' => true, 'table_id' => "add_{$this->m_iInputId}"));
+			$oP,
+			"ResultsToAdd_{$this->m_iInputId}",
+			['menu' => false, 'cssCount' => "#count_{$this->m_iInputId}", 'selection_mode' => true, 'table_id' => "add_{$this->m_iInputId}"]
+		);
 	}
 
 }

application/uiwizard.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -17,7 +18,6 @@
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\WebPage\iTopWebPage;
 
-
 /**
  * Class UIWizard
  *
@@ -36,69 +36,68 @@ class UIWizard
 	{
 		$this->m_oPage = $oPage;
 		$this->m_sClass = $sClass;
-		if (empty($sTargetState))
+		if (empty($sTargetState)) {
-		{
 			$sTargetState = MetaModel::GetDefaultState($sClass);
 		}
 		$this->m_sTargetState = $sTargetState;
 		$this->m_aWizardSteps = $this->ComputeWizardStructure();
 	}
 
-	public function GetObjectClass() { return $this->m_sClass; }
+	public function GetObjectClass()
-	public function GetTargetState() { return $this->m_sTargetState; }
+	{
-	public function GetWizardStructure() { return $this->m_aWizardSteps; }
+		return $this->m_sClass;
+	}
+	public function GetTargetState()
+	{
+		return $this->m_sTargetState;
+	}
+	public function GetWizardStructure()
+	{
+		return $this->m_aWizardSteps;
+	}
 
 	/**
 	 * Displays one step of the wizard
 	 */
-	public function DisplayWizardStep($aStep, $iStepIndex, &$iMaxInputId, &$aFieldsMap, $bFinishEnabled = false, $aArgs = array())
+	public function DisplayWizardStep($aStep, $iStepIndex, &$iMaxInputId, &$aFieldsMap, $bFinishEnabled = false, $aArgs = [])
-	{
-		if ($iStepIndex == 1) // one big form that contains everything, to make sure that the uploaded files are posted too
 	{
+		if ($iStepIndex == 1) { // one big form that contains everything, to make sure that the uploaded files are posted too
 			$this->m_oPage->add("<form method=\"post\" enctype=\"multipart/form-data\" action=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php\">\n");
 		}
 		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
 		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
 		$aStates = MetaModel::EnumStates($this->m_sClass);
-		$aDetails = array();
+		$aDetails = [];
 		$sJSHandlerCode = ''; // Javascript code to be executed each time this step of the wizard is entered
-		foreach($aStep as $sAttCode)
+		foreach ($aStep as $sAttCode) {
-		{
 			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-			if ($oAttDef->IsWritable())
+			if ($oAttDef->IsWritable()) {
-			{
 				$sAttLabel = $oAttDef->GetLabel();
 				$iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
 
 				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))
+				if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) {
-				{
+					$aFields[$sAttCode] = [];
-					$aFields[$sAttCode] = array();
+					foreach ($aPrerequisites as $sCode) {
-					foreach($aPrerequisites as $sCode)
-					{
 						$aFields[$sAttCode][$sCode] = '';
 					}
 				}
-				if (count($aPrerequisites) > 0)
+				if (count($aPrerequisites) > 0) {
-				{
 					$aOptions[] = 'Prerequisites: '.implode(', ', $aPrerequisites);
 				}
 
-				$sFieldFlag = (($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) || (!$oAttDef->IsNullAllowed()) )? ' <span class="hilite">*</span>' : '';
+				$sFieldFlag = (($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) || (!$oAttDef->IsNullAllowed())) ? ' <span class="hilite">*</span>' : '';
 				$oDefaultValuesSet = $oAttDef->GetDefaultValue(/* $oObject->ToArgs() */); // @@@ TO DO: get the object's current value if the object exists
 				$sHTMLValue = cmdbAbstractObject::GetFormElementForField($this->m_oPage, $this->m_sClass, $sAttCode, $oAttDef, $oDefaultValuesSet, '', "att_$iMaxInputId", '', $iOptions, $aArgs);
 				$aFieldsMap["att_$iMaxInputId"] = $sAttCode;
-				$aDetails[] = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().$sFieldFlag.'</span>', 'value' => "<span id=\"field_att_$iMaxInputId\">$sHTMLValue</span>");
+				$aDetails[] = ['label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().$sFieldFlag.'</span>', 'value' => "<span id=\"field_att_$iMaxInputId\">$sHTMLValue</span>"];
-				if ($oAttDef->GetValuesDef() != null)
+				if ($oAttDef->GetValuesDef() != null) {
-				{
 					$sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
 				}
-				if ($oAttDef->GetDefaultValue() != null)
+				if ($oAttDef->GetDefaultValue() != null) {
-				{
 					$sJSHandlerCode .= "\toWizardHelper.RequestDefaultValue('$sAttCode');\n";
 				}
-				if ($oAttDef->IsLinkSet())
+				if ($oAttDef->IsLinkSet()) {
-				{
 					$sJSHandlerCode .= "\toLinkWidgetatt_$iMaxInputId.Init();";
 				}
 				$iMaxInputId++;
@@ -141,8 +140,7 @@ $sJSHandlerCode
 		$this->m_oPage->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\" />\n");
 		$this->m_oPage->add("<input type=\"hidden\" id=\"wizard_json_obj\" name=\"json_obj\" value=\"\" />\n");
 		$sScript = "function OnEnterStep$iStepIndex() {\n";
-		foreach($aFieldsMap as $iInputId => $sAttCode)
+		foreach ($aFieldsMap as $iInputId => $sAttCode) {
-		{
 			$sScript .= "\toWizardHelper.UpdateCurrentValue('$sAttCode');\n";
 		}
 		$sScript .= "\toWizardHelper.Preview('object_preview');\n";
@@ -166,39 +164,32 @@ $sJSHandlerCode
 	 */
 	protected function ComputeWizardStructure()
 	{
-		$aWizardSteps = array( 'mandatory' => array(), 'optional' => array());
+		$aWizardSteps = [ 'mandatory' => [], 'optional' => []];
-		$aFieldsDone = array(); // Store all the fields that are already covered by a previous step of the wizard
+		$aFieldsDone = []; // Store all the fields that are already covered by a previous step of the wizard
 
 		$aStates = MetaModel::EnumStates($this->m_sClass);
 		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
 
-		$aMandatoryAttributes = array();
+		$aMandatoryAttributes = [];
 		// Some attributes are always mandatory independently of the state machine (if any)
-        foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode)
+		foreach (MetaModel::GetAttributesList($this->m_sClass) as $sAttCode) {
-        {
 			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 			if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed() &&
-			    $oAttDef->IsWritable() && ($sAttCode != $sStateAttCode) )
+				$oAttDef->IsWritable() && ($sAttCode != $sStateAttCode)) {
-            {
 				$aMandatoryAttributes[$sAttCode] = OPT_ATT_MANDATORY;
 			}
 		}
 
 		// Now check the attributes that are mandatory in the specified state
-		if ( (!empty($this->m_sTargetState)) && (count($aStates[$this->m_sTargetState]['attribute_list']) > 0) )
+		if ((!empty($this->m_sTargetState)) && (count($aStates[$this->m_sTargetState]['attribute_list']) > 0)) {
-		{
 			// Check all the fields that *must* be included in the wizard for this
 			// particular target state
-			$aFields = array();
+			$aFields = [];
-			foreach($aStates[$this->m_sTargetState]['attribute_list'] as $sAttCode => $iOptions)
+			foreach ($aStates[$this->m_sTargetState]['attribute_list'] as $sAttCode => $iOptions) {
-			{
+				if ((isset($aMandatoryAttributes[$sAttCode])) &&
-				if ( (isset($aMandatoryAttributes[$sAttCode])) && 
+					 ($aMandatoryAttributes[$sAttCode] & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))) {
-					 ($aMandatoryAttributes[$sAttCode] & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) )
-				{
 					$aMandatoryAttributes[$sAttCode] |= $iOptions;
-				}
+				} else {
-				else
-				{
 					$aMandatoryAttributes[$sAttCode] = $iOptions;
 				}
 			}
@@ -209,17 +200,14 @@ $sJSHandlerCode
 		// not also read-only or hidden.
 		// Some fields may be required (null not allowed) from the database
 		// perspective, but hidden or read-only from the user interface perspective
-		$aFields = array();
+		$aFields = [];
-		foreach($aMandatoryAttributes as $sAttCode => $iOptions)
+		foreach ($aMandatoryAttributes as $sAttCode => $iOptions) {
-		{
+			if (($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) &&
-			if ( ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) &&
+				 !($iOptions & (OPT_ATT_READONLY | OPT_ATT_HIDDEN))) {
-				 !($iOptions & (OPT_ATT_READONLY | OPT_ATT_HIDDEN)) )
-			{
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				$aFields[$sAttCode] = array();
+				$aFields[$sAttCode] = [];
-				foreach($aPrerequisites as $sCode)
+				foreach ($aPrerequisites as $sCode) {
-				{
 					$aFields[$sAttCode][$sCode] = '';
 				}
 			}
@@ -229,48 +217,39 @@ $sJSHandlerCode
 		// Start from the order of the 'details'
 		$aList = MetaModel::FlattenZlist(MetaModel::GetZListItems($this->m_sClass, 'details'));
 		$index = 0;
-		$aOrder = array();
+		$aOrder = [];
-		foreach($aFields as $sAttCode => $void)
+		foreach ($aFields as $sAttCode => $void) {
-		{
 			$aOrder[$sAttCode] = 999; // At the end of the list...
 		}
-		foreach($aList as $sAttCode)
+		foreach ($aList as $sAttCode) {
-		{
+			if (array_key_exists($sAttCode, $aFields)) {
-			if (array_key_exists($sAttCode, $aFields))
-			{
 				$aOrder[$sAttCode] = $index;
 			}
 			$index++;
 		}
-		foreach($aFields as $sAttCode => $aDependencies)
+		foreach ($aFields as $sAttCode => $aDependencies) {
-		{
 			// All fields with no remaining dependencies can be entered at this
 			// step of the wizard
-			if (count($aDependencies) > 0)
+			if (count($aDependencies) > 0) {
-			{
 				$iMaxPos = 0;
 				// Remove this field from the dependencies of the other fields
-				foreach($aDependencies as $sDependentAttCode => $void)
+				foreach ($aDependencies as $sDependentAttCode => $void) {
-				{
 					// position the current field after the ones it depends on
-					$iMaxPos = max($iMaxPos, 1+$aOrder[$sDependentAttCode]);
+					$iMaxPos = max($iMaxPos, 1 + $aOrder[$sDependentAttCode]);
 				}
 			}
 		}
 		asort($aOrder);
-		$aCurrentStep = array();
+		$aCurrentStep = [];
-		foreach($aOrder as $sAttCode => $rank)
+		foreach ($aOrder as $sAttCode => $rank) {
-		{
 			$aCurrentStep[] = $sAttCode;
 			$aFieldsDone[$sAttCode] = '';
 		}
 		$aWizardSteps['mandatory'][] = $aCurrentStep;
 
-
 		// Now computes the steps to fill the optional fields
-		$aFields = array(); // reset
+		$aFields = []; // reset
-		foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef)
+		foreach (MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode => $oAttDef) {
-		{
 			$iOptions = (isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode])) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
 			if (($sStateAttCode != $sAttCode) &&
 				(!$oAttDef->IsExternalField()) &&
@@ -282,7 +261,7 @@ $sJSHandlerCode
 				// are removed from the 'optional' part of the wizard
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				$aFields[$sAttCode] = array();
+				$aFields[$sAttCode] = [];
 				foreach ($aPrerequisites as $sCode) {
 					if (!isset($aFieldsDone[$sCode])) {
 						// retain only the dependencies that were not covered
@@ -293,28 +272,23 @@ $sJSHandlerCode
 			}
 		}
 		// Now use the dependencies between the fields to order them
-		while(count($aFields) > 0)
+		while (count($aFields) > 0) {
-		{
+			$aCurrentStep = [];
-			$aCurrentStep = array();
+			foreach ($aFields as $sAttCode => $aDependencies) {
-			foreach($aFields as $sAttCode => $aDependencies)
-			{
 				// All fields with no remaining dependencies can be entered at this
 				// step of the wizard
-				if (count($aDependencies) == 0)
+				if (count($aDependencies) == 0) {
-				{
 					$aCurrentStep[] = $sAttCode;
 					$aFieldsDone[$sAttCode] = '';
 					unset($aFields[$sAttCode]);
 					// Remove this field from the dependencies of the other fields
-					foreach($aFields as $sUpdatedCode => $aDummy)
+					foreach ($aFields as $sUpdatedCode => $aDummy) {
-					{
 						// remove the dependency
 						unset($aFields[$sUpdatedCode][$sAttCode]);
 					}
 				}
 			}
-			if (count($aCurrentStep) == 0)
+			if (count($aCurrentStep) == 0) {
-			{
 				// This step of the wizard would contain NO field !
 				$this->m_oPage->add(Dict::S('UI:Error:WizardCircularReferenceInDependencies'));
 				print_r($aFields);
@@ -326,4 +300,3 @@ $sJSHandlerCode
 
 	}
 }
-?>

application/user.dashboard.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -31,31 +32,31 @@ class UserDashboard extends DBObject
 {
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category" => "gui",
 			"key_type" => "autoincrement",
-			"name_attcode" => array('user_id', 'menu_code'),
+			"name_attcode" => ['user_id', 'menu_code'],
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => [],
 			"db_table" => "priv_app_dashboards",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-		);
+		];
 
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", ["targetclass" => "User", "allowed_values" => null, "sql" => "user_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeString("menu_code", array("allowed_values"=>null, "sql"=>"menu_code", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("menu_code", ["allowed_values" => null, "sql" => "menu_code", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeText("contents", array("allowed_values"=>null, "sql"=>"contents", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("contents", ["allowed_values" => null, "sql" => "contents", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
 
-		MetaModel::Init_SetZListItems('default_search', array (
+		MetaModel::Init_SetZListItems('default_search', [
 			0 => 'user_id',
 			1 => 'menu_code',
-		));
+		]);
-		MetaModel::Init_SetZListItems('list', array (
+		MetaModel::Init_SetZListItems('list', [
 			0 => 'user_id',
 			1 => 'menu_code',
-		));
+		]);
 	}
 
 	/**
@@ -67,4 +68,3 @@ class UserDashboard extends DBObject
 		$this->DBDelete($oDeletionPlan);
 	}
 }
-?>

application/user.preferences.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -227,13 +228,12 @@ class appUserPreferences extends DBObject
 			// No prefs (yet) for this user, create the object
 			$oObj = new appUserPreferences();
 			$oObj->Set('userid', $sUserId);
-			$oObj->Set('preferences', array()); // Default preferences: an empty array
+			$oObj->Set('preferences', []); // Default preferences: an empty array
 			try {
 				utils::PushArchiveMode(false);
 				$oObj->DBInsert();
 				utils::PopArchiveMode();
-			}
+			} catch (Exception $e) {
-			catch (Exception $e) {
 				// Ignore errors
 			}
 		}
@@ -245,25 +245,25 @@ class appUserPreferences extends DBObject
 	 */
 	public static function Init()
 	{
-		$aParams = array
+		$aParams =
-		(
+		[
 			"category" => "gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "login",
 			"state_attcode" => "",
-			"reconc_keys" => array("userid","login"),
+			"reconc_keys" => ["userid","login"],
 			"db_table" => "priv_app_preferences",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-		);
+		];
 
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", ["targetclass" => "User", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("preferences", array("allowed_values"=>null, "sql"=>"preferences", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributePropertySet("preferences", ["allowed_values" => null, "sql" => "preferences", "default_value" => null, "is_null_allowed" => true, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("org_id", array("allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "org_id")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("org_id", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "org_id"]));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
-		MetaModel::Init_SetZListItems('list', array('org_id','preferences'));
+		MetaModel::Init_SetZListItems('list', ['org_id','preferences']);
-		MetaModel::Init_SetZListItems('default_search', array('userid','login','org_id'));
+		MetaModel::Init_SetZListItems('default_search', ['userid','login','org_id']);
 	}
 
 	/**

application/wizardhelper.class.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 // Copyright (C) 2010-2024 Combodo SAS
 //
 //   This file is part of iTop.
@@ -16,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * Class WizardHelper
  *
@@ -42,23 +42,17 @@ class WizardHelper
 	 */
 	public function GetTargetObject($bReadUploadedFiles = false)
 	{
-		if (isset($this->m_aData['m_oCurrentValues']['id']))
+		if (isset($this->m_aData['m_oCurrentValues']['id'])) {
-		{
 			$oObj = MetaModel::GetObject($this->m_aData['m_sClass'], $this->m_aData['m_oCurrentValues']['id']);
-		}
+		} else {
-		else
-		{
 			$oObj = MetaModel::NewObject($this->m_aData['m_sClass']);
 		}
-		foreach($this->m_aData['m_oCurrentValues'] as $sAttCode => $value)
+		foreach ($this->m_aData['m_oCurrentValues'] as $sAttCode => $value) {
-		{
 			// Because this is stored in a Javascript array, unused indexes
 			// are filled with null values and unused keys (stored as strings) contain $$NULL$$
-			if ( ($sAttCode !='id') && ($value !== '$$NULL$$'))
+			if (($sAttCode != 'id') && ($value !== '$$NULL$$')) {
-			{
 				$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
-				if (($oAttDef->IsLinkSet()) && ($value != '') )
+				if (($oAttDef->IsLinkSet()) && ($value != '')) {
-				{
 					// special handling for lists
 					// assumes this is handled as an array of objects
 					// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
@@ -71,47 +65,35 @@ class WizardHelper
 					// Check what are the meaningful attributes
 					$aFields = $this->GetLinkedWizardStructure($oAttDef);
 					$sLinkedClass = $oAttDef->GetLinkedClass();
-					$aLinkedObjectsArray = array();
+					$aLinkedObjectsArray = [];
 					if (!is_array($aData)) {
 						echo("aData: '$aData' (value: '$value')\n");
 					}
-					foreach ($aData as $aLinkedObject)
+					foreach ($aData as $aLinkedObject) {
-					{
 						$oLinkedObj = MetaModel::NewObject($sLinkedClass);
-						foreach($aFields as $sLinkedAttCode)
+						foreach ($aFields as $sLinkedAttCode) {
-						{
+							if (isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null)) {
-							if ( isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null) )
-							{
 								$sLinkedAttDef = MetaModel::GetAttributeDef($sLinkedClass, $sLinkedAttCode);
-								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] > 0) )
+								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] > 0)) {
-								{
 									// For external keys: load the target object so that external fields
 									// get filled too
 									$oTargetObj = MetaModel::GetObject($sLinkedAttDef->GetTargetClass(), $aLinkedObject[$sLinkedAttCode]);
 									$oLinkedObj->Set($sLinkedAttCode, $oTargetObj);
-								}
+								} elseif ($sLinkedAttDef instanceof AttributeDateTime) {
-								elseif($sLinkedAttDef instanceof AttributeDateTime)
-                                {
 									$sDateClass = get_class($sLinkedAttDef);
 									$sDate = $aLinkedObject[$sLinkedAttCode];
-                                    if($sDate !== null && $sDate !== '')
+									if ($sDate !== null && $sDate !== '') {
-                                    {
 										$oDateTimeFormat = $sDateClass::GetFormat();
 										$oDate = $oDateTimeFormat->Parse($sDate);
-                                        if ($sDateClass == "AttributeDate")
+										if ($sDateClass == "AttributeDate") {
-                                        {
 											$sDate = $oDate->format('Y-m-d');
-                                        }
+										} else {
-                                        else
-                                        {
 											$sDate = $oDate->format('Y-m-d H:i:s');
 										}
 									}
 
 									$oLinkedObj->Set($sLinkedAttCode, $sDate);
-                                }
+								} else {
-								else
-								{
 									$oLinkedObj->Set($sLinkedAttCode, $aLinkedObject[$sLinkedAttCode]);
 								}
 							}
@@ -120,98 +102,67 @@ class WizardHelper
 					}
 					$oSet = DBObjectSet::FromArray($sLinkedClass, $aLinkedObjectsArray);
 					$oObj->Set($sAttCode, $oSet);
-				}
+				} elseif ($oAttDef->GetEditClass() == 'Document') {
-				else if ( $oAttDef->GetEditClass() == 'Document' )
+					if ($bReadUploadedFiles) {
-				{
-					if ($bReadUploadedFiles)
-					{
 						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
 						$oObj->Set($sAttCode, $oDocument);
-					}
+					} else {
-					else
-					{
 						// Create a new empty document, just for displaying the file name
 						$oDocument = new ormDocument(null, '', $value);
 						$oObj->Set($sAttCode, $oDocument);
 					}
-				}
+				} elseif ($oAttDef->GetEditClass() == 'Image') {
-				else if ( $oAttDef->GetEditClass() == 'Image' )
+					if ($bReadUploadedFiles) {
-				{
-					if ($bReadUploadedFiles)
-					{
 						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
 						$oObj->Set($sAttCode, $oDocument);
-					}
+					} else {
-					else
-					{
 						// Create a new empty document, just for displaying the file name
 						$oDocument = new ormDocument(null, '', $value);
 						$oObj->Set($sAttCode, $oDocument);
 					}
-				}
+				} elseif (($oAttDef->IsExternalKey()) && (!empty($value)) && ($value > 0)) {
-				else if (($oAttDef->IsExternalKey()) && (!empty($value)) && ($value > 0) )
-				{
 					// For external keys: load the target object so that external fields
 					// get filled too
 					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value, false);
-					if ($oTargetObj)
+					if ($oTargetObj) {
-					{
 						$oObj->Set($sAttCode, $oTargetObj);
-					}
+					} else {
-					else
-					{
 						// May happen for security reasons (portal, see ticket N°1074)
 						$oObj->Set($sAttCode, $value);
 					}
-				}
+				} elseif ($oAttDef instanceof AttributeDateTime) { // AttributeDate is derived from AttributeDateTime
-				else if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
+					if ($value != null) {
-				{
-					if ($value != null)
-					{
 						$oDate = $oAttDef->GetFormat()->Parse($value);
-						if ($oDate instanceof DateTime)
+						if ($oDate instanceof DateTime) {
-						{
 							$value = $oDate->format($oAttDef->GetInternalFormat());
-						}
+						} else {
-						else
-						{
 							$value = null;
 						}
 					}
 					$oObj->Set($sAttCode, $value);
-				}
+				} elseif ($oAttDef instanceof AttributeTagSet) { // AttributeDate is derived from AttributeDateTime
-				else if ($oAttDef instanceof AttributeTagSet) // AttributeDate is derived from AttributeDateTime
+					if (is_null($value)) {
-				{
-					if (is_null($value))
-					{
 						// happens if field is hidden (see N°1827)
-						$value = array();
+						$value = [];
-					}
+					} else {
-					else
-					{
 						$value = json_decode($value, true);
 					}
 					$oTagSet = new ormTagSet(get_class($oObj), $sAttCode, $oAttDef->GetMaxItems());
 					$oTagSet->SetValues($value['orig_value']);
 					$oTagSet->ApplyDelta($value);
 					$oObj->Set($sAttCode, $oTagSet);
-				}
+				} elseif ($oAttDef instanceof AttributeSet) { // AttributeDate is derived from AttributeDateTime
-				else if ($oAttDef instanceof AttributeSet) // AttributeDate is derived from AttributeDateTime
-				{
 					$value = json_decode($value, true);
 					$oTagSet = new ormSet(get_class($oObj), $sAttCode, $oAttDef->GetMaxItems());
 					$oTagSet->SetValues($value['orig_value']);
 					$oTagSet->ApplyDelta($value);
 					$oObj->Set($sAttCode, $oTagSet);
-				}
+				} else {
-				else
-				{
 					$oObj->Set($sAttCode, $value);
 				}
 			}
 		}
-		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
+		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState'])) {
-		{
 			$oObj->Set(MetaModel::GetStateAttributeCode($this->m_aData['m_sClass']), $this->m_aData['m_sState']);
 		}
 		$oObj->DoComputeValues();
@@ -226,31 +177,25 @@ class WizardHelper
 	public function SetDefaultValue($sAttCode, $value)
 	{
 		// Protect against a request for a non existing field
-		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
+		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode])) {
-		{
 			$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
-			if ($oAttDef->GetEditClass() == 'List')
+			if ($oAttDef->GetEditClass() == 'List') {
-			{
 				// special handling for lists
 				// this as to be handled as an array of objects
 				// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
 				// NOT YET IMPLEMENTED !!
 				$oSet = $value;
-				$aData = array();
+				$aData = [];
 				$aFields = $this->GetLinkedWizardStructure($oAttDef);
-				while($oLinkedObj = $oSet->fetch())
+				while ($oLinkedObj = $oSet->fetch()) {
-				{
+					foreach ($aFields as $sLinkedAttCode) {
-					foreach($aFields as $sLinkedAttCode)
-					{
 						$aRow[$sAttCode] = $oLinkedObj->Get($sLinkedAttCode);
 					}
 					$aData[] = $aRow;
 				}
 				$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
 
-			}
+			} else {
-			else
-			{
 				// Normal handling for all other scalar attributes
 				$this->m_aData['m_oDefaultValue'][$sAttCode] = $value;
 			}
@@ -265,8 +210,7 @@ class WizardHelper
 	public function SetAllowedValuesHtml($sAttCode, $sHtml)
 	{
 		// Protect against a request for a non existing field
-		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
+		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode])) {
-		{
 			$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
 		}
 	}
@@ -276,7 +220,7 @@ class WizardHelper
 		return json_encode($this->m_aData);
 	}
 
-	static public function FromJSON($sJSON)
+	public static function FromJSON($sJSON)
 	{
 		$oWizHelper = new WizardHelper();
 		$aData = json_decode($sJSON, true); // true means hash array instead of object
@@ -288,21 +232,17 @@ class WizardHelper
 	{
 		$oWizard = new UIWizard(null, $oAttDef->GetLinkedClass());
 		$aWizardSteps = $oWizard->GetWizardStructure();
-		$aFields = array();
+		$aFields = [];
 		$sExtKeyToMeCode = $oAttDef->GetExtKeyToMe();
 		// Retrieve as a flat list, all the attributes that are needed to create
 		// an object of the linked class and put them into a flat array, except
 		// the attribute 'ext_key_to_me' which is a constant in our case
-		foreach($aWizardSteps as $sDummy => $aMainSteps)
+		foreach ($aWizardSteps as $sDummy => $aMainSteps) {
-		{
 			// 2 entries: 'mandatory' and 'optional'
-			foreach($aMainSteps as $aSteps)
+			foreach ($aMainSteps as $aSteps) {
-			{
 				// One entry for each step of the wizard
-				foreach($aSteps as $sAttCode)
+				foreach ($aSteps as $sAttCode) {
-				{
+					if ($sAttCode != $sExtKeyToMeCode) {
-					if ($sAttCode != $sExtKeyToMeCode)
-					{
 						$aFields[] = $sAttCode;
 					}
 				}
@@ -337,8 +277,7 @@ class WizardHelper
 		// It may happen that the field we'd like to update does not
 		// exist in the form. For example, if the field should be hidden/read-only
 		// in the current state of the object
-		if (isset($this->m_aData['m_oFieldsMap'][$sFieldName]))
+		if (isset($this->m_aData['m_oFieldsMap'][$sFieldName])) {
-		{
 			$sResult = $this->m_aData['m_oFieldsMap'][$sFieldName];
 		}
 
@@ -362,12 +301,14 @@ class WizardHelper
 		$sWizardHelperJsVar = (!is_null($this->m_aData['m_sWizHelperJsVarName'])) ? utils::Sanitize($this->m_aData['m_sWizHelperJsVarName'], '', utils::ENUM_SANITIZATION_FILTER_PARAMETER) : 'oWizardHelper'.$this->GetFormPrefix();
 		$sWizardHelperJson = $this->ToJSON();
 
-		$oPage->add_script(<<<JS
+		$oPage->add_script(
+			<<<JS
 {$sWizardHelperJsVar}.m_oData = {$sWizardHelperJson};
 {$sWizardHelperJsVar}.UpdateFields();
 JS
 		);
-		$oPage->add_ready_script(<<<JS
+		$oPage->add_ready_script(
+			<<<JS
 if ({$sWizardHelperJsVar}.m_oDependenciesUpdatedPromiseResolve !== null){
     {$sWizardHelperJsVar}.m_oDependenciesUpdatedPromiseResolve();
 }

application/xlsxwriter.class.php

@@ -1,28 +1,36 @@
 <?php
+
 /* @author Mark Jones
  * @license MIT License
  * */
 
-if (!class_exists('ZipArchive')) { throw new Exception('ZipArchive not found'); }
+if (!class_exists('ZipArchive')) {
+	throw new Exception('ZipArchive not found');
+}
 
-Class XLSXWriter
+class XLSXWriter
 {
 	//------------------------------------------------------------------
-	protected $author ='Doc Author';
+	protected $author = 'Doc Author';
-	protected $sheets_meta = array();
+	protected $sheets_meta = [];
-	protected $shared_strings = array();//unique set
+	protected $shared_strings = [];//unique set
 	protected $shared_string_count = 0;//count of non-unique references to the unique set
-	protected $temp_files = array();
+	protected $temp_files = [];
 	protected $date_format = 'YYYY-MM-DD';
 	protected $date_time_format = 'YYYY-MM-DD\ HH:MM:SS';
 
-	public function __construct(){}
+	public function __construct()
-	public function setAuthor($author='') { $this->author=$author; }
+	{
+	}
+	public function setAuthor($author = '')
+	{
+		$this->author = $author;
+	}
 
 	public function __destruct()
 	{
 		if (!empty($this->temp_files)) {
-			foreach($this->temp_files as $temp_file) {
+			foreach ($this->temp_files as $temp_file) {
 				@unlink($temp_file);
 			}
 		}
@@ -64,59 +72,66 @@ Class XLSXWriter
 	{
 		@unlink($filename);//if the zip already exists, overwrite it
 		$zip = new ZipArchive();
-		if (empty($this->sheets_meta))                  { self::log("Error in ".__CLASS__."::".__FUNCTION__.", no worksheets defined."); return; }
+		if (empty($this->sheets_meta)) {
-		if (!$zip->open($filename, ZipArchive::CREATE)) { self::log("Error in ".__CLASS__."::".__FUNCTION__.", unable to create zip."); return; }
+			self::log("Error in ".__CLASS__."::".__FUNCTION__.", no worksheets defined.");
+			return;
+		}
+		if (!$zip->open($filename, ZipArchive::CREATE)) {
+			self::log("Error in ".__CLASS__."::".__FUNCTION__.", unable to create zip.");
+			return;
+		}
 
 		$zip->addEmptyDir("docProps/");
-		$zip->addFromString("docProps/app.xml" , self::buildAppXML() );
+		$zip->addFromString("docProps/app.xml", self::buildAppXML());
 		$zip->addFromString("docProps/core.xml", self::buildCoreXML());
 
 		$zip->addEmptyDir("_rels/");
 		$zip->addFromString("_rels/.rels", self::buildRelationshipsXML());
 
 		$zip->addEmptyDir("xl/worksheets/");
-		foreach($this->sheets_meta as $sheet_meta) {
+		foreach ($this->sheets_meta as $sheet_meta) {
-			$zip->addFile($sheet_meta['filename'], "xl/worksheets/".$sheet_meta['xmlname'] );
+			$zip->addFile($sheet_meta['filename'], "xl/worksheets/".$sheet_meta['xmlname']);
 		}
 		if (!empty($this->shared_strings)) {
-			$zip->addFile($this->writeSharedStringsXML(), "xl/sharedStrings.xml" );  //$zip->addFromString("xl/sharedStrings.xml",     self::buildSharedStringsXML() );
+			$zip->addFile($this->writeSharedStringsXML(), "xl/sharedStrings.xml");  //$zip->addFromString("xl/sharedStrings.xml",     self::buildSharedStringsXML() );
 		}
-		$zip->addFromString("xl/workbook.xml"         , self::buildWorkbookXML() );
+		$zip->addFromString("xl/workbook.xml", self::buildWorkbookXML());
-		$zip->addFile($this->writeStylesXML(), "xl/styles.xml" );  //$zip->addFromString("xl/styles.xml"           , self::buildStylesXML() );
+		$zip->addFile($this->writeStylesXML(), "xl/styles.xml");  //$zip->addFromString("xl/styles.xml"           , self::buildStylesXML() );
-		$zip->addFromString("[Content_Types].xml"     , self::buildContentTypesXML() );
+		$zip->addFromString("[Content_Types].xml", self::buildContentTypesXML());
 
 		$zip->addEmptyDir("xl/_rels/");
-		$zip->addFromString("xl/_rels/workbook.xml.rels", self::buildWorkbookRelsXML() );
+		$zip->addFromString("xl/_rels/workbook.xml.rels", self::buildWorkbookRelsXML());
 		$zip->close();
 	}
 
-	
+	public function writeSheet(array $data, $sheet_name = '', array $header_types = [], array $header_row = [])
-	public function writeSheet(array $data, $sheet_name='', array $header_types=array(), array $header_row=array() )
 	{
-		$data = empty($data) ? array( array('') ) : $data;
+		$data = empty($data) ? [ [''] ] : $data;
 
 		$sheet_filename = $this->tempFilename();
-		$sheet_default = 'Sheet'.(count($this->sheets_meta)+1);
+		$sheet_default = 'Sheet'.(count($this->sheets_meta) + 1);
 		$sheet_name = !empty($sheet_name) ? $sheet_name : $sheet_default;
-		$this->sheets_meta[] = array('filename'=>$sheet_filename, 'sheetname'=>$sheet_name ,'xmlname'=>strtolower($sheet_default).".xml" );
+		$this->sheets_meta[] = ['filename' => $sheet_filename, 'sheetname' => $sheet_name ,'xmlname' => strtolower($sheet_default).".xml" ];
 
 		$header_offset = empty($header_types) ? 0 : 1;
 		$row_count = count($data) + $header_offset;
 		$column_count = count($data[self::array_first_key($data)]);
-		$max_cell = self::xlsCell( $row_count-1, $column_count-1 );
+		$max_cell = self::xlsCell($row_count - 1, $column_count - 1);
 
-		$tabselected = count($this->sheets_meta)==1 ? 'true' : 'false';//only first sheet is selected
+		$tabselected = count($this->sheets_meta) == 1 ? 'true' : 'false';//only first sheet is selected
 		$cell_formats_arr = empty($header_types) ? array_fill(0, $column_count, 'string') : array_values($header_types);
-		if (empty($header_row) && !empty($header_types))
+		if (empty($header_row) && !empty($header_types)) {
-		{
+			$header_row = empty($header_types) ? [] : array_keys($header_types);
-			$header_row = empty($header_types) ? array() : array_keys($header_types);
 		}
 
 		$fd = fopen($sheet_filename, "w+");
-		if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
+		if ($fd === false) {
+			self::log("write failed in ".__CLASS__."::".__FUNCTION__.".");
+			return;
+		}
 
-		fwrite($fd,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
+		fwrite($fd, '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
-		fwrite($fd,'<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">');
+		fwrite($fd, '<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">');
 		fwrite($fd, '<sheetPr filterMode="false">');
 		fwrite($fd, '<pageSetUpPr fitToPage="false"/>');
 		fwrite($fd, '</sheetPr>');
@@ -130,21 +145,17 @@ Class XLSXWriter
 		fwrite($fd, '<col collapsed="false" hidden="false" max="1025" min="1" style="0" width="19"/>');
 		fwrite($fd, '</cols>');
 		fwrite($fd, '<sheetData>');
-		if (!empty($header_row))
+		if (!empty($header_row)) {
-		{
 			fwrite($fd, '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.(1).'">');
-			foreach($header_row as $k=>$v)
+			foreach ($header_row as $k => $v) {
-			{
+				$this->writeCell($fd, 0, $k, $v, $cell_format = 'string');
-				$this->writeCell($fd, 0, $k, $v, $cell_format='string');
 			}
 			fwrite($fd, '</row>');
 		}
-		foreach($data as $i=>$row)
+		foreach ($data as $i => $row) {
-		{
+			fwrite($fd, '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.($i + $header_offset + 1).'">');
-			fwrite($fd, '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.($i+$header_offset+1).'">');
+			foreach ($row as $k => $v) {
-			foreach($row as $k=>$v)
+				$this->writeCell($fd, $i + $header_offset, $k, $v, $cell_formats_arr[$k]);
-			{
-				$this->writeCell($fd, $i+$header_offset, $k, $v, $cell_formats_arr[$k]);
 			}
 			fwrite($fd, '</row>');
 		}
@@ -156,28 +167,28 @@ Class XLSXWriter
 		fwrite($fd, '<oddHeader>&amp;C&amp;&quot;Times New Roman,Regular&quot;&amp;12&amp;A</oddHeader>');
 		fwrite($fd, '<oddFooter>&amp;C&amp;&quot;Times New Roman,Regular&quot;&amp;12Page &amp;P</oddFooter>');
 		fwrite($fd, '</headerFooter>');
-		fwrite($fd,'</worksheet>');
+		fwrite($fd, '</worksheet>');
 		fclose($fd);
 	}
 
 	protected function writeCell($fd, $row_number, $column_number, $value, $cell_format)
 	{
-		static $styles = array('money'=>1,'dollar'=>1,'datetime'=>2,'date'=>3,'string'=>0);
+		static $styles = ['money' => 1,'dollar' => 1,'datetime' => 2,'date' => 3,'string' => 0];
 		$cell = self::xlsCell($row_number, $column_number);
 		$s = isset($styles[$cell_format]) && ($value !== '') ? $styles[$cell_format] : '0';
 
 		if (is_int($value) || is_float($value)) {
-			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.($value*1).'</v></c>');//int,float, etc
+			fwrite($fd, '<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.($value * 1).'</v></c>');//int,float, etc
-		} else if (($cell_format=='date') && ($value != '')) {
+		} elseif (($cell_format == 'date') && ($value != '')) {
-			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.intval(self::convert_date_time($value)).'</v></c>');
+			fwrite($fd, '<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.intval(self::convert_date_time($value)).'</v></c>');
-		} else if (($cell_format=='datetime') && ($value != '')) {
+		} elseif (($cell_format == 'datetime') && ($value != '')) {
-			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
+			fwrite($fd, '<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
-		} else if ($value==''){
+		} elseif ($value == '') {
-			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'"/>');
+			fwrite($fd, '<c r="'.$cell.'" s="'.$s.'"/>');
-		} else if ($value[0]=='='){
+		} elseif ($value[0] == '=') {
-			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="s"><f>'.self::xmlspecialchars($value).'</f></c>');
+			fwrite($fd, '<c r="'.$cell.'" s="'.$s.'" t="s"><f>'.self::xmlspecialchars($value).'</f></c>');
-		} else if ($value!==''){
+		} elseif ($value !== '') {
-			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="s"><v>'.self::xmlspecialchars($this->setSharedString($value)).'</v></c>');
+			fwrite($fd, '<c r="'.$cell.'" s="'.$s.'" t="s"><v>'.self::xmlspecialchars($this->setSharedString($value)).'</v></c>');
 		}
 	}
 
@@ -185,7 +196,10 @@ Class XLSXWriter
 	{
 		$tempfile = $this->tempFilename();
 		$fd = fopen($tempfile, "w+");
-		if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
+		if ($fd === false) {
+			self::log("write failed in ".__CLASS__."::".__FUNCTION__.".");
+			return;
+		}
 		fwrite($fd, '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
 		fwrite($fd, '<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">');
 		fwrite($fd, '<numFmts count="4">');
@@ -250,12 +264,9 @@ Class XLSXWriter
 	{
 		// Strip control characters which Excel does not seem to like...
 		$v = preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F]/u', '', $v);
-		if (isset($this->shared_strings[$v]))
+		if (isset($this->shared_strings[$v])) {
-		{
 			$string_value = $this->shared_strings[$v];
-		}
+		} else {
-		else
-		{
 			$string_value = count($this->shared_strings);
 			$this->shared_strings[$v] = $string_value;
 		}
@@ -267,13 +278,15 @@ Class XLSXWriter
 	{
 		$tempfile = $this->tempFilename();
 		$fd = fopen($tempfile, "w+");
-		if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
+		if ($fd === false) {
+			self::log("write failed in ".__CLASS__."::".__FUNCTION__.".");
+			return;
+		}
 
-		fwrite($fd,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
+		fwrite($fd, '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
-		fwrite($fd,'<sst count="'.($this->shared_string_count).'" uniqueCount="'.count($this->shared_strings).'" xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">');
+		fwrite($fd, '<sst count="'.($this->shared_string_count).'" uniqueCount="'.count($this->shared_strings).'" xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">');
-		foreach($this->shared_strings as $s=>$c)
+		foreach ($this->shared_strings as $s => $c) {
-		{
+			fwrite($fd, '<si><t>'.self::xmlspecialchars($s).'</t></si>');
-			fwrite($fd,'<si><t>'.self::xmlspecialchars($s).'</t></si>');
 		}
 		fwrite($fd, '</sst>');
 		fclose($fd);
@@ -282,89 +295,89 @@ Class XLSXWriter
 
 	protected function buildAppXML()
 	{
-		$app_xml="";
+		$app_xml = "";
-		$app_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+		$app_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
-		$app_xml.='<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><TotalTime>0</TotalTime></Properties>';
+		$app_xml .= '<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><TotalTime>0</TotalTime></Properties>';
 		return $app_xml;
 	}
 
 	protected function buildCoreXML()
 	{
-		$core_xml="";
+		$core_xml = "";
-		$core_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+		$core_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
-		$core_xml.='<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
+		$core_xml .= '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
-		$core_xml.='<dcterms:created xsi:type="dcterms:W3CDTF">'.date("Y-m-d\TH:i:s.00\Z").'</dcterms:created>';//$date_time = '2013-07-25T15:54:37.00Z';
+		$core_xml .= '<dcterms:created xsi:type="dcterms:W3CDTF">'.date("Y-m-d\TH:i:s.00\Z").'</dcterms:created>';//$date_time = '2013-07-25T15:54:37.00Z';
-		$core_xml.='<dc:creator>'.self::xmlspecialchars($this->author).'</dc:creator>';
+		$core_xml .= '<dc:creator>'.self::xmlspecialchars($this->author).'</dc:creator>';
-		$core_xml.='<cp:revision>0</cp:revision>';
+		$core_xml .= '<cp:revision>0</cp:revision>';
-		$core_xml.='</cp:coreProperties>';
+		$core_xml .= '</cp:coreProperties>';
 		return $core_xml;
 	}
 
 	protected function buildRelationshipsXML()
 	{
-		$rels_xml="";
+		$rels_xml = "";
-		$rels_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
+		$rels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-		$rels_xml.='<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
+		$rels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
-		$rels_xml.='<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
+		$rels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
-		$rels_xml.='<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
+		$rels_xml .= '<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
-		$rels_xml.='<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>';
+		$rels_xml .= '<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>';
-		$rels_xml.="\n";
+		$rels_xml .= "\n";
-		$rels_xml.='</Relationships>';
+		$rels_xml .= '</Relationships>';
 		return $rels_xml;
 	}
 
 	protected function buildWorkbookXML()
 	{
-		$workbook_xml="";
+		$workbook_xml = "";
-		$workbook_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+		$workbook_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
-		$workbook_xml.='<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">';
+		$workbook_xml .= '<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">';
-		$workbook_xml.='<fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/>';
+		$workbook_xml .= '<fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/>';
-		$workbook_xml.='<bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews>';
+		$workbook_xml .= '<bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews>';
-		$workbook_xml.='<sheets>';
+		$workbook_xml .= '<sheets>';
-		foreach($this->sheets_meta as $i=>$sheet_meta) {
+		foreach ($this->sheets_meta as $i => $sheet_meta) {
-			$workbook_xml.='<sheet name="'.self::xmlspecialchars($sheet_meta['sheetname']).'" sheetId="'.($i+1).'" state="visible" r:id="rId'.($i+2).'"/>';
+			$workbook_xml .= '<sheet name="'.self::xmlspecialchars($sheet_meta['sheetname']).'" sheetId="'.($i + 1).'" state="visible" r:id="rId'.($i + 2).'"/>';
 		}
-		$workbook_xml.='</sheets>';
+		$workbook_xml .= '</sheets>';
-		$workbook_xml.='<calcPr iterateCount="100" refMode="A1" iterate="false" iterateDelta="0.001"/></workbook>';
+		$workbook_xml .= '<calcPr iterateCount="100" refMode="A1" iterate="false" iterateDelta="0.001"/></workbook>';
 		return $workbook_xml;
 	}
 
 	protected function buildWorkbookRelsXML()
 	{
-		$wkbkrels_xml="";
+		$wkbkrels_xml = "";
-		$wkbkrels_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
+		$wkbkrels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-		$wkbkrels_xml.='<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
+		$wkbkrels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
-		$wkbkrels_xml.='<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>';
+		$wkbkrels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>';
-		foreach($this->sheets_meta as $i=>$sheet_meta) {
+		foreach ($this->sheets_meta as $i => $sheet_meta) {
-			$wkbkrels_xml.='<Relationship Id="rId'.($i+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.($sheet_meta['xmlname']).'"/>';
+			$wkbkrels_xml .= '<Relationship Id="rId'.($i + 2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.($sheet_meta['xmlname']).'"/>';
 		}
 		if (!empty($this->shared_strings)) {
-			$wkbkrels_xml.='<Relationship Id="rId'.(count($this->sheets_meta)+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>';
+			$wkbkrels_xml .= '<Relationship Id="rId'.(count($this->sheets_meta) + 2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>';
 		}
-		$wkbkrels_xml.="\n";
+		$wkbkrels_xml .= "\n";
-		$wkbkrels_xml.='</Relationships>';
+		$wkbkrels_xml .= '</Relationships>';
 		return $wkbkrels_xml;
 	}
 
 	protected function buildContentTypesXML()
 	{
-		$content_types_xml="";
+		$content_types_xml = "";
-		$content_types_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
+		$content_types_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-		$content_types_xml.='<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
+		$content_types_xml .= '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
-		$content_types_xml.='<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
+		$content_types_xml .= '<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
-		$content_types_xml.='<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
+		$content_types_xml .= '<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
-		foreach($this->sheets_meta as $i=>$sheet_meta) {
+		foreach ($this->sheets_meta as $i => $sheet_meta) {
-			$content_types_xml.='<Override PartName="/xl/worksheets/'.($sheet_meta['xmlname']).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+			$content_types_xml .= '<Override PartName="/xl/worksheets/'.($sheet_meta['xmlname']).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
 		}
 		if (!empty($this->shared_strings)) {
-			$content_types_xml.='<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>';
+			$content_types_xml .= '<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>';
 		}
-		$content_types_xml.='<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
+		$content_types_xml .= '<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
-		$content_types_xml.='<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';
+		$content_types_xml .= '<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';
-		$content_types_xml.='<Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>';
+		$content_types_xml .= '<Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>';
-		$content_types_xml.='<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>';
+		$content_types_xml .= '<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>';
-		$content_types_xml.="\n";
+		$content_types_xml .= "\n";
-		$content_types_xml.='</Types>';
+		$content_types_xml .= '</Types>';
 		return $content_types_xml;
 	}
 
@@ -377,10 +390,10 @@ Class XLSXWriter
 	public static function xlsCell($row_number, $column_number)
 	{
 		$n = $column_number;
-		for($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
+		for ($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
-			$r = chr($n%26 + 0x41) . $r;
+			$r = chr($n % 26 + 0x41).$r;
 		}
-		return $r . ($row_number+1);
+		return $r.($row_number + 1);
 	}
 	//------------------------------------------------------------------
 	public static function log($string)
@@ -404,26 +417,30 @@ Class XLSXWriter
 	{
 		$days    = 0;    # Number of days since epoch
 		$seconds = 0;    # Time expressed as fraction of 24h hours in seconds
-		$year=$month=$day=0;
+		$year = $month = $day = 0;
-		$hour=$min  =$sec=0;
+		$hour = $min  = $sec = 0;
 
 		$date_time = $date_input;
-		if (preg_match("/(\d{4})\-(\d{2})\-(\d{2})/", $date_time, $matches))
+		if (preg_match("/(\d{4})\-(\d{2})\-(\d{2})/", $date_time, $matches)) {
-		{
+			list($junk, $year, $month, $day) = $matches;
-			list($junk,$year,$month,$day) = $matches;
 		}
-		if (preg_match("/(\d{2}):(\d{2}):(\d{2})/", $date_time, $matches))
+		if (preg_match("/(\d{2}):(\d{2}):(\d{2})/", $date_time, $matches)) {
-		{
+			list($junk, $hour, $min, $sec) = $matches;
-			list($junk,$hour,$min,$sec) = $matches;
+			$seconds = ($hour * 60 * 60 + $min * 60 + $sec) / (24 * 60 * 60);
-			$seconds = ( $hour * 60 * 60 + $min * 60 + $sec ) / ( 24 * 60 * 60 );
 		}
 
 		//using 1900 as epoch, not 1904, ignoring 1904 special case
 
 		# Special cases for Excel.
-		if ("$year-$month-$day"=='1899-12-31')  return $seconds      ;    # Excel 1900 epoch
+		if ("$year-$month-$day" == '1899-12-31') {
-		if ("$year-$month-$day"=='1900-01-00')  return $seconds      ;    # Excel 1900 epoch
+			return $seconds      ;
-		if ("$year-$month-$day"=='1900-02-29')  return 60 + $seconds ;    # Excel false leapday
+		}    # Excel 1900 epoch
+		if ("$year-$month-$day" == '1900-01-00') {
+			return $seconds      ;
+		}    # Excel 1900 epoch
+		if ("$year-$month-$day" == '1900-02-29') {
+			return 60 + $seconds ;
+		}    # Excel false leapday
 
 		# We calculate the date by calculating the number of days since the epoch
 		# and adjust for the number of leap days. We calculate the number of leap
@@ -435,33 +452,35 @@ Class XLSXWriter
 		$range  = $year - $epoch;
 
 		# Set month days and check for leap year.
-		$leap = (($year % 400 == 0) || (($year % 4 == 0) && ($year % 100)) ) ? 1 : 0;
+		$leap = (($year % 400 == 0) || (($year % 4 == 0) && ($year % 100))) ? 1 : 0;
-		$mdays = array( 31, ($leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 );
+		$mdays = [ 31, ($leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ];
 
 		# Some boundary checks
-		if($year < $epoch || $year > 9999) return 0;
+		if ($year < $epoch || $year > 9999) {
-		if($month < 1     || $month > 12)  return 0;
+			return 0;
-		if($day < 1       || $day > $mdays[ $month - 1 ]) return 0;
+		}
+		if ($month < 1     || $month > 12) {
+			return 0;
+		}
+		if ($day < 1       || $day > $mdays[ $month - 1 ]) {
+			return 0;
+		}
 
 		# Accumulate the number of days since the epoch.
 		$days = $day;    # Add days for current month
-		$days += array_sum( array_slice($mdays, 0, $month-1 ) );    # Add days for past months
+		$days += array_sum(array_slice($mdays, 0, $month - 1));    # Add days for past months
 		$days += $range * 365;                      # Add days for past years
-		$days += intval( ( $range ) / 4 );             # Add leapdays
+		$days += intval(($range) / 4);             # Add leapdays
-		$days -= intval( ( $range + $offset ) / 100 ); # Subtract 100 year leapdays
+		$days -= intval(($range + $offset) / 100); # Subtract 100 year leapdays
-		$days += intval( ( $range + $offset + $norm ) / 400 );  # Add 400 year leapdays
+		$days += intval(($range + $offset + $norm) / 400);  # Add 400 year leapdays
 		$days -= $leap;                                      # Already counted above
 
 		# Adjust for Excel erroneously treating 1900 as a leap year.
-		if ($days > 59) { $days++;}
+		if ($days > 59) {
+			$days++;
+		}
 
 		return $days + $seconds;
 	}
 	//------------------------------------------------------------------
 }
-
-
-
-
-
-

bootstrap.inc.php

@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-
 /**
  * Checks PHP version
  *
@@ -39,7 +38,6 @@ if (PHP_MAJOR_VERSION >= 7) {
 	exit(-1);
 }
 
-
 define('ITOP_DEFAULT_ENV', 'production');
 define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
 define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
@@ -60,8 +58,7 @@ if (!isset($bBypassMaintenance)) {
 	$bBypassMaintenance = isset($_REQUEST['maintenance']) ? boolval($_REQUEST['maintenance']) : false;
 }
 
-if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
+if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance) {
-{
 	$sTitle = 'Maintenance';
 	$sMessage = 'This application is currently under maintenance.';
 
@@ -70,8 +67,7 @@ if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
 	include(APPROOT.'application/maintenancemsg.php');
 	$sSAPIName = strtoupper(trim(PHP_SAPI));
 
-	switch (true)
+	switch (true) {
-	{
 		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/pages/ajax.searchform.php'):
 			_MaintenanceHtmlMessage($sMessage);
 			break;
@@ -102,6 +98,7 @@ if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
  *
  * @return bool
  */
-function EndsWith($haystack, $needle) {
+function EndsWith($haystack, $needle)
+{
 	return substr_compare($haystack, $needle, -strlen($needle)) === 0;
 }

composer.json

@@ -31,6 +31,7 @@
     "symfony/mailer": "^6.4",
     "symfony/security-csrf": "^6.4",
     "symfony/twig-bundle": "~6.4.0",
+    "symfony/validator" : "^6.4",
     "symfony/yaml": "~6.4.0",
     "tecnickcom/tcpdf": "^6.6.0",
     "thenetworg/oauth2-azure": "^2.0"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "26fa7aa920057d080bcc0948bf052fda",
+  "content-hash" : "3e627286597661542dd598499c2bcc36",
     "packages": [
         {
             "name": "apereo/phpcas",
@@ -4983,6 +4983,107 @@
             ],
             "time": "2025-07-10T08:14:14+00:00"
         },
+        {
+          "name" : "symfony/validator",
+          "version" : "v6.4.29",
+          "source" : {
+            "type" : "git",
+            "url" : "https://github.com/symfony/validator.git",
+            "reference" : "99df8a769e64e399f510166141ea74f450e8dd1d"
+          },
+          "dist" : {
+            "type" : "zip",
+            "url" : "https://api.github.com/repos/symfony/validator/zipball/99df8a769e64e399f510166141ea74f450e8dd1d",
+            "reference" : "99df8a769e64e399f510166141ea74f450e8dd1d",
+            "shasum" : ""
+          },
+          "require" : {
+            "php" : ">=8.1",
+            "symfony/deprecation-contracts" : "^2.5|^3",
+            "symfony/polyfill-ctype" : "~1.8",
+            "symfony/polyfill-mbstring" : "~1.0",
+            "symfony/polyfill-php83" : "^1.27",
+            "symfony/translation-contracts" : "^2.5|^3"
+          },
+          "conflict" : {
+            "doctrine/annotations" : "<1.13",
+            "doctrine/lexer" : "<1.1",
+            "symfony/dependency-injection" : "<5.4",
+            "symfony/expression-language" : "<5.4",
+            "symfony/http-kernel" : "<5.4",
+            "symfony/intl" : "<5.4",
+            "symfony/property-info" : "<5.4",
+            "symfony/translation" : "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3",
+            "symfony/yaml" : "<5.4"
+          },
+          "require-dev" : {
+            "doctrine/annotations" : "^1.13|^2",
+            "egulias/email-validator" : "^2.1.10|^3|^4",
+            "symfony/cache" : "^5.4|^6.0|^7.0",
+            "symfony/config" : "^5.4|^6.0|^7.0",
+            "symfony/console" : "^5.4|^6.0|^7.0",
+            "symfony/dependency-injection" : "^5.4|^6.0|^7.0",
+            "symfony/expression-language" : "^5.4|^6.0|^7.0",
+            "symfony/finder" : "^5.4|^6.0|^7.0",
+            "symfony/http-client" : "^5.4|^6.0|^7.0",
+            "symfony/http-foundation" : "^5.4|^6.0|^7.0",
+            "symfony/http-kernel" : "^5.4|^6.0|^7.0",
+            "symfony/intl" : "^5.4|^6.0|^7.0",
+            "symfony/mime" : "^5.4|^6.0|^7.0",
+            "symfony/property-access" : "^5.4|^6.0|^7.0",
+            "symfony/property-info" : "^5.4|^6.0|^7.0",
+            "symfony/translation" : "^5.4.35|~6.3.12|^6.4.3|^7.0.3",
+            "symfony/yaml" : "^5.4|^6.0|^7.0"
+          },
+          "type" : "library",
+          "autoload" : {
+            "psr-4" : {
+              "Symfony\\Component\\Validator\\" : ""
+            },
+            "exclude-from-classmap" : [
+              "/Tests/",
+              "/Resources/bin/"
+            ]
+          },
+          "notification-url" : "https://packagist.org/downloads/",
+          "license" : [
+            "MIT"
+          ],
+          "authors" : [
+            {
+              "name" : "Fabien Potencier",
+              "email" : "fabien@symfony.com"
+            },
+            {
+              "name" : "Symfony Community",
+              "homepage" : "https://symfony.com/contributors"
+            }
+          ],
+          "description" : "Provides tools to validate values",
+          "homepage" : "https://symfony.com",
+          "support" : {
+            "source" : "https://github.com/symfony/validator/tree/v6.4.29"
+          },
+          "funding" : [
+            {
+              "url" : "https://symfony.com/sponsor",
+              "type" : "custom"
+            },
+            {
+              "url" : "https://github.com/fabpot",
+              "type" : "github"
+            },
+            {
+              "url" : "https://github.com/nicolas-grekas",
+              "type" : "github"
+            },
+            {
+              "url" : "https://tidelift.com/funding/github/packagist/symfony/symfony",
+              "type" : "tidelift"
+            }
+          ],
+          "time" : "2025-11-06T20:26:06+00:00"
+        },
       {
             "name": "symfony/var-dumper",
             "version": "v6.4.26",