Update profiles definition

.doc/itop-version-history.md

@@ -2,17 +2,13 @@
 
 ```mermaid
 %%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
-              'git0': '#7ccf00',
-              'git1': '#7ccf00',
-              'git2': '#99a1af',
-              'git3': '#99a1af',
-              'git4': '#99a1af',
-              'git5': '#99a1af',
-              'git6': '#99a1af',
-              'git7': '#99a1af',
-              'git8': '#99a1af',
-              'git9': '#99a1af',
-              'git10': '#99a1af'
+              'git0': 'lawngreen',
+              'git3': 'dodgerblue',
+              'git4': 'grey',
+              'git5': 'grey',
+              'git6': 'grey',
+              'git7': 'grey',
+              'git8': 'grey'
        }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
 gitGraph
     commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
@@ -110,11 +106,6 @@ gitGraph
     commit id: "2025-09-25" tag: "2.7.13"
     checkout support/3.2
     commit id: "2026-04-27 " tag: "3.2.3"
-    checkout support/3.2.3
-    commit id: "2026-05-25 " tag: "3.2.3-1"
-    commit id: "2026-07-17 " tag: "3.2.3-2"
-    checkout develop
-    commit id: "2026-07-23" tag: "3.3.0-beta1"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.github/pull_request_template.md

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

addons/userrights/userrightsprofile.class.inc.php

@@ -582,30 +582,16 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	public function ListProfiles($oUser)
 	{
-		if (!array_key_exists('profile_list', $oUser->ListChanges())) {
-			// Profiles list is not modified on the $oUser object, we can use DBObjectSearch with `all data` capabilities
-			// Note: This is the default behavior
-			$aRet = [];
-			$oSearch = new DBObjectSearch('URP_UserProfile');
-			$oSearch->AllowAllData();
-			$oSearch->NoContextParameters();
-			$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
-			$oProfiles = new DBObjectSet($oSearch);
-			while ($oUserProfile = $oProfiles->Fetch()) {
-				$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
-			}
-
-			return $aRet;
-		} else {
-			// Profiles list must be computed with memory changes.
-			// Note: this is a bit tricky because the user object may have been modified in memory (e.g. a profile added or removed) and we need to take that into account
-			$aRet = [];
-			$oProfilesSet = $oUser->Get('profile_list');
-			foreach ($oProfilesSet as $oUserProfile) {
-				$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
-			}
-			return $aRet;
+		$aRet = [];
+		$oSearch = new DBObjectSearch('URP_UserProfile');
+		$oSearch->AllowAllData();
+		$oSearch->NoContextParameters();
+		$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
+		$oProfiles = new DBObjectSet($oSearch);
+		while ($oUserProfile = $oProfiles->Fetch()) {
+			$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
 		}
+		return $aRet;
 	}
 
 	public function GetSelectFilter($oUser, $sClass, $aSettings = [])
@@ -719,23 +705,26 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
 	{
 		$this->LoadCache();
-		if (count($oUser->ListChanges()) === 0) {
-			// load and cache permissions for the current user on the given class
-			if (isset($this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode])) {
-				$aTest = $this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode];
-				if (is_array($aTest)) {
-					return $aTest;
-				}
+
+		// load and cache permissions for the current user on the given class
+		//
+		$iUser = $oUser->GetKey();
+		if (isset($this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode])) {
+			$aTest = $this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
+			if (is_array($aTest)) {
+				return $aTest;
 			}
 		}
 
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
 		$bStatus = null;
-
-		$aProfileList = $this->GetProfileList($oUser);
+		// Cache user's profiles
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
+			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
 		// Call the API of UserRights because it caches the list for us
-		foreach ($aProfileList as $iProfile => $oProfile) {
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
 			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
 			if (!is_null($bGrant)) {
 				if ($bGrant) {
@@ -753,9 +742,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$aRes = [
 			'permission' => $iPermission,
 		];
-		if (count($oUser->ListChanges()) === 0) {
-			$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode] = $aRes;
-		}
+		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
 		return $aRes;
 	}
 
@@ -837,14 +824,18 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	{
 		$this->LoadCache();
 		// Note: this code is VERY close to the code of IsActionAllowed()
+		$iUser = $oUser->GetKey();
 
-		$aProfileList  = $this->GetProfileList($oUser);
+		// Cache user's profiles
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
+			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
 
 		// Note: The object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
 		$bStatus = null;
 		// Call the API of UserRights because it caches the list for us
-		foreach ($aProfileList as $iProfile => $oProfile) {
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
 			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
 			if (!is_null($bGrant)) {
 				if ($bGrant) {
@@ -902,25 +893,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		}
 		return $bHasSharing;
 	}
-
-	/**
-	 * @param \User $oUser
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function GetProfileList(User $oUser): array
-	{
-		if (count($oUser->ListChanges()) === 0) { // if user is already in db and not changed
-			$iUser = $oUser->GetKey();
-			if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
-				$aProfiles = UserRights::ListProfiles($oUser);
-				$this->aUsersProfilesList[$iUser] = $aProfiles;
-			}
-			return $this->aUsersProfilesList[$iUser];
-		}
-		return UserRights::ListProfiles($oUser);
-	}
 }
 
 UserRights::SelectModule('UserRightsProfile');

application/application.inc.php

@@ -16,5 +16,5 @@ require_once(APPROOT.'/application/audit.category.class.inc.php');
 require_once(APPROOT.'/application/audit.domain.class.inc.php');
 require_once(APPROOT.'/application/audit.rule.class.inc.php');
 require_once(APPROOT.'/application/query.class.inc.php');
-require_once(APPROOT.'/setup/moduleinstallation/moduleinstallation.class.inc.php');
+require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');

application/applicationextension/backoffice/iBackofficeSassExtension.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implement this interface to add sass files (SCSS) to the backoffice pages.
+ * Implement this interface to add sass file (SCSS) to the backoffice pages.
  * example: return "css/setup.scss"
  *
  * @api
@@ -11,9 +11,9 @@
 interface iBackofficeSassExtension
 {
 	/**
-	 * @return array An array of relative paths (from loaded import paths) to the files to compile and include
-	 * @see \iTopWebPage::$a_linked_stylesheets
+	 * @return string
+	 * @see \iTopWebPage::$a_styles
 	 * @api
 	 */
-	public function GetSassRelPaths(): array;
+	public function GetSass(): string;
 }

application/applicationextension/rest/RestUtils.php

@@ -97,125 +97,33 @@ class RestUtils
 	 * @throws Exception
 	 * @api
 	 */
-	public static function GetFieldList($sClass, $oData, $sParamName, $bFailIfNotFound = true)
+	public static function GetFieldList($sClass, $oData, $sParamName)
 	{
 		$sFields = self::GetOptionalParam($oData, $sParamName, '*');
-		return match($sFields) {
-			'*' => self::GetFieldListForClass($sClass),
-			'*+' => self::GetFieldListForParentClass($sClass),
-			default => self::GetLimitedFieldListForClass($sClass, $sFields, $sParamName, $bFailIfNotFound),
-		};
-	}
-
-	/**
-	 * Check if the requested field list asks for an extended output.
-	 *
-	 * Extended output is requested when using '*+' or class-scoped field definitions.
-	 *
-	 * @param string $sFields Requested field specification.
-	 *
-	 * @return bool
-	 */
-	public static function HasRequestedExtendedOutput(string $sFields): bool
-	{
-		return match($sFields) {
-			'*' => false,
-			'*+' => true,
-			default => substr_count($sFields, ':') > 1,
-		};
-	}
-
-	/**
-	 * Check if the requested field list asks for all output fields.
-	 *
-	 * @param string $sFields Requested field specification.
-	 *
-	 * @return bool
-	 */
-	public static function HasRequestedAllOutputFields(string $sFields): bool
-	{
-		return match($sFields) {
-			'*', '*+' => true,
-			default => false,
-		};
-	}
-
-	protected static function GetFieldListForClass(string $sClass): array
-	{
-		return [$sClass => array_keys(MetaModel::ListAttributeDefs($sClass))];
-	}
-
-	/**
-	 * Build a field list for all child classes of the given parent class.
-	 *
-	 * @param string $sClass Parent class name.
-	 *
-	 * @return array Array of class => list of attribute codes.
-	 */
-	protected static function GetFieldListForParentClass(string $sClass): array
-	{
-		$aFieldList = [];
-		foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass) {
-			$aFieldList = array_merge($aFieldList, self::GetFieldListForClass($sRefClass));
-		}
-		return $aFieldList;
-	}
-
-	/**
-	 * Build a restricted field list for one class from a comma-separated attribute list.
-	 *
-	 * @param string $sClass Class name.
-	 * @param string $sFields Comma-separated list of requested attribute codes.
-	 * @param string $sParamName Input parameter name used in error messages.
-	 * @param bool $bFailIfNotFound If true, throws when an attribute code is invalid.
-	 *
-	 * @return array Array containing one class => list of attribute codes.
-	 * @throws Exception When an attribute code is invalid and $bFailIfNotFound is true.
-	 */
-	protected static function GetLimitedFieldListForSingleClass(string $sClass, string $sFields, string $sParamName, bool $bFailIfNotFound = true): array
-	{
-		$aFieldList = [$sClass => []];
-		foreach (explode(',', $sFields) as $sAttCode) {
-			$sAttCode = trim($sAttCode);
-			if (($sAttCode == 'id') || (MetaModel::IsValidAttCode($sClass, $sAttCode))) {
-				$aFieldList[$sClass][] = $sAttCode;
-			} else {
-				if ($bFailIfNotFound) {
-					throw new Exception("$sParamName: invalid attribute code '$sAttCode' for class '$sClass'");
+		$aShowFields = [];
+		if ($sFields == '*') {
+			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) {
+				$aShowFields[$sClass][] = $sAttCode;
+			}
+		} elseif ($sFields == '*+') {
+			foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass) {
+				foreach (MetaModel::ListAttributeDefs($sRefClass) as $sAttCode => $oAttDef) {
+					$aShowFields[$sRefClass][] = $sAttCode;
 				}
 			}
-		}
-		return $aFieldList;
-	}
-
-	/**
-	 * Build a restricted field list for one or several classes.
-	 *
-	 * Accepted formats are either "att1,att2" for a single class, or
-	 * "ClassA:att1,att2;ClassB:att3" for class-scoped field definitions.
-	 *
-	 * @param string $sClass Default class name used when no class scope is specified.
-	 * @param string $sFields Requested field specification.
-	 * @param string $sParamName Input parameter name used in error messages.
-	 * @param bool $bFailIfNotFound If true, throws when an attribute code is invalid.
-	 *
-	 * @return array Array of class => list of attribute codes.
-	 * @throws Exception Propagated from GetLimitedFieldListForSingleClass.
-	 */
-	protected static function GetLimitedFieldListForClass(string $sClass, string $sFields, string $sParamName, bool $bFailIfNotFound = true): array
-	{
-		if (!str_contains($sFields, ':')) {
-			return self::GetLimitedFieldListForSingleClass($sClass, $sFields, $sParamName, $bFailIfNotFound);
+		} else {
+			foreach (explode(',', $sFields) as $sAttCode) {
+				$sAttCode = trim($sAttCode);
+				if (($sAttCode != 'id') && (!MetaModel::IsValidAttCode($sClass, $sAttCode))) {
+					throw new Exception("$sParamName: invalid attribute code '$sAttCode'");
+				}
+				$aShowFields[$sClass][] = $sAttCode;
+			}
 		}
 
-		$aFieldList = [];
-		$aFieldListParts = explode(';', $sFields);
-		foreach ($aFieldListParts as $sClassFields) {
-			list($sSubClass, $sSubClassFields) = explode(':', $sClassFields);
-			$aFieldList = array_merge($aFieldList, self::GetLimitedFieldListForSingleClass(trim($sSubClass), trim($sSubClassFields), $sParamName, $bFailIfNotFound));
-		}
-		return $aFieldList;
+		return $aShowFields;
 	}
+
 	/**
 	 * Read and interpret object search criteria from a Rest/Json structure
 	 *

application/cmdbabstract.class.inc.php

@@ -175,11 +175,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	 */
 	protected $sDisplayMode;
 	protected $aFieldsMap;
-	/**
-	 * @var array Store posted values in order to be used in GetAttributeFlags
-	 * @since 3.3.0
-	 */
-	protected $aPostedValues = [];
 
 	/**
 	 * If true, bypass IsActionAllowedOnAttribute when writing this object
@@ -529,12 +524,6 @@ JS
 				$sLabel = Dict::S('Tag:Synchronized');
 				$sSynchroTagId = 'synchro_icon-'.$this->GetKey();
 				$aTags[$sSynchroTagId] = ['title' => $sTip, 'css_classes' => 'ibo-object-details--tag--synchronized', 'decoration_classes' => 'fas fa-lock', 'label' => $sLabel];
-				if (UserRights::IsActionAllowed(SynchroReplica::class, UR_ACTION_READ)) {
-					$oDBSearch = DBObjectSearch::FromOQL('SELECT SynchroReplica WHERE dest_class=:sClass AND dest_id=:id');
-					$sFilter = rawurlencode($oDBSearch->serialize(false, ['sClass' => get_class($this),'id' => $this->GetKey()]));
-					$sUrlSearchReplica = 'UI.php?operation=search&filter='.$sFilter;
-					$oPage->add_ready_script("$('#$sSynchroTagId').on('click',function() {window.location = '$sUrlSearchReplica' });");
-				}
 			}
 		}
 
@@ -1046,7 +1035,7 @@ HTML
 							// Add extra data for markup generation
 							// - Attribute code and AttributeDef. class
 							$val['attcode'] = $sAttCode;
-							$val['atttype'] = $oAttDef->GetTypeShortClassName();
+							$val['atttype'] = $oAttDef->GetType();
 							$val['attlabel'] = $sAttLabel;
 							$val['attflags'] = ($bEditMode) ? $this->GetFormAttributeFlags($sAttCode) : OPT_ATT_READONLY;
 
@@ -1535,6 +1524,190 @@ HTML
 		return $sHtml;
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @throws \Exception
+	 *  only used in old and deprecated export.php
+	 *
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
+	 */
+	public static function DisplaySetAsHTMLSpreadsheet(WebPage $oPage, CMDBObjectSet $oSet, $aParams = [])
+	{
+		$oPage->add(self::GetSetAsHTMLSpreadsheet($oSet, $aParams));
+	}
+
+	/**
+	 * Spreadsheet output: designed for end users doing some reporting
+	 * Then the ids are excluded and replaced by the corresponding friendlyname
+	 *
+	 * @param \DBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 *
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
+	 */
+	public static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = [])
+	{
+		$aFields = null;
+		if (isset($aParams['fields']) && (strlen($aParams['fields']) > 0)) {
+			$aFields = explode(',', $aParams['fields']);
+		}
+
+		$bFieldsAdvanced = false;
+		if (isset($aParams['fields_advanced'])) {
+			$bFieldsAdvanced = (bool)$aParams['fields_advanced'];
+		}
+
+		$bLocalize = true;
+		if (isset($aParams['localize_values'])) {
+			$bLocalize = (bool)$aParams['localize_values'];
+		}
+
+		$aList = [];
+
+		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
+		$aAuthorizedClasses = [];
+		foreach ($aClasses as $sAlias => $sClassName) {
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) {
+				$aAuthorizedClasses[$sAlias] = $sClassName;
+			}
+		}
+		$aHeader = [];
+		foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
+			$aList[$sAlias] = [];
+
+			foreach (MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef) {
+				if (is_null($aFields) || (count($aFields) == 0)) {
+					// Standard list of attributes (no link sets)
+					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField())) {
+						$sAttCodeEx = $oAttDef->IsExternalField() ? $oAttDef->GetKeyAttCode().'->'.$oAttDef->GetExtAttCode() : $sAttCode;
+
+						$aList[$sAlias][$sAttCodeEx] = $oAttDef;
+
+						if ($bFieldsAdvanced && $oAttDef->IsExternalKey(EXTKEY_RELATIVE)) {
+							$sRemoteClass = $oAttDef->GetTargetClass();
+							foreach (MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode) {
+								$aList[$sAlias][$sAttCode.'->'.$sRemoteAttCode] = MetaModel::GetAttributeDef(
+									$sRemoteClass,
+									$sRemoteAttCode
+								);
+							}
+						}
+					}
+				} else {
+					// User defined list of attributes
+					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields)) {
+						$aList[$sAlias][$sAttCode] = $oAttDef;
+					}
+				}
+			}
+			// Replace external key by the corresponding friendly name (if not already in the list)
+			foreach ($aList[$sAlias] as $sAttCode => $oAttDef) {
+				if ($oAttDef->IsExternalKey()) {
+					unset($aList[$sAlias][$sAttCode]);
+					$sFriendlyNameAttCode = $sAttCode.'_friendlyname';
+					if (!array_key_exists(
+						$sFriendlyNameAttCode,
+						$aList[$sAlias]
+					) && MetaModel::IsValidAttCode($sClassName, $sFriendlyNameAttCode)) {
+						$oFriendlyNameAtt = MetaModel::GetAttributeDef($sClassName, $sFriendlyNameAttCode);
+						$aList[$sAlias][$sFriendlyNameAttCode] = $oFriendlyNameAtt;
+					}
+				}
+			}
+
+			foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
+				$sColLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx) : $sAttCodeEx;
+
+				$oFinalAttDef = $oAttDef->GetFinalAttDef();
+				if (get_class($oFinalAttDef) == 'AttributeDateTime') {
+					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Date').')';
+					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Time').')';
+				} else {
+					$aHeader[] = $sColLabel;
+				}
+			}
+		}
+
+		$sHtml = "<table border=\"1\">\n";
+		$sHtml .= "<tr>\n";
+		$sHtml .= "<td>".implode("</td><td>", $aHeader)."</td>\n";
+		$sHtml .= "</tr>\n";
+		$oSet->Seek(0);
+		while ($aObjects = $oSet->FetchAssoc()) {
+			$aRow = [];
+			foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
+				$oObj = $aObjects[$sAlias];
+				foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
+					if (is_null($oObj)) {
+						$aRow[] = '<td></td>';
+					} else {
+						$oFinalAttDef = $oAttDef->GetFinalAttDef();
+						if (get_class($oFinalAttDef) == 'AttributeDateTime') {
+							$sDate = $oObj->Get($sAttCodeEx);
+							if ($sDate === null) {
+								$aRow[] = '<td></td>';
+								$aRow[] = '<td></td>';
+							} else {
+								$iDate = AttributeDateTime::GetAsUnixSeconds($sDate);
+								$aRow[] = '<td>'.date(
+									'Y-m-d',
+									$iDate
+								).'</td>'; // Format kept as-is for 100% backward compatibility of the exports
+								$aRow[] = '<td>'.date(
+									'H:i:s',
+									$iDate
+								).'</td>'; // Format kept as-is for 100% backward compatibility of the exports
+							}
+						} else {
+							if ($oAttDef instanceof AttributeCaseLog) {
+								$rawValue = $oObj->Get($sAttCodeEx);
+								$outputValue = str_replace(
+									"\n",
+									"<br/>",
+									utils::EscapeHtml($rawValue->__toString())
+								);
+								// Trick for Excel: treat the content as text even if it begins with an equal sign
+								$aRow[] = '<td x:str>'.$outputValue.'</td>';
+							} else {
+								$rawValue = $oObj->Get($sAttCodeEx);
+								// Due to custom formatting rules, empty friendlynames may be rendered as non-empty strings
+								// let's fix this and make sure we render an empty string if the key == 0
+								if ($oAttDef instanceof AttributeExternalField && $oAttDef->IsFriendlyName()) {
+									$sKeyAttCode = $oAttDef->GetKeyAttCode();
+									if ($oObj->Get($sKeyAttCode) == 0) {
+										$rawValue = '';
+									}
+								}
+								if ($bLocalize) {
+									$outputValue = utils::EscapeHtml($oFinalAttDef->GetEditValue($rawValue));
+								} else {
+									$outputValue = utils::EscapeHtml($rawValue);
+								}
+								$aRow[] = '<td>'.$outputValue.'</td>';
+							}
+						}
+					}
+				}
+			}
+			$sHtml .= implode("\n", $aRow);
+			$sHtml .= "</tr>\n";
+		}
+		$sHtml .= "</table>\n";
+
+		return $sHtml;
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
@@ -3066,12 +3239,8 @@ EOF
 							}
 							$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, $aArgs);
 							if (is_array($aAllowedValues) && count($aAllowedValues) == 1) {
-								// linkset are ignored
-								// N°9622 - Error in the user story life cycle
-								if (!$oAttDef->IsLinkSet()) {
-									$aValues = array_keys($aAllowedValues);
-									$this->Set($sAttCode, $aValues[0]);
-								}
+								$aValues = array_keys($aAllowedValues);
+								$this->Set($sAttCode, $aValues[0]);
 							}
 						}
 					}
@@ -3817,7 +3986,6 @@ HTML;
 
 		$aErrors = [];
 		$aFinalValues = [];
-		$this->aPostedValues = $aValues; // Store the values for later use (e.g. in GetAttributeFlags)
 		foreach ($this->GetWriteableAttList(array_keys($aValues), $aErrors, $aAttFlags) as $sAttCode => $oAttDef) {
 			$aFinalValues[$sAttCode] = $aValues[$sAttCode];
 		}
@@ -3987,27 +4155,6 @@ HTML;
 				$sTagSetJson = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null, 'raw_data');
 				if ($sTagSetJson !== null) { // bulk modify, direct linked set not handled
 					$value = json_decode($sTagSetJson, true);
-					if ($this->IsNew()) {
-						if (is_array($value['orig_value'])) {
-							foreach ($value['orig_value'] as $val) {
-								if (!in_array($val, $value['removed'])) {
-									$value['added'][] = $val;
-								}
-							}
-						}
-					} else {
-						$aCurrentValues = $this->Get($sAttCode)->GetValues();
-						foreach ($value['orig_value'] as $val) {
-							if (!in_array($val, $aCurrentValues) && !in_array($val, $value['removed']) && !in_array($val, $value['added'])) {
-								$value['added'][] = $val;
-							}
-						}
-						foreach ($aCurrentValues as $val) {
-							if (!in_array($val, $value['orig_value']) && !in_array($val, $value['removed']) && !in_array($val, $value['added'])) {
-								$value['removed'][] = $val;
-							}
-						}
-					}
 				}
 				break;
 
@@ -4348,7 +4495,7 @@ HTML;
 
 			$oDivField = FieldUIBlockFactory::MakeLarge("");
 			//	UIContentBlockUIBlockFactory::MakeStandard(null,["field_container field_large"]);
-			$oDivField->AddDataAttribute("attribute-type", $oAttDef->GetTypeShortClassName());
+			$oDivField->AddDataAttribute("attribute-type", $oAttDef->GetType());
 			$oDivField->AddDataAttribute("attribute-label", $sAttMetaDataLabel);
 			$oDivField->AddDataAttribute("attribute-flag-hidden", false);
 			$oDivField->AddDataAttribute("attribute-flag-read-only", false);

application/dashboard.class.inc.php

@@ -497,11 +497,11 @@ EOF
 	 * @param array $aExtraParams
 	 * @param bool $bCanEdit
 	 *
-	 * @return null|\Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout
+	 * @return \Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = [], $bCanEdit = true)
 	{
-		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? $this->GetId(), $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? null, $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
 
 		/** @var \DashboardLayoutMultiCol $oLayout */
 		$oLayout = new $this->sLayoutClass();

application/dashlet.class.inc.php

@@ -25,20 +25,6 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\UIBlock;
 use Combodo\iTop\Application\WebPage\WebPage;
-use Combodo\iTop\Core\AttributeDefinition\AttributeDateTime;
-use Combodo\iTop\Core\AttributeDefinition\AttributeDecimal;
-use Combodo\iTop\Core\AttributeDefinition\AttributeDuration;
-use Combodo\iTop\Core\AttributeDefinition\AttributeEncryptedString;
-use Combodo\iTop\Core\AttributeDefinition\AttributeEnum;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalField;
-use Combodo\iTop\Core\AttributeDefinition\AttributeFriendlyName;
-use Combodo\iTop\Core\AttributeDefinition\AttributeInteger;
-use Combodo\iTop\Core\AttributeDefinition\AttributeLinkedSet;
-use Combodo\iTop\Core\AttributeDefinition\AttributeOneWayPassword;
-use Combodo\iTop\Core\AttributeDefinition\AttributePassword;
-use Combodo\iTop\Core\AttributeDefinition\AttributePercentage;
-use Combodo\iTop\Core\AttributeDefinition\AttributeSubItem;
-use Combodo\iTop\Core\AttributeDefinition\iAttributeNoGroupBy;
 
 require_once(APPROOT.'application/forms.class.inc.php');
 
@@ -454,7 +440,7 @@ EOF
 				// For external fields, find the real type of the target
 				$sExtFieldAttCode = $sAttCode;
 				$sTargetClass = $sClass;
-				while (is_a($sAttType, AttributeExternalField::class, true)) {
+				while (is_a($sAttType, 'AttributeExternalField', true)) {
 					$sExtKeyAttCode = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtFieldAttCode, 'extkey_attcode');
 					$sTargetAttCode = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtFieldAttCode, 'target_attcode');
 					$sTargetClass = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtKeyAttCode, 'targetclass');
@@ -464,13 +450,13 @@ EOF
 				}
 
 				$aForbidenAttType = [
-					AttributeLinkedSet::class,
-					AttributeFriendlyName::class,
+					'AttributeLinkedSet',
+					'AttributeFriendlyName',
 
-					iAttributeNoGroupBy::class, //we cannot only use iAttributeNoGroupBy since this method is also used by the designer who do not have access to the classes' PHP reflection API. So the known classes has to be listed altogether
-					AttributeOneWayPassword::class,
-					AttributeEncryptedString::class,
-					AttributePassword::class,
+					'iAttributeNoGroupBy', //we cannot only use iAttributeNoGroupBy since this method is also used by the designer who do not have access to the classes' PHP reflection API. So the known classes has to be listed altogether
+					'AttributeOneWayPassword',
+					'AttributeEncryptedString',
+					'AttributePassword',
 				];
 				foreach ($aForbidenAttType as $sForbidenAttType) {
 					if (is_a($sAttType, $sForbidenAttType, true)) {
@@ -482,7 +468,7 @@ EOF
 				if (!in_array($sLabel, $aGroupBy)) {
 					$aGroupBy[$sAttCode] = $sLabel;
 
-					if (is_a($sAttType, AttributeDateTime::class, true)) {
+					if (is_a($sAttType, 'AttributeDateTime', true)) {
 						$aGroupBy[$sAttCode.':hour'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Hour', $sLabel);
 						$aGroupBy[$sAttCode.':month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Month', $sLabel);
 						$aGroupBy[$sAttCode.':day_of_week'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek', $sLabel);
@@ -1116,7 +1102,7 @@ abstract class DashletGroupBy extends Dashlet
 			$aAttributeTypes = $this->oModelReflection->ListAttributes($this->sClass);
 			if (isset($aAttributeTypes[$this->sGroupByAttCode])) {
 				$sAttributeType = $aAttributeTypes[$this->sGroupByAttCode];
-				if (is_subclass_of($sAttributeType, AttributeDateTime::class) || $sAttributeType == AttributeDateTime::class) {
+				if (is_subclass_of($sAttributeType, 'AttributeDateTime') || $sAttributeType == 'AttributeDateTime') {
 					$this->sOrderDirection = 'asc';
 				} else {
 					$this->sOrderDirection = 'desc';
@@ -1272,7 +1258,7 @@ abstract class DashletGroupBy extends Dashlet
 		if ($this->oModelReflection->IsValidAttCode($sClass, $this->sGroupByAttCode)) {
 			$aAttributeTypes = $this->oModelReflection->ListAttributes($sClass);
 			$sAttributeType = $aAttributeTypes[$this->sGroupByAttCode];
-			if (is_subclass_of($sAttributeType, AttributeDateTime::class) || $sAttributeType == AttributeDateTime::class) {
+			if (is_subclass_of($sAttributeType, 'AttributeDateTime') || $sAttributeType == 'AttributeDateTime') {
 				// Note: an alternative to this somewhat hardcoded way of doing things would be to implement...
 				//$oExpr = Expression::FromOQL($this->sGroupByExpr);
 				//$aTranslationData = array($oQuery->GetClassAlias() => array($this->sGroupByAttCode => new ScalarExpression(date('Y-m-d H:i:s', $iTime))));
@@ -1303,7 +1289,7 @@ abstract class DashletGroupBy extends Dashlet
 				foreach ($aValues as $sValue) {
 					$aDisplayValues[] = ['label' => $sValue, 'value' => (int)rand(1, 15)];
 				}
-			} elseif (is_subclass_of($sAttributeType, AttributeEnum::class) || $sAttributeType == AttributeEnum::class) {
+			} elseif (is_subclass_of($sAttributeType, 'AttributeEnum') || $sAttributeType == 'AttributeEnum') {
 				$aAllowed = $this->oModelReflection->GetAllowedValues_att($sClass, $this->sGroupByAttCode);
 				if ($aAllowed) { // null for non enums
 					foreach ($aAllowed as $sValue => $sValueLabel) {
@@ -1472,11 +1458,11 @@ abstract class DashletGroupBy extends Dashlet
 			}
 			foreach ($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType) {
 				switch ($sAttType) {
-					case AttributeDecimal::class:
-					case AttributeDuration::class:
-					case AttributeInteger::class:
-					case AttributePercentage::class:
-					case AttributeSubItem::class: // TODO: Known limitation: no unit displayed (values in sec)
+					case 'AttributeDecimal':
+					case 'AttributeDuration':
+					case 'AttributeInteger':
+					case 'AttributePercentage':
+					case 'AttributeSubItem': // TODO: Known limitation: no unit displayed (values in sec)
 						$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
 						$aFunctionAttributes[$sAttCode] = $sLabel;
 						break;

application/displayblock.class.inc.php

@@ -1078,6 +1078,7 @@ JS
 
 				if ($aCounts[$sStateValue] == 0) {
 					$aCounts[$sStateValue] = ['link' => '-', 'label' => $aCounts[$sStateValue]];
+					;
 				} else {
 					$oSingleGroupByValueFilter = $this->m_oFilter->DeepClone();
 					$oSingleGroupByValueFilter->AddCondition($sStateAttrCode, $sStateValue, '=');
@@ -1707,7 +1708,7 @@ JS
 		$oBlock->bAdvancedMode = utils::ReadParam('advanced', false);
 
 		$oBlock->sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv';
-		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
+		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
 		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
 		// Pass the parameters via POST, since expression may be very long
 		$aParamsToPost = [
@@ -1724,7 +1725,7 @@ JS
 			$oBlock->sLinkToToggle = $oBlock->sLinkToToggle.'&advanced=1';
 			$oBlock->sChecked = '';
 		}
-		$oBlock->sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php';
+		$oBlock->sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php';
 
 		$oBlock->sCharsetNotice = false;
 		$oBlock->sJsonParams = json_encode($aParamsToPost);
@@ -1946,8 +1947,8 @@ class MenuBlock extends DisplayBlock
 					$sSelectedClassName = MetaModel::GetName($sSelectedClass);
 
 					// Check rights on class
-					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY) && (($oReflectionClass->IsSubclassOf(cmdbAbstractObject::class) || $sSelectedClass === SynchroReplica::class));
-					$bIsBulkDeleteAllowed = (bool)UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE);
+					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE);
 
 					// Refine filter on selected class so bullk actions occur on the right class
 					$oSelectedClassFilter = $this->GetFilter()->DeepClone();
@@ -1957,15 +1958,7 @@ class MenuBlock extends DisplayBlock
 					// Action label dict code has a specific suffix for "Link" / "Remote" aliases to allow dedicated labels in linksets.
 					$sActionLabelCodeSuffix = in_array($sSelectedAlias, ['Link', 'Remote']) ? $sSelectedAlias : 'Class';
 					if ($bIsBulkModifyAllowed) {
-						if ($sSelectedClass === SynchroReplica::class) {
-							$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:UnlinkAll:', Dict::S('Class:SynchroReplica/Action:unlink_all'), 'unlink');
-							$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:UnLinkSynchroAll:', Dict::S('Class:SynchroReplica/Action:unlinksynchro_all'), 'unlinksynchro');
-							$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:SynchroAll:', Dict::S('Class:SynchroReplica/Action:synchro_all'), 'synchro');
-							$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:AllowDeleteAll:', Dict::S('Class:SynchroReplica/Action:allowdelete_all'), 'allowdelete');
-							$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:DenyDeleteAll:', Dict::S('Class:SynchroReplica/Action:denydelete_all'), 'denydelete');
-						} else {
-							$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:ModifyAll:'.$sSelectedAlias, Dict::Format('UI:Menu:ModifyAll_'.$sActionLabelCodeSuffix, $sSelectedClassName));
-						}
+						$this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:ModifyAll:'.$sSelectedAlias, Dict::Format('UI:Menu:ModifyAll_'.$sActionLabelCodeSuffix, $sSelectedClassName));
 					}
 					if ($bIsBulkDeleteAllowed) {
 						$this->AddBulkDeleteObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:BulkDelete:'.$sSelectedAlias, Dict::Format('UI:Menu:BulkDelete_'.$sActionLabelCodeSuffix, $sSelectedClassName));
@@ -2485,11 +2478,11 @@ class MenuBlock extends DisplayBlock
 	 * @since 3.1.0
 	 * @internal
 	 */
-	protected function AddBulkModifyObjectsMenuAction(array &$aActions, string $sClass, string $sFilter, string $sActionIdentifier = 'UI:Menu:ModifyAll', $sActionLabel = 'UI:Menu:ModifyAll', $sOperationName = 'modify'): void
+	protected function AddBulkModifyObjectsMenuAction(array &$aActions, string $sClass, string $sFilter, string $sActionIdentifier = 'UI:Menu:ModifyAll', $sActionLabel = 'UI:Menu:ModifyAll'): void
 	{
 		$aActions[$sActionIdentifier] = [
-				'label' => Dict::S($sActionLabel),
-				'url'   => $this->PrepareUrlForStandardMenuAction($sClass, 'operation=select_for_'.$sOperationName.'_all&class='.$sClass.'&filter='.urlencode($sFilter)),
+			'label' => Dict::S($sActionLabel),
+			'url' => $this->PrepareUrlForStandardMenuAction($sClass, "operation=select_for_modify_all&class=$sClass&filter=".urlencode($sFilter)),
 		] + $this->GetDefaultParamsForMenuAction();
 	}
 

application/exceptions/CoreException.php

@@ -14,8 +14,6 @@ class CoreException extends Exception
 	/**
 	 * CoreException constructor.
 	 *
-	 * ATTENTION: Logging here will break the CI
-	 *
 	 * @param string $sIssue error message
 	 * @param array|null $aContextData key/value array, value MUST implements _toString
 	 * @param string $sImpact

application/forms.class.inc.php

@@ -1387,7 +1387,7 @@ class DesignerIconSelectionField extends DesignerFormField
 	public function AddAllowedValue($aValue)
 	{
 		// Add a null value to the list of allowed values
-		$this->aAllowedValues = array_merge([$aValue], $this->aAllowedValues ?? [null]);
+		$this->aAllowedValues = array_merge([$aValue], $this->aAllowedValues);
 	}
 	public function EnableUpload($sIconUploadUrl)
 	{

application/loginwebpage.class.inc.php

@@ -25,11 +25,11 @@
  */
 
 use Combodo\iTop\Application\Branding;
+use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\WebPage\ErrorPage;
 use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
-use Combodo\iTop\Service\Session\Session;
 
 /**
  * Web page used for displaying the login form
@@ -369,7 +369,16 @@ class LoginWebPage extends NiceWebPage
 	public static function ResetSession()
 	{
 		// Unset all of the session variables.
-		Session::UnsetAll();
+		Session::Unset('auth_user');
+		Session::Unset('login_state');
+		Session::Unset('can_logoff');
+		Session::Unset('archive_mode');
+		Session::Unset('impersonate_user');
+		Session::Unset('PluginProperties');
+		Session::Unset('UrlMakerClass');
+		Session::Unset('itop_env');
+		Session::Unset('obj_messages');
+		Session::Unset('profile_list');
 		UserRights::_ResetSessionCache();
 		// If it's desired to kill the session, also delete the session cookie.
 		// Note: This will destroy the session, and not just the session data!

application/query.class.inc.php

@@ -113,43 +113,17 @@ abstract class Query extends cmdbAbstractObject
 			]
 		));
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey(
-			"owner_id",
-			[
-				"targetclass" => 'Contact',
-				"allowed_values" => null,
-				"sql" => 'owner_id',
-				"is_null_allowed" => true,
-				"depends_on" => [],
-				"display_style" => 'select',
-				"always_load_in_tables" => false,
-				"on_target_delete" => DEL_AUTO,
-			]
-		));
-
-		MetaModel::Init_AddAttribute(new AttributeEnumSet(
-			"usages",
-			[
-				"allowed_values" => null,
-				"possible_values" => new ValueSetEnumPadded("export,reference,notif,draft,dashlet"),
-				"sql" => "usages",
-				"depends_on" => [],
-				"is_null_allowed" => true,
-				"max_items" => 12,
-			]
-		));
-
 		// Display lists
 		MetaModel::Init_SetZListItems(
 			'details',
-			['name', 'is_template', 'owner_id', 'usages', 'description']
+			['name', 'is_template', 'description']
 		); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', ['description', 'usages']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', ['name', 'description', 'is_template']); // Criteria of the std search form
 		MetaModel::Init_SetZListItems(
 			'default_search',
-			['name', 'description', 'is_template', 'owner_id', 'usages']
+			['name', 'description', 'is_template']
 		); // Criteria of the default search form
 		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
@@ -169,15 +143,6 @@ abstract class Query extends cmdbAbstractObject
 		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
 	}
 
-	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = [])
-	{
-		// read only attribute
-		if (in_array($sAttCode, ['export_count', 'export_last_date', 'export_last_user_id'])) {
-			return OPT_ATT_READONLY;
-		}
-		return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
-	}
-
 	/**
 	 * Return export url.
 	 *
@@ -249,15 +214,15 @@ class QueryOQL extends Query
 		MetaModel::Init_SetZListItems(
 			'details',
 			[
-				'col:col1' => ['fieldset:Query:baseinfo' => ['name', 'is_template', 'owner_id', 'usages', 'description', 'oql', 'fields']],
+				'col:col1' => ['fieldset:Query:baseinfo' => ['name', 'is_template', 'description', 'oql', 'fields']],
 				'col:col2' => ['fieldset:Query:exportInfo' => ['export_count', 'export_last_date', 'export_last_user_id', 'export_last_user_contact']],
 			]
 		); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', ['description', 'usages']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems(
 			'standard_search',
-			['name', 'description', 'is_template', 'owner_id', 'usages', 'oql']
+			['name', 'description', 'is_template', 'fields', 'oql']
 		); // Criteria of the std search form
 	}
 

application/startup.inc.php

@@ -17,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\Helper\Session;
-use Combodo\iTop\Service\Startup\StartupService;
 
 require_once(APPROOT.'core/cmdbobject.class.inc.php');
 require_once(APPROOT.'application/utils.inc.php');
@@ -70,7 +69,26 @@ $oKPI->ComputeAndReport("Session Start");
 
 $sSwitchEnv = utils::ReadParam('switch_env', null);
 $bAllowCache = true;
-$sEnv = (new StartupService())->SetItopEnvironment($sSwitchEnv, $bAllowCache);
+if (($sSwitchEnv != null) && file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE) && (Session::Get('itop_env') !== $sSwitchEnv)) {
+	Session::Set('itop_env', $sSwitchEnv);
+	$sEnv = $sSwitchEnv;
+	$bAllowCache = false;
+	// Reset the opcache since otherwise the PHP "model" files may still be cached !!
+	if (function_exists('opcache_reset')) {
+		// Zend opcode cache
+		opcache_reset();
+	}
+	if (function_exists('apc_clear_cache')) {
+		// APC(u) cache
+		apc_clear_cache();
+	}
+	// TODO: reset the credentials as well ??
+} elseif (Session::IsSet('itop_env')) {
+	$sEnv = Session::Get('itop_env');
+} else {
+	$sEnv = ITOP_DEFAULT_ENV;
+	Session::Set('itop_env', ITOP_DEFAULT_ENV);
+}
 $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
 try {
 	MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);

application/utils.inc.php

@@ -284,7 +284,9 @@ class utils
 		}
 		// Read and record the value for switching the archive mode
 		$iCurrent = self::ReadParam('with-archive', $iDefault);
-		Session::Set('archive_mode', $iCurrent);
+		if (Session::IsInitialized()) {
+			Session::Set('archive_mode', $iCurrent);
+		}
 		// Read and use the value for the current page (web services)
 		$iCurrent = self::ReadParam('with_archive', $iCurrent, true);
 		self::$bPageMode = ($iCurrent == 1);
@@ -974,7 +976,7 @@ class utils
 			return self::$oConfig;
 		}
 
-		$sProductionEnvConfigPath = self::GetConfigFilePath(ITOP_DEFAULT_ENV);
+		$sProductionEnvConfigPath = self::GetConfigFilePath('production');
 		if (file_exists($sProductionEnvConfigPath)) {
 			$oProductionEnvDiskConfig = new Config($sProductionEnvConfigPath);
 			self::SetConfig($oProductionEnvDiskConfig);
@@ -1886,7 +1888,7 @@ SQL;
 			CURLOPT_HEADER         => false,    // don't return the headers in the output
 			CURLOPT_FOLLOWLOCATION => true,     // follow redirects
 			CURLOPT_ENCODING       => "",       // handle all encodings
-			CURLOPT_USERAGENT      => static::GetConfig()->Get('http.request.user_agent'), // who am i
+			CURLOPT_USERAGENT      => "spider", // who am i
 			CURLOPT_AUTOREFERER    => true,     // set referer on redirect
 			CURLOPT_CONNECTTIMEOUT => 120,      // timeout on connect
 			CURLOPT_TIMEOUT        => 120,      // timeout on response
@@ -1917,9 +1919,7 @@ SQL;
 				$aResponseHeaders[$sName] = $sValue;
 			}
 		}
-		if (PHP_VERSION_ID < 80000) {
-			curl_close($ch);
-		}
+		curl_close($ch);
 
 		return $response;
 	}
@@ -3022,6 +3022,7 @@ TXT
 	 * Note: Only works for backoffice URLs for now
 	 *
 	 * @param string $sText Text containing the mentioned objects to be found
+	 * @param string $sFormat {@uses static::ENUM_TEXT_FORMAT_HTML, ...}
 	 *
 	 * @return array Array of object classes / IDs for the ones found in $sText
 	 *
@@ -3036,45 +3037,13 @@ TXT
 	public static function GetMentionedObjectsFromText(string $sText): array
 	{
 		$aMentionedObjects = [];
-		$aMentionAllowedClasses = MetaModel::GetConfig()->Get('mentions.allowed_classes');
-		$oDom = new \DOMDocument();
-		$bPreviousUseInternalErrors = libxml_use_internal_errors(true); // to keep processing even in case of "invalid" HTML, cf. testGetMentionedObjectsFromText
+		$aMentionMatches = [];
+		$sText = html_entity_decode($sText);
 
-		try {
-			$oDom->loadHTML('<?xml encoding="UTF-8">'.$sText);
-		} finally {
-			libxml_clear_errors();
-			libxml_use_internal_errors($bPreviousUseInternalErrors);
-		}
-		$oXpath = new \DOMXPath($oDom);
-		$oNodes = $oXpath->query('//a[@data-object-class and @data-object-key]');
-
-		foreach ($oNodes as $oObjNode) {
-			$sMatchedClass = $oObjNode->getAttribute('data-object-class');
-			$sMatchedId = $oObjNode->getAttribute('data-object-key');
-			$sMatchedName = trim($oObjNode->textContent);
-
-			// Ensure that what we found is actually configured as a mention
-			$sMentionPrefix = array_search($sMatchedClass, $aMentionAllowedClasses);
-			// - No direct configuration for the matched class, let's look for a configuration on parent classes
-			if (false === $sMentionPrefix) {
-				$bHasMentionConfigurationForParentClass = false;
-				foreach (MetaModel::EnumParentClasses($sMatchedClass, ENUM_PARENT_CLASSES_EXCLUDELEAF, false) as $aMatchedParentClass) {
-					$sMentionPrefix = array_search($aMatchedParentClass, $aMentionAllowedClasses);
-					if (false !== $sMentionPrefix) {
-						$bHasMentionConfigurationForParentClass = true;
-						break;
-					}
-				}
-
-				if (false === $bHasMentionConfigurationForParentClass) {
-					continue;
-				}
-			}
-			// - Test if the name starts with $sMentionPrefix (e.g. '@' for 'Contact' class)
-			if (false === str_starts_with($sMatchedName, $sMentionPrefix)) {
-				continue;
-			}
+		preg_match_all('/<a\s*([^>]*)data-object-class="([^"]*)"\s.*data-object-key="([^"]*)"/Ui', $sText, $aMentionMatches);
+		foreach ($aMentionMatches[0] as $iMatchIdx => $sCompleteMatch) {
+			$sMatchedClass = $aMentionMatches[2][$iMatchIdx];
+			$sMatchedId = $aMentionMatches[3][$iMatchIdx];
 
 			// Prepare array for matched class if not already present
 			if (!array_key_exists($sMatchedClass, $aMentionedObjects)) {
@@ -3223,74 +3192,4 @@ TXT
 			}
 		}
 	}
-
-	/**
-	 * Read memory limit from the php.ini file
-	 *
-	 * @return int Memory limit in bytes
-	 */
-	public static function GetMemoryLimit(): int
-	{
-		$sLimit = ini_get('memory_limit');
-		if ($sLimit == '-1') {
-			return 128 * 1048576;
-		}
-		switch (substr($sLimit, -1)) {
-			case 'M':
-			case 'm':
-				return (int)$sLimit * 1048576;
-			case 'K':
-			case 'k':
-				return (int)$sLimit * 1024;
-			case 'G':
-			case 'g':
-				return (int)$sLimit * 1073741824;
-			default:
-				return (int)$sLimit;
-		}
-	}
-
-	/**
-	 * @since 3.3.0 N°9875
-	 * Open archive and raise appropriate exception.
-	 * Warning: do not forget to close archive afterwhile
-	 * @param string $sArchiveFilePath
-	 * @param int|null $flags
-	 * @return ZipArchive
-	 * @throws \Exception
-	 */
-	public static function ZipArchiveOpen(string $sArchiveFilePath, int|null $flags = null): ZipArchive
-	{
-		$oZip = new ZipArchive();
-		if (is_null($flags)) {
-			$code = $oZip->open($sArchiveFilePath);
-		} else {
-			$code = $oZip->open($sArchiveFilePath, $flags);
-		}
-		if (true !== $code) {
-			//ZipArchive::ZIP_ER_NOZIP : 19
-			if ($code === 19) {
-				throw new \Exception(sprintf('Cannot open zip file due to inconsistent or empty content'));
-			}
-
-			throw new \Exception(sprintf('Cannot open zip file due to error code %s', $code));
-		}
-		return $oZip;
-	}
-
-	/**
-	* @since 3.3.0 N°9875
-	* @param string $sDirectory
-	* @param string $sPrefix
-	* @return ZipArchive
-	* @throws \Exception
-	 */
-	public static function ZipArchiveCreateWithTempNam(string $sDirectory, string $sPrefix): ZipArchive
-	{
-		$sTempnam = tempnam($sDirectory, $sPrefix);
-		unlink($sTempnam);
-		$sArchiveName = $sTempnam.'.zip';
-
-		return self::ZipArchiveOpen($sArchiveName, ZipArchive::CREATE);
-	}
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "24e7507794b971955358df5f2b143ac4",
+    "content-hash": "1cca58a0e26794fb9c546a001f7f7de8",
     "packages": [
         {
             "name": "apereo/phpcas",
@@ -5570,16 +5570,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.28.0",
+            "version": "v3.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b"
+                "reference": "a6769aefb305efef849dc25c9fd1653358c148f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
-                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6769aefb305efef849dc25c9fd1653358c148f0",
+                "reference": "a6769aefb305efef849dc25c9fd1653358c148f0",
                 "shasum": ""
             },
             "require": {
@@ -5634,7 +5634,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.28.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.24.0"
             },
             "funding": [
                 {
@@ -5646,7 +5646,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-03T20:44:34+00:00"
+            "time": "2026-03-17T21:31:11+00:00"
         }
     ],
     "packages-dev": [

core/autoload.php

@@ -24,7 +24,7 @@ MetaModel::IncludeModule('application/user.dashboard.class.inc.php');
 MetaModel::IncludeModule('application/audit.rule.class.inc.php');
 MetaModel::IncludeModule('application/audit.domain.class.inc.php');
 MetaModel::IncludeModule('application/query.class.inc.php');
-MetaModel::IncludeModule('setup/moduleinstallation/moduleinstallation.class.inc.php');
+MetaModel::IncludeModule('setup/moduleinstallation.class.inc.php');
 
 MetaModel::IncludeModule('core/event.class.inc.php');
 MetaModel::IncludeModule('core/action.class.inc.php');

core/cmdbsource.class.inc.php

@@ -916,9 +916,7 @@ class CMDBSource
 		$aColumn = [];
 		$aData = self::QueryToArray($sSql);
 		foreach ($aData as $aRow) {
-			if ($aRow[$col] !== null) {
-				$aColumn[] = $aRow[$col];
-			}
+			@$aColumn[] = $aRow[$col];
 		}
 		return $aColumn;
 	}

core/config.class.inc.php

@@ -20,6 +20,9 @@
  *
  */
 
+use Combodo\iTop\Config\Validator\iTopConfigAstValidator;
+use Combodo\iTop\Config\Validator\iTopConfigSyntaxValidator;
+
 define('ITOP_APPLICATION', 'iTop');
 define('ITOP_APPLICATION_SHORT', 'iTop');
 
@@ -1179,8 +1182,8 @@ class Config
 		'tracking_level_linked_set_default' => [
 			'type' => 'integer',
 			'description' => 'Default tracking level if not explicitly set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)',
-			'default' => LINKSET_TRACKING_NONE,
-			'value' => LINKSET_TRACKING_NONE,
+			'default' => LINKSET_TRACKING_LIST,
+			'value' => LINKSET_TRACKING_LIST,
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
@@ -2752,13 +2755,14 @@ class Config
 	 *
 	 * @param array $aParamValues
 	 * @param ?string $sModulesDir
+	 * @param bool $bPreserveModuleSettings
 	 *
 	 * @return void The current object is modified directly
 	 *
 	 * @throws \Exception
 	 * @throws \CoreException
 	 */
-	public function UpdateFromParams($aParamValues, $sModulesDir = null)
+	public function UpdateFromParams($aParamValues, $sModulesDir = null, $bPreserveModuleSettings = false)
 	{
 		if (isset($aParamValues['application_path'])) {
 			$this->Set('app_root_url', $aParamValues['application_path']);
@@ -2806,10 +2810,7 @@ class Config
 		} else {
 			$aSelectedModules = null;
 		}
-
-		if (! is_null($sModulesDir)) {
-			$this->UpdateIncludes($sModulesDir, $aSelectedModules);
-		}
+		$this->UpdateIncludes($sModulesDir, $aSelectedModules);
 
 		if (isset($aParamValues['source_dir'])) {
 			$this->Set('source_dir', $aParamValues['source_dir']);
@@ -2827,13 +2828,17 @@ class Config
 	 *
 	 * @throws Exception
 	 */
-	public function UpdateIncludes(string $sModulesDir, $aSelectedModules = null)
+	public function UpdateIncludes($sModulesDir, $aSelectedModules = null)
 	{
+		if ($sModulesDir === null) {
+			return;
+		}
+
 		// Initialize the arrays below with default values for the application...
 		$oEmptyConfig = new Config('dummy_file', false); // Do NOT load any config file, just set the default values
 		$aAddOns = $oEmptyConfig->GetAddOns();
 
-		$aModules = ModuleDiscovery::GetModulesOrderedByDependencies([APPROOT.$sModulesDir]);
+		$aModules = ModuleDiscovery::GetAvailableModules([APPROOT.$sModulesDir]);
 		foreach ($aModules as $sModuleId => $aModuleInfo) {
 			list($sModuleName, $sModuleVersion) = ModuleDiscovery::GetModuleName($sModuleId);
 			if (is_null($aSelectedModules) || in_array($sModuleName, $aSelectedModules)) {

core/dbobject.class.php

@@ -730,8 +730,13 @@ abstract class DBObject implements iDisplay
 	public function SetTrim($sAttCode, $sValue)
 	{
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-
-		$this->Set($sAttCode, $oAttDef->TrimValue($sValue));
+		$iMaxSize = $oAttDef->GetMaxSize();
+		$sLength = mb_strlen($sValue);
+		if ($iMaxSize && ($sLength > $iMaxSize)) {
+			$sMessage = " -truncated ($sLength chars)";
+			$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
+		}
+		$this->Set($sAttCode, $sValue);
 	}
 
 	/**
@@ -2033,7 +2038,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 			if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
-				$iLen = $oAtt->GetSize($toCheck);
+				$iLen = mb_strlen($toCheck);
 				if ($iLen > $iMaxSize) {
 					return "String too long (found $iLen, limited to $iMaxSize)";
 				}
@@ -5103,8 +5108,8 @@ abstract class DBObject implements iDisplay
 	protected function GetReferencingObjectsForDeletion($bAllowAllData = false)
 	{
 		$aDependentObjects = [];
-		$aReferencingMe = MetaModel::EnumReferencingClasses(get_class($this));
-		foreach ($aReferencingMe as $sRemoteClass => $aExtKeys) {
+		$aRererencingMe = MetaModel::EnumReferencingClasses(get_class($this));
+		foreach ($aRererencingMe as $sRemoteClass => $aExtKeys) {
 			/** @var \AttributeExternalKey $oExtKeyAttDef */
 			foreach ($aExtKeys as $sExtKeyAttCode => $oExtKeyAttDef) {
 				// skip if external key doesn't require the deletion cascading

core/dbobjectsearch.class.php

@@ -1935,8 +1935,9 @@ class DBObjectSearch extends DBSearch
 
 	/**
 	 * @inheritDoc
+	 * @return DBObjectSearch
 	 */
-	protected function ApplyDataFilters(): DBSearch
+	protected function ApplyDataFilters(): DBObjectSearch
 	{
 		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
 			return $this;

core/dbunionsearch.class.php

@@ -676,8 +676,9 @@ class DBUnionSearch extends DBSearch
 
 	/**
 	 * @inheritDoc
+	 * @return DBUnionSearch
 	 */
-	protected function ApplyDataFilters(): DBSearch
+	protected function ApplyDataFilters(): DBUnionSearch
 	{
 		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
 			return $this;

core/designdocument.class.inc.php

@@ -360,10 +360,10 @@ class DesignElement extends \DOMElement
 	 * @param string $sTagName
 	 * @param string|null $sDefault
 	 *
-	 * @return null|string
+	 * @return string
 	 * @throws \DOMFormatException
 	 */
-	public function GetChildText($sTagName, $sDefault = null): ?string
+	public function GetChildText($sTagName, $sDefault = null)
 	{
 		$sRet = $sDefault;
 		if ($oChild = $this->GetOptionalElement($sTagName)) {

core/inlineimage.class.inc.php

@@ -434,7 +434,7 @@ JS
 	 * Resize an image so that it fits the maximum width/height defined in the config file
 	 * @param ormDocument $oImage The original image stored as an array (content / mimetype / filename)
 	 * @return ormDocument The resampled image (or the original one if it already fit)
-	 * @deprecated 3.3.0 Use ormDocument::ResizeImageToFit instead
+	 * @deprecated since 3.3.0 Replaced by ormDocument::ResizeImageToFit
 	 */
 	public static function ResizeImageToFit(ormDocument $oImage, &$aDimensions = null)
 	{

core/log.class.inc.php

@@ -614,13 +614,6 @@ class LogChannels
 	 * @since 3.2.0
 	 */
 	public const SECURITY = 'Security';
-
-	/**
-	 * For Session parameters
-	 *
-	 * @Since 3.3.0
-	 */
-	public const SESSION_PARAMETERS = 'SessionParameters';
 }
 
 abstract class LogAPI

core/metamodel.class.php

@@ -22,7 +22,6 @@ use Combodo\iTop\Application\EventRegister\ApplicationEvents;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
-use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReader;
 
 require_once APPROOT.'core/modulehandler.class.inc.php';
 require_once APPROOT.'core/querymodifier.class.inc.php';
@@ -129,7 +128,7 @@ abstract class MetaModel
 	/** @var array */
 	private static $m_aClassToFile = [];
 	/** @var string */
-	protected static $m_sEnvironment = ITOP_DEFAULT_ENV;
+	protected static $m_sEnvironment = 'production';
 
 	/**
 	 * Objects currently created/updated.
@@ -463,43 +462,6 @@ abstract class MetaModel
 		return call_user_func([$sClass, 'GetClassDescription'], $sClass);
 	}
 
-	/**
-	 * @param string $sClass
-	 *
-	 * @return string
-	 * @throws \CoreException
-	 */
-	final public static function GetModuleName($sClass)
-	{
-		try {
-			$oReflectionClass = new ReflectionClass($sClass);
-			$sDir = realpath(dirname($oReflectionClass->getFileName()));
-			$sApproot = realpath(APPROOT);
-			while (($sDir !== $sApproot) && (str_contains($sDir, $sApproot))) {
-				$aFiles = glob("$sDir/module.*.php");
-				if (count($aFiles) > 1) {
-					return 'core';
-				}
-
-				if (count($aFiles) == 0) {
-					$sDir = realpath(dirname($sDir));
-					continue;
-				}
-
-				$sModuleFilePath = $aFiles[0];
-				$aModuleInfo = ModuleFileReader::GetInstance()->ReadModuleFileInformation($sModuleFilePath);
-				$sModuleId = $aModuleInfo[ModuleFileReader::MODULE_INFO_ID];
-				list($sModuleName, ) = ModuleDiscovery::GetModuleName($sModuleId);
-
-				return $sModuleName;
-			}
-		} catch (\Exception $e) {
-			throw new CoreException("Cannot find class module", ['class' => $sClass], '', $e);
-		}
-
-		return 'core';
-	}
-
 	/**
 	 * @param string $sClass
 	 *
@@ -1642,10 +1604,10 @@ abstract class MetaModel
 		if ($sFilterCode == 'id') {
 			return true;
 		}
-		if (array_key_exists($sClass, self::$m_aMagicFields) && in_array($sFilterCode, self::$m_aMagicFields[$sClass])) {
+		if (array_key_exists($sClass, self::$m_aMagicFields) && array_key_exists($sFilterCode, self::$m_aMagicFields[$sClass])) {
 			return true;
 		}
-		if (array_key_exists($sClass, self::$m_aFilterForbiddenAttributes) && in_array($sFilterCode, self::$m_aFilterForbiddenAttributes[$sClass])) {
+		if (array_key_exists($sClass, self::$m_aFilterForbiddenAttributes) && array_key_exists($sFilterCode, self::$m_aFilterForbiddenAttributes[$sClass])) {
 			return false;
 		}
 		return self::IsValidAttCode($sClass, $sFilterCode);
@@ -2963,9 +2925,8 @@ abstract class MetaModel
 						self::$m_aMagicFields[] = $sClass;
 					}
 					self::$m_aMagicFields[$sClass][] = $sCode;
-					self::$m_aAttribOrigins[$sClass][$sCode] = self::$m_aAttribOrigins[$sClass][$sAttCode];
 				}
-				if (!$oAttDef->IsValidFilterAttribute()) {
+				if (!$oAttDef->IsSearchable()) {
 					if (!array_key_exists($sClass, self::$m_aFilterForbiddenAttributes)) {
 						self::$m_aFilterForbiddenAttributes[] = $sClass;
 					}
@@ -4660,15 +4621,12 @@ abstract class MetaModel
 	 * @throws \CoreException
 	 * @throws \MySQLException
 	 */
-	public static function DBExists($bMustBeComplete = true, ?string $sDBName = null)
+	public static function DBExists($bMustBeComplete = true)
 	{
-		if (is_null($sDBName)) {
-			$sDBName = self::$m_sDBName;
-		}
-		if (!CMDBSource::IsDB($sDBName)) {
+		if (!CMDBSource::IsDB(self::$m_sDBName)) {
 			return false;
 		}
-		CMDBSource::SelectDB($sDBName);
+		CMDBSource::SelectDB(self::$m_sDBName);
 
 		$aFound = [];
 		$aMissing = [];
@@ -5751,7 +5709,7 @@ abstract class MetaModel
 	 * @throws \DictExceptionUnknownLanguage
 	 * @throws \Exception
 	 */
-	public static function Startup($config, $bModelOnly = false, $bAllowCache = true, $bTraceSourceFiles = false, $sEnvironment = ITOP_DEFAULT_ENV)
+	public static function Startup($config, $bModelOnly = false, $bAllowCache = true, $bTraceSourceFiles = false, $sEnvironment = 'production')
 	{
 		// Startup on a new environment is not supported
 		static $bStarted = false;
@@ -5762,37 +5720,36 @@ abstract class MetaModel
 
 		self::$m_sEnvironment = $sEnvironment;
 
-		if (!defined('MODULESROOT')) {
-			define('MODULESROOT', APPROOT.'env-'.self::$m_sEnvironment.'/');
+		try {
+			if (!defined('MODULESROOT')) {
+				define('MODULESROOT', APPROOT.'env-'.self::$m_sEnvironment.'/');
 
-			self::$m_bTraceSourceFiles = $bTraceSourceFiles;
+				self::$m_bTraceSourceFiles = $bTraceSourceFiles;
 
-			// $config can be either a filename, or a Configuration object (volatile!)
-			if ($config instanceof Config) {
-				self::LoadConfig($config, $bAllowCache);
-			} else {
-				self::LoadConfig(new Config($config), $bAllowCache);
+				// $config can be either a filename, or a Configuration object (volatile!)
+				if ($config instanceof Config) {
+					self::LoadConfig($config, $bAllowCache);
+				} else {
+					self::LoadConfig(new Config($config), $bAllowCache);
+				}
+
+				if ($bModelOnly) {
+					return;
+				}
 			}
 
-			if ($bModelOnly) {
-				// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
-				EventService::InitService();
-				EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
-				return;
+			CMDBSource::SelectDB(self::$m_sDBName);
+
+			foreach (MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass) {
+				$oPHPClass::OnMetaModelStarted();
 			}
+
+			ExpressionCache::Warmup();
+		} finally {
+			// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
+			EventService::InitService();
+			EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
 		}
-
-		CMDBSource::SelectDB(self::$m_sDBName);
-
-		foreach (MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass) {
-			$oPHPClass::OnMetaModelStarted();
-		}
-
-		ExpressionCache::Warmup();
-
-		// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
-		EventService::InitService();
-		EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
 	}
 
 	/**

core/oqlactualclasstreeresolver.class.inc.php

@@ -60,13 +60,15 @@ class OQLActualClassTreeResolver
 		$aTranslateFields = [];
 		foreach ($aExpectedAttributes as $sAttCode => $oExpression) {
 			// 'id' is managed later
-			if ($sAttCode === 'id') {
+			if ($sAttCode == 'id') {
 				continue;
 			}
 			// Attributes can be stored in attributes list or for magic ones into filter codes list.
 			$sOriginClass = null;
-			if (MetaModel::IsValidAttCode($sClass, $sAttCode) || MetaModel::IsValidFilterCode($sClass, $sAttCode)) {
+			if (MetaModel::IsValidAttCode($sClass, $sAttCode)) {
 				$sOriginClass = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
+			} elseif ($sAttCode == 'id') {
+				$sOriginClass = $sClass;
 			} else {
 				continue;
 			}

core/ormdocument.class.inc.php

@@ -340,14 +340,13 @@ class ormDocument
 	 * @param string $sContentDisposition Either 'inline' or 'attachment'
 	 * @param string $sSecretField The attcode of the field containing a "secret" to be provided in order to retrieve the file
 	 * @param string $sSecretValue The value of the secret to be compared with the value of the attribute $sSecretField
-	 * @param bool $bAllowAllData If true, no rights filtering is applied
 	 *
 	 * @return void
 	 */
-	public static function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisposition = 'attachment', $sSecretField = null, $sSecretValue = null, $bAllowAllData = false)
+	public static function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisposition = 'attachment', $sSecretField = null, $sSecretValue = null)
 	{
 		try {
-			$oObj = MetaModel::GetObject($sClass, $id, false, $bAllowAllData);
+			$oObj = MetaModel::GetObject($sClass, $id, false, false);
 			if (!is_object($oObj)) {
 				// If access to the document is not granted, check if the access to the host object is allowed
 				$oObj = MetaModel::GetObject($sClass, $id, false, true);
@@ -408,7 +407,7 @@ class ormDocument
 	 * @param int $iMaxImageHeight Maximum height for the resized image
 	 * @param array|null $aFinalDimensions Image dimensions after resizing or null if unable to read the image
 	 * @return ormDocument The resampled image
-	 * @since 3.3.0 N°3124
+	 *
 	 */
 	public function ResizeImageToFit(int $iMaxWidth, int $iMaxHeight, array|null &$aFinalDimensions = null): static
 	{

core/ormpassword.class.inc.php

@@ -52,7 +52,7 @@ class ormPassword
 	public function SetPassword($sClearTextPassword)
 	{
 		$iHashAlgo = MetaModel::GetConfig()->GetPasswordHashAlgo();
-		$this->m_sHashed = password_hash($sClearTextPassword ?? '', $iHashAlgo);
+		$this->m_sHashed = password_hash($sClearTextPassword, $iHashAlgo);
 	}
 
 	/**
@@ -99,10 +99,10 @@ class ormPassword
 		$aInfo = password_get_info($this->m_sHashed);
 		if (is_null($aInfo["algo"]) || $aInfo["algo"] === 0) {
 			// - Unknown algorithm, assume it's a legacy password
-			$sHashedPwd = $this->ComputeHash($sClearTextPassword ?? '');
+			$sHashedPwd = $this->ComputeHash($sClearTextPassword);
 			$bResult = hash_equals($this->m_sHashed, $sHashedPwd);
 		} else {
-			$bResult = password_verify($sClearTextPassword ?? '', $this->m_sHashed);
+			$bResult = password_verify($sClearTextPassword, $this->m_sHashed);
 		}
 		return $bResult;
 	}

core/ormtagset.class.inc.php

@@ -43,24 +43,24 @@ final class ormTagSet extends ormSet
 
 	/**
 	 *
-	 * @param array|null $aItems
+	 * @param array $aTagCodes
 	 *
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue when a code is invalid
 	 */
-	public function SetValues($aItems)
+	public function SetValues($aTagCodes)
 	{
-		if (is_null($aItems)) {
-			$aItems = [];
+		if (is_null($aTagCodes)) {
+			$aTagCodes = [];
 		}
-		if (!is_array($aItems)) {
-			throw new CoreUnexpectedValue("Wrong value {$aItems} for {$this->sClass}:{$this->sAttCode}");
+		if (!is_array($aTagCodes)) {
+			throw new CoreUnexpectedValue("Wrong value {$aTagCodes} for {$this->sClass}:{$this->sAttCode}");
 		}
 
 		$oTags = [];
 		$iCount = 0;
 		$bError = false;
-		foreach ($aItems as $sTagCode) {
+		foreach ($aTagCodes as $sTagCode) {
 			$iCount++;
 			if (($this->iLimit != 0) && ($iCount > $this->iLimit)) {
 				$bError = true;

core/restservices.class.inc.php

@@ -248,45 +248,6 @@ class RestResultWithObjects extends RestResult
 	}
 }
 
-/**
- * @package RESTAPI
- * @api
- */
-class RestResultWithObjectSets extends RestResultWithObjects
-{
-	private $current_object = null;
-
-	public function MakeNewObjectSet()
-	{
-		$arr = [];
-		$this->current_object = &$arr;
-		$this->objects[] = &$arr;
-	}
-
-	/**
-	 * Report the given object
-	 *
-	 * @api
-	 * @param string $sObjectAlias Name of the subobject, usually the OQL class alias
-	 * @param int $iCode An error code (RestResult::OK is no issue has been found)
-	 * @param string $sMessage Description of the error if any, an empty string otherwise
-	 * @param DBObject $oObject The object being reported
-	 * @param array|null $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
-	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 *
-	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 */
-	public function AppendSubObject($sObjectAlias, $iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
-	{
-		$oObjRes = ObjectResult::FromDBObject($oObject, $aFieldSpec, $bExtendedOutput, $iCode, $sMessage);
-		$this->current_object[$sObjectAlias] = $oObjRes;
-	}
-}
-
 /**
  * @package RESTAPI
  * @api
@@ -539,21 +500,14 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 				break;
 
 			case 'core/get':
-				$sClassParam =  RestUtils::GetMandatoryParam($aParams, 'class');
+				$sClass = RestUtils::GetClass($aParams, 'class');
 				$key = RestUtils::GetMandatoryParam($aParams, 'key');
-				$sShowFields = RestUtils::GetOptionalParam($aParams, 'output_fields', '*');
+				$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+				$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
 				$iLimit = (int)RestUtils::GetOptionalParam($aParams, 'limit', 0);
 				$iPage = (int)RestUtils::GetOptionalParam($aParams, 'page', 1);
 
-				// Validate the class(es)
-				$aClass = explode(',', $sClassParam);
-				foreach ($aClass as $sClass) {
-					if (!MetaModel::IsValidClass(trim($sClass))) {
-						throw new Exception("class '$sClass' is not valid");
-					}
-				}
-
-				$oObjectSet = RestUtils::GetObjectSetFromKey($sClassParam, $key, $iLimit, self::getOffsetFromLimitAndPage($iLimit, $iPage));
+				$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key, $iLimit, self::getOffsetFromLimitAndPage($iLimit, $iPage));
 				$sTargetClass = $oObjectSet->GetFilter()->GetClass();
 
 				if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ) != UR_ALLOWED_YES) {
@@ -565,56 +519,8 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 				} elseif ($iPage < 1) {
 					$oResult->code = RestResult::INVALID_PAGE;
 					$oResult->message = "The request page number is not valid. It must be an integer greater than 0";
-				} elseif (count($oObjectSet->GetSelectedClasses()) > 1) {
-					$oResult = new RestResultWithObjectSets();
-					$aCache = [];
-					$aShowFields = [];
-					foreach ($oObjectSet->GetSelectedClasses() as $sSelectedClass) {
-						$aShowFields = array_merge($aShowFields, RestUtils::GetFieldList($sSelectedClass, $aParams, 'output_fields', false));
-					}
-
-					while ($oObjects = $oObjectSet->FetchAssoc()) {
-						$oResult->MakeNewObjectSet();
-
-						foreach ($oObjects as $sAlias => $oObject) {
-							if (!$oObject) {
-								continue;
-							}
-
-							if (!array_key_exists($sAlias, $aCache)) {
-								$sClass = get_class($oObject);
-								$bExtendedOutput = RestUtils::HasRequestedExtendedOutput($sShowFields);
-
-								if (!RestUtils::HasRequestedAllOutputFields($sShowFields)) {
-									$aFields = $aShowFields[$sClass];
-									//Id is not a valid attribute to optimize
-									if ($aFields && in_array('id', $aFields)) {
-										unset($aFields[array_search('id', $aFields)]);
-									}
-									$aAttToLoad = [$sAlias => $aFields];
-									$oObjectSet->OptimizeColumnLoad($aAttToLoad);
-								}
-								$aCache[$sAlias] = [
-									'aShowFields' => $aShowFields,
-									'bExtendedOutput' => $bExtendedOutput,
-								];
-							} else {
-								$aShowFields = $aCache[$sAlias]['aShowFields'];
-								$bExtendedOutput = $aCache[$sAlias]['bExtendedOutput'];
-							}
-
-							$oResult->AppendSubObject($sAlias, 0, '', $oObject, $aShowFields, $bExtendedOutput);
-						}
-					}
-					$oResult->message = "Found: ".$oObjectSet->Count();
 				} else {
-					$aShowFields = [];
-					foreach ($aClass as $sSelectedClass) {
-						$sSelectedClass = trim($sSelectedClass);
-						$aShowFields = array_merge($aShowFields, RestUtils::GetFieldList($sSelectedClass, $aParams, 'output_fields', false));
-					}
-
-					if (!RestUtils::HasRequestedAllOutputFields($sShowFields) && count($aShowFields) == 1) {
+					if (!$bExtendedOutput && RestUtils::GetOptionalParam($aParams, 'output_fields', '*') != '*') {
 						$aFields = $aShowFields[$sClass];
 						//Id is not a valid attribute to optimize
 						if (in_array('id', $aFields)) {
@@ -625,7 +531,7 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 					}
 
 					while ($oObject = $oObjectSet->Fetch()) {
-						$oResult->AddObject(0, '', $oObject, $aShowFields, RestUtils::HasRequestedExtendedOutput($sShowFields));
+						$oResult->AddObject(0, '', $oObject, $aShowFields, $bExtendedOutput);
 					}
 					$oResult->message = "Found: ".$oObjectSet->Count();
 				}

core/tabularbulkexport.class.inc.php

@@ -8,13 +8,6 @@
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Application\WebPage\WebPage;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalField;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalKey;
-use Combodo\iTop\Core\AttributeDefinition\AttributeFriendlyName;
-use Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey;
-use Combodo\iTop\Core\AttributeDefinition\AttributeLinkedSet;
-use Combodo\iTop\Core\AttributeDefinition\AttributeStopWatch;
-use Combodo\iTop\Core\AttributeDefinition\AttributeSubItem;
 
 /**
  * Bulk export: Tabular export: abstract base class for all "tabular" exports.
@@ -98,8 +91,8 @@ abstract class TabularBulkExport extends BulkExport
 	{
 		$aResult = [];
 		switch (get_class($oAttDef)) {
-			case AttributeExternalKey::class:
-			case AttributeHierarchicalKey::class:
+			case 'AttributeExternalKey':
+			case 'AttributeHierarchicalKey':
 
 				$bAddFriendlyName = true;
 				$oKeyAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
@@ -149,7 +142,7 @@ abstract class TabularBulkExport extends BulkExport
 				}
 				break;
 
-			case AttributeStopWatch::class:
+			case 'AttributeStopWatch':
 				foreach (MetaModel::ListAttributeDefs($sClass) as $sSubAttCode => $oSubAttDef) {
 					if ($oSubAttDef instanceof AttributeSubItem) {
 						if ($oSubAttDef->GetParentAttCode() == $sAttCode) {

core/userrights.class.inc.php

@@ -1530,37 +1530,6 @@ class UserRights
 		}
 	}
 
-	/**
-	 * @param User $oUser
-	 * @param array $aExcludedProfilesId Administrator by default, but can also be other proofiles depending on needs (e.g. power portal user or REST profile)
-	 * @return bool
-	 * @throws ArchivedObjectException
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 * @throws MySQLException
-	 */
-	public static function IsUserReadOnly(User $oUser, array $aExcludedProfilesId = [1]): bool
-	{
-		$oUserProfiles = $oUser->Get('profile_list');
-		$oUserRights = UserRights::GetModuleInstance();
-		while ($oUserProfile = $oUserProfiles->Fetch()) {
-			$iProfileId = $oUserProfile->Get('profileid');
-			if (in_array($iProfileId, $aExcludedProfilesId)) {
-				return false;
-			}
-			foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass) {
-				foreach (['w', 'bw', 'd', 'bd'] as $sWriteActionCode) {
-					$bIsGranted = $oUserRights->GetProfileActionGrant($iProfileId, $sClass, $sWriteActionCode);
-					if ($bIsGranted === true) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	 * @param string $sClass
 	 * @param int $iActionCode see UR_ACTION_* constants

css/backoffice/application/_user-rights.scss

@@ -4,7 +4,7 @@
  */
 
 $ibo-user-rights--padding-x: $ibo-spacing-400 !default;
-$ibo-user-rights--padding-y: $ibo-spacing-100 !default;
+$ibo-user-rights--padding-y: $ibo-spacing-200 !default;
 $ibo-user-rights--border-radius: $ibo-border-radius-400 !default;
 
 $ibo-user-rights--is-success--background-color: $ibo-color-success-100 !default;
@@ -18,8 +18,6 @@ $ibo-user-rights--is-failure--border-color: $ibo-color-danger-500 !default;
 $ibo-user-rights--is-failure--border: 1px solid $ibo-user-rights--is-failure--border-color !default;
 
 .ibo-user-rights {
-  display: inline-flex;
-  align-items: baseline;
   padding: $ibo-user-rights--padding-y $ibo-user-rights--padding-x;
   border-radius: $ibo-user-rights--border-radius;
   &.ibo-is-success {

css/backoffice/blocks-integrations/_all.scss

@@ -22,6 +22,4 @@
 @import "medallion-with-blocklist";
 @import "field-badge-within-datatable";
 @import "jquery-blockui-within-dialog";
-@import "jquery-blockui-within-datatable";
-@import "badge-with-badge";
-@import "extension-details-with-extension-details";
+@import "jquery-blockui-within-datatable";

css/backoffice/blocks-integrations/_badge-with-badge.scss

@@ -1,10 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-$ibo-badge--spacing-left--with-same-block: $ibo-spacing-200 !default;
-
-.ibo-badge + .ibo-badge {
-  margin-left: $ibo-badge--spacing-left--with-same-block;
-}

css/backoffice/blocks-integrations/_extension-details-with-extension-details.scss

@@ -1,11 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-$ibo-extension-details--margin-top: $ibo-spacing-300 !default;
-
-.ibo-extension-details + .ibo-extension-details,
-.ibo-extension-details--information--description .ibo-extension-details {
-	margin-top: $ibo-extension-details--margin-top;
-}

css/backoffice/components/_all.scss

@@ -33,5 +33,4 @@
 @import "field-badge";
 @import "file-select";
 @import "medallion-icon";
-@import "toast";
-@import "badge";
+@import "toast";

css/backoffice/components/_badge.scss

@@ -1,43 +0,0 @@
-$ibo-badge--padding-x : $ibo-spacing-200 !default;
-$ibo-badge--padding-y : $ibo-spacing-100 !default;
-$ibo-badge--border-radius : $ibo-border-radius-400 !default;
-
-$ibo-badge-colors: (
-		'primary': ($ibo-color-primary-100, $ibo-color-primary-900),
-		'secondary': ($ibo-color-secondary-100, $ibo-color-secondary-900),
-		'neutral': ($ibo-color-secondary-100, $ibo-color-secondary-900),
-		'information': ($ibo-color-information-100, $ibo-color-information-900),
-		'success': ($ibo-color-success-100, $ibo-color-success-900),
-		'failure': ($ibo-color-danger-100, $ibo-color-danger-900),
-		'warning': ($ibo-color-warning-100,$ibo-color-warning-900),
-		'danger': ($ibo-color-danger-100,$ibo-color-danger-900),
-		'grey' : ($ibo-color-grey-100, $ibo-color-grey-900),
-		'blue-grey': ($ibo-color-blue-grey-100, $ibo-color-blue-grey-900),
-		'blue': ($ibo-color-blue-100, $ibo-color-blue-900),
-		'cyan': ($ibo-color-cyan-100, $ibo-color-cyan-900),
-		'green': ($ibo-color-green-100, $ibo-color-green-900),
-		'orange' : ($ibo-color-orange-100, $ibo-color-orange-900),
-		'red': ($ibo-color-red-100, $ibo-color-red-900),
-		'pink': ($ibo-color-pink-100, $ibo-color-pink-900),
-		'purple': ($ibo-color-purple-100, $ibo-color-purple-900),
-		'yellow': ($ibo-color-yellow-200, $ibo-color-yellow-900),
-) !default;
-
-
-
-.ibo-badge {
-	display: inline-block;
-	white-space: nowrap;
-	padding : $ibo-badge--padding-y $ibo-badge--padding-x;
-	border-radius : $ibo-badge--border-radius;
-	@extend %ibo-font-ral-med-50;
-
-	@each $sColor, $aColorValues in $ibo-badge-colors {
-		$bg-color: nth($aColorValues, 1);
-		$text-color: nth($aColorValues, 2);
-		&.ibo-is-#{$sColor} {
-			background-color: $bg-color;
-			color: $text-color;
-		}
-	}
-}

css/backoffice/components/_form.scss

@@ -8,74 +8,70 @@
   padding-bottom: 14px;
 }
 
-// WIP SDK Forms
-//form[is="itop-form-element"] {
-//
-//  .help-text{
-//    padding: 1px 5px;
-//    background-color: #d7e3f8;
-//    border: 1px solid #c6e7f5;
-//    border-radius: 5px;
-//    margin: 5px 0;
-//    font-size: 0.9em;
-//  }
-//
-//  .form-error ul{
-//    padding: 1px 5px;
-//    background-color: #f8d7da;
-//    border: 1px solid #f5c6cb;
-//    border-radius: 5px;
-//    margin: 5px 0;
-//    font-size: 0.9em;
-//  }
-//
-//  .subform{
-//    background-color: #efefef;
-//    border-radius: 5px;
-//    padding: 10px;
-//  }
-//
-//  .form-buttons{
-//    margin: 20px 0;
-//  }
-//
-//  .form select{
-//    padding: 0;
-//    overflow-y: auto;
-//  }
-//
-//  .form select option{
-//    height: 30px;
-//    display: flex;
-//    align-items: center;
-//  }
-//
-//  .turbo-refreshing{
-//    opacity: .5;
-//  }
-//
-//  .ibo-field legend{
-//    margin-top: 24px;
-//  }
-//
-//  collection-entry-element {
-//    margin-top: 8px;
-//    display: block;
-//    padding: 10px 10px;
-//    background-color: #f5f5f5;
-//    border-radius: 5px;
-//  }
-//  .ts-control{
-//    height: auto;
-//    min-height: 30px;
-//  }
-//
-//  .ibo-form-actions > .ibo-button > span{
-//    margin-right: 5px;
-//  }
-//
-//  .ibo-form textarea{
-//    resize: vertical;
-//  }
-//
-//}
+.help-text{
+  padding: 1px 5px;
+  background-color: #d7e3f8;
+  border: 1px solid #c6e7f5;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.form-error ul{
+  padding: 1px 5px;
+  background-color: #f8d7da;
+  border: 1px solid #f5c6cb;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.subform{
+  background-color: #efefef;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.form-buttons{
+  margin: 20px 0;
+}
+
+.form select{
+  padding: 0;
+  overflow-y: auto;
+}
+
+.form select option{
+  height: 30px;
+  display: flex;
+  align-items: center;
+}
+
+.turbo-refreshing{
+  opacity: .5;
+}
+
+.ibo-field legend{
+  margin-top: 24px;
+}
+
+collection-entry-element {
+  margin-top: 8px;
+  display: block;
+  padding: 10px 10px;
+  background-color: #f5f5f5;
+  border-radius: 5px;
+}
+.ts-control{
+  height: auto;
+  min-height: 30px;
+}
+
+.ibo-form-actions > .ibo-button > span{
+  margin-right: 5px;
+}
+
+.ibo-form textarea{
+  resize: vertical;
+}
+

css/backoffice/components/input/_input-select-icon.scss

@@ -3,9 +3,9 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-input-select-icon--max-height: 100% !default;
-$ibo-input-select-icon--max-width: 100% !default;
-$ibo-input-select-icon--padding-right: $ibo-spacing-200 !default;
+$ibo-input-select-icon--menu--icon--max-height: 100% !default;
+$ibo-input-select-icon--menu--icon--max-width: 100% !default;
+$ibo-input-select-icon--icon--padding-right: $ibo-spacing-200 !default;
 
 $ibo-input-select-icon--menu--z-index: 21 !default;
 $ibo-input-select-icon--menu--max-height: 300px !default;
@@ -18,9 +18,9 @@ $ibo-input-select-icon--menu--icon--margin-right: 10px !default;
   display: inline-flex;
   text-align: left;
 	>img{
-		max-height: $ibo-input-select-icon--max-height;
-		max-width: $ibo-input-select-icon--max-width;
-		padding-right: $ibo-input-select-icon--padding-right;
+		max-height: $ibo-input-select-icon--menu--icon--max-height;
+		max-width: $ibo-input-select-icon--menu--icon--max-width;
+		padding-right: $ibo-input-select-icon--icon--padding-right;
 	}
   >span{
     overflow: hidden;

css/backoffice/components/input/_input-toggler.scss

@@ -8,7 +8,6 @@ $ibo-toggler--wrapper--height: 20px !default;
 
 $ibo-toggler--slider--border-radius: $ibo-border-radius-900 !default;
 $ibo-toggler--slider--background-color: $ibo-color-secondary-600 !default;
-$ibo-toggler--slider--disabled--background-color: $ibo-color-secondary-200 !default;
 
 $ibo-toggler--slider--before--left: 3px !default;
 $ibo-toggler--slider--before--bottom: 3px !default;
@@ -18,7 +17,6 @@ $ibo-toggler--slider--before--border-radius: $ibo-border-radius-full !default;
 $ibo-toggler--slider--before--background-color: $ibo-color-grey-100 !default;
 
 $ibo-toggler--slider--checked--background-color: $ibo-color-primary-600 !default;
-$ibo-toggler--slider--checked-disabled--background-color: $ibo-color-primary-200 !default;
 $ibo-toggler--slider--focus--box-shadow: 0 0 1px $ibo-color-primary-600 !default;
 
 $ibo-toggler--label--margin-left: 4px !default;
@@ -63,13 +61,6 @@ $ibo-toggler--label--margin-left: 4px !default;
   background-color: $ibo-toggler--slider--checked--background-color;
 }
 
-.ibo-toggler--wrapper input:disabled + .ibo-toggler--slider {
-  background-color: $ibo-toggler--slider--disabled--background-color;
-}
-.ibo-toggler--wrapper input:checked:disabled + .ibo-toggler--slider {
-  background-color: $ibo-toggler--slider--checked-disabled--background-color;
-}
-
 input:focus + .ibo-toggler--slider {
   box-shadow: $ibo-toggler--slider--focus--box-shadow;
 }

css/backoffice/layout/_all.scss

@@ -15,4 +15,3 @@
 @import "wizard-container/wizard-container";
 @import "object/all";
 @import "activity-panel/all";
-@import "extension/all";

css/backoffice/layout/extension/_all.scss

@@ -1 +0,0 @@
-@import "extension-details";

css/backoffice/layout/extension/_extension-details.scss

@@ -1,76 +0,0 @@
-$ibo-extension-details--information--metadata--padding: $ibo-spacing-200 !default;
-$ibo-extension-details--information--metadata--delimiter: "-" !default;
-$ibo-extension-details--information--metadata--color: $ibo-color-grey-700 !default;
-$ibo-extension-details--actions--button--padding-y: 3px !default;
-$ibo-extension-details--actions--button--padding-x: $ibo-button--padding-x !default;
-
-.ibo-extension-details {
-	display: inline-flex;
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-	width: 100%;
-}
-
-.ibo-extension-details--information {
-	flex-grow: 1;
-	display: flex;
-	flex-direction: column;
-}
-
-.ibo-extension-details--actions {
-	display: flex;
-}
-
-.ibo-extension-details--information--label {
-	@extend %ibo-font-ral-med-150;
-}
-
-.ibo-extension-details--information--metadata {
-	@extend %ibo-font-ral-med-100;
-	color: $ibo-extension-details--information--metadata--color;
-}
-
-.ibo-extension-details--information--description {
-	@extend %ibo-font-ral-med-100;
-}
-
-.ibo-extension-details--information--metadata span + span:before {
-	content: $ibo-extension-details--information--metadata--delimiter;
-	padding-left: $ibo-extension-details--information--metadata--padding;
-	padding-right: $ibo-extension-details--information--metadata--padding;
-}
-
-//ibo-extension-details can have other ibo-extension-details inside its ibo-extension-details--information--description in the setup. We need to only affect direct children
-.ibo-extension-details:has(>.ibo-extension-details--actions  input:is([type="checkbox"], [type="radio"]):checked){
-	&>.ibo-extension-details--information>.ibo-extension-details--information--label .ibo-badge.unchecked {
-		display: none;
-	}
-}
-//Merging the two lines below with :is([type="checkbox"], [type="radio"]) will generate a warning in scss compiler
-.ibo-extension-details:has(>.ibo-extension-details--actions input[type="checkbox"]:not(:checked)),
-.ibo-extension-details:has(>.ibo-extension-details--actions input[type="radio"]:not(:checked)) {
-	&>.ibo-extension-details--information>.ibo-extension-details--information--label .ibo-badge.checked {
-		display: none;
-	}
-}
-
-
-.ibo-extension-details--actions > button {
-	padding: $ibo-extension-details--actions--button--padding-y $ibo-extension-details--actions--button--padding-x;
-}
-
-.ibo-extension-details--actions:has(.toggler-install:not(:disabled)) .ibo-popover-menu--section a[data-resource-id="force_uninstall"] {
-	display: none;
-}
-
-.ibo-extension-details .ibo-popover-menu ~ .ibo-button{
-	visibility: hidden;
-}
-.ibo-extension-details .ibo-popover-menu:has(.ibo-popover-menu--item) ~ .ibo-button{
-	visibility: visible;
-}
-
-.ibo-extension-details .ibo-toggler--wrapper:has(.ibo-toggler.ibo-is-hidden){
-	visibility: hidden;
-}

css/backoffice/pages/_data-synchro.scss

@@ -80,14 +80,4 @@ $ibo-data-synchro-source--synoptics--cell--arrow--border: 2px solid $ibo-data-sy
 }
 .ibo-data-synchro-source--replicas-status--warning{
   margin: $ibo-data-synchro-source--replicas-status--warning--margin;
-}
-
-.ibo-page-header--replica-title{
-  display: table;
-  width: 100%;
-
-  >.ibo-toolbar--button{
-    display: table-cell;
-    vertical-align: middle;
-  }
 }

css/backoffice/vendors/ckeditor/_overloads.scss

@@ -70,7 +70,7 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
   }
 }
 
-.ck-editor__editable_inline:not(.ck-comment__input *), .ck-source-editing-area {
+.ck-editor__editable_inline:not(.ck-comment__input *) {
   height: 200px;
 }
 
@@ -84,6 +84,11 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
   }
 }
 
+// N°7552 Allow source editing area to be scrollable in full screen
+.ck-maximize_editor_main .ck-source-editing-area textarea{
+  overflow: auto !important;
+}
+
 /* Mentions */
 .ck-mentions {
   .ck-button {

css/common/utils/helpers/_text-decoration.scss

@@ -4,7 +4,7 @@
  */
 
 /* SCSS variables */
-$common-has-description--content: "?" !default;
+$common-has-description--content: "\1F6C8" !default;
 $common-has-description--padding-left: $common-spacing-200 !default;
 $common-has-description--color: $common-color-grey-600 !default;
 $common-has-description--font-size: 0.7em !default; /* Font size is em on purpose as we want it to be proportional to its context */

css/common/utils/helpers/_typography.scss

@@ -11,9 +11,6 @@
  *
  * Usage: @extend %common-font-size-XXX;
  */
-%common-font-size-20 {
-  font-size: $common-font-size-20;
-}
 %common-font-size-50 {
   font-size: $common-font-size-50;
 }

css/setup.scss

@@ -316,34 +316,29 @@ fieldset {
 	background-color: #F7FAFC;
 	padding: 10px;
 	.wiz-choice{
-		&:not(:checked) ~ label .checked{
+		&:checked ~ .description {
+			#itop-ticket-mgmt-simple-ticket-enhanced-portal:not(:checked),
+			#itop-ticket-mgmt-itil-enhanced-portal:not(:checked) {
+				~ .description::after {
+					content: "Legacy portal is no longer part of iTop, by leaving this option unchecked your portal users won't be able to access iTop anymore.";
+					display: block;
+					margin-top: 0.5em;
+					font-weight: bold;
+					color: $legacy-portal-removal-text-color;
+				}
+			}
+		}
+		&:not(:checked) ~ label .setup-extension-tag.checked{
 			display:none;
 		}
-		&:checked ~ label .unchecked{
+		&:checked ~ label .setup-extension-tag.unchecked{
 			display:none;
 		}
 	}
 }
 
-.ibo-extension-details:has(>.ibo-extension-details--actions>input:checked) {
-	.ibo-extension-details:has(#itop-ticket-mgmt-simple-ticket-enhanced-portal:not(:checked), #itop-ticket-mgmt-itil-enhanced-portal:not(:checked)) {
-		.ibo-extension-details--information--description::after {
-			content: "Legacy portal is no longer part of iTop, by leaving this option unchecked your portal users won't be able to access iTop anymore.";
-			display: block;
-			margin-top: 0.5em;
-			font-weight: bold;
-			color: $legacy-portal-removal-text-color;
-		}
-	}
-}
 
-.ibo-extension-details--information--metadata{
-	color: $ibo-color-grey-800;
-}
 
-.choice-disabled {
-	color: $ibo-color-grey-700;
-}
 
 body {
   font-size: 1.17rem;
@@ -527,12 +522,10 @@ body {
   }
 }
 
-.ibo-setup-summary-title, .ibo-setup-summary-title:visited, .ibo-setup-summary-title:hover {
-	font-size: $ibo-font-size-150;
-	color: inherit;
+.ibo-setup-summary-title {
+  font-size: $ibo-font-size-150;
 }
 
-
 #ibo-setup-licenses--components-list {
   background-color: $ibo-color-white-200;
   padding: 12px;
@@ -611,20 +604,30 @@ body {
 .setup-extension--missing .setup-extension--icon{
 	color:#a00000;
 }
-
-.ibo-extension-details {
-	align-items: flex-start;
-}
-.ibo-extension-details--actions input{
-	margin:0.2em 0.5em;
-	width: 12px;
-}
-:not(.ibo-badge) ~ .ibo-badge{
-	margin-left:0.5em;
-}
-.ibo-extension-details--information--label i{
-	font-size : 0.9em;
-	margin-left:0.3em;
+.setup-extension-tag {
+	background-color: grey;
+	border-radius: 8px;
+	padding-left: 3px;
+	padding-right: 3px;
+	margin-right: 3px;
+	&.installed{
+		background-color:#9eff9e
+	}
+	&.notinstalled{
+		background-color:#ed9eff
+	}
+	&.tobeinstalled{
+		background-color:#9ef0ff
+	}
+	&.tobeuninstalled{
+		background-color:#ff9e9e
+	}
+	&.notuninstallable{
+		background-color:#ffc98c
+	}
+	&.removed{
+		background-color: #969594
+	}
 }
 
 .setup--wizard-choice--label + .setup--wizard-choice--more-info {
@@ -673,10 +676,14 @@ body {
   }
 }
 
-  #progress_content *:not(.message) + .message {
-      margin-top: 1.5rem;
+  #progress_content {
+    height: 200px;
+    overflow: auto;
+    text-align: center;
+  }
+  #installation_progress {
+    display: none;
   }
-
   #fresh_content{
     border: 0;
     min-height: 300px;

datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php

@@ -6,9 +6,8 @@
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'CAS:Error:UserNotAllowed' => '用户被禁止登录',
-	'CAS:Login:SignIn' => '使用 CAS 登录',
-	'CAS:Login:SignInTooltip' => '点击这里使用 CAS 服务器认证',
+	'CAS:Login:SignIn' => '使用CAS登录',
+	'CAS:Login:SignInTooltip' => '点击这里使用CAS服务器认证',
 ]);

datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php

@@ -5,8 +5,10 @@
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
+ *
+ */
+/**
  * @author Robert Deng <denglx@gmail.com>
- * 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
@@ -21,7 +23,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,11 +32,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserExternal' => '外部用户',
 	'Class:UserExternal+' => '用户在'.ITOP_APPLICATION_SHORT.'外部验证身份',

datamodels/2.x/authent-ldap/dictionaries/ru.dict.authent-ldap.php

@@ -14,7 +14,7 @@
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLDAP' => 'Пользователь LDAP',
 	'Class:UserLDAP+' => 'Пользователь, аутентифицируемый через LDAP',
-	'UserLDAP:server' => 'Особенности LDAP',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ]);
 
 //
@@ -22,6 +22,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 //
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'Class:UserLDAP/Attribute:ldap_server' => 'Сервер LDAP',
-	'Class:UserLDAP/Attribute:ldap_server+' => '',
+	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php

@@ -6,6 +6,7 @@
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
  * @author Robert Deng <denglx@gmail.com>
+ *
  * This file is part of iTop.
  *
  * iTop is free software; you can redistribute it and/or modify
@@ -21,7 +22,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,15 +31,13 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLDAP
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:UserLDAP' => 'LDAP 用户',
-	'Class:UserLDAP+' => '用户身份由 LDAP 认证',
-	'UserLDAP:server' => 'LDAP 详情',
+	'Class:UserLDAP' => 'LDAP用户',
+	'Class:UserLDAP+' => '用户身份由LDAP认证',
+	'UserLDAP:server' => 'LDAP详情',
 ]);
 
 //
@@ -47,6 +45,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:UserLDAP/Attribute:ldap_server' => 'LDAP 服务器',
-	'Class:UserLDAP/Attribute:ldap_server+' => '',
+	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php

@@ -24,11 +24,11 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Истёкший',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
-	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Одноразовый пароль',
-	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Пароль не может быть изменён пользователем.',
+	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
+	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Дата изменения пароля',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Когда пароль был изменен в последний раз',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Пароль должен содержать не менее 12 символов и включать прописные, строчные, числовые и специальные символы.',
 	'UserLocal:password:expiration' => 'Поля требуют наличия доп. расширения',
-	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Установка срока действия пароля "Одноразовый пароль" для своей собственной учётной записи не разрешена',
+	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ]);

datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php

@@ -6,6 +6,7 @@
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
  * @author Robert Deng <denglx@gmail.com>
+ *
  * This file is part of iTop.
  *
  * iTop is free software; you can redistribute it and/or modify
@@ -21,7 +22,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,19 +31,16 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' 用户',
 	'Class:UserLocal+' => '用户由'.ITOP_APPLICATION_SHORT.'验证身份',
 	'Class:UserLocal/Attribute:password' => '密码',
 	'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',
-
-	'Class:UserLocal/Attribute:expiration' => '密码过期时间',
-	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要扩展才能生效)',
+	'Class:UserLocal/Attribute:expiration' => '密码过期',
+	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要一个扩展才能生效)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => '允许过期',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => '永不过期',
@@ -52,9 +49,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => '一次性密码',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
-	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新时间',
+	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
-
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少12个字符, 包含大小写, 数字和特殊字符.',
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',

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

@@ -11,5 +11,5 @@
  *
  */
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:darkmoon' => 'Тёмная луна',
+	'theme:darkmoon' => 'Dark moon~~',
 ]);

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

@@ -21,7 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:darkmoon' => 'Dark moon',
+	'theme:darkmoon' => '暗月',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-high-contrast-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:fullmoon-high-contrast' => 'Fullmoon (высокая контрастность)',
+	'theme:fullmoon-high-contrast' => 'Fullmoon (High contrast)~~',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-high-contrast-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:fullmoon-high-contrast' => 'Fullmoon (高对比度)',
+	'theme:fullmoon-high-contrast' => 'Fullmoon (High contrast)~~',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (протанопия и дейтеранопия)',
+	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (Protanopia & Deuteranopia)~~',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (红绿色盲 & 绿色色盲)',
+	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (Protanopia & Deuteranopia)~~',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-tritanopia-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:fullmoon-tritanopia' => 'Fullmoon (тританопия)',
+	'theme:fullmoon-tritanopia' => 'Fullmoon (Tritanopia)~~',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-tritanopia-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:fullmoon-tritanopia' => 'Fullmoon (蓝黄色盲)',
+	'theme:fullmoon-tritanopia' => 'Fullmoon (Tritanopia)~~',
 ]);

datamodels/2.x/combodo-data-feature-removal/assets/css/DataFeatureRemoval.css

@@ -1,9 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/*
- * CSS of the template page
- */
-

datamodels/2.x/combodo-data-feature-removal/assets/js/DataFeatureRemoval.js

@@ -1,9 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/*
- * Javascript file loaded in template page
- */
-

datamodels/2.x/combodo-data-feature-removal/composer.json

@@ -1,16 +0,0 @@
-{
-  "config": {
-    "classmap-authoritative": true
-  },
-  "autoload": {
-    "psr-4": {
-      "Combodo\\iTop\\DataFeatureRemoval\\": "src"
-    }
-  },
-  "name": "combodo/combodo-data-feature-removal",
-  "type": "itop-extension",
-  "description": "iTop Data Feature Removal",
-  "require": {
-    "composer-runtime-api": "^2.0"
-  }
-}

datamodels/2.x/combodo-data-feature-removal/composer.lock

@@ -1,20 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "b862a55cbf5448fb99f0905a4db6529b",
-    "packages": [],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {},
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "composer-runtime-api": "^2.0"
-    },
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
-}

datamodels/2.x/combodo-data-feature-removal/datamodel.combodo-data-feature-removal.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
-  <classes>
-    <class id="ResourceDataFeatureRemoval" _delta="define">
-      <parent>AbstractResource</parent>
-      <properties>
-        <comment>/* Extension management access control. */</comment>
-        <abstract>true</abstract>
-        <category>grant_by_profile</category>
-      </properties>
-      <presentation/>
-      <methods/>
-    </class>
-  </classes>
-  <menus>
-    <menu id="DataFeatureRemovalMenu" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>30</rank>
-      <parent>SystemTools</parent>
-      <url>$pages/exec.php?exec_module=combodo-data-feature-removal&amp;exec_page=index.php&amp;c[menu]=DataFeatureRemovalMenu</url>
-      <enable_class>ResourceDataFeatureRemoval</enable_class>
-      <enable_action>UR_ACTION_MODIFY</enable_action>
-    </menu>
-  </menus>
-  <module_parameters>
-    <parameters id="combodo-data-feature-removal">
-      <max_count_estimation_for_safe_cleanup>100</max_count_estimation_for_safe_cleanup>
-    </parameters>
-  </module_parameters>
-</itop_design>

datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php

@@ -1,71 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Localized data
- */
-
-Dict::Add('EN US', 'English', 'English', [
-	'Menu:DataFeatureRemovalMenu' => 'Extension management',
-	'combodo-data-feature-removal/Operation:Main/Title' => 'Extension management',
-
-	'DataFeatureRemoval:Main:Title' => 'Extension management',
-	'DataFeatureRemoval:Main:SubTitle' => 'Toggle extensions installed on your iTop',
-	'DataFeatureRemoval:Failure:Title' => 'Extensions dry removal errors',
-	'DataFeatureRemoval:Helper:Title' => 'Analyze if there are any data or dependency preventing you from adding/removing an extension.',
-
-	'DataFeatureRemoval:Features:Title' => 'Extensions',
-	'DataFeatureRemoval:Result:Title' => 'Modification requested',
-	'DataFeatureRemoval:NoResult:Title' => 'No modification requested',
-	'DataFeatureRemoval:Execution:Title' => 'Deletion Executions',
-	'DataFeatureRemoval:Analysis:Title' => 'Analysis result',
-	'DataFeatureRemoval:Analysis:Subtitle' => 'Review all elements requiring attention',
-	'DataFeatureRemoval:Analysis:SubTitle' => '%1$s element(s) to clean before continuing',
-
-	'DataFeatureRemoval:DeletionPlan:Title' => 'Data deletion plan',
-	'DataFeatureRemoval:DeletionPlan:SubTitle' => '%1$s rows to clean before continuing',
-	'DataFeatureRemoval:DoDeletion:Title' => 'Do deletion',
-	'DataFeatureRemoval:DoDeletion:SubTitle' => 'Remove all the entries from the database',
-	'DataFeatureRemoval:DeletionPlan:Error:Issues' => 'Some objects must be deleted manually prior to cleanup',
-
-	'DataFeatureRemoval:Table:Analysis:ClassName' => 'Element to remove',
-	'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Extension name',
-	'DataFeatureRemoval:Table:Analysis:Module' => 'Module name',
-	'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Occurrence',
-
-	'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.',
-	'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.',
-
-	'DataFeatureRemoval:Compile:InProgress' => 'Compilation in progress...',
-	'DataFeatureRemoval:Compile:Success' => 'Compilation successful',
-	'DataFeatureRemoval:Compile:Error' => 'Compilation error',
-
-	'DataFeatureRemoval:RunAudit:InProgress' => 'Analysis in progress...',
-	'DataFeatureRemoval:RunAudit:Success' => 'Analysis completed',
-	'DataFeatureRemoval:RunAudit:Error' => 'Error during analysis',
-
-	'UI:Button:Analyze' => 'Analyze',
-	'UI:Button:ModifyChoices' => 'Change my selection',
-	'UI:Button:AnalyzeAndSetup' => 'Analyze and go to setup',
-	'UI:Button:PlanDeletion' => 'Proceed with deletion',
-	'UI:Button:DoDeletion' => 'Proceed with deletion',
-	'UI:Button:BackToMain' => 'Change my selection',
-	'UI:Button:Setup' => 'Run setup',
-
-	'UI:Action:ForceUninstall' => 'Force uninstall',
-	'UI:Action:MoreInfo' => 'More information',
-
-	'DataFeatureRemoval:Table:Empty' => 'No data to remove',
-
-	'DataFeatureRemoval:Column:Class' => 'Class',
-	'DataFeatureRemoval:Column:DeleteCount' => 'Entries to delete',
-	'DataFeatureRemoval:Column:UpdateCount' => 'Entries to update',
-	'DataFeatureRemoval:Column:IssueCount' => 'Issues found preventing automatic cleanup',
-
-	'DataFeatureRemoval:Column:DeletedCount' => 'Deleted entries',
-	'DataFeatureRemoval:Column:UpdatedCount' => 'Updated entries',
-]);

datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php

@@ -1,71 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
-* Localized data
-*/
-
-Dict::Add('FR FR', 'French', 'Français', [
-	'Menu:DataFeatureRemovalMenu' => 'Gestion des extensions',
-	'combodo-data-feature-removal/Operation:Main/Title' => 'Gestion des extensions',
-
-	'DataFeatureRemoval:Main:Title' => 'Gestion des extensions',
-	'DataFeatureRemoval:Main:SubTitle' => 'Sélectionner les extensions à installer sur votre iTop',
-	'DataFeatureRemoval:Failure:Title' => 'Erreurs lors de la simulation de suppression d\'extensions',
-	'DataFeatureRemoval:Helper:Title' => 'Activez ou désactivez les extensions installées dans votre iTop.',
-
-	'DataFeatureRemoval:Features:Title' => 'Extensions',
-	'DataFeatureRemoval:Result:Title' => 'Modification demandée',
-	'DataFeatureRemoval:NoResult:Title' => 'Aucune modification demandée',
-	'DataFeatureRemoval:Execution:Title' => 'Suppressions',
-	'DataFeatureRemoval:Analysis:Title' => 'Résultat de l’analyse',
-	'DataFeatureRemoval:Analysis:Subtitle' => 'Vérifier les éléments à nettoyer',
-	'DataFeatureRemoval:Analysis:SubTitle' => '%1$s élément(s) à nettoyer avant de poursuivre',
-
-	'DataFeatureRemoval:DeletionPlan:Title' => 'Plan de suppression des données',
-	'DataFeatureRemoval:DeletionPlan:SubTitle' => '%1$s ligne(s) à nettoyer avant de poursuivre',
-	'DataFeatureRemoval:DoDeletion:Title' => 'Exécuter la suppression',
-	'DataFeatureRemoval:DoDeletion:SubTitle' => 'Supprime toutes les entrées de la base de données',
-	'DataFeatureRemoval:DeletionPlan:Error:Issues' => 'Certains objets doivent être supprimés manuellement avant le nettoyage',
-
-	'DataFeatureRemoval:Table:Analysis:ClassName' => 'Élément à supprimer',
-	'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Extension',
-	'DataFeatureRemoval:Table:Analysis:Module' => 'Module',
-	'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Occurrence',
-
-	'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.',
-	'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.',
-
-	'DataFeatureRemoval:Compile:InProgress' => 'Compilation en cours...',
-	'DataFeatureRemoval:Compile:Success' => 'Compilation terminée',
-	'DataFeatureRemoval:Compile:Error' => 'Erreur lors de la compilation',
-
-	'DataFeatureRemoval:RunAudit:InProgress' => 'Analyse en cours...',
-	'DataFeatureRemoval:RunAudit:Success' => 'Analyse terminée',
-	'DataFeatureRemoval:RunAudit:Error' => 'Erreur lors de l\'analyse',
-
-	'UI:Button:Analyze' => 'Analyser',
-	'UI:Button:ModifyChoices' => 'Modifier la sélection',
-	'UI:Button:AnalyzeAndSetup' => 'Analyser et ouvrir l’assistant de configuration',
-	'UI:Button:PlanDeletion' => 'Supprimer les données',
-	'UI:Button:DoDeletion' => 'Supprimer les données',
-	'UI:Button:BackToMain' => 'Modifier la sélection',
-	'UI:Button:Setup' => 'Lancer le setup',
-
-	'UI:Action:ForceUninstall' => 'Forcer la désinstallation',
-	'UI:Action:MoreInfo' => 'Plus d’informations',
-
-	'DataFeatureRemoval:Table:Empty' => 'Aucune donnée à supprimer',
-
-	'DataFeatureRemoval:Column:Class' => 'Classe',
-	'DataFeatureRemoval:Column:DeleteCount' => 'Entrées à supprimer',
-	'DataFeatureRemoval:Column:UpdateCount' => 'Entrées à mettre à jour',
-	'DataFeatureRemoval:Column:IssueCount' => 'Problèmes empêchant le nettoyage automatique',
-
-	'DataFeatureRemoval:Column:DeletedCount' => 'Entrées supprimées',
-	'DataFeatureRemoval:Column:UpdatedCount' => 'Entrées mises à jour',
-]);

datamodels/2.x/combodo-data-feature-removal/dictionaries/ru.dict.combodo-data-feature-removal.php

@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Localized data
- */
-/**
- * @author Vladimir Kunin <v.b.kunin@gmail.com>
- *
- */
-
-Dict::Add('RU RU', 'Russian', 'Русский', [
-	'Menu:DataFeatureRemovalMenu' => 'Управление расширениями',
-	'combodo-data-feature-removal/Operation:Main/Title' => 'Управление расширениями',
-
-	'DataFeatureRemoval:Main:Title' => 'Управление расширениями',
-	'DataFeatureRemoval:Main:SubTitle' => 'Включение и отключение расширений, установленных в вашем iTop',
-	'DataFeatureRemoval:Failure:Title' => 'Ошибки пробного удаления расширений',
-	'DataFeatureRemoval:Helper:Title' => 'Проверьте, есть ли данные или зависимости, мешающие добавить/удалить расширение.',
-
-	'DataFeatureRemoval:Features:Title' => 'Расширения',
-	'DataFeatureRemoval:Result:Title' => 'Запрошено изменение',
-	'DataFeatureRemoval:NoResult:Title' => 'Изменений не запрошено',
-	'DataFeatureRemoval:Execution:Title' => 'Выполнения удаления',
-	'DataFeatureRemoval:Analysis:Title' => 'Результат анализа',
-	'DataFeatureRemoval:Analysis:Subtitle' => 'Просмотрите все элементы, требующие внимания',
-	'DataFeatureRemoval:Analysis:SubTitle' => 'Элементов для очистки перед продолжением: %1$s',
-
-	'DataFeatureRemoval:DeletionPlan:Title' => 'План удаления данных',
-	'DataFeatureRemoval:DeletionPlan:SubTitle' => 'Строк для очистки перед продолжением: %1$s',
-	'DataFeatureRemoval:DoDeletion:Title' => 'Выполнить удаление',
-	'DataFeatureRemoval:DoDeletion:SubTitle' => 'Удалить все записи из базы данных',
-	'DataFeatureRemoval:DeletionPlan:Error:Issues' => 'Некоторые объекты нужно удалить вручную перед очисткой',
-
-	'DataFeatureRemoval:Table:Analysis:ClassName' => 'Элемент для удаления',
-	'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Название расширения',
-	'DataFeatureRemoval:Table:Analysis:Module' => 'Название модуля',
-	'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Количество',
-
-	'DataFeatureRemoval:CleanupComplete:Title' => 'Всё чисто.',
-	'DataFeatureRemoval:CompilComplete' => 'Компиляция выполнена успешно. Очистка не требуется. Можно переходить к установке.',
-
-	'DataFeatureRemoval:Compile:InProgress' => 'Идёт компиляция...',
-	'DataFeatureRemoval:Compile:Success' => 'Компиляция выполнена успешно',
-	'DataFeatureRemoval:Compile:Error' => 'Ошибка компиляции',
-
-	'DataFeatureRemoval:RunAudit:InProgress' => 'Идёт анализ...',
-	'DataFeatureRemoval:RunAudit:Success' => 'Анализ завершён',
-	'DataFeatureRemoval:RunAudit:Error' => 'Ошибка при анализе',
-
-	'UI:Button:Analyze' => 'Анализировать',
-	'UI:Button:ModifyChoices' => 'Изменить выбор',
-	'UI:Button:AnalyzeAndSetup' => 'Анализировать и перейти к установке',
-	'UI:Button:PlanDeletion' => 'Продолжить удаление',
-	'UI:Button:DoDeletion' => 'Продолжить удаление',
-	'UI:Button:BackToMain' => 'Изменить выбор',
-	'UI:Button:Setup' => 'Запустить установку',
-
-	'UI:Action:ForceUninstall' => 'Принудительно удалить',
-	'UI:Action:MoreInfo' => 'Подробнее',
-
-	'DataFeatureRemoval:Table:Empty' => 'Нет данных для удаления',
-
-	'DataFeatureRemoval:Column:Class' => 'Класс',
-	'DataFeatureRemoval:Column:DeleteCount' => 'Записей к удалению',
-	'DataFeatureRemoval:Column:UpdateCount' => 'Записей к обновлению',
-	'DataFeatureRemoval:Column:IssueCount' => 'Найдено проблем, мешающих автоматической очистке',
-
-	'DataFeatureRemoval:Column:DeletedCount' => 'Удалено записей',
-	'DataFeatureRemoval:Column:UpdatedCount' => 'Обновлено записей',
-]);

datamodels/2.x/combodo-data-feature-removal/dictionaries/zh_cn.dict.combodo-data-feature-removal.php

@@ -1,62 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Localized data
- */
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Menu:DataFeatureRemovalMenu' => '扩展管理',
-	'combodo-data-feature-removal/Operation:Main/Title' => '扩展管理',
-
-	'DataFeatureRemoval:Main:Title' => '扩展管理',
-	'DataFeatureRemoval:Main:SubTitle' => '切换安装在您的 iTop 上的扩展',
-	'DataFeatureRemoval:Failure:Title' => '扩展预删除错误',
-	'DataFeatureRemoval:Helper:Title' => '分析是否有任何数据或依赖关系阻止您添加/删除扩展。',
-
-	'DataFeatureRemoval:Features:Title' => '扩展',
-	'DataFeatureRemoval:Result:Title' => '请求的修改',
-	'DataFeatureRemoval:Execution:Title' => '删除执行',
-	'DataFeatureRemoval:Analysis:Title' => '分析结果',
-	'DataFeatureRemoval:Analysis:Subtitle' => '审查所有需要关注的元素',
-	'DataFeatureRemoval:Analysis:SubTitle' => '%1$s 个元素需要在继续之前清理',
-
-	'DataFeatureRemoval:DeletionPlan:Title' => '数据删除计划',
-	'DataFeatureRemoval:DeletionPlan:SubTitle' => '%1$s 行需要在继续之前清理',
-	'DataFeatureRemoval:DoDeletion:Title' => '执行删除',
-	'DataFeatureRemoval:DoDeletion:SubTitle' => '从数据库中删除所有条目',
-	'DataFeatureRemoval:DeletionPlan:Error:Issues' => '某些对象必须在清理前手动删除',
-
-	'DataFeatureRemoval:Table:Analysis:ClassName' => '要删除的元素',
-	'DataFeatureRemoval:Table:Analysis:FeatureName' => '扩展名称',
-	'DataFeatureRemoval:Table:Analysis:Module' => '模块名称',
-	'DataFeatureRemoval:Table:Analysis:Occurrence' => '出现次数',
-
-	'DataFeatureRemoval:CleanupComplete:Title' => '全部清除.',
-	'DataFeatureRemoval:CompilComplete' => '编译成功. 无需清理. 您可以继续进行设置.',
-
-	'UI:Button:Analyze' => '分析',
-	'UI:Button:ModifyChoices' => '改变我的选择',
-	'UI:Button:AnalyzeAndSetup' => '分析并进入设置',
-	'UI:Button:PlanDeletion' => '继续删除',
-	'UI:Button:DoDeletion' => '继续删除',
-	'UI:Button:BackToMain' => '改变我的选择',
-	'UI:Button:Setup' => '运行安装向导',
-
-	'UI:Action:ForceUninstall' => '强制卸载',
-	'UI:Action:MoreInfo' => '更多信息',
-
-	'DataFeatureRemoval:Table:Empty' => '没有数据需要删除',
-
-	'DataFeatureRemoval:Column:Class' => '类',
-	'DataFeatureRemoval:Column:DeleteCount' => '待删除的条目',
-	'DataFeatureRemoval:Column:UpdateCount' => '待更新的条目',
-	'DataFeatureRemoval:Column:IssueCount' => '发现阻止自动清理的问题',
-
-	'DataFeatureRemoval:Column:DeletedCount' => '已删除的条目',
-	'DataFeatureRemoval:Column:UpdatedCount' => '已更新的条目',
-]);

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

@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval;
-
-use Combodo\iTop\DataFeatureRemoval\Controller\DataFeatureRemovalController;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalHelper;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalLog;
-
-require_once(APPROOT.'application/startup.inc.php');
-
-DataFeatureRemovalLog::Enable();
-
-$oController = new DataFeatureRemovalController(MODULESROOT.DataFeatureRemovalHelper::MODULE_NAME.'/templates', DataFeatureRemovalHelper::MODULE_NAME);
-$oController->SetDefaultOperation('Main');
-$oController->HandleOperation();

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

@@ -1,16 +0,0 @@
-<?php
-
-// PHP Data Model definition file
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you provide a datamodel.xxxx.xml file with your module,
-// this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module

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

@@ -1,54 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//
-// iTop module definition file
-//
-
-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.3.0',
-	[
-		// Identification
-		//
-		'label' => 'iTop Data Feature Removal',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => [
-
-		],
-		'mandatory' => true,
-		'visible' => false,
-
-		// Components
-		//
-		'datamodel' => [
-			'vendor/autoload.php',
-			'model.combodo-data-feature-removal.php', // Contains the PHP code generated by the "compilation" of datamodel.combodo-data-feature-removal.xml
-		],
-		'webservice' => [],
-		'data.struct' => [
-			// add your 'structure' definition XML files here,
-		],
-		'data.sample' => [
-			// add your sample data XML files here,
-		],
-
-		// Documentation
-		//
-		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
-		'doc.more_information' => '', // hyperlink to more information, if any
-
-		// Default settings
-		//
-		'settings' => [
-			// Module specific settings go here, if any
-		],
-	]
-);

datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php

@@ -1,494 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Controller;
-
-require_once APPROOT.'setup/feature_removal/SetupAudit.php';
-
-use Combodo\iTop\Application\Helper\Session;
-use Combodo\iTop\Application\TwigBase\Controller\Controller;
-use Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalHelper;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalLog;
-use Combodo\iTop\DataFeatureRemoval\Service\DataCleanupService;
-use Combodo\iTop\DataFeatureRemoval\Service\DataFeatureRemoverExtensionService;
-use Combodo\iTop\DataFeatureRemoval\Service\StaticDeletionPlan;
-use Combodo\iTop\Service\Session\SessionParameters;
-use Combodo\iTop\Setup\FeatureRemoval\SetupAudit;
-use ContextTag;
-use CoreException;
-use Dict;
-use Exception;
-use MetaModel;
-use MFCompiler;
-use RunTimeEnvironment;
-use SetupUtils;
-use utils;
-
-class DataFeatureRemovalController extends Controller
-{
-	private ?array $aExtensionsToCheck = null;
-	private bool $bForcedUninstallation = false;
-	private array $aCountClassesToCleanup = [];
-	private array $aAnalysisDataTable = [];
-	private array $aDeletionExecutionSummary = [];
-
-	private int $iCount = 0;
-	private int $iColumnCount = 2;
-	private RunTimeEnvironment $oRuntimeEnvironment;
-
-	public function OperationMain($sErrorMessage = null): void
-	{
-		$aParams = [];
-
-		SetupUtils::EraseSetupToken();
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$oParameters->Erase();
-		Session::Unset('aDeletionExecutionSummary');
-		Session::Set('bForceCompilation', true);
-		$oParameters->SetParameter('return_application', 'DataFeatureRemoval');
-
-		$this->AddAnalyzeParams();
-		$aParams['sTransactionId'] = utils::GetNewTransactionId();
-		$aParams['iColumnCount'] = $this->iColumnCount;
-		$aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($this->GetAvailableExtensions(), $this->iColumnCount);
-		$aParams['aAnalysisDataTable'] = $this->aAnalysisDataTable;
-		$aParams['aClasses'] = array_keys($this->aCountClassesToCleanup);
-		$aParams['DataFeatureRemovalErrorMessage'] = $sErrorMessage;
-		$aParams['bHasData'] = $this->iCount > 0;
-		$aParams['sSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup';
-		$aParams['iCount'] = $this->iCount;
-
-		$this->AddLinkedStylesheet(utils::GetAbsoluteUrlModulesRoot().DataFeatureRemovalHelper::MODULE_NAME.'/assets/css/DataFeatureRemoval.css');
-		$this->AddLinkedScript(utils::GetAbsoluteUrlModulesRoot().DataFeatureRemovalHelper::MODULE_NAME.'/assets/js/DataFeatureRemoval.js');
-		$this->DisplayPage($aParams);
-	}
-
-	public function AddAnalyzeParams(): void
-	{
-		$aData = [];
-		$aColumns = [];
-		$this->iCount = 0;
-		foreach ($this->aCountClassesToCleanup as $sClass => $iCount) {
-			$sModuleName = MetaModel::GetModuleName($sClass);
-			$aExtensions = DataFeatureRemoverExtensionService::GetInstance()->GetIncludingExtensions($sModuleName);
-			$sExtensions = implode(' ', $aExtensions);
-			$aColumns = ['ClassName','FeatureName','Module','Occurrence'];
-			$aData[] = [$sClass,$sExtensions,$sModuleName,$iCount];
-			$this->iCount += $iCount;
-		}
-
-		$this->aAnalysisDataTable =  $this->GetTableData('Analysis', $aColumns, $aData);
-	}
-
-	public function OperationAnalysisResult(): void
-	{
-		$aParams = [];
-
-		//from setup wizard/mtp
-		if (!SetupUtils::IsSessionSetupTokenValid()) {
-			//from same module
-			$this->ValidateTransactionId();
-		}
-
-		// Display changed extensions
-		$aSetupParameterNames = [
-			'selected_extensions' => '[]',
-			'selected_modules' => '[]',
-			'display_choices' => '',
-			'added_extensions' => '[]',
-			'removed_extensions' => '[]',
-			'extensions_not_uninstallable' => '[]',
-			'copy_setup_files' => 1,
-			'force-uninstall' => '',
-			'use_symbolic_links' => MFCompiler::UseSymbolicLinks() ? 'on' : '',
-			'return_application' => '',
-			'target_env' => ITOP_DEFAULT_ENV,
-		];
-
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		foreach ($aSetupParameterNames as $sInputName => $defaultValue) {
-			$oParameters->SetParameter($sInputName, $oParameters->GetParameter($sInputName, $defaultValue));
-		}
-
-		$aAddedExtensions = json_decode($oParameters->GetParameter('added_extensions', '[]'), true);
-		$aRemovedExtensions = json_decode($oParameters->GetParameter('removed_extensions', '[]'), true);
-		if ('[]' === $oParameters->GetParameter('selected_modules', '[]')) {
-			//it does not come from setup
-			// we get extensions from 1st screen uiblocks
-			$this->ReadExtensionsDiff();
-			$oParameters->SetParameter('force-uninstall', $this->bForcedUninstallation ? 'on' : '');
-			$aAddedExtensions = $this->aExtensionsToCheck['to_be_installed'];
-			$oParameters->SetParameter('added_extensions', $this->ConvertIntoSetupFormat($aAddedExtensions));
-
-			$aRemovedExtensions = $this->aExtensionsToCheck['to_be_removed'];
-			$oParameters->SetParameter('removed_extensions', $this->ConvertIntoSetupFormat($aRemovedExtensions));
-
-			$aExtensionsNotUninstallable = $this->aExtensionsToCheck['extensions_not_uninstallable'];
-			$oParameters->SetParameter('extensions_not_uninstallable', $this->ConvertIntoSetupFormat($aExtensionsNotUninstallable));
-		}
-
-		DataFeatureRemovalLog::Debug(__METHOD__.' Extensions given in parameter', null, [
-			'added_extensions' => $aAddedExtensions,
-			'removed_extensions' => $aRemovedExtensions]);
-
-		$aParams['sTransactionId'] = utils::GetNewTransactionId();
-		$aParams['iColumnCount'] = $this->iColumnCount;
-		$aAvailableExtensions = $this->GetExtensionsDiff($aAddedExtensions, $aRemovedExtensions);
-		$aParams['aAvailableExtensionsCount'] = count($aAvailableExtensions);
-		$aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($aAvailableExtensions, $this->iColumnCount);
-		$aParams['sAjaxURL'] = utils::GetAbsoluteUrlModulePage(DataFeatureRemovalHelper::MODULE_NAME, 'index.php');
-
-		$this->DisplayPage($aParams, 'AnalysisResult');
-	}
-
-	private function ConvertIntoSetupFormat(array $aData): string
-	{
-		$aNewData = [];
-		foreach ($aData as $sCode => $sLabel) {
-			$aNewData[] = sprintf('"%s":"%s"', $sCode, $sLabel);
-		}
-
-		return "{".implode(',', $aNewData)."}";
-	}
-
-	/**
-	 * @return void
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 */
-	public function OperationAjaxCompile(): void
-	{
-		$aParams = [];
-		//to make setup redirection work, we need to pass complex data structures to setup wizards (ie extension/module lists)
-		$sSourceEnv = MetaModel::GetEnvironment();
-		$oRuntimeEnvironment = new RunTimeEnvironment($sSourceEnv, false);
-
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$aSelectedModules = json_decode($oParameters->GetParameter('selected_modules', '[]'), true);
-		$aSelectedExtensions = json_decode($oParameters->GetParameter('selected_extensions', '[]'), true);
-		$aAddedExtensions = json_decode($oParameters->GetParameter('added_extensions', '[]'), true);
-		$aRemovedExtensions = json_decode($oParameters->GetParameter('removed_extensions', '[]'), true);
-
-		try {
-			$this->ValidateTransactionId();
-
-			$oConfig = MetaModel::GetConfig();
-			if (count($aSelectedModules) === 0) {
-				$aSelectedExtensions = DataFeatureRemoverExtensionService::GetInstance()->GetExtensionMap()->GetSelectedExtensions($oConfig, array_keys($aAddedExtensions), array_keys($aRemovedExtensions));
-				$oParameters->SetParameter('selected_extensions', $this->ConvertIntoSetupFormat($aSelectedExtensions));
-			}
-
-			$sBuildDir = APPROOT."/env-$sSourceEnv-build";
-			if (! is_dir($sBuildDir)) {
-				SetupUtils::builddir($sBuildDir);
-			}
-			$bIsDirEmpty = count(scandir($sBuildDir)) === 2;
-			$bForceCompilation = Session::Get('bForceCompilation', false);
-			if ($bIsDirEmpty || $bForceCompilation) {
-				$oRuntimeEnvironment->CopySetupFiles();
-				if (count($aSelectedModules) === 0) {
-					$aSelectedModules = $oRuntimeEnvironment->GetModulesToLoadFromChoices($oConfig, $aSelectedExtensions);
-				}
-
-				DataFeatureRemovalLog::Debug(
-					__METHOD__,
-					null,
-					['sSourceEnv' => $sSourceEnv, 'sBuildDir' => $sBuildDir, 'bIsDirEmpty' => $bIsDirEmpty, glob("$sBuildDir/*")]
-				);
-				$oRuntimeEnvironment->DoCompile($aSelectedExtensions, $aRemovedExtensions, $aSelectedModules, MFCompiler::CanUseSymbolicLinks());
-				Session::Unset('bForceCompilation');
-			} else {
-				if (count($aSelectedModules) === 0) {
-					$aSelectedModules = $oRuntimeEnvironment->GetModulesToLoadFromChoices($oConfig, $aSelectedExtensions);
-				}
-			}
-		} catch (CoreException $e) {
-			$aParams['error_message'] = $e->getHtmlDesc();
-		} catch (Exception $e) {
-			$aParams['error_message'] = $e->getMessage();
-		}
-
-		$aParams['success_message'] = Dict::S('DataFeatureRemoval:Compile:Success');
-		$aParams['transaction_id'] = utils::GetNewTransactionId();
-
-		$oParameters->SetParameter('selected_modules', json_encode($aSelectedModules));
-		$this->DisplayJSONPage($aParams);
-	}
-
-	public function OperationAjaxRunAudit(): void
-	{
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$aParams = [];
-		$aPageParams = [];
-		try {
-			$this->ValidateTransactionId();
-
-			$sSourceEnv = MetaModel::GetEnvironment();
-			$oSetupAudit = new SetupAudit($sSourceEnv);
-			$aRemovedClasses = array_keys($oSetupAudit->RunDataAudit());
-			$oParameters->SetParameter('classes', $aRemovedClasses);
-
-			new ContextTag(ContextTag::TAG_SETUP);
-			$aPageParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php';
-			$aPageParams['aSetupParams'] = [
-				"_class" => "WizStepLandingBeforeAudit",
-				"operation" => "next",
-			];
-			$aPageParams['sTransactionId'] = utils::GetNewTransactionId();
-
-			$aDeletionPlanSummaryEntities = $this->GetDeletionPlanSummaryEntities($aRemovedClasses);
-			[$aPageParams['aDeletionPlanSummary'], $aPageParams['iQueryCount'], $aPageParams['bDeletionPossible']] = $this->GetDeletionPlanSummaryTable($aDeletionPlanSummaryEntities);
-			[$aPageParams['aDeletionExecutionSummary'], $aPageParams['bHasDeletionExecution']] = $this->GetExecutionSummaryTable();
-			$aPageParams['bDeletionNeeded'] = ($aPageParams['iQueryCount'] > 0);
-
-			if (!$aPageParams['bDeletionNeeded']) {
-				// Erase session setup parameters
-				SetupUtils::CreateSetupToken();
-			}
-
-			$this->DisplayAjaxPage($aPageParams, 'AjaxRunAudit');
-			return;
-		} catch (CoreException $e) {
-			$aParams['error_message'] = $e->getHtmlDesc();
-		} catch (Exception $e) {
-			$aParams['error_message'] = $e->getMessage();
-		}
-
-		$this->DisplayJSONPage($aParams);
-	}
-
-	private function GetExecutionSummaryTable(): array
-	{
-		$sName = 'ExecutionSummary';
-
-		$this->aDeletionExecutionSummary = unserialize(Session::Get('aDeletionExecutionSummary') ?? serialize([]));
-
-		$aTableData = [];
-		if (count($this->aDeletionExecutionSummary) === 0) {
-			return [$aTableData, false];
-		}
-
-		$aColumns = ['Class', 'Total Deleted Count' , 'Total Updated Count', 'Deleted Count' , 'Updated Count'];
-		$aRows = [];
-		/** @var DataCleanupSummaryEntity $oSummary */
-		foreach ($this->aDeletionExecutionSummary as $sClass => $oSummary) {
-			$aRows[] = [
-				$sClass,
-				$oSummary->iTotalDeleteCount,
-				$oSummary->iTotalUpdateCount,
-				$oSummary->iDeleteCount,
-				$oSummary->iUpdateCount,
-			];
-		}
-
-		$aTableData = $this->GetTableData($sName, $aColumns, $aRows);
-
-		return [$aTableData, true];
-
-	}
-
-	private function GetDeletionPlanSummaryEntities(array $aRemovedClasses): array
-	{
-		$oDataCleanupService = new StaticDeletionPlan();
-		return $oDataCleanupService->GetCleanupSummary($aRemovedClasses);
-	}
-
-	private function GetDeletionPlanSummaryTable(array $aDeletionPlanSummaryEntities): array
-	{
-		$sName = 'DeletionPlanSummary';
-		$aColumns = ['Class', 'Delete Count' , 'Update Count', 'Issue Count'];
-		$aRows = [];
-		$iQueryCount = 0;
-		$bHasIssues = false;
-		foreach ($aDeletionPlanSummaryEntities as $oDeletionPlanSummaryEntity) {
-			$aRows[] = [
-				$oDeletionPlanSummaryEntity->sClass,
-				$oDeletionPlanSummaryEntity->iDeleteCount,
-				$oDeletionPlanSummaryEntity->iUpdateCount,
-				$oDeletionPlanSummaryEntity->iIssueCount,
-			];
-			$bHasIssues |= ($oDeletionPlanSummaryEntity->iIssueCount !== 0);
-			$iQueryCount += $oDeletionPlanSummaryEntity->iDeleteCount;
-			$iQueryCount += $oDeletionPlanSummaryEntity->iUpdateCount;
-		}
-		return [$this->GetTableData($sName, $aColumns, $aRows), $iQueryCount, !$bHasIssues];
-	}
-
-	public function OperationDoDeletion(): void
-	{
-		$this->ValidateTransactionId();
-
-		$this->aDeletionExecutionSummary = unserialize(Session::Get('aDeletionExecutionSummary') ?? serialize([]));
-		Session::Unset('aDeletionExecutionSummary');
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$aClasses = $oParameters->GetParameter('classes', []);
-
-		$oDataCleanupService = new DataCleanupService();
-		$aDeletionExecutionSummary = $oDataCleanupService->ExecuteCleanup($aClasses);
-		foreach ($aDeletionExecutionSummary as $sClass => $oExecutionSummary) {
-			if (!array_key_exists($sClass, $this->aDeletionExecutionSummary)) {
-				$this->aDeletionExecutionSummary[$sClass] = new DataCleanupSummaryEntity($sClass);
-			}
-			$oSummary = $this->aDeletionExecutionSummary[$sClass];
-			$oSummary->iDeleteCount = $oExecutionSummary->iDeleteCount;
-			$oSummary->iUpdateCount = $oExecutionSummary->iUpdateCount;
-			$oSummary->iTotalDeleteCount += $oExecutionSummary->iDeleteCount;
-			$oSummary->iTotalUpdateCount += $oExecutionSummary->iUpdateCount;
-		}
-
-		Session::Set('aDeletionExecutionSummary', serialize($this->aDeletionExecutionSummary));
-		$this->OperationAnalysisResult();
-	}
-
-	private function GetAvailableExtensions(bool $bIncludePackageExtensions = false): array
-	{
-		$aExtensionsData = [];
-		if ($bIncludePackageExtensions) {
-			$aExtensionsRef = DataFeatureRemoverExtensionService::GetInstance()->GetExtensionMap()->GetAllExtensionsWithPreviouslyInstalled();
-		} else {
-			$aExtensionsRef = DataFeatureRemoverExtensionService::GetInstance()->ReadItopExtensions();
-		}
-
-		foreach ($aExtensionsRef as $oExtension) {
-			/** @var \iTopExtension $oExtension */
-			$aExtensionsData[$oExtension->sCode] = [
-				'version' => $oExtension->sVersion,
-				'label' => $oExtension->sLabel,
-				'code' => $oExtension->sCode,
-				'description' => $oExtension->sDescription,
-				'source' => $oExtension->GetExtensionSourceLabel(),
-				'installed' => $oExtension->bInstalled,
-				'extra_flags' => [
-					'uninstallable' => $oExtension->CanBeUninstalled(),
-					'remote' => $oExtension->IsRemote(),
-					'missing' => $oExtension->bRemovedFromDisk,
-					'dependency_issue' => $oExtension->HasDependencyIssue(),
-				],
-
-			];
-		}
-
-		return $aExtensionsData;
-	}
-
-	private function GetExtensionsDiff(array $aAddedExtensions, array $aRemovedExtensions): array
-	{
-		$aExtensions = [];
-		foreach ($this->GetAvailableExtensions(true) as $sCode => $aExtension) {
-			$aExtension['extra_flags']['disabled'] = true;
-			if (isset($aAddedExtensions[$sCode])) {
-				$aExtension['extra_flags']['selected'] = true;
-				$aExtensions[$sCode] = $aExtension;
-			} elseif (isset($aRemovedExtensions[$sCode])) {
-				$aExtension['extra_flags']['selected'] = false;
-				$aExtensions[$sCode] = $aExtension;
-			}
-		}
-
-		return $aExtensions;
-	}
-
-	private function GetTableData(string $sTableName, array $aColumns, array $aData): array
-	{
-		if (empty($aData)) {
-			return [
-				'Type' => 'Table',
-				'Columns' => [['label' => '']],
-				'Data' => [[ Dict::S('DataFeatureRemoval:Table:Empty')]],
-			];
-		}
-
-		$aNewColumns = [];
-		foreach ($aColumns as $sColumn) {
-			$aNewColumns[] = ['label' => Dict::S("DataFeatureRemoval:Table:$sTableName:$sColumn", Dict::S("DataFeatureRemoval:Column:$sColumn", $sColumn))];
-		}
-		$aColumns = $aNewColumns;
-
-		return [
-			'Type' => 'Table',
-			'Columns' => $aColumns,
-			'Data' => $aData,
-		];
-	}
-
-	/**
-	 * @return void
-	 * @throws \Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException
-	 */
-	private function ValidateTransactionId(): void
-	{
-		if (empty($_POST)) {
-			return;
-		}
-
-		$sTransactionId = utils::ReadPostedParam('transaction_id', null, utils::ENUM_SANITIZATION_FILTER_TRANSACTION_ID);
-		DataFeatureRemovalLog::Debug(__FUNCTION__.": Transaction [$sTransactionId]");
-		if (empty($sTransactionId) || !utils::IsTransactionValid($sTransactionId, false)) {
-			throw new DataFeatureRemovalException(Dict::S("iTopUpdate:Error:InvalidToken"));
-		}
-	}
-
-	/**
-	 * Read extensions selected from posted parameters
-	 */
-	public function ReadExtensionsDiff(): void
-	{
-		if (!is_null($this->aExtensionsToCheck)) {
-			return;
-		}
-
-		$aAvailableExtensions = $this->GetAvailableExtensions();
-		$aSelectedExtensionsFromUI = utils::ReadPostedParam('aSelectedExtensions', []);
-		$this->aExtensionsToCheck = [
-			'to_be_installed' => [],
-			'to_be_removed' => [],
-			'extensions_not_uninstallable' => [],
-		];
-		foreach ($aAvailableExtensions as $sCode => &$aExtensionData) {
-			if (!isset($aSelectedExtensionsFromUI[$sCode])) {
-				continue;
-			}
-
-			if ($aExtensionData['installed'] && $aSelectedExtensionsFromUI[$sCode] !== 'on') {
-				$aExtensionData['extra_flags']['selected'] = false;
-				$sLabel = $aAvailableExtensions[$sCode]['label'];
-				$this->aExtensionsToCheck['to_be_removed'][$sCode] = $sLabel;
-				if (! $this->bForcedUninstallation && $aExtensionData['extra_flags']['uninstallable']) {
-					$this->bForcedUninstallation = true;
-				}
-				if (false === $aExtensionData['extra_flags']['uninstallable'] || true === $aExtensionData['extra_flags']['remote']) {
-					$this->aExtensionsToCheck['extensions_not_uninstallable'][] = $sCode;
-				}
-			} elseif (!$aExtensionData['installed'] && $aSelectedExtensionsFromUI[$sCode] === 'on') {
-				$aExtensionData['extra_flags']['selected'] = true;
-				$sLabel = $aAvailableExtensions[$sCode]['label'];
-				$this->aExtensionsToCheck['to_be_installed'][$sCode] = $sLabel;
-			}
-		}
-	}
-
-	/**
-	 * Divide an array into several sub arrays, distributing elements so that every sub array has an equal amount of elements
-	 * @param mixed[] $aInput
-	 * @param int $iColNumber
-	 *
-	 * @return array[]
-	 */
-	private function SplitArrayIntoColumns(array $aInput, int $iColNumber)
-	{
-		$aOutput = array_fill(0, $iColNumber, []);
-		$iIndex = 0;
-		foreach ($aInput as $mItem) {
-			//Split extensions in $iColNumber columns
-			$aOutput[$iIndex % $this->iColumnCount][] = $mItem;
-			$iIndex++;
-		}
-		return $aOutput;
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Entity/DataCleanupSummaryEntity.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace Combodo\iTop\DataFeatureRemoval\Entity;
-
-class DataCleanupSummaryEntity
-{
-	public string $sClass;
-	public int $iIssueCount = 0;
-	public int $iUpdateCount = 0;
-	public int $iDeleteCount = 0;
-	public int $iTotalUpdateCount = 0;
-	public int $iTotalDeleteCount = 0;
-
-	/**
-	 * @param string $sClass
-	 */
-	public function __construct(string $sClass)
-	{
-		$this->sClass = $sClass;
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Entity/DeletionPlanEntity.php

@@ -1,37 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Entity;
-
-class DeletionPlanEntity
-{
-	public readonly DeletionPlanItem $oDelete;
-	public readonly DeletionPlanItem $oUpdate;
-	public readonly DeletionPlanItem $oIssue;
-
-	/**
-	 * @param \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem $oDelete
-	 * @param \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem $oUpdate
-	 * @param \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem $oIssue
-	 */
-	public function __construct()
-	{
-		$this->oDelete = $oDelete ?? new DeletionPlanItem();
-		$this->oUpdate = $oUpdate ?? new DeletionPlanItem();
-		$this->oIssue = $oIssue ?? new DeletionPlanItem();
-	}
-
-	public function TotalCount(): int
-	{
-		return $this->oDelete->Count() + $this->oUpdate->Count() + $this->oIssue->Count();
-	}
-
-	public function FilterUpdatesByDeletes()
-	{
-		$this->oUpdate->FilterBy($this->oDelete);
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Entity/DeletionPlanItem.php

@@ -1,36 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Entity;
-
-class DeletionPlanItem
-{
-	public array $aIds = [];
-
-	/**
-	 * @param array $aIds
-	 */
-	public function __construct(array $aIds = [])
-	{
-		$this->aIds = $aIds;
-	}
-
-	public function Merge(DeletionPlanItem $oItem): void
-	{
-		$this->aIds = array_unique(array_merge($this->aIds, $oItem->aIds));
-	}
-
-	public function Count(): int
-	{
-		return count($this->aIds);
-	}
-
-	public function FilterBy(DeletionPlanItem $oItem): void
-	{
-		$this->aIds = array_diff($this->aIds, $oItem->aIds);
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Helper/DataFeatureRemovalConfig.php

@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Helper;
-
-use MetaModel;
-use utils;
-
-class DataFeatureRemovalConfig
-{
-	private static DataFeatureRemovalConfig $oInstance;
-
-	protected function __construct()
-	{
-	}
-
-	final public static function GetInstance(): DataFeatureRemovalConfig
-	{
-		if (!isset(self::$oInstance)) {
-			self::$oInstance = new DataFeatureRemovalConfig();
-		}
-
-		return self::$oInstance;
-	}
-
-	public function Get(string $sParamName, $default = null)
-	{
-		return MetaModel::GetModuleSetting(DataFeatureRemovalHelper::MODULE_NAME, $sParamName, $default);
-	}
-
-	public function GetBoolean(string $sParamName, $default = null): bool
-	{
-		$res = $this->Get($sParamName, $default);
-
-		return boolval($res);
-	}
-
-	public function IsEnabled(): bool
-	{
-		return $this->GetBoolean('enable', false);
-	}
-
-	public function Set(string $sParamName, $value)
-	{
-		$oConfig = utils::GetConfig();
-		$oConfig->SetModuleSetting(DataFeatureRemovalHelper::MODULE_NAME, $sParamName, $value);
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Helper/DataFeatureRemovalException.php

@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Helper;
-
-use Exception;
-use Throwable;
-
-class DataFeatureRemovalException extends Exception
-{
-	public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null, array $aContext = [])
-	{
-		if (!is_null($previous)) {
-			$sStack = $previous->getTraceAsString();
-			$sError = $previous->getMessage();
-		} else {
-			$sStack = $this->getTraceAsString();
-			$sError = '';
-		}
-
-		$aContext['error'] = $sError;
-		$aContext['stack'] = $sStack;
-		DataFeatureRemovalLog::Error($message, null, $aContext);
-		parent::__construct($message, $code, $previous);
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Helper/DataFeatureRemovalHelper.php

@@ -1,13 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Helper;
-
-class DataFeatureRemovalHelper
-{
-	public const MODULE_NAME = 'combodo-data-feature-removal';
-}

datamodels/2.x/combodo-data-feature-removal/src/Helper/DataFeatureRemovalLog.php

@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Helper;
-
-use LogAPI;
-
-class DataFeatureRemovalLog extends LogAPI
-{
-	public const CHANNEL_DEFAULT = 'DataFeatureRemoval';
-
-	protected static $m_oFileLog = null;
-
-	public static function Enable($sTargetFile = null)
-	{
-		if (empty($sTargetFile)) {
-			$sTargetFile = APPROOT.'log/error.log';
-		}
-		parent::Enable($sTargetFile);
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Service/DataCleanupService.php

@@ -1,179 +0,0 @@
-<?php
-
-namespace Combodo\iTop\DataFeatureRemoval\Service;
-
-use CMDBObjectSet;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalLog;
-use Combodo\iTop\Service\Limits\ExecutionLimits;
-use DBObject;
-use DBObjectSearch;
-use MetaModel;
-
-class DataCleanupService
-{
-	private array $aVisited = [];
-	private iObjectService $oObjectService;
-	private ExecutionLimits $oExecutionLimits;
-
-	public function __construct(int $iMaxExecutionTime = 30, int $iMaxMemoryPercent = 80)
-	{
-		DataFeatureRemovalLog::Enable();
-		$this->oExecutionLimits = new ExecutionLimits($iMaxExecutionTime, $iMaxMemoryPercent);
-	}
-
-	/**
-	 * Get a summary of the deletion plan computed for the classes.
-	 * The result is used for display
-	 *
-	 * @param array|null $aClasses
-	 *
-	 * @return array<\Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity>
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @throws \Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException
-	 */
-	public function GetCleanupSummary(?array $aClasses): array
-	{
-		return $this->ExecuteCleanup($aClasses ?? [], oObjectService: new ObjectServiceSummary());
-	}
-
-	private function GetNextObjectToDelete(array $aClasses): ?DBObject
-	{
-		foreach ($aClasses as $sClass) {
-			$oFilter = new DBObjectSearch($sClass);
-			$oFilter->AllowAllData();
-			$oSet = new \DBObjectSet($oFilter);
-			while ($oObject = $oSet->Fetch()) {
-				if (!$this->IsVisited($oObject)) {
-					return $oObject;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param array $aClasses
-	 * @param \Combodo\iTop\DataFeatureRemoval\Service\iObjectService|null $oObjectService
-	 *
-	 * @return array execution summary
-	 * @throws \ArchivedObjectException
-	 * @throws \Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 */
-	public function ExecuteCleanup(array $aClasses, ?iObjectService $oObjectService = null): array
-	{
-		$this->oObjectService = $oObjectService ?? new ObjectService();
-
-		$this->aVisited = [];
-
-		while ($oObject = $this->GetNextObjectToDelete($aClasses)) {
-			if ($this->RecursiveDeletion($oObject) === false) {
-				// Timeout, stop here
-				break;
-			}
-		}
-		return $this->oObjectService->GetSummary();
-
-	}
-
-	private function MarkObjectAsVisited(DBObject $oObject): void
-	{
-		$sClass = get_class($oObject);
-		$sId = $oObject->GetKey();
-		$sKey = "$sClass-$sId";
-		$this->aVisited[$sKey] = true;
-	}
-
-	private function IsVisited(DBObject $oObject): bool
-	{
-		$sClass = get_class($oObject);
-		$sId = $oObject->GetKey();
-		$sKey = "$sClass-$sId";
-
-		$bRes = $this->aVisited[$sKey] ?? false;
-		DataFeatureRemovalLog::Debug('Checking if object is visited', null, [$sKey, $bRes]);
-		return $bRes;
-	}
-
-	/**
-	 *
-	 * @param \DBObject $oObjectToClean
-	 *
-	 * @return bool true if deletion is complete, false in case of timeout or memory limit reached
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 */
-	private function RecursiveDeletion(DBObject $oObjectToClean): bool
-	{
-		$this->MarkObjectAsVisited($oObjectToClean);
-		$sClass = get_class($oObjectToClean);
-
-		$aReferencingMe = MetaModel::EnumReferencingClasses($sClass);
-		foreach ($aReferencingMe as $sRemoteClass => $aExtKeys) {
-			/** @var \AttributeExternalKey $oExtKeyAttDef */
-			foreach ($aExtKeys as $sExtKeyAttCode => $oExtKeyAttDef) {
-				// skip if this external key is behind an external field
-				if (!$oExtKeyAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) {
-					continue;
-				}
-
-				$oSearch = new DBObjectSearch($sRemoteClass);
-				$oSearch->AddCondition($sExtKeyAttCode, $oObjectToClean->GetKey(), '=');
-				$oSearch->AllowAllData();
-				$oSet = new CMDBObjectSet($oSearch);
-				$oSet->OptimizeColumnLoad([$sRemoteClass => [$oExtKeyAttDef->GetCode()]]);
-				/** @var DBObject $oDependentObj */
-				while ($oDependentObj = $oSet->Fetch()) {
-					$iDeletePropagationOption = $oExtKeyAttDef->GetDeletionPropagationOption();
-
-					if ($oExtKeyAttDef->IsNullAllowed()) {
-						// Optional external key, list to reset
-						if (($iDeletePropagationOption == DEL_MOVEUP) && ($oExtKeyAttDef->IsHierarchicalKey())) {
-							// Move the child up one level i.e. set the same parent as the current object
-							$iParentId = $oObjectToClean->Get($oExtKeyAttDef->GetCode());
-							$this->oObjectService->Update($oDependentObj, $oExtKeyAttDef->GetCode(), $iParentId);
-						} else {
-							$this->oObjectService->Update($oDependentObj, $oExtKeyAttDef->GetCode(), 0);
-						}
-						if ($this->oExecutionLimits->ShouldStopExecution()) {
-							return false;
-						}
-					} else {
-						// Mandatory external key
-						if ($iDeletePropagationOption == DEL_MANUAL) {
-							// Cannot be deleted automatically, must be handled manually
-							$this->oObjectService->SetIssue(get_class($oDependentObj));
-							continue;
-						}
-						// Propagate deletion only if not visited
-						if ($this->IsVisited($oDependentObj)) {
-							continue;
-						}
-						if (!$this->RecursiveDeletion($oDependentObj)) {
-							// Timeout
-							return false;
-						}
-					}
-
-				}
-			}
-		}
-
-		$this->oObjectService->Delete($sClass, $oObjectToClean->GetKey());
-
-		if ($this->oExecutionLimits->ShouldStopExecution()) {
-			return false;
-		}
-
-		return true;
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Service/DataFeatureRemoverExtensionService.php

@@ -1,90 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Service;
-
-use iTopExtension;
-use iTopExtensionsMap;
-use MetaModel;
-
-class DataFeatureRemoverExtensionService
-{
-	private static DataFeatureRemoverExtensionService $oInstance;
-	private ?iTopExtensionsMap $oMap = null;
-	private array $aItopExtensions = [];
-	private array $aIncludingExtensionsByModuleName = [];
-
-	protected function __construct()
-	{
-	}
-
-	final public static function GetInstance(): DataFeatureRemoverExtensionService
-	{
-		if (!isset(self::$oInstance)) {
-			self::$oInstance = new DataFeatureRemoverExtensionService();
-		}
-
-		return self::$oInstance;
-	}
-
-	final public static function SetInstance(?DataFeatureRemoverExtensionService $oInstance): void
-	{
-		self::$oInstance = $oInstance;
-	}
-
-	/**
-	 * @param string $sModuleName
-	 *
-	 * @return array
-	 * @throws \Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException
-	 */
-	public function GetIncludingExtensions(string $sModuleName): array
-	{
-		if (count($this->aIncludingExtensionsByModuleName) === 0) {
-			foreach ($this->ReadItopExtensions() as $oExtension) {
-				$aModuleNames = $oExtension->aModules;
-				if (is_array($aModuleNames) && count($aModuleNames) > 0) {
-					foreach ($aModuleNames as $sModule) {
-						$aExtensions = $this->aIncludingExtensionsByModuleName[$sModule] ?? [];
-						$aExtensions[] = $oExtension->sLabel.'/'.$oExtension->sVersion;
-						$this->aIncludingExtensionsByModuleName[$sModule] = $aExtensions;
-					}
-				}
-			}
-		}
-
-		return $this->aIncludingExtensionsByModuleName[$sModuleName] ?? [];
-	}
-
-	/**
-	 * @return \iTopExtensionsMap
-	 */
-	public function GetExtensionMap(): iTopExtensionsMap
-	{
-		if (is_null($this->oMap)) {
-			$this->oMap = iTopExtensionsMap::GetExtensionsMap();
-			$this->oMap->LoadInstalledExtensionsFromDatabase(MetaModel::GetConfig());
-		}
-		return $this->oMap;
-	}
-
-	/**
-	 * @return iTopExtension[]
-	 */
-	public function ReadItopExtensions(): array
-	{
-		if (count($this->aItopExtensions) === 0) {
-			$this->aItopExtensions = $this->GetExtensionMap()->GetAllExtensionsToDisplayInSetup(true);
-
-			uasort($this->aItopExtensions, function (iTopExtension $oiTopExtension1, iTopExtension $oiTopExtension2) {
-				return strcmp($oiTopExtension1->sLabel, $oiTopExtension2->sLabel);
-			});
-		}
-
-		return $this->aItopExtensions;
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Service/ObjectService.php

@@ -1,60 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Service;
-
-use CMDBSource;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalLog;
-use DBObject;
-use DBObjectSearch;
-use MetaModel;
-
-class ObjectService extends ObjectServiceSummary
-{
-	public function Update(DBObject $oToUpdate, string $sAttCode, $value): void
-	{
-		$oToUpdate->Set($sAttCode, $value);
-		$oToUpdate->DBUpdate();
-		parent::Update($oToUpdate, $sAttCode, $value);
-	}
-
-	public function Delete(string $sClass, string $sId): void
-	{
-		try {
-			CMDBSource::Query('START TRANSACTION');
-			// Delete any existing change tracking about the current object
-			$oFilter = new DBObjectSearch('CMDBChangeOp');
-			$oFilter->AddCondition('objclass', $sClass, '=');
-			$oFilter->AddCondition('objkey', $sId, '=');
-			MetaModel::PurgeData($oFilter);
-
-			// Delete the entry
-			$aClassesToRemove = array_merge(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL), MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_EXCLUDELEAF, false));
-			foreach ($aClassesToRemove as $sParentClass) {
-				/** @var DBObjectSearch $oFilter */
-				$oFilter = DBObjectSearch::FromOQL_AllData("SELECT $sParentClass WHERE id=:id");
-				$sQuery = $oFilter->MakeDeleteQuery(['id' => $sId]);
-				CMDBSource::DeleteFrom($sQuery);
-			}
-
-			CMDBSource::Query('COMMIT');
-			parent::Delete($sClass, $sId);
-
-		} catch (\Exception $e) {
-			DataFeatureRemovalLog::Exception(__METHOD__.': Cleanup failed', $e);
-			CMDBSource::Query('ROLLBACK');
-			throw $e;
-		}
-	}
-
-	public function SetIssue(string $sClass): void
-	{
-		throw new DataFeatureRemovalException('Deletion Plan cannot be executed due to issues');
-	}
-
-}

datamodels/2.x/combodo-data-feature-removal/src/Service/ObjectServiceSummary.php

@@ -1,71 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Service;
-
-use Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity;
-use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalLog;
-use DBObject;
-
-/**
- * Manage operation summary instead of doing the actual update or delete
- *
- * The summary is an array [class => DeletionPlanSummaryEntity]
- */
-class ObjectServiceSummary implements iObjectService
-{
-	private array $aSummary = [];
-
-	public function Update(DBObject $oToUpdate, string $sAttCode, $value): void
-	{
-		$sClass = get_class($oToUpdate);
-		DataFeatureRemovalLog::Debug('Object to update', null, ['class' => $sClass, 'id' => $oToUpdate->GetKey(), 'code' => $sAttCode, 'value' => "$value"]);
-		if (! array_key_exists($sClass, $this->aSummary)) {
-			$this->aSummary[$sClass] = new DataCleanupSummaryEntity($sClass);
-		}
-		$oDeletionPlanSummaryEntity = $this->aSummary[$sClass];
-		$oDeletionPlanSummaryEntity->iUpdateCount++;
-		$oDeletionPlanSummaryEntity->iTotalUpdateCount++;
-	}
-
-	public function Delete(string $sClass, string $sId): void
-	{
-		DataFeatureRemovalLog::Debug('Object to delete', null, ['class' => $sClass, 'id' => $sId]);
-		if (!array_key_exists($sClass, $this->aSummary)) {
-			$this->aSummary[$sClass] = new DataCleanupSummaryEntity($sClass);
-		}
-		$oDeletionPlanSummaryEntity = $this->aSummary[$sClass];
-		$oDeletionPlanSummaryEntity->iDeleteCount++;
-		$oDeletionPlanSummaryEntity->iTotalDeleteCount++;
-	}
-
-	public function SetIssue(string $sClass): void
-	{
-		DataFeatureRemovalLog::Debug('Issue on object', null, ['class' => $sClass]);
-		if (!array_key_exists($sClass, $this->aSummary)) {
-			$this->aSummary[$sClass] = new DataCleanupSummaryEntity($sClass);
-		}
-		$oDeletionPlanSummaryEntity = $this->aSummary[$sClass];
-		$oDeletionPlanSummaryEntity->iIssueCount++;
-	}
-
-	public function GetSummary(): array
-	{
-		return $this->aSummary;
-	}
-
-	public function SetSummary(array $aSummary): void
-	{
-		foreach ($aSummary as $sClass => $oPreviousSummaryEntity) {
-			$oSummaryEntity = new DataCleanupSummaryEntity($sClass);
-			$oSummaryEntity->iTotalUpdateCount = $oPreviousSummaryEntity->iTotalUpdateCount;
-			$oSummaryEntity->iTotalDeleteCount = $oPreviousSummaryEntity->iTotalDeleteCount;
-
-			$this->aSummary[$sClass] = $oSummaryEntity;
-		}
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Service/StaticDeletionPlan.php

@@ -1,221 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Service;
-
-use CMDBSource;
-use Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity;
-use Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanEntity;
-use Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem;
-use MetaModel;
-
-class StaticDeletionPlan
-{
-	/** @var array<DeletionPlanEntity> */
-	private array $aDeletionPlan = [];
-
-	/**
-	 * Get a summary of the deletion plan computed for the classes.
-	 * The result is used for display
-	 *
-	 * @param array|null $aClasses
-	 *
-	 * @return array<\Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity>
-	 * @throws \CoreException
-	 */
-	public function GetCleanupSummary(?array $aClasses): array
-	{
-		$aSummary = [];
-		$aDeletionPlan = $this->GetStaticDeletionPlan($aClasses ?? []);
-
-		foreach ($aDeletionPlan as $sClass => $oDeletionPlanEntity) {
-			if ($oDeletionPlanEntity->TotalCount() === 0) {
-				continue;
-			}
-			$oDeletionPlanEntity->FilterUpdatesByDeletes();
-			$oDataCleanupSummary = new DataCleanupSummaryEntity($sClass);
-			$oDataCleanupSummary->iUpdateCount = $oDeletionPlanEntity->oUpdate->Count();
-			$oDataCleanupSummary->iDeleteCount = $oDeletionPlanEntity->oDelete->Count();
-			$oDataCleanupSummary->iIssueCount = $oDeletionPlanEntity->oIssue->Count();
-
-			$aSummary[$sClass] = $oDataCleanupSummary;
-		}
-
-		return $aSummary;
-	}
-
-	/**
-	 * @param array $aClasses Classes to clean entirely
-	 *
-	 * @return array ['class' => DeletionPlanEntity];
-	 *
-	 * @throws \CoreException
-	 */
-	public function GetStaticDeletionPlan(array $aClasses): array
-	{
-		foreach ($aClasses as $sClass) {
-			$oDeletionPlanItem = $this->GetInitialClassDeletionPlan($sClass);
-			// N°9831 Do not overwrite existing entity as it may already exist for this class if a previously processed class references it (issues/updates already accumulated must be kept)
-			if (false === array_key_exists($sClass, $this->aDeletionPlan)) {
-				$this->aDeletionPlan[$sClass] = new DeletionPlanEntity();
-			}
-			$this->aDeletionPlan[$sClass]->oDelete->Merge($oDeletionPlanItem);
-
-			$this->DeletionPlanForReferencingClasses($sClass);
-		}
-
-		return $this->aDeletionPlan;
-	}
-
-	private function DeletionPlanForReferencingClasses(string $sClass): void
-	{
-		$sIdsToRemove = implode(', ', $this->aDeletionPlan[$sClass]->oDelete->aIds);
-		$aReferencingMe = MetaModel::EnumReferencingClasses($sClass);
-		foreach ($aReferencingMe as $sRemoteClass => $aExtKeys) {
-			if (!isset($this->aDeletionPlan[$sRemoteClass])) {
-				$this->aDeletionPlan[$sRemoteClass] =  new DeletionPlanEntity();
-			}
-			$oDeletionPlanEntity = $this->aDeletionPlan[$sRemoteClass];
-			/** @var \AttributeExternalKey $oExtKeyAttDef */
-			foreach ($aExtKeys as $sExtKeyAttCode => $oExtKeyAttDef) {
-				// skip if this external key is behind an external field
-				if (!$oExtKeyAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) {
-					continue;
-				}
-
-				if ($oExtKeyAttDef->IsNullAllowed()) {
-					// update
-					$oUpdateItem = $this->UpdateExtKeyNullable($sRemoteClass, $sExtKeyAttCode, $sIdsToRemove);
-					$oDeletionPlanEntity->oUpdate->Merge($oUpdateItem);
-				} else {
-					// delete
-					$aRemoteIdsToRemove = $this->GetRemoteIdsForExtKey($sRemoteClass, $sExtKeyAttCode, $sIdsToRemove);
-
-					$iDeletePropagationOption = $oExtKeyAttDef->GetDeletionPropagationOption();
-					if ($iDeletePropagationOption == DEL_MANUAL) {
-						// Issue, do not recurse
-						$oDeletionPlanItem = new DeletionPlanItem(aIds: $aRemoteIdsToRemove);
-						$oDeletionPlanEntity->oIssue->Merge($oDeletionPlanItem);
-						continue;
-					}
-
-					if (($iDeletePropagationOption == DEL_MOVEUP) && ($oExtKeyAttDef->IsHierarchicalKey())) {
-						// update hierarchical keys due to row cleanup in the same table
-						$sTargetIdsToRemove = implode(',', $this->aDeletionPlan[$sRemoteClass]->oDelete->aIds);
-						$oUpdateItem = $this->UpdateHierarchicalExtKey($sRemoteClass, $sExtKeyAttCode, $sTargetIdsToRemove);
-						$oDeletionPlanEntity->oUpdate->Merge($oUpdateItem);
-					}
-
-					// Delete entries in Remote Class
-					if (count($aRemoteIdsToRemove) !== 0) {
-						$oDeletionPlanEntity->oDelete->Merge(new DeletionPlanItem($aRemoteIdsToRemove));
-						// Infinite loops do not occurs due to the datamodel structure
-						$this->DeletionPlanForReferencingClasses($sRemoteClass);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param string $sRemoteClass
-	 * @param string $sExtKeyAttCode
-	 * @param string $sIdsToRemoveInTargetClass
-	 *
-	 * @return \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem
-	 * @throws \CoreException
-	 */
-	public function UpdateExtKeyNullable(string $sRemoteClass, string $sExtKeyAttCode, string $sIdsToRemoveInTargetClass): DeletionPlanItem
-	{
-		$aIds = $this->GetRemoteIdsForExtKey($sRemoteClass, $sExtKeyAttCode, $sIdsToRemoveInTargetClass);
-
-		return new DeletionPlanItem($aIds);
-	}
-
-	/**
-	 * @param string $sRemoteClass
-	 * @param string $sExtKeyAttCode
-	 * @param string $sIdsToRemoveInTargetClass
-	 *
-	 * @return \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem
-	 * @throws \CoreException
-	 * @throws \MySQLException
-	 */
-	public function UpdateHierarchicalExtKey(string $sRemoteClass, string $sExtKeyAttCode, string $sIdsToRemoveInTargetClass): DeletionPlanItem
-	{
-		[$sDBTable, $sDBField, $sDBKey] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
-
-		$sSQL = <<<SQL
-SELECT `$sDBKey`
-FROM `$sDBTable` AS `updated`
-INNER JOIN `$sDBTable` AS `removed` ON `updated`.`$sDBField` = `removed`.`$sDBKey`
-WHERE `removed`.`$sDBKey` IN ($sIdsToRemoveInTargetClass)
-SQL;
-		$aIds = CMDBSource::QueryToCol($sSQL, $sDBKey);
-
-		return new DeletionPlanItem($aIds);
-	}
-
-	/**
-	 * @param string $sRemoteClass
-	 * @param string $sExtKeyAttCode
-	 * @param string $sIdsToRemoveInTargetClass
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \MySQLException
-	 */
-	public function GetRemoteIdsForExtKey(string $sRemoteClass, string $sExtKeyAttCode, string $sIdsToRemoveInTargetClass): array
-	{
-		if (\utils::IsNullOrEmptyString($sIdsToRemoveInTargetClass)) {
-			return [];
-		}
-		[$sDBTable, $sDBField, $sDBKey] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
-		$sSQL = "SELECT `$sDBKey` FROM `$sDBTable` WHERE `$sDBField` IN ($sIdsToRemoveInTargetClass)";
-
-		return CMDBSource::QueryToCol($sSQL, $sDBKey);
-	}
-
-	/**
-	 * @param string $sClass
-	 *
-	 * @return \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem
-	 * @throws \CoreException
-	 * @throws \MySQLException
-	 */
-	public function GetInitialClassDeletionPlan(string $sClass): DeletionPlanItem
-	{
-		$sTable = MetaModel::DBGetTable($sClass);
-		$sDBKey = MetaModel::DBGetKey($sClass);
-		$sSQL = "SELECT `$sDBKey` FROM `$sTable`";
-		$aIds = CMDBSource::QueryToCol($sSQL, $sDBKey);
-
-		return new DeletionPlanItem($aIds);
-	}
-
-	/**
-	 * Get database table for an attcode
-	 *
-	 * @param string $sClass
-	 * @param string $sExtKeyAttCode
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public function GetDBInfoForAttcode(string $sClass, string $sExtKeyAttCode): array
-	{
-		$sOriginClass = MetaModel::GetAttributeOrigin($sClass, $sExtKeyAttCode);
-		$sDBTable = MetaModel::DBGetTable($sOriginClass);
-		$oAttDef = MetaModel::GetAttributeDef($sOriginClass, $sExtKeyAttCode);
-		// External key is on a single DB column
-		$sDBField = array_keys($oAttDef->GetSQLColumns())[0];
-		$sDBKey = MetaModel::DBGetKey($sClass);
-		return [$sDBTable, $sDBField, $sDBKey];
-	}
-
-}

datamodels/2.x/combodo-data-feature-removal/src/Service/iObjectService.php

@@ -1,21 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Service;
-
-use DBObject;
-
-interface iObjectService
-{
-	public function Update(DBObject $oToUpdate, string $sAttCode, $value): void;
-
-	public function Delete(string $sClass, string $sId): void;
-
-	public function SetIssue(string $sClass): void;
-
-	public function GetSummary(): array;
-}