N°7001 - Being admin to generate oAuth token is too restrictive

.doc/itop-version-history.md

@@ -62,14 +62,6 @@ gitGraph
     commit id: "2022-12-28" tag: "2.7.8"
     checkout support/3.0
     commit id: "2023-04-12" tag: "3.0.3"
-    checkout develop
-    commit id: "2023-06-19" tag: "3.1.0-beta" type: REVERSE
-    commit id: "2023-07-26" tag: "3.1.0-1" type: HIGHLIGHT
-    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).
+To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.gitignore

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

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 ! (note that if you are working with an org fork, this option [won't be available](https://github.com/orgs/community/discussions/5634))
+* 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 !
 
 
 ## 🙏 We are thankful
@@ -161,4 +161,4 @@ We have one sticker per contribution type. You might get multiple stickers with
 
 Here is the design of each stickers for year 2022:
 
-![iTop stickers 2023](.doc/contributing-guide/2023.contributing-stickers-side-by-side.png)
+![iTop stickers 2022](.doc/contributing-guide/2022.contributing-stickers-side-by-side.png)

README.md

@@ -90,7 +90,6 @@ 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
@@ -108,7 +107,6 @@ 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

@@ -502,7 +502,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	}
 
 	protected $m_aUserOrgs = array(); // userid -> array of orgid
-	protected $m_aAdministrators = null; // [user id]
 
 	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
 	protected $m_aObjectActionGrants = array();
@@ -559,7 +558,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 		// Cache
 		$this->m_aObjectActionGrants = array();
-		$this->m_aAdministrators = null;
 	}
 
 	public function LoadCache()
@@ -702,10 +700,12 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	private function GetAdministrators()
 	{
-		if ($this->m_aAdministrators === null)
+		static $aAdministrators = null;
+
+		if ($aAdministrators === null)
 		{
 			// Find all administrators
-			$this->m_aAdministrators = array();
+			$aAdministrators = array();
 			$oAdministratorsFilter = new DBObjectSearch('User');
 			$oLnkFilter = new DBObjectSearch('URP_UserProfile');
 			$oExpression = new FieldExpression('profileid', 'URP_UserProfile');
@@ -718,10 +718,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oSet->OptimizeColumnLoad(array('User' => array('login')));
 			while($oUser = $oSet->Fetch())
 			{
-				$this->m_aAdministrators[] = $oUser->GetKey();
+				$aAdministrators[] = $oUser->GetKey();
 			}
 		}
-		return $this->m_aAdministrators;
+		return $aAdministrators;
 	}
 
 	/**

application/ajaxwebpage.class.inc.php

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

application/applicationextension.inc.php

@@ -2246,27 +2246,3 @@ interface iModuleExtension
 	 */
 	public function __construct();
 }
-
-/**
- * KPI logging extensibility point
- *
- * KPI Logger extension
- */
-interface iKPILoggerExtension
-{
-    /**
-     * Init the statistics collected
-     *
-     * @return void
-     */
-    public function InitStats();
-
-    /**
-     * Add a new KPI to the stats
-     *
-     * @param \Combodo\iTop\Core\Kpi\KpiLogData $oKpiLogData
-     *
-     * @return mixed
-     */
-    public function LogOperation($oKpiLogData);
-}

application/audit.category.class.inc.php

@@ -34,15 +34,15 @@ class AuditCategory extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"            => "application,grant_by_profile",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "name",
-			"state_attcode"       => "",
-			"reconc_keys"         => array('name'),
-			"db_table"            => "priv_auditcategory",
-			"db_key_field"        => "id",
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_auditcategory",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			'style'               => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit-folder.svg'),
+			'style' => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit-folder.svg'),
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));

application/audit.domain.class.inc.php

@@ -35,7 +35,7 @@ class AuditDomain extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"                   => "application,grant_by_profile",
+			"category"                   => "application, grant_by_profile",
 			"key_type"                   => "autoincrement",
 			"name_attcode"               => "name",
 			"complementary_name_attcode" => array('description'),

application/audit.rule.class.inc.php

@@ -35,7 +35,7 @@ class AuditRule extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"            => "application,grant_by_profile",
+			"category"            => "application, grant_by_profile",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "name",
 			"state_attcode"       => "",

application/capturewebpage.class.inc.php

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

application/clipage.class.inc.php

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

application/cmdbabstract.class.inc.php

@@ -744,11 +744,7 @@ HTML
 			$oPage->SetCurrentTab($sTabCode, $oAttDef->GetLabel().$sCount, $sTabDescription);
 
 			$aArgs = array('this' => $this);
-			
-			$sEditWhen = $oAttDef->GetEditWhen();
-			$bIsEditableBasedOnEditWhen = ($sEditWhen === LINKSET_EDITWHEN_ALWAYS || $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION);
-
-			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)) || !$bIsEditableBasedOnEditWhen;
+			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
 			if ($bEditMode && (!$bReadOnly)) {
 				$sInputId = $this->m_iFormId.'_'.$sAttCode;
 				$sDisplayValue = ''; // not used
@@ -1170,7 +1166,7 @@ HTML
 	/**
 	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
-	 * @param array $aExtraParams See possible values in {@see DataTableUIBlockFactory::RenderDataTable()}
+	 * @param array $aExtraParams
 	 *
 	 * @throws \ApplicationException
 	 * @throws \CoreException
@@ -4551,9 +4547,7 @@ HTML;
 		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
 			$sExtensionClass = get_class($oExtensionInstance);
 			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBInsert()");
-			$oKPI = new ExecutionKPI();
 			$oExtensionInstance->OnDBInsert($this, self::GetCurrentChange());
-			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
 		}
 	}
 
@@ -4568,16 +4562,13 @@ HTML;
 
 	protected function DBCloneTracked_Internal($newKey = null)
 	{
-        /** @var cmdbAbstractObject $oNewObj */
-        $oNewObj = MetaModel::GetObject(get_class($this), parent::DBCloneTracked_Internal($newKey));
+		$oNewObj = parent::DBCloneTracked_Internal($newKey);
 
 		// Invoke extensions after insertion (the object must exist, have an id, etc.)
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-            $oKPI = new ExecutionKPI();
 			$oExtensionInstance->OnDBInsert($oNewObj, self::GetCurrentChange());
-            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
 		}
 
 		return $oNewObj;
@@ -4614,9 +4605,7 @@ HTML;
 		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
 			$sExtensionClass = get_class($oExtensionInstance);
 			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBUpdate()");
-			$oKPI = new ExecutionKPI();
 			$oExtensionInstance->OnDBUpdate($this, self::GetCurrentChange());
-			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBUpdate');
 		}
 	}
 
@@ -4660,9 +4649,7 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-            $oKPI = new ExecutionKPI();
 			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
-            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
 		}
 
 		return parent::DBDeleteTracked_Internal($oDeletionPlan);
@@ -4681,10 +4668,7 @@ HTML;
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
 			$sExtensionClass = get_class($oExtensionInstance);
-			$oKPI = new ExecutionKPI();
-			$bIsModified = $oExtensionInstance->OnIsModified($this);
-			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnIsModified');
-			if ($bIsModified) {
+			if ($oExtensionInstance->OnIsModified($this)) {
 				$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified() -> true");
 				return true;
 			} else {
@@ -4740,9 +4724,7 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-            $oKPI = new ExecutionKPI();
 			$aNewIssues = $oExtensionInstance->OnCheckToWrite($this);
-            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToWrite');
 			if (is_array($aNewIssues) && (count($aNewIssues) > 0)) // Some extensions return null instead of an empty array
 			{
 				$this->m_aCheckIssues = array_merge($this->m_aCheckIssues, $aNewIssues);
@@ -4790,9 +4772,7 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-            $oKPI = new ExecutionKPI();
 			$aNewIssues = $oExtensionInstance->OnCheckToDelete($this);
-            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToDelete');
 			if (is_array($aNewIssues) && count($aNewIssues) > 0)
 			{
 				$this->m_aDeleteIssues = array_merge($this->m_aDeleteIssues, $aNewIssues);

application/csvpage.class.inc.php

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

application/dashboard.class.inc.php

@@ -918,11 +918,6 @@ class RuntimeDashboard extends Dashboard
 	{
 		$bCustomized = false;
 
-		$sDashboardFileSanitized = utils::RealPath(APPROOT.$sDashboardFile, APPROOT);
-		if (false === $sDashboardFileSanitized) {
-			throw new SecurityException('Invalid dashboard file !');
-		}
-
 		// Search for an eventual user defined dashboard
 		$oUDSearch = new DBObjectSearch('UserDashboard');
 		$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
@@ -934,7 +929,7 @@ class RuntimeDashboard extends Dashboard
 			$sDashboardDefinition = $oUserDashboard->Get('contents');
 			$bCustomized = true;
 		} else {
-			$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
+			$sDashboardDefinition = @file_get_contents($sDashboardFile);
 		}
 
 
@@ -942,7 +937,7 @@ class RuntimeDashboard extends Dashboard
 			$oDashboard = new RuntimeDashboard($sDashBoardId);
 			$oDashboard->FromXml($sDashboardDefinition);
 			$oDashboard->SetCustomFlag($bCustomized);
-			$oDashboard->SetDefinitionFile($sDashboardFileSanitized);
+			$oDashboard->SetDefinitionFile($sDashboardFile);
 		} else {
 			$oDashboard = null;
 		}
@@ -1141,7 +1136,7 @@ JS
 		$oToolbar->AddSubBlock($oActionButton);
 
 		$aActions = array();
-		$sFile = addslashes(utils::LocalPath($this->sDefinitionFile));
+		$sFile = addslashes($this->sDefinitionFile);
 		$sJSExtraParams = json_encode($aExtraParams);
 		if ($this->HasCustomDashboard()) {
 			$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:EditCustom'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
@@ -1264,12 +1259,12 @@ EOF
 		$sOkButtonLabel = Dict::S('UI:Button:Save');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		
-		$sId = utils::HtmlEntities($this->sId);
-		$sLayoutClass = utils::HtmlEntities($this->sLayoutClass);
+		$sId = addslashes($this->sId);
+		$sLayoutClass = addslashes($this->sLayoutClass);
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
-		$sTitle = utils::HtmlEntities($this->sTitle);
-		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
+		$sTitle = addslashes($this->sTitle);
+		$sFile = addslashes($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
 		$sReloadURL = $this->GetReloadURL();
 

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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -514,18 +514,10 @@
           <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/displayblock.class.inc.php

@@ -1246,10 +1246,6 @@ JS
 		} else {
 			$oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, null, null, $aRefreshParams);
 		}
-		$sClassDescription = MetaModel::GetClassDescription($sClass);
-		if (utils::IsNotNullOrEmptyString($sClassDescription)) {
-			$oBlock->SetClassDescription($sClassDescription);
-		}
 
 		return $oBlock;
 	}
@@ -2042,7 +2038,7 @@ class MenuBlock extends DisplayBlock
 			}
 
 			//----------------------------------------------------
-			// Any style but NOT \DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT (linksets) actions
+			// Any style but NOT "listInObject" (linksets) actions
 			//----------------------------------------------------
 			if ($this->m_sStyle !== static::ENUM_STYLE_LIST_IN_OBJECT) {
 				switch ($iSetCount) {

application/errorpage.class.inc.php

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

application/itopwebpage.class.inc.php

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

application/itopwizardwebpage.class.inc.php

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

application/nicewebpage.class.inc.php

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

application/pdfpage.class.inc.php

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

application/query.class.inc.php

@@ -296,7 +296,7 @@ class QueryOQL extends Query
 			}
 			catch
 			(OQLException $e) {
-				$oAlert = AlertUIBlockFactory::MakeForFailure(Dict::S('UI:RunQuery:Error'), $e->getHtmlDesc())
+				$oAlert = AlertUIBlockFactory::MakeForFailure(Dict::Format('UI:RunQuery:Error'), $e->getHtmlDesc())
 					->SetIsClosable(false)
 					->SetIsCollapsible(false);
 				$oAlert->AddCSSClass('mb-5');

application/startup.inc.php

@@ -99,10 +99,4 @@ else
 	Session::Set('itop_env', ITOP_DEFAULT_ENV);
 }
 $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
-try {
-    MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);
-}
-catch (MySQLException $e) {
-    IssueLog::Debug($e->getMessage());
-    throw new MySQLException('Could not connect to the DB server', []);
-}
+MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);

