WIP Make it work on hierarchical keys only, not external keys

.gitignore

@@ -33,6 +33,7 @@ tests/*/vendor/*
 !/data/index.php
 !/data/web.config
 !/data/exclude.txt
+!/data/.compilation-symlinks
 
 # iTop extensions
 /extensions/**

README.md

@@ -33,13 +33,13 @@ iTop also offers mass import tools to help you become even more efficient.
 [62]: https://www.itophub.io/wiki/page?id=latest:release:change_log
 [63]: https://www.itophub.io/wiki/page?id=latest:release:start
 [64]: https://www.itophub.io/wiki/page?id=latest:install:start
-[65]: https://github.com/Combodo/iTop/releases/latest
+[65]: https://sourceforge.net/projects/itop/files/latest/download
 
 
 ## Resources
 
- - [GitHub Discussions][1]: community support
- - [GitHub Issues Tickets ][2]: for feature requests and bug reports
+ - [iTop Forums][1]: community support
+ - [iTop Tickets][2]: for feature requests and bug reports
  - [Releases download][3]
  - [iTop requirements][4]
  - [Documentation][5] covering both iTop and its official extensions
@@ -47,9 +47,9 @@ iTop also offers mass import tools to help you become even more efficient.
  - [iTop versions history][7]
 
 
-[1]: https://github.com/Combodo/iTop/discussions
-[2]: https://github.com/Combodo/iTop/issues
-[3]: https://github.com/Combodo/iTop/releases
+[1]: https://sourceforge.net/p/itop/discussion/
+[2]: https://sourceforge.net/p/itop/tickets/
+[3]: https://sourceforge.net/projects/itop/files/itop/
 [4]: https://www.itophub.io/wiki/page?id=latest:install:requirements
 [5]: https://www.itophub.io/wiki
 [6]: https://store.itophub.io/en_US/

application/dashlet.class.inc.php

@@ -892,6 +892,41 @@ class DashletObjectList extends Dashlet
 		$this->aProperties['title'] = '';
 		$this->aProperties['query'] = 'SELECT Contact';
 		$this->aProperties['menu'] = false;
+		$this->aProperties['tree_grouping_attr'] = '';
+	}
+
+	/**
+	 * Return all attribute codes allowed for tree grouping for the class targeted by $sOql.
+	 * Which means any hierarchical keys of the same class (or child classes)
+	 *
+	 * @param string $sOql
+	 * @return array  [attcode => label]
+	 */
+	protected function GetTreeGroupingAttributes(string $sOql): array
+	{
+		$aAttrs = [];
+		try {
+			$oQuery = $this->oModelReflection->GetQuery($sOql);
+			$sClass = $oQuery->GetClass();
+			foreach ($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType) {
+				// Ignore non-hierarchical key attributes
+				if (false === is_a($sAttType, AttributeHierarchicalKey::class, true)) {
+					continue;
+				}
+
+				// Ignore hierarchical that do not point to the same class
+				$sExtKeyTargetClass = $this->oModelReflection->GetAttributeProperty($sClass, $sAttCode, 'targetclass', '');
+				if (false === is_a($sExtKeyTargetClass, $sClass, true)) {
+					continue;
+				}
+
+				$aAttrs[$sAttCode] = $this->oModelReflection->GetLabel($sClass, $sAttCode);
+			}
+		} catch (Exception $e) {
+			// Fallback: return empty list on OQL error
+		}
+
+		return $aAttrs;
 	}
 
 	/**
@@ -919,6 +954,9 @@ class DashletObjectList extends Dashlet
 			"panel_title" => Dict::S($sTitle),
 			"panel_class" => $sClass,
 		];
+		if (utils::IsNotNullOrEmptyString($this->aProperties['tree_grouping_attr'])) {
+			$aParams['tree_grouping_attr'] = $this->aProperties['tree_grouping_attr'];
+		}
 		$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occurring in the same DOM)
 		//$oBlock->DisplayIntoContentBlock($oPanel, $oPage, $sBlockId, array_merge($aExtraParams, $aParams));
 
@@ -979,6 +1017,30 @@ HTML;
 		return DBObjectSearch::FromOQL($sQuery, $aQueryParams);
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+	public function Update($aValues, $aUpdatedFields)
+	{
+		if (in_array('query', $aUpdatedFields)) {
+			try {
+				$oCurrSearch = $this->oModelReflection->GetQuery($aValues['query']);
+				$sCurrClass = $oCurrSearch->GetClass();
+
+				$oPrevSearch = $this->oModelReflection->GetQuery($this->aProperties['query']);
+				$sPrevClass = $oPrevSearch->GetClass();
+
+				if ($sCurrClass !== $sPrevClass) {
+					$this->aProperties['tree_grouping_attr'] = '';
+					$this->bFormRedrawNeeded = true;
+				}
+			} catch (Exception $e) {
+				$this->bFormRedrawNeeded = true;
+			}
+		}
+		return parent::Update($aValues, $aUpdatedFields);
+	}
+
 	/**
 	 * @inheritdoc
 	 */
