N°6890 - Update request template data though the REST/JSON API

- handle selectize enable/disable to update operation hidden input state
- don't execute elements click callback when input disabled
- merge current and initial values for the initial value

.doc/itop-version-history.md

@@ -68,6 +68,8 @@ gitGraph
     branch support/3.1 order: 840
     checkout support/3.1
     commit id: "2023-08-09" tag: "3.1.0-2"
+    checkout support/2.7
+    commit id: "2023-08-10" tag: "2.7.9"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

CONTRIBUTING.md

@@ -140,7 +140,7 @@ When your code is working, please:
 * Pull request description: mind to add all the information useful to understand why you're suggesting this modification and anything necessary to dive into your work. Especially:
   - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented 
   - Enhancements: use cases, implementation details if needed
-* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option !
+* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this option [won't be available](https://github.com/orgs/community/discussions/5634))
 
 
 ## 🙏 We are thankful

README.md

@@ -90,6 +90,7 @@ We would like to give a special thank you 🤗 to the people from the community
 - Dvořák, Lukáš
 - Goethals, Stefan
 - Gumble, David
+- Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
 - Kaltefleiter, Lars (a.k.a [@larhip](https://www.github.com/larhip))
 - Khamit, Shamil
 - Kincel, Martin
@@ -107,6 +108,7 @@ We would like to give a special thank you 🤗 to the people from the community
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Seki, Shoji
 - Shilov, Vladimir
+- Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
 - Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
 - Tulio, Marco
 - Turrubiates, Miguel

addons/userrights/userrightsprofile.class.inc.php

@@ -446,12 +446,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		UR_ACTION_BULK_DELETE => 'bd',
 	);
 
-    /**
-     * @var array $aUsersProfilesList Cache of users' profiles. Hash array of user ID => [profile ID => profile friendlyname, profile ID => profile friendlyname, ...]
-     * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6887
-     */
-	private $aUsersProfilesList = [];
-
 	// Installation: create the very first user
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
@@ -764,12 +758,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
 		$bStatus = null;
-        // Cache user's profiles
-		if(false === array_key_exists($iUser, $this->aUsersProfilesList)){
-		     $this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
-		}
 		// Call the API of UserRights because it caches the list for us
-		foreach($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile)
+		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
 		{
 			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
 			if (!is_null($bGrant))
@@ -895,16 +885,11 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// Note: this code is VERY close to the code of IsActionAllowed()
 		$iUser = $oUser->GetKey();
 
-        // Cache user's profiles
-		if(false === array_key_exists($iUser, $this->aUsersProfilesList)){
-			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
-		}
-
 		// Note: The object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
 		$bStatus = null;
 		// Call the API of UserRights because it caches the list for us
-		foreach($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile)
+		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
 		{
 			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
 			if (!is_null($bGrant))
@@ -933,9 +918,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	}
 
 	/**
-	 * @param string $sClass
-	 * @return string|null Find out which attribute is corresponding the dimension 'owner org'
-	 *                   returns null if no such attribute has been found (no filtering should occur)
+	 * Find out which attribute is corresponding the the dimension 'owner org'
+	 * returns null if no such attribute has been found (no filtering should occur)
 	 */
 	public static function GetOwnerOrganizationAttCode($sClass)
 	{

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

@@ -580,10 +580,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	/**
 	 * Read and cache organizations allowed to the given user
 	 *
-	 * @param User $oUser
-	 * @param string $sClass (not used here but can be used in overloads)
+	 * @param $oUser
+	 * @param $sClass (not used here but can be used in overloads)
 	 *
-	 * @return array keys of the User allowed org
+	 * @return array
 	 * @throws \CoreException
 	 * @throws \Exception
 	 */

application/applicationextension.inc.php

@@ -335,6 +335,7 @@ abstract class AbstractPreferencesExtension implements iPreferencesExtension
  * A recommended pattern is to cache data by the mean of static members.
  *
  * @api
+ * @deprecated  3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method
  * @package     UIExtensibilityAPI
  */
 interface iApplicationUIExtension
@@ -486,6 +487,7 @@ interface iApplicationUIExtension
  * @api
  * @package     UIExtensibilityAPI
  * @since       2.7.0
+ * @deprecated
  */
 abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
 {
@@ -558,7 +560,6 @@ abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
  * or through the GUI.
  *
  * @api
- * @deprecated  3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method. More details on each method PHPDoc.
  * @package     ORMExtensibilityAPI
  */
 interface iApplicationObjectExtension
@@ -573,7 +574,6 @@ interface iApplicationObjectExtension
 	 * Otherwise, the answer is definitively "yes, the object has changed".
 	 *
 	 * @api
-	 * @deprecated 3.1.0 N°4756 No alternative available, this API was unstable and is abandoned
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return boolean True if something has changed for the target object
@@ -587,7 +587,6 @@ interface iApplicationObjectExtension
 	 * Anyhow, this API can be called in other contexts such as the CSV import tool.
 	 *
 	 * @api
-	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_CHECK_TO_WRITE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
@@ -602,7 +601,6 @@ interface iApplicationObjectExtension
 	 * Please not that it is not possible to cascade deletion by this mean: only stopper issues can be handled.
 	 *
 	 * @api
-	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_CHECK_TO_DELETE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
@@ -619,7 +617,6 @@ interface iApplicationObjectExtension
 	 * * {@see DBObject::Get()} : for a given attribute the new value that was persisted
 	 *
 	 * @api
-	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_WRITE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -636,7 +633,6 @@ interface iApplicationObjectExtension
 	 * The method is called right <b>after</b> the object has been written to the database.
 	 *
 	 * @api
-	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_WRITE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -651,7 +647,6 @@ interface iApplicationObjectExtension
 	 * The method is called right <b>before</b> the object will be deleted from the database.
 	 *
 	 * @api
-	 * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_DELETE event instead
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -665,7 +660,6 @@ interface iApplicationObjectExtension
  * Extend this class instead of iApplicationObjectExtension if you don't need to overload all methods
  *
  * @api
- * @deprecated  3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method
  * @package     ORMExtensibilityAPI
  * @since       2.7.0
  */
@@ -2015,8 +2009,6 @@ class RestUtils
 	 *
 	 * @return DBObject The object found
 	 * @throws Exception If the input structure is not valid or it could not find exactly one object
-	 *
-	 * @see DBObject::CheckChangedExtKeysValues() generic method to check that we can access the linked object isn't used in that use case because values can be literal, OQL, friendlyname
 	 */
 	public static function FindObjectFromKey($sClass, $key, $bAllowNullValue = false)
 	{

application/cmdbabstract.class.inc.php

@@ -746,9 +746,7 @@ HTML
 			$aArgs = array('this' => $this);
 			
 			$sEditWhen = $oAttDef->GetEditWhen();
-			// Calculate if edit_when allows to edit based on current $bEditMode
-			$bIsEditableBasedOnEditWhen =  ($sEditWhen === LINKSET_EDITWHEN_ALWAYS) || 
-				($bEditMode ? $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION : $sEditWhen === LINKSET_EDITWHEN_ON_HOST_DISPLAY);
+			$bIsEditableBasedOnEditWhen = ($sEditWhen === LINKSET_EDITWHEN_ALWAYS || $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION);
 
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)) || !$bIsEditableBasedOnEditWhen;
 			if ($bEditMode && (!$bReadOnly)) {
@@ -760,9 +758,9 @@ HTML
 				$oPage->add($sHTMLValue);
 			} else {
 				if ($oAttDef->IsIndirect()) {
-					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
+					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
 				} else {
-					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
+					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef);
 				}
 				$oPage->AddUiBlock($oBlockLinkSetViewTable);
 			}
@@ -4544,7 +4542,7 @@ HTML;
 		return $res;
 	}
 
-	protected function PostInsertActions(): void
+	public function PostInsertActions(): void
 	{
 		parent::PostInsertActions();
 
@@ -4568,9 +4566,6 @@ HTML;
 		InlineImage::FinalizeInlineImages($this);
 	}
 
-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
-	 */
 	protected function DBCloneTracked_Internal($newKey = null)
 	{
         /** @var cmdbAbstractObject $oNewObj */
@@ -4591,7 +4586,6 @@ HTML;
 	public function DBUpdate()
 	{
 		$this->LogCRUDEnter(__METHOD__);
-		$res = 0;
 
 		try {
 			if (count($this->ListChanges()) === 0) {
@@ -4611,7 +4605,7 @@ HTML;
 		return $res;
 	}
 
-	protected function PostUpdateActions(array $aChanges): void
+	public function PostUpdateActions(array $aChanges): void
 	{
 		parent::PostUpdateActions($aChanges);
 
@@ -4652,7 +4646,6 @@ HTML;
 			if (static::IsCrudStackEmpty()) {
 				// Avoid signaling the current object that links were modified
 				static::RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
-				$this->LogCRUDDebug(__METHOD__, var_export(self::$aObjectsAwaitingEventDbLinksChanged, true));
 				static::FireEventDbLinksChangedForAllObjects();
 			}
 		}
@@ -4661,15 +4654,7 @@ HTML;
 		return $oDeletionPlan;
 	}
 
-	protected function PostDeleteActions(): void
-	{
-		parent::PostDeleteActions();
-	}
-
-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
-	 */
-	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
+		protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
 		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
@@ -5361,7 +5346,7 @@ EOF
 			$aErrors = $oObj->UpdateObjectFromPostedForm('');
 			$bResult = (count($aErrors) == 0);
 			if ($bResult) {
-				[$bResult, $aErrors] = $oObj->CheckToWrite();
+				list($bResult, $aErrors) = $oObj->CheckToWrite();
 			}
 			if ($bPreview) {
 				$sStatus = $bResult ? Dict::S('UI:BulkModifyStatusOk') : Dict::S('UI:BulkModifyStatusError');
@@ -5378,11 +5363,6 @@ EOF
 				'errors' => '<p>'.($bResult ? '' : implode('</p><p>', $aErrorsToDisplay)).'</p>',
 			);
 			if ($bResult && (!$bPreview)) {
-				// doing the check will load multiple times same objects :/
-				// but it shouldn't cost too much on execution time
-				// user can mitigate by selecting less extkeys/lnk to set and/or less objects to update 🤷‍♂️
-				$oObj->CheckChangedExtKeysValues();
-
 				$oObj->DBUpdate();
 			}
 		}
@@ -5960,63 +5940,47 @@ JS
 	final protected function FireEventAfterDelete(): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
+		$this->FireEventDbLinksChangedForCurrentObject();
 		$this->FireEvent(EVENT_DB_AFTER_DELETE);
 	}
 
 	/**
-	 * Possibility for linked classes to be notified of current class modification
-	 *
+	 * If the passed object is an instance of a link class, then will register each remote object for modification using {@see static::RegisterObjectAwaitingEventDbLinksChanged()}
 	 * If an external key was modified, register also the previous object that was linked previously.
 	 *
-	 * @uses static::RegisterObjectAwaitingEventDbLinksChanged()
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \Exception
 	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreException
-	 * @throws Exception
-	 *
-	 * @since 3.1.0 N°5906 method creation
-	 * @since 3.1.1 3.2.0 N°6228 now just notify attributes having `with_php_computation`
+	 * @since 3.1.0 N°5906
 	 */
 	final protected function NotifyAttachedObjectsOnLinkClassModification(): void
 	{
+		$sClass = get_class($this);
+		if (false === MetaModel::IsLinkClass($sClass)) {
+			return;
+		}
 		// previous values in case of link change
 		$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-		$sClass = get_class($this);
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList($sClass, [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExternalKeyAttCode) {
-			/** @var AttributeExternalKey $oAttDef */
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sExternalKeyAttCode);
 
-			if (false === $this->DoesTargetObjectHavePhpComputation($oAttDef)) {
-				continue;
+		$aLnkClassExternalKeys = MetaModel::GetAttributesList($sClass, [AttributeExternalKey::class]);
+		foreach ($aLnkClassExternalKeys as $sExternalKeyAttCode) {
+			/** @var \AttributeExternalKey $oExternalKeyAttDef */
+			$oExternalKeyAttDef = MetaModel::GetAttributeDef($sClass, $sExternalKeyAttCode);
+			$sRemoteClassName = $oExternalKeyAttDef->GetTargetClass();
+
+			$sRemoteObjectId = $this->Get($sExternalKeyAttCode);
+			if ($sRemoteObjectId > 0) {
+				self::RegisterObjectAwaitingEventDbLinksChanged($sRemoteClassName, $sRemoteObjectId);
 			}
 
-			$sTargetObjectId = $this->Get($sExternalKeyAttCode);
-			$sTargetClass = $oAttDef->GetTargetClass();
-			if ($sTargetObjectId > 0) {
-				$this->LogCRUDDebug(__METHOD__, "Add $sTargetClass:$sTargetObjectId for DBLINKS_CHANGED");
-				self::RegisterObjectAwaitingEventDbLinksChanged($sTargetClass, $sTargetObjectId);
-			}
-
-			$sPreviousTargetObjectId = $aPreviousValues[$sExternalKeyAttCode] ?? 0;
-			if ($sPreviousTargetObjectId > 0) {
-				$this->LogCRUDDebug(__METHOD__, "Add $sTargetClass:$sPreviousTargetObjectId for DBLINKS_CHANGED");
-				self::RegisterObjectAwaitingEventDbLinksChanged($sTargetClass, $sPreviousTargetObjectId);
+			$sPreviousRemoteObjectId = $aPreviousValues[$sExternalKeyAttCode] ?? 0;
+			if ($sPreviousRemoteObjectId > 0) {
+				self::RegisterObjectAwaitingEventDbLinksChanged($sRemoteClassName, $sPreviousRemoteObjectId);
 			}
 		}
 	}
 
-	private function DoesTargetObjectHavePhpComputation(AttributeExternalKey $oAttDef): bool
-	{
-		/** @var AttributeLinkedSet $oAttDefMirrorLink */
-		$oAttDefMirrorLink = $oAttDef->GetMirrorLinkAttribute();
-		if (is_null($oAttDefMirrorLink) || false === $oAttDefMirrorLink->HasPHPComputation()){
-			return false;
-		}
-
-		return true;
-	}
-
 	/**
 	 * Register one object for later EVENT_DB_LINKS_CHANGED event.
 	 *
@@ -6051,12 +6015,7 @@ JS
 
 		$sClass = get_class($this);
 		$sId = $this->GetKey();
-		$bIsObjectAwaitingEventDbLinksChanged = self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
-		if (false === $bIsObjectAwaitingEventDbLinksChanged) {
-			return;
-		}
-		self::FireEventDbLinksChangedForObject($this);
-		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+		self::FireEventDbLinksChangedForClassId($sClass, $sId);
 	}
 
 	/**
@@ -6088,15 +6047,9 @@ JS
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
 		$oObject = MetaModel::GetObject($sClass, $sId, false);
-		self::FireEventDbLinksChangedForObject($oObject);
-		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
-	}
-
-	private static function FireEventDbLinksChangedForObject(DBObject $oObject)
-	{
-		self::SetEventDBLinksChangedBlocked(true);
 		// N°6408 The object can have been deleted
 		if (!is_null($oObject)) {
+			self::SetEventDBLinksChangedBlocked(true);
 			MetaModel::StartReentranceProtection($oObject);
 			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
 			MetaModel::StopReentranceProtection($oObject);
@@ -6104,6 +6057,7 @@ JS
 				$oObject->DBUpdate();
 			}
 		}
+		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
 	}
 

application/datamodel.application.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -514,10 +514,18 @@
           <description>The object containing the document</description>
           <type>DBObject</type>
         </event_datum>
+        <event_datum id="att_code">
+          <description>The optional object attribute code hosting the document</description>
+          <type>string</type>
+        </event_datum>
         <event_datum id="document">
           <description>The document downloaded</description>
           <type>ormDocument</type>
         </event_datum>
+        <event_datum id="content_disposition">
+          <description>The content disposition of the document ("inline" or "attachment")</description>
+          <type>string</type>
+        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>

application/exceptions/InvalidExternalKeyValueException.php

@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6458 object creation
- */
-class InvalidExternalKeyValueException extends CoreUnexpectedValue
-{
-	private const ENUM_PARAMS_OBJECT = 'current_object';
-	private const ENUM_PARAMS_ATTCODE = 'attcode';
-	private const ENUM_PARAMS_ATTVALUE = 'attvalue';
-	private const ENUM_PARAMS_USER = 'current_user';
-
-	public function __construct($oObject, $sAttCode, $aContextData = null, $oPrevious = null)
-	{
-		$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();
-		}
-
-		parent::__construct('Attribute pointing to an object that is either non existing or not readable by the current user', $aContextData, '', $oPrevious);
-	}
-
-	public function GetAttCode(): string
-	{
-		return $this->getContextData()[self::ENUM_PARAMS_ATTCODE];
-	}
-
-	public function GetAttValue(): string
-	{
-		return $this->getContextData()[self::ENUM_PARAMS_ATTVALUE];
-	}
-}

application/loginwebpage.class.inc.php

@@ -248,7 +248,6 @@ class LoginWebPage extends NiceWebPage
 				$oEmail = new Email();
 				$oEmail->SetRecipientTO($sTo);
 				$sFrom = MetaModel::GetConfig()->Get('forgot_password_from');
-				$sFrom = utils::IsNullOrEmptyString($sFrom) ? MetaModel::GetConfig()->Get('email_default_sender_address') : $sFrom;
 				$oEmail->SetRecipientFrom($sFrom);
 				$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject', $oUser->Get('login')));
 				$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);

application/menunode.class.inc.php

@@ -103,7 +103,7 @@ class ApplicationMenu
 	{
 		self::$sFavoriteSiloQuery = $sOQL;
 	}
-
+	
 	/**
 	 * Get the query used to limit the list of displayed organizations in the drop-down menu
 	 * @return string The OQL query returning a list of Organization objects
@@ -536,7 +536,7 @@ EOF
 
 		return -1;
 	}
-
+	
 	/**
 	 * Retrieves the currently active menu (if any, otherwise the first menu is the default)
 	 * @return string The Id of the currently active menu
@@ -544,7 +544,7 @@ EOF
 	public static function GetActiveNodeId()
 	{
 		$oAppContext = new ApplicationContext();
-		$sMenuId = $oAppContext->GetCurrentValue('menu', null);
+		$sMenuId = $oAppContext->GetCurrentValue('menu', null);		
 		if ($sMenuId  === null)
 		{
 			$sMenuId = self::GetDefaultMenuId();
@@ -654,7 +654,7 @@ abstract class MenuNode
 
 	/**
 	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
-	 */
+	 */	
 	protected $m_aEnableStimuli;
 
 	/**
@@ -814,7 +814,7 @@ abstract class MenuNode
 	{
 		return false;
 	}
-
+	
 	/**
 	 * Add a limiting display condition for the same menu node. The conditions will be combined with a AND
 	 * @param $oMenuNode MenuNode Another definition of the same menu node, with potentially different access restriction
@@ -987,7 +987,7 @@ class TemplateMenuNode extends MenuNode
 	 * @var string
 	 */
 	protected $sTemplateFile;
-
+	
 	/**
 	 * Create a menu item based on a custom template and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
@@ -1058,7 +1058,7 @@ class OQLMenuNode extends MenuNode
 	 * @var bool|null
 	 */
 	protected $bSearchFormOpen;
-
+	
 	/**
 	 * Extra parameters to be passed to the display block to fine tune its appearence
 	 */
@@ -1091,7 +1091,7 @@ class OQLMenuNode extends MenuNode
 		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
 		// of the class specified by the OQL...
 	}
-
+	
 	/**
 	 * Set some extra parameters to be passed to the display block to fine tune its appearence
 	 * @param array $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
@@ -1111,7 +1111,7 @@ class OQLMenuNode extends MenuNode
 	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
-		$oTag = new ContextTag(ContextTag::TAG_OBJECT_SEARCH);
+		ContextTag::AddContext(ContextTag::TAG_OBJECT_SEARCH);
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		OQLMenuNode::RenderOQLSearch
 		(
@@ -1120,7 +1120,7 @@ class OQLMenuNode extends MenuNode
 			'Menu_'.$this->GetMenuId(),
 			$this->bSearch, // Search pane
 			$this->bSearchFormOpen, // Search open
-			$oPage,
+			$oPage, 
 			array_merge($this->m_aParams, $aExtraParams),
 			true
 		);
@@ -1354,10 +1354,10 @@ class NewObjectMenuNode extends MenuNode
 	{
 		// Enable this menu, only if the current user has enough rights to create such an object, or an object of
 		// any child class
-
+	
 		$aSubClasses = MetaModel::EnumChildClasses($this->sClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
 		$bActionIsAllowed = false;
-
+	
 		foreach($aSubClasses as $sCandidateClass)
 		{
 			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
@@ -1366,7 +1366,7 @@ class NewObjectMenuNode extends MenuNode
 				break; // Enough for now
 			}
 		}
-		return $bActionIsAllowed;
+		return $bActionIsAllowed;		
 	}
 
 	/**
@@ -1508,7 +1508,7 @@ class DashboardMenuNode extends MenuNode
 			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-
+	
 }
 
 /**
@@ -1549,7 +1549,7 @@ class ShortcutContainerMenuNode extends MenuNode
 			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
 			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
 		}
-
+	
 		// Complete the tree
 		//
 		parent::PopulateChildMenus();

application/ui.extkeywidget.class.inc.php

@@ -976,7 +976,7 @@ HTML
 		FormHelper::DisableAttributeBlobInputs($this->sTargetClass, $aFormExtraParams);
 
 		if(FormHelper::HasMandatoryAttributeBlobInputs($oNewObj)){
-			$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal(FormHelper::ENUM_MANDATORY_BLOB_MODE_CREATE));
+			$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal());
 		}
 		
 		cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), $aFormExtraParams);

application/ui.linksdirectwidget.class.inc.php

@@ -145,7 +145,7 @@ JS
 			FormHelper::DisableAttributeBlobInputs($sRealClass, $aFormExtraParams);
 			
 			if(FormHelper::HasMandatoryAttributeBlobInputs($oObj)){
-				$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal(FormHelper::ENUM_MANDATORY_BLOB_MODE_CREATE));
+				$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal());
 			}
 
 			cmdbAbstractObject::DisplayCreationForm($oPage, $sRealClass, $oObj, array(), $aFormExtraParams);

application/utils.inc.php

@@ -2499,17 +2499,15 @@ SQL;
 						$aHeaders = static::ParseHeaders($http_response_header);
 						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
 						// Compute the file extension from the MIME Type
-						foreach ($aKnownExtensions as $sExtValue => $sMime) {
-							if ($sMime === $sMimeType) {
+						foreach($aKnownExtensions as $sExtValue => $sMime)
+						{
+							if ($sMime === $sMimeType)
+							{
 								$sExtension = '.'.$sExtValue;
 								break;
 							}
 						}
 					}
-					$sPathName = pathinfo($sPath, PATHINFO_FILENAME);
-					if (utils::IsNotNullOrEmptyString($sPathName)) {
-						$sFileName = $sPathName;
-					}
 					$sFileName .= $sExtension;
 				}
 				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
@@ -3031,7 +3029,6 @@ HTML;
 	 *
 	 * @return bool if string null or empty
 	 * @since 3.0.2 N°5302
-	 * @since 2.7.10 N°6458 add method in the 2.7 branch
 	 */
 	public static function IsNullOrEmptyString(?string $sString): bool
 	{
@@ -3047,7 +3044,6 @@ HTML;
 	 *
 	 * @return bool if string is not null and not empty
 	 * @since 3.0.2 N°5302
-	 * @since 2.7.10 N°6458 add method in the 2.7 branch
 	 */
 	public static function IsNotNullOrEmptyString(?string $sString): bool
 	{

approot.inc.php

@@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/');
  *
  * @see ITOP_CORE_VERSION to get full iTop core version
  */
-define('ITOP_DESIGN_LATEST_VERSION', '3.1');
+define('ITOP_DESIGN_LATEST_VERSION', '3.2');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,13 +23,11 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.1');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.1.1');
+define('ITOP_CORE_VERSION', '3.2.0');
 
 /**
- * @var string
- * @since 3.0.4 3.1.0 3.2.0 N°6274 Allow to test if PHPUnit is currently running. Starting with PHPUnit 9.5 we'll be able to replace it with $GLOBALS['phpunit_version']
- * @since 3.0.4 3.1.1 3.2.0 N°6976 Fix constant name (DeprecatedCallsLog error handler was never set)
+ * @since 3.0.4 N°6274 Allow to test if PHPUnit is currently running. Starting with PHPUnit 9.5 we'll be able to replace it with $GLOBALS['phpunit_version']
  */
-const ITOP_PHPUNIT_RUNNING_CONSTANT_NAME = 'ITOP_PHPUNIT_RUNNING';
+define('ITOP_PHPUNIT_RUNNING_CONSTANT_NAME', 'ITOP_PHPUNIT_RUNNING');
 
 require_once APPROOT.'bootstrap.inc.php';

composer.lock

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

core/attributedef.class.inc.php

@@ -1739,20 +1739,11 @@ class AttributeLinkedSet extends AttributeDefinition
 	 * @return bool true if Attribute has constraints
 	 * @since 3.1.0 N°6228
 	 */
-	public function HasPHPConstraint(): bool
+	public function GetHasConstraint()
 	{
 		return $this->GetOptional('with_php_constraint', false);
 	}
 
-	/**
-	 * @return bool true if Attribute has computation (DB_LINKS_CHANGED event propagation, `with_php_computation` attribute xml property), false otherwise
-	 * @since 3.1.1 3.2.0 N°6228
-	 */
-	public function HasPHPComputation(): bool
-	{
-		return $this->GetOptional('with_php_computation', false);
-	}
-	
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
@@ -8608,7 +8599,7 @@ class AttributeBlob extends AttributeDefinition
 	public function RecordAttChange(DBObject $oObject, $original, $value): void
 	{
 		// N°6502 Don't record history if only the download count has changed
-		if ((null !== $original) && (null !== $value) && $original->EqualsExceptDownloadsCount($value)) {
+		if ($original->EqualsExceptDownloadsCount($value)) {
 			return;
 		}
 
@@ -13220,8 +13211,10 @@ class AttributeCustomFields extends AttributeDefinition
 				// In that case we need additional keys : see \TemplateFieldsHandler::DoBuildForm
 				$aRequestTemplateValues = $proposedValue->GetValues();
 				if (false === array_key_exists('current_template_id', $aRequestTemplateValues)) {
-					$aRequestTemplateValues['current_template_id'] = $aRequestTemplateValues['template_id'];
-					$aRequestTemplateValues['current_template_data'] = $aRequestTemplateValues['template_data'];
+					$oCurrentValue = $oHostObject->Get($this->GetCode());
+					if(is_object($oCurrentValue)){
+						$aRequestTemplateValues = array_merge($oCurrentValue->GetValues(), $aRequestTemplateValues);
+					}
 					$proposedValue = new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aRequestTemplateValues);
 				}
 			}

core/cmdbobject.class.inc.php

@@ -438,8 +438,7 @@ abstract class CMDBObject extends DBObject
 	}
 
 	/**
-	 * @deprecated 3.1.0 N°5232 N°6966 simply use {@see DBObject::DBClone()} instead, that will automatically create and persist a CMDBChange object.
-	 *     If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before.
+	 * @deprecated 3.1.0 N°5232 not used
 	 */
 	public function DBCloneTracked(CMDBChange $oChange, $newKey = null)
 	{
@@ -447,9 +446,6 @@ abstract class CMDBObject extends DBObject
 		$this->DBCloneTracked_Internal($newKey);
 	}
 
-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
-	 */
 	protected function DBCloneTracked_Internal($newKey = null)
 	{
 		$newKey = parent::DBClone($newKey);
@@ -474,13 +470,23 @@ abstract class CMDBObject extends DBObject
 	public function DBDelete(&$oDeletionPlan = null)
 	{
 		$this->LogCRUDEnter(__METHOD__);
-		$oDeletionPlan = parent::DBDelete($oDeletionPlan);
+		$oDeletionPlan = $this->DBDeleteTracked_Internal($oDeletionPlan);
 		$this->LogCRUDExit(__METHOD__);
 		return $oDeletionPlan;
 	}
 
 	/**
-	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
+	 * @param null $oDeletionPlan
+	 *
+	 * @return \DeletionPlan|null
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DeleteException
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 */
 	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{

core/cmdbsource.class.inc.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   iTop is free software; you can redistribute it and/or modify	
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -380,7 +380,7 @@ class CMDBSource
 	public static function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
-
+		
 		$sVersionComment = static::GetServerVariable('version') .  ' - ' . static::GetServerVariable('version_comment');
 		if(preg_match('/mariadb/i', $sVersionComment) === 1)
 		{
@@ -390,7 +390,7 @@ class CMDBSource
 		{
 			$sDBVendor = static::ENUM_DB_VENDOR_PERCONA;
 		}
-
+		
 		return $sDBVendor;
 	}
 
@@ -934,7 +934,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+				
 		while ($aRow = $oResult->fetch_array($iMode))
 		{
 			$aData[] = $aRow;
@@ -1088,7 +1088,7 @@ class CMDBSource
 		if (!array_key_exists($iKey, $aTableInfo["Fields"])) return false;
 		$aFieldData = $aTableInfo["Fields"][$iKey];
 		if (!array_key_exists("Key", $aFieldData)) return false;
-		return ($aFieldData["Key"] == "PRI");
+		return ($aFieldData["Key"] == "PRI"); 
 	}
 
 	public static function IsAutoIncrement($sTable, $sField)
@@ -1099,7 +1099,7 @@ class CMDBSource
 		$aFieldData = $aTableInfo["Fields"][$sField];
 		if (!array_key_exists("Extra", $aFieldData)) return false;
 		//MyHelpers::debug_breakpoint($aFieldData);
-		return (strstr($aFieldData["Extra"], "auto_increment"));
+		return (strstr($aFieldData["Extra"], "auto_increment")); 
 	}
 
 	public static function IsField($sTable, $sField)
@@ -1366,13 +1366,13 @@ class CMDBSource
 	public static function GetTableFieldsList($sTable)
 	{
 		assert(!empty($sTable));
-
+		
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return array(); // #@# or an error ?
 
 		return array_keys($aTableInfo["Fields"]);
 	}
-
+	
 	// Cache the information about existing tables, and their fields
 	private static $m_aTablesInfo = array();
 	private static function _TablesInfoCacheReset($sTableName = null)
@@ -1505,7 +1505,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+		
 		$aRows = array();
 		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
@@ -1514,7 +1514,7 @@ class CMDBSource
 		$oResult->free();
 		return $aRows;
 	}
-
+	
 	/**
 	 * Returns the value of the specified server variable
 	 * @param string $sVarName Name of the server variable
@@ -1530,7 +1530,7 @@ class CMDBSource
 	/**
 	 * Returns the privileges of the current user
 	 * @return string privileges in a raw format
-	 */
+	 */	   	
 	public static function GetRawPrivileges()
 	{
 		try
@@ -1556,8 +1556,8 @@ class CMDBSource
 
 	/**
 	 * Determine the slave status of the server
-	 * @return bool true if the server is slave
-	 */
+	 * @return bool true if the server is slave 
+	 */	   	
 	public static function IsSlaveServer()
 	{
 		try

core/config.class.inc.php

@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.1.1-dev');
+define('ITOP_VERSION', '3.2.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -1193,30 +1193,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'sessions_tracking.enabled' => [
-			'type' => 'bool',
-			'description' => 'Whether or not the whole mechanism to track active sessions is enabled. See PHP session.gc_maxlifetime setting to configure session expiration.',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_threshold' => [
-			'type' => 'integer',
-			'description'         => 'fallback in case cron is not active: probability in percent that session files are cleanup during any itop request (100 means always)',
-			'default'             => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_duration_in_seconds' => [
-			'type' => 'integer',
-			'description' => 'fallback in case cron is not active: when a cleanup is triggered cleanup duration will not exceed this duration (in seconds).',
-			'default' => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'transaction_storage' => [
 			'type' => 'string',
 			'description' => 'The type of mechanism to use for storing the unique identifiers for transactions (Session|File).',

core/csvbulkexport.class.inc.php

@@ -12,7 +12,6 @@ use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\Helper\ExportHelper;
 
 /**
  * Bulk export: CSV export
@@ -115,7 +114,6 @@ class CSVBulkExport extends TabularBulkExport
 
 			case 'csv_options':
 				$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:CSVOptions'));
-				$oPanel->AddSubBlock(ExportHelper::GetAlertForExcelMaliciousInjection());
 
 				$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
 				$oPanel->AddSubBlock($oMulticolumn);

core/datamodel.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -282,8 +282,13 @@
           <field id="obj_attcode" xsi:type="AttributeString"/>
         </fields>
       </class>
+      <class id="DefaultWorkingTimeComputer" _delta="define">
+        <interfaces>
+          <interface id="iWorkingTimeComputer"/>
+        </interfaces>
+      </class>
     </classes>
-    <attribute_properties_definition  _delta="define">
+    <attribute_properties_definition _delta="define">
       <properties>
         <property id="sql">
           <php_param>sql</php_param>
@@ -502,12 +507,6 @@
           <type>boolean</type>
           <default>false</default>
         </property>
-        <property id="with_php_computation">
-          <php_param>with_php_computation</php_param>
-          <mandatory>false</mandatory>
-          <type>boolean</type>
-          <default>false</default>
-        </property>
         <property id="create_temporary_object">
           <php_param>create_temporary_object</php_param>
           <mandatory>false</mandatory>

core/dbobject.class.php

@@ -9,7 +9,6 @@ use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventException;
 use Combodo\iTop\Service\Events\EventService;
 use Combodo\iTop\Service\Events\EventServiceLog;
-use Combodo\iTop\Service\Module\ModuleService;
 use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
 
 /**
@@ -187,13 +186,12 @@ abstract class DBObject implements iDisplay
 	protected $m_oLinkHostObject = null;
 
 	/**
-	 * @var array{array{
-	 *      type: string,
-	 *      class: string,
-	 *      id: string,
-	 * }} List all the CRUD stack in progress, with :
-	 *      - type: CRUD operation (INSERT, UPDATE, DELETE)',
-	 *      - class: class of the object in the CRUD process, leaf (object finalclass) if we have a hierarchy
+	 * @var array List all the CRUD stack in progress
+	 *
+	 * The array contains instances of
+	 * ['type' => 'type of CRUD operation (INSERT, UPDATE, DELETE)',
+	 *  'class' => 'class of the object in the CRUD process',
+	 *  'id' => 'id of the object in the CRUD process']
 	 *
 	 * @since 3.1.0 N°5906
 	 */
@@ -763,18 +761,6 @@ abstract class DBObject implements iDisplay
 		$this->Set($sAttCode, $sValue);
 	}
 
-	/**
-	 * @return void
-	 * @throws \ReflectionException
-	 */
-	protected function PostDeleteActions(): void
-	{
-		$this->FireEventAfterDelete();
-		$oKPI = new ExecutionKPI();
-		$this->AfterDelete();
-		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
-	}
-
 	/**
 	 * Compute (and optionally start) the StopWatches deadlines
 	 *
@@ -2424,6 +2410,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 * @throws \OQLException
+	 *
 	 */
 	public function DoCheckToWrite()
 	{
@@ -2475,130 +2462,7 @@ abstract class DBObject implements iDisplay
 	}
 
 	/**
-	 * Trigger onObjectUpdate on the target object when an object pointed by a LinkSet is modified, added or removed
-	 *
-	 * @since 3.1.1 3.2.0 N°6531 method creation
-	 */
-	final protected function ActivateOnObjectUpdateTriggersForTargetObjects(): void
-	{
-		$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList(get_class($this), [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExtKeyWithMirrorLinkAttCode) {
-			/** @var AttributeExternalKey $oExtKeyWithMirrorLinkAttDef */
-			$oExtKeyWithMirrorLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyWithMirrorLinkAttCode);
-
-			/** @var AttributeLinkedSet $oAttDefMirrorLink */
-			$oAttDefMirrorLink = $oExtKeyWithMirrorLinkAttDef->GetMirrorLinkAttribute();
-			if (is_null($oAttDefMirrorLink)) {
-				// No LinkSet pointing to me
-				continue;
-			}
-			$sAttCodeMirrorLink = $oAttDefMirrorLink->GetCode();
-			$sTargetObjectClass = $oExtKeyWithMirrorLinkAttDef->GetTargetClass();
-
-			if (array_key_exists($sExtKeyWithMirrorLinkAttCode, $aPreviousValues)) {
-				// need to update old target also
-				$sPreviousTargetObjectKey = $aPreviousValues[$sExtKeyWithMirrorLinkAttCode];
-				$oPreviousTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $sPreviousTargetObjectKey);
-				$this->ActivateOnObjectUpdateTriggers($oPreviousTargetObject, [$sAttCodeMirrorLink]);
-			}
-
-			// we need to update remote with current lnk instance
-			$oTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $this->Get($sExtKeyWithMirrorLinkAttCode));
-			$this->ActivateOnObjectUpdateTriggers($oTargetObject, [$sAttCodeMirrorLink]);
-		}
-	}
-
-	final static protected function GetObjectIfNotInCRUDStack($sClass, $sKey)
-	{
-		if (DBObject::IsObjectCurrentlyInCrud($sClass, $sKey)) {
-			return null;
-		}
-
-		return MetaModel::GetObject($sClass, $sKey, false);
-	}
-
-	/**
-	 * Cascade CheckToWrite to Target Objects With LinkSet Pointing To Me
-	 * @since 3.1.1 3.2.0 N°6228 method creation
-	 */
-	final protected function CheckToWriteForTargetObjects(bool $bIsCheckToDelete = false): void
-	{
-		$aChanges = $this->ListChanges();
-
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList(get_class($this), [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExtKeyWithMirrorLinkAttCode) {
-			/** @var AttributeExternalKey $oExtKeyWithMirrorLinkAttDef */
-			$oExtKeyWithMirrorLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyWithMirrorLinkAttCode);
-
-			/** @var AttributeLinkedSet $oAttDefMirrorLink */
-			$oAttDefMirrorLink = $oExtKeyWithMirrorLinkAttDef->GetMirrorLinkAttribute();
-			if (is_null($oAttDefMirrorLink) || (false === $oAttDefMirrorLink->HasPHPConstraint())) {
-				continue;
-			}
-			$sAttCodeMirrorLink = $oAttDefMirrorLink->GetCode();
-			$sTargetObjectClass = $oExtKeyWithMirrorLinkAttDef->GetTargetClass();
-
-			$oTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $this->Get($sExtKeyWithMirrorLinkAttCode));
-
-			if ($this->IsNew()) {
-				$this->CheckToWriteForSingleTargetObject_Internal('add', $oTargetObject, $sAttCodeMirrorLink, false);
-			} else if ($bIsCheckToDelete) {
-				$this->CheckToWriteForSingleTargetObject_Internal('remove', $oTargetObject, $sAttCodeMirrorLink, true);
-			} else {
-				if (array_key_exists($sExtKeyWithMirrorLinkAttCode, $aChanges)) {
-					// need to update remote old + new
-					$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-					$sPreviousTargetObjectKey = $aPreviousValues[$sExtKeyWithMirrorLinkAttCode];
-					$oPreviousTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $sPreviousTargetObjectKey);
-					$this->CheckToWriteForSingleTargetObject_Internal('remove', $oPreviousTargetObject, $sAttCodeMirrorLink, false);
-					$this->CheckToWriteForSingleTargetObject_Internal('add', $oTargetObject, $sAttCodeMirrorLink, false);
-				} else {
-					$this->CheckToWriteForSingleTargetObject_Internal('modify', $oTargetObject, $sAttCodeMirrorLink, false); // we need to update remote with current lnk instance
-				}
-			}
-		}
-	}
-
-	private function CheckToWriteForSingleTargetObject_Internal(string $sAction, ?DBObject $oTargetObject, string $sAttCodeMirrorLink, bool $bIsCheckToDelete): void
-	{
-		if (is_null($oTargetObject)) {
-			return;
-		}
-
-		$this->LogCRUDDebug(__METHOD__, "action: $sAction ".get_class($oTargetObject).'::'.$oTargetObject->GetKey()." ($sAttCodeMirrorLink)");
-
-		/** @var \ormLinkSet $oTargetValue */
-		$oTargetValue = $oTargetObject->Get($sAttCodeMirrorLink);
-		switch ($sAction) {
-			case 'add':
-				$oTargetValue->AddItem($this);
-				break;
-			case 'remove':
-				$oTargetValue->RemoveItem($this->GetKey());
-				break;
-			case 'modify':
-				$oTargetValue->ModifyItem($this);
-				break;
-		}
-		$oTargetObject->Set($sAttCodeMirrorLink, $oTargetValue);
-		[$bCheckStatus, $aCheckIssues, $bSecurityIssue] = $oTargetObject->CheckToWrite();
-		if (false === $bCheckStatus) {
-			if ($bIsCheckToDelete) {
-				$this->m_aDeleteIssues = array_merge($this->m_aDeleteIssues ?? [], $aCheckIssues);
-			} else {
-				$this->m_aCheckIssues = array_merge($this->m_aCheckIssues ?? [], $aCheckIssues);
-			}
-			$this->m_bSecurityIssue = $this->m_bSecurityIssue || $bSecurityIssue;
-		}
-		$aTargetCheckWarnings = $oTargetObject->GetCheckWarnings();
-		if (is_array($aTargetCheckWarnings)) {
-			$this->m_aCheckWarnings = array_merge($this->m_aCheckWarnings ?? [], $aTargetCheckWarnings);
-		}
-	}
-
-	/**
+     *
      * @api
      * @api-advanced
      *
@@ -2614,14 +2478,14 @@ abstract class DBObject implements iDisplay
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 * @throws \OQLException
+	 *
 	 */
-	final public function CheckToWrite($bDoComputeValues = true)
+	public final function CheckToWrite($bDoComputeValues = true)
 	{
 		if (MetaModel::SkipCheckToWrite())
 		{
 			return array(true, array());
 		}
-
 		if (is_null($this->m_bCheckStatus))
 		{
 			$this->m_aCheckIssues = array();
@@ -2638,9 +2502,6 @@ abstract class DBObject implements iDisplay
 			$oKPI = new ExecutionKPI();
 			$this->DoCheckToWrite();
             $oKPI->ComputeStatsForExtension($this, 'DoCheckToWrite');
-
-			$this->CheckToWriteForTargetObjects();
-
 			if (count($this->m_aCheckIssues) == 0)
 			{
 				$this->m_bCheckStatus = true;
@@ -2650,97 +2511,15 @@ abstract class DBObject implements iDisplay
 				$this->m_bCheckStatus = false;
 			}
 		}
-
 		return array($this->m_bCheckStatus, $this->m_aCheckIssues, $this->m_bSecurityIssue);
 	}
 
-	/**
-	 * Checks for extkey attributes values. This will throw exception on non-existing as well as non-accessible objects (silo, scopes).
-	 * That's why the test is done for all users including Administrators
-	 *
-	 * Note that due to perf issues, this isn't called directly by the ORM, but has to be called by consumers when possible.
-	 *
-	 * @param callable(string, string):bool|null $oIsObjectLoadableCallback Override to check if object is accessible.
-	 *                          Parameters are object class and key
-	 *                          Return value should be false if cannot access object, true otherwise
-	 * @return void
-	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreException if cannot get object attdef list
-	 * @throws CoreUnexpectedValue
-	 * @throws InvalidExternalKeyValueException
-	 * @throws MySQLException
-	 * @throws SecurityException if one extkey is pointing to an invalid value
-	 *
-	 * @link https://github.com/Combodo/iTop/security/advisories/GHSA-245j-66p9-pwmh
-	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6458
-	 *
-	 * @see \RestUtils::FindObjectFromKey for the same check in the REST endpoint
-	 */
-	final public function CheckChangedExtKeysValues(callable $oIsObjectLoadableCallback = null)
-	{
-		if (is_null($oIsObjectLoadableCallback)) {
-			$oIsObjectLoadableCallback = function ($sClass, $sId) {
-				$oRemoteObject = MetaModel::GetObject($sClass, $sId, false);
-				if (is_null($oRemoteObject)) {
-					return false;
-				}
-				return true;
-			};
-		}
-
-		$aChanges = $this->ListChanges();
-		$aAttCodesChanged = array_keys($aChanges);
-		foreach ($aAttCodesChanged as $sAttDefCode) {
-			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttDefCode);
-
-			if ($oAttDef instanceof AttributeLinkedSetIndirect) {
-				/** @var ormLinkSet $oOrmSet */
-				$oOrmSet = $this->Get($sAttDefCode);
-				while ($oLnk = $oOrmSet->Fetch()) {
-					$oLnk->CheckChangedExtKeysValues($oIsObjectLoadableCallback);
-				}
-				continue;
-			}
-
-			/** @noinspection PhpConditionCheckedByNextConditionInspection */
-			/** @noinspection NotOptimalIfConditionsInspection */
-			if (($oAttDef instanceof AttributeHierarchicalKey) || ($oAttDef instanceof AttributeExternalKey)) {
-				$sRemoteObjectClass = $oAttDef->GetTargetClass();
-				$sRemoteObjectKey = $this->Get($sAttDefCode);
-			} else if ($oAttDef instanceof AttributeObjectKey) {
-				$sRemoteObjectClassAttCode = $oAttDef->Get('class_attcode');
-				$sRemoteObjectClass = $this->Get($sRemoteObjectClassAttCode);
-				$sRemoteObjectKey = $this->Get($sAttDefCode);
-			} else {
-				continue;
-			}
-
-			if (utils::IsNullOrEmptyString($sRemoteObjectClass)
-				|| utils::IsNullOrEmptyString($sRemoteObjectKey)
-			) {
-				continue;
-			}
-
-			// 0 : Undefined ext. key (EG. non-mandatory and no value provided)
-			// < 0 : Non yet persisted object
-            /** @noinspection TypeUnsafeComparisonInspection Non-strict comparison as object ID can be string */
-			if ($sRemoteObjectKey <= 0) {
-				continue;
-			}
-
-			if (false === $oIsObjectLoadableCallback($sRemoteObjectClass, $sRemoteObjectKey)) {
-				throw new InvalidExternalKeyValueException($this, $sAttDefCode);
-			}
-		}
-	}
-
 	/**
 	 * Check if it is allowed to delete the existing object from the database
 	 *
 	 * an array of displayable error is added in {@see DBObject::$m_aDeleteIssues}
 	 *
-     * @internal
+     * @internal 
      *
 	 * @param \DeletionPlan $oDeletionPlan
 	 *
@@ -2805,15 +2584,8 @@ abstract class DBObject implements iDisplay
      */
 	public function CheckToDelete(&$oDeletionPlan)
   	{
-		$this->AddCurrentObjectInCrudStack('DELETE');
-		try {
-			$this->MakeDeletionPlan($oDeletionPlan);
-			$oDeletionPlan->ComputeResults();
-		}
-		finally {
-			$this->RemoveCurrentObjectInCrudStack();
-		}
-
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();
 		return (!$oDeletionPlan->FoundStopper());
 	}
 