application/ui.extkeywidget.class.inc.php

@@ -163,7 +163,7 @@ class UIExtKeyWidget
 		$oPage->add_linked_script('../js/extkeywidget.js');
 		$oPage->add_linked_script('../js/forms-json-utils.js');
 
-		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_MODIFY) && $bAllowTargetCreation);
+		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
 		$bExtensions = true;
 		$sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
 		$sAttrFieldPrefix = ($this->bSearchMode) ? '' : 'attr_';
@@ -975,10 +975,6 @@ HTML
 		// Remove blob edition from creation form @see N°5863 to allow blob edition in modal context
 		FormHelper::DisableAttributeBlobInputs($this->sTargetClass, $aFormExtraParams);
 
-		if(FormHelper::HasMandatoryAttributeBlobInputs($oNewObj)){
-			$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal());
-		}
-		
 		cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), $aFormExtraParams);
 		$oPage->add(<<<HTML
 	</div>

application/ui.linksdirectwidget.class.inc.php

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

application/ui.linkswidget.class.inc.php

@@ -178,18 +178,17 @@ class UILinksWidget
 
 		$oDisplayBlock = new DisplayBlock($oFilter, 'search', false);
 		$oBlock->AddSubBlock($oDisplayBlock->GetDisplay($oPage, "SearchFormToAdd_{$sLinkedSetId}",
-			[
-				'menu'                       => false,
+			array(
+				'menu' => false,
 				'result_list_outer_selector' => "SearchResultsToAdd_{$sLinkedSetId}",
-				'table_id'                   => "add_{$sLinkedSetId}",
-				'table_inner_id'             => "ResultsToAdd_{$sLinkedSetId}",
-				'selection_mode'             => true,
-				'json'                       => $sJson,
-				'cssCount'                   => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
-				'query_params'               => $oFilter->GetInternalParams(),
-				'hidden_criteria'            => $sAlreadyLinkedExpression,
-				'submit_on_load'             => false,
-			]));
+				'table_id' => "add_{$sLinkedSetId}",
+				'table_inner_id' => "ResultsToAdd_{$sLinkedSetId}",
+				'selection_mode' => true,
+				'json' => $sJson,
+				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
+				'query_params' => $oFilter->GetInternalParams(),
+				'hidden_criteria' => $sAlreadyLinkedExpression,
+			)));
 
 		$oBlock->AddForm();
 	}

application/utils.inc.php

@@ -20,7 +20,6 @@
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
-use Combodo\iTop\Service\Module\ModuleService;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\OutputStyle;
 use ScssPhp\ScssPhp\ValueConverter;
@@ -52,31 +51,22 @@ class utils
 {
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_INTEGER = 'integer';
 	/**
-	 * Datamodel class
 	 * @var string
-	 * @since 2.7.10 3.0.0
-	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6606 update PHPDoc
-	 * @uses MetaModel::IsValidClass()
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_CLASS = 'class';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6606
-	 * @uses class_exists()
-	 */
-	public const ENUM_SANITIZATION_FILTER_PHP_CLASS = 'php_class';
-	/**
-	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_STRING = 'string';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_CONTEXT_PARAM = 'context_param';
 	/**
@@ -91,22 +81,22 @@ class utils
 	public const ENUM_SANITIZATION_FILTER_OPERATION = 'operation';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_PARAMETER = 'parameter';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_FIELD_NAME = 'field_name';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_TRANSACTION_ID = 'transaction_id';
 	/**
 	 * @var string For XML / HTML node identifiers
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER = 'element_identifier';
 	/**
@@ -116,13 +106,12 @@ class utils
 	public const ENUM_SANITIZATION_FILTER_VARIABLE_NAME = 'variable_name';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_RAW_DATA = 'raw_data';
 	/**
 	 * @var string
-	 * @since 3.0.2 3.1.0 N°4899
-	 * @since 2.7.10 N°6606
+	 * @since 3.0.2, 3.1.0 N°4899
 	 */
 	public const ENUM_SANITIZATION_FILTER_URL = 'url';
 
@@ -165,8 +154,6 @@ class utils
 
 	private static $iNextId = 0;
 
-	private static $m_sAppRootUrl = null;
-
 	protected static function LoadParamFile($sParamFile)
 	{
 		if (!file_exists($sParamFile)) {
@@ -408,10 +395,6 @@ class utils
 	 * @since 2.7.0 new 'element_identifier' filter
 	 * @since 3.0.0 new utils::ENUM_SANITIZATION_* const
 	 * @since 2.7.7, 3.0.2, 3.1.0 N°4899 - new 'url' filter
-	 * @since 2.7.10 N°6606 use the utils::ENUM_SANITIZATION_* const
-	 * @since 2.7.10 N°6606 new case for ENUM_SANITIZATION_FILTER_PHP_CLASS
-	 *
-	 * @link https://www.php.net/manual/en/filter.filters.sanitize.php PHP sanitization filters
 	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
@@ -432,13 +415,6 @@ class utils
 				$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
 				break;
 
-			case static::ENUM_SANITIZATION_FILTER_PHP_CLASS:
-				$retValue = $value;
-				if (!class_exists($value)) {
-					$retValue = false;
-				}
-				break;
-
 			case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
 			case static::ENUM_SANITIZATION_FILTER_ROUTE:
 			case static::ENUM_SANITIZATION_FILTER_OPERATION:
@@ -504,7 +480,6 @@ class utils
 
 			// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
-                // N°6350 - returns only valid URLs
 				$retValue = filter_var($value, FILTER_VALIDATE_URL);
 				break;
 
@@ -1048,7 +1023,7 @@ class utils
      */
 	public static function GetAbsoluteUrlAppRoot($bForceTrustProxy = false)
 	{
-		$sUrl = static::$m_sAppRootUrl;
+		static $sUrl = null;
 		if ($sUrl === null || $bForceTrustProxy)
 		{
 			$sUrl = self::GetConfig()->Get('app_root_url');
@@ -1069,9 +1044,8 @@ class utils
 				}
 				$sUrl = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, $sUrl);
 			}
-			static::$m_sAppRootUrl = $sUrl;
 		}
-		return static::$m_sAppRootUrl;
+		return $sUrl;
 	}
 
 	/**
@@ -1422,23 +1396,13 @@ class utils
 		return APPROOT . 'env-' . MetaModel::GetEnvironment() . '/';
 	}
 
-	/**
-	 * @return string A path to the folder into which data can be written
-	 * @internal
-	 * @since N°6097 2.7.10 3.0.4 3.1.1
-	 */
-	public static function GetDataPath(): string
-	{
-		return APPROOT.'data/';
-	}
-
 	/**
 	 * @return string A path to a folder into which any module can store cache data
 	 * The corresponding folder is created or cleaned upon code compilation
 	 */
 	public static function GetCachePath()
 	{
-		return static::GetDataPath().'cache-'.MetaModel::GetEnvironment().'/';
+		return APPROOT.'data/cache-'.MetaModel::GetEnvironment().'/';
 	}
 
 	/**
@@ -2301,7 +2265,24 @@ SQL;
 	 */
 	public static function GetCurrentModuleName($iCallDepth = 0)
 	{
-        return ModuleService::GetInstance()->GetCurrentModuleName($iCallDepth + 1);
+		$sCurrentModuleName = '';
+		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
+		
+		foreach(GetModulesInfo() as $sModuleName => $aInfo)
+		{
+			if ($aInfo['root_dir'] !== '')
+			{
+				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
+				
+				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
+				{
+					$sCurrentModuleName = $sModuleName;
+					break;
+				}
+			}
+		}
+		return $sCurrentModuleName;
 	}
 	
 	/**
@@ -2323,7 +2304,24 @@ SQL;
 	 */
 	public static function GetCurrentModuleDir($iCallDepth)
 	{
-		return ModuleService::GetInstance()->GetCurrentModuleDir($iCallDepth);
+		$sCurrentModuleDir = '';
+		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
+	
+		foreach(GetModulesInfo() as $sModuleName => $aInfo)
+		{
+			if ($aInfo['root_dir'] !== '')
+			{
+				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
+	
+				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
+				{
+					$sCurrentModuleDir = basename($sRootDir);
+					break;
+				}
+			}
+		}
+		return $sCurrentModuleDir;
 	}
 
 	/**
@@ -2338,7 +2336,12 @@ SQL;
 	 */
 	public static function GetCurrentModuleUrl()
 	{
-		return ModuleService::GetInstance()->GetCurrentModuleUrl(1);
+		$sDir = static::GetCurrentModuleDir(1);
+		if ( $sDir !== '')
+		{
+			return static::GetAbsoluteUrlModulesRoot().'/'.$sDir;
+		}
+		return '';
 	}
 	
 	/**
@@ -2348,7 +2351,8 @@ SQL;
 	 */
 	public static function GetCurrentModuleSetting($sProperty, $defaultvalue = null)
 	{
-        return ModuleService::GetInstance()->GetCurrentModuleSetting($sProperty, $defaultvalue);
+		$sModuleName = static::GetCurrentModuleName(1);
+		return MetaModel::GetModuleSetting($sModuleName, $sProperty, $defaultvalue);
 	}
 	
 	/**
@@ -2357,7 +2361,12 @@ SQL;
 	 */
 	public static function GetCompiledModuleVersion($sModuleName)
 	{
-        return ModuleService::GetInstance()->GetCompiledModuleVersion($sModuleName);
+		$aModulesInfo = GetModulesInfo();
+		if (array_key_exists($sModuleName, $aModulesInfo))
+		{
+			return $aModulesInfo[$sModuleName]['version'];
+		}
+		return null;
 	}
 	
 	/**
@@ -2682,26 +2691,24 @@ SQL;
 	}
 
 	/**
-	 * Returns the local path relative to the iTop installation (APPROOT or the given base path)
+	 * Returns the local path relative to the iTop installation of an existing file
 	 * Dir separator is changed to '/' for consistency among the different OS
 	 *
 	 * @param string $sAbsolutePath absolute path
-	 * @param string $sBasePath Base path for the resulting local path (default APPROOT)
 	 *
-	 * @return false|string The generated local path or false if absolute path is not under the base path
-	 * @since 3.1.1 Added base path defaulted to previous version APPROOT
+	 * @return false|string
 	 */