@@ -993,6 +1055,15 @@ HTML;
 		$oField->AddCSSClass("ibo-is-code");
 		$oForm->AddField($oField);
 
+		$aTreeGroupingAttrs = $this->GetTreeGroupingAttributes($this->aProperties['query']);
+		$oField = new DesignerComboField(
+			'tree_grouping_attr',
+			Dict::S('UI:DashletObjectList:Prop-TreeGroupingAttr'),
+			$this->aProperties['tree_grouping_attr']
+		);
+		$oField->SetAllowedValues($aTreeGroupingAttrs);
+		$oForm->AddField($oField);
+
 		$oField = new DesignerBooleanField('menu', Dict::S('UI:DashletObjectList:Prop-Menu'), $this->aProperties['menu']);
 		$oForm->AddField($oField);
 	}
@@ -1031,6 +1102,16 @@ HTML;
 		$oField->AddCSSClass("ibo-is-code");
 		$oForm->AddField($oField);
 
+		// TODO: Add tree grouping attr. But what is this for?
+		$aTreeGroupingAttrs = $this->GetTreeGroupingAttributes($this->aProperties['query']);
+		$oField = new DesignerComboField(
+			'tree_grouping_attr',
+			Dict::S('UI:DashletObjectList:Prop-TreeGroupingAttr'),
+			$this->aProperties['tree_grouping_attr']
+		);
+		$oField->SetAllowedValues($aTreeGroupingAttrs);
+		$oForm->AddField($oField);
+
 		$oField = new DesignerBooleanField('menu', Dict::S('UI:DashletObjectList:Prop-Menu'), $this->aProperties['menu']);
 		$oForm->AddField($oField);
 	}

application/datamodel.application.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="https://www.combodo.com/itop-schema/3.3"
-             version="3.4">
+             version="3.3">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>

application/displayblock.class.inc.php

@@ -2034,8 +2034,17 @@ class MenuBlock extends DisplayBlock
 									$aAllowedProfiles = MetaModel::GetConfig()->Get('concurrent_lock_override_profiles');
 									$bCanKill = false;
 
