N°6218 - 1:n & n:n - Read mode: No refresh of tab count on Add/Remove in pop-up

.doc/itop-version-history.md

@@ -1,14 +1,7 @@
 # iTop version history
 
 ```mermaid
-%%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
-              'git0': 'lawngreen',
-              'git3': 'dodgerblue',
-              'git4': 'grey',
-              'git5': 'grey',
-              'git6': 'grey',
-              'git7': 'grey'
-       }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
+%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
 gitGraph
     commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
     branch support/2.3 order: 900
@@ -75,10 +68,6 @@ gitGraph
     branch support/3.1 order: 840
     checkout support/3.1
     commit id: "2023-08-09" tag: "3.1.0-2"
-    checkout support/2.7
-    commit id: "2023-08-10" tag: "2.7.9"
-    checkout support/3.1
-    commit id: "2023-12-20" tag: "3.1.1"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

CONTRIBUTING.md

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

README.md

@@ -87,11 +87,9 @@ We would like to give a special thank you 🤗 to the people from the community
 - Castro, Randall Badilla
 - Colantoni, Maria Laura
 - Couronné, Guy
-- Dejin, Bie (a.k.a [@bdejin](https://github.com/bdejin))
 - Dvořák, Lukáš
 - Goethals, Stefan
 - Gumble, David
-- Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
 - Kaltefleiter, Lars (a.k.a [@larhip](https://www.github.com/larhip))
 - Khamit, Shamil
 - Kincel, Martin
@@ -107,12 +105,9 @@ We would like to give a special thank you 🤗 to the people from the community
 - Roháč, Richard (a.k.a [@RohacRichard](https://github.com/RohacRichard))
 - Rosenke, Stephan
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
-- Šafránek, Jaroslav (a.k.a [jkcinik](https://sourceforge.net/u/jkcinik/profile/) on SourceForge)
 - Seki, Shoji
 - Shilov, Vladimir
-- Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
 - Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
-- Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))
 - Tulio, Marco
 - Turrubiates, Miguel
 

addons/userrights/userrightsprofile.class.inc.php

@@ -4,8 +4,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
-
 define('ADMIN_PROFILE_NAME', 'Administrator');
 define('PORTAL_PROFILE_NAME', 'Portal user');
 
@@ -935,9 +933,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	}
 
 	/**
-	 * @param string $sClass
-	 * @return string|null Find out which attribute is corresponding the dimension 'owner org'
-	 *                   returns null if no such attribute has been found (no filtering should occur)
+	 * Find out which attribute is corresponding the the dimension 'owner org'
+	 * returns null if no such attribute has been found (no filtering should occur)
 	 */
 	public static function GetOwnerOrganizationAttCode($sClass)
 	{

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

@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
-
 define('ADMIN_PROFILE_NAME', 'Administrator');
 define('PORTAL_PROFILE_NAME', 'Portal user');
 
@@ -582,10 +580,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	/**
 	 * Read and cache organizations allowed to the given user
 	 *
-	 * @param User $oUser
-	 * @param string $sClass (not used here but can be used in overloads)
+	 * @param $oUser
+	 * @param $sClass (not used here but can be used in overloads)
 	 *
-	 * @return array keys of the User allowed org
+	 * @return array
 	 * @throws \CoreException
 	 * @throws \Exception
 	 */

addons/userrights/userrightsprojection.class.inc.php

@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
-
 define('ADMIN_PROFILE_ID', 1);
 
 class UserRightsBaseClass extends cmdbAbstractObject

app.php

@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-use Combodo\iTop\Kernel;
-
-require_once __DIR__.'/lib/autoload_runtime.php';
-
-require_once('approot.inc.php');
-require_once('application/startup.inc.php');
-
-return function (array $context) {
-    return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
-};

application/ajaxwebpage.class.inc.php

@@ -7,7 +7,6 @@
 
 // cannot notify depreciation for now as this is still load in autoloader
 //DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader');
-use Combodo\iTop\Application\WebPage\AjaxPage;
 
 /**
  * Class ajax_page

application/applicationextension.inc.php

@@ -19,8 +19,6 @@
  */
 
 use Combodo\iTop\Application\UI\Base\iUIBlock;
-use Combodo\iTop\Application\WebPage\iTopWebPage;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Symfony\Component\DependencyInjection\Container;
 
 require_once(APPROOT.'application/newsroomprovider.class.inc.php');
@@ -272,14 +270,14 @@ interface iPreferencesExtension
 {
 	/**
 	 * @api
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 */
 	public function DisplayPreferences(WebPage $oPage);
 
 	/**
 	 * @api
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sOperation
 	 *
 	 * @return bool true if the operation has been used
@@ -2017,8 +2015,6 @@ class RestUtils
 	 *
 	 * @return DBObject The object found
 	 * @throws Exception If the input structure is not valid or it could not find exactly one object
-	 *
-	 * @see DBObject::CheckChangedExtKeysValues() generic method to check that we can access the linked object isn't used in that use case because values can be literal, OQL, friendlyname
 	 */
 	public static function FindObjectFromKey($sClass, $key, $bAllowNullValue = false)
 	{

application/cmdbabstract.class.inc.php

@@ -26,7 +26,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Html\HtmlFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
-use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\JsPopoverMenuItem;
@@ -42,9 +42,6 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetViewTable;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetViewTable;
 use Combodo\iTop\Application\UI\Links\Set\LinkSetUIBlockFactory;
-use Combodo\iTop\Application\WebPage\AjaxPage;
-use Combodo\iTop\Application\WebPage\iTopWebPage;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
@@ -288,7 +285,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \cmdbAbstractObject $oObj
 	 * @param array $aParams
 	 *
@@ -357,7 +354,7 @@ JS
 	 * @param int $iKey The identifier of the object
 	 * @param string $sMessageId Your id or one of the well-known ids: 'create', 'update' and 'apply_stimulus'
 	 * @param string $sMessage The HTML message (must be correctly escaped)
-	 * @param string $sSeverity Any of the WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants
+	 * @param string $sSeverity Any of the \WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants
 	 * @param float $fRank Ordering of the message: smallest displayed first (can be negative)
 	 * @param bool $bMustNotExist Do not alter any existing message (considering the id)
 	 *
@@ -379,7 +376,7 @@ JS
 	}
 
 	/**
-	 * @param WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
+	 * @param \WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
 	 *   When writing to the page, markup will be put above the real header of the panel.
 	 *   To insert something IN the panel, we now need to add UIBlocks in either the "subtitle" or "toolbar" sections of the array that will be returned.
 	 * @param bool $bEditMode Deprecated parameter in iTop 3.0.0, use {@see GetDisplayMode()} and ENUM_DISPLAY_MODE_* constants instead
@@ -557,7 +554,7 @@ HTML
 	/**
 	 * Display properties tab of an object
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 * @param string $sPrefix
 	 * @param array $aExtraParams
@@ -596,7 +593,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @throws \Exception
@@ -637,7 +634,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 *
 	 * @throws \CoreException
@@ -864,7 +861,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 * @param string $sPrefix
 	 * @param array $aExtraParams
@@ -1068,7 +1065,7 @@ HTML
 
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method, {@see static::$sDisplayMode} is used instead, but we cannot remove it as it part of the base interface (iDisplay)...
 	 *
 	 * @throws \ApplicationException
@@ -1115,7 +1112,7 @@ HTML
 		}
 
 		// Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage.
-		/** @var iTopWebPage $oPage */
+		/** @var \iTopWebPage $oPage */
 		$aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode);
 		if (false === empty($aHeadersBlocks['subtitle'])) {
 			$oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']);
@@ -1150,7 +1147,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1173,7 +1170,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams See possible values in {@see DataTableUIBlockFactory::RenderDataTable()}
 	 *
@@ -1235,7 +1232,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \DBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -1407,7 +1404,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams key used :
 	 *      <ul>
@@ -1530,7 +1527,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 * @param string $sCharset
@@ -1689,7 +1686,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1902,7 +1899,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1980,7 +1977,7 @@ HTML
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -2011,7 +2008,7 @@ HTML
 
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sClass
 	 * @param string $sAttCode
 	 * @param \AttributeDefinition $oAttDef
@@ -2749,7 +2746,7 @@ JS
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ArchivedObjectException
@@ -3154,7 +3151,7 @@ EOF
 	/**
 	 *  Select the derived class to create
 	 * @param string $sClass
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param \ApplicationContext $oAppContext
 	 * @param array $aPossibleClasses
 	 * @param array $aHiddenFields
@@ -3249,7 +3246,7 @@ EOF
 		return $oBlock;
 	}
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sClass
 	 * @param \DBObject|null $oSourceObject Object to use for the creation form, can be either the class to instantiate, an object to clone or an object to use (eg. already prefilled / modeled object)
 	 * @param array $aArgs
@@ -3334,7 +3331,7 @@ EOF
 	}
 
 	/**
-	 * @param WebPage      $oPage
+	 * @param \WebPage      $oPage
 	 * @param string        $sStimulus
 	 * @param array|null    $aPrefillFormParam
 	 * @param bool          $bDisplayBareProperties Whether to display the object details or not
@@ -3712,7 +3709,7 @@ HTML;
 			if ($oAttDef->GetEditClass() == 'Document') {
 				/** @var \ormDocument $oDocument */
 				$oDocument = $this->Get($sAttCode);
-				if (is_object($oDocument) && !$oDocument->IsEmpty()) {
+				if (!$oDocument->IsEmpty()) {
 					$sFieldAsHtml = $this->GetAsHTML($sAttCode);
 
 					$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');
@@ -3747,7 +3744,7 @@ HTML;
 	/**
 	 * Displays a blob document *inline* (if possible, depending on the type of the document)
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @return string
@@ -4547,7 +4544,7 @@ HTML;
 		return $res;
 	}
 
-	protected function PostInsertActions(): void
+	public function PostInsertActions(): void
 	{
 		parent::PostInsertActions();
 
@@ -4571,9 +4568,6 @@ HTML;
 		InlineImage::FinalizeInlineImages($this);
 	}
 
-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
-	 */
 	protected function DBCloneTracked_Internal($newKey = null)
 	{
         /** @var cmdbAbstractObject $oNewObj */
@@ -4594,7 +4588,6 @@ HTML;
 	public function DBUpdate()
 	{
 		$this->LogCRUDEnter(__METHOD__);
-		$res = 0;
 
 		try {
 			if (count($this->ListChanges()) === 0) {
@@ -4614,7 +4607,7 @@ HTML;
 		return $res;
 	}
 
-	protected function PostUpdateActions(array $aChanges): void
+	public function PostUpdateActions(array $aChanges): void
 	{
 		parent::PostUpdateActions($aChanges);
 
@@ -4655,7 +4648,6 @@ HTML;
 			if (static::IsCrudStackEmpty()) {
 				// Avoid signaling the current object that links were modified
 				static::RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
-				$this->LogCRUDDebug(__METHOD__, var_export(self::$aObjectsAwaitingEventDbLinksChanged, true));
 				static::FireEventDbLinksChangedForAllObjects();
 			}
 		}
@@ -4664,15 +4656,7 @@ HTML;
 		return $oDeletionPlan;
 	}
 
-	protected function PostDeleteActions(): void
-	{
-		parent::PostDeleteActions();
-	}
-
-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
-	 */
-	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
+		protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
 		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
@@ -4835,7 +4819,7 @@ HTML;
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sComment
 	 * @param string $sPrefix
@@ -4939,7 +4923,7 @@ HTML
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sComment
 	 * @param string $sPrefix
@@ -5064,7 +5048,7 @@ HTML
 	 * Display a form for modifying several objects at once
 	 * The form will be submitted to the current page, with the specified additional values
 	 *
-	 * @param iTopWebPage $oP
+	 * @param \iTopWebPage $oP
 	 * @param string $sClass
 	 * @param array $aSelectedObj
 	 * @param string $sCustomOperation
@@ -5308,7 +5292,7 @@ EOF
 	/**
 	 * Process the reply made from a form built with DisplayBulkModifyForm
 	 *
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param string $sClass
 	 * @param array $aSelectedObj
 	 * @param string $sCustomOperation
@@ -5364,7 +5348,7 @@ EOF
 			$aErrors = $oObj->UpdateObjectFromPostedForm('');
 			$bResult = (count($aErrors) == 0);
 			if ($bResult) {
-				[$bResult, $aErrors] = $oObj->CheckToWrite();
+				list($bResult, $aErrors) = $oObj->CheckToWrite();
 			}
 			if ($bPreview) {
 				$sStatus = $bResult ? Dict::S('UI:BulkModifyStatusOk') : Dict::S('UI:BulkModifyStatusError');
@@ -5381,11 +5365,6 @@ EOF
 				'errors' => '<p>'.($bResult ? '' : implode('</p><p>', $aErrorsToDisplay)).'</p>',
 			);
 			if ($bResult && (!$bPreview)) {
-				// doing the check will load multiple times same objects :/
-				// but it shouldn't cost too much on execution time
-				// user can mitigate by selecting less extkeys/lnk to set and/or less objects to update 🤷‍♂️
-				$oObj->CheckChangedExtKeysValues();
-
 				$oObj->DBUpdate();
 			}
 		}
@@ -5448,7 +5427,7 @@ EOF
 	/**
 	 * Perform all the needed checks to delete one (or more) objects
 	 *
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sClass
 	 * @param \DBObject[] $aObjects
 	 * @param $bPreview
@@ -5954,16 +5933,6 @@ JS
 		$this->FireEvent(EVENT_DB_CHECK_TO_DELETE, ['deletion_plan' => $oDeletionPlan]);
 	}
 
-	/**
-	 * @return void
-	 * @throws \CoreException
-	 * @since 3.1.2
-	 */
-	final protected function FireEventAboutToDelete(): void
-	{
-		$this->FireEvent(EVENT_DB_ABOUT_TO_DELETE);
-	}
-
 	/**
 	 * @return void
 	 * @throws \CoreException
@@ -5973,63 +5942,47 @@ JS
 	final protected function FireEventAfterDelete(): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
+		$this->FireEventDbLinksChangedForCurrentObject();
 		$this->FireEvent(EVENT_DB_AFTER_DELETE);
 	}
 
 	/**
-	 * Possibility for linked classes to be notified of current class modification
-	 *
+	 * If the passed object is an instance of a link class, then will register each remote object for modification using {@see static::RegisterObjectAwaitingEventDbLinksChanged()}
 	 * If an external key was modified, register also the previous object that was linked previously.
 	 *
-	 * @uses static::RegisterObjectAwaitingEventDbLinksChanged()
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \Exception
 	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreException
-	 * @throws Exception
-	 *
-	 * @since 3.1.0 N°5906 method creation
-	 * @since 3.1.1 3.2.0 N°6228 now just notify attributes having `with_php_computation`
+	 * @since 3.1.0 N°5906
 	 */
 	final protected function NotifyAttachedObjectsOnLinkClassModification(): void
 	{
+		$sClass = get_class($this);
+		if (false === MetaModel::IsLinkClass($sClass)) {
+			return;
+		}
 		// previous values in case of link change
 		$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-		$sClass = get_class($this);
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList($sClass, [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExternalKeyAttCode) {
-			/** @var AttributeExternalKey $oAttDef */
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sExternalKeyAttCode);
 
-			if (false === $this->DoesTargetObjectHavePhpComputation($oAttDef)) {
-				continue;
+		$aLnkClassExternalKeys = MetaModel::GetAttributesList($sClass, [AttributeExternalKey::class]);
+		foreach ($aLnkClassExternalKeys as $sExternalKeyAttCode) {
+			/** @var \AttributeExternalKey $oExternalKeyAttDef */
+			$oExternalKeyAttDef = MetaModel::GetAttributeDef($sClass, $sExternalKeyAttCode);
+			$sRemoteClassName = $oExternalKeyAttDef->GetTargetClass();
+
+			$sRemoteObjectId = $this->Get($sExternalKeyAttCode);
+			if ($sRemoteObjectId > 0) {
+				self::RegisterObjectAwaitingEventDbLinksChanged($sRemoteClassName, $sRemoteObjectId);
 			}
 
-			$sTargetObjectId = $this->Get($sExternalKeyAttCode);
-			$sTargetClass = $oAttDef->GetTargetClass();
-			if ($sTargetObjectId > 0) {
-				$this->LogCRUDDebug(__METHOD__, "Add $sTargetClass:$sTargetObjectId for DBLINKS_CHANGED");
-				self::RegisterObjectAwaitingEventDbLinksChanged($sTargetClass, $sTargetObjectId);
-			}
-
-			$sPreviousTargetObjectId = $aPreviousValues[$sExternalKeyAttCode] ?? 0;
-			if ($sPreviousTargetObjectId > 0) {
-				$this->LogCRUDDebug(__METHOD__, "Add $sTargetClass:$sPreviousTargetObjectId for DBLINKS_CHANGED");
-				self::RegisterObjectAwaitingEventDbLinksChanged($sTargetClass, $sPreviousTargetObjectId);
+			$sPreviousRemoteObjectId = $aPreviousValues[$sExternalKeyAttCode] ?? 0;
+			if ($sPreviousRemoteObjectId > 0) {
+				self::RegisterObjectAwaitingEventDbLinksChanged($sRemoteClassName, $sPreviousRemoteObjectId);
 			}
 		}
 	}
 
-	private function DoesTargetObjectHavePhpComputation(AttributeExternalKey $oAttDef): bool
-	{
-		/** @var AttributeLinkedSet $oAttDefMirrorLink */
-		$oAttDefMirrorLink = $oAttDef->GetMirrorLinkAttribute();
-		if (is_null($oAttDefMirrorLink) || false === $oAttDefMirrorLink->HasPHPComputation()){
-			return false;
-		}
-
-		return true;
-	}
-
 	/**
 	 * Register one object for later EVENT_DB_LINKS_CHANGED event.
 	 *
@@ -6064,12 +6017,7 @@ JS
 
 		$sClass = get_class($this);
 		$sId = $this->GetKey();
-		$bIsObjectAwaitingEventDbLinksChanged = self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
-		if (false === $bIsObjectAwaitingEventDbLinksChanged) {
-			return;
-		}
-		self::FireEventDbLinksChangedForObject($this);
-		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+		self::FireEventDbLinksChangedForClassId($sClass, $sId);
 	}
 
 	/**
@@ -6101,15 +6049,9 @@ JS
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
 		$oObject = MetaModel::GetObject($sClass, $sId, false);
-		self::FireEventDbLinksChangedForObject($oObject);
-		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
-	}
-
-	private static function FireEventDbLinksChangedForObject(DBObject $oObject)
-	{
-		self::SetEventDBLinksChangedBlocked(true);
 		// N°6408 The object can have been deleted
 		if (!is_null($oObject)) {
+			self::SetEventDBLinksChangedBlocked(true);
 			MetaModel::StartReentranceProtection($oObject);
 			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
 			MetaModel::StopReentranceProtection($oObject);
@@ -6117,6 +6059,7 @@ JS
 				$oObject->DBUpdate();
 			}
 		}
+		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
 	}
 

application/dashboard.class.inc.php

@@ -9,8 +9,6 @@ use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
 use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
-use Combodo\iTop\Application\WebPage\iTopWebPage;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'application/dashboardlayout.class.inc.php');
 require_once(APPROOT.'application/dashlet.class.inc.php');
@@ -424,7 +422,7 @@ abstract class Dashboard
 	}
 
 	/**
-	 * @param WebPage $oPage *
+	 * @param \WebPage $oPage *
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ReflectionException
@@ -515,7 +513,7 @@ EOF
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 * @param bool $bCanEdit
@@ -571,7 +569,7 @@ JS
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 * @throws \ReflectionException
 	 * @throws \Exception
@@ -594,7 +592,7 @@ JS
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aExtraParams
 	 */
 	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = array())
@@ -1111,7 +1109,7 @@ JS
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \Exception
@@ -1230,7 +1228,7 @@ EOF
 
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 * @param array $aExtraParams
 	 *
@@ -1490,7 +1488,7 @@ JS
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $sOQL
 	 *
 	 * @throws \DictExceptionMissingString

application/dashboardlayout.class.inc.php

@@ -19,7 +19,6 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardRow;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Dashboard presentation
@@ -107,7 +106,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $aCells
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams

application/dashlet.class.inc.php

@@ -23,7 +23,6 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 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;
 
 require_once(APPROOT.'application/forms.class.inc.php');
 
@@ -223,7 +222,7 @@ abstract class Dashlet
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param bool $bEnclosingDiv
 	 * @param array $aExtraParams
@@ -299,7 +298,7 @@ EOF
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *
@@ -310,7 +309,7 @@ EOF
 	/**
 	 * Rendering without the real data
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *

application/datamodel.application.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -270,23 +270,6 @@
         </event_datum>
       </event_data>
     </event>
-    <event id="EVENT_DB_ABOUT_TO_DELETE" _delta="define">
-      <description>An object is about to be deleted from the database</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <replaces>cmdbAbstractObject::OnDelete</replaces>
-      <event_data>
-        <event_datum id="object">
-          <description>The object about to be deleted</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
     <event id="EVENT_DB_AFTER_DELETE" _delta="define">
       <description>An object has been deleted into the database</description>
       <sources>
@@ -531,18 +514,10 @@
           <description>The object containing the document</description>
           <type>DBObject</type>
         </event_datum>
-        <event_datum id="att_code">
-          <description>The optional object attribute code hosting the document</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="document">
           <description>The document downloaded</description>
           <type>ormDocument</type>
         </event_datum>
-        <event_datum id="content_disposition">
-          <description>The content disposition of the document ("inline" or "attachment")</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>

application/datatable.class.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 /**
@@ -63,8 +61,8 @@ class DataTable
 	}
 
 	/**
-	 * @param WebPage $oPage
-	 * @param DataTableSettings $oSettings
+	 * @param \WebPage $oPage
+	 * @param \DataTableSettings $oSettings
 	 * @param $bActionsMenu
 	 * @param $sSelectMode
 	 * @param $bViewLink
@@ -143,7 +141,7 @@ class DataTable
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -238,7 +236,7 @@ class DataTable
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $sSelectMode
 	 *
 	 * @return string
@@ -257,7 +255,7 @@ class DataTable
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -350,7 +348,7 @@ EOF;
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -377,7 +375,7 @@ EOF;
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -407,7 +405,7 @@ EOF;
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $aColumns
 	 * @param $bViewLink
 	 * @param $iDefaultPageSize
@@ -660,7 +658,7 @@ EOF;
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize
@@ -792,7 +790,7 @@ JS
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $iDefaultPageSize
 	 * @param $iStart
 	 */
@@ -820,7 +818,7 @@ JS
 class PrintableDataTable extends DataTable
 {
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -846,7 +844,7 @@ class PrintableDataTable extends DataTable
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize

application/displayblock.class.inc.php

@@ -24,8 +24,6 @@ use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxBars\BlockChartAjaxBa
 use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxPie\BlockChartAjaxPie;
 use Combodo\iTop\Application\UI\DisplayBlock\BlockCsv\BlockCsv;
 use Combodo\iTop\Application\UI\DisplayBlock\BlockList\BlockList;
-use Combodo\iTop\Application\WebPage\iTopWebPage;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Router\Router;
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -597,7 +595,7 @@ class DisplayBlock
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ApplicationException
@@ -1356,7 +1354,7 @@ JS
 }
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\iUIBlock
@@ -1380,7 +1378,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \ConfigException
@@ -1458,7 +1456,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Layout\UIContentBlock
 	 * @throws \ApplicationException
@@ -1566,7 +1564,7 @@ JS
 	/**
 	 * @deprecated 3.1.0 N°5957
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Component\Html\Html|\Combodo\iTop\Application\UI\Base\Layout\UIContentBlock|string
@@ -1666,7 +1664,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1832,7 +1830,7 @@ class MenuBlock extends DisplayBlock
 	 * an object in with the same tab active by default as the tab that was active when selecting
 	 * the "Modify..." action.
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aExtraParams
 	 * @param string|null $sId
 	 *

application/excelexporter.class.inc.php

@@ -1,8 +1,4 @@
 <?php
-
-use Combodo\iTop\Application\WebPage\CLIPage;
-use Combodo\iTop\Application\WebPage\Page;
-
 require_once('xlsxwriter.class.php');
 
 class ExcelExporter

application/exceptions/InvalidExternalKeyValueException.php

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

application/forms.class.inc.php

@@ -15,7 +15,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\WebPage\WebPage;
 
 /**
  * Helper class to build interactive forms to be used either in stand-alone
@@ -829,7 +828,7 @@ class DesignerFormField
 	}
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param string $sFormId
 	 * @param string $sRenderMode
 	 *

application/logindefault.class.inc.php

@@ -119,11 +119,6 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	protected function OnConnected(&$iErrorCode)
 	{
 		Session::Unset('login_temp_auth_user');
-		if (is_null(UserRights::GetUserObject())){
-			//N°7085 avoid infinite loop
-			IssueLog::Error("No user logged in. exit");
-			exit(-1);
-		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
@@ -139,4 +134,4 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 			}
 		}
 	}
-}
+}

application/loginform.class.inc.php

@@ -140,11 +140,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('extensionblock/loginformfooter.html.twig'));
 
 		$bEnableResetPassword = MetaModel::GetConfig()->Get('forgot_password');
-		$sResetPasswordUrl = MetaModel::GetConfig()->Get('forgot_password.url');
-		if ($sResetPasswordUrl == '')
-		{
-			$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
-		}
+		$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
 		$aData = array(
 			'bEnableResetPassword' => $bEnableResetPassword,
 			'sResetPasswordUrl' => $sResetPasswordUrl,

application/logintwig.class.inc.php

@@ -9,7 +9,6 @@
 
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\TwigBase\Twig\Extension;
-use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Twig\Environment;
 use Twig\Loader\ChainLoader;
 use Twig\Loader\FilesystemLoader;

application/loginwebpage.class.inc.php

@@ -26,8 +26,6 @@
 
 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;
 
@@ -92,7 +90,7 @@ class LoginWebPage extends NiceWebPage
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
 		$this->no_cache();
-		$this->add_http_headers();
+		$this->add_xframe_options();
 	}
 	
 	public function SetStyleSheet()

application/maintenancemsg.php

@@ -22,7 +22,6 @@
 // Maintenance message display functions
 // Only included by approot.inc.php
 //
-use Combodo\iTop\Application\WebPage\ErrorPage;
 
 /**
  * Use a setup page to display the maintenance message

application/menunode.class.inc.php

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

application/query.class.inc.php

@@ -21,7 +21,6 @@ use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 abstract class Query extends cmdbAbstractObject
 {

application/shortcut.class.inc.php

@@ -16,7 +16,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\UI\Base\Component\DataTable\DataTableSettings;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 
 /**

application/template.class.inc.php

@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\WebPage\iTopWebPage;
-use Combodo\iTop\Application\WebPage\WebPage;
-
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 /**
  * This class manages the special template format used internally to build the iTop web pages

application/ui.extkeywidget.class.inc.php

@@ -7,7 +7,6 @@
 use Combodo\iTop\Application\Helper\FormHelper;
 use Combodo\iTop\Application\UI\Base\Component\Form\FormUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 
 require_once(APPROOT.'/application/displayblock.class.inc.php');
@@ -66,7 +65,7 @@ class UIExtKeyWidget
 	//public function __construct($sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sClass
 	 * @param string $sTitle
@@ -133,7 +132,7 @@ class UIExtKeyWidget
 	}
 
 	/**
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param int $iMaxComboLength
 	 * @param bool $bAllowTargetCreation
 	 * @param string $sTitle
@@ -445,7 +444,7 @@ JS
 	/**
 	 * Get the HTML fragment corresponding to the ext key editing widget
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param int $iMaxComboLength
 	 * @param boolean $bAllowTargetCreation
 	 * @param string $sTitle

application/ui.htmleditorwidget.class.inc.php

@@ -16,7 +16,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\WebResourcesHelper;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Class UIHTMLEditorWidget

application/ui.linksdirectwidget.class.inc.php

@@ -6,7 +6,6 @@
 
 use Combodo\iTop\Application\Helper\FormHelper;
 use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetEditTable;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 /**

application/ui.linkswidget.class.inc.php

@@ -8,8 +8,6 @@ use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory
 use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow\FormTableRow;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetEditTable;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockObjectPickerDialog;
-use Combodo\iTop\Application\WebPage\JsonPage;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 require_once(APPROOT.'application/displayblock.class.inc.php');

application/ui.passwordwidget.class.inc.php

@@ -24,8 +24,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
-
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UIPasswordWidget 

application/ui.searchformforeignkeys.class.inc.php

@@ -21,8 +21,6 @@
  */
 
 
-use Combodo\iTop\Application\WebPage\WebPage;
-
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys

application/uiwizard.class.inc.php

@@ -15,7 +15,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\WebPage\iTopWebPage;
 
 
 /**

application/utils.inc.php

@@ -20,8 +20,6 @@
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
-use Combodo\iTop\Application\UI\Hook\iKeyboardShortcut;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Module\ModuleService;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\OutputStyle;
@@ -1455,7 +1453,7 @@ class utils
 	/**
 	 * Merge standard menu items with plugin provided menus items
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param int $iMenuId
 	 * @param \DBObjectSet $param
 	 * @param array $aActions
@@ -2501,17 +2499,15 @@ SQL;
 						$aHeaders = static::ParseHeaders($http_response_header);
 						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
 						// Compute the file extension from the MIME Type
-						foreach ($aKnownExtensions as $sExtValue => $sMime) {
-							if ($sMime === $sMimeType) {
+						foreach($aKnownExtensions as $sExtValue => $sMime)
+						{
+							if ($sMime === $sMimeType)
+							{
 								$sExtension = '.'.$sExtValue;
 								break;
 							}
 						}
 					}
-					$sPathName = pathinfo($sPath, PATHINFO_FILENAME);
-					if (utils::IsNotNullOrEmptyString($sPathName)) {
-						$sFileName = $sPathName;
-					}
 					$sFileName .= $sExtension;
 				}
 				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
@@ -2958,7 +2954,7 @@ HTML;
 		$aResultPref = [];
 		$aShortcutPrefs = appUserPreferences::GetPref('keyboard_shortcuts', []);
 		// Note: Mind the 4 blackslashes, see utils::GetClassesForInterface()
-		$aShortcutClasses = utils::GetClassesForInterface(iKeyboardShortcut::class, '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
+		$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
 
 		foreach ($aShortcutClasses as $cShortcutPlugin) {
 			$sTriggeredElement = $cShortcutPlugin::GetShortcutTriggeredElementSelector();
@@ -3033,7 +3029,6 @@ HTML;
 	 *
 	 * @return bool if string null or empty
 	 * @since 3.0.2 N°5302
-	 * @since 2.7.10 N°6458 add method in the 2.7 branch
 	 */
 	public static function IsNullOrEmptyString(?string $sString): bool
 	{
@@ -3049,7 +3044,6 @@ HTML;
 	 *
 	 * @return bool if string is not null and not empty
 	 * @since 3.0.2 N°5302
-	 * @since 2.7.10 N°6458 add method in the 2.7 branch
 	 */
 	public static function IsNotNullOrEmptyString(?string $sString): bool
 	{

application/wizardhelper.class.inc.php

@@ -24,8 +24,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
-
 require_once(APPROOT.'/application/uiwizard.class.inc.php');
 
 class WizardHelper
@@ -369,7 +367,7 @@ JS;
 	/**
 	 * Add necessary JS snippets (to the page) to be executed for fields update
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @return void
 	 * @since 3.0.3-2 3.0.4 3.1.1 3.2.0 N°6766
 	 */

approot.inc.php

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

composer.json

@@ -4,7 +4,7 @@
   "type": "project",
   "license": "AGPL-3.0-only",
   "require": {
-    "php": ">=8.1.0 <8.2.0",
+    "php": ">=7.4.0 <8.2.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -23,24 +23,18 @@
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "^6.0.0",
     "scssphp/scssphp": "^1.10.3",
-    "symfony/console": "~6.4.0",
-    "symfony/dotenv": "~6.4.0",
-    "symfony/form": "~6.4.0",
-    "symfony/framework-bundle": "~6.4.0",
-    "symfony/http-foundation": "~6.4.0",
-    "symfony/http-kernel": "~6.4.0",
-    "symfony/runtime": "~6.4.0",
-    "symfony/serializer": "^6.4",
-    "symfony/twig-bundle": "~6.4.0",
-    "symfony/validator": "~6.4.0",
-    "symfony/var-dumper": "~6.4.0",
-    "symfony/yaml": "~6.4.0",
+    "symfony/console": "5.4.*",
+    "symfony/dotenv": "5.4.*",
+    "symfony/framework-bundle": "5.4.*",
+    "symfony/http-foundation": "5.4.*",
+    "symfony/http-kernel": "5.4.*",
+    "symfony/twig-bundle": "5.4.*",
+    "symfony/yaml": "5.4.*",
     "thenetworg/oauth2-azure": "^2.0"
   },
   "require-dev": {
-    "symfony/stopwatch": "~6.4.0",
-    "symfony/web-profiler-bundle": "~6.4.0",
-    "symfony/debug-bundle": "~6.4.0"
+    "symfony/stopwatch": "5.4.*",
+    "symfony/web-profiler-bundle": "5.4.*"
   },
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
@@ -52,7 +46,7 @@
   },
   "config": {
     "platform": {
-      "php": "8.1.0"
+      "php": "7.4.0"
     },
     "vendor-dir": "lib",
     "preferred-install": {
@@ -60,10 +54,7 @@
     },
     "sort-packages": true,
     "classmap-authoritative": true,
-    "platform-check": true,
-    "allow-plugins": {
-      "symfony/runtime": true
-    }
+    "platform-check": true
   },
   "autoload": {
     "classmap": [
@@ -81,9 +72,6 @@
       "application/logindefault.class.inc.php",
       "application/loginexternal.class.inc.php",
       "application/loginurl.class.inc.php"
-    ],
-    "files": [
-      "sources/alias.php"
     ]
   },
   "conflict": {
@@ -93,9 +81,6 @@
     "symfony": {
       "allow-contrib": false,
       "require": "3.4.*"
-    },
-    "runtime": {
-      "dotenv_path": "symfony/.env"
     }
   },
   "scripts": {

core/action.class.inc.php

@@ -17,7 +17,6 @@
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Persistent classes (internal): user defined actions
@@ -202,39 +201,12 @@ abstract class ActionNotification extends Action
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list'));
 		// - Attributes to be displayed for a list
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'description', 'status'));
-		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
 		// Search criteria
 		// - Criteria of the std search form
 //		MetaModel::Init_SetZListItems('standard_search', array('name'));
 		// - Default criteria of the search form
 //		MetaModel::Init_SetZListItems('default_search', array('name'));
 	}
-
-	/**
-	 * @param $sLanguage
-	 * @param $sLanguageCode
-	 *
-	 * @return array [$sPreviousLanguage, $aPreviousPluginProperties]
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \DictExceptionUnknownLanguage
-	 * @since 3.2.0
-	 */
-	public function SetNotificationLanguage($sLanguage = null, $sLanguageCode = null){
-		$sPreviousLanguage = Dict::GetUserLanguage();
-		$aPreviousPluginProperties = ApplicationContext::GetPluginProperties('QueryLocalizerPlugin');
-		$sLanguage = $sLanguage ?? $this->Get('language');
-		$sLanguageCode = $sLanguageCode ?? $sLanguage;
-		if (!utils::IsNullOrEmptyString($sLanguage)) {
-			// If a language is specified for this action, force this language
-			// when rendering all placeholders inside this message
-			Dict::SetUserLanguage($sLanguage);
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $sLanguageCode);
-		}
-		return [$sPreviousLanguage, $aPreviousPluginProperties];
-	}
 }
 
 /**
@@ -301,6 +273,7 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values" => null, "sql" => "subject", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values" => null, "sql" => "body", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values" => new ValueSetEnum('low,normal,high'), "sql" => "importance", "default_value" => 'normal', "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeBlob("html_template", array("is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeEnum("ignore_notify", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "ignore_notify", "default_value" => 'yes', "is_null_allowed" => false, "depends_on" => array())));
 		
@@ -588,7 +561,15 @@ class ActionEmail extends ActionNotification
 			'attachments' => [],
 		];
 		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
+		$sPreviousLanguage = Dict::GetUserLanguage();
+		$aPreviousPluginProperties = ApplicationContext::GetPluginProperties('QueryLocalizerPlugin');
+		if ($this->Get('language') !== '') {
+			// If a language is specified for this action, force this language
+			// when rendering all placeholders inside this message
+			Dict::SetUserLanguage($this->Get('language'));
+			AttributeDateTime::LoadFormatFromConfig();
+			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $this->Get('language'));
+		}
 
 		try
 		{
@@ -620,7 +601,9 @@ class ActionEmail extends ActionNotification
 		}
 		finally {
 			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-			$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
+			Dict::SetUserLanguage($sPreviousLanguage);
+			AttributeDateTime::LoadFormatFromConfig();
+			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $aPreviousPluginProperties['language_code'] ?? null);
 		}
 		
 		if (!is_null($oLog)) {

core/attributedef.class.inc.php

@@ -6,7 +6,6 @@
 
 use Combodo\iTop\Application\UI\Base\Component\FieldBadge\FieldBadgeUIBlockFactory;
 use Combodo\iTop\Application\UI\Links\Set\BlockLinkSetDisplayAsProperty;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Form\Field\LabelField;
 use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Form;
@@ -1740,20 +1739,11 @@ class AttributeLinkedSet extends AttributeDefinition
 	 * @return bool true if Attribute has constraints
 	 * @since 3.1.0 N°6228
 	 */
-	public function HasPHPConstraint(): bool
+	public function GetHasConstraint()
 	{
 		return $this->GetOptional('with_php_constraint', false);
 	}
 
-	/**
-	 * @return bool true if Attribute has computation (DB_LINKS_CHANGED event propagation, `with_php_computation` attribute xml property), false otherwise
-	 * @since 3.1.1 3.2.0 N°6228
-	 */
-	public function HasPHPComputation(): bool
-	{
-		return $this->GetOptional('with_php_computation', false);
-	}
-	
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
@@ -12997,7 +12987,7 @@ class AttributeRedundancySettings extends AttributeDBField
 	 * Display an option (form, or current value)
 	 *
 	 * @param string $sCurrentValue
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sFormPrefix
 	 * @param bool $bEditMode
 	 * @param string $sUserOption

core/autoload.php

@@ -25,7 +25,6 @@ MetaModel::IncludeModule('application/audit.domain.class.inc.php');
 MetaModel::IncludeModule('application/query.class.inc.php');
 MetaModel::IncludeModule('setup/moduleinstallation.class.inc.php');
 
-
 MetaModel::IncludeModule('core/event.class.inc.php');
 MetaModel::IncludeModule('core/action.class.inc.php');
 MetaModel::IncludeModule('core/trigger.class.inc.php');

core/bulkchange.class.inc.php

@@ -6,9 +6,6 @@
 
 // The BOM is added at the head of exported UTF-8 CSV data, and removed (if present) from input UTF-8 data.
 // This helps MS-Excel (Version > 2007, Windows only) in changing its interpretation of a CSV file (by default Excel reads data as ISO-8859-1 -not 100% sure!)
-use Combodo\iTop\Application\WebPage\iTopWebPage;
-use Combodo\iTop\Application\WebPage\WebPage;
-
 define('UTF8_BOM', chr(239).chr(187).chr(191)); // 0xEF, 0xBB, 0xBF
 
 

core/bulkexport.class.inc.php

@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\WebPage\Page;
-use Combodo\iTop\Application\WebPage\WebPage;
-
 define('EXPORTER_DEFAULT_CHUNK_SIZE', 1000);
 
 class BulkExportException extends Exception
@@ -394,7 +391,7 @@ abstract class BulkExport
 
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/cmdbobject.class.inc.php

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

core/cmdbsource.class.inc.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   iTop is free software; you can redistribute it and/or modify	
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -42,12 +42,6 @@ class CMDBSource
 	const ENUM_DB_VENDOR_MARIADB = 'MariaDB';
 	const ENUM_DB_VENDOR_PERCONA = 'Percona';
 
-	/**
-	 * @since 2.7.10 3.0.4 3.1.2 3.0.2 N°6889 constant creation
-	 * @internal will be removed in a future version
-	 */
-	const MYSQL_DEFAULT_PORT = 3306;
-
 	/**
 	 * Error: 1205 SQLSTATE: HY000 (ER_LOCK_WAIT_TIMEOUT)
 	 *   Message: Lock wait timeout exceeded; try restarting transaction
@@ -218,19 +212,16 @@ class CMDBSource
 	/**
 	 * @param string $sDbHost initial value ("p:domain:port" syntax)
 	 * @param string $sServer server variable to update
-	 * @param int|null $iPort port variable to update, will return null if nothing is specified in $sDbHost
-	 *
-	 * @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost. Use {@see MYSQL_DEFAULT_PORT} if needed
-	 *
-	 * @link http://php.net/manual/en/mysqli.persistconns.php documentation for the "p:" prefix (persistent connexion)
+	 * @param int $iPort port variable to update
 	 */
 	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
 	{
 		$aConnectInfo = explode(':', $sDbHost);
 
 		$bUsePersistentConnection = false;
-		if (strcasecmp($aConnectInfo[0], 'p') === 0)
+		if (strcasecmp($aConnectInfo[0], 'p') == 0)
 		{
+			// we might have "p:" prefix to use persistent connections (see http://php.net/manual/en/mysqli.persistconns.php)
 			$bUsePersistentConnection = true;
 			$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
 		}
@@ -248,6 +239,10 @@ class CMDBSource
 		{
 			$iPort = (int)($aConnectInfo[1]);
 		}
+		else
+		{
+			$iPort = 3306;
+		}
 	}
 
 	/**
@@ -385,7 +380,7 @@ class CMDBSource
 	public static function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
-
+		
 		$sVersionComment = static::GetServerVariable('version') .  ' - ' . static::GetServerVariable('version_comment');
 		if(preg_match('/mariadb/i', $sVersionComment) === 1)
 		{
@@ -395,7 +390,7 @@ class CMDBSource
 		{
 			$sDBVendor = static::ENUM_DB_VENDOR_PERCONA;
 		}
-
+		
 		return $sDBVendor;
 	}
 
@@ -939,7 +934,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+				
 		while ($aRow = $oResult->fetch_array($iMode))
 		{
 			$aData[] = $aRow;
@@ -1093,7 +1088,7 @@ class CMDBSource
 		if (!array_key_exists($iKey, $aTableInfo["Fields"])) return false;
 		$aFieldData = $aTableInfo["Fields"][$iKey];
 		if (!array_key_exists("Key", $aFieldData)) return false;
-		return ($aFieldData["Key"] == "PRI");
+		return ($aFieldData["Key"] == "PRI"); 
 	}
 
 	public static function IsAutoIncrement($sTable, $sField)
@@ -1104,7 +1099,7 @@ class CMDBSource
 		$aFieldData = $aTableInfo["Fields"][$sField];
 		if (!array_key_exists("Extra", $aFieldData)) return false;
 		//MyHelpers::debug_breakpoint($aFieldData);
-		return (strstr($aFieldData["Extra"], "auto_increment"));
+		return (strstr($aFieldData["Extra"], "auto_increment")); 
 	}
 
 	public static function IsField($sTable, $sField)
@@ -1371,13 +1366,13 @@ class CMDBSource
 	public static function GetTableFieldsList($sTable)
 	{
 		assert(!empty($sTable));
-
+		
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return array(); // #@# or an error ?
 
 		return array_keys($aTableInfo["Fields"]);
 	}
-
+	
 	// Cache the information about existing tables, and their fields
 	private static $m_aTablesInfo = array();
 	private static function _TablesInfoCacheReset($sTableName = null)
@@ -1510,7 +1505,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+		
 		$aRows = array();
 		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
@@ -1519,7 +1514,7 @@ class CMDBSource
 		$oResult->free();
 		return $aRows;
 	}
-
+	
 	/**
 	 * Returns the value of the specified server variable
 	 * @param string $sVarName Name of the server variable
@@ -1535,7 +1530,7 @@ class CMDBSource
 	/**
 	 * Returns the privileges of the current user
 	 * @return string privileges in a raw format
-	 */
+	 */	   	
 	public static function GetRawPrivileges()
 	{
 		try
@@ -1561,8 +1556,8 @@ class CMDBSource
 
 	/**
 	 * Determine the slave status of the server
-	 * @return bool true if the server is slave
-	 */
+	 * @return bool true if the server is slave 
+	 */	   	
 	public static function IsSlaveServer()
 	{
 		try

core/config.class.inc.php

@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.2.0-dev');
+define('ITOP_VERSION', '3.1.1-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -889,14 +889,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-        'forgot_password.url' => [
-			'type'                => 'string',
-			'description'         => 'Set this value to your "forgot password" service URL if it should be handled out of '.ITOP_APPLICATION_SHORT.'. Note that it will apply to all users (iTop users, LDAP users, ...)',
-			'default'             => '',
-			'value'               => '',
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'deadline_format' => [
 			'type' => 'string',
 			'description' => 'The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$',
@@ -1201,30 +1193,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'sessions_tracking.enabled' => [
-			'type' => 'bool',
-			'description' => 'Whether or not the whole mechanism to track active sessions is enabled. See PHP session.gc_maxlifetime setting to configure session expiration.',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_threshold' => [
-			'type' => 'integer',
-			'description'         => 'fallback in case cron is not active: probability in percent that session files are cleanup during any itop request (100 means always)',
-			'default'             => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_duration_in_seconds' => [
-			'type' => 'integer',
-			'description' => 'fallback in case cron is not active: when a cleanup is triggered cleanup duration will not exceed this duration (in seconds).',
-			'default' => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'transaction_storage' => [
 			'type' => 'string',
 			'description' => 'The type of mechanism to use for storing the unique identifiers for transactions (Session|File).',
@@ -1603,22 +1571,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'notifications.itop.read_notification_retention' => [
-			'type' => 'integer',
-			'description' => 'Duration in days after which iTop read notifications will be deleted',
-			'default' => 182,
-			'value' => 182,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'notifications.itop.newsroom_cache_time' => [
-			'type' => 'integer',
-			'description' => 'Duration in min between each fetch for notifications in newsroom',
-			'default' => 5,
-			'value' => 5,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'regenerate_session_id_enabled' => [
 			'type' => 'bool',
 			'description' => 'If true then session id will be regenerated on each login, to prevent session fixation.',
@@ -1667,14 +1619,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'security.enable_header_xcontent_type_options' => [
-			'type' => 'bool',
-			'description' => 'If set to false, iTop will stop sending the X-Content-Type-Options HTTP header. This header could trigger CORB protection on certain resources (JSON, XML, HTML, text) therefore blocking them.',
-			'default' => true,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'security.disable_inline_documents_sandbox' => [
 			'type' => 'bool',
 			'description' => 'If true then the sandbox for documents displayed in a browser tab will be disabled; enabling scripts and other interactive content. Note that setting this to true will open the application to potential XSS attacks!',
@@ -1739,14 +1683,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'application.secret' => [
-			'type'                => 'string',
-			'description'         => 'Application secret, uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).',
-			'default'             => '',
-			'value'               => '',
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 	];
 
 	public function IsProperty($sPropCode)
@@ -1926,15 +1862,6 @@ class Config
 	 */
 	protected $m_iPasswordHashAlgo;
 
-	/**
-	 * Symfony uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).
-	 *
-	 * @see https://symfony.com/doc/current/reference/configuration/framework.html#secret
-	 * @since 3.2.0 - N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4
-	 * @var string
-	 */
-	protected $m_sAppSecret;
-
 	/**
 	 * Config constructor.
 	 *
@@ -1979,7 +1906,6 @@ class Config
 		$this->m_aCharsets = array();
 		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;
 		$this->m_iPasswordHashAlgo = DEFAULT_HASH_ALGO;
-		$this->m_sAppSecret = bin2hex(random_bytes(16));
 
 		//define default encryption params according to php install
 		$aEncryptParams = SimpleCrypt::GetNewDefaultParams();
@@ -2140,7 +2066,6 @@ class Config
 		$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
 		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
 		$this->m_iPasswordHashAlgo = isset($MySettings['password_hash_algo']) ? $MySettings['password_hash_algo'] : $this->m_iPasswordHashAlgo;
-		$this->m_sAppSecret = isset($MySettings['application.secret']) ? trim($MySettings['application.secret']) : $this->m_sAppSecret;
 	}
 
 	protected function Verify()
@@ -2276,11 +2201,6 @@ class Config
 		return $this->m_sEncryptionKey;
 	}
 
-	public function GetAppSecret()
-	{
-		return $this->m_sAppSecret;
-	}
-
 	public function GetEncryptionLibrary()
 	{
 		return $this->m_sEncryptionLibrary;
@@ -2369,24 +2289,6 @@ class Config
 		$this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes);
 	}
 
-	/**
-	 * @since 2.7.11 N°7085
-	 * Add login mode if not configured already
-	 * @param string $sLoginMode
-	 *
-	 * @return void
-	 */
-	public function AddAllowedLoginTypes($sLoginMode)
-	{
-		$aAllowedLoginTypes = $this->GetAllowedLoginTypes();
-		if (in_array($sLoginMode, $aAllowedLoginTypes)){
-			return;
-		}
-
-		$aAllowedLoginTypes[] = $sLoginMode;
-		$this->SetAllowedLoginTypes($aAllowedLoginTypes);
-	}
-
 	public function SetExternalAuthenticationVariable($sExtAuthVariable)
 	{
 		$this->m_sExtAuthVariable = $sExtAuthVariable;
@@ -2397,12 +2299,6 @@ class Config
 		$this->m_sEncryptionKey = $sKey;
 	}
 
-	public function SetAppSecret($sKey)
-	{
-		$this->m_sAppSecret = $sKey;
-	}
-
-
 	public function SetCSVImportCharsets($aCharsets)
 	{
 		$this->m_aCharsets = $aCharsets;
@@ -2454,7 +2350,6 @@ class Config
 		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
 		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
 		$aSettings['password_hash_algo'] = $this->m_iPasswordHashAlgo;
-		$aSettings['application.secret'] = $this->m_sAppSecret;
 
 		foreach ($this->m_aModuleSettings as $sModule => $aProperties)
 		{
@@ -2567,8 +2462,7 @@ class Config
 				'encryption_key' => $this->m_sEncryptionKey,
 				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,
-				'password_hash_algo' => $this->m_iPasswordHashAlgo,
-				'application.secret' => $this->m_sAppSecret,
+				'password_hash_algo' => $this->m_iPasswordHashAlgo
 			);
 			foreach ($aOtherValues as $sKey => $value)
 			{

core/csvbulkexport.class.inc.php

@@ -8,13 +8,10 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
-use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\Helper\ExportHelper;
-use Combodo\iTop\Application\WebPage\Page;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: CSV export
@@ -103,7 +100,7 @@ class CSVBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock
@@ -117,7 +114,6 @@ class CSVBulkExport extends TabularBulkExport
 
 			case 'csv_options':
 				$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:CSVOptions'));
-				$oPanel->AddSubBlock(ExportHelper::GetAlertForExcelMaliciousInjection());
 
 				$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
 				$oPanel->AddSubBlock($oMulticolumn);

core/datamodel.core.xml

@@ -1,268 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
-  <classes>
-    <class id="ActioniTopNotification"  _delta="define">
-      <php_parent>
-        <name>ActionNotification</name>
-      </php_parent>
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>grant_by_profile,core/cmdb,application</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>priv_action_itop_notif</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="title"/>
-          </attributes>
-        </naming>
-      </properties>
-      <fields>
-        <field id="title" xsi:type="AttributeString">
-          <sql>title</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="message" xsi:type="AttributeText">
-          <sql>message</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="icon" xsi:type="AttributeImage">
-          <sql>icon</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-          <display_max_width>96</display_max_width>
-          <display_max_height>96</display_max_height>
-          <storage_max_width>256</storage_max_width>
-          <storage_max_height>256</storage_max_height>
-          <default_image>null</default_image>
-        </field>
-        <field id="priority" xsi:type="AttributeEnum">
-          <sql>priority</sql>
-          <values>
-            <value id="1">
-              <code>1</code>
-            </value>
-            <value id="2">
-              <code>2</code>
-            </value>
-            <value id="3">
-              <code>3</code>
-            </value>
-            <value id="4">
-              <code>4</code>
-            </value>
-          </values>
-          <default_value>4</default_value>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="recipients" xsi:type="AttributeOQL">
-          <sql>recipients</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="url" xsi:type="AttributeString">
-          <sql>url</sql>
-          <default_value>$this->url()$</default_value>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-      </fields>
-      <presentation>
-        <details>
-          <items>
-            <item id="col:col1">
-              <items>
-                <item id="fieldset:ActioniTopNotification:content">
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="status">
-                      <rank>20</rank>
-                    </item>
-                    <item id="language">
-                      <rank>30</rank>
-                    </item>
-                    <item id="title">
-                      <rank>40</rank>
-                    </item>
-                    <item id="message">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
-            </item>
-            <item id="col:col2">
-              <items>
-                <item id="fieldset:ActioniTopNotification:settings">
-                  <items>
-                    <item id="priority">
-                      <rank>10</rank>
-                    </item>
-                    <item id="icon">
-                      <rank>20</rank>
-                    </item>
-                    <item id="recipients">
-                      <rank>30</rank>
-                    </item>
-                    <item id="url">
-                      <rank>40</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
-            </item>
-          </items>
-        </details>
-        <list>
-          <items>
-            <item id="title">
-              <rank>10</rank>
-            </item>
-            <item id="status">
-              <rank>20</rank>
-            </item>
-            <item id="language">
-              <rank>30</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-      <methods>
-        <method id="DoExecute">
-          <comment>	/**
-            *
-            *  Create EventiTopNotification for each recipient
-            * @param $oTrigger
-            * @param $aContextArgs
-            *
-            * @return void
-            * @throws \ArchivedObjectException
-            * @throws \CoreCannotSaveObjectException
-            * @throws \CoreException
-            * @throws \CoreUnexpectedValue
-            * @throws \CoreWarning
-            * @throws \MySQLException
-            * @throws \OQLException
-            */</comment>
-          <static>false</static>
-          <access>public</access>
-          <code><![CDATA[
-              public function DoExecute($oTrigger, $aContextArgs)
-	{
-		$oRecipientsSearch = DBObjectSearch::FromOQL($this->Get('recipients'));
-		$oRecipientsSearch->AllowAllData();
-		$oRecipientsSet = new DBObjectSet($oRecipientsSearch);
-		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
-		while ($oRecipient = $oRecipientsSet->Fetch()) {
-			$oEvent = new EventiTopNotification();
-			$oEvent->Set('title', MetaModel::ApplyParams($this->Get('title'), $aContextArgs));
-			$oEvent->Set('message', MetaModel::ApplyParams($this->Get('message'), $aContextArgs));
-			$oIcon = !$this->Get('icon')->IsEmpty() ? $this->Get('icon') : MetaModel::GetAttributeDef('EventiTopNotification', 'icon')->MakeRealValue(Combodo\iTop\Application\Branding::GetCompactMainLogoAbsoluteUrl(), $oEvent);
-			$oEvent->Set('icon', $oIcon);
-			$oEvent->Set('priority', $this->Get('priority'));
-			$oEvent->Set('contact_id', $oRecipient->GetKey());
-			$oEvent->Set('trigger_id', $oTrigger->GetKey());
-			$oEvent->Set('action_id', $this->GetKey());
-			$iObjectId = array_key_exists('this->object()', $aContextArgs) ? $aContextArgs['this->object()']->GetKey() : 0;
-			$oEvent->Set('object_id', $iObjectId);
-			$oEvent->Set('url', MetaModel::ApplyParams($this->Get('url'), $aContextArgs));
-			$oEvent->DBInsertNoReload();
-		}
-		$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
-	}
-]]></code>
-        </method>
-      </methods>
-    </class>
-    <class id="EventiTopNotification"  _delta="define">
-      <php_parent>
-        <name>EventNotification</name>
-      </php_parent>
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>core/cmdb,view_in_gui</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>priv_event_itop_notif</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="title"/>
-          </attributes>
-        </naming>
-      </properties>
-      <fields>
-        <field id="title" xsi:type="AttributeString">
-          <sql>title</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="icon" xsi:type="AttributeImage">
-          <sql>icon</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-          <default_image>null</default_image>
-        </field>
-        <field id="priority" xsi:type="AttributeEnum">
-          <sql>priority</sql>
-          <values>
-            <value id="1">
-              <code>1</code>
-            </value>
-            <value id="2">
-              <code>2</code>
-            </value>
-            <value id="3">
-              <code>3</code>
-            </value>
-            <value id="4">
-              <code>4</code>
-            </value>
-          </values>
-          <default_value>4</default_value>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="url" xsi:type="AttributeURL">
-          <sql>url</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-          <target>_blank</target>
-        </field>
-        <field id="read" xsi:type="AttributeEnum">
-          <sql>read</sql>
-          <values>
-            <value id="yes">
-              <code>yes</code>
-            </value>
-            <value id="no">
-              <code>no</code>
-            </value>
-          </values>
-          <default_value>no</default_value>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="read_date" xsi:type="AttributeDateTime">
-          <sql>read_date</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="contact_id" xsi:type="AttributeExternalKey">
-          <sql>contact_id</sql>
-          <target_class>Contact</target_class>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-      </fields>
-      <presentation/>
-      <methods/>
-    </class>
-  </classes>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -545,50 +282,8 @@
           <field id="obj_attcode" xsi:type="AttributeString"/>
         </fields>
       </class>
-      <class id="DefaultWorkingTimeComputer" _delta="define">
-        <interfaces>
-          <interface id="iWorkingTimeComputer"/>
-        </interfaces>
-      </class>
-      <class id="ActionNotification" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>Action</parent>
-        <properties>
-          <category>grant_by_profile,core/cmdb</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeString"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="trigger_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="language" xsi:type="AttributeApplicationLanguage"/>
-        </fields>
-      </class>
-      <class id="EventNotification" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>Event</parent>
-        <properties>
-          <category>core/cmdb,view_in_gui</category>
-        </properties>
-        <fields>
-          <field id="message" xsi:type="AttributeText"/>
-          <field id="date" xsi:type="AttributeDateTime"/>
-          <field id="userinfo" xsi:type="AttributeString"/>
-          <field id="trigger_id" xsi:type="AttributeExternalKey">
-            <target_class>Trigger</target_class>
-          </field>
-          <field id="action_id" xsi:type="AttributeExternalKey">
-            <target_class>Action</target_class>
-          </field>
-          <field id="object_id" xsi:type="AttributeInteger"/>
-          <field id="trigger_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="trigger_id_finalclass_recall" xsi:type="AttributeExternalField"/>
-          <field id="action_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="action_id_finalclass_recall" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
     </classes>
-    <attribute_properties_definition _delta="define">
+    <attribute_properties_definition  _delta="define">
       <properties>
         <property id="sql">
           <php_param>sql</php_param>
@@ -807,12 +502,6 @@
           <type>boolean</type>
           <default>false</default>
         </property>
-        <property id="with_php_computation">
-          <php_param>with_php_computation</php_param>
-          <mandatory>false</mandatory>
-          <type>boolean</type>
-          <default>false</default>
-        </property>
         <property id="create_temporary_object">
           <php_param>create_temporary_object</php_param>
           <mandatory>false</mandatory>

core/dbobject.class.php

@@ -4,14 +4,12 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventException;
 use Combodo\iTop\Service\Events\EventService;
 use Combodo\iTop\Service\Events\EventServiceLog;
 use Combodo\iTop\Service\Module\ModuleService;
-use Combodo\iTop\Service\SummaryCard\SummaryCardService;
 use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
 
 /**
@@ -189,13 +187,12 @@ abstract class DBObject implements iDisplay
 	protected $m_oLinkHostObject = null;
 
 	/**
-	 * @var array{array{
-	 *      type: string,
-	 *      class: string,
-	 *      id: string,
-	 * }} List all the CRUD stack in progress, with :
-	 *      - type: CRUD operation (INSERT, UPDATE, DELETE)',
-	 *      - class: class of the object in the CRUD process, leaf (object finalclass) if we have a hierarchy
+	 * @var array List all the CRUD stack in progress
+	 *
+	 * The array contains instances of
+	 * ['type' => 'type of CRUD operation (INSERT, UPDATE, DELETE)',
+	 *  'class' => 'class of the object in the CRUD process',
+	 *  'id' => 'id of the object in the CRUD process']
 	 *
 	 * @since 3.1.0 N°5906
 	 */
@@ -758,26 +755,13 @@ abstract class DBObject implements iDisplay
 	{
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
 		$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;
+		if ($iMaxSize && (strlen($sValue) > $iMaxSize))
+		{
+			$sValue = substr($sValue, 0, $iMaxSize);
 		}
 		$this->Set($sAttCode, $sValue);
 	}
 
-	/**
-	 * @return void
-	 * @throws \ReflectionException
-	 */
-	protected function PostDeleteActions(): void
-	{
-		$this->FireEventAfterDelete();
-		$oKPI = new ExecutionKPI();
-		$this->AfterDelete();
-		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
-	}
-
 	/**
 	 * Compute (and optionally start) the StopWatches deadlines
 	 *
@@ -2113,26 +2097,33 @@ abstract class DBObject implements iDisplay
 				return true;
 			}
 
-			if ($toCheck instanceof ormSet) {
+			if ($toCheck instanceof ormSet)
+			{
 				return true;
 			}
 
 			return "Bad type";
-		} elseif ($oAtt->IsScalar()) {
-
+		}
+		elseif ($oAtt->IsScalar())
+		{
 			$aValues = $oAtt->GetAllowedValues($this->ToArgsForQuery());
-			if (is_array($aValues) && (count($aValues) > 0)) {
-				if (!array_key_exists($toCheck, $aValues)) {
+			if (is_array($aValues) && (count($aValues) > 0))
+			{
+				if (!array_key_exists($toCheck, $aValues))
+				{
 					return "Value not allowed [$toCheck]";
 				}
 			}
-			if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
-				$iLen = mb_strlen($toCheck);
-				if ($iLen > $iMaxSize) {
+			if (!is_null($iMaxSize = $oAtt->GetMaxSize()))
+			{
+				$iLen = strlen($toCheck);
+				if ($iLen > $iMaxSize)
+				{
 					return "String too long (found $iLen, limited to $iMaxSize)";
 				}
 			}
-			if (!$oAtt->CheckFormat($toCheck)) {
+			if (!$oAtt->CheckFormat($toCheck))
+			{
 				return "Wrong format [$toCheck]";
 			}
 		}
@@ -2470,130 +2461,6 @@ abstract class DBObject implements iDisplay
 		}
 	}
 
-	/**
-	 * Trigger onObjectUpdate on the target object when an object pointed by a LinkSet is modified, added or removed
-	 *
-	 * @since 3.1.1 3.2.0 N°6531 method creation
-	 */
-	final protected function ActivateOnObjectUpdateTriggersForTargetObjects(): void
-	{
-		$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList(get_class($this), [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExtKeyWithMirrorLinkAttCode) {
-			/** @var AttributeExternalKey $oExtKeyWithMirrorLinkAttDef */
-			$oExtKeyWithMirrorLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyWithMirrorLinkAttCode);
-
-			/** @var AttributeLinkedSet $oAttDefMirrorLink */
-			$oAttDefMirrorLink = $oExtKeyWithMirrorLinkAttDef->GetMirrorLinkAttribute();
-			if (is_null($oAttDefMirrorLink)) {
-				// No LinkSet pointing to me
-				continue;
-			}
-			$sAttCodeMirrorLink = $oAttDefMirrorLink->GetCode();
-			$sTargetObjectClass = $oExtKeyWithMirrorLinkAttDef->GetTargetClass();
-
-			if (array_key_exists($sExtKeyWithMirrorLinkAttCode, $aPreviousValues)) {
-				// need to update old target also
-				$sPreviousTargetObjectKey = $aPreviousValues[$sExtKeyWithMirrorLinkAttCode];
-				$oPreviousTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $sPreviousTargetObjectKey);
-				$this->ActivateOnObjectUpdateTriggers($oPreviousTargetObject, [$sAttCodeMirrorLink]);
-			}
-
-			// we need to update remote with current lnk instance
-			$oTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $this->Get($sExtKeyWithMirrorLinkAttCode));
-			$this->ActivateOnObjectUpdateTriggers($oTargetObject, [$sAttCodeMirrorLink]);
-		}
-	}
-
-	final static protected function GetObjectIfNotInCRUDStack($sClass, $sKey)
-	{
-		if (DBObject::IsObjectCurrentlyInCrud($sClass, $sKey)) {
-			return null;
-		}
-
-		return MetaModel::GetObject($sClass, $sKey, false);
-	}
-
-	/**
-	 * Cascade CheckToWrite to Target Objects With LinkSet Pointing To Me
-	 * @since 3.1.1 3.2.0 N°6228 method creation
-	 */
-	final protected function CheckToWriteForTargetObjects(bool $bIsCheckToDelete = false): void
-	{
-		$aChanges = $this->ListChanges();
-
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList(get_class($this), [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExtKeyWithMirrorLinkAttCode) {
-			/** @var AttributeExternalKey $oExtKeyWithMirrorLinkAttDef */
-			$oExtKeyWithMirrorLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyWithMirrorLinkAttCode);
-
-			/** @var AttributeLinkedSet $oAttDefMirrorLink */
-			$oAttDefMirrorLink = $oExtKeyWithMirrorLinkAttDef->GetMirrorLinkAttribute();
-			if (is_null($oAttDefMirrorLink) || (false === $oAttDefMirrorLink->HasPHPConstraint())) {
-				continue;
-			}
-			$sAttCodeMirrorLink = $oAttDefMirrorLink->GetCode();
-			$sTargetObjectClass = $oExtKeyWithMirrorLinkAttDef->GetTargetClass();
-
-			$oTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $this->Get($sExtKeyWithMirrorLinkAttCode));
-
-			if ($this->IsNew()) {
-				$this->CheckToWriteForSingleTargetObject_Internal('add', $oTargetObject, $sAttCodeMirrorLink, false);
-			} else if ($bIsCheckToDelete) {
-				$this->CheckToWriteForSingleTargetObject_Internal('remove', $oTargetObject, $sAttCodeMirrorLink, true);
-			} else {
-				if (array_key_exists($sExtKeyWithMirrorLinkAttCode, $aChanges)) {
-					// need to update remote old + new
-					$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-					$sPreviousTargetObjectKey = $aPreviousValues[$sExtKeyWithMirrorLinkAttCode];
-					$oPreviousTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $sPreviousTargetObjectKey);
-					$this->CheckToWriteForSingleTargetObject_Internal('remove', $oPreviousTargetObject, $sAttCodeMirrorLink, false);
-					$this->CheckToWriteForSingleTargetObject_Internal('add', $oTargetObject, $sAttCodeMirrorLink, false);
-				} else {
-					$this->CheckToWriteForSingleTargetObject_Internal('modify', $oTargetObject, $sAttCodeMirrorLink, false); // we need to update remote with current lnk instance
-				}
-			}
-		}
-	}
-
-	private function CheckToWriteForSingleTargetObject_Internal(string $sAction, ?DBObject $oTargetObject, string $sAttCodeMirrorLink, bool $bIsCheckToDelete): void
-	{
-		if (is_null($oTargetObject)) {
-			return;
-		}
-
-		$this->LogCRUDDebug(__METHOD__, "action: $sAction ".get_class($oTargetObject).'::'.$oTargetObject->GetKey()." ($sAttCodeMirrorLink)");
-
-		/** @var \ormLinkSet $oTargetValue */
-		$oTargetValue = $oTargetObject->Get($sAttCodeMirrorLink);
-		switch ($sAction) {
-			case 'add':
-				$oTargetValue->AddItem($this);
-				break;
-			case 'remove':
-				$oTargetValue->RemoveItem($this->GetKey());
-				break;
-			case 'modify':
-				$oTargetValue->ModifyItem($this);
-				break;
-		}
-		$oTargetObject->Set($sAttCodeMirrorLink, $oTargetValue);
-		[$bCheckStatus, $aCheckIssues, $bSecurityIssue] = $oTargetObject->CheckToWrite();
-		if (false === $bCheckStatus) {
-			if ($bIsCheckToDelete) {
-				$this->m_aDeleteIssues = array_merge($this->m_aDeleteIssues ?? [], $aCheckIssues);
-			} else {
-				$this->m_aCheckIssues = array_merge($this->m_aCheckIssues ?? [], $aCheckIssues);
-			}
-			$this->m_bSecurityIssue = $this->m_bSecurityIssue || $bSecurityIssue;
-		}
-		$aTargetCheckWarnings = $oTargetObject->GetCheckWarnings();
-		if (is_array($aTargetCheckWarnings)) {
-			$this->m_aCheckWarnings = array_merge($this->m_aCheckWarnings ?? [], $aTargetCheckWarnings);
-		}
-	}
-
 	/**
      * @api
      * @api-advanced
@@ -2617,7 +2484,6 @@ abstract class DBObject implements iDisplay
 		{
 			return array(true, array());
 		}
-
 		if (is_null($this->m_bCheckStatus))
 		{
 			$this->m_aCheckIssues = array();
@@ -2634,9 +2500,6 @@ abstract class DBObject implements iDisplay
 			$oKPI = new ExecutionKPI();
 			$this->DoCheckToWrite();
             $oKPI->ComputeStatsForExtension($this, 'DoCheckToWrite');
-
-			$this->CheckToWriteForTargetObjects();
-
 			if (count($this->m_aCheckIssues) == 0)
 			{
 				$this->m_bCheckStatus = true;
@@ -2646,97 +2509,15 @@ abstract class DBObject implements iDisplay
 				$this->m_bCheckStatus = false;
 			}
 		}
-
 		return array($this->m_bCheckStatus, $this->m_aCheckIssues, $this->m_bSecurityIssue);
 	}
 
-	/**
-	 * Checks for extkey attributes values. This will throw exception on non-existing as well as non-accessible objects (silo, scopes).
-	 * That's why the test is done for all users including Administrators
-	 *
-	 * Note that due to perf issues, this isn't called directly by the ORM, but has to be called by consumers when possible.
-	 *
-	 * @param callable(string, string):bool|null $oIsObjectLoadableCallback Override to check if object is accessible.
-	 *                          Parameters are object class and key
-	 *                          Return value should be false if cannot access object, true otherwise
-	 * @return void
-	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreException if cannot get object attdef list
-	 * @throws CoreUnexpectedValue
-	 * @throws InvalidExternalKeyValueException
-	 * @throws MySQLException
-	 * @throws SecurityException if one extkey is pointing to an invalid value
-	 *
-	 * @link https://github.com/Combodo/iTop/security/advisories/GHSA-245j-66p9-pwmh
-	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6458
-	 *
-	 * @see \RestUtils::FindObjectFromKey for the same check in the REST endpoint
-	 */
-	final public function CheckChangedExtKeysValues(callable $oIsObjectLoadableCallback = null)
-	{
-		if (is_null($oIsObjectLoadableCallback)) {
-			$oIsObjectLoadableCallback = function ($sClass, $sId) {
-				$oRemoteObject = MetaModel::GetObject($sClass, $sId, false);
-				if (is_null($oRemoteObject)) {
-					return false;
-				}
-				return true;
-			};
-		}
-
-		$aChanges = $this->ListChanges();
-		$aAttCodesChanged = array_keys($aChanges);
-		foreach ($aAttCodesChanged as $sAttDefCode) {
-			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttDefCode);
-
-			if ($oAttDef instanceof AttributeLinkedSetIndirect) {
-				/** @var ormLinkSet $oOrmSet */
-				$oOrmSet = $this->Get($sAttDefCode);
-				while ($oLnk = $oOrmSet->Fetch()) {
-					$oLnk->CheckChangedExtKeysValues($oIsObjectLoadableCallback);
-				}
-				continue;
-			}
-
-			/** @noinspection PhpConditionCheckedByNextConditionInspection */
-			/** @noinspection NotOptimalIfConditionsInspection */
-			if (($oAttDef instanceof AttributeHierarchicalKey) || ($oAttDef instanceof AttributeExternalKey)) {
-				$sRemoteObjectClass = $oAttDef->GetTargetClass();
-				$sRemoteObjectKey = $this->Get($sAttDefCode);
-			} else if ($oAttDef instanceof AttributeObjectKey) {
-				$sRemoteObjectClassAttCode = $oAttDef->Get('class_attcode');
-				$sRemoteObjectClass = $this->Get($sRemoteObjectClassAttCode);
-				$sRemoteObjectKey = $this->Get($sAttDefCode);
-			} else {
-				continue;
-			}
-
-			if (utils::IsNullOrEmptyString($sRemoteObjectClass)
-				|| utils::IsNullOrEmptyString($sRemoteObjectKey)
-			) {
-				continue;
-			}
-
-			// 0 : Undefined ext. key (EG. non-mandatory and no value provided)
-			// < 0 : Non yet persisted object
-            /** @noinspection TypeUnsafeComparisonInspection Non-strict comparison as object ID can be string */
-			if ($sRemoteObjectKey <= 0) {
-				continue;
-			}
-
-			if (false === $oIsObjectLoadableCallback($sRemoteObjectClass, $sRemoteObjectKey)) {
-				throw new InvalidExternalKeyValueException($this, $sAttDefCode);
-			}
-		}
-	}
-
 	/**
 	 * Check if it is allowed to delete the existing object from the database
 	 *
 	 * an array of displayable error is added in {@see DBObject::$m_aDeleteIssues}
 	 *
-     * @internal
+     * @internal 
      *
 	 * @param \DeletionPlan $oDeletionPlan
 	 *
@@ -2801,15 +2582,8 @@ abstract class DBObject implements iDisplay
      */
 	public function CheckToDelete(&$oDeletionPlan)
   	{
-		$this->AddCurrentObjectInCrudStack('DELETE');
-		try {
-			$this->MakeDeletionPlan($oDeletionPlan);
-			$oDeletionPlan->ComputeResults();
-		}
-		finally {
-			$this->RemoveCurrentObjectInCrudStack();
-		}
-
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();
 		return (!$oDeletionPlan->FoundStopper());
 	}
 
@@ -2860,7 +2634,7 @@ abstract class DBObject implements iDisplay
 			{
 				// The value is a scalar, the comparison must be 100% strict
 				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
-				{
+				{	
 					//echo "$sAtt:<pre>\n";
 					//var_dump($this->m_aOrigValues[$sAtt]);
 					//var_dump($proposedValue);
@@ -2881,11 +2655,11 @@ abstract class DBObject implements iDisplay
 	 * @api
 	 * @api-advanced
 	 *
-	 * @return array attcode => currentvalue List the attributes that have been changed using {@see DBObject::Set()}.
-	 *         Reset during {@see DBObject::DBUpdate()}
-	 * @throws Exception
 	 * @see  \DBObject::ListPreviousValuesForUpdatedAttributes() to get previous values anywhere in the CRUD stack
 	 * @see https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Asequence_crud iTop CRUD stack documentation
+	 * @return array attname => currentvalue List the attributes that have been changed using {@see DBObject::Set()}.
+	 *         Reset during {@see DBObject::DBUpdate()}
+	 * @throws Exception
 	 * @uses m_aCurrValues
 	 */
 	public function ListChanges()
@@ -2982,7 +2756,7 @@ abstract class DBObject implements iDisplay
 
 	/**
 	 * Used only by insert, Meant to be overloaded
-     *
+     * 
      * @overwritable-hook You can extend this method in order to provide your own logic.
 	 */
 	protected function OnObjectKeyReady()
@@ -3090,7 +2864,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -3099,7 +2873,7 @@ abstract class DBObject implements iDisplay
 		}
 
 		$aHierarchicalKeys = array();
-
+		
 		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef) {
 			// Skip this attribute if not defined in this table
 			if ((!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode) && !$oAttDef->CopyOnAllTables())
@@ -3109,7 +2883,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -3133,7 +2907,7 @@ abstract class DBObject implements iDisplay
 					self::$m_aBulkInsertCols[$sClass][$sTable] = implode(', ', $aFieldsToWrite);
 				}
 				self::$m_aBulkInsertItems[$sClass][$sTable][] = '('.implode (', ', $aValuesToWrite).')';
-
+				
 				$iNewKey = 999999; // TODO - compute next id....
 			}
 			else
@@ -3218,7 +2992,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -3253,7 +3027,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($value);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -3324,8 +3098,6 @@ abstract class DBObject implements iDisplay
 	 * @throws \CoreWarning
 	 * @throws \MySQLException
 	 * @throws \OQLException
-	 *
-	 * @see DBWrite
 	 */
 	public function DBInsertNoReload()
 	{
@@ -3363,7 +3135,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 
-			[$bRes, $aIssues] = $this->CheckToWrite(false);
+			list($bRes, $aIssues) = $this->CheckToWrite(false);
 			if (!$bRes) {
 				throw new CoreCannotSaveObjectException(array('issues' => $aIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
 			}
@@ -3484,7 +3256,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	protected function PostInsertActions(): void
+	public function PostInsertActions(): void
 	{
 		$this->FireEventAfterWrite([], true);
 		$oKPI = new ExecutionKPI();
@@ -3508,9 +3280,6 @@ abstract class DBObject implements iDisplay
 
 		// - TriggerOnObjectMention
 		$this->ActivateOnMentionTriggers(true);
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
 	}
 
     /**
@@ -3538,7 +3307,7 @@ abstract class DBObject implements iDisplay
 		$this->RecordObjCreation();
 		return $ret;
 	}
-
+	
 	/**
 	 * This function is automatically called after cloning an object with the "clone" PHP language construct
 	 * The purpose of this method is to reset the appropriate attributes of the object in
@@ -3557,13 +3326,13 @@ abstract class DBObject implements iDisplay
 	 * Update an object in DB
 	 *
 	 * @api
+	 * @see DBObject::DBWrite()
+	 *
 	 * @return int object key
 	 *
 	 * @throws \CoreException
 	 * @throws \CoreCannotSaveObjectException if CheckToWrite() returns issues
 	 * @throws \Exception
-	 *
-	 * @see DBObject::DBWrite()
 	 */
 	public function DBUpdate()
 	{
@@ -3606,7 +3375,7 @@ abstract class DBObject implements iDisplay
 					return $this->m_iKey;
 				}
 
-				[$bRes, $aIssues] = $this->CheckToWrite(false);
+				list($bRes, $aIssues) = $this->CheckToWrite(false);
 				if (!$bRes) {
 					throw new CoreCannotSaveObjectException(['issues' => $aIssues, 'class' => $sClass, 'id' => $this->GetKey()]);
 				}
@@ -3803,7 +3572,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	protected function PostUpdateActions(array $aChanges): void
+	public function PostUpdateActions(array $aChanges): void
 	{
 		$this->FireEventAfterWrite($aChanges, false);
 		$oKPI = new ExecutionKPI();
@@ -3811,10 +3580,20 @@ abstract class DBObject implements iDisplay
 		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');
 
 		// - TriggerOnObjectUpdate
-		$this->ActivateOnObjectUpdateTriggers($this);
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
+		$aClassList = MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL);
+		$aParams = array('class_list' => $aClassList);
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
+			array(), $aParams);
+		while ($oTrigger = $oSet->Fetch()) {
+			/** @var \TriggerOnObjectUpdate $oTrigger */
+			try {
+				$oTrigger->DoActivate($this->ToArgs());
+			}
+			catch (Exception $e) {
+				$oTrigger->LogException($e, $this);
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
+		}
 
 		$sClass = get_class($this);
 		if (MetaModel::HasLifecycle($sClass))
@@ -3860,37 +3639,6 @@ abstract class DBObject implements iDisplay
 		$this->ActivateOnMentionTriggers(false, $aChanges);
 	}
 
-	/**
-	 * @param \DBObject $oObject
-	 * @param array|null $aAttributes
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	private function ActivateOnObjectUpdateTriggers(?DBObject $oObject, array $aAttributes = null): void
-	{
-		if (is_null($oObject)) {
-			return;
-		}
-
-		// - TriggerOnObjectUpdate
-		$aClassList = MetaModel::EnumParentClasses(get_class($oObject), ENUM_PARENT_CLASSES_ALL);
-		$aParams = array('class_list' => $aClassList);
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
-			array(), $aParams);
-		while ($oTrigger = $oSet->Fetch()) {
-			/** @var \TriggerOnObjectUpdate $oTrigger */
-			try {
-				$oTrigger->DoActivateForSpecificAttributes($oObject->ToArgs(), $aAttributes);
-			}
-			catch (Exception $e) {
-				$oTrigger->LogException($e, $oObject);
-				utils::EnrichRaisedException($oTrigger, $e);
-			}
-		}
-	}
 
 	/**
 	 * Increment attribute with specified value.
@@ -4036,18 +3784,13 @@ abstract class DBObject implements iDisplay
 
 	/**
 	 * Make the current changes persistent - clever wrapper for Insert or Update
-	 *
-	 * @api
+     *
+     * @api
 	 *
 	 * @return int
-	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreCannotSaveObjectException
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 * @throws CoreWarning
-	 * @throws MySQLException
-	 * @throws OQLException
+     *
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
 	 */
 	public function DBWrite()
 	{
@@ -4094,16 +3837,12 @@ abstract class DBObject implements iDisplay
      */
 	protected function DBDeleteSingleObject()
 	{
-		$this->LogCRUDEnter(__METHOD__);
-
 		if (MetaModel::DBIsReadOnly())
 		{
 			$this->LogCRUDExit(__METHOD__, 'DB is read-only');
 			return;
 		}
 
-		$this->SetReadOnly("No modification allowed before delete");
-		$this->FireEventAboutToDelete();
 		$oKPI = new ExecutionKPI();
 		$this->OnDelete();
 		$oKPI->ComputeStatsForExtension($this, 'OnDelete');
@@ -4213,14 +3952,13 @@ abstract class DBObject implements iDisplay
 			}
 		}
 
+		$this->FireEventAfterDelete();
+		$oKPI = new ExecutionKPI();
+		$this->AfterDelete();
+		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
+
+
 		$this->m_bIsInDB = false;
-
-		$this->PostDeleteActions();
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
-
-		$this->LogCRUDExit(__METHOD__);
 		// Fix for N°926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete
 		// objects, reported as bug N°926)
 		// Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected
@@ -4232,7 +3970,7 @@ abstract class DBObject implements iDisplay
      * First, checks if the object can be deleted regarding database integrity.
      * If the answer is yes, it performs any required cleanup (delete other objects or reset external keys) in addition to the object
      * deletion.
-     *
+     * 
      * @api
      *
      * @param \DeletionPlan $oDeletionPlan Do not use: aims at dealing with recursion
@@ -4251,66 +3989,74 @@ abstract class DBObject implements iDisplay
 	public function DBDelete(&$oDeletionPlan = null)
 	{
 		$this->LogCRUDEnter(__METHOD__);
-		try {
-			static $iLoopTimeLimit = null;
-			if ($iLoopTimeLimit == null) {
-				$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-			}
-			if (is_null($oDeletionPlan)) {
-				$oDeletionPlan = new DeletionPlan();
-			}
 
-			if (false === $this->CheckToDelete($oDeletionPlan)) {
-				$aIssues = $oDeletionPlan->GetIssues();
-				$this->LogCRUDError(__METHOD__, ' Errors: '.implode(', ', $aIssues));
-				throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));
-			}
+		static $iLoopTimeLimit = null;
+		if ($iLoopTimeLimit == null)
+		{
+			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		}
+		if (is_null($oDeletionPlan))
+		{
+			$oDeletionPlan = new DeletionPlan();
+		}
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();
 
-
-			// Getting and setting time limit are not symmetric:
-			// www.php.net/manual/fr/function.set-time-limit.php#72305
-			$iPreviousTimeLimit = ini_get('max_execution_time');
-
-			foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete) {
-				foreach ($aToDelete as $iId => $aData) {
-					/** @var \DBObject $oToDelete */
-					$oToDelete = $aData['to_delete'];
-
-					// The deletion based on a deletion plan should not be done for each object if the deletion plan is common (Trac #457)
-					// because for each object we would try to update all the preceding ones... that are already deleted
-					// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
-					// As a temporary fix: delete only the objects that are still to be deleted...
-					if ($oToDelete->m_bIsInDB) {
-						set_time_limit(intval($iLoopTimeLimit));
-
-						$oToDelete->AddCurrentObjectInCrudStack('DELETE');
-						try {
-							$oToDelete->DBDeleteSingleObject();
-						}
-						finally {
-							$oToDelete->RemoveCurrentObjectInCrudStack();
-						}
-					}
-				}
-			}
-
-			foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate) {
-				foreach ($aToUpdate as $aData) {
-					$oToUpdate = $aData['to_reset'];
-					/** @var \DBObject $oToUpdate */
-					foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef) {
-						$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
-						set_time_limit(intval($iLoopTimeLimit));
-						$oToUpdate->DBUpdate();
-					}
-				}
-			}
-
-			set_time_limit(intval($iPreviousTimeLimit));
-		} finally {
-			$this->LogCRUDExit(__METHOD__);
+		if ($oDeletionPlan->FoundStopper())
+		{
+			$aIssues = $oDeletionPlan->GetIssues();
+			$this->LogCRUDError(__METHOD__, ' Errors: '.implode(', ', $aIssues));
+			throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));
 		}
 
+
+		// Getting and setting time limit are not symetric:
+		// www.php.net/manual/fr/function.set-time-limit.php#72305
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+
+		foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete)
+		{
+			foreach ($aToDelete as $iId => $aData)
+			{
+				/** @var \DBObject $oToDelete */
+				$oToDelete = $aData['to_delete'];
+				// The deletion based on a deletion plan should not be done for each object if the deletion plan is common (Trac #457)
+				// because for each object we would try to update all the preceding ones... that are already deleted
+				// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
+				// As a temporary fix: delete only the objects that are still to be deleted...
+				if ($oToDelete->m_bIsInDB)
+				{
+					set_time_limit(intval($iLoopTimeLimit));
+
+					$oToDelete->AddCurrentObjectInCrudStack('DELETE');
+					try {
+						$oToDelete->DBDeleteSingleObject();
+					}
+					finally {
+						$oToDelete->RemoveCurrentObjectInCrudStack();
+					}
+				}
+			}
+		}
+
+		foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate)
+		{
+			foreach ($aToUpdate as $aData)
+			{
+				$oToUpdate = $aData['to_reset'];
+				/** @var \DBObject $oToUpdate */
+				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
+				{
+					$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
+					set_time_limit(intval($iLoopTimeLimit));
+					$oToUpdate->DBUpdate();
+				}
+			}
+		}
+
+		set_time_limit(intval($iPreviousTimeLimit));
+
+		$this->LogCRUDExit(__METHOD__);
 		return $oDeletionPlan;
 	}
 
@@ -4617,7 +4363,7 @@ abstract class DBObject implements iDisplay
      *
      * @api
      *
-	 */
+	 */	 	
 	public function Reset($sAttCode)
 	{
 		$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
@@ -4629,7 +4375,7 @@ abstract class DBObject implements iDisplay
      * Suitable for use as a lifecycle action
      *
      * @api
-	 */
+	 */	 	
 	public function Copy($sDestAttCode, $sSourceAttCode)
 	{
 		$oTypeValueToCopy = MetaModel::GetAttributeDef(get_class($this), $sSourceAttCode);
@@ -4959,7 +4705,7 @@ abstract class DBObject implements iDisplay
 			{
 				throw new CoreException("Unknown attribute '$sExtKeyAttCode' for the class ".get_class($this));
 			}
-
+			
 			$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
 			if (!$oKeyAttDef instanceof AttributeExternalKey)
 			{
@@ -4977,14 +4723,14 @@ abstract class DBObject implements iDisplay
 				$ret  = $oRemoteObj->GetForTemplate($sRemoteAttCode);
 			}
 		}
-		else
+		else 
 		{
 			switch($sPlaceholderAttCode)
 			{
 				case 'id':
 				$ret = $this->GetKey();
 				break;
-
+				
 				case 'name()':
 				$ret = $this->GetName();
 				break;
@@ -5171,7 +4917,7 @@ abstract class DBObject implements iDisplay
 		if ($oOwner)
 		{
 			$sLinkSetOwnerClass = get_class($oOwner);
-
+			
 			$oMyChangeOp = MetaModel::NewObject($sChangeOpClass);
 			$oMyChangeOp->Set("objclass", $sLinkSetOwnerClass);
 			$oMyChangeOp->Set("objkey", $iLinkSetOwnerId);
@@ -5198,7 +4944,7 @@ abstract class DBObject implements iDisplay
 		{
 			/** @var \AttributeLinkedSet $oLinkSet */
 			if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
-
+			
 			$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
 			$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
 			if ($oMyChangeOp)
@@ -5416,9 +5162,8 @@ abstract class DBObject implements iDisplay
 		$this->m_aDeleteIssues = array(); // Ok
 		$this->FireEventCheckToDelete($oDeletionPlan);
 		$this->DoCheckToDelete($oDeletionPlan);
-		$this->CheckToWriteForTargetObjects(true);
 		$oDeletionPlan->SetDeletionIssues($this, $this->m_aDeleteIssues, $this->m_bSecurityIssue);
-
+	
 		$aDependentObjects = $this->GetReferencingObjects(true /* allow all data */);
 
 		// Getting and setting time limit are not symmetric:
@@ -5600,7 +5345,7 @@ abstract class DBObject implements iDisplay
 				$aSynchroClasses[] = $sTarget;
 			}
 		}
-
+		
 		foreach($aSynchroClasses as $sClass)
 		{
 			if ($this instanceof $sClass)
@@ -6407,18 +6152,6 @@ abstract class DBObject implements iDisplay
 		$this->m_aCheckWarnings[] = $sWarning;
 	}
 
-	/**
-	 *
-	 * @api
-	 *
-	 * @return string[]|null
-	 * @since 3.1.1 3.2.0
-	 */
-	public function GetCheckWarnings(): ?array
-	{
-		return $this->m_aCheckWarnings;
-	}
-
 	/**
 	 * @api
 	 *
@@ -6623,14 +6356,6 @@ abstract class DBObject implements iDisplay
 	{
 	}
 
-	/**
-	 * @return void
-	 * @since 3.1.2
-	 */
-	protected function FireEventAboutToDelete(): void
-	{
-	}
-
 	/**
 	 * @return void
 	 * @since 3.1.0
@@ -6674,10 +6399,9 @@ abstract class DBObject implements iDisplay
 		// during insert key is reset from -1 to null
 		// so we need to handle null values (will give empty string after conversion)
 		$sConvertedId = (string)$sId;
-		$oRootClass = MetaModel::GetRootClass($sClass);
 
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if (($oRootClass === $aCrudStackEntry['class'])
+			if (($sClass === $aCrudStackEntry['class'])
 				&& ($sConvertedId === $aCrudStackEntry['id'])) {
 				return true;
 			}
@@ -6692,14 +6416,12 @@ abstract class DBObject implements iDisplay
 	 * @param string $sClass
 	 *
 	 * @return bool
-	 * @throws \CoreException
 	 * @since 3.1.0 N°5609
 	 */
 	final public static function IsClassCurrentlyInCrud(string $sClass): bool
 	{
-		$sRootClass = MetaModel::GetRootClass($sClass);
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if ($sRootClass === $aCrudStackEntry['class']) {
+			if ($sClass === $aCrudStackEntry['class']) {
 				return true;
 			}
 		}
@@ -6717,11 +6439,9 @@ abstract class DBObject implements iDisplay
 	 */
 	private function AddCurrentObjectInCrudStack(string $sCrudType): void
 	{
-		$this->LogCRUDDebug(__METHOD__);
-		$sRootClass = MetaModel::GetRootClass(get_class($this));
 		self::$m_aCrudStack[] = [
 			'type'  => $sCrudType,
-			'class' => $sRootClass,
+			'class' => get_class($this),
 			'id'    => (string)$this->GetKey(), // GetKey() doesn't have type hinting, so forcing type to avoid getting an int
 		];
 	}
@@ -6735,7 +6455,6 @@ abstract class DBObject implements iDisplay
 	 */
 	private function UpdateCurrentObjectInCrudStack(): void
 	{
-		$this->LogCRUDDebug(__METHOD__);
 		$aCurrentCrudStack = array_pop(self::$m_aCrudStack);
 		$aCurrentCrudStack['id'] = (string)$this->GetKey();
 		self::$m_aCrudStack[] = $aCurrentCrudStack;
@@ -6749,8 +6468,7 @@ abstract class DBObject implements iDisplay
 	 */
 	private function RemoveCurrentObjectInCrudStack(): void
 	{
-		$aRemoved = array_pop(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, $aRemoved['class'].':'.$aRemoved['id']);
+		array_pop(self::$m_aCrudStack);
 	}
 
 	/**

core/displayablegraph.class.inc.php

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

core/email.class.inc.php

@@ -46,15 +46,6 @@ class EMail implements iEMail
 	const ORIGINAL_FORMAT = 1; // Original format, consisting in serializing the whole object, inculding the Swift Mailer's object.
 	// Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
 	const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
-	
-	/** @var int ENUM_SEND_DEFAULT This option can be used when sending an e-mail to respect the default configuration parameter. */
-	const ENUM_SEND_DEFAULT = 0;
-	
-	/** @var int ENUM_SEND_FORCE_SYNCHRONOUS This option can be used when sending an e-mail to ignore the default and force synchronous sending instead. Example of a use case: instant e-mail test. */
-	const ENUM_SEND_FORCE_SYNCHRONOUS = 1;
-	
-	/** @var int ENUM_SEND_FORCE_ASYNCHRONOUS This option can be used when sending an e-mail to ignore the default and force synchronous sending instead. Example of a use case: Bulk mails. */
-	const ENUM_SEND_FORCE_ASYNCHRONOUS = 2;
 
 	public function __construct()
 	{

core/event.class.inc.php

@@ -1,7 +1,4 @@
 <?php
-
-use Combodo\iTop\Application\WebPage\WebPage;
-
 /**
  * Copyright (C) 2013-2023 Combodo SARL
  *
@@ -245,33 +242,44 @@ class EventIssue extends Event
 			{
 				if (is_string($sValue))
 				{
-					if (mb_strlen($sValue) < 256) {
+					if (strlen($sValue) < 256)
+					{
 						$aPost[$sKey] = $sValue;
-					} else {
-						$aPost[$sKey] = "!long string: ".mb_strlen($sValue)." chars";
 					}
-				} else {
+					else
+					{
+						$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
+					}
+				}
+				else
+				{
 					// Not a string (avoid warnings in case the value cannot be easily casted into a string)
-					$aPost[$sKey] = @(string)$sValue;
+					$aPost[$sKey] = @(string) $sValue;
 				}
 			}
 			$this->Set('arguments_post', $aPost);
-		} else {
+		}
+		else
+		{
 			$this->Set('arguments_post', array());
 		}
-		$sLength = mb_strlen($this->Get('issue'));
-		if ($sLength > 255) {
-			$this->Set('issue', mb_substr($this->Get('issue'), 0, 210)." -truncated ($sLength chars)");
+
+		$sLength = strlen($this->Get('issue'));
+		if ($sLength > 255)
+		{
+			$this->Set('issue', substr($this->Get('issue'), 0, 200)." -truncated ($sLength chars)");
 		}
 
-		$sLength = mb_strlen($this->Get('impact'));
-		if ($sLength > 255) {
-			$this->Set('impact', mb_substr($this->Get('impact'), 0, 210)." -truncated ($sLength chars)");
+		$sLength = strlen($this->Get('impact'));
+		if ($sLength > 255)
+		{
+			$this->Set('impact', substr($this->Get('impact'), 0, 200)." -truncated ($sLength chars)");
 		}
 
-		$sLength = mb_strlen($this->Get('page'));
-		if ($sLength > 255) {
-			$this->Set('page', mb_substr($this->Get('page'), 0, 210)." -truncated ($sLength chars)");
+		$sLength = strlen($this->Get('page'));
+		if ($sLength > 255)
+		{
+			$this->Set('page', substr($this->Get('page'), 0, 200)." -truncated ($sLength chars)");
 		}
 	}
 }

core/excelbulkexport.class.inc.php

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

core/expressioncache.class.inc.php

@@ -101,7 +101,7 @@ EOF;
 EOF;
 
 				SetupUtils::builddir(dirname($sFilePath));
-				file_put_contents($sFilePath, $content, LOCK_EX);
+				file_put_contents($sFilePath, $content);
 			}
 		}
 		Dict::SetUserLanguage($sUserLang);

core/htmlbulkexport.class.inc.php

@@ -15,8 +15,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\WebPage\Page;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: HTML export
@@ -39,7 +37,7 @@ class HTMLBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/log.class.inc.php

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

core/metamodel.class.php

@@ -1445,10 +1445,8 @@ abstract class MetaModel
 	 *
 	 * @return AttributeDefinition[]
 	 * @throws \CoreException
-	 *
-	 * @see GetAttributesList for attcode list
 	 */
-	final public static function ListAttributeDefs($sClass)
+	final static public function ListAttributeDefs($sClass)
 	{
 		self::_check_subclass($sClass);
 		return self::$m_aAttribDefs[$sClass];
@@ -1461,10 +1459,8 @@ abstract class MetaModel
 	 * @param string[] $aDesiredAttTypes Array of AttributeDefinition classes to filter the list on
 	 * @param string|null $sListCode If provided, attributes will be limited to those in this zlist
 	 *
-	 * @return string[] list of attcodes
+	 * @return array
 	 * @throws \CoreException
-	 *
-	 * @see ListAttributeDefs to get AttributeDefinition array instead
 	 */
 	final public static function GetAttributesList(string $sClass, array $aDesiredAttTypes = [], ?string $sListCode = null)
 	{
@@ -4267,17 +4263,16 @@ abstract class MetaModel
 			];
 			IssueLog::Warning("Unresolved placeholders due to null object in current context", null,
 				$aContext);
-			$aPlaceholders[$sPlaceHolderKey] = Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
+			$aPlaceholders[$sPlaceHolderKey] = \Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
 			foreach ($aCurrentUser as $sField) {
 				$sPlaceHolderKey = $sPlaceHolderPrefix . "->$sField";
-				$aPlaceholders[$sPlaceHolderKey] = Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
+				$aPlaceholders[$sPlaceHolderKey] = \Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
 			}
 		} else {
 			$aPlaceholders[$sPlaceHolderKey] = $oObject;
 			foreach ($aCurrentUser as $sField) {
 				$sPlaceHolderKey = $sPlaceHolderPrefix . "->$sField";
-				// Mind that the "id" is not viewed as a valid att. code by \MetaModel::IsValidAttCode() so we have to test it manually
-				if ($sField !== "id" && false === MetaModel::IsValidAttCode(get_class($oObject), $sField)){
+				if (false === MetaModel::IsValidAttCode(get_class($oObject), $sField)){
 					$aContext = [
 						"current_user_id" => UserRights::GetUserId(),
 						"obj_class" => get_class($oObject),
@@ -4286,7 +4281,7 @@ abstract class MetaModel
 					];
 					IssueLog::Warning("Unresolved placeholder due to invalid attribute", null,
 						$aContext);
-					$aPlaceholders[$sPlaceHolderKey] = Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
+					$aPlaceholders[$sPlaceHolderKey] = \Dict::Format("Core:Placeholder:CannotBeResolved", $sPlaceHolderKey);
 					continue;
 				}
 
@@ -5156,7 +5151,7 @@ abstract class MetaModel
 	 */
 	protected static function DBCreateTables($aCallback = null)
 	{
-		[$aErrors, $aSugFix, $aCondensedQueries] = self::DBCheckFormat();
+		list($aErrors, $aSugFix, $aCondensedQueries) = self::DBCheckFormat();
 
 		//$sSQL = implode('; ', $aCondensedQueries); Does not work - multiple queries not allowed
 		foreach($aCondensedQueries as $sQuery)
@@ -5178,7 +5173,7 @@ abstract class MetaModel
 	 */
 	protected static function DBCreateViews()
 	{
-		[$aErrors, $aSugFix] = self::DBCheckViews();
+		list($aErrors, $aSugFix) = self::DBCheckViews();
 
 		foreach($aSugFix as $sClass => $aTarget)
 		{
@@ -6927,22 +6922,6 @@ abstract class MetaModel
 		return $iCount === 1;
 	}
 
-	public static function GetFinalClassName(string $sClass, int $iKey): string
-	{
-		if (MetaModel::IsStandaloneClass($sClass)) {
-			return $sClass;
-		}
-
-		$sRootClass = MetaModel::GetRootClass($sClass);
-		$sTable = MetaModel::DBGetTable($sRootClass);
-		$sKeyCol = MetaModel::DBGetKey($sRootClass);
-		$sEscapedKey = CMDBSource::Quote($iKey);
-		$sFinalClassField = Metamodel::DBGetClassField($sRootClass);
-
-		$sQuery = "SELECT `{$sFinalClassField}` FROM `{$sTable}` WHERE `{$sKeyCol}` = {$sEscapedKey}";
-		return  CMDBSource::QueryToScalar($sQuery);
-	}
-
 	/**
 	 * Search for the specified class and id. If the object is archived it will be returned anyway (this is for pre-2.4
 	 * module compatibility, see N.1108)

core/mutex.class.inc.php

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

core/ormcaselog.class.inc.php

@@ -20,7 +20,6 @@ use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSec
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 define('CASELOG_VISIBLE_ITEMS', 2);

core/ormdocument.class.inc.php

@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
 

core/pdfbulkexport.class.inc.php

@@ -8,13 +8,10 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
-use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\WebPage\Page;
-use Combodo\iTop\Application\WebPage\PDFPage;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: PDF export, based on the HTML export converted to PDF
@@ -52,7 +49,7 @@ class PDFBulkExport extends HTMLBulkExport
 	}
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock
@@ -71,6 +68,8 @@ class PDFBulkExport extends HTMLBulkExport
 
 				//page format
 				$oSelectFormat = SelectUIBlockFactory::MakeForSelectWithLabel("page_size", Dict::S('Core:BulkExport:PDFPageSize'));
+				$oSelectFormat->SetIsLabelBefore(false);
+				//$oSelectFormat->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetFormat->AddSubBlock($oSelectFormat);
 
 				$aPossibleFormat = ['A3', 'A4', 'Letter'];
@@ -80,7 +79,10 @@ class PDFBulkExport extends HTMLBulkExport
 				}
 				$oFieldSetFormat->AddSubBlock(new Html('</br>'));
 
-				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation", Dict::S('Core:BulkExport:PDFPageOrientation'));
+				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation",
+					Dict::S('Core:BulkExport:PDFPageOrientation'));
+				$oSelectOrientation->SetIsLabelBefore(false);
+				//$oSelectOrientation->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetFormat->AddSubBlock($oSelectOrientation);
 
 				$aPossibleOrientation = ['P', 'L'];

core/spreadsheetbulkexport.class.inc.php

@@ -10,8 +10,6 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\WebPage\Page;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: "spreadsheet" export: a simplified HTML export in which the date/time columns are split in two column: date AND time
@@ -36,7 +34,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tabularbulkexport.class.inc.php

@@ -6,7 +6,6 @@
 
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: Tabular export: abstract base class for all "tabular" exports.
@@ -23,7 +22,7 @@ abstract class TabularBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tagsetfield.class.inc.php

@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\WebPage\WebPage;
-
 
 /**
  * <p>Stores data for {@link AttributeTagSet} fields
@@ -298,7 +296,7 @@ abstract class TagSetFieldData extends cmdbAbstractObject
 	/**
 	 * Display Tag Usage
 	 *
-	 * @param WebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode
 	 *
 	 * @throws \CoreException

core/trigger.class.inc.php

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

core/userrights.class.inc.php

@@ -1,7 +1,6 @@
 <?php
 
 use Combodo\iTop\Application\Helper\Session;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 define('UR_ALLOWED_NO', 0);
 define('UR_ALLOWED_YES', 1);
@@ -249,7 +248,7 @@ abstract class User extends cmdbAbstractObject
 			"depends_on"      => array(),
 		)));
 
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property', "with_php_constraint" => true, "with_php_computation" => true)));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property', "with_php_constraint" => true)));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class" => "URP_UserOrg", "ext_key_to_me" => "userid", "ext_key_to_remote" => "allowed_org_id", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), 'with_php_constraint' => true)));
 		MetaModel::Init_AddAttribute(new AttributeCaseLog("log", array("sql" => 'log', "is_null_allowed" => true, "default_value" => '', "allowed_values" => null, "depends_on" => array(), "always_load_in_tables" => false)));
 
@@ -868,8 +867,6 @@ class UserRights
 	 */
 	public static function Login($sLogin, $sAuthentication = 'any')
 	{
-		self::ResetCurrentUserData();
-
 		$oUser = self::FindUser($sLogin, $sAuthentication);
 		if (is_null($oUser))
 		{
@@ -1124,7 +1121,9 @@ class UserRights
 	}
 
 	/**
-	 * @return string connected {@see User} login field value, otherwise empty string
+	 * Return the current user login or an empty string if nobody connected.
+	 *
+	 * @return string
 	 */
 	public static function GetUser()
 	{
@@ -1572,9 +1571,9 @@ class UserRights
 
 	/**
 	 * @param string $sClass
-	 * @param int $iActionCode see UR_ACTION_* constants
-	 * @param DBObjectSet $oInstanceSet
-	 * @param User $oUser
+	 * @param int $iActionCode
+	 * @param \DBObjectSet $oInstanceSet
+	 * @param \User $oUser
 	 *
 	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO|UR_ALLOWED_DEPENDS)
 	 * @throws \CoreException

core/xmlbulkexport.class.inc.php

@@ -8,8 +8,6 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\WebPage\Page;
-use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: XML export
@@ -32,7 +30,7 @@ class XMLBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param WebPage $oP
+	 * @param \WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

css/form-sdk/form.css

@@ -1,75 +0,0 @@
-/**
- * Widgets Factory.
- *
- * @package FormSDK
- * @since 3.2.0
- */
-
-/* debug purpose */
-.form-type-pictograms{
-	display: inline-block;
-	float: right;
-	margin-left: 5px;
-	color: grey;
-	cursor: pointer;
-	padding: 0px 5px;
-	border-radius: 8px;
-	font-size: 0.9rem;
-}
-.form-type-pictograms i{
-	width: 15px;
-}
-.complete .form-type-pictograms .pattern:after{
-	content: '\f00c';
-	font-family: "Font Awesome 6 Free";
-	font-weight: 900;
-	background-color: #20b220;
-	border-radius: 50%;
-	font-size: 7px;
-	color: white;
-	position: relative;
-	top: -10px;
-	padding: 2px;
-}
-
-/* form label */
-.form-label.required:after{
-	content: '*';
-	color: #e63535;
-	margin-left: 3px;
-}
-
-.cke_focus .cke_contents{
-	border: 1px #86b7fe solid;
-	outline: 0;
-	border-radius: 6px;
-	box-shadow: 0 0 0 0.25rem rgba(13,110,253,.25);
-}
-
-.form_interval_horizontal{
-	display: flex;
-}
-.form_interval_horizontal > div{
-	margin-right: 8px;
-}
-
-.form-compound-fieldset{
-	padding: 8px;
-	border-radius: 10px;
-	border: 1px dashed lightgrey;
-}
-
-.form-layout-row{
-	display: flex;
-	flex-direction: row;
-}
-.form-layout-column{
-	margin: 10px;
-}
-.form-layout-column:first-child{
-	margin-left: 0px;
-}
-.form-layout-column:last-child{
-	margin-right: 0px;
-}
-

css/form-sdk/test.css

@@ -1,88 +0,0 @@
-.layout-grow{
-	flex-grow: 1;
-}
-
-.custom-container{
-	position: relative;
-	border-radius: 10px;
-	padding: 40px 20px 0px;
-}
-
-.custom-container:before{
-	content: 'Custom Layout CSS';
-	font-weight: 500;
-	position: absolute;
-	left: 50%;
-	top: -10px;
-	transform: translateX(-50%);
-	/*border: 1px solid #9c21af;*/
-	background-color: white;
-	padding: 5px 15px;
-	border-radius: 10px;
-}
-
-.container-flower{
-	background-color: #f3deff;
-	background-size: 500px;
-	background-repeat: no-repeat;
-	background-position-x: right;
-	background-position-y: bottom;
-	background: linear-gradient( to right bottom, rgb(248 242 251) 50%, rgb(241 187 255) );
-	padding-bottom: 200px;
-}
-.container-flower fieldset{
-	position: relative;
-	z-index: 1;
-}
-.container-flower:after{
-	content: '';
-	width: 300px;
-	height: 200px;
-	background-image: url('../../sources/FormImplementation/Resources/6662396.png');
-	background-size: 300px;
-	position: absolute;
-	bottom: 0px;
-	right: 0px;
-	border-radius: 10px;
-}
-
-.container-flower .col-form-label{
-	color: #8d63b7;
-}
-.container-flower .form-compound-fieldset{
-	border: 1px solid #8d63b7;
-}
-
-.container-color{
-	position: relative;
-	border-radius: 10px;
-	background-color: #faf7ff;
-}
-
-.container-color .form-compound-fieldset{
-	background-color: #ebe4f6;
-	border: none;
-}
-
-.container-color2{
-	position: relative;
-	border-radius: 10px;
-	background-color: #f7f9ff;
-}
-
-.container-color2 .form-compound-fieldset{
-	background-color: #e8edf9;
-	border: none;
-}
-
-.error-label{
-	color: #d32f2f;
-}
-
-.container-color2 .form-compound-fieldset fieldset{
-	border-bottom: 1px dashed #a3adc5;
-}
-
-.container-color2 .form-compound-fieldset fieldset:last-child{
-	border-bottom: none;
-}

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

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

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

@@ -7,6 +7,6 @@
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'CAS:Error:UserNotAllowed' => '用户被禁止登录',
-	'CAS:Login:SignIn' => '使用CAS登录',
-	'CAS:Login:SignInTooltip' => '点击这里使用CAS服务器认证',
+	'CAS:Login:SignIn' => '使用CAS 登录',
+	'CAS:Login:SignInTooltip' => '点击这里使用CAS 服务器认证',
 ));

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

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

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

@@ -35,5 +35,5 @@
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserExternal' => '外部用户',
-	'Class:UserExternal+' => '用户在'.ITOP_APPLICATION_SHORT.'外部验证身份',
+	'Class:UserExternal+' => '用户在 '.ITOP_APPLICATION_SHORT.' 外部验证身份',
 ));

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

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

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

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

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

@@ -21,6 +21,6 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLDAP' => 'LDAP felhasználó',
-	'Class:UserLDAP+' => 'LDAP vagy AD felhasználó',
+	'Class:UserLDAP+' => '',
 	'UserLDAP:server' => 'LDAP specifics~~',
 ));

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

@@ -34,7 +34,7 @@
 // Class: UserLDAP
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:UserLDAP' => 'LDAP用户',
-	'Class:UserLDAP+' => '用户身份由LDAP认证',
-	'UserLDAP:server' => 'LDAP详情',
+	'Class:UserLDAP' => 'LDAP 用户',
+	'Class:UserLDAP+' => '用户身份由LDAP 认证',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));

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

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

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

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

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

@@ -21,7 +21,7 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' felhasználó',
-    'Class:UserLocal+' => 'Rendszeren belül létrehozott felhasználó',
+	'Class:UserLocal+' => '',
 	'Class:UserLocal/Attribute:password' => 'Jelszó',
 	'Class:UserLocal/Attribute:password+' => '',
 	'Class:UserLocal/Attribute:expiration' => 'Jelszó lejárati ideje',

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

@@ -35,11 +35,11 @@
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' 用户',
-	'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/Value:can_expire' => '允许过期',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => '永不过期',
@@ -50,7 +50,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
 	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8个字符, 包含大小写, 数字和特殊字符.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8个字符,包含大小写,数字和特殊字符.',
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
-	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',
+	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置"一次性密码"的失效期限',
 ));

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

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

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

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

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

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

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

@@ -22,4 +22,4 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'theme:darkmoon' => 'Dark moon',
-));
+));

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

@@ -21,5 +21,5 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'theme:darkmoon' => '暗月',
+	'theme:darkmoon' => 'Dark moon~~',
 ));

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

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

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

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

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

@@ -30,7 +30,6 @@ use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Toolbar\Separator\ToolbarSeparatorUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
-use Combodo\iTop\Application\WebPage\iTopWebPage;
 use Combodo\iTop\DBTools\Service\DBAnalyzerUtils;
 
 @include_once('../../approot.inc.php');
@@ -44,7 +43,7 @@ const MAX_RESULTS = 10;
  * @param iTopWebPage $oP
  * @param ApplicationContext $oAppContext
  *
- * @return iTopWebPage
+ * @return \iTopWebPage
  * @throws \CoreException
  * @throws \DictExceptionMissingString
  * @throws \MySQLException
@@ -295,7 +294,7 @@ function DisplayErrorDetails($aResults, $bVerbose)
  * @param iTopWebPage $oP
  * @param ApplicationContext $oAppContext
  *
- * @return iTopWebPage
+ * @return \iTopWebPage
  * @throws CoreException
  * @throws MySQLException
  * @throws \Exception

datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php

@@ -42,8 +42,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'DBTools:FetchCheck' => 'Lehívás ellenőrzés (hosszú)',
 	'DBTools:SelectAnalysisType' => 'Válasszon elemzés típust',
 	'DBTools:Analyze' => 'Elemzés',
-    'DBTools:Details' => 'Részletek megjelenítése',
-    'DBTools:ShowAll' => 'Minden hiba megjelenítése',
+	'DBTools:Details' => 'Részletek mutatása',
+	'DBTools:ShowAll' => 'Minden hiba mutatása',
 	'DBTools:Inconsistencies' => 'Adatbázis inkonzisztenciák',
 	'DBTools:DetailedErrorTitle' => '%2$s hiba a %1$s osztályban: %3$s',
 	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',

datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php

@@ -24,51 +24,51 @@
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Dictionary entries go here
 	'Menu:DBToolsMenu' => '数据库工具',
-	'DBTools:Class' => '类型',
+	'DBTools:Class' => '类',
 	'DBTools:Title' => '数据库维护工具',
 	'DBTools:ErrorsFound' => '发现错误',
-	'DBTools:Indication' => '重要: 修复数据库错误后, 可能会出现新的不一致, 您必须重新运行一次分析.',
-	'DBTools:Disclaimer' => '免责申明: 在应用修复之前, 应先备份数据库',
+	'DBTools:Indication' => '重要: 修复数据库错误后,可能会出现新的不一致,您必须重新运行一次分析.',
+	'DBTools:Disclaimer' => '免责申明: 在应用修复之前,应先备份数据库',
 	'DBTools:Error' => '错误',
 	'DBTools:Count' => '个数',
-	'DBTools:SQLquery' => 'SQL查询',
-	'DBTools:FixitSQLquery' => '修复问题的SQL查询 (指示)',
-	'DBTools:SQLresult' => 'SQL结果',
+	'DBTools:SQLquery' => 'SQL 查询',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL 结果',
 	'DBTools:NoError' => '数据库正确',
 	'DBTools:HideIds' => '错误列表',
 	'DBTools:ShowIds' => '详细视图',
 	'DBTools:ShowReport' => '报告',
 	'DBTools:IntegrityCheck' => '完整性检查',
-	'DBTools:FetchCheck' => '提取检查 (耗时长)',
+	'DBTools:FetchCheck' => '提取检查(耗时长)',
 	'DBTools:SelectAnalysisType' => '请选择分析类型',
 	'DBTools:Analyze' => '分析',
 	'DBTools:Details' => '显示详情',
 	'DBTools:ShowAll' => '显示所有错误',
 	'DBTools:Inconsistencies' => '数据库不一致',
-	'DBTools:DetailedErrorTitle' => '%2$s个错误在类型%1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => '列表限制为%1$s错误',
-	'DBAnalyzer-Integrity-OrphanRecord' => '孤立记录位于 `%1$s`, 其应该有副本位于表 `%2$s`',
-	'DBAnalyzer-Integrity-InvalidExtKey' => '无效的外键%1$s (列: `%2$s.%3$s`)',
-	'DBAnalyzer-Integrity-MissingExtKey' => '外键丢失%1$s (列: `%2$s.%3$s`)',
-	'DBAnalyzer-Integrity-InvalidValue' => '无效的值%1$s (列: `%2$s.%3$s`)',
+	'DBTools:DetailedErrorTitle' => '%2$s 个错误在类 %1$s: %3$s',
+	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => '无效的外键 %1$s (列: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-MissingExtKey' => '外键丢失 %1$s (列: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-InvalidValue' => '无效的值 %1$s (列: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => '一些用户账号没有角色',
 	'DBAnalyzer-Integrity-HKInvalid' => '损坏的层级链 `%1$s`',
-	'DBAnalyzer-Fetch-Count-Error' => '读取计数出错于 `%1$s`, %2$d个记录已读取 / %3$d已~~',
-	'DBAnalyzer-Integrity-FinalClass' => '字段 `%2$s`.`%1$s` 必须是相同的值, 而不是 `%3$s`.`%1$s`',
-	'DBAnalyzer-Integrity-RootFinalClass' => '字段 `%2$s`.`%1$s` 必须包含一个有效的类型',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+	'DBAnalyzer-Integrity-FinalClass' => '字段 `%2$s`.`%1$s` 必须是相同的值,而不是 `%3$s`.`%1$s`',
+	'DBAnalyzer-Integrity-RootFinalClass' => '字段 `%2$s`.`%1$s` 必须包含一个有效的类',
 ));
 
 // Database Info
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'DBTools:DatabaseInfo' => '数据库信息',
-	'DBTools:Base' => '数据库',
+	'DBTools:Base' => 'Base~~',
 	'DBTools:Size' => '大小',
 ));
 
 // Lost attachments
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'DBTools:LostAttachments' => '附件缺失',
-	'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件. 这不是数据恢复工具, 其无法恢复已删除的数据.',
+	'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件.这不是数据恢复工具,其无法恢复已删除的数据.',
 	'DBTools:LostAttachments:Button:Analyze' => '分析',
 	'DBTools:LostAttachments:Button:Restore' => '还原',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => '此操作无法回退, 请确认是否继续还原.',
@@ -81,7 +81,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => '当前位置',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => '移动到...',
 	'DBTools:LostAttachments:Step:RestoreResults' => '还原结果:',
-	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d的附件被还原.',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d 的附件被还原.',
 	'DBTools:LostAttachments:StoredAsInlineImage' => '存储为内嵌图像',
 	'DBTools:LostAttachments:History' => '附件 "%1$s" 已使用数据库工具还原'
 ));

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

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

datamodels/2.x/itop-attachments/ajax.itop-attachment.php

@@ -17,14 +17,11 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\WebPage\AjaxPage;
-use Combodo\iTop\Application\WebPage\JsonPage;
-
 require_once('../../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 
 /**
- * @param \Combodo\iTop\Application\WebPage\AjaxPage $oPage
+ * @param \AjaxPage $oPage
  * @param int $iTransactionId
  *
  * @throws \ArchivedObjectException

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

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

datamodels/2.x/itop-attachments/dictionaries/en.dict.itop-attachments.php

@@ -26,9 +26,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Attachments:History_File_Removed' => 'Attachment %1$s removed.',
 	'Attachments:AddAttachment' => 'Add attachment: ',
 	'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.',
-	'Attachment:Max_Go' => '(Maximum file size: %1$s GB)',
-	'Attachment:Max_Mo' => '(Maximum file size: %1$s MB)',
-	'Attachment:Max_Ko' => '(Maximum file size: %1$s KB)',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s Go)',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)',
 	'Attachments:NoAttachment' => 'No attachment. ',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.',
 	'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s',

datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php

@@ -34,7 +34,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Attachment:Max_Ko' => '(Maximum fájlméret: %1$s KB)',
 	'Attachments:NoAttachment' => 'Nincs melléklet. ',
 	'Attachments:PreviewNotAvailable' => 'Az előnézet nem érhető el ilyen típusú melléklethez',
-    'Attachments:Error:FileTooLarge' => 'Túl nagy a %1$s fájl a feltöltéshez.',
+	'Attachments:Error:FileTooLarge' => 'Túl nagy a fájl a feltöltéshez. %1$s',
 	'Attachments:Error:UploadedFileEmpty' => 'A kapott fájl üres, ezért nem csatolható. Vagy egy üres fájlt húzott be, vagy kérdezze meg a rendszergazdát, hátha az iTop szerver lemeze telt meg.',
 	'Attachments:Render:Icons' => 'Mutassa ikonként',
 	'Attachments:Render:Table' => 'Mutassa listaként',
@@ -52,7 +52,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Attachment/Attribute:expire+' => '~~',
 	'Class:Attachment/Attribute:temp_id' => 'Átmeneti azonosító',
 	'Class:Attachment/Attribute:temp_id+' => '~~',
-    'Class:Attachment/Attribute:item_class' => 'Elem típus',
+	'Class:Attachment/Attribute:item_class' => 'Elem osztály',
 	'Class:Attachment/Attribute:item_class+' => '~~',
 	'Class:Attachment/Attribute:item_id' => 'Elem',
 	'Class:Attachment/Attribute:item_id+' => '~~',

datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php

@@ -21,8 +21,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachments:EmptyTabTitle' => '附件',
 	'Attachments:FieldsetTitle' => '附件',
 	'Attachments:DeleteBtn' => '删除',
-	'Attachments:History_File_Added' => '附件%1$s已添加.',
-	'Attachments:History_File_Removed' => '附件%1$s已移除.',
+	'Attachments:History_File_Added' => '附件 %1$s 已添加.',
+	'Attachments:History_File_Removed' => '附件 %1$s 已移除.',
 	'Attachments:AddAttachment' => '添加附件: ',
 	'Attachments:UploadNotAllowedOnThisSystem' => '本系统不支持文件上传.',
 	'Attachment:Max_Go' => '(最大文件尺寸: %1$s GB)',
@@ -31,7 +31,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachments:NoAttachment' => '没有附件. ',
 	'Attachments:PreviewNotAvailable' => '此附件类型不支持预览.',
 	'Attachments:Error:FileTooLarge' => '上传的文件过大. %1$s',
-	'Attachments:Error:UploadedFileEmpty' => '收到的文件为空, 无法添加. 可能是因为您发送的是空文件,或者咨询'.ITOP_APPLICATION_SHORT.'管理员服务器磁盘是否已满.',
+	'Attachments:Error:UploadedFileEmpty' => '收到的文件为空,无法添加. 可能是因为您发送的是空文件,或者咨询 '.ITOP_APPLICATION_SHORT.' 管理员服务器磁盘是否已满. ',
 	'Attachments:Render:Icons' => '显示为图标',
 	'Attachments:Render:Table' => '显示为列表',
 	'UI:Attachments:DropYourFileHint' => '将文件拖放到此区域的任意位置',
@@ -46,9 +46,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Attachment+' => '',
 	'Class:Attachment/Attribute:expire' => '过期',
 	'Class:Attachment/Attribute:expire+' => '~~',
-	'Class:Attachment/Attribute:temp_id' => '临时编号',
+	'Class:Attachment/Attribute:temp_id' => '临时id',
 	'Class:Attachment/Attribute:temp_id+' => '~~',
-	'Class:Attachment/Attribute:item_class' => '项目类型',
+	'Class:Attachment/Attribute:item_class' => '项目类',
 	'Class:Attachment/Attribute:item_class+' => '~~',
 	'Class:Attachment/Attribute:item_id' => '项目',
 	'Class:Attachment/Attribute:item_id+' => '~~',
@@ -66,7 +66,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachments:File:Uploader' => '上传者',
 	'Attachments:File:Size' => '大小',
 	'Attachments:File:MimeType' => '类型',
-	'Attachments:File:DownloadsCount' => '下载',
+	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -75,9 +75,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Attachment/Attribute:creation_date' => '创建日期',
 	'Class:Attachment/Attribute:creation_date+' => '~~',
-	'Class:Attachment/Attribute:user_id' => '用户编号',
+	'Class:Attachment/Attribute:user_id' => '用户id',
 	'Class:Attachment/Attribute:user_id+' => '~~',
-	'Class:Attachment/Attribute:contact_id' => '联系人编号',
+	'Class:Attachment/Attribute:contact_id' => '联系人id',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
 
@@ -86,6 +86,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:TriggerOnAttachmentDownload' => '触发器 (于对象附件下载时)',
-	'Class:TriggerOnAttachmentDownload+' => '触发器于指定类型 [子类型] 对象附件下载时',
+	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
+	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
 ));