-	final public static function LocalPath($sAbsolutePath, string $sBasePath = APPROOT)
+	final public static function LocalPath($sAbsolutePath)
 	{
-		$sRootPath = realpath($sBasePath);
+		$sRootPath = realpath(APPROOT);
 		$sFullPath = realpath($sAbsolutePath);
 		if (($sFullPath === false) || !self::StartsWith($sFullPath, $sRootPath))
 		{
 			return false;
 		}
 		$sLocalPath = substr($sFullPath, strlen($sRootPath.DIRECTORY_SEPARATOR));
-
-		return str_replace(DIRECTORY_SEPARATOR, '/', $sLocalPath);
+		$sLocalPath = str_replace(DIRECTORY_SEPARATOR, '/', $sLocalPath);
+		return $sLocalPath;
 	}
 
 	/**
@@ -2893,7 +2900,7 @@ HTML;
 
 			// Add already loaded classes
 			$aCurrentClasses = array_fill_keys(get_declared_classes(), '');
-			$aClassMap = array_merge($aCurrentClasses, $aClassMap);
+			$aClassMap = array_merge($aClassMap, $aCurrentClasses);
 
 			foreach ($aClassMap as $sPHPClass => $sPHPFile) {
 				$bSkipped = false;
@@ -2918,12 +2925,11 @@ HTML;
 						$bSkipped = true; // file not found
 					}
 				}
-
+				
 				if(!$bSkipped){
 					try {
 						$oRefClass = new ReflectionClass($sPHPClass);
-						if ($oRefClass->implementsInterface($sInterface) &&
-							!$oRefClass->isInterface() && !$oRefClass->isAbstract() && !$oRefClass->isTrait()) {
+						if ($oRefClass->implementsInterface($sInterface) && $oRefClass->isInstantiable()) {
 							$aMatchingClasses[] = $sPHPClass;
 						}
 					} catch (Exception $e) {

application/webpage.class.inc.php

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

application/wizardhelper.class.inc.php

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

application/xmlpage.class.inc.php

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

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.2');
+define('ITOP_DESIGN_LATEST_VERSION', '3.1');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.2');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.2.0');
+define('ITOP_CORE_VERSION', '3.1.0');
 
 /**
  * @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']

bootstrap.inc.php

@@ -45,7 +45,6 @@ define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
 define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
 
 $fItopStarted = microtime(true);
-$iItopInitialMemory = memory_get_usage(true);
 
 if (!isset($GLOBALS['bBypassAutoload']) || $GLOBALS['bBypassAutoload'] == false) {
 	require_once APPROOT.'/lib/autoload.php';

core/MyHelpers.class.inc.php

@@ -419,7 +419,6 @@ class MyHelpers
 		//}
 		return $sOutput;
 	}
-
 }
 
 /**
@@ -524,3 +523,5 @@ class Str
 		return (strtolower($sString) == $sString);
 	}
 }
+
+?>

core/action.class.inc.php

@@ -650,9 +650,6 @@ class ActionEmail extends ActionNotification
 			$aMessageContent['subject'] = 'TEST['.$aMessageContent['subject'].']';
 			$aMessageContent['body'] = $sTestBody;
 			$aMessageContent['to'] = $this->Get('test_recipient');
-			// N°6677 Ensure emails in test are never sent to cc'd and bcc'd addresses
-			$aMessageContent['cc'] = '';
-			$aMessageContent['bcc'] = '';
 		}
 		// Note: N°4849 We pass the "References" identifier instead of the "Message-ID" on purpose as we want notifications emails to group around the triggering iTop object, not just the users' replies to the notification
 		$aMessageContent['in_reply_to'] = $aMessageContent['references'];

core/attributedef.class.inc.php

@@ -91,12 +91,6 @@ define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
 define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
 define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
 
-define('LINKSET_EDITWHEN_NEVER', 0); // The linkset cannot be edited at all from inside this object
-define('LINKSET_EDITWHEN_ON_HOST_EDITION', 1); // The only possible action is to open a new window to create a new object
-define('LINKSET_EDITWHEN_ON_HOST_DISPLAY', 2); // Show the usual 'Actions' popup menu
-define('LINKSET_EDITWHEN_ALWAYS', 3); // Show the usual 'Actions' popup menu
-
-
 define('LINKSET_DISPLAY_STYLE_PROPERTY', 'property');
 define('LINKSET_DISPLAY_STYLE_TAB', 'tab');
 
@@ -797,7 +791,7 @@ abstract class AttributeDefinition
 	public function HasAValue($proposedValue): bool
 	{
 		// Default implementation, we don't really know what type $proposedValue will be
-		return !(is_null($proposedValue));
+		return is_null($proposedValue);
 	}
 
 	/**
@@ -1709,15 +1703,6 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
-	}	
-	
-	/**
-	 * @return int see LINKSET_EDITWHEN_* constants
-	 * @since 3.1.1 3.2.0 N°6385
-	 */
-	public function GetEditWhen(): int
-	{
-		return $this->GetOptional('edit_when', LINKSET_EDITWHEN_ALWAYS);
 	}
 
 	/**
@@ -13211,10 +13196,8 @@ 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)) {
-					$oCurrentValue = $oHostObject->Get($this->GetCode());
-					if(is_object($oCurrentValue)){
-						$aRequestTemplateValues = array_merge($oCurrentValue->GetValues(), $aRequestTemplateValues);
-					}
+					$aRequestTemplateValues['current_template_id'] = $aRequestTemplateValues['template_id'];
+					$aRequestTemplateValues['current_template_data'] = $aRequestTemplateValues['template_data'];
 					$proposedValue = new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aRequestTemplateValues);
 				}
 			}

core/bulkexport.class.inc.php

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

core/cmdbsource.class.inc.php

@@ -431,7 +431,6 @@ class CMDBSource
 		{
 			self::$m_sDBName = '';
 		}
-		self::_TablesInfoCacheReset(); // reset the table info cache!
 	}
 
 	public static function CreateTable($sQuery)
@@ -608,9 +607,8 @@ class CMDBSource
 		{
 			self::LogDeadLock($e, true);
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
-		} finally {
-            $oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-        }
+		}
+		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
 		if ($oResult === false) {
 			$aContext = array('query' => $sSql);
 
@@ -628,24 +626,18 @@ class CMDBSource
 	}
 
 	/**
-	 * @param Exception $e
+	 * @param \Exception $e
 	 * @param bool $bForQuery to get the proper DB connection
-	 * @param bool $bCheckMysqliErrno if false won't try to check for mysqli::errno value
 	 *
 	 * @since 2.7.1
 	 * @since 3.0.0 N°4325 add new optional parameter to use the correct DB connection
-	 * @since 3.0.4 3.1.1 3.2.0 N°6643 new bCheckMysqliErrno parameter as a workaround for mysqli::errno cannot be mocked
 	 */