+									$oUser = UserRights::GetUserObject();
+									$aUserProfiles = [];
+									if (!is_null($oUser)) {
+										$oProfileSet = $oUser->Get('profile_list');
+										while ($oProfile = $oProfileSet->Fetch()) {
+											$aUserProfiles[$oProfile->Get('profile')] = true;
+										}
+									}
+
 									foreach ($aAllowedProfiles as $sProfile) {
-										if (UserRights::HasProfile($sProfile)) {
+										if (array_key_exists($sProfile, $aUserProfiles)) {
 											$bCanKill = true;
 											break;
 										}

application/forms.class.inc.php

@@ -1228,6 +1228,7 @@ class DesignerComboField extends DesignerFormField
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
+		$sChecked = $this->defaultValue ? 'checked' : '';
 		$sMandatory = $this->bMandatory ? 'true' : 'false';
 		$sReadOnly = $this->IsReadOnly() ? 'disabled="disabled"' : '';
 		if ($this->IsSorted()) {
@@ -1270,7 +1271,8 @@ class DesignerComboField extends DesignerFormField
 				} else {
 					$sSelected = ($sKey == $this->defaultValue) ? 'selected' : '';
 				}
-				$sHtmlValue = $this->PrepareValueForRendering($sDisplayValue);
+				// Quick and dirty: display the menu parents as a tree
+				$sHtmlValue = str_replace(' ', ' ', $sDisplayValue);
 				$sHtml .= "<option value=\"".utils::EscapeHtml($sKey)."\" $sSelected>$sHtmlValue</option>";
 			}
 			$sHtml .= "</select></span>";
@@ -1287,14 +1289,6 @@ EOF
 
 	}
 
-	protected function PrepareValueForRendering($sValue = null): ?string
-	{
-		if (is_null($sValue)) {
-			$sValue = $this->defaultValue;
-		}
-		return $sValue;
-	}
-
 	public function ReadParam(&$aValues)
 	{
 		parent::ReadParam($aValues);

application/loginbasic.class.inc.php

@@ -5,7 +5,7 @@ use Combodo\iTop\Application\Helper\Session;
 /**
  * Class LoginBasic
  *
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -24,7 +24,11 @@ class LoginBasic extends AbstractLoginFSMExtension
 	protected function OnModeDetection(&$iErrorCode)
 	{
 		if (!Session::IsSet('login_mode')) {
-			if (!is_null($this->GetAuthUserAndPassword())) {
+			if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
+				Session::Set('login_mode', 'basic');
+			} elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
+				Session::Set('login_mode', 'basic');
+			} elseif (isset($_SERVER['PHP_AUTH_USER'])) {
 				Session::Set('login_mode', 'basic');
 			}
 		}
@@ -82,49 +86,38 @@ class LoginBasic extends AbstractLoginFSMExtension
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
-	/**
-	 * @return array|null [$sAuthUser, $sAuthPwd]
-	 */
-	private function GetAuthUserAndPassword(): ?array
+	private function GetAuthUserAndPassword()
 	{
+		$sAuthUser = '';
+		$sAuthPwd = null;
 		$sAuthorization = '';
 		if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
 			$sAuthorization = $_SERVER['HTTP_AUTHORIZATION'];
 		} elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
 			$sAuthorization = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
-		} elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-			$sAuthUser = $_SERVER['PHP_AUTH_USER'];
-			// Unfortunately, the RFC is not clear about the encoding...
-			// IE and FF supply the user and password encoded in ISO-8859-1 whereas Chrome provides them encoded in UTF-8
-			// So let's try to guess if it's an UTF-8 string or not... fortunately all encodings share the same ASCII base
-			if (!LoginWebPage::LooksLikeUTF8($sAuthUser)) {
-				// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
-				// Supposed to be harmless in case of a plain ASCII string...
-				$sAuthUser = iconv('iso-8859-1', 'utf-8', $sAuthUser);
+		}
+
+		if (!empty($sAuthorization)) {
+			list($sAuthUser, $sAuthPwd) = explode(':', base64_decode(substr($sAuthorization, 6)));
+		} else {
+			if (isset($_SERVER['PHP_AUTH_USER'])) {
+				$sAuthUser = $_SERVER['PHP_AUTH_USER'];
+				// Unfortunately, the RFC is not clear about the encoding...
+				// IE and FF supply the user and password encoded in ISO-8859-1 whereas Chrome provides them encoded in UTF-8
+				// So let's try to guess if it's an UTF-8 string or not... fortunately all encodings share the same ASCII base
+				if (!LoginWebPage::LooksLikeUTF8($sAuthUser)) {
+					// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
+					// Supposed to be harmless in case of a plain ASCII string...
+					$sAuthUser = iconv('iso-8859-1', 'utf-8', $sAuthUser);
+				}
+				$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
+				if (!LoginWebPage::LooksLikeUTF8($sAuthPwd)) {
+					// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
+					// Supposed to be harmless in case of a plain ASCII string...
+					$sAuthPwd = iconv('iso-8859-1', 'utf-8', $sAuthPwd);
+				}
 			}
-			$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
-			if (!LoginWebPage::LooksLikeUTF8($sAuthPwd)) {
-				// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
-				// Supposed to be harmless in case of a plain ASCII string...
-				$sAuthPwd = iconv('iso-8859-1', 'utf-8', $sAuthPwd);
-			}
-
-			return [$sAuthUser, $sAuthPwd];
 		}