@@ -2864,7 +2636,7 @@ abstract class DBObject implements iDisplay
 			{
 				// The value is a scalar, the comparison must be 100% strict
 				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
-				{
+				{	
 					//echo "$sAtt:<pre>\n";
 					//var_dump($this->m_aOrigValues[$sAtt]);
 					//var_dump($proposedValue);
@@ -2885,11 +2657,11 @@ abstract class DBObject implements iDisplay
 	 * @api
 	 * @api-advanced
 	 *
-	 * @return array attcode => currentvalue List the attributes that have been changed using {@see DBObject::Set()}.
-	 *         Reset during {@see DBObject::DBUpdate()}
-	 * @throws Exception
 	 * @see  \DBObject::ListPreviousValuesForUpdatedAttributes() to get previous values anywhere in the CRUD stack
 	 * @see https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Asequence_crud iTop CRUD stack documentation
+	 * @return array attname => currentvalue List the attributes that have been changed using {@see DBObject::Set()}.
+	 *         Reset during {@see DBObject::DBUpdate()}
+	 * @throws Exception
 	 * @uses m_aCurrValues
 	 */
 	public function ListChanges()
@@ -2986,7 +2758,7 @@ abstract class DBObject implements iDisplay
 
 	/**
 	 * Used only by insert, Meant to be overloaded
-     *
+     * 
      * @overwritable-hook You can extend this method in order to provide your own logic.
 	 */
 	protected function OnObjectKeyReady()
@@ -3094,7 +2866,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -3103,7 +2875,7 @@ abstract class DBObject implements iDisplay
 		}
 
 		$aHierarchicalKeys = array();
-
+		
 		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef) {
 			// Skip this attribute if not defined in this table
 			if ((!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode) && !$oAttDef->CopyOnAllTables())
@@ -3113,7 +2885,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -3137,7 +2909,7 @@ abstract class DBObject implements iDisplay
 					self::$m_aBulkInsertCols[$sClass][$sTable] = implode(', ', $aFieldsToWrite);
 				}
 				self::$m_aBulkInsertItems[$sClass][$sTable][] = '('.implode (', ', $aValuesToWrite).')';
-
+				
 				$iNewKey = 999999; // TODO - compute next id....
 			}
 			else