-	private static function LogDeadLock(Exception $e, $bForQuery = false, $bCheckMysqliErrno = true)
+	private static function LogDeadLock(Exception $e, $bForQuery = false)
 	{
 		// checks MySQL error code
-		if ($bCheckMysqliErrno) {
-			$iMySqlErrorNo = DbConnectionWrapper::GetDbConnection($bForQuery)->errno;
-			if (!in_array($iMySqlErrorNo, array(self::MYSQL_ERRNO_WAIT_TIMEOUT, self::MYSQL_ERRNO_DEADLOCK))) {
-				return;
-			}
-		} else {
-			$iMySqlErrorNo = "N/A";
+		$iMySqlErrorNo = DbConnectionWrapper::GetDbConnection($bForQuery)->errno;
+		if (!in_array($iMySqlErrorNo, array(self::MYSQL_ERRNO_WAIT_TIMEOUT, self::MYSQL_ERRNO_DEADLOCK))) {
+			return;
 		}
 
 		// Get error info
@@ -672,10 +664,7 @@ class CMDBSource
 		);
 		DeadLockLog::Info($sMessage, $iMySqlErrorNo, $aLogContext);
 
-		IssueLog::Error($sMessage, LogChannels::DEADLOCK, [
-			'exception.class' => get_class($e),
-			'exception.message' => $e->getMessage(),
-		]);
+		IssueLog::Error($sMessage, LogChannels::DEADLOCK, $e->getMessage());
 	}
 
 	/**

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.2.0-dev');
+define('ITOP_VERSION', '3.1.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -656,22 +656,22 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'email_transport_smtp.allow_self_signed' => [
+		'email_transport_smtp.allow_self_signed' => array(
 			'type'                => 'bool',
 			'description'         => 'Allow self signed peer certificates',
 			'default'             => false,
 			'value'               => false,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
-		],
-		'email_transport_smtp.verify_peer' => [
+		),
+		'email_transport_smtp.verify_peer' => array(
 			'type'                => 'bool',
 			'description'         => 'Verify peer certificate',
 			'default'             => true,
 			'value'               => true,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
-		],
+		),
 		'email_css' => [
 			'type' => 'string',
 			'description' => 'CSS that will override the standard stylesheet used for the notifications',
@@ -1069,14 +1069,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'log_kpi_generate_legacy_report' => [
-			'type' => 'bool',
-			'description' => 'Generate the legacy KPI report (kpi.html)',
-			'default' => true,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'max_linkset_output' => [
 			'type' => 'integer',
 			'description' => 'Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.',

core/coreexception.class.inc.php

@@ -1,11 +1,8 @@
 <?php
 /**
- * This file is only here for compatibility reasons.
- * It will be removed in future iTop versions (N°6533)
+ * This file is only here for compatibility issues. Will be removed in iTop 3.1.0 (N°3664)
  *
  * @deprecated 3.0.0 N°3663 Exception classes were moved to `/application/exceptions`, use autoloader instead of require !
  */
-
-require_once __DIR__ . '/../approot.inc.php';
-
-DeprecatedCallsLog::NotifyDeprecatedFile('Classes were moved to /application/exceptions and can be used directly with the autoloader');
+require_once '../approot.inc.php';
+DeprecatedCallsLog::NotifyDeprecatedFile('Classes were moved to /application/exceptions');

core/counter.class.inc.php

@@ -188,8 +188,8 @@ final class ItopCounter
 
 		if (!$hDBLink)
 		{
-            throw new MySQLException('Could not connect to the DB server '.mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno(), array('host' => $sDBHost, 'user' => $sDBUser));
-        }
+			throw new Exception("Could not connect to the DB server (host=$sDBHost, user=$sDBUser): ".mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno().')');
+		}
 
 		return $hDBLink;
 	}

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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -219,19 +219,6 @@
           <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
         </fields>
       </class>
-      <class id="AuditDomain" _delta="define">
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>application, grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeString"/>
-          <field id="icon" xsi:type="AttributeImage"/>
-          <field id="categories_list" xsi:type="AttributeLinkedSet"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-        </fields>
-      </class>
       <class id="Query" _delta="define">
         <!-- Generated by toolkit/export-class-to-meta.php -->
         <parent>cmdbAbstractObject</parent>
@@ -282,13 +269,8 @@
           <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>

core/dbobject.class.php

@@ -1152,9 +1152,7 @@ abstract class DBObject implements iDisplay
 			return; //skip!
 		}
 		$this->FireEventComputeValues();
-		$oKPI = new ExecutionKPI();
 		$this->ComputeValues();
-		$oKPI->ComputeStatsForExtension($this, 'ComputeValues');
 	}
 
     /**
@@ -2490,6 +2488,7 @@ abstract class DBObject implements iDisplay
 		{
 			$this->m_aCheckIssues = array();
 
+			$oKPI = new ExecutionKPI();
 			if ($bDoComputeValues) {
 				$this->DoComputeValues();
 			}
@@ -2499,9 +2498,8 @@ abstract class DBObject implements iDisplay
 			$this->FireEventCheckToWrite();
 			$this->SetReadWrite();
 
-			$oKPI = new ExecutionKPI();
 			$this->DoCheckToWrite();
-            $oKPI->ComputeStatsForExtension($this, 'DoCheckToWrite');
+			$oKPI->ComputeStats('CheckToWrite', get_class($this));
 			if (count($this->m_aCheckIssues) == 0)
 			{
 				$this->m_bCheckStatus = true;
@@ -3124,9 +3122,7 @@ abstract class DBObject implements iDisplay
 
 			// Ensure the update of the values (we are accessing the data directly)
 			$this->DoComputeValues();
-			$oKPI = new ExecutionKPI();
 			$this->OnInsert();
-			$oKPI->ComputeStatsForExtension($this, 'OnInsert');
 
 			$this->FireEventBeforeWrite();
 
@@ -3182,9 +3178,7 @@ abstract class DBObject implements iDisplay
 						$this->DBInsertSingleTable($sParentClass);
 					}
 
-					$oKPI = new ExecutionKPI();
 					$this->OnObjectKeyReady();
-					$oKPI->ComputeStatsForExtension($this, 'OnObjectKeyReady');
 					$this->UpdateCurrentObjectInCrudStack();
 
 					$this->DBWriteLinks();
@@ -3261,9 +3255,7 @@ abstract class DBObject implements iDisplay
 	public function PostInsertActions(): void
 	{
 		$this->FireEventAfterWrite([], true);
-		$oKPI = new ExecutionKPI();
 		$this->AfterInsert();
-		$oKPI->ComputeStatsForExtension($this, 'AfterInsert');
 
 		// Activate any existing trigger
 		$sClass = get_class($this);
@@ -3361,9 +3353,7 @@ abstract class DBObject implements iDisplay
 			try {
 				$this->DoComputeValues();
 				$this->ComputeStopWatchesDeadline(false);
-				$oKPI = new ExecutionKPI();
 				$this->OnUpdate();
-				$oKPI->ComputeStatsForExtension($this, 'OnUpdate');
 
 				$this->FireEventBeforeWrite();
 
@@ -3577,13 +3567,10 @@ abstract class DBObject implements iDisplay
 	public function PostUpdateActions(array $aChanges): void
 	{
 		$this->FireEventAfterWrite($aChanges, false);
-		$oKPI = new ExecutionKPI();
 		$this->AfterUpdate();
-		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');
 
 		// - TriggerOnObjectUpdate
-		$aClassList = MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL);
-		$aParams = array('class_list' => $aClassList);
+		$aParams = array('class_list' => MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL));
 		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
 			array(), $aParams);
 		while ($oTrigger = $oSet->Fetch()) {
@@ -3597,44 +3584,6 @@ abstract class DBObject implements iDisplay
 			}
 		}
 
-		$sClass = get_class($this);
-		if (MetaModel::HasLifecycle($sClass))
-		{
-			$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-			if (isset($this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode])) {
-				$sPreviousState = $this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode];
-				// Change state triggers...
-				$aParams = array(
-					'class_list'     => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
-					'previous_state' => $sPreviousState,
-					'new_state'      => $this->Get($sStateAttCode),
-				);
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state'), array(), $aParams);
-				while ($oTrigger = $oSet->Fetch()) {
-					/** @var \TriggerOnStateLeave $oTrigger */
-					try {
-						$oTrigger->DoActivate($this->ToArgs('this'));
-					}
-					catch (Exception $e) {
-						$oTrigger->LogException($e, $this);
-						utils::EnrichRaisedException($oTrigger, $e);
-					}
-				}
-
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state'), array(), $aParams);
-				while ($oTrigger = $oSet->Fetch()) {
-					/** @var \TriggerOnStateEnter $oTrigger */
-					try {
-						$oTrigger->DoActivate($this->ToArgs('this'));
-					}
-					catch (Exception $e) {
-						$oTrigger->LogException($e, $this);
-						utils::EnrichRaisedException($oTrigger, $e);
-					}
-				}
-			}
-		}
-
 		// Activate any existing trigger
 		// - TriggerOnObjectMention
 		// Forgotten by the fix of N°3245
@@ -3845,9 +3794,7 @@ abstract class DBObject implements iDisplay
 			return;
 		}
 
-		$oKPI = new ExecutionKPI();
 		$this->OnDelete();
-		$oKPI->ComputeStatsForExtension($this, 'OnDelete');
 
 		// Activate any existing trigger
 		$sClass = get_class($this);
@@ -3955,9 +3902,7 @@ abstract class DBObject implements iDisplay
 		}
 
 		$this->FireEventAfterDelete();
-		$oKPI = new ExecutionKPI();
 		$this->AfterDelete();
-		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
 
 
 		$this->m_bIsInDB = false;
@@ -4330,6 +4275,36 @@ abstract class DBObject implements iDisplay
 				$this->DBWrite();
 			}
 
+			// Change state triggers...
+			$aParams = array(
+				'class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
+				'previous_state' => $sPreviousState,
+				'new_state' => $sNewState,
+			);
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state"), array(), $aParams);
+			while ($oTrigger = $oSet->Fetch()) {
+				/** @var \TriggerOnStateLeave $oTrigger */
+				try {
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch (Exception $e) {
+					$oTrigger->LogException($e, $this);
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
+			}
+
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state"), array(), $aParams);
+			while ($oTrigger = $oSet->Fetch()) {
+				/** @var \TriggerOnStateEnter $oTrigger */
+				try {
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch (Exception $e) {
+					$oTrigger->LogException($e, $this);
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
+			}
+
 			$this->FireEvent(EVENT_DB_AFTER_APPLY_STIMULUS, $aEventData);
 		}
 		else

core/dbobjectset.class.php

@@ -767,10 +767,7 @@ class DBObjectSet implements iDBObjectSetIterator
 
 		try
 		{
-            $oKPI = new ExecutionKPI();
 			$this->m_oSQLResult = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, $this->GetRealSortOrder(), $this->m_iLimitCount, $this->m_iLimitStart, false);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 		} catch (MySQLException $e)
 		{
 			// 1116 = ER_TOO_MANY_TABLES
@@ -850,11 +847,8 @@ class DBObjectSet implements iDBObjectSetIterator
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
-            $oKPI = new ExecutionKPI();
 			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, 0, 0, true);
 			$resQuery = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, array(), 0, 0, true);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 			if (!$resQuery) return 0;
 
 			$aRow = CMDBSource::FetchArray($resQuery);
@@ -865,42 +859,6 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??
 	}
 