-
-		if (empty($sAuthorization)) {
-			return null;
-		}
-
-		// Decode without Bearer
-		if (strncasecmp($sAuthorization, 'Basic ', 6) !== 0) {
-			return null;
-		}
-		$sDecodedAuthorisation = base64_decode(substr($sAuthorization, 6));
-		if (str_contains($sDecodedAuthorisation, ':')) {
-			return explode(':', $sDecodedAuthorisation);
-		}
-
-		return null;
+		return [$sAuthUser, $sAuthPwd];
 	}
 }

application/utils.inc.php

@@ -1313,8 +1313,8 @@ class utils
 		}
 
 		if (is_null($sAuthUser)) {
-			$sAuthUser = self::ReadParam('auth_user', '', true, 'raw_data');
-			$sAuthPwd = self::ReadParam('auth_pwd', '', true, 'raw_data');
+			$sAuthUser = self::ReadParam('auth_user', '', 'raw_data');
+			$sAuthPwd = self::ReadParam('auth_pwd', '', 'raw_data');
 		}
 		$sParamFile = self::GetParamSourceFile('auth_user');
 		if (is_null($sParamFile)) {
@@ -1886,9 +1886,6 @@ SQL;
 			$aHTTPHeaders[] = trim($sHeaderString);
 		}
 		// Default options, can be overloaded/extended with the 4th parameter of this method, see above $aCurlOptions
-		$iCurlAllowedProtocols = self::ConvertProtocolsToCurlOption(
-			self::GetConfig()->Get('security.post_requests.allowed_protocols')
-		);
 		$aOptions = [
 			CURLOPT_RETURNTRANSFER => true,     // return the content of the request
 			CURLOPT_HEADER         => false,    // don't return the headers in the output
@@ -1911,9 +1908,6 @@ SQL;
 		$aAllOptions = $aCurlOptions + $aOptions;
 		$ch = curl_init($sUrl);
 		curl_setopt_array($ch, $aAllOptions);
-		if (!curl_setopt($ch, CURLOPT_PROTOCOLS, $iCurlAllowedProtocols)) {
-			throw new Exception('Unable to enforce allowed protocols for cURL request');
-		}
 		$response = curl_exec($ch);
 		$iErr = curl_errno($ch);
 		$sErrMsg = curl_error($ch);
@@ -1935,40 +1929,6 @@ SQL;
 		return $response;
 	}
 