@@ -3222,7 +2994,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -3257,7 +3029,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($value);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -3328,8 +3100,6 @@ abstract class DBObject implements iDisplay
 	 * @throws \CoreWarning
 	 * @throws \MySQLException
 	 * @throws \OQLException
-	 *
-	 * @see DBWrite
 	 */
 	public function DBInsertNoReload()
 	{
@@ -3367,7 +3137,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 
-			[$bRes, $aIssues] = $this->CheckToWrite(false);
+			list($bRes, $aIssues) = $this->CheckToWrite(false);
 			if (!$bRes) {
 				throw new CoreCannotSaveObjectException(array('issues' => $aIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
 			}
@@ -3488,7 +3258,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	protected function PostInsertActions(): void
+	public function PostInsertActions(): void
 	{
 		$this->FireEventAfterWrite([], true);
 		$oKPI = new ExecutionKPI();
@@ -3512,9 +3282,6 @@ abstract class DBObject implements iDisplay
 
 		// - TriggerOnObjectMention
 		$this->ActivateOnMentionTriggers(true);
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
 	}
 
     /**
@@ -3542,7 +3309,7 @@ abstract class DBObject implements iDisplay
 		$this->RecordObjCreation();
 		return $ret;
 	}
-
+	
 	/**
 	 * This function is automatically called after cloning an object with the "clone" PHP language construct
 	 * The purpose of this method is to reset the appropriate attributes of the object in
@@ -3561,13 +3328,13 @@ abstract class DBObject implements iDisplay
 	 * Update an object in DB
 	 *
 	 * @api
+	 * @see DBObject::DBWrite()
+	 *
 	 * @return int object key
 	 *
 	 * @throws \CoreException
 	 * @throws \CoreCannotSaveObjectException if CheckToWrite() returns issues
 	 * @throws \Exception
-	 *
-	 * @see DBObject::DBWrite()
 	 */
 	public function DBUpdate()
 	{
@@ -3610,7 +3377,7 @@ abstract class DBObject implements iDisplay
 					return $this->m_iKey;
 				}
 
-				[$bRes, $aIssues] = $this->CheckToWrite(false);
+				list($bRes, $aIssues) = $this->CheckToWrite(false);
 				if (!$bRes) {
 					throw new CoreCannotSaveObjectException(['issues' => $aIssues, 'class' => $sClass, 'id' => $this->GetKey()]);
 				}
@@ -3807,7 +3574,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	protected function PostUpdateActions(array $aChanges): void
+	public function PostUpdateActions(array $aChanges): void
 	{
 		$this->FireEventAfterWrite($aChanges, false);
 		$oKPI = new ExecutionKPI();
@@ -3815,10 +3582,20 @@ abstract class DBObject implements iDisplay
 		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');
 
 		// - TriggerOnObjectUpdate
-		$this->ActivateOnObjectUpdateTriggers($this);
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
+		$aClassList = MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL);
+		$aParams = array('class_list' => $aClassList);
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
+			array(), $aParams);
+		while ($oTrigger = $oSet->Fetch()) {
+			/** @var \TriggerOnObjectUpdate $oTrigger */
+			try {
+				$oTrigger->DoActivate($this->ToArgs());
+			}
+			catch (Exception $e) {
+				$oTrigger->LogException($e, $this);
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
+		}
 
 		$sClass = get_class($this);
 		if (MetaModel::HasLifecycle($sClass))
@@ -3864,37 +3641,6 @@ abstract class DBObject implements iDisplay
 		$this->ActivateOnMentionTriggers(false, $aChanges);
 	}
 
-	/**
-	 * @param \DBObject $oObject
-	 * @param array|null $aAttributes
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	private function ActivateOnObjectUpdateTriggers(?DBObject $oObject, array $aAttributes = null): void
-	{
-		if (is_null($oObject)) {
-			return;
-		}
-
-		// - TriggerOnObjectUpdate
-		$aClassList = MetaModel::EnumParentClasses(get_class($oObject), ENUM_PARENT_CLASSES_ALL);
-		$aParams = array('class_list' => $aClassList);
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
-			array(), $aParams);
-		while ($oTrigger = $oSet->Fetch()) {
-			/** @var \TriggerOnObjectUpdate $oTrigger */
-			try {
-				$oTrigger->DoActivateForSpecificAttributes($oObject->ToArgs(), $aAttributes);
-			}
-			catch (Exception $e) {
-				$oTrigger->LogException($e, $oObject);
-				utils::EnrichRaisedException($oTrigger, $e);
-			}
-		}
-	}
 
 	/**
 	 * Increment attribute with specified value.
@@ -4040,18 +3786,13 @@ abstract class DBObject implements iDisplay
 
 	/**
 	 * Make the current changes persistent - clever wrapper for Insert or Update
-	 *
-	 * @api
+     *
+     * @api
 	 *
 	 * @return int
-	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreCannotSaveObjectException
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 * @throws CoreWarning
-	 * @throws MySQLException
-	 * @throws OQLException
+     *
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
 	 */
 	public function DBWrite()
 	{
@@ -4098,8 +3839,6 @@ abstract class DBObject implements iDisplay
      */
 	protected function DBDeleteSingleObject()
 	{
-		$this->LogCRUDEnter(__METHOD__);
-
 		if (MetaModel::DBIsReadOnly())
 		{
 			$this->LogCRUDExit(__METHOD__, 'DB is read-only');
@@ -4215,14 +3954,13 @@ abstract class DBObject implements iDisplay
 			}
 		}
 
+		$this->FireEventAfterDelete();
+		$oKPI = new ExecutionKPI();
+		$this->AfterDelete();
+		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
+
+
 		$this->m_bIsInDB = false;
-
-		$this->PostDeleteActions();
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
-
-		$this->LogCRUDExit(__METHOD__);
 		// Fix for N°926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete
 		// objects, reported as bug N°926)
 		// Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected
@@ -4234,7 +3972,7 @@ abstract class DBObject implements iDisplay
      * First, checks if the object can be deleted regarding database integrity.
      * If the answer is yes, it performs any required cleanup (delete other objects or reset external keys) in addition to the object
      * deletion.
-     *
+     * 
      * @api
      *
      * @param \DeletionPlan $oDeletionPlan Do not use: aims at dealing with recursion
@@ -4253,66 +3991,74 @@ abstract class DBObject implements iDisplay
 	public function DBDelete(&$oDeletionPlan = null)
 	{
 		$this->LogCRUDEnter(__METHOD__);
-		try {
-			static $iLoopTimeLimit = null;
-			if ($iLoopTimeLimit == null) {
-				$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-			}
-			if (is_null($oDeletionPlan)) {
-				$oDeletionPlan = new DeletionPlan();
-			}
 
-			if (false === $this->CheckToDelete($oDeletionPlan)) {
-				$aIssues = $oDeletionPlan->GetIssues();
-				$this->LogCRUDError(__METHOD__, ' Errors: '.implode(', ', $aIssues));
-				throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));
-			}
+		static $iLoopTimeLimit = null;
+		if ($iLoopTimeLimit == null)
+		{
+			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		}
+		if (is_null($oDeletionPlan))
+		{
+			$oDeletionPlan = new DeletionPlan();
+		}
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();
 
-
-			// Getting and setting time limit are not symmetric:
-			// www.php.net/manual/fr/function.set-time-limit.php#72305
-			$iPreviousTimeLimit = ini_get('max_execution_time');
-
-			foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete) {
-				foreach ($aToDelete as $iId => $aData) {
-					/** @var \DBObject $oToDelete */
-					$oToDelete = $aData['to_delete'];
-
-					// The deletion based on a deletion plan should not be done for each object if the deletion plan is common (Trac #457)
-					// because for each object we would try to update all the preceding ones... that are already deleted
-					// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
-					// As a temporary fix: delete only the objects that are still to be deleted...
-					if ($oToDelete->m_bIsInDB) {
-						set_time_limit(intval($iLoopTimeLimit));
-
-						$oToDelete->AddCurrentObjectInCrudStack('DELETE');
-						try {
-							$oToDelete->DBDeleteSingleObject();
-						}
-						finally {
-							$oToDelete->RemoveCurrentObjectInCrudStack();
-						}
-					}
-				}
-			}
-
-			foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate) {
-				foreach ($aToUpdate as $aData) {
-					$oToUpdate = $aData['to_reset'];
-					/** @var \DBObject $oToUpdate */
-					foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef) {
-						$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
-						set_time_limit(intval($iLoopTimeLimit));
-						$oToUpdate->DBUpdate();
-					}
-				}
-			}
-
-			set_time_limit(intval($iPreviousTimeLimit));
-		} finally {
-			$this->LogCRUDExit(__METHOD__);
+		if ($oDeletionPlan->FoundStopper())
+		{
+			$aIssues = $oDeletionPlan->GetIssues();
+			$this->LogCRUDError(__METHOD__, ' Errors: '.implode(', ', $aIssues));
+			throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));
 		}
 