-    /**
-     * @param \DBSearch $oFilter
-     * @param array $aOrder
-     * @param int $iLimitCount
-     * @param int $iLimitStart
-     * @param bool $bCount
-     *
-     * @return string
-     */
-    private function GetPseudoOQL($oFilter, $aOrder, $iLimitCount, $iLimitStart, $bCount)
-    {
-        $sOQL = '';
-        if ($bCount) {
-            $sOQL .= 'COUNT ';
-        }
-        $sOQL .= $oFilter->ToOQL();
-
-        if ($iLimitCount > 0) {
-            $sOQL .= ' LIMIT ';
-            if ($iLimitStart > 0) {
-                $sOQL .= "$iLimitStart, ";
-            }
-            $sOQL .= "$iLimitCount";
-        }
-
-        if (count($aOrder) > 0) {
-            $sOQL .= ' ORDER BY ';
-            $aOrderBy = [];
-            foreach ($aOrder as $sAttCode => $bAsc) {
-                $aOrderBy[] = $sAttCode.' '.($bAsc ? 'ASC' : 'DESC');
-            }
-            $sOQL .= implode(', ', $aOrderBy);
-        }
-        return $sOQL;
-    }
-
 	/**
 	 * Check if the count exceeds a given limit
 	 *
@@ -917,11 +875,8 @@ class DBObjectSet implements iDBObjectSetIterator
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
-            $oKPI = new ExecutionKPI();
 			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
 			$resQuery = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, array(), $iLimit + 2, 0, true);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 			if ($resQuery)
 			{
 				$aRow = CMDBSource::FetchArray($resQuery);
@@ -932,7 +887,7 @@ class DBObjectSet implements iDBObjectSetIterator
 			{
 				$iCount = 0;
 			}
-        }
+		}
 		else
 		{
 			$iCount = $this->m_iNumTotalDBRows;
@@ -957,11 +912,8 @@ class DBObjectSet implements iDBObjectSetIterator
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
-            $oKPI = new ExecutionKPI();
 			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
 			$resQuery = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, array(), $iLimit + 2, 0, true);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 			if ($resQuery)
 			{
 				$aRow = CMDBSource::FetchArray($resQuery);
@@ -972,7 +924,7 @@ class DBObjectSet implements iDBObjectSetIterator
 			{
 				$iCount = 0;
 			}
-        }
+		}
 		else
 		{
 			$iCount = $this->m_iNumTotalDBRows;

core/dict.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.
@@ -56,11 +56,10 @@ class Dict
 	 * @param $sLanguageCode
 	 *
 	 * @throws \DictExceptionUnknownLanguage
-	 * @since 3.0.4 3.1.1 3.2.0 Param $sLanguageCode becomes nullable
 	 */
-	public static function SetUserLanguage($sLanguageCode = null)
+	public static function SetUserLanguage($sLanguageCode)
 	{
-		if (!is_null($sLanguageCode) && !array_key_exists($sLanguageCode, self::$m_aLanguages))
+		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
 		{
 			throw new DictExceptionUnknownLanguage($sLanguageCode);
 		}
@@ -116,50 +115,33 @@ class Dict
 	 * @return string
 	 */
 	public static function S($sStringCode, $sDefault = null, $bUserLanguageOnly = false)
-	{
-		$aInfo = self::GetLabelAndLangCode($sStringCode, $sDefault, $bUserLanguageOnly);
-		return $aInfo['label'];
-	}
-
-	/**
-	 * Returns a localised string from the dictonary with its associated lang code
-	 *
-	 * @param string $sStringCode The code identifying the dictionary entry
-	 * @param string $sDefault Default value if there is no match in the dictionary
-	 * @param bool $bUserLanguageOnly True to allow the use of the default language as a fallback, false otherwise
-	 *
-	 * @return array{
-	 *     lang: string, label: string
-	 * } with localized label string and used lang code
-	 */
-	private static function GetLabelAndLangCode($sStringCode, $sDefault = null, $bUserLanguageOnly = false)
 	{
 		// Attempt to find the string in the user language
 		//
 		$sLangCode = self::GetUserLanguage();
 		self::InitLangIfNeeded($sLangCode);
 
-		if (! array_key_exists($sLangCode, self::$m_aData))
+		if (!array_key_exists($sLangCode, self::$m_aData))
 		{
-			IssueLog::Warning("Cannot find $sLangCode in all registered dictionaries.");
+			IssueLog::Warning("Cannot find $sLangCode in dictionnaries. default labels displayed");
 			// It may happen, when something happens before the dictionaries get loaded
-			return [ 'label' => $sStringCode, 'lang' => $sLangCode ];
+			return $sStringCode;
 		}
 		$aCurrentDictionary = self::$m_aData[$sLangCode];
 		if (is_array($aCurrentDictionary) && array_key_exists($sStringCode, $aCurrentDictionary))
 		{
-			return [ 'label' => $aCurrentDictionary[$sStringCode], 'lang' => $sLangCode ];
+			return $aCurrentDictionary[$sStringCode];
 		}
 		if (!$bUserLanguageOnly)
 		{
 			// Attempt to find the string in the default language
 			//
 			self::InitLangIfNeeded(self::$m_sDefaultLanguage);
-
+			
 			$aDefaultDictionary = self::$m_aData[self::$m_sDefaultLanguage];
 			if (is_array($aDefaultDictionary) && array_key_exists($sStringCode, $aDefaultDictionary))
 			{
-				return [ 'label' => $aDefaultDictionary[$sStringCode], 'lang' => self::$m_sDefaultLanguage ];
+				return $aDefaultDictionary[$sStringCode];
 			}
 			// Attempt to find the string in english
 			//
@@ -168,17 +150,17 @@ class Dict
 			$aDefaultDictionary = self::$m_aData['EN US'];
 			if (is_array($aDefaultDictionary) && array_key_exists($sStringCode, $aDefaultDictionary))
 			{
-				return [ 'label' => $aDefaultDictionary[$sStringCode], 'lang' => 'EN US' ];
+				return $aDefaultDictionary[$sStringCode];
 			}
 		}
 		// Could not find the string...
 		//
 		if (is_null($sDefault))
 		{
-			return [ 'label' => $sStringCode, 'lang' => null ];
+			return $sStringCode;
 		}
 
-		return [ 'label' => $sDefault, 'lang' => null ];
+		return $sDefault;
 	}
 
 
@@ -194,25 +176,19 @@ class Dict
 	 */
 	public static function Format($sFormatCode /*, ... arguments ... */)
 	{
-		['label' => $sLocalizedFormat, 'lang' => $sLangCode] = self::GetLabelAndLangCode($sFormatCode);
-
+		$sLocalizedFormat = self::S($sFormatCode);
 		$aArguments = func_get_args();
 		array_shift($aArguments);
-
+		
 		if ($sLocalizedFormat == $sFormatCode)
 		{
 			// Make sure the information will be displayed (ex: an error occuring before the dictionary gets loaded)
 			return $sFormatCode.' - '.implode(', ', $aArguments);
 		}
 
-		try{
-			return vsprintf($sLocalizedFormat, $aArguments);
-		} catch(\Throwable $e){
-			\IssueLog::Error("Cannot format dict key", null, ["sFormatCode" => $sFormatCode, "sLangCode" => $sLangCode, 'exception_msg' => $e->getMessage() ]);
-			return $sFormatCode.' - '.implode(', ', $aArguments);
-		}
+		return vsprintf($sLocalizedFormat, $aArguments);
 	}
-
+	
 	/**
 	 * Initialize a the entries for a given language (replaces the former Add() method)
 	 * @param string $sLanguageCode Code identifying the language i.e. 'FR-FR', 'EN-US'
@@ -222,7 +198,7 @@ class Dict
 	{
 		self::$m_aData[$sLanguageCode] = $aEntries;
 	}
-
+	
 	/**
 	 * Set the list of available languages
 	 * @param hash $aLanguagesList
@@ -283,7 +259,7 @@ class Dict
 		{
 			$sDictFile = APPROOT.'env-'.utils::GetCurrentEnvironment().'/dictionaries/'.str_replace(' ', '-', strtolower($sLangCode)).'.dict.php';
 			require_once($sDictFile);
-
+			
 			if (self::GetApcService()->function_exists('apc_store')
 				&& (self::$m_sApplicationPrefix !== null))
 			{
@@ -293,7 +269,7 @@ class Dict
 		}
 		return $bResult;
 	}
-
+	
 	/**
 	 * Enable caching (cached using APC)
 	 * @param string $sApplicationPrefix The prefix for uniquely identiying this iTop instance
@@ -336,14 +312,14 @@ class Dict
 			}
 		}
 	}
-
+	
 	public static function MakeStats($sLanguageCode, $sLanguageRef = 'EN US')
 	{
 		$aMissing = array(); // Strings missing for the target language
 		$aUnexpected = array(); // Strings defined for the target language, but not found in the reference dictionary
 		$aNotTranslated = array(); // Strings having the same value in both dictionaries
 		$aOK = array(); // Strings having different values in both dictionaries
-
+	
 		foreach (self::$m_aData[$sLanguageRef] as $sStringCode => $sValue)
 		{
 			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageCode]))
@@ -351,7 +327,7 @@ class Dict
 				$aMissing[$sStringCode] = $sValue;
 			}
 		}
-
+	
 		foreach (self::$m_aData[$sLanguageCode] as $sStringCode => $sValue)
 		{
 			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageRef]))
@@ -374,7 +350,7 @@ class Dict
 		}
 		return array($aMissing, $aUnexpected, $aNotTranslated, $aOK);
 	}
-
+	
 	public static function Dump()
 	{
 		MyHelpers::var_dump_html(self::$m_aData);
@@ -397,7 +373,7 @@ class Dict
 		// No need to actually load the strings since it's only used to know the list of languages
 		// at setup time !!
 	}
-
+	
 	/**
 	 * Export all the dictionary entries - of the given language - whose code matches the given prefix
 	 * missing entries in the current language will be replaced by entries in the default language
@@ -410,7 +386,7 @@ class Dict
 		self::InitLangIfNeeded(self::$m_sDefaultLanguage);
 		$aEntries = array();
 		$iLength = strlen($sStartingWith);
-
+		
 		// First prefill the array with entries from the default language
 		foreach(self::$m_aData[self::$m_sDefaultLanguage] as $sCode => $sEntry)
 		{
@@ -419,7 +395,7 @@ class Dict
 				$aEntries[$sCode] = $sEntry;
 			}
 		}
-
+		
 		// Now put (overwrite) the entries for the user language
 		foreach(self::$m_aData[self::GetUserLanguage()] as $sCode => $sEntry)
 		{

core/kpi.class.inc.php

@@ -1,14 +1,27 @@
 <?php
-/**
- * @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;
+// Copyright (C) 2010-2023 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 
 /**
  * Measures operations duration, memory usage, etc. (and some other KPIs)
+ *
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 class ExecutionKPI
@@ -17,8 +30,6 @@ class ExecutionKPI
 	static protected $m_bEnabled_Memory = false;
 	static protected $m_bBlameCaller = false;
 	static protected $m_sAllowedUser = '*';
-    static protected $m_bGenerateLegacyReport = true;
-    static protected $m_fSlowQueries = 0;
 
 	static protected $m_aStats = []; // Recurrent operations
 	static protected $m_aExecData = []; // One shot operations
@@ -75,39 +86,14 @@ class ExecutionKPI
 		return false;
 	}
 
-    static public function SetGenerateLegacyReport($bReportExtensionsOnly)
-    {
-        self::$m_bGenerateLegacyReport = $bReportExtensionsOnly;
-    }
-
-    static public function SetSlowQueries($fSlowQueries)
-    {
-        self::$m_fSlowQueries = $fSlowQueries;
-    }
-
 	static public function GetDescription()
 	{
 		$aFeatures = array();
 		if (self::$m_bEnabled_Duration) $aFeatures[] = 'Duration'; 
 		if (self::$m_bEnabled_Memory)   $aFeatures[] = 'Memory usage';
-		$sFeatures = 'Measures: '.implode(', ', $aFeatures);
+		$sFeatures = implode(', ', $aFeatures);
 		$sFor = self::$m_sAllowedUser == '*' ? 'EVERYBODY' : "'".trim(self::$m_sAllowedUser)."'";
-        $sSlowQueries = '';
-        if (self::$m_fSlowQueries > 0) {
-            $sSlowQueries = ". Slow Queries: ".self::$m_fSlowQueries."s";
-        }
-
-        $aExtensions = [];
-        /** @var \iKPILoggerExtension $oExtensionInstance */
-        foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
-            $aExtensions[] = ModuleService::GetInstance()->GetModuleNameFromObject($oExtensionInstance);
-        }
-        $sExtensions = '';
-        if (count($aExtensions) > 0) {
-            $sExtensions = '. KPI Extensions: ['.implode(', ', $aExtensions).']';
-        }
-
-        return "KPI logging is active for $sFor. $sFeatures$sSlowQueries$sExtensions";
+		return "KPI logging is active for $sFor. Measures: $sFeatures";
 	}
 
 	static public function ReportStats()