-	private static function ConvertProtocolsToCurlOption(string $sProtocols): int
-	{
-		$aProtocols = explode(',', $sProtocols);
-
-		$iCurlProtocols = 0;
-		foreach ($aProtocols as $sProtocol) {
-			$iCurlProtocols |= match (strtolower(trim($sProtocol))) {
-				'dict' => defined('CURLPROTO_DICT') ? CURLPROTO_DICT : 0,
-				'file' => defined('CURLPROTO_FILE') ? CURLPROTO_FILE : 0,
-				'ftp' => defined('CURLPROTO_FTP') ? CURLPROTO_FTP : 0,
-				'ftps' => defined('CURLPROTO_FTPS') ? CURLPROTO_FTPS : 0,
-				'gopher' => defined('CURLPROTO_GOPHER') ? CURLPROTO_GOPHER : 0,
-				'http' => defined('CURLPROTO_HTTP') ? CURLPROTO_HTTP : 0,
-				'https' => defined('CURLPROTO_HTTPS') ? CURLPROTO_HTTPS : 0,
-				'imap' => defined('CURLPROTO_IMAP') ? CURLPROTO_IMAP : 0,
-				'imaps' => defined('CURLPROTO_IMAPS') ? CURLPROTO_IMAPS : 0,
-				'ldap' => defined('CURLPROTO_LDAP') ? CURLPROTO_LDAP : 0,
-				'ldaps' => defined('CURLPROTO_LDAPS') ? CURLPROTO_LDAPS : 0,
-				'mqtt' => defined('CURLPROTO_MQTT') ? CURLPROTO_MQTT : 0,
-				'pop3' => defined('CURLPROTO_POP3') ? CURLPROTO_POP3 : 0,
-				'pop3s' => defined('CURLPROTO_POP3S') ? CURLPROTO_POP3S : 0,
-				'rtsp' => defined('CURLPROTO_RTSP') ? CURLPROTO_RTSP : 0,
-				'scp' => defined('CURLPROTO_SCP') ? CURLPROTO_SCP : 0,
-				'sftp' => defined('CURLPROTO_SFTP') ? CURLPROTO_SFTP : 0,
-				'smtp' => defined('CURLPROTO_SMTP') ? CURLPROTO_SMTP : 0,
-				'smtps' => defined('CURLPROTO_SMTPS') ? CURLPROTO_SMTPS : 0,
-				'telnet' => defined('CURLPROTO_TELNET') ? CURLPROTO_TELNET : 0,
-				'tftp' => defined('CURLPROTO_TFTP') ? CURLPROTO_TFTP : 0,
-				default => throw new Exception("Unsupported protocol: $sProtocol"),
-			};
-		}
-		return $iCurlProtocols;
-	}
-
 	public static function QuoteForPHP(string $sValue): string
 	{
 		$sEscaped = str_replace(['\\', "'"], ['\\\\', "\\'"], $sValue);

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.4');
+define('ITOP_DESIGN_LATEST_VERSION', '3.3');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.4');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.4.0');
+define('ITOP_CORE_VERSION', '3.3.0');
 
 /**
  * @var string

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.4.0-dev');
+define('ITOP_VERSION', '3.3.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -1762,19 +1762,11 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'security.disable_mandatory_authentication_for_inline_images' => [
-			'type'                => 'bool',
-			'description' => 'If true then image access does not require user authentication, provided the image\'s secret is valid. Note that setting this to true gives a less secure access to inline images!',
-			'default'             => false,
-			'value'               => false,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'security.disable_joined_classes_filter' => [
 			'type'                => 'bool',
 			'description'         => 'If true, scope filters aren\'t applied to joined classes or union classes not directly listed in the SELECT clause.',
-			'default'             => false,
-			'value'               => false,
+			'default'             => true,
+			'value'               => true,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
@@ -1789,16 +1781,8 @@ class Config
 		'security.disable_exec_forced_login_for_all_enpoints' => [
 			'type'                => 'bool',
 			'description'         => 'If true, when no delegated authentication module is defined, no login will be forced on modules exec endpoints',
-			'default'             => false,
-			'value'               => false,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
-		'security.post_requests.allowed_protocols' => [
-			'type'                => 'string',
-			'description'         => 'List of allowed protocols that will be used for post requests. Allowed values: dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, ldaps, mqtt, pop3, pop3s, rtsp, scp, sftp, smtp, smtps, telnet, tftp',
-			'default'             => 'http,https,ftp,ftps,sftp',
-			'value'               => 'http,https,ftp,ftps,sftp',
+			'default'             => true,
+			'value'               => true,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],

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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="lnkActionNotificationToContact" _delta="define">
       <parent>DBObject</parent>

core/dbobjectsearch.class.php

@@ -1711,7 +1711,7 @@ class DBObjectSearch extends DBSearch
 	 * @return array|mixed|\SQLObjectQuery|null
 	 * @throws \CoreException
 	 */
-	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
 		// Hide objects that are not visible to the current user
 		//