+
+		// Getting and setting time limit are not symetric:
+		// www.php.net/manual/fr/function.set-time-limit.php#72305
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+
+		foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete)
+		{
+			foreach ($aToDelete as $iId => $aData)
+			{
+				/** @var \DBObject $oToDelete */
+				$oToDelete = $aData['to_delete'];
+				// The deletion based on a deletion plan should not be done for each object if the deletion plan is common (Trac #457)
+				// because for each object we would try to update all the preceding ones... that are already deleted
+				// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
+				// As a temporary fix: delete only the objects that are still to be deleted...
+				if ($oToDelete->m_bIsInDB)
+				{
+					set_time_limit(intval($iLoopTimeLimit));
+
+					$oToDelete->AddCurrentObjectInCrudStack('DELETE');
+					try {
+						$oToDelete->DBDeleteSingleObject();
+					}
+					finally {
+						$oToDelete->RemoveCurrentObjectInCrudStack();
+					}
+				}
+			}
+		}
+
+		foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate)
+		{
+			foreach ($aToUpdate as $aData)
+			{
+				$oToUpdate = $aData['to_reset'];
+				/** @var \DBObject $oToUpdate */
+				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
+				{
+					$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
+					set_time_limit(intval($iLoopTimeLimit));
+					$oToUpdate->DBUpdate();
+				}
+			}
+		}
+
+		set_time_limit(intval($iPreviousTimeLimit));
+
+		$this->LogCRUDExit(__METHOD__);
 		return $oDeletionPlan;
 	}
 
@@ -4619,7 +4365,7 @@ abstract class DBObject implements iDisplay
      *
      * @api
      *