@@ -115,28 +101,7 @@ class ExecutionKPI
 		if (!self::IsEnabled()) return;
 
 		global $fItopStarted;
-        global $iItopInitialMemory;
 		$sExecId = microtime(); // id to differentiate the hrefs!
-        $sRequest = $_SERVER['REQUEST_URI'].' ('.$_SERVER['REQUEST_METHOD'].')';
-        if (isset($_POST['operation'])) {
-            $sRequest .= ' operation: '.$_POST['operation'];
-        }
-
-        $fStop = MyHelpers::getmicrotime();
-        if (($fStop - $fItopStarted) > self::$m_fSlowQueries) {
-            // Invoke extensions to log the KPI operation
-            /** @var \iKPILoggerExtension $oExtensionInstance */
-            $iCurrentMemory = self::memory_get_usage();
-            $iPeakMemory = self::memory_get_peak_usage();
-            foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
-                $oKPILogData = new KpiLogData(KpiLogData::TYPE_REQUEST, 'Page', $sRequest, $fItopStarted, $fStop, '', $iItopInitialMemory, $iCurrentMemory, $iPeakMemory);
-                $oExtensionInstance->LogOperation($oKPILogData);
-            }
-        }
-
-        if (!self::$m_bGenerateLegacyReport) {
-            return;
-        }
 
 		$aBeginTimes = array();
 		foreach (self::$m_aExecData as $aOpStats)
@@ -149,9 +114,9 @@ class ExecutionKPI
 
 		$sHtml = "<hr/>";
 		$sHtml .= "<div style=\"background-color: grey; padding: 10px;\">";
-        $sHtml .= "<h3><a name=\"".md5($sExecId)."\">KPIs</a> - $sRequest</h3>";
+		$sHtml .= "<h3><a name=\"".md5($sExecId)."\">KPIs</a> - ".$_SERVER['REQUEST_URI']." (".$_SERVER['REQUEST_METHOD'].")</h3>";
 		$oStarted = DateTime::createFromFormat('U.u', $fItopStarted);
-		$sHtml .= '<p>'.$oStarted->format('Y-m-d H:i:s.u').'</p>';
+		$sHtml .= "<p>".$oStarted->format('Y-m-d H:i:s.u')."</p>";
 		$sHtml .= "<p>log_kpi_user_id: ".UserRights::GetUserId()."</p>";
 		$sHtml .= "<div>";
 		$sHtml .= "<table border=\"1\" style=\"$sTableStyle\">";
@@ -292,7 +257,7 @@ class ExecutionKPI
 				$sTotalInter = round($fTotalInter, 3);
 				$sMinInter = round($fMinInter, 3);
 				$sMaxInter = round($fMaxInter, 3);
-				if (($fTotalInter >= self::$m_fSlowQueries))
+				if (($fTotalInter >= $fSlowQueries))
 				{
 					if ($bDisplayHeader)
 					{
@@ -320,19 +285,37 @@ class ExecutionKPI
 		self::Report($sHtml);
 	}
 
-    public static function InitStats()
-    {
-        // Invoke extensions to initialize the KPI statistics
-        /** @var \iKPILoggerExtension $oExtensionInstance */
-        foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
-            $oExtensionInstance->InitStats();
-        }
-    }
 
 	public function __construct()
 	{
 		$this->ResetCounters();
-    }
+		self::Push($this);
+	}
+
+	/**
+	 * Stack executions to remove children duration from stats
+	 *
+	 * @param \ExecutionKPI $oExecutionKPI
+	 */
+	private static function Push(ExecutionKPI $oExecutionKPI)
+	{
+		self::$m_aExecutionStack[] = $oExecutionKPI;
+	}
+
+	/**
+	 * Pop current child and count its duration in its parent
+	 *
+	 * @param float|int $fChildDuration
+	 */
+	private static function Pop(float $fChildDuration = 0)
+	{
+		array_pop(self::$m_aExecutionStack);
+		// Update the parent's children duration
+		$oPrevExecutionKPI = end(self::$m_aExecutionStack);
+		if ($oPrevExecutionKPI) {
+			$oPrevExecutionKPI->m_fChildrenDuration += $fChildDuration;
+		}
+	}
 
 	// Get the duration since startup, and reset the counter for the next measure
 	//
@@ -340,15 +323,9 @@ class ExecutionKPI
 	{
 		global $fItopStarted;
 
-        if (!self::IsEnabled()) {
-            return;
-        }
-
 		$aNewEntry = null;
 
-        $fStarted = $this->m_fStarted;
-        $fStopped = $this->m_fStarted;
-		if (self::$m_bEnabled_Duration)	{
+		if (self::$m_bEnabled_Duration) {
 			$fStopped = MyHelpers::getmicrotime();
 			$aNewEntry = array(
 				'op'         => $sOperationDesc,
@@ -359,9 +336,6 @@ class ExecutionKPI
 			$this->m_fStarted = $fStopped;
 		}
 
-        $iInitialMemory = is_null($this->m_iInitialMemory) ? 0 : $this->m_iInitialMemory;
-        $iCurrentMemory = 0;
-        $iPeakMemory = 0;
 		if (self::$m_bEnabled_Memory)
 		{
 			$iCurrentMemory = self::memory_get_usage();
@@ -371,103 +345,40 @@ class ExecutionKPI
 			}
 			$aNewEntry['mem_begin'] = $this->m_iInitialMemory;
 			$aNewEntry['mem_end'] = $iCurrentMemory;
-            $iPeakMemory = self::memory_get_peak_usage();
-            $aNewEntry['mem_peak'] = $iPeakMemory;
+			if (function_exists('memory_get_peak_usage'))
+			{
+				$aNewEntry['mem_peak'] = memory_get_peak_usage();
+			}
 			// Reset for the next operation (if the object is recycled)
 			$this->m_iInitialMemory = $iCurrentMemory;
 		}
 
-        if (self::$m_bEnabled_Duration || self::$m_bEnabled_Memory) {
-            // Invoke extensions to log the KPI operation
-            /** @var \iKPILoggerExtension $oExtensionInstance */
-            foreach(MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance)
-            {
-                $sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
-                $oKPILogData = new KpiLogData(
-                        KpiLogData::TYPE_REPORT,
-                        'Step',
-                        $sOperationDesc,
-                        $fStarted,
-                        $fStopped,
-                        $sExtension,
-                        $iInitialMemory,
-                        $iCurrentMemory,
-                        $iPeakMemory);
-                $oExtensionInstance->LogOperation($oKPILogData);
-            }
-        }
-
-		if (!is_null($aNewEntry) && self::$m_bGenerateLegacyReport)
+		if (!is_null($aNewEntry))
 		{
 			self::$m_aExecData[] = $aNewEntry;
 		}
 		$this->ResetCounters();
 	}
 
-    public function ComputeStatsForExtension($object, $sMethod)
-    {
-        if (!self::IsEnabled()) {
-            return;
-        }
-
-        $sSignature = ModuleService::GetInstance()->GetModuleMethodSignature($object, $sMethod);
-        if (utils::StartsWith($sSignature, '[')) {
-            $this->ComputeStats('Extension', $sSignature);
-        }
-    }
-
 	public function ComputeStats($sOperation, $sArguments)
 	{
-		if (!self::IsEnabled()) {
-			return;
-		}
-
 		$fDuration = 0;
 		if (self::$m_bEnabled_Duration) {
 			$fStopped = MyHelpers::getmicrotime();
 			$fDuration = $fStopped - $this->m_fStarted;
-            $aCallstack = [];
-            if (self::$m_bGenerateLegacyReport) {
-                if (self::$m_bBlameCaller) {
-                    $aCallstack = MyHelpers::get_callstack(1);
-                    self::$m_aStats[$sOperation][$sArguments][] = [
-                            'time' => $fDuration,
-                            'callers' => $aCallstack,
-                    ];
-                } else {
-                    self::$m_aStats[$sOperation][$sArguments][] = [
-                            'time' => $fDuration
-                    ];
-                }
-            }
-
-            $iInitialMemory = is_null($this->m_iInitialMemory) ? 0 : $this->m_iInitialMemory;
-            $iCurrentMemory = 0;
-            $iPeakMemory = 0;
-            if (self::$m_bEnabled_Memory)
-            {
-                $iCurrentMemory = self::memory_get_usage();
-                $iPeakMemory = self::memory_get_peak_usage();
-            }
-
-            // Invoke extensions to log the KPI operation
-            /** @var \iKPILoggerExtension $oExtensionInstance */
-            foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
-                $sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
-                $oKPILogData = new KpiLogData(
-                        KpiLogData::TYPE_STATS,
-                        $sOperation,
-                        $sArguments,
-                        $this->m_fStarted,
-                        $fStopped,
-                        $sExtension,
-                        $iInitialMemory,
-                        $iCurrentMemory,
-                        $iPeakMemory,
-                        $aCallstack);
-                $oExtensionInstance->LogOperation($oKPILogData);
-            }
-        }
+			$fSelfDuration = $fDuration - $this->m_fChildrenDuration;
+			if (self::$m_bBlameCaller) {
+				self::$m_aStats[$sOperation][$sArguments][] = array(
+					'time'    => $fSelfDuration,
+					'callers' => MyHelpers::get_callstack(1),
+				);
+			} else {
+				self::$m_aStats[$sOperation][$sArguments][] = array(
+					'time' => $fSelfDuration,
+				);
+			}
+		}
+		self::Pop($fDuration);
 	}
 
 	protected function ResetCounters()