@@ -1782,8 +1782,6 @@ class DBObjectSearch extends DBSearch
 			$aContextData['aSelectExpr'] = $aSelectExpr;
 			$sRawId .= $bGetCount;
 			$aContextData['bGetCount'] = $bGetCount;
-			$sRawId .= 'ids:'.($bSelectOnlyIds ? '1' : '0');
-			$aContextData['bSelectOnlyIds'] = $bSelectOnlyIds;
 			if (is_array($aSelectedClasses)) {
 				$sRawId .= implode(',', $aSelectedClasses); // Unions may alter the list of selected columns
 			}
@@ -1837,7 +1835,7 @@ class DBObjectSearch extends DBSearch
 		if (!isset($oSQLQuery)) {
 			$oKPI = new ExecutionKPI();
 			$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($oSearch);
-			$oSQLQuery = $oSQLObjectQueryBuilder->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr, $bSelectOnlyIds);
+			$oSQLQuery = $oSQLObjectQueryBuilder->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
 			$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);
 
 			if (self::$m_bQueryCacheEnabled) {
@@ -1947,7 +1945,7 @@ class DBObjectSearch extends DBSearch
 		$oSearch = $this;
 		$aClassesToFilter = $this->GetSelectedClasses();
 
-		// Joined classes filtering can be disabled through the configuration.
+		// Opt-in for joined classes filtering, otherwise only filter the selected class(es)
 		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === false) {
 			$aClassesToFilter = $this->GetJoinedClasses();
 		}

core/dbsearch.class.php

@@ -921,7 +921,7 @@ abstract class DBSearch
 	 * @internal
 	 *
 	 */
-	public function MakeSelectQuery($aOrderBy = [], $aArgs = [], $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulSQL = true, $bSelectOnlyIds = false)
+	public function MakeSelectQuery($aOrderBy = [], $aArgs = [], $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulSQL = true)
 	{
 		// Check the order by specification, and prefix with the class alias
 		// and make sure that the ordering columns are going to be selected
@@ -962,7 +962,7 @@ abstract class DBSearch
 			}
 		}
 
-		$oSQLQuery = $this->GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, null, null, $bSelectOnlyIds);
+		$oSQLQuery = $this->GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount);
 
 		if ($this->m_bNoContextParameters) {
 			// Only internal parameters
@@ -1046,7 +1046,7 @@ abstract class DBSearch
 	 * @internal
 	 *
 	 */
-	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null)
 	{
 		$oSearch = $this->ApplyDataFilters();
 
@@ -1068,7 +1068,7 @@ abstract class DBSearch
 			}
 		}
 
-		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr, $bSelectOnlyIds);
+		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr);
 		$oSQLQuery->SetSourceOQL($oSearch->ToOQL());
 
 		// Join to an additional table, if required...
@@ -1103,8 +1103,7 @@ abstract class DBSearch
 		$bGetCount,
 		$aGroupByExpr = null,
 		$aSelectedClasses = null,
-		$aSelectExpr = null,
-		$bSelectOnlyIds = false
+		$aSelectExpr = null
 	);
 
 	/**

core/dbunionsearch.class.php

@@ -527,10 +527,10 @@ class DBUnionSearch extends DBSearch
 		throw new Exception('MakeUpdateQuery is not implemented for the unions!');
 	}
 
-	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
 		if (count($this->aSearches) == 1) {
-			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectedClasses, $aSelectExpr, $bSelectOnlyIds);
+			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
 		}
 
 		$aSQLQueries = [];
@@ -610,7 +610,7 @@ class DBUnionSearch extends DBSearch
 					}
 				}
 			}
-			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr, $bSelectOnlyIds);
+			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr);
 			if (count($aSearchAliases) > 1) {
 				// Necessary to make sure that selected columns will match throughout all the queries
 				// (default order of selected fields depending on the order of JOINS)
@@ -683,7 +683,7 @@ class DBUnionSearch extends DBSearch
 			return $this;
 		}
 
-		// Joined classes filtering can be disabled through the configuration.
+		// Opt-in for joined classes filtering, otherwise fallback on DBSearch filtering
 		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === true) {
 			return parent::ApplyDataFilters();
 		}

core/sqlobjectquerybuilder.class.inc.php

@@ -29,14 +29,13 @@ class SQLObjectQueryBuilder
 	 * @param array $aGroupByExpr
 	 * @param array $aSelectedClasses
 	 * @param array $aSelectExpr
-	 * @param bool $bSelectOnlyIds
 	 *
 	 * @return null|SQLObjectQuery
 	 * @throws \CoreException
 	 */