-	 */
+	 */	 	
 	public function Reset($sAttCode)
 	{
 		$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
@@ -4631,7 +4377,7 @@ abstract class DBObject implements iDisplay
      * Suitable for use as a lifecycle action
      *
      * @api
-	 */
+	 */	 	
 	public function Copy($sDestAttCode, $sSourceAttCode)
 	{
 		$oTypeValueToCopy = MetaModel::GetAttributeDef(get_class($this), $sSourceAttCode);
@@ -4961,7 +4707,7 @@ abstract class DBObject implements iDisplay
 			{
 				throw new CoreException("Unknown attribute '$sExtKeyAttCode' for the class ".get_class($this));
 			}
-
+			
 			$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
 			if (!$oKeyAttDef instanceof AttributeExternalKey)
 			{
@@ -4979,14 +4725,14 @@ abstract class DBObject implements iDisplay
 				$ret  = $oRemoteObj->GetForTemplate($sRemoteAttCode);
 			}
 		}
-		else
+		else 
 		{
 			switch($sPlaceholderAttCode)
 			{
 				case 'id':
 				$ret = $this->GetKey();
 				break;
-
+				
 				case 'name()':
 				$ret = $this->GetName();
 				break;
@@ -5173,7 +4919,7 @@ abstract class DBObject implements iDisplay
 		if ($oOwner)
 		{
 			$sLinkSetOwnerClass = get_class($oOwner);
-
+			
 			$oMyChangeOp = MetaModel::NewObject($sChangeOpClass);
 			$oMyChangeOp->Set("objclass", $sLinkSetOwnerClass);
 			$oMyChangeOp->Set("objkey", $iLinkSetOwnerId);
@@ -5200,7 +4946,7 @@ abstract class DBObject implements iDisplay
 		{
 			/** @var \AttributeLinkedSet $oLinkSet */
 			if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
-
+			
 			$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
 			$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
 			if ($oMyChangeOp)
@@ -5418,9 +5164,8 @@ abstract class DBObject implements iDisplay
 		$this->m_aDeleteIssues = array(); // Ok
 		$this->FireEventCheckToDelete($oDeletionPlan);
 		$this->DoCheckToDelete($oDeletionPlan);
-		$this->CheckToWriteForTargetObjects(true);
 		$oDeletionPlan->SetDeletionIssues($this, $this->m_aDeleteIssues, $this->m_bSecurityIssue);
-
+	
 		$aDependentObjects = $this->GetReferencingObjects(true /* allow all data */);
 
 		// Getting and setting time limit are not symmetric:
@@ -5602,7 +5347,7 @@ abstract class DBObject implements iDisplay
 				$aSynchroClasses[] = $sTarget;
 			}
 		}
-
+		
 		foreach($aSynchroClasses as $sClass)
 		{
 			if ($this instanceof $sClass)
@@ -6409,18 +6154,6 @@ abstract class DBObject implements iDisplay
 		$this->m_aCheckWarnings[] = $sWarning;
 	}
 
-	/**
-	 *
-	 * @api
-	 *
-	 * @return string[]|null
-	 * @since 3.1.1 3.2.0
-	 */
-	public function GetCheckWarnings(): ?array
-	{
-		return $this->m_aCheckWarnings;
-	}
-
 	/**
 	 * @api
 	 *
@@ -6552,10 +6285,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 			finally {
-				if (!$oKPI->ComputeStatsForExtension($this, $sCallback, "Event: $sEvent")) {
-					$sSignature = ModuleService::GetInstance()->GetModuleMethodSignature($this, $sCallback);
-					$oKPI->ComputeStats('FireEvent', "$sEvent callback: $sSignature");
-				}
+				$oKPI->ComputeStats('FireEvent', $sEvent);
 			}
 		}
 		if (!is_null($oFirstException)) {
@@ -6668,10 +6398,9 @@ abstract class DBObject implements iDisplay
 		// during insert key is reset from -1 to null
 		// so we need to handle null values (will give empty string after conversion)
 		$sConvertedId = (string)$sId;
-		$oRootClass = MetaModel::GetRootClass($sClass);
 
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if (($oRootClass === $aCrudStackEntry['class'])
+			if (($sClass === $aCrudStackEntry['class'])
 				&& ($sConvertedId === $aCrudStackEntry['id'])) {
 				return true;
 			}
@@ -6686,14 +6415,12 @@ abstract class DBObject implements iDisplay
 	 * @param string $sClass
 	 *
 	 * @return bool
-	 * @throws \CoreException
 	 * @since 3.1.0 N°5609
 	 */
 	final public static function IsClassCurrentlyInCrud(string $sClass): bool
 	{
-		$sRootClass = MetaModel::GetRootClass($sClass);
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if ($sRootClass === $aCrudStackEntry['class']) {
+			if ($sClass === $aCrudStackEntry['class']) {
 				return true;
 			}
 		}
@@ -6711,11 +6438,9 @@ abstract class DBObject implements iDisplay
 	 */
 	private function AddCurrentObjectInCrudStack(string $sCrudType): void
 	{
-		$this->LogCRUDDebug(__METHOD__);
-		$sRootClass = MetaModel::GetRootClass(get_class($this));
 		self::$m_aCrudStack[] = [
 			'type'  => $sCrudType,
-			'class' => $sRootClass,
+			'class' => get_class($this),
 			'id'    => (string)$this->GetKey(), // GetKey() doesn't have type hinting, so forcing type to avoid getting an int
 		];
 	}
@@ -6729,7 +6454,6 @@ abstract class DBObject implements iDisplay
 	 */
 	private function UpdateCurrentObjectInCrudStack(): void
 	{
-		$this->LogCRUDDebug(__METHOD__);
 		$aCurrentCrudStack = array_pop(self::$m_aCrudStack);
 		$aCurrentCrudStack['id'] = (string)$this->GetKey();
 		self::$m_aCrudStack[] = $aCurrentCrudStack;
@@ -6743,8 +6467,7 @@ abstract class DBObject implements iDisplay
 	 */
 	private function RemoveCurrentObjectInCrudStack(): void
 	{
-		$aRemoved = array_pop(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, $aRemoved['class'].':'.$aRemoved['id']);
+		array_pop(self::$m_aCrudStack);
 	}
 
 	/**

core/displayablegraph.class.inc.php

@@ -16,11 +16,8 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
-use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\MedallionIcon\MedallionIcon;
 use Combodo\iTop\Application\UI\Base\Component\Panel\Panel;
-use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
-use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 /**
@@ -1415,8 +1412,6 @@ class DisplayableGraph extends SimpleGraph
 	/**
 	 * Display the graph inside the given page, with the "filter" drawer above it
 	 *
-	 * @deprecated 3.1.1 3.2.0 N°3767 Use \DisplayableGraph::DisplayFilterBox() and \DisplayableGraph::DisplayGraph() instead
-	 *
 	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param string $sRelation
@@ -1430,35 +1425,10 @@ class DisplayableGraph extends SimpleGraph
 	 *
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
-	 *
 	 */
 	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array(), bool $bLazyLoading = false)
 	{
-		$oP->AddSubBlock($this->DisplayFilterBox($oP, $aResults, $bLazyLoading));
-		$this->DisplayGraph($oP, $sRelation, $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams, $bLazyLoading);
-	}
-
-	/**
-	 * Display only the graph inside the given page, with the parameters of filter box draw with DisplayFilterBox
-	 *
-	 * @param WebPage $oP
-	 * @param string $sRelation
-	 * @param ApplicationContext $oAppContext
-	 * @param array $aExcludedObjects
-	 * @param string $sObjClass
-	 * @param int $iObjKey
-	 * @param string $sContextKey
-	 * @param array $aContextParams
-	 * @param bool $bLazyLoading
-	 *
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 *
-	 * @since 3.1.1 3.2.0 N°3767
-	 */
-	function DisplayGraph(WebPage $oP, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array(), bool $bLazyLoading = false): void
-	{
-		list($aExcludedByClass, $aAdditionalContexts) = $this->GetFilteringData($sContextKey, $aContextParams, $aExcludedObjects);
+		list($aExcludedByClass, $aAdditionalContexts) = $this->DisplayFiltering($sContextKey, $aContextParams, $aExcludedObjects, $oP, $aResults, $bLazyLoading);
 
 		$iGroupingThreshold = utils::ReadParam('g', 5);
 
@@ -1543,10 +1513,12 @@ class DisplayableGraph extends SimpleGraph
 				$oP->add_ready_script(" $('#$sId').simple_graph(".json_encode($aParams).");");
 			} else {
 				$oP->add_script("function Load(){var aExcluded = [];	$('input[name^=excluded]').each( function() {if (!$(this).prop('checked'))	{	aExcluded.push($(this).val());		}} ); var params= $.extend(".json_encode($aParams).",  {excluded_classes: aExcluded}); $('#$sId').simple_graph(params);}");
-				$oP->add_ready_script("$('#graph').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');$('#impacted_objects_lists').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');$('#impacted_groups').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');");
+				$oP->add_ready_script("$('#impacted_objects_lists').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');$('#impacted_groups').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');");
+
 			}
 		}
-		catch (Exception $e) {
+		catch(Exception $e)
+		{
 			$oP->add('<div>'.$e->getMessage().'</div>');
 		}
 		$oP->add_script(
@@ -1591,41 +1563,23 @@ EOF
 	 * @throws \Twig\Error\LoaderError
 	 * @throws \Twig\Error\RuntimeError
 	 * @throws \Twig\Error\SyntaxError
-	 *
-	 * @deprecated 3.1.1 3.2.0 N°3767 Use \DisplayableGraph::DisplayFilterBox() and \DisplayableGraph::GetFilteringData() instead
 	 */
 	public function DisplayFiltering(string $sContextKey, array $aContextParams, array $aExcludedObjects, WebPage $oP, array $aResults, bool $bLazyLoading = false): array
 	{
-		$oP->Add($this->DisplayFilterBox($oP, $aResults, $bLazyLoading));
-
-		return $this->GetFilteringData($sContextKey, $aContextParams, $aExcludedObjects);
-	}
-
-	/**
-	 * @param \WebPage $oP
-	 * @param array $aResults
-	 * @param bool $bLazyLoading
-	 *
-	 * @return UIContentBlock
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 * @throws \ReflectionException
-	 * @throws \Twig\Error\LoaderError
-	 * @throws \Twig\Error\RuntimeError
-	 * @throws \Twig\Error\SyntaxError
-	 *
-	 * @since 3.1.1 3.2.0 N°3767
-	 */
-	public function DisplayFilterBox(WebPage $oP, array $aResults, bool $bLazyLoading = false): UIContentBlock
-	{
+		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
+		$aExcludedByClass = array();
+		foreach ($aExcludedObjects as $oObj) {
+			if (!array_key_exists(get_class($oObj), $aExcludedByClass)) {
+				$aExcludedByClass[get_class($oObj)] = array();
+			}
+			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
+		}
 		$sSftShort = Dict::S('UI:ElementsDisplayed');
-		$oBlock = UIContentBlockUIBlockFactory::MakeStandard(null, ['not-printable']);
-
+		$oP->add("<div class=\"not-printable\">\n");
 		$oUiSearchBlock = new Panel($sSftShort, [], Panel::ENUM_COLOR_SCHEME_CYAN, 'dh_flash');
-		$oUiSearchBlock->SetCSSClasses(["ibo-search-form-panel", "display_block"])
-			->SetIsCollapsible(true);
-
-		$oUiHtmlBlock = new Html(
+		$oUiSearchBlock->SetCSSClasses(["ibo-search-form-panel", "display_block"]);
+		$oUiSearchBlock->SetIsCollapsible(true);
+		$oUiHtmlBlock = new Combodo\iTop\Application\UI\Base\Component\Html\Html(
 			<<<EOF
 		
     <div id="ds_flash" class="search_box ibo-display-graph--search-box">
@@ -1672,23 +1626,11 @@ EOF
 			$oUiHtmlBlock->AddHtml("<button type=\"button\" id=\"ReloadMovieBtn\" class=\"ibo-button ibo-is-neutral ibo-is-regular\" onClick=\"$sOnCLick\">".Dict::S('UI:Button:Refresh')."</button></div></form>");
 		}
 		$oUiHtmlBlock->AddHtml("</div>\n");
+		$oUiHtmlBlock->AddHtml("</div>\n"); // class="not-printable"
 
 		$oUiSearchBlock->AddSubBlock($oUiHtmlBlock);
-		$oBlock->AddSubBlock($oUiSearchBlock);
+		$oP->AddUiBlock($oUiSearchBlock);
 
-		return $oBlock;
-	}
-
-	public function GetFilteringData(string $sContextKey, array $aContextParams, array $aExcludedObjects): array
-	{
-		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
-		$aExcludedByClass = array();
-		foreach ($aExcludedObjects as $oObj) {
-			if (!array_key_exists(get_class($oObj), $aExcludedByClass)) {
-				$aExcludedByClass[get_class($oObj)] = array();
-			}
-			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
-		}
 		$aAdditionalContexts = array();
 		foreach ($aContextDefs as $sKey => $aDefinition) {
 			$aAdditionalContexts[] = array('key' => $sKey, 'label' => Dict::S($aDefinition['dict']), 'oql' => $aDefinition['oql'], 'default' => (array_key_exists('default', $aDefinition) && ($aDefinition['default'] == 'yes')));

core/excelbulkexport.class.inc.php

@@ -10,7 +10,6 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\Helper\ExportHelper;
 
 require_once(APPROOT.'application/xlsxwriter.class.php');
 
@@ -83,7 +82,6 @@ class ExcelBulkExport extends TabularBulkExport
 
 			case 'xlsx_options':
 				$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:XLSXOptions'));
-				$oPanel->AddSubBlock(ExportHelper::GetAlertForExcelMaliciousInjection());
 
 				$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
 				$oPanel->AddSubBlock($oMulticolumn);

core/kpi.class.inc.php

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

core/log.class.inc.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   iTop is free software; you can redistribute it and/or modify	
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -576,11 +576,6 @@ class LogChannels
 	public const DATATABLE = 'Datatable';
 
 	public const DEADLOCK = 'DeadLock';
-	/**
-	 * @var string Everything related to PHP sessions tracking
-	 * @since 3.1.1 3.2.0 N°6901
-	 */
-	public const SESSIONTRACKER = 'SessionTracker';
 
 	/**
 	 * @var string Everything related to the datamodel CRUD
@@ -1143,13 +1138,9 @@ class DeprecatedCallsLog extends LogAPI
 		parent::Enable($sTargetFile);
 
 		if (
-			(
-				(false === defined(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME))
-				|| (defined(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME) && (constant(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME) !== true))
-			)
+			(false === defined('ITOP_PHPUNIT_RUNNING_CONSTANT_NAME'))
 			&& static::IsLogLevelEnabledSafe(self::LEVEL_WARNING, self::ENUM_CHANNEL_PHP_LIBMETHOD)
 		) {
-			IssueLog::Trace('Setting '.static::class.' error handler to catch DEPRECATED', static::ENUM_CHANNEL_PHP_LIBMETHOD);
 			set_error_handler([static::class, 'DeprecatedNoticesErrorHandler'], E_DEPRECATED | E_USER_DEPRECATED);
 		}
 	}

core/metamodel.class.php

@@ -1241,7 +1241,7 @@ abstract class MetaModel
 			}
 			$sTable = self::DBGetTable($sClass);
 
-			// Could be completed later with all the classes that are using a given table
+			// Could be completed later with all the classes that are using a given table 
 			if (!array_key_exists($sTable, $aTables)) {
 				$aTables[$sTable] = array();
 			}
@@ -1445,10 +1445,8 @@ abstract class MetaModel
 	 *
 	 * @return AttributeDefinition[]
 	 * @throws \CoreException
-	 *
-	 * @see GetAttributesList for attcode list
 	 */
-	final public static function ListAttributeDefs($sClass)
+	final static public function ListAttributeDefs($sClass)
 	{
 		self::_check_subclass($sClass);
 		return self::$m_aAttribDefs[$sClass];
@@ -1461,10 +1459,8 @@ abstract class MetaModel
 	 * @param string[] $aDesiredAttTypes Array of AttributeDefinition classes to filter the list on
 	 * @param string|null $sListCode If provided, attributes will be limited to those in this zlist
 	 *
-	 * @return string[] list of attcodes
+	 * @return array
 	 * @throws \CoreException
-	 *
-	 * @see ListAttributeDefs to get AttributeDefinition array instead
 	 */
 	final public static function GetAttributesList(string $sClass, array $aDesiredAttTypes = [], ?string $sListCode = null)
 	{
@@ -3526,7 +3522,7 @@ abstract class MetaModel
 		}
 
 		// Set the "host class" as soon as possible, since HierarchicalKeys use it for their 'target class' as well
-		// and this needs to be know early (for Init_IsKnowClass 19 lines below)
+		// and this needs to be know early (for Init_IsKnowClass 19 lines below)		
 		$oAtt->SetHostClass($sTargetClass);
 
 		// Some attributes could refer to a class
@@ -3568,7 +3564,7 @@ abstract class MetaModel
 
 		self::$m_aAttribDefs[$sTargetClass][$oAtt->GetCode()] = $oAtt;
 		self::$m_aAttribOrigins[$sTargetClass][$oAtt->GetCode()] = $sTargetClass;
-		// Note: it looks redundant to put targetclass there, but a mix occurs when inheritance is used
+		// Note: it looks redundant to put targetclass there, but a mix occurs when inheritance is used		
 	}
 
 	/**
@@ -3768,7 +3764,7 @@ abstract class MetaModel
 		self::$m_aStimuli[$sTargetClass][$oStimulus->GetCode()] = $oStimulus;
 
 		// I wanted to simplify the syntax of the declaration of objects in the biz model
-		// Therefore, the reference to the host class is set there
+		// Therefore, the reference to the host class is set there 
 		$oStimulus->SetHostClass($sTargetClass);
 	}
 
@@ -4223,78 +4219,40 @@ abstract class MetaModel
 		}
 		else
 		{
-			$aCurrentUser = [];
-			$aCurrentContact = [];
+			$aCurrentUser = array();
+			$aCurrentContact = array();
 			foreach ($aExpectedArgs as $expression)
 			{
 				$aName = explode('->', $expression->GetName());
 				if ($aName[0] == 'current_contact_id') {
 					$aPlaceholders['current_contact_id'] = UserRights::GetContactId();
-				} else if ($aName[0] == 'current_user') {
+				}
+				if ($aName[0] == 'current_user') {
 					array_push($aCurrentUser, $aName[1]);
-				} else if ($aName[0] == 'current_contact') {
+				}
+				if ($aName[0] == 'current_contact') {
 					array_push($aCurrentContact, $aName[1]);
 				}
 			}
 			if (count($aCurrentUser) > 0) {
-				static::FillObjectPlaceholders($aPlaceholders, 'current_user', UserRights::GetUserObject(), $aCurrentUser);
+				$oUser = UserRights::GetUserObject();
+				$aPlaceholders['current_user->object()'] = $oUser;
+				foreach ($aCurrentUser as $sField) {
+					$aPlaceholders['current_user->'.$sField] = $oUser->Get($sField);
+				}
 			}
 			if (count($aCurrentContact) > 0) {
-				static::FillObjectPlaceholders($aPlaceholders, 'current_contact', UserRights::GetContactObject(), $aCurrentContact);
+				$oPerson = UserRights::GetContactObject();
+				$aPlaceholders['current_contact->object()'] = $oPerson;
+				foreach ($aCurrentContact as $sField) {
+					$aPlaceholders['current_contact->'.$sField] = $oPerson->Get($sField);
+				}
 			}
 		}
 
 		return $aPlaceholders;
 	}
 
-	/**
-	 * @since 3.1.1 N°6824
-	 * @param array $aPlaceholders
-	 * @param string $sPlaceHolderPrefix
-	 * @param ?\DBObject $oObject
-	 * @param array $aCurrentUser
-	 *
-	 * @return void
-	 *
-	 */
-	private static function FillObjectPlaceholders(array &$aPlaceholders, string $sPlaceHolderPrefix, ?\DBObject $oObject, array $aCurrentUser) : void {
-		$sPlaceHolderKey = $sPlaceHolderPrefix."->object()";
-		if (is_null($oObject)){
-			$aContext = [
-				"current_user_id" => UserRights::GetUserId(),
-				"null object type" => $sPlaceHolderPrefix,
-				"fields" => $aCurrentUser,
-			];
-			IssueLog::Warning("Unresolved placeholders due to null object in current context", null,
-				$aContext);
-			$aPlaceholders[$sPlaceHolderKey] = Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
-			foreach ($aCurrentUser as $sField) {
-				$sPlaceHolderKey = $sPlaceHolderPrefix . "->$sField";
-				$aPlaceholders[$sPlaceHolderKey] = Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
-			}
-		} else {
-			$aPlaceholders[$sPlaceHolderKey] = $oObject;
-			foreach ($aCurrentUser as $sField) {
-				$sPlaceHolderKey = $sPlaceHolderPrefix . "->$sField";
-				// Mind that the "id" is not viewed as a valid att. code by \MetaModel::IsValidAttCode() so we have to test it manually
-				if ($sField !== "id" && false === MetaModel::IsValidAttCode(get_class($oObject), $sField)){
-					$aContext = [
-						"current_user_id" => UserRights::GetUserId(),
-						"obj_class" => get_class($oObject),
-						"placeholder" => $sPlaceHolderKey,
-						"invalid_field" => $sField,
-					];
-					IssueLog::Warning("Unresolved placeholder due to invalid attribute", null,
-						$aContext);
-					$aPlaceholders[$sPlaceHolderKey] = Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
-					continue;
-				}
-
-				$aPlaceholders[$sPlaceHolderKey] = $oObject->Get($sField);
-			}
-		}
-	}
-
 	/**
 	 * @param \DBSearch $oFilter
 	 *
@@ -5156,7 +5114,7 @@ abstract class MetaModel
 	 */
 	protected static function DBCreateTables($aCallback = null)
 	{
-		[$aErrors, $aSugFix, $aCondensedQueries] = self::DBCheckFormat();
+		list($aErrors, $aSugFix, $aCondensedQueries) = self::DBCheckFormat();
 
 		//$sSQL = implode('; ', $aCondensedQueries); Does not work - multiple queries not allowed
 		foreach($aCondensedQueries as $sQuery)
@@ -5178,7 +5136,7 @@ abstract class MetaModel
 	 */
 	protected static function DBCreateViews()
 	{
-		[$aErrors, $aSugFix] = self::DBCheckViews();
+		list($aErrors, $aSugFix) = self::DBCheckViews();
 
 		foreach($aSugFix as $sClass => $aTarget)
 		{
@@ -6521,7 +6479,7 @@ abstract class MetaModel
 				$aCache['m_aExtensionClassNames'] = self::$m_aExtensionClassNames;
 				$aCache['m_Category2Class'] = self::$m_Category2Class;
 				$aCache['m_aRootClasses'] = self::$m_aRootClasses; // array of "classname" => "rootclass"
-				$aCache['m_aParentClasses'] = self::$m_aParentClasses; // array of ("classname" => array of "parentclass")
+				$aCache['m_aParentClasses'] = self::$m_aParentClasses; // array of ("classname" => array of "parentclass") 
 				$aCache['m_aChildClasses'] = self::$m_aChildClasses; // array of ("classname" => array of "childclass")
 				$aCache['m_aClassParams'] = self::$m_aClassParams; // array of ("classname" => array of class information)
 				$aCache['m_aAttribDefs'] = self::$m_aAttribDefs; // array of ("classname" => array of attributes)
@@ -6927,22 +6885,6 @@ abstract class MetaModel
 		return $iCount === 1;
 	}
 
-	public static function GetFinalClassName(string $sClass, int $iKey): string
-	{
-		if (MetaModel::IsStandaloneClass($sClass)) {
-			return $sClass;
-		}
-
-		$sRootClass = MetaModel::GetRootClass($sClass);
-		$sTable = MetaModel::DBGetTable($sRootClass);
-		$sKeyCol = MetaModel::DBGetKey($sRootClass);
-		$sEscapedKey = CMDBSource::Quote($iKey);
-		$sFinalClassField = Metamodel::DBGetClassField($sRootClass);
-
-		$sQuery = "SELECT `{$sFinalClassField}` FROM `{$sTable}` WHERE `{$sKeyCol}` = {$sEscapedKey}";
-		return  CMDBSource::QueryToScalar($sQuery);
-	}
-
 	/**
 	 * Search for the specified class and id. If the object is archived it will be returned anyway (this is for pre-2.4
 	 * module compatibility, see N.1108)

core/mutex.class.inc.php

@@ -22,9 +22,7 @@
  * A class to serialize the execution of some code sections
  * Emulates the API of PECL Mutex class
  * Relies on MySQL locks because the API sem_get is not always present in the
- * installed PHP.
- *
- * @link https://dev.mysql.com/doc/refman/5.7/en/locking-functions.html MySQL locking functions documentation
+ * installed PHP.    
  *
  * @copyright   Copyright (C) 2013-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0

core/pdfbulkexport.class.inc.php

@@ -68,8 +68,6 @@ class PDFBulkExport extends HTMLBulkExport
 
 				//page format
 				$oSelectFormat = SelectUIBlockFactory::MakeForSelectWithLabel("page_size", Dict::S('Core:BulkExport:PDFPageSize'));
-				$oSelectFormat->SetIsLabelBefore(false);
-				//$oSelectFormat->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetFormat->AddSubBlock($oSelectFormat);
 
 				$aPossibleFormat = ['A3', 'A4', 'Letter'];
@@ -79,10 +77,7 @@ class PDFBulkExport extends HTMLBulkExport
 				}
 				$oFieldSetFormat->AddSubBlock(new Html('</br>'));
 
-				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation",
-					Dict::S('Core:BulkExport:PDFPageOrientation'));
-				$oSelectOrientation->SetIsLabelBefore(false);
-				//$oSelectOrientation->AddCSSClass('ibo-input-checkbox');
+				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation", Dict::S('Core:BulkExport:PDFPageOrientation'));
 				$oFieldSetFormat->AddSubBlock($oSelectOrientation);
 
 				$aPossibleOrientation = ['P', 'L'];

core/trigger.class.inc.php

@@ -256,38 +256,6 @@ abstract class TriggerOnObject extends Trigger
 		}
 	}
 
-	/**
-	 * Activate trigger based on attribute list given instead of changed attributes
-	 *
-	 * @param array $aContextArgs
-	 * @param array|null $aAttributes if null default to changed attributes
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 * @throws \OQLException
-	 * @since 3.1.1 3.2.0 N°6228
-	 */
-	public function DoActivateForSpecificAttributes(array $aContextArgs, ?array $aAttributes)
-	{
-		if (isset($aContextArgs['this->object()']))
-		{
-			/** @var \DBObject $oObject */
-			$oObject = $aContextArgs['this->object()'];
-			if (is_null($aAttributes)) {
-				$aChanges = $oObject->ListPreviousValuesForUpdatedAttributes();
-			} else {
-				$aChanges = array_fill_keys($aAttributes, true);
-			}
-			if (false === $this->IsTargetObject($oObject->GetKey(), $aChanges)) {
-				return;
-			}
-		}
-		parent::DoActivate($aContextArgs);
-	}
-
 	/**
 	 * @param $iObjectId
 	 * @param array $aChanges

core/userrights.class.inc.php

@@ -248,7 +248,7 @@ abstract class User extends cmdbAbstractObject
 			"depends_on"      => array(),
 		)));
 
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property', "with_php_constraint" => true, "with_php_computation" => true)));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property', "with_php_constraint" => true)));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class" => "URP_UserOrg", "ext_key_to_me" => "userid", "ext_key_to_remote" => "allowed_org_id", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), 'with_php_constraint' => true)));
 		MetaModel::Init_AddAttribute(new AttributeCaseLog("log", array("sql" => 'log', "is_null_allowed" => true, "default_value" => '', "allowed_values" => null, "depends_on" => array(), "always_load_in_tables" => false)));
 
@@ -856,8 +856,6 @@ class UserRights
 	}
 
 	/**
-	 * Set the current user (as part of the login process)
-	 *
 	 * @param string $sLogin Login of the concerned user
 	 * @param string $sAuthentication
 	 *
@@ -867,6 +865,8 @@ class UserRights
 	 */
 	public static function Login($sLogin, $sAuthentication = 'any')
 	{
+		static::Logoff();
+
 		$oUser = self::FindUser($sLogin, $sAuthentication);
 		if (is_null($oUser))
 		{
@@ -885,8 +885,6 @@ class UserRights
 	}
 
 	/**
-	 * Reset current user and cleanup associated SESSION data
-	 *
 	 * @return void
 	 * @since 3.0.4 3.1.1 3.2.0
 	 */
@@ -1121,7 +1119,9 @@ class UserRights
 	}
 
 	/**
-	 * @return string connected {@see User} login field value, otherwise empty string
+	 * Return the current user login or an empty string if nobody connected.
+	 *
+	 * @return string
 	 */
 	public static function GetUser()
 	{
@@ -1569,9 +1569,9 @@ class UserRights
 
 	/**
 	 * @param string $sClass
-	 * @param int $iActionCode see UR_ACTION_* constants
-	 * @param DBObjectSet $oInstanceSet
-	 * @param User $oUser
+	 * @param int $iActionCode
+	 * @param \DBObjectSet $oInstanceSet
+	 * @param \User $oUser
 	 *
 	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO|UR_ALLOWED_DEPENDS)
 	 * @throws \CoreException

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants>
   </constants>
   <classes>

datamodels/2.x/authent-cas/module.authent-cas.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.1.1',
+	'authent-cas/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-external/module.authent-external.php

@@ -27,7 +27,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/3.1.1',
+	'authent-external/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/authent-ldap/module.authent-ldap.php

@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/3.1.1',
+	'authent-ldap/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
       <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>

datamodels/2.x/authent-local/module.authent-local.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.1.1',
+	'authent-local/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <branding>
     <themes>
       <theme id="darkmoon" _delta="define">

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/cs.dict.combodo-backoffice-darkmoon-theme.php

@@ -21,5 +21,5 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'theme:darkmoon' => 'Dark moon~~',
-));
+	'theme:darkmoon' => 'Dark moon',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-darkmoon-theme/3.1.1',
+	'combodo-backoffice-darkmoon-theme/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="DBToolsMenu" xsi:type="WebPageMenuNode" _delta="define">
       <rank>30</rank>

datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-db-tools/3.1.1',
+	'combodo-db-tools/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>

datamodels/2.x/itop-attachments/module.itop-attachments.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/3.1.1',
+	'itop-attachments/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
       <rank>50</rank>

datamodels/2.x/itop-backup/module.itop-backup.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/3.1.1',
+	'itop-backup/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToProviderContract" _delta="define">

datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-services/3.1.1',
+	'itop-bridge-cmdb-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToTicket" _delta="define">

datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/3.1.1',
+	'itop-bridge-cmdb-ticket/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="Rack" _delta="must_exist">

datamodels/2.x/itop-bridge-datacenter-mgmt-services/module.itop-bridge-datacenter-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-datacenter-mgmt-services/3.1.1',
+	'itop-bridge-datacenter-mgmt-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="Phone" _delta="must_exist">

datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-endusers-devices-services/3.1.1',
+	'itop-bridge-endusers-devices-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="SANSwitch" _delta="must_exist">

datamodels/2.x/itop-bridge-storage-mgmt-services/module.itop-bridge-storage-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-storage-mgmt-services/3.1.1',
+	'itop-bridge-storage-mgmt-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="Hypervisor" _delta="must_exist">

datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-mgmt-services/3.1.1',
+	'itop-bridge-virtualization-mgmt-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="lnkVirtualDeviceToVolume" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/3.1.1',
+	'itop-bridge-virtualization-storage/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -49,20 +49,12 @@
             <value id="approved">approved
               <code>approved</code>
               <rank>60</rank>
-              <style>
-                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-                <decoration_classes>fas fa-user-check</decoration_classes>
-              </style>
+              <style><main_color>$ibo-lifecycle-success-state-primary-color</main_color><complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color><decoration_classes>fas fa-user-check</decoration_classes></style>
             </value>
             <value id="assigned">assigned
               <code>assigned</code>
               <rank>40</rank>
-              <style>
-                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                <decoration_classes/>
-              </style>
+              <style><main_color>$ibo-lifecycle-neutral-state-primary-color</main_color><complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color><decoration_classes/></style>
             </value>
             <value id="closed">
               <code>closed</code>
@@ -1296,7 +1288,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2097,7 +2089,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3103,7 +3095,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3801,7 +3793,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>

datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/3.1.1',
+	'itop-change-mgmt-itil/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/3.1.1',
+	'itop-change-mgmt/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="FunctionalCI" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -272,7 +272,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -530,8 +530,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -702,8 +702,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -992,8 +992,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="networkdevicetype_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="networkdevicetype_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1293,8 +1293,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1621,7 +1621,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -1797,7 +1797,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -1943,7 +1943,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -2145,7 +2145,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2299,7 +2299,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2453,7 +2453,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2607,7 +2607,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2740,7 +2740,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2872,8 +2872,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="middleware_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="middleware_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3011,8 +3011,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="dbserver_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="dbserver_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3148,8 +3148,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="webserver_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="webserver_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3304,8 +3304,8 @@
             <attribute id="version"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="vendor"></attribute>
-            <attribute id="type"></attribute>
+            <attribute id="vendor"/>
+            <attribute id="type"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3782,7 +3782,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -4260,7 +4260,6 @@
               <rank>70</rank>
             </item>
           </items>
-
         </summary>
       </presentation>
     </class>
@@ -4372,7 +4371,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="osfamily_name"></attribute>
+            <attribute id="osfamily_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -4561,8 +4560,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="brand_name"></attribute>
-            <attribute id="type"></attribute>
+            <attribute id="brand_name"/>
+            <attribute id="type"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -5425,8 +5424,8 @@
             <attribute id="ip_mask"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="org_name"></attribute>
-            <attribute id="subnet_name"></attribute>
+            <attribute id="org_name"/>
+            <attribute id="subnet_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -5649,7 +5648,7 @@
             <attribute id="vlan_tag"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="org_name"></attribute>
+            <attribute id="org_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -5942,7 +5941,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="ipaddress"></attribute>
+            <attribute id="ipaddress"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -6831,8 +6830,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="owner_name"></attribute>
-            <attribute id="type"></attribute>
+            <attribute id="owner_name"/>
+            <attribute id="type"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php

@@ -28,18 +28,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Relation:impacts/Description'    => 'Prvky ovlivněné objektem',
-	'Relation:impacts/DownStream'     => 'Dopad na',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by~~',
-	'Relation:impacts/UpStream'       => 'Závislost na',
-	'Relation:impacts/UpStream+'      => 'Elements impacting~~',
+	'Relation:impacts/Description' => 'Prvky ovlivněné objektem',
+	'Relation:impacts/DownStream' => 'Dopad na',
+	'Relation:impacts/DownStream+' => 'Elements impacted by~~',
+	'Relation:impacts/UpStream' => 'Závislost na',
+	'Relation:impacts/UpStream+' => 'Elements impacting~~',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Prvky ovlivňující objekt',
-	'Relation:depends on/DownStream'  => 'Závislost na',
-	'Relation:depends on/UpStream'    => 'Dopad na',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Závislost na',
+	'Relation:depends on/UpStream' => 'Dopad na',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php

@@ -21,18 +21,17 @@
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Relation:impacts/Description'    => 'Elementer berørt af ...',
-	'Relation:impacts/DownStream'     => 'Påvrikning ...',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by~~',
-	'Relation:impacts/UpStream'       => 'Afhænger af ...',
-	'Relation:impacts/UpStream+'      => 'Elements impacting~~',
+	'Relation:impacts/Description' => 'Elementer berørt af ...',
+	'Relation:impacts/DownStream' => 'Påvrikning ...',
+	'Relation:impacts/DownStream+' => 'Elements impacted by~~',
+	'Relation:impacts/UpStream' => 'Afhænger af ...',
+	'Relation:impacts/UpStream+' => 'Elements impacting~~',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementer, som afhænger af dette element',
-	'Relation:depends on/DownStream'  => 'Afhænger af ...',
-	'Relation:depends on/UpStream'    => 'Påvirker ...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Afhænger af ...',
+	'Relation:depends on/UpStream' => 'Påvirker ...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php

@@ -23,18 +23,18 @@
 *
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Relation:impacts/Description'    => 'Elemente betroffen von',
-	'Relation:impacts/DownStream'     => 'Auswirkung ...',
-	'Relation:impacts/DownStream+'    => 'Elemente betroffen von',
-	'Relation:impacts/UpStream'       => 'Hängt ab von ...',
-	'Relation:impacts/UpStream+'      => 'Betroffene Elemente',
+	'Relation:impacts/Description' => 'Elemente betroffen von',
+	'Relation:impacts/DownStream' => 'Auswirkung ...',
+	'Relation:impacts/DownStream+' => 'Elemente betroffen von',
+	'Relation:impacts/UpStream' => 'Hängt ab von ...',
+	'Relation:impacts/UpStream+' => 'Betroffene Elemente',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elemente, von denen dieses Element abhängt.',
-	'Relation:depends on/DownStream'  => 'Hängt ab von ...',
-	'Relation:depends on/UpStream'    => 'Wirkt auf ...',
-	'Relation:impacts/LoadData'       => 'Daten laden',
-	'Relation:impacts/FilteredData'   => 'Daten sind über den Tab "Grafische Ansicht" gefiltert',
-	'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte ~~',
+	'Relation:depends on/DownStream' => 'Hängt ab von ...',
+	'Relation:depends on/UpStream' => 'Wirkt auf ...',
+	'Relation:impacts/LoadData' => 'Daten laden',
+	'Relation:impacts/FilteredData' => 'Daten sind über den Tab "Grafische Ansicht" gefiltert',
+	'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte im Tab "Grafische Ansicht"',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php

@@ -27,18 +27,17 @@
 //
 
 Dict::Add('EN US', 'English', 'English', array(
-	'Relation:impacts/Description'    => 'Elements impacted by',
-	'Relation:impacts/DownStream'     => 'Impacts...',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by',
-	'Relation:impacts/UpStream'       => 'Depends on......',
-	'Relation:impacts/UpStream+'      => 'Elements impacting',
+	'Relation:impacts/Description' => 'Elements impacted by',
+	'Relation:impacts/DownStream' => 'Impacts...',
+	'Relation:impacts/DownStream+' => 'Elements impacted by',
+	'Relation:impacts/UpStream' => 'Depends on......',
+	'Relation:impacts/UpStream+' => 'Elements impacting',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elements impacting',
-	'Relation:depends on/DownStream'  => 'Depends on...',
-	'Relation:depends on/UpStream'    => 'Impacts...',
+	'Relation:depends on/DownStream' => 'Depends on...',
+	'Relation:depends on/UpStream' => 'Impacts...',
 	'Relation:impacts/LoadData'       => 'Load data',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data',
-	'Relation:impacts/FilteredData'   => 'Filtered data',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php

@@ -27,18 +27,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Relation:impacts/Description'    => 'Elementos Impactados por',
-	'Relation:impacts/DownStream'     => 'Impacto...',
-	'Relation:impacts/DownStream+'    => 'Elementos Impactados por',
-	'Relation:impacts/UpStream'       => 'Depende de...',
-	'Relation:impacts/UpStream+'      => 'Elementos de los cuales depende',
+	'Relation:impacts/Description' => 'Elementos Impactados por',
+	'Relation:impacts/DownStream' => 'Impacto...',
+	'Relation:impacts/DownStream+' => 'Elementos Impactados por',
+	'Relation:impacts/UpStream' => 'Depende de...',
+	'Relation:impacts/UpStream+' => 'Elementos de los cuales depende',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementos de los cuales depende',
-	'Relation:depends on/DownStream'  => 'Depende de...',
-	'Relation:depends on/UpStream'    => 'Impactos...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Depende de...',
+	'Relation:depends on/UpStream' => 'Impactos...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php

@@ -23,18 +23,17 @@
 // Class: Organization
 //
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Relation:impacts/Description'    => 'Eléments impactés par',
-	'Relation:impacts/DownStream'     => 'Impacte...',
-	'Relation:impacts/DownStream+'    => 'Eléments impactés par',
-	'Relation:impacts/UpStream'       => 'Dépend de...',
-	'Relation:impacts/UpStream+'      => 'Eléments dont dépend',
+	'Relation:impacts/Description' => 'Eléments impactés par',
+	'Relation:impacts/DownStream' => 'Impacte...',
+	'Relation:impacts/DownStream+' => 'Eléments impactés par',
+	'Relation:impacts/UpStream' => 'Dépend de...',
+	'Relation:impacts/UpStream+' => 'Eléments dont dépend',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Eléments dont dépend',
-	'Relation:depends on/DownStream'  => 'Dépend de...',
-	'Relation:depends on/UpStream'    => 'Impacte...',
-	'Relation:impacts/LoadData'       => 'Charger les données',
-	'Relation:impacts/NoFilteredData' => 'Veuillez sélectionner des objets et lancer le chargement des données',
-	'Relation:impacts/FilteredData'   => 'Données filtrées',
+	'Relation:depends on/DownStream' => 'Dépend de...',
+	'Relation:depends on/UpStream' => 'Impacte...',
+	'Relation:impacts/LoadData' => 'Charger les données',
+	'Relation:impacts/NoFilteredData' => 'Veuillez sélectionner des objets dans l\'onglet Graph',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php

@@ -20,18 +20,17 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Relation:impacts/Description'    => 'Konfigurációs elem működését befolyásolják',
-	'Relation:impacts/DownStream'     => 'Hatás',
-	'Relation:impacts/DownStream+'    => 'Konfigurációs elem működését befolyásolják',
-	'Relation:impacts/UpStream'       => 'Függőségek',
-	'Relation:impacts/UpStream+'      => 'Konfigurációs elemtől függnek',
+	'Relation:impacts/Description' => 'Konfigurációs elem működését befolyásolják',
+	'Relation:impacts/DownStream' => 'Hatás',
+	'Relation:impacts/DownStream+' => 'Konfigurációs elem működését befolyásolják',
+	'Relation:impacts/UpStream' => 'Függőségek',
+	'Relation:impacts/UpStream+' => 'Konfigurációs elemtől függnek',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Konfigurációs elemtől függnek',
-	'Relation:depends on/DownStream'  => 'Függőségek',
-	'Relation:depends on/UpStream'    => 'Hatások',
-	'Relation:impacts/LoadData'       => 'Adat betöltés',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Függőségek',
+	'Relation:depends on/UpStream' => 'Hatások',
+	'Relation:impacts/LoadData' => 'Adat betöltés',
+	'Relation:impacts/NoFilteredData' => 'kérjük, válassza ki az objektumokat a grafikus nézetben',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php

@@ -20,18 +20,17 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Relation:impacts/Description'    => 'Elementi impattati da...',
-	'Relation:impacts/DownStream'     => 'Impatto...',
-	'Relation:impacts/DownStream+'    => 'Elementi impattati da...',
-	'Relation:impacts/UpStream'       => 'Dipende da...',
-	'Relation:impacts/UpStream+'      => 'Elementi di questo elemento dipende da',
+	'Relation:impacts/Description' => 'Elementi impattati da...',
+	'Relation:impacts/DownStream' => 'Impatto...',
+	'Relation:impacts/DownStream+' => 'Elementi impattati da...',
+	'Relation:impacts/UpStream' => 'Dipende da...',
+	'Relation:impacts/UpStream+' => 'Elementi di questo elemento dipende da',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementi di questo elemento dipende da',
-	'Relation:depends on/DownStream'  => 'Dipende da...',
-	'Relation:depends on/UpStream'    => 'Impatto...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Dipende da...',
+	'Relation:depends on/UpStream' => 'Impatto...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php

@@ -20,18 +20,17 @@
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Relation:impacts/Description'    => 'インパクトを受ける要素',
-	'Relation:impacts/DownStream'     => 'インパクト...',
-	'Relation:impacts/DownStream+'    => 'インパクトを受ける要素',
-	'Relation:impacts/UpStream'       => '依存...',
-	'Relation:impacts/UpStream+'      => 'この要素が依存している要素',
+	'Relation:impacts/Description' => 'インパクトを受ける要素',
+	'Relation:impacts/DownStream' => 'インパクト...',
+	'Relation:impacts/DownStream+' => 'インパクトを受ける要素',
+	'Relation:impacts/UpStream' => '依存...',
+	'Relation:impacts/UpStream+' => 'この要素が依存している要素',
 	// Legacy entries
 	'Relation:depends on/Description' => 'この要素が依存している要素',
-	'Relation:depends on/DownStream'  => '依存...',
-	'Relation:depends on/UpStream'    => 'インパクト...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => '依存...',
+	'Relation:depends on/UpStream' => 'インパクト...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php

@@ -32,18 +32,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Relation:impacts/Description'    => 'Elementen met impact van',
-	'Relation:impacts/DownStream'     => 'Impact op...',
-	'Relation:impacts/DownStream+'    => 'Elementen geïmpacteerd door',
-	'Relation:impacts/UpStream'       => 'Is afhankelijk van...',
-	'Relation:impacts/UpStream+'      => 'Elementen met impact op',
+	'Relation:impacts/Description' => 'Elementen met impact van',
+	'Relation:impacts/DownStream' => 'Impact op...',
+	'Relation:impacts/DownStream+' => 'Elementen geïmpacteerd door',
+	'Relation:impacts/UpStream' => 'Is afhankelijk van...',
+	'Relation:impacts/UpStream+' => 'Elementen met impact op',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementen afhankelijk van',
-	'Relation:depends on/DownStream'  => 'Is afhankelijk van...',
-	'Relation:depends on/UpStream'    => 'Impact op...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Is afhankelijk van...',
+	'Relation:depends on/UpStream' => 'Impact op...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php

@@ -25,18 +25,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('PL PL', 'Polish', 'Polski', array(
-	'Relation:impacts/Description'    => 'Elementy, na które ma wpływ',
-	'Relation:impacts/DownStream'     => 'Wpływa na...',
-	'Relation:impacts/DownStream+'    => 'Elementy, na które ma wpływ',
-	'Relation:impacts/UpStream'       => 'Zależy od......',
-	'Relation:impacts/UpStream+'      => 'Elementy wpływające',
+	'Relation:impacts/Description' => 'Elementy, na które ma wpływ',
+	'Relation:impacts/DownStream' => 'Wpływa na...',
+	'Relation:impacts/DownStream+' => 'Elementy, na które ma wpływ',
+	'Relation:impacts/UpStream' => 'Zależy od......',
+	'Relation:impacts/UpStream+' => 'Elementy wpływające',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementy wpływające',
-	'Relation:depends on/DownStream'  => 'Zależy od...',
-	'Relation:depends on/UpStream'    => 'Wpływa na...',
-	'Relation:impacts/LoadData'       => 'Załaduj dane',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Zależy od...',
+	'Relation:depends on/UpStream' => 'Wpływa na...',
+	'Relation:impacts/LoadData' => 'Załaduj dane',
+	'Relation:impacts/NoFilteredData' => 'proszę wybrać obiekty w widoku graficznym',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php

@@ -26,18 +26,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Relation:impacts/Description'    => 'Elementos impactados por',
-	'Relation:impacts/DownStream'     => 'Impacto...',
-	'Relation:impacts/DownStream+'    => 'Elementos impactados por',
-	'Relation:impacts/UpStream'       => 'Depende de...',
-	'Relation:impacts/UpStream+'      => 'Elementos estes, que dependem deste elemento',
+	'Relation:impacts/Description' => 'Elementos impactados por',
+	'Relation:impacts/DownStream' => 'Impacto...',
+	'Relation:impacts/DownStream+' => 'Elementos impactados por',
+	'Relation:impacts/UpStream' => 'Depende de...',
+	'Relation:impacts/UpStream+' => 'Elementos estes, que dependem deste elemento',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementos estes, que dependem deste elemento',
-	'Relation:depends on/DownStream'  => 'Depende de...',
-	'Relation:depends on/UpStream'    => 'Impactos...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Depende de...',
+	'Relation:depends on/UpStream' => 'Impactos...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php

@@ -13,18 +13,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Relation:impacts/Description'    => 'Элементы, на которые влияет',
-	'Relation:impacts/DownStream'     => 'Влияет на...',
-	'Relation:impacts/DownStream+'    => 'Элементы, на которые влияет',
-	'Relation:impacts/UpStream'       => 'Зависит от...',
-	'Relation:impacts/UpStream+'      => 'Элементы, от которых зависит',
+	'Relation:impacts/Description' => 'Элементы, на которые влияет',
+	'Relation:impacts/DownStream' => 'Влияет на...',
+	'Relation:impacts/DownStream+' => 'Элементы, на которые влияет',
+	'Relation:impacts/UpStream' => 'Зависит от...',
+	'Relation:impacts/UpStream+' => 'Элементы, от которых зависит',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Элементы, от которых зависит',
-	'Relation:depends on/DownStream'  => 'Зависит от...',
-	'Relation:depends on/UpStream'    => 'Влияет на...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Зависит от...',
+	'Relation:depends on/UpStream' => 'Влияет на...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php

@@ -25,18 +25,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Relation:impacts/Description'    => 'Prvky zasiahnuté',
-	'Relation:impacts/DownStream'     => 'Impacts...~~',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by~~',
-	'Relation:impacts/UpStream'       => 'Depends on......~~',
-	'Relation:impacts/UpStream+'      => 'Elements impacting~~',
+	'Relation:impacts/Description' => 'Prvky zasiahnuté',
+	'Relation:impacts/DownStream' => 'Impacts...~~',
+	'Relation:impacts/DownStream+' => 'Elements impacted by~~',
+	'Relation:impacts/UpStream' => 'Depends on......~~',
+	'Relation:impacts/UpStream+' => 'Elements impacting~~',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Prvky, od ktorých závisí tento prvok',
-	'Relation:depends on/DownStream'  => 'Depends on...~~',
-	'Relation:depends on/UpStream'    => 'Impacts...~~',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Depends on...~~',
+	'Relation:depends on/UpStream' => 'Impacts...~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php

@@ -27,18 +27,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Relation:impacts/Description'    => 'Etkilenen kalemler',
-	'Relation:impacts/DownStream'     => 'Etkiler...',
-	'Relation:impacts/DownStream+'    => 'Etkilenen kalemler',
-	'Relation:impacts/UpStream'       => 'Bağımlı olanlar...',
-	'Relation:impacts/UpStream+'      => 'Bu kaleme bağımlı olan kalemler',
+	'Relation:impacts/Description' => 'Etkilenen kalemler',
+	'Relation:impacts/DownStream' => 'Etkiler...',
+	'Relation:impacts/DownStream+' => 'Etkilenen kalemler',
+	'Relation:impacts/UpStream' => 'Bağımlı olanlar...',
+	'Relation:impacts/UpStream+' => 'Bu kaleme bağımlı olan kalemler',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Bu kaleme bağımlı olan kalemler',
-	'Relation:depends on/DownStream'  => 'Bağımlı olanlar...',
-	'Relation:depends on/UpStream'    => 'Etkiledikleri...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Bağımlı olanlar...',
+	'Relation:depends on/UpStream' => 'Etkiledikleri...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php

@@ -25,18 +25,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Relation:impacts/Description'    => '被影响的元素',
-	'Relation:impacts/DownStream'     => '影响...',
-	'Relation:impacts/DownStream+'    => '被影响的元素',
-	'Relation:impacts/UpStream'       => '依赖于...',
-	'Relation:impacts/UpStream+'      => '此元素依赖的元素...',
+	'Relation:impacts/Description' => '被影响的元素',
+	'Relation:impacts/DownStream' => '影响...',
+	'Relation:impacts/DownStream+' => '被影响的元素',
+	'Relation:impacts/UpStream' => '依赖于...',
+	'Relation:impacts/UpStream+' => '此元素依赖的元素...',
 	// Legacy entries
 	'Relation:depends on/Description' => '此元素依赖的元素...',
-	'Relation:depends on/DownStream'  => '依赖于...',
-	'Relation:depends on/UpStream'    => '影响...',
-	'Relation:impacts/LoadData'       => '加载数据',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => '依赖于...',
+	'Relation:depends on/UpStream' => '影响...',
+	'Relation:impacts/LoadData' => '加载数据',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
 

datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/3.1.1',
+	'itop-config-mgmt/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
       <rank>10</rank>

datamodels/2.x/itop-config/module.itop-config.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/3.1.1',
+	'itop-config/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="iTopUpdate" xsi:type="WebPageMenuNode" _delta="define">
       <rank>60</rank>

datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php

@@ -68,47 +68,47 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Fájlrendszer ellenőrzése sikertelen',
 	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Az alkalmazás frissíthető',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Az alkalmazás nem frissíthető: %1$s',
-	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Figyelem: alkalmazás frissítés sikertelen lehet: %1$s',
-	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>SNéhány módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse a <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
-	'iTopUpdate:UI:CheckInProgress' => 'Kérjük, várjon az integritás ellenőrzés alatt',
-	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
-	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
+	'iTopUpdate:UI:CanCoreUpdate:Warning'          => 'Figyelem: alkalmazás frissítés sikertelen lehet: %1$s',
+	'iTopUpdate:UI:CannotUpdateUseSetup'           => '<b>SNéhány módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse a <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
+	'iTopUpdate:UI:CheckInProgress'                => 'Kérjük, várjon az integritás ellenőrzés alatt',
+	'iTopUpdate:UI:SetupLaunch'                    => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm'             => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-	'iTopUpdate:UI:SetupMessage:Ready' => 'Készen állunk',
-	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Karbantartási módba lépés',
-	'iTopUpdate:UI:SetupMessage:Backup' => 'Adatbázis biztonsági mentése',
-	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Alkalmazás fájlok archiválása',
-	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Új fájlverziók másolása',
-	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Alkalmazásfrissítés ellenőrzése',
-	'iTopUpdate:UI:SetupMessage:Compile' => 'Az alkalmazás és az adatbázis frissítése',
-	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Adatbázis frissítés',
-	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Kilépés a karbantartási módból',
-	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'A frissítés befejeződött',
+	'iTopUpdate:UI:SetupMessage:Ready'             => 'Készen állunk',
+	'iTopUpdate:UI:SetupMessage:EnterMaintenance'  => 'Karbantartási módba lépés',
+	'iTopUpdate:UI:SetupMessage:Backup'            => 'Adatbázis biztonsági mentése',
+	'iTopUpdate:UI:SetupMessage:FilesArchive'      => 'Alkalmazás fájlok archiválása',
+	'iTopUpdate:UI:SetupMessage:CopyFiles'         => 'Új fájlverziók másolása',
+	'iTopUpdate:UI:SetupMessage:CheckCompile'      => 'Alkalmazásfrissítés ellenőrzése',
+	'iTopUpdate:UI:SetupMessage:Compile'           => 'Az alkalmazás és az adatbázis frissítése',
+	'iTopUpdate:UI:SetupMessage:UpdateDatabase'    => 'Adatbázis frissítés',
+	'iTopUpdate:UI:SetupMessage:ExitMaintenance'   => 'Kilépés a karbantartási módból',
+	'iTopUpdate:UI:SetupMessage:UpdateDone'        => 'A frissítés befejeződött',
 
 	// Errors
-	'iTopUpdate:Error:MissingFunction' => 'Lehetetlen elindítani a frissítést, hiányzó funkció',
-	'iTopUpdate:Error:MissingFile' => 'Hiányzó fájl: %1$s',
-	'iTopUpdate:Error:CorruptedFile' => 'A %1$s fájl sérült',
-	'iTopUpdate:Error:BadFileFormat' => 'A frissítési fájl nem zip fájl',
-	'iTopUpdate:Error:BadFileContent' => 'A frissítési fájl nem alkalmazás archívum',
-	'iTopUpdate:Error:BadItopProduct' => 'A frissítési fájl nem kompatibilis az alkalmazással',
-	'iTopUpdate:Error:Copy' => 'Hiba: \'%1$s\' nem másolható \'%2$s\' -ba',
-	'iTopUpdate:Error:FileNotFound' => 'Nincs meg a fájl',
-	'iTopUpdate:Error:NoFile' => 'Nincs fájl megadva',
-	'iTopUpdate:Error:InvalidToken' => 'Érvénytelen token',
-	'iTopUpdate:Error:UpdateFailed' => 'Frissítés sikertelen',
-	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'A feltöltés maximális mérete túl kicsinek tűnik a frissítéshez. Kérjük, módosítsa a PHP konfigurációt.',
-	'iTopUpdate:UI:RestoreArchive' => 'Visszaállíthatja az alkalmazást a \'%1$s\' archívumból',
-	'iTopUpdate:UI:RestoreBackup' => 'Visszaállíthatja az adatbázist a \'%1$s\' archívumból',
-	'iTopUpdate:UI:UpdateDone' => 'Frissítés sikeres',
-	'Menu:iTopUpdate' => 'Alkalmazás frissítés',
-	'Menu:iTopUpdate+' => 'Alkalmazás frissítés',
+	'iTopUpdate:Error:MissingFunction'             => 'Lehetetlen elindítani a frissítést, hiányzó funkció',
+	'iTopUpdate:Error:MissingFile'                 => 'Hiányzó fájl: %1$s',
+	'iTopUpdate:Error:CorruptedFile'               => 'A %1$s fájl sérült',
+	'iTopUpdate:Error:BadFileFormat'               => 'A frissítési fájl nem zip fájl',
+	'iTopUpdate:Error:BadFileContent'              => 'A frissítési fájl nem alkalmazás archívum',
+	'iTopUpdate:Error:BadItopProduct'              => 'A frissítési fájl nem kompatibilis az alkalmazással',
+	'iTopUpdate:Error:Copy'                        => 'Hiba: \'%1$s\' nem másolható \'%2$s\' -ba',
+	'iTopUpdate:Error:FileNotFound'                => 'Nincs meg a fájl',
+	'iTopUpdate:Error:NoFile'                      => 'Nincs fájl megadva',
+	'iTopUpdate:Error:InvalidToken'                => 'Érvénytelen token',
+	'iTopUpdate:Error:UpdateFailed'                => 'Frissítés sikertelen',
+	'iTopUpdate:Error:FileUploadMaxSizeTooSmall'   => 'A feltöltés maximális mérete túl kicsinek tűnik a frissítéshez. Kérjük, módosítsa a PHP konfigurációt.',
+	'iTopUpdate:UI:RestoreArchive'                 => 'Visszaállíthatja az alkalmazást a \'%1$s\' archívumból',
+	'iTopUpdate:UI:RestoreBackup'                  => 'Visszaállíthatja az adatbázist a \'%1$s\' archívumból',
+	'iTopUpdate:UI:UpdateDone'                     => 'Frissítés sikeres',
+	'Menu:iTopUpdate'                              => 'Alkalmazás frissítés',
+	'Menu:iTopUpdate+'                             => 'Alkalmazás frissítés',
 
-    // Missing itop entries
+	// Missing itop entries
 	'Class:ModuleInstallation/Attribute:installed' => 'Telepítve ',
-	'Class:ModuleInstallation/Attribute:name' => 'Név',
-	'Class:ModuleInstallation/Attribute:version' => 'Verzió',
+	'Class:ModuleInstallation/Attribute:name'      => 'Név',
+	'Class:ModuleInstallation/Attribute:version'   => 'Verzió',
 	'Class:ModuleInstallation/Attribute:comment' => 'Megjegyzés',
 ));
 

datamodels/2.x/itop-core-update/module.itop-core-update.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-core-update/3.1.1',
+	'itop-core-update/3.2.0',
 	[
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Rack" _delta="define">
       <parent>PhysicalDevice</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -213,7 +213,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
             <attribute id="rack_name"/>
           </complementary_attributes>
@@ -419,7 +419,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -585,7 +585,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -754,7 +754,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
             <attribute id="rack_name"/>
             <attribute id="powerstart_name"/>

datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php

@@ -18,7 +18,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-datacenter-mgmt/3.1.1',
+	'itop-datacenter-mgmt/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="TelephonyCI" _delta="define">
       <parent>PhysicalDevice</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -173,7 +173,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -343,7 +343,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -533,7 +533,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -703,7 +703,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -869,8 +869,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1139,8 +1139,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1339,8 +1339,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>

datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php

@@ -25,7 +25,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/3.1.1',
+	'itop-endusers-devices/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="FAQ" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-faq-light/module.itop-faq-light.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-faq-light/3.1.1',
+	'itop-faq-light/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
 </itop_design>

datamodels/2.x/itop-files-information/module.itop-files-information.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-files-information/3.1.1',
+	'itop-files-information/3.2.0',
 	array(
 		// Identification
 		//

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Ticket">
       <methods>

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/3.1.1',
+	'itop-full-itil/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants>
   </constants>
   <classes>