@@ -497,7 +408,35 @@ class ExecutionKPI
 
 	static protected function memory_get_usage()
 	{
-        return memory_get_usage(true);
+		if (function_exists('memory_get_usage'))
+		{
+			return memory_get_usage(true);
+		}
+
+		// Copied from the PHP manual
+		//
+		//If its Windows
+		//Tested on Win XP Pro SP2. Should work on Win 2003 Server too
+		//Doesn't work for 2000
+		//If you need it to work for 2000 look at http://us2.php.net/manual/en/function.memory-get-usage.php#54642
+		if (substr(PHP_OS,0,3) == 'WIN') 
+		{
+			$output = array();
+			exec('tasklist /FI "PID eq ' . getmypid() . '" /FO LIST', $output);
+
+			return preg_replace( '/[\D]/', '', $output[5] ) * 1024;
+		}
+		else
+		{
+			//We now assume the OS is UNIX
+			//Tested on Mac OS X 10.4.6 and Linux Red Hat Enterprise 4
+			//This should work on most UNIX systems
+			$pid = getmypid();
+			exec("ps -eo%mem,rss,pid | grep $pid", $output);
+			$output = explode("  ", $output[0]);
+			//rss is given in 1024 byte units
+			return $output[1] * 1024;
+		}
 	}
 
 	static public function memory_get_peak_usage($bRealUsage = false)

core/log.class.inc.php

@@ -1138,7 +1138,7 @@ class DeprecatedCallsLog extends LogAPI
 		parent::Enable($sTargetFile);
 
 		if (
-			(false === defined('ITOP_PHPUNIT_RUNNING_CONSTANT_NAME'))
+			(false === defined(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME))
 			&& static::IsLogLevelEnabledSafe(self::LEVEL_WARNING, self::ENUM_CHANNEL_PHP_LIBMETHOD)
 		) {
 			set_error_handler([static::class, 'DeprecatedNoticesErrorHandler'], E_DEPRECATED | E_USER_DEPRECATED);
@@ -1671,8 +1671,6 @@ class ExceptionLog extends LogAPI
 	 */
 	private static function GetLastEventIssue()
 	{
-		$oRet = self::$oLastEventIssue;
-		self::$oLastEventIssue = null;
-		return $oRet;
+		return self::$oLastEventIssue;
 	}
 }

core/metamodel.class.php

@@ -6298,13 +6298,6 @@ abstract class MetaModel
 	 */
 	public static function Startup($config, $bModelOnly = false, $bAllowCache = true, $bTraceSourceFiles = false, $sEnvironment = 'production')
 	{
-		// Startup on a new environment is not supported
-		static $bStarted = false;
-		if ($bStarted) {
-			return;
-		}
-		$bStarted = true;
-
 		self::$m_sEnvironment = $sEnvironment;
 
 		try {
@@ -6383,9 +6376,7 @@ abstract class MetaModel
 
 		ExecutionKPI::EnableDuration(self::$m_oConfig->Get('log_kpi_duration'));
 		ExecutionKPI::EnableMemory(self::$m_oConfig->Get('log_kpi_memory'));
-        ExecutionKPI::SetAllowedUser(self::$m_oConfig->Get('log_kpi_user_id'));
-        ExecutionKPI::SetGenerateLegacyReport(self::$m_oConfig->Get('log_kpi_generate_legacy_report'));
-        ExecutionKPI::SetSlowQueries(self::$m_oConfig->Get('log_kpi_slow_queries'));
+		ExecutionKPI::SetAllowedUser(self::$m_oConfig->Get('log_kpi_user_id'));
 
 		self::$m_bSkipCheckToWrite = self::$m_oConfig->Get('skip_check_to_write');
 		self::$m_bSkipCheckExtKeys = self::$m_oConfig->Get('skip_check_ext_keys');
@@ -6504,7 +6495,6 @@ abstract class MetaModel
 
 		CMDBSource::InitFromConfig(self::$m_oConfig);
 		// Later when timezone implementation is correctly done: CMDBSource::SetTimezone($sDBTimezone);
-        ExecutionKPI::InitStats();
 	}
 
 	/**
@@ -6536,19 +6526,6 @@ abstract class MetaModel
 		return $value;
 	}
 
-	/**
-	 * @internal Used for resetting the configuration during automated tests
-
-	 * @param \Config $oConfiguration
-	 *
-	 * @return void
-	 * @since 3.0.4 3.1.1 3.2.0
-	 */
-	public static function SetConfig(Config $oConfiguration)
-	{
-		self::$m_oConfig = $oConfiguration;
-	}
-
 	/**
 	 * @return Config
 	 */
@@ -6737,13 +6714,7 @@ abstract class MetaModel
 
 		if ($bMustBeFound && empty($aRow))
 		{
-			$sNotFoundErrorMessage = "No result for the single row query";
-			IssueLog::Info($sNotFoundErrorMessage, LogChannels::CMDB_SOURCE, [
-				'class' => $sClass,
-				'key' => $iKey,
-				'sql_query' => $sSQL,
-				]);
-			throw new CoreException($sNotFoundErrorMessage);
+			throw new CoreException("No result for the single row query: '$sSQL'");
 		}
 
 		return $aRow;
@@ -6836,21 +6807,25 @@ abstract class MetaModel
 	 *     $bMustBeFound=false)
 	 * @throws CoreException if no result found and $bMustBeFound=true
 	 * @throws ArchivedObjectException if archive mode disabled and result is archived and $bMustBeFound=true