-	public function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $bSelectOnlyIds = false)
+	public function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
-		if ($bGetCount || !is_null($aGroupByExpr) || $bSelectOnlyIds) {
+		if ($bGetCount || !is_null($aGroupByExpr)) {
 			// Avoid adding all the fields for counts or "group by" requests
 			$aAttToLoad = [];
 			foreach ($this->oDBObjetSearch->GetSelectedClasses() as $sClassAlias => $sClass) {

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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
   </constants>
   <classes>

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.4.0',
+	'authent-cas/3.3.0',
 	[
 		// 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.4.0',
+	'authent-external/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -7,7 +7,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.4.0',
+		'authent-ldap/3.3.0',
 		[
 			// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
       <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{12,}$</password_validation.pattern>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.4.0',
+	'authent-local/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="darkmoon" _delta="define">

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-darkmoon-theme/3.4.0',
+	'combodo-backoffice-darkmoon-theme/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/datamodel.combodo-backoffice-fullmoon-high-contrast-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-high-contrast" _delta="define">

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/module.combodo-backoffice-fullmoon-high-contrast-theme.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-high-contrast-theme/3.4.0',
+	'combodo-backoffice-fullmoon-high-contrast-theme/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/datamodel.combodo-backoffice-fullmoon-protanopia-deuteranopia-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-protanopia-deuteranopia" _delta="define">

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/module.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.4.0',
+	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/datamodel.combodo-backoffice-fullmoon-tritanopia-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-tritanopia" _delta="define">

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/module.combodo-backoffice-fullmoon-tritanopia-theme.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-tritanopia-theme/3.4.0',
+	'combodo-backoffice-fullmoon-tritanopia-theme/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/combodo-data-feature-removal/datamodel.combodo-data-feature-removal.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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="ResourceDataFeatureRemoval" _delta="define">
       <parent>AbstractResource</parent>

datamodels/2.x/combodo-data-feature-removal/module.combodo-data-feature-removal.php

@@ -11,7 +11,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-data-feature-removal/3.4.0',
+	'combodo-data-feature-removal/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="DBToolsMenu" xsi:type="WebPageMenuNode" _delta="define">
       <rank>30</rank>

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

@@ -25,7 +25,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.4.0',
+	'combodo-db-tools/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>

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

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

datamodels/2.x/itop-attachments/src/Hook/EventListener.php

@@ -159,7 +159,7 @@ class EventListener implements iEventServiceSetup
 		while ($oTrigger = $oTriggerSet->Fetch()) {
 			try {
 				$aContextArgs = $aTriggerContextArgs;
-				if (MetaModel::IsValidAttCode(get_class($oTrigger), 'file_in_email') && $oTrigger->Get('file_in_email')) {
+				if ($oTrigger->Get('file_in_email')) {
 					$aContextArgs['attachments'] = [$oDocument];
 				}
 				$oTrigger->DoActivate($aContextArgs);

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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
       <rank>50</rank>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/3.4.0',
+	'itop-backup/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToProviderContract" _delta="define">

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-services/3.4.0',
+	'itop-bridge-cmdb-services/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToTicket" _delta="define">

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/3.4.0',
+	'itop-bridge-cmdb-ticket/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Rack" _delta="must_exist">

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-datacenter-mgmt-services/3.4.0',
+	'itop-bridge-datacenter-mgmt-services/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Phone" _delta="must_exist">

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-endusers-devices-services/3.4.0',
+	'itop-bridge-endusers-devices-services/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="SANSwitch" _delta="must_exist">

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-storage-mgmt-services/3.4.0',
+	'itop-bridge-storage-mgmt-services/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Hypervisor" _delta="must_exist">

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-mgmt-services/3.4.0',
+	'itop-bridge-virtualization-mgmt-services/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="lnkVirtualDeviceToVolume" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -2,7 +2,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.4.0',
+	'itop-bridge-virtualization-storage/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>

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

@@ -2,7 +2,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.4.0',
+	'itop-change-mgmt-itil/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>

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

@@ -2,7 +2,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.4.0',
+	'itop-change-mgmt/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="FunctionalCI" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -2,7 +2,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.4.0',
+	'itop-config-mgmt/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
       <rank>10</rank>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/3.4.0',
+	'itop-config/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-container-mgmt/datamodel.itop-container-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="ContainerImage" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-container-mgmt/3.4.0',
+	'itop-container-mgmt/3.3.0',
 	[
 		// 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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="iTopUpdate" xsi:type="WebPageMenuNode" _delta="define">
       <rank>60</rank>

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

@@ -25,7 +25,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.4.0',
+	'itop-core-update/3.3.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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Rack" _delta="define">
       <parent>PhysicalDevice</parent>

datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.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-datacenter-mgmt/3.4.0',
+	'itop-datacenter-mgmt/3.3.0',
 	[
 		// Identification
 		//

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

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

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

@@ -26,7 +26,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/3.4.0',
+	'itop-endusers-devices/3.3.0',
 	[
 		// Identification
 		//

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

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

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-faq-light/3.4.0',
+	'itop-faq-light/3.3.0',
 	[
 		// Identification
 		//

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

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

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

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

datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="DataFlow" _delta="define">
       <parent>FunctionalCI</parent>

datamodels/2.x/itop-flow-map/module.itop-flow-map.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-flow-map/3.4.0',
+	'itop-flow-map/3.3.0',
 	[
 		// Identification
 		//

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

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

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

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

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

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

datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-hub-connector/3.4.0',
+	'itop-hub-connector/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Incident" _delta="define">
       <parent>Ticket</parent>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-incident-mgmt-itil/3.4.0',
+	'itop-incident-mgmt-itil/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="KnownError" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/3.4.0',
+	'itop-knownerror-mgmt/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="OAuthClient" _delta="define">

datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-oauth-client/3.4.0',
+	'itop-oauth-client/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design version="3.4">
+<itop_design version="3.3">
   <events>
     <event id="EVENT_DISPLAY_OBJECT_DETAILS" _delta="define">
       <name>Portal object displayed</name>

datamodels/2.x/itop-portal-base/module.itop-portal-base.php

@@ -21,7 +21,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/3.4.0',
+	'itop-portal-base/3.3.0',
 	[
 	// Identification
 	'label' => 'Portal Development Library',

datamodels/2.x/itop-portal/datamodel.itop-portal.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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <portals>
     <portal id="itop-portal" _delta="define">
       <!-- ID must match module_design[id] -->

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

@@ -21,7 +21,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/3.4.0',
+	'itop-portal/3.3.0',
 	[
 	// Identification
 	'label' => 'Enhanced Customer Portal',

datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Problem" _delta="define">
       <parent>Ticket</parent>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-problem-mgmt/3.4.0',
+	'itop-problem-mgmt/3.3.0',
 	[
 		// Identification
 		//

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

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

datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.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-profiles-itil/3.4.0',
+	'itop-profiles-itil/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt-itil/3.4.0',
+	'itop-request-mgmt-itil/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt/datamodel.itop-request-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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>

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

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt/3.4.0',
+	'itop-request-mgmt/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.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.4">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Organization">
       <fields>

datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php

@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt-provider/3.4.0',
+	'itop-service-mgmt-provider/3.3.0',
 	[
 		// Identification
 		//