+	 * @throws \Exception
+	 *
 	 */
 	public static function GetObject($sClass, $iKey, $bMustBeFound = true, $bAllowAllData = false, $aModifierProperties = null)
 	{
 		$oObject = self::GetObjectWithArchive($sClass, $iKey, $bMustBeFound, $bAllowAllData, $aModifierProperties);
 
-		if (empty($oObject)) {
+		if (empty($oObject))
+		{
 			return null;
 		}
 
-		if (!utils::IsArchiveMode() && $oObject->IsArchived()) {
+		if (!utils::IsArchiveMode() && $oObject->IsArchived())
+		{
 			if ($bMustBeFound) {
 				throw new ArchivedObjectException("The object $sClass::$iKey is archived");
+			} else {
+				return null;
 			}
-
-			return null;
 		}
 
 		return $oObject;
@@ -7633,12 +7608,14 @@ abstract class MetaModel
 		// Build the list of available extensions
 		//
 		$aInterfaces = [
-			'iLoginFSMExtension',
-			'iLogoutExtension',
-			'iLoginUIExtension',
-			'iPreferencesExtension',
 			'iApplicationUIExtension',
+			'iPreferencesExtension',
 			'iApplicationObjectExtension',
+			'iLoginFSMExtension',
+			'iLoginUIExtension',
+			'iLogoutExtension',
+			'iQueryModifier',
+			'iOnClassInitialization',
 			'iPopupMenuExtension',
 			'iPageUIExtension',
 			'iPageUIBlockExtension',
@@ -7652,12 +7629,9 @@ abstract class MetaModel
 			'iBackofficeDictEntriesExtension',
 			'iBackofficeDictEntriesPrefixesExtension',
 			'iPortalUIExtension',
-			'iQueryModifier',
-			'iOnClassInitialization',
-			'iModuleExtension',
-			'iKPILoggerExtension',
 			'ModuleHandlerApiInterface',
 			'iNewsroomProvider',
+			'iModuleExtension',
 		];
 		foreach ($aInterfaces as $sInterface) {
 			self::$m_aExtensionClassNames[$sInterface] = array();

core/mutex.class.inc.php

@@ -257,7 +257,7 @@ class iTopMutex
 		$this->hDBLink = CMDBSource::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA, false);
 
 		if (!$this->hDBLink) {
-            throw new MySQLException('Could not connect to the DB server '.mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno(), array('host' => $sDBHost, 'user' => $sDBUser));
+			throw new Exception("Could not connect to the DB server (host=$sServer, user=$sUser): ".mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno().')');
 		}
 
 		// Make sure that the server variable `wait_timeout` is at least 86400 seconds for this connection,

core/pdfbulkexport.class.inc.php

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

core/trigger.class.inc.php

@@ -121,9 +121,7 @@ abstract class Trigger extends cmdbAbstractObject
 			$oAction = MetaModel::GetObject('Action', $iActionId);
 			if ($oAction->IsActive())
 			{
-                $oKPI = new ExecutionKPI();
 				$oAction->DoExecute($this, $aContextArgs);
-                $oKPI->ComputeStatsForExtension($oAction, 'DoExecute');
 			}
 		}
 	}

core/userrights.class.inc.php

@@ -761,25 +761,14 @@ class UserRights
 	protected static $m_aCacheContactPictureAbsUrl = [];
 	/** @var UserRightsAddOnAPI $m_oAddOn */
 	protected static $m_oAddOn;
-	protected static $m_oUser = null;
-	protected static $m_oRealUser = null;
+	protected static $m_oUser;
+	protected static $m_oRealUser;
 	protected static $m_sSelfRegisterAddOn = null;
 	protected static $m_aAdmins = array();
 	protected static $m_aPortalUsers = array();
 	/** @var array array('sName' => $sName, 'bSuccess' => $bSuccess); */
 	private static $m_sLastLoginStatus = null;
 
-	/**
-	 * @return void
-	 * @since 3.0.4 3.1.1 3.2.0
-	 */
-	protected static function ResetCurrentUserData()
-	{
-		self::$m_oUser = null;
-		self::$m_oRealUser = null;
-		self::$m_sLastLoginStatus = null;
-	}
-
 	/**
 	 * @param string $sModuleName
 	 *
@@ -798,7 +787,8 @@ class UserRights
 		}
 		self::$m_oAddOn = new $sModuleName;
 		self::$m_oAddOn->Init();
-		self::ResetCurrentUserData();
+		self::$m_oUser = null;
+		self::$m_oRealUser = null;
 	}
 
 	/**
@@ -865,8 +855,6 @@ class UserRights
 	 */
 	public static function Login($sLogin, $sAuthentication = 'any')
 	{
-		static::Logoff();
-
 		$oUser = self::FindUser($sLogin, $sAuthentication);
 		if (is_null($oUser))
 		{
@@ -884,17 +872,6 @@ class UserRights
 		return true;
 	}
 
-	/**
-	 * @return void
-	 * @since 3.0.4 3.1.1 3.2.0
-	 */
-	public static function Logoff()
-	{
-		self::ResetCurrentUserData();
-		Dict::SetUserLanguage(null);
-		self::_ResetSessionCache();
-	}
-
 	/**
 	 * @param string $sLogin Login of the user to check the credentials for
 	 * @param string $sPassword

css/backoffice/components/dashlet/_dashlet-badge.scss

@@ -20,8 +20,6 @@ $ibo-dashlet-badge--icon--size: 48px !default;
 
 $ibo-dashlet-badge--action-icon--margin-right: $ibo-spacing-300 !default;
 
-$ibo-dashlet-badge--body--tooltip-title--margin-bottom: $ibo-spacing-500 !default;
-
 /* CSS variables (can be changed directly from the browser) */
 :root {
   --ibo-dashlet-badge--min-width: #{$ibo-dashlet-badge--min-width};
@@ -76,27 +74,18 @@ $ibo-dashlet-badge--body--tooltip-title--margin-bottom: $ibo-spacing-500 !defaul
     @extend %ibo-hyperlink-inherited-colors;
   }
 }
-
-.ibo-dashlet-badge--action-list-count {
-  margin-right: $ibo-dashlet-badge--action-list-count--margin-right;
-  @extend %ibo-font-ral-bol-450;
+.ibo-dashlet-badge--action-list-count{
+	margin-right: $ibo-dashlet-badge--action-list-count--margin-right;
+	@extend %ibo-font-ral-bol-450;
 }
-
-.ibo-dashlet-badge--action-list-label {
-  display: inline-block;
-  @extend %ibo-text-truncated-with-ellipsis;
+.ibo-dashlet-badge--action-list-label{
+	display: inline-block;
+	@extend %ibo-text-truncated-with-ellipsis;
 }
-
-.ibo-dashlet-badge--action-create {
-  @extend %ibo-baseline-centered-content;
-  @extend %ibo-font-size-150;
+.ibo-dashlet-badge--action-create{
+	@extend %ibo-baseline-centered-content;
+	@extend %ibo-font-size-150;
 }
-
-.ibo-dashlet-badge--action-create-icon {
-  margin-right: $ibo-dashlet-badge--action-icon--margin-right;
-}
-
-.ibo-dashlet-badge--body--tooltip-title {
-  @extend %ibo-font-weight-600;
-  margin-bottom: $ibo-dashlet-badge--body--tooltip-title--margin-bottom;
+.ibo-dashlet-badge--action-create-icon{
+	margin-right: $ibo-dashlet-badge--action-icon--margin-right;
 }

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

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

datamodels/2.x/authent-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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'authent-cas/3.1.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.2.0',
+	'authent-external/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -355,26 +355,4 @@
       </presentation>
     </class>
   </classes>
-  <meta>
-    <classes>
-      <class id="UserInternal" _delta="define_if_not_exists">
-        <fields>
-          <field id="contactid" xsi:type="AttributeExternalKey">
-            <target_class>Contact</target_class>
-          </field>
-          <field id="first_name" xsi:type="AttributeExternalField"/>
-          <field id="last_name" xsi:type="AttributeExternalField"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="org_id" xsi:type="AttributeExternalField"/>
-          <field id="email" xsi:type="AttributeExternalField"/>
-          <field id="login" xsi:type="AttributeString"/>
-          <field id="language" xsi:type="AttributeApplicationLanguage"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="allowed_org_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="profile_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="log" xsi:type="AttributeCaseLog"/>
-        </fields>
-      </class>
-    </classes>
-  </meta>
 </itop_design>

datamodels/2.x/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.2.0',
+	'authent-ldap/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'authent-local/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'combodo-backoffice-darkmoon-theme/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'combodo-db-tools/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>

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

@@ -344,7 +344,6 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 		while ($oAttachment = $oSet->Fetch())
 		{
 			$oTempAttachment = clone $oAttachment;
-			$oTempAttachment->Set('expire', time() + utils::GetConfig()->Get('draft_attachments_lifetime'));
 			$oTempAttachment->Set('item_id', null);
 			$oTempAttachment->Set('temp_id', $sTempId);
 			$oTempAttachment->DBInsert();

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.2.0',
+	'itop-attachments/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
       <rank>50</rank>

datamodels/2.x/itop-backup/dbrestore.class.inc.php

@@ -235,16 +235,13 @@ class DBRestore extends DBBackup
 			if (in_array($oFileInfo->getFilename(), $aStandardFiles)) {
 				continue;
 			}
-			// Normalize filenames to cope with Windows backslashes
-			$sPath = str_replace('\\', '/', $oFileInfo->getPathname());
-			$sRefPath = str_replace('\\', '/', $sDataDir.'/production-modules');
-			if (strncmp($sPath, $sRefPath, strlen($sRefPath)) == 0) {
+			if (strncmp($oFileInfo->getPathname(), $sDataDir.'/production-modules', strlen($sDataDir.'/production-modules')) == 0) {
 				continue;
 			}
-
+			
 			$aExtraFiles[$oFileInfo->getPathname()] = APPROOT.substr($oFileInfo->getPathname(), strlen($sDataDir));
 		}
-
+		
 		return $aExtraFiles;
 	}
 }

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.2.0',
+	'itop-backup/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-bridge-cmdb-services/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-bridge-cmdb-ticket/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-bridge-datacenter-mgmt-services/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-bridge-endusers-devices-services/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-bridge-storage-mgmt-services/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-bridge-virtualization-mgmt-services/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-bridge-virtualization-storage/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -49,12 +49,20 @@
             <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>
@@ -1288,7 +1296,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -2089,7 +2097,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -3095,7 +3103,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -3793,7 +3801,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
           </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.2.0',
+	'itop-change-mgmt-itil/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
           </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.2.0',
+	'itop-change-mgmt/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="FunctionalCI" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -272,7 +272,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -530,8 +530,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -702,8 +702,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -992,8 +992,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="networkdevicetype_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="networkdevicetype_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -1293,8 +1293,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -1621,7 +1621,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -1797,7 +1797,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -1943,7 +1943,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -2145,7 +2145,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -2299,7 +2299,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -2453,7 +2453,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -2607,7 +2607,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -2740,7 +2740,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -2872,8 +2872,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="middleware_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="middleware_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -3011,8 +3011,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="dbserver_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="dbserver_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -3148,8 +3148,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="webserver_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="webserver_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -3304,8 +3304,8 @@
             <attribute id="version"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="vendor"/>
-            <attribute id="type"/>
+            <attribute id="vendor"></attribute>
+            <attribute id="type"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -3782,7 +3782,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -4260,6 +4260,7 @@
               <rank>70</rank>
             </item>
           </items>
+
         </summary>
       </presentation>
     </class>
@@ -4371,7 +4372,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="osfamily_name"/>
+            <attribute id="osfamily_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -4560,8 +4561,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="brand_name"/>
-            <attribute id="type"/>
+            <attribute id="brand_name"></attribute>
+            <attribute id="type"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -5424,8 +5425,8 @@
             <attribute id="ip_mask"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="org_name"/>
-            <attribute id="subnet_name"/>
+            <attribute id="org_name"></attribute>
+            <attribute id="subnet_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -5648,7 +5649,7 @@
             <attribute id="vlan_tag"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="org_name"/>
+            <attribute id="org_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -5941,7 +5942,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="ipaddress"/>
+            <attribute id="ipaddress"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -6353,7 +6354,17 @@
             <attribute id="connectableci_id"/>
           </attributes>
         </reconciliation>
-        <uniqueness_rules/>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="networkdevice_id"/>
+              <attribute id="connectableci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="networkdevice_id" xsi:type="AttributeExternalKey">
@@ -6830,8 +6841,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="owner_name"/>
-            <attribute id="type"/>
+            <attribute id="owner_name"></attribute>
+            <attribute id="type"></attribute>
           </complementary_attributes>
         </naming>
         <fields_semantic>

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.2.0',
+	'itop-config-mgmt/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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.2.0',
+	'itop-config/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <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$',
+	'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.2.0',
+	'itop-core-update/3.1.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.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="Rack" _delta="define">
       <parent>PhysicalDevice</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -213,7 +213,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
             <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 id="organization_name"></attribute>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -585,7 +585,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -754,7 +754,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
             <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.2.0',
+	'itop-datacenter-mgmt/3.1.0',
 	array(
 		// Identification
 		//