N°5298 - Update CKEditor to version 5

* Allow to include backup extra file via interface

* Update application/applicationextension.inc.php

Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>

* Add iBackupExtraFilesExtension to plugin list

* decouple extra_files via config and interface

* Add unit tests for iBackupExtraFilesExtension

* Enable recursive creation of destination directories

* Update application/applicationextension.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update setup/backup.class.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update tests/php-unit-tests/unitary-tests/application/applicationextension/ApplicationExtensionTest.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update application/applicationextension.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update core/metamodel.class.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update setup/backup.class.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

---------

Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

.doc/itop-version-history.md

@@ -1,7 +1,14 @@
 # iTop version history
 
 ```mermaid
-%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
+%%{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}} }%%
 gitGraph
     commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
     branch support/2.3 order: 900
@@ -68,6 +75,10 @@ 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).

.gitignore

@@ -47,6 +47,9 @@ tests/*/vendor/*
 !/log/index.php
 !/log/web.config
 
+# NPM: `jquery-ui` package is just there for vulnerability scans, so we don't want to version its files (only `jquery-ui-dist` is used within the code base)
+/node_modules/jquery-ui/**
+
 # PHPUnit: Cache file, local XML working copies
 /tests/php-unit-tests/.phpunit.result.cache
 /tests/php-unit-tests/phpunit.xml

.make/build/afterBuild.php

@@ -4,7 +4,7 @@ $iBeginTime = time();
 chdir(__DIR__);
 
 $aCommands = [
-	'php composer/rmDeniedTestDir.php',
+	'php composer/rmUnnecessaryFolders.php',
 	'php build/commands/setupCssCompiler.php',
 //	'bash /tmp/gabuzomeu.sh',
 ];
@@ -22,13 +22,13 @@ $iElapsed = time() - $iBeginTime;
 
 if (count($aFailedCommands))
 {
-	fwrite(STDERR, "\nafterBuild execution failed! (in ${iElapsed}s)\n");
+	fwrite(STDERR, "\nafterBuild execution failed! (in {$iElapsed}s)\n");
 	fwrite(STDERR, "List of failling commands:\n - " . implode("\n - ", $aFailedCommands) . "\n");
 	exit(1);
 }
 
 
-echo "\nDone (${iElapsed}s)\n";
+echo "\nDone ({$iElapsed}s)\n";
 exit(0);
 
 /**
@@ -74,7 +74,7 @@ function ExecCommand($cmd) {
 	}
 	else
 	{
-		echo "| elapsed:${iElapsed}s \n";
+		echo "| elapsed:{$iElapsed}s \n";
 	}
 
 	if (!empty($stderr))

.make/composer/rmDeniedTestDir.php

@@ -1,73 +0,0 @@
-<?php
-/**
- * Copyright (C) 2010-2023 Combodo SARL
- *
- *   This file is part of iTop.
- *
- *   iTop is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   iTop is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with iTop. If not, see <http: *www.gnu.org/licenses/>
- *
- */
-
-use Combodo\iTop\Composer\iTopComposer;
-
-$iTopFolder = __DIR__ . "/../../" ;
-
-require_once ("$iTopFolder/approot.inc.php");
-require_once (APPROOT."/setup/setuputils.class.inc.php");
-
-if  (php_sapi_name() !== 'cli')
-{
-	throw new \Exception('This script can only run from CLI');
-}
-
-clearstatcache();
-
-$oiTopComposer = new iTopComposer();
-$aDeniedButStillPresent = $oiTopComposer->ListDeniedButStillPresent();
-
-echo "\n";
-foreach ($aDeniedButStillPresent as $sDir)
-{
-	if (false === iTopComposer::IsTestDir($sDir))
-	{
-		echo "ERROR found INVALID denied test dir: '$sDir'\n";
-		throw new \Exception("$sDir must end with /Test/ or /test/");
-	}
-
-	if (false === file_exists($sDir)) {
-		echo "INFO $sDir is in denied list, but not existing on disk => skipping !\n";
-		continue;
-	}
-
-	try {
-		SetupUtils::rrmdir($sDir);
-		echo "OK Remove denied test dir: '$sDir'\n";
-	}
-	catch (\Exception $e) {
-		echo "\nFAILED to remove denied test dir: '$sDir'\n";
-	}
-}
-
-
-$aAllowedAndDeniedDirs = array_merge(
-	$oiTopComposer->ListAllowedTestDir(),
-	$oiTopComposer->ListDeniedTestDir()
-);
-$aExistingDirs = $oiTopComposer->ListAllTestDir();
-$aMissing = array_diff($aExistingDirs, $aAllowedAndDeniedDirs);
-if (false === empty($aMissing)) {
-	echo "Some new tests dirs exists !\n"
-		.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
-		.'  List of dirs:'."\n".var_export($aMissing, true);
-}

.make/dependencies/composer/listOutdated.php

@@ -26,7 +26,7 @@
  * @link https://getcomposer.org/doc/03-cli.md#show
  */
 
-$iTopFolder = __DIR__."/../../";
+$iTopFolder = __DIR__."/../../../";
 
 require_once("$iTopFolder/approot.inc.php");
 $sApproot = APPROOT;

.make/dependencies/composer/tcpdf/tcpdfDefaultFontsToKeepInItop.txt

@@ -0,0 +1,56 @@
+courier.php
+courierb.php
+courierbi.php
+courieri.php
+dejavusans.ctg.z
+dejavusans.php
+dejavusans.z
+dejavusansb.ctg.z
+dejavusansb.php
+dejavusansb.z
+dejavusansbi.ctg.z
+dejavusansbi.php
+dejavusansbi.z
+dejavusanscondensed.ctg.z
+dejavusanscondensed.php
+dejavusanscondensed.z
+dejavusanscondensedb.ctg.z
+dejavusanscondensedb.php
+dejavusanscondensedb.z
+dejavusanscondensedbi.ctg.z
+dejavusanscondensedbi.php
+dejavusanscondensedbi.z
+dejavusanscondensedi.ctg.z
+dejavusanscondensedi.php
+dejavusanscondensedi.z
+dejavusansextralight.ctg.z
+dejavusansextralight.php
+dejavusansextralight.z
+dejavusansi.ctg.z
+dejavusansi.php
+dejavusansi.z
+dejavusansmono.ctg.z
+dejavusansmono.php
+dejavusansmono.z
+dejavusansmonob.ctg.z
+dejavusansmonob.php
+dejavusansmonob.z
+dejavusansmonobi.ctg.z
+dejavusansmonobi.php
+dejavusansmonobi.z
+dejavusansmonoi.ctg.z
+dejavusansmonoi.php
+dejavusansmonoi.z
+droidsansfallback.ctg.z
+droidsansfallback.php
+droidsansfallback.z
+helvetica.php
+helveticab.php
+helveticabi.php
+helveticai.php
+symbol.php
+times.php
+timesb.php
+timesbi.php
+timesi.php
+zapfdingbats.php

.make/dependencies/composer/tcpdf/tcpdfUpdateFonts.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * This script will copy custom fonts in the TCPDF lib fonts directory.
+ * If you need to add other files :
+ * - add the corresponding files in this script directory
+ * - modify this script to copy also your files
+ *
+ * @since 2.7.0 N°1947 add DroidSansFallback font (see also PR #49 in the links below)
+ * @since 2.7.0 N°2435 TCPPDF lib forked and added in composer.json (at that time the lib was announced as deprecated and rewritten in tecnickcom/tc-lib-pdf)
+ * @since 3.2.0 N°7175 switch back to TCPDF original lib (which is finally still maintained, tecnickcom/tc-lib-pdf us still under dev), script creation to keep custom DroidSansFallback font
+ *
+ * @link https://github.com/Combodo/iTop/pull/49 add DroidSansFallback font
+ * @link https://github.com/tecnickcom/TCPDF?tab=readme-ov-file#note TCPDF is in support only mode
+ */
+
+$sItopRootFolder = realpath(__DIR__ . "/../../../../");
+$sCurrentScriptFileName = basename(__FILE__);
+
+
+require_once ("$sItopRootFolder/lib/autoload.php");
+
+
+$sTcPdfRootFolder = $sItopRootFolder.'/lib/tecnickcom/tcpdf';
+if (false === file_exists($sTcPdfRootFolder)) {
+	echo $sCurrentScriptFileName.": No TCPDF lib detected, exiting !\n";
+	return;
+}
+$sTcPdfFontsFolder = $sTcPdfRootFolder.'/Fonts/';
+
+
+/**
+ * 1) Cleaning up the fonts directory to keep only the ones we want in iTop
+ */
+echo $sCurrentScriptFileName.": ---1) Cleaning up the fonts files\n";
+$aTcpdfDefaultFontsToKeepInItop = file(__DIR__.'/tcpdfDefaultFontsToKeepInItop.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+$aTcpdfFontsDirContent = scandir($sTcPdfFontsFolder);
+foreach ($aTcpdfFontsDirContent as $sTcpdfFontResourceName) {
+	if ($sTcpdfFontResourceName === '.') {
+		continue;
+	}
+	if ($sTcpdfFontResourceName === '..') {
+		continue;
+	}
+
+	if (!in_array($sTcpdfFontResourceName, $aTcpdfDefaultFontsToKeepInItop, true)) {
+		echo $sCurrentScriptFileName.": Removing $sTcpdfFontResourceName !\n";
+
+		$sTcpdfFontResourceFullPath = $sTcPdfFontsFolder.$sTcpdfFontResourceName;
+		if (is_file($sTcpdfFontResourceFullPath)) {
+			unlink($sTcpdfFontResourceFullPath);
+		} elseif (is_dir($sTcpdfFontResourceFullPath)) {
+			rrmdir($sTcpdfFontResourceFullPath);
+		}
+	}
+}
+
+
+
+/**
+ * 2) Then adding the DroidSansFallback font (useful for CJK data for example)
+ */
+echo $sCurrentScriptFileName.": ---2) Copying font files to TCPDF ($sTcPdfFontsFolder)...\n";
+$aFontFilesToCopy = glob(__DIR__.'\droidsansfallback.*');
+foreach ($aFontFilesToCopy as $sFontFileToCopy) {
+	$sFontFileName = basename($sFontFileToCopy);
+	echo $sCurrentScriptFileName.': copying '.$sFontFileName."\n";
+	copy($sFontFileToCopy, $sTcPdfFontsFolder.$sFontFileName);
+}
+echo $sCurrentScriptFileName.": Done !\n";
+
+
+
+/*-----------------------------------------------------------------------------------------------*/
+
+
+
+/**
+ * Recursively delete a directory and its content
+ *
+ * @param $sDirToRemovePath
+ *
+ * @return void
+ */
+function rrmdir($sDirToRemovePath):void
+{
+	if (is_dir($sDirToRemovePath)) {
+		$objects = scandir($sDirToRemovePath);
+		foreach ($objects as $object) {
+			if ($object != "." && $object != "..") {
+				if (filetype($sDirToRemovePath."/".$object) == "dir") {
+					rrmdir($sDirToRemovePath."/".$object);
+				} else {
+					unlink($sDirToRemovePath."/".$object);
+				}
+			}
+		}
+		reset($objects);
+		rmdir($sDirToRemovePath);
+	}
+}

.make/dependencies/npm/restoreFolderBrowsingProtection.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright (C) 2010-2023 Combodo SARL
+ *
+ *   This file is part of iTop.
+ *
+ *   iTop is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   iTop is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with iTop. If not, see <http: *www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Ensure that the files for folder browsing protection (.htaccess, web.config) are kept after an "npm install/update" command
+ */
+
+$iTopFolder = __DIR__."/../../../";
+
+require_once("$iTopFolder/approot.inc.php");
+
+$sDependenciesRootFolderAbsPath = APPROOT . "node_modules/";
+$aFilesToCheck = [
+	".htaccess",
+	"web.config",
+];
+
+echo "This command aims at ensuring that folder browsing protection files (.htaccess, web.config) are present in the dependencies folder even after an install/upgrade command\n";
+echo "Checking files:\n";
+
+foreach($aFilesToCheck as $sFileToCheck) {
+	if (file_exists($sDependenciesRootFolderAbsPath . $sFileToCheck)) {
+		echo "✔️ $sFileToCheck is present\n";
+		continue;
+	}
+
+	// If missing, copy the one from /lib as it contains the necessary allow/deny directives for third-parties
+	copy(APPROOT . "lib/$sFileToCheck", $sDependenciesRootFolderAbsPath . $sFileToCheck);
+	echo "✔️ $sFileToCheck was missing and has been re-created\n";
+}
+
+// Ensure separation with following scripts
+echo "\n";

.make/dependencies/rmUnnecessaryFolders.php

@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright (C) 2010-2023 Combodo SARL
+ *
+ *   This file is part of iTop.
+ *
+ *   iTop is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   iTop is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with iTop. If not, see <http: *www.gnu.org/licenses/>
+ *
+ */
+
+$iTopFolder = __DIR__ . "/../../" ;
+
+require_once ("$iTopFolder/approot.inc.php");
+require_once (APPROOT."/setup/setuputils.class.inc.php");
+
+if  (php_sapi_name() !== 'cli')
+{
+	throw new \Exception('This script can only run from CLI');
+}
+
+clearstatcache();
+
+// Read params
+$key = array_search("--manager", $argv);
+if (false === $key || false === isset($argv[$key + 1]) ) {
+	throw new \InvalidArgumentException("Usage: " . __FILE__ . " --manager composer|npm");
+}
+$sDependenciesHandlerCode = $argv[$key + 1];
+
+switch ($sDependenciesHandlerCode) {
+	case "composer":
+		$sDependenciesHandlerFQCN = \Combodo\iTop\Dependencies\Composer\iTopComposer::class;
+		break;
+
+	case "npm":
+		$sDependenciesHandlerFQCN = \Combodo\iTop\Dependencies\NPM\iTopNPM::class;
+		break;
+
+	default:
+		throw new \Exception("Invalid dependencies handler code, $sDependenciesHandlerCode given, expected composer|npm");
+}
+
+// Start handler
+$oDependenciesHandler = new $sDependenciesHandlerFQCN();
+$aDeniedButStillPresent = $oDependenciesHandler->ListDeniedButStillPresentFoldersAbsPaths();
+
+echo "\n";
+foreach ($aDeniedButStillPresent as $sDir)
+{
+	if (false === $oDependenciesHandler::IsQuestionnableFolder($sDir))
+	{
+		echo "ERROR found INVALID denied test dir: '$sDir'\n";
+		throw new \RuntimeException("$sDir is in the denied list but doesn't comply with the rule (see IsQuestionnableFolder method)");
+	}
+
+	if (false === file_exists($sDir)) {
+		echo "INFO $sDir is in denied list, but not existing on disk => skipping !\n";
+		continue;
+	}
+
+	try {
+		SetupUtils::rrmdir($sDir);
+		echo "✔️ Remove denied test dir: '$sDir'\n";
+	}
+	catch (\Exception $e) {
+		echo "\n❌ FAILED to remove denied test dir: '$sDir'\n";
+	}
+}
+
+
+$aAllowedAndDeniedDirs = array_merge(
+	$oDependenciesHandler->ListAllowedFoldersAbsPaths(),
+	$oDependenciesHandler->ListDeniedFoldersAbsPaths()
+);
+$aExistingDirs = $oDependenciesHandler->ListAllFoldersAbsPaths();
+$aMissing = array_diff($aExistingDirs, $aAllowedAndDeniedDirs);
+if (false === empty($aMissing)) {
+	echo "Some new tests dirs exists !\n"
+		."  They must be declared either in the allowed or denied list in {$sDependenciesHandlerFQCN}\n"
+		.'  List of dirs:'."\n".var_export($aMissing, true)."\n";
+}
+
+// Ensure separation with following scripts
+echo "\n";

CONTRIBUTING.md

@@ -140,7 +140,7 @@ When your code is working, please:
 * Pull request description: mind to add all the information useful to understand why you're suggesting this modification and anything necessary to dive into your work. Especially:
   - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented 
   - Enhancements: use cases, implementation details if needed
-* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option !
+* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this option [won't be available](https://github.com/orgs/community/discussions/5634))
 
 
 ## 🙏 We are thankful
@@ -159,6 +159,6 @@ We have one sticker per contribution type. You might get multiple stickers with
 * Beta tester: Test and give feedback on beta releases
 * Extension developer: Develop and publish an extension
 
-Here is the design of each stickers for year 2022:
+Here is the design of each stickers for year 2024:
 
-![iTop stickers 2023](.doc/contributing-guide/2023.contributing-stickers-side-by-side.png)
+![iTop stickers 2024](.doc/contributing-guide/2024.contributing-stickers-side-by-side.png)

README.md

@@ -87,9 +87,11 @@ 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
@@ -105,9 +107,11 @@ 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
-- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya-stukalov))
+- 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,6 +4,8 @@
  * @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');
 

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

@@ -17,6 +17,8 @@
  * 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');
 

addons/userrights/userrightsprojection.class.inc.php

@@ -17,6 +17,8 @@
  * 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

@@ -0,0 +1,29 @@
+<?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,6 +7,7 @@
 
 // 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,6 +19,8 @@
  */
 
 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');
@@ -270,14 +272,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
@@ -1272,8 +1274,6 @@ abstract class AbstractPageUIExtension implements iPageUIExtension
 	 */
 	public function GetNorthPaneHtml(iTopWebPage $oPage)
 	{
-		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use iPageUIBlockExtension instead');
-
 		return '';
 	}
 
@@ -1282,8 +1282,6 @@ abstract class AbstractPageUIExtension implements iPageUIExtension
 	 */
 	public function GetSouthPaneHtml(iTopWebPage $oPage)
 	{
-		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use iPageUIBlockExtension instead');
-
 		return '';
 	}
 
@@ -1292,8 +1290,6 @@ abstract class AbstractPageUIExtension implements iPageUIExtension
 	 */
 	public function GetBannerHtml(iTopWebPage $oPage)
 	{
-		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use iPageUIBlockExtension instead');
-
 		return '';
 	}
 
@@ -2285,4 +2281,19 @@ interface iKPILoggerExtension
      * @return mixed
      */
     public function LogOperation($oKpiLogData);
-}
+}
+
+/**
+ * Implement this interface to add files to the backup
+ *
+ * @api
+ * @since 3.2.0
+ */
+interface iBackupExtraFilesExtension
+{
+	/**
+	 * @api
+	 * @return string[] Array of relative paths (from app root) for files and directories to be included in the backup
+	 */
+	public function GetExtraFilesRelPaths(): array;
+}

application/cmdbabstract.class.inc.php

@@ -4,6 +4,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\Helper\CKEditorHelper;
 use Combodo\iTop\Application\Helper\FormHelper;
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
@@ -26,7 +27,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\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\Select\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,6 +43,9 @@ 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;
@@ -287,7 +291,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \cmdbAbstractObject $oObj
 	 * @param array $aParams
 	 *
@@ -356,7 +360,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)
 	 *
@@ -378,7 +382,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
@@ -556,7 +560,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
@@ -595,7 +599,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @throws \Exception
@@ -636,7 +640,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
@@ -863,7 +867,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
@@ -1067,7 +1071,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
@@ -1114,7 +1118,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']);
@@ -1149,7 +1153,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1172,7 +1176,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams See possible values in {@see DataTableUIBlockFactory::RenderDataTable()}
 	 *
@@ -1234,7 +1238,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \DBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -1406,7 +1410,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams key used :
 	 *      <ul>
@@ -1529,7 +1533,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 * @param string $sCharset
@@ -1688,7 +1692,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1901,7 +1905,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1979,7 +1983,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -2010,7 +2014,7 @@ HTML
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sClass
 	 * @param string $sAttCode
 	 * @param \AttributeDefinition $oAttDef
@@ -2320,14 +2324,14 @@ JS
 					// To change the default settings of the editor,
 					// a) edit the file /js/ckeditor/config.js
 					// b) or override some of the configuration settings, using the second parameter of ckeditor()
-					$aConfig = utils::GetCkeditorPref();
+					$aConfig = CKEditorHelper::GetCkeditorPref();
 					$aConfig['placeholder'] = Dict::S('UI:CaseLogTypeYourTextHere');
 
 					// - Final config
 					$sConfigJS = json_encode($aConfig);
 
 					WebResourcesHelper::EnableCKEditorToWebPage($oPage);
-					$oPage->add_ready_script("$('#$iId').ckeditor(function() { /* callback code */ }, $sConfigJS);"); // Transform $iId into a CKEdit
+					$oPage->add_ready_script("CombodoCKEditorHandler.CreateInstance('#$iId')");
 
 					$oPage->add_ready_script(
 <<<EOF
@@ -2426,7 +2430,7 @@ HTML;
 					$sInputType = self::ENUM_INPUT_TYPE_IMAGE;
 					$aEventsList[] = 'validate';
 					$aEventsList[] = 'change';
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/edit_image.js');
+					$oPage->LinkScriptFromAppRoot('js/edit_image.js');
 					$oDocument = $value; // Value is an ormDocument objectm
 					$sDefaultUrl = $oAttDef->Get('default_image');
 					if (is_object($oDocument) && !$oDocument->IsEmpty()) {
@@ -2542,11 +2546,11 @@ HTML;
 					$sHTMLValue .= '</div></div>';
 					$sHTMLValue .= '<div>'.$sReloadSpan.'</div>'; // No validation span for this one: it does handle its own validation!
 					$sHTMLValue .= "<input name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" type=\"hidden\" id=\"$iId\" value=\"\"/>\n";
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/form_handler.js');
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/console_form_handler.js');
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_set.js');
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/form_field.js');
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/subform_field.js');
+					$oPage->LinkScriptFromAppRoot('js/form_handler.js');
+					$oPage->LinkScriptFromAppRoot('js/console_form_handler.js');
+					$oPage->LinkScriptFromAppRoot('js/field_set.js');
+					$oPage->LinkScriptFromAppRoot('js/form_field.js');
+					$oPage->LinkScriptFromAppRoot('js/subform_field.js');
 					$oPage->add_ready_script(
 						<<<JS
 $('#{$iId}_field_set').field_set($sFieldSetOptions);
@@ -2572,9 +2576,9 @@ JS
 				case 'Set':
 				case 'TagSet':
 					$sInputType = self::ENUM_INPUT_TYPE_TAGSET;
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/selectize.min.js');
-					$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/selectize.default.css');
-					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.itop-set-widget.js');
+					$oPage->LinkScriptFromAppRoot('js/selectize.min.js');
+					$oPage->LinkStylesheetFromAppRoot('css/selectize.default.css');
+					$oPage->LinkScriptFromAppRoot('js/jquery.itop-set-widget.js');
 
 					$oPage->add_dict_entry('Core:AttributeSet:placeholder');
 
@@ -2749,7 +2753,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ArchivedObjectException
@@ -3154,7 +3158,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 +3253,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 +3338,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
@@ -3449,7 +3453,7 @@ EOF
 								// Dummy collapsible section created in order to get JS files
 								$oCollapsibleSection = new CollapsibleSection('');
 								foreach ($oCollapsibleSection->GetJsFilesUrlRecursively(true) as $sJSFile) {
-									$oPage->add_linked_script($sJSFile);
+									$oPage->LinkScriptFromURI($sJSFile);
 								}
 							}
 							$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, $aArgs);
@@ -3589,16 +3593,26 @@ EOF
 			$oPage->add_ready_script(InlineImage::EnableCKEditorImageUpload($this, $sTempId));
 		} else {
 			//we can directly apply the stimuli
+			$sExceptionMessage = null;
+			try {
 			$bApplyStimulus = $this->ApplyStimulus($sStimulus); // will write the object in the DB
-			if (!$bApplyStimulus) {
-				throw new ApplicationException(Dict::S('UI:FailedToApplyStimuli'));
-			} else {
+			}
+			catch (Exception $oException) {
+				// Catch any exception happening during the stimulus
+				$bApplyStimulus = false;
+				$sExceptionMessage =   ($oException instanceof CoreCannotSaveObjectException) ? $oException->getHtmlMessage() : $oException->getMessage();
+			}
+			finally {
 				if ($sOwnershipToken !== null) {
 					// Release the concurrent lock, if any
 					iTopOwnershipLock::ReleaseLock($sClass, $iKey, $sOwnershipToken);
 				}
-
-				return true;
+				if (!$bApplyStimulus) {
+					// Throw an application oriented exception if necessary
+					throw new ApplicationException($sExceptionMessage ?? Dict::S('UI:FailedToApplyStimuli'));
+				} else {
+					return true;
+				}
 			}
 		}
 
@@ -3747,7 +3761,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
@@ -4835,7 +4849,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 +4953,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 +5078,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 +5322,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
@@ -5448,7 +5462,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

application/dashboard.class.inc.php

@@ -9,6 +9,8 @@ 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');
@@ -422,7 +424,7 @@ abstract class Dashboard
 	}
 
 	/**
-	 * @param \WebPage $oPage *
+	 * @param WebPage $oPage *
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ReflectionException
@@ -478,7 +480,7 @@ abstract class Dashboard
 	CombodoTooltip.InitTooltipFromMarkup($("#attr_auto_reload_sec"));
 	$("#attr_auto_reload_sec").prop('disabled', !$('#attr_auto_reload').is(':checked'));
 	
-	$('#attr_auto_reload').change( function(ev) {
+	$('#attr_auto_reload').on('change', function(ev) {
 		$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
 	} );
 
@@ -513,7 +515,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 * @param bool $bCanEdit
@@ -561,15 +563,15 @@ JS
 		}
 
 		if (!$bEditMode) {
-			$oPage->add_linked_script('../js/dashlet.js');
-			$oPage->add_linked_script('../js/dashboard.js');
+			$oPage->LinkScriptFromAppRoot('js/dashlet.js');
+			$oPage->LinkScriptFromAppRoot('js/dashboard.js');
 		}
 
 		return $oDashboard;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ReflectionException
 	 * @throws \Exception
@@ -592,7 +594,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 */
 	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = array())
@@ -1109,15 +1111,15 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \Exception
 	 */
 	protected function RenderEditionTools(WebPage $oPage, DashboardLayoutUIBlock $oDashboard, $aExtraParams)
 	{
-		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.iframe-transport.js');
-		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.fileupload.js');
+		$oPage->LinkScriptFromAppRoot('node_modules/blueimp-file-upload/js/jquery.iframe-transport.js');
+		$oPage->LinkScriptFromAppRoot('node_modules/blueimp-file-upload/js/jquery.fileupload.js');
 		$sId = utils::Sanitize($this->GetId(), '', 'element_identifier');
 
 		$sMenuTogglerId = "ibo-dashboard-menu-toggler-{$sId}";
@@ -1228,7 +1230,7 @@ EOF
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @param array $aExtraParams
 	 *
@@ -1270,6 +1272,7 @@ EOF
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
 		$sTitle = utils::HtmlEntities($this->sTitle);
 		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
+		$sFileForJS = json_encode($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
 		$sReloadURL = $this->GetReloadURL();
 
@@ -1331,9 +1334,9 @@ $('#dashboard_editor .ui-layout-center').runtimedashboard({
 	auto_reload: $sAutoReload, 
 	auto_reload_sec: $sAutoReloadSec,
 	submit_to: '$sUrl', 
-	submit_parameters: {operation: 'save_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	submit_parameters: {operation: 'save_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	render_to: '$sUrl', 
-	render_parameters: {operation: 'render_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	render_parameters: {operation: 'render_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	new_dashlet_parameters: {operation: 'new_dashlet'}
 });
 
@@ -1488,7 +1491,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sOQL
 	 *
 	 * @throws \DictExceptionMissingString

application/dashboardlayout.class.inc.php

@@ -19,6 +19,7 @@ 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
@@ -106,7 +107,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,6 +23,7 @@ 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');
 
@@ -222,7 +223,7 @@ abstract class Dashlet
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param bool $bEnclosingDiv
 	 * @param array $aExtraParams
@@ -298,7 +299,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *
@@ -309,7 +310,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.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -474,10 +474,18 @@ Call $this->AddInitialAttributeFlags() for all the initial attributes to be set
           <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,5 +1,7 @@
 <?php
 
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 /**
@@ -61,8 +63,8 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
-	 * @param \DataTableSettings $oSettings
+	 * @param WebPage $oPage
+	 * @param DataTableSettings $oSettings
 	 * @param $bActionsMenu
 	 * @param $sSelectMode
 	 * @param $bViewLink
@@ -141,7 +143,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -236,7 +238,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sSelectMode
 	 *
 	 * @return string
@@ -255,7 +257,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -324,6 +326,7 @@ class DataTable
 		$sPagesLinks = implode('', $aPagesToDisplay);
 		$sPagesList = '['.implode(',', array_keys($aPagesToDisplay)).']';
 
+		$sAppRootUrl = utils::GetAbsoluteUrlAppRoot();
 		$sSelectionMode = ($iNbPages == 1) ? '' : 'positive';
 		$sHtml =
 <<<EOF
@@ -331,11 +334,11 @@ class DataTable
 		<div $sPagerStyle>
 		<table id="pager{$this->iListId}" class="pager"><tr>
 		<td>$sPages</td>
-		<td><img src="../images/first.png" class="first"/></td>
-		<td><img src="../images/prev.png" class="prev"/></td>
+		<td><img src="{$sAppRootUrl}images/first.png" class="first"/>AAAA</td>
+		<td><img src="{$sAppRootUrl}images/prev.png" class="prev"/></td>
 		<td><span id="index">$sPagesLinks</span></td>
-		<td><img src="../images/next.png" class="next"/></td>
-		<td><img src="../images/last.png" class="last"/></td>
+		<td><img src="{$sAppRootUrl}images/next.png" class="next"/></td>
+		<td><img src="{$sAppRootUrl}images/last.png" class="last"/></td>
 		<td>$sPageSizeCombo</td>
 		<td><span id="loading">&nbsp;</span><input type="hidden" name="selectionMode" value="$sSelectionMode"></input>
 		</td>
@@ -348,7 +351,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -375,7 +378,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -405,7 +408,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $bViewLink
 	 * @param $iDefaultPageSize
@@ -658,7 +661,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize
@@ -790,7 +793,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iDefaultPageSize
 	 * @param $iStart
 	 */
@@ -818,7 +821,7 @@ JS
 class PrintableDataTable extends DataTable
 {
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -844,7 +847,7 @@ class PrintableDataTable extends DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize

application/displayblock.class.inc.php

@@ -24,6 +24,8 @@ 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');
@@ -568,7 +570,7 @@ class DisplayBlock
 		} else {
 			// render it as an Ajax (asynchronous) call
 			$oHtml->AddCSSClass("loading");
-			$oHtml->AddHtml("<p><img src=\"../images/indicator_arrows.gif\"> ".Dict::S('UI:Loading').'</p>');
+			$oHtml->AddHtml("<p><img src=\"".utils::GetAbsoluteUrlAppRoot()."images/indicator_arrows.gif\"> ".Dict::S('UI:Loading').'</p>');
 			$oPage->add_script('
 			$.post("ajax.render.php?style='.$this->m_sStyle.'",
 			   { operation: "ajax", filter: "'.$sFilter.'", extra_params: "'.$sExtraParams.'" },
@@ -595,7 +597,7 @@ class DisplayBlock
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ApplicationException
@@ -1354,7 +1356,7 @@ JS
 }
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\iUIBlock
@@ -1378,7 +1380,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \ConfigException
@@ -1456,7 +1458,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Layout\UIContentBlock
 	 * @throws \ApplicationException
@@ -1564,7 +1566,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
@@ -1664,7 +1666,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1830,7 +1832,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,4 +1,8 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\CLIPage;
+use Combodo\iTop\Application\WebPage\Page;
+
 require_once('xlsxwriter.class.php');
 
 class ExcelExporter

application/forms.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   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
@@ -828,7 +829,7 @@ class DesignerFormField
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param string $sFormId
 	 * @param string $sRenderMode
 	 *

application/loginform.class.inc.php

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

application/logintwig.class.inc.php

@@ -9,6 +9,7 @@
 
 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,6 +26,8 @@
 
 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;
 
@@ -80,7 +82,7 @@ class LoginWebPage extends NiceWebPage
 	}
 
 	protected static $m_sLoginFailedMessage = '';
-	
+
 	public function __construct($sTitle = null)
 	{
 		if ($sTitle === null) {
@@ -95,8 +97,17 @@ class LoginWebPage extends NiceWebPage
 	
 	public function SetStyleSheet()
 	{
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/login.css');
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css');
+		$this->LinkStylesheetFromAppRoot('css/login.css');
+		$this->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css');
+	}
+
+	/**
+	 * @inheritDoc
+	 * @since 3.2.0
+	 */
+	protected function GetFaviconAbsoluteUrl()
+	{
+		return Branding::GetLoginFavIconAbsoluteUrl();
 	}
 
 	public static function SetLoginFailedMessage($sMessage)
@@ -908,13 +919,13 @@ class LoginWebPage extends NiceWebPage
 			$aAllProfiles = array();
 			while ($oProfile = $oProfilesSet->Fetch())
 			{
-				$aAllProfiles[strtolower($oProfile->GetName())] = $oProfile->GetKey();
+				$aAllProfiles[mb_strtolower($oProfile->GetName())] = $oProfile->GetKey();
 			}
 
 			$aProfiles = array();
 			foreach ($aRequestedProfiles as $sRequestedProfile)
 			{
-				$sRequestedProfile = strtolower($sRequestedProfile);
+				$sRequestedProfile = mb_strtolower($sRequestedProfile);
 				if (isset($aAllProfiles[$sRequestedProfile]))
 				{
 					$aProfiles[] = $aAllProfiles[$sRequestedProfile];

application/maintenancemsg.php

@@ -22,6 +22,7 @@
 // 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,6 +5,9 @@
  */
 
 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');
@@ -122,9 +125,7 @@ class ApplicationMenu
 	 */
 	public static function CheckMenuIdEnabled($sMenuId)
 	{
-		self::LoadAdditionalMenus();
-		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
-		if (is_null($oMenuNode) || !$oMenuNode->IsEnabled())
+		if (self::IsMenuIdEnabled($sMenuId) === false)
 		{
 			require_once(APPROOT.'/setup/setuppage.class.inc.php');
 			$oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError'));
@@ -135,6 +136,19 @@ class ApplicationMenu
 		}
 	}
 
+	/**
+	 * @param $sMenuId
+	 *
+	 * @return bool true if the menu exists and current user is allowed to see the menu
+	 * @since 3.2.0
+	 */
+	public static function IsMenuIdEnabled($sMenuId):bool
+	{
+		self::LoadAdditionalMenus();
+		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
+		return is_null($oMenuNode) === false && $oMenuNode->IsEnabled();
+	}
+
 	/**
 	 * Main function to add a menu entry into the application, can be called during the definition
 	 * of the data model objects
@@ -266,9 +280,11 @@ class ApplicationMenu
 			$oMenuNode = static::GetMenuNode($sMenuGroupIdx);
 
 			if (!($oMenuNode instanceof MenuGroup)) {
-				IssueLog::Error('Menu node was not displayed as a menu group as it is actually not a menu group', LogChannels::CONSOLE, [
+				IssueLog::Error('Menu node without parent (root menu) must be of type menu group. Parent menu is missing or not visible to user.', LogChannels::CONSOLE, [
 					'menu_node_class' => get_class($oMenuNode),
+					'menu_node_id' => $oMenuNode->GetMenuID(),
 					'menu_node_label' => $oMenuNode->GetLabel(),
+					'current_user_id' => UserRights::GetUserId(),
 				]);
 				continue;
 			}
@@ -345,7 +361,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
 	 *
@@ -419,7 +435,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

application/query.class.inc.php

@@ -21,6 +21,7 @@ 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,6 +16,7 @@
 //   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;
 
 
 /**
@@ -292,7 +293,7 @@ $("#attr_auto_reload_sec").attr('data-tooltip-content', '$sRateTitle');
 CombodoTooltip.InitTooltipFromMarkup($("#attr_auto_reload_sec"));
 $("#attr_auto_reload_sec").prop('disabled', !$('#attr_auto_reload').is(':checked'));
 
-$('#attr_auto_reload').change( function(ev) {
+$('#attr_auto_reload').on('change', function(ev) {
 	$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
 } );
 

application/template.class.inc.php

@@ -17,6 +17,9 @@
  * 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
@@ -229,12 +232,13 @@ class DisplayTemplate
 	static public function UnitTest()
 	{
 		require_once(APPROOT.'/application/startup.inc.php');
-		
+
+		$sAppRootUrl = utils::GetAbsoluteUrlAppRoot();
 		$sTemplate = '<div class="page_header">
 		<div class="actions_details"><a href="#"><span>Actions</span></a></div>
 		<h1>$class$: <span class="hilite">$name$</span></h1>
 		</div>
-		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
+		<img src="'.$sAppRootUrl.'images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
 		<itoptabs>
 			<itoptab name="Interfaces">
 				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</itopblock>
@@ -347,7 +351,8 @@ class ObjectDetailsTemplate extends DisplayTemplate
 						if ($iFlags & OPT_ATT_SLAVE)
 						{
 							$iSynchroFlags = $this->m_oObj->GetSynchroReplicaFlags($sAttCode, $aReasons);
-							$sSynchroIcon = "&nbsp;<img id=\"synchro_$iInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
+							$sAppRooturl = utils::GetAbsoluteUrlAppRoot();
+							$sSynchroIcon = "&nbsp;<img id=\"synchro_$iInputId\" src=\"{$sAppRooturl}images/transp-lock.png\" style=\"vertical-align:middle\"/>";
 							$sTip = '';
 							foreach($aReasons as $aRow)
 							{

application/themehandler.class.inc.php

@@ -536,7 +536,7 @@ CSS;
 			if (static::HasImageExtension($sImg)
 				&& ! array_key_exists($sImg, $aImages))
 			{
-				$sFilePath = realpath($sImg);
+				$sFilePath = utils::RealPath($sImg, APPROOT);
 				if ($sFilePath !== false) {
 					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
 					$aImages[$sImg] = $sFilePathWithSlashes;
@@ -544,7 +544,7 @@ CSS;
 				}
 
 				$sCanonicalPath = static::CanonicalizePath($sTargetThemeFolderPath.'/'.$sImg);
-				$sFilePath = realpath($sCanonicalPath);
+				$sFilePath = utils::RealPath($sCanonicalPath, APPROOT);
 				if ($sFilePath !== false) {
 					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
 					$aImages[$sImg] = $sFilePathWithSlashes;

application/ui.extkeywidget.class.inc.php

@@ -7,6 +7,7 @@
 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');
@@ -65,7 +66,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
@@ -132,7 +133,7 @@ class UIExtKeyWidget
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param int $iMaxComboLength
 	 * @param bool $bAllowTargetCreation
 	 * @param string $sTitle
@@ -160,8 +161,8 @@ class UIExtKeyWidget
 	public function DisplaySelect(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), &$sInputType = '')
 	{
 		$sTitle = addslashes($sTitle);
-		$oPage->add_linked_script('../js/extkeywidget.js');
-		$oPage->add_linked_script('../js/forms-json-utils.js');
+		$oPage->LinkScriptFromAppRoot('js/extkeywidget.js');
+		$oPage->LinkScriptFromAppRoot('js/forms-json-utils.js');
 
 		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_MODIFY) && $bAllowTargetCreation);
 		$bExtensions = true;
@@ -367,7 +368,7 @@ JS
 	 */
 	public function DisplayRadio(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, DBObjectset $oAllowedValues, $value, $sFieldName, $sDisplayStyle)
 	{
-		$oPage->add_linked_script('../js/forms-json-utils.js');
+		$oPage->LinkScriptFromAppRoot('js/forms-json-utils.js');
 
 		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
 		$bExtensions = true;
@@ -444,7 +445,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
@@ -476,8 +477,8 @@ JS
 			$this->bSearchMode = $bSearchMode;
 		}
 		$sTitle = addslashes($sTitle);
-		$oPage->add_linked_script('../js/extkeywidget.js');
-		$oPage->add_linked_script('../js/forms-json-utils.js');
+		$oPage->LinkScriptFromAppRoot('js/extkeywidget.js');
+		$oPage->LinkScriptFromAppRoot('js/forms-json-utils.js');
 
 		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
 		$bExtensions = true;
@@ -733,7 +734,7 @@ HTML
 				],
 		});
 		$('#fs_{$this->iId}').on('submit.uiAutocomplete', oACWidget_{$this->iId}.DoSearchObjects);
-		$('#dc_{$this->iId}').resize(oACWidget_{$this->iId}.UpdateSizes);
+		$('#dc_{$this->iId}').on('resize', oACWidget_{$this->iId}.UpdateSizes);
 JS
 		);
 	}

application/ui.htmleditorwidget.class.inc.php

@@ -15,7 +15,11 @@
 //
 //   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\CKEditorHelper;
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
+use Combodo\iTop\Application\WebPage\WebPage;
+use Combodo\iTop\Renderer\BlockRenderer;
 
 /**
  * Class UIHTMLEditorWidget
@@ -72,7 +76,7 @@ class UIHTMLEditorWidget
 		// a) edit the file /js/ckeditor/config.js
 		// b) or override some of the configuration settings, using the second parameter of ckeditor()
 		$sJSDefineWidth = '';
-		$aConfig = utils::GetCkeditorPref();
+		$aConfig = CKEditorHelper::GetCkeditorPref();
 		$sWidthSpec = addslashes(trim($this->m_oAttDef->GetWidth()));
 		if ($sWidthSpec != '') {
 			/*N°6543 - the function min allow to keep text inside the column when width is defined*/
@@ -83,10 +87,20 @@ class UIHTMLEditorWidget
 		if ($sHeightSpec != '') {
 			$aConfig['height'] = $sHeightSpec;
 		}
+		// TODO 3.2.0 Add the configuration for the editor
 		$sConfigJS = json_encode($aConfig);
 
 		WebResourcesHelper::EnableCKEditorToWebPage($oPage);
-		$oPage->add_ready_script("$('#$iId').ckeditor(function() { /* callback code */ }, $sConfigJS);"); // Transform $iId into a CKEdit
+		$oPage->add_ready_script("CombodoCKEditorHandler.CreateInstance('#$iId', $sConfigJS)");
+
+		// inject mention item renderer template
+		$oTwig = TwigHelper::GetTwigEnvironment(BlockRenderer::TWIG_BASE_PATH);
+		$sTemplate = $oTwig->render('application/object/set/option_renderer.html.twig');
+		$oPage->add(<<<HTML
+<template id="{$iId}_items_template">
+$sTemplate
+</template>
+HTML);
 
 		// Please read...
 		// ValidateCKEditField triggers a timer... calling itself indefinitely

application/ui.linksdirectwidget.class.inc.php

@@ -6,6 +6,7 @@
 
 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,6 +8,8 @@ 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,6 +24,8 @@
  * @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,6 +21,8 @@
  */
 
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys
@@ -97,7 +99,7 @@ HTML
  });
 $('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});
 $('#SearchFormToAdd_{$this->m_iInputId} form').on('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);
-$('#SearchFormToAdd_{$this->m_iInputId}').resize(oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);
+$('#SearchFormToAdd_{$this->m_iInputId}').on('resize', oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);
 JS
 );
 	}

application/uiwizard.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   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/user.dashboard.class.inc.php

@@ -35,7 +35,7 @@ class UserDashboard extends DBObject
 		(
 			"category" => "gui",
 			"key_type" => "autoincrement",
-			"name_attcode" => "user_id",
+			"name_attcode" => array('user_id', 'menu_code'),
 			"state_attcode" => "",
 			"reconc_keys" => array(),
 			"db_table" => "priv_app_dashboards",
@@ -47,6 +47,15 @@ class UserDashboard extends DBObject
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("menu_code", array("allowed_values"=>null, "sql"=>"menu_code", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("contents", array("allowed_values"=>null, "sql"=>"contents", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_SetZListItems('default_search', array (
+			0 => 'user_id',
+			1 => 'menu_code',
+		));
+		MetaModel::Init_SetZListItems('list', array (
+			0 => 'user_id',
+			1 => 'menu_code',
+		));
 	}
 
 	/**

application/utils.inc.php

@@ -20,6 +20,8 @@
 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;
@@ -165,7 +167,11 @@ class utils
 
 	private static $iNextId = 0;
 
-	private static $m_sAppRootUrl = null;
+	/**
+	 * @var ?string
+	 * @used-by GetAbsoluteUrlAppRoot
+	 */
+	private static $sAbsoluteUrlAppRootCache = null;
 
 	protected static function LoadParamFile($sParamFile)
 	{
@@ -1035,28 +1041,27 @@ class utils
 		return $bTrustProxies;
 	}
 
-    /**
-     * Returns the absolute URL to the application root path
-     *
-     * @param bool $bForceTrustProxy
-     *
-     * @return string The absolute URL to the application root, without the first slash
-     *
-     * @throws \Exception
-     *
-     * @since 2.7.4 $bForceTrustProxy param added
-     */
+	/**
+	 * Returns the absolute URL to the application root path
+	 *
+	 * @param bool $bForceTrustProxy
+	 *
+	 * @return string The absolute URL to the application root, without the first slash
+	 *
+	 * @throws \Exception
+	 *
+	 * @since 2.7.4 $bForceTrustProxy param added
+	 */
 	public static function GetAbsoluteUrlAppRoot($bForceTrustProxy = false)
 	{
-		$sUrl = static::$m_sAppRootUrl;
-		if ($sUrl === null || $bForceTrustProxy)
+		if (static::$sAbsoluteUrlAppRootCache === null || $bForceTrustProxy)
 		{
-			$sUrl = self::GetConfig()->Get('app_root_url');
-			if ($sUrl == '')
+			static::$sAbsoluteUrlAppRootCache = self::GetConfig()->Get('app_root_url');
+			if (static::$sAbsoluteUrlAppRootCache == '')
 			{
-				$sUrl = self::GetDefaultUrlAppRoot($bForceTrustProxy);
+				static::$sAbsoluteUrlAppRootCache = self::GetDefaultUrlAppRoot($bForceTrustProxy);
 			}
-			elseif (strpos($sUrl, SERVER_NAME_PLACEHOLDER) > -1)
+			elseif (strpos(static::$sAbsoluteUrlAppRootCache, SERVER_NAME_PLACEHOLDER) > -1)
 			{
 				if (isset($_SERVER['SERVER_NAME']))
 				{
@@ -1067,11 +1072,10 @@ class utils
 					// CLI mode ?
 					$sServerName = php_uname('n');
 				}
-				$sUrl = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, $sUrl);
+				static::$sAbsoluteUrlAppRootCache = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, static::$sAbsoluteUrlAppRootCache);
 			}
-			static::$m_sAppRootUrl = $sUrl;
 		}
-		return static::$m_sAppRootUrl;
+		return static::$sAbsoluteUrlAppRootCache;
 	}
 
 	/**
@@ -1453,7 +1457,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
@@ -2776,76 +2780,6 @@ SQL;
 		return static::$iNextId++;
 	}
 
-	/**
-	 * Return the CKEditor config as an array
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @since 3.0.0
-	 */
-	public static function GetCkeditorPref()
-	{
-		$sLanguage = strtolower(trim(UserRights::GetUserLanguage()));
-
-		$aDefaultConf = array(
-			'language'=> $sLanguage,
-			'contentsLanguage' => $sLanguage,
-			'extraPlugins' => 'disabler,codesnippet,mentions,objectshortcut,font,uploadimage',
-			'uploadUrl' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php',
-			'contentsCss' => array(utils::GetAbsoluteUrlAppRoot().'js/ckeditor/contents.css', utils::GetAbsoluteUrlAppRoot().'css/ckeditor/contents.css'),
-		);
-
-		// Mentions
-		$aMentionsAllowedClasses = MetaModel::GetConfig()->Get('mentions.allowed_classes');
-		if(!empty($aMentionsAllowedClasses)) {
-			$aDefaultConf['mentions'] = [];
-
-			foreach($aMentionsAllowedClasses as $sMentionMarker => $sMentionScope) {
-				// Retrieve mention class
-				// - First test if the conf is a simple Datamodel class
-				if (MetaModel::IsValidClass($sMentionScope)) {
-					$sMentionClass = $sMentionScope;
-				}
-				// - Otherwise it must be a valid OQL
-				else {
-					$oTmpSearch = DBSearch::FromOQL($sMentionScope);
-					$sMentionClass = $oTmpSearch->GetClass();
-					unset($oTmpSearch);
-				}
-
-				// Note: Endpoints are defaults only and should be overloaded by other GUIs such as the end-users portal
-				$sMentionEndpoint = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=cke_mentions&marker='.urlencode($sMentionMarker).'&needle={encodedQuery}';
-				$sMentionItemUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details&class='.$sMentionClass.'&id={id}';
-
-				$sMentionItemPictureTemplate = (empty(MetaModel::GetImageAttributeCode($sMentionClass))) ? '' : <<<HTML
-<span class="ibo-vendors-ckeditor--autocomplete-item-image" style="{picture_style}">{initials}</span>
-HTML;
-				$sMentionItemTemplate = <<<HTML
-<li class="ibo-vendors-ckeditor--autocomplete-item" data-id="{id}">{$sMentionItemPictureTemplate}<span class="ibo-vendors-ckeditor--autocomplete-item-title">{friendlyname}</span></li>
-HTML;
-				$sMentionOutputTemplate = <<<HTML
-<a href="$sMentionItemUrl" data-role="object-mention" data-object-class="{class}" data-object-id="{id}">{$sMentionMarker}{friendlyname}</a>
-HTML;
-
-				$aDefaultConf['mentions'][] = [
-					'feed' => $sMentionEndpoint,
-					'marker' => $sMentionMarker,
-					'minChars' => MetaModel::GetConfig()->Get('min_autocomplete_chars'),
-					'itemTemplate' => $sMentionItemTemplate,
-					'outputTemplate' => $sMentionOutputTemplate,
-					'throttle' => 500,
-				];
-			}
-		}
-
-		$aRichTextConfig = 	json_decode(appUserPreferences::GetPref('richtext_config', '{}'), true);
-
-
-		return array_merge($aDefaultConf, $aRichTextConfig);
-	}
-
 	/**
 	 * @param string $sInterface
 	 * @param string $sClassNameFilter
@@ -2956,7 +2890,7 @@ HTML;
 		$aResultPref = [];
 		$aShortcutPrefs = appUserPreferences::GetPref('keyboard_shortcuts', []);
 		// Note: Mind the 4 blackslashes, see utils::GetClassesForInterface()
-		$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
+		$aShortcutClasses = utils::GetClassesForInterface(iKeyboardShortcut::class, '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
 
 		foreach ($aShortcutClasses as $cShortcutPlugin) {
 			$sTriggeredElement = $cShortcutPlugin::GetShortcutTriggeredElementSelector();

application/wizardhelper.class.inc.php

@@ -24,6 +24,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/uiwizard.class.inc.php');
 
 class WizardHelper
@@ -367,7 +369,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.1');
+define('ITOP_DESIGN_LATEST_VERSION', '3.2');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.1');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.1.1');
+define('ITOP_CORE_VERSION', '3.2.0');
 
 /**
  * @var string

composer.json

@@ -4,7 +4,7 @@
   "type": "project",
   "license": "AGPL-3.0-only",
   "require": {
-    "php": ">=7.4.0 <8.2.0",
+    "php": ">=8.1.0 <8.4.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -13,40 +13,46 @@
     "ext-mysqli": "*",
     "ext-soap": "*",
     "apereo/phpcas": "~1.6.0",
-    "combodo/tcpdf": "~6.4.4",
-    "firebase/php-jwt": "~6.4.0",
+    "firebase/php-jwt": "^6.4.0",
     "guzzlehttp/guzzle": "^7.5.1",
     "laminas/laminas-mail": "^2.11",
     "laminas/laminas-servicemanager": "^3.5",
-    "league/oauth2-google": "^3.0",
-    "nikic/php-parser": "~4.14.0",
+    "league/oauth2-google": "^4.0.1",
+    "nikic/php-parser": "^4.14.0",
     "pear/archive_tar": "~1.4.14",
-    "pelago/emogrifier": "^6.0.0",
-    "scssphp/scssphp": "^1.10.3",
-    "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"
+    "pelago/emogrifier": "^7.2.0",
+    "psr/log": "^3.0.0",
+    "scssphp/scssphp": "^1.12.1",
+    "symfony/console": "~6.4.0",
+    "symfony/dotenv": "~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/twig-bundle": "~6.4.0",
+    "symfony/var-dumper": "~6.4.0",
+    "symfony/yaml": "~6.4.0",
+    "tecnickcom/tcpdf": "^6.6.0",
+    "thenetworg/oauth2-azure": "^2.0",
+    "masterminds/html5": "^2.8.0"
   },
   "require-dev": {
-    "symfony/stopwatch": "5.4.*",
-    "symfony/web-profiler-bundle": "5.4.*"
+    "symfony/debug-bundle": "~6.4.0",
+    "symfony/stopwatch": "~6.4.0",
+    "symfony/web-profiler-bundle": "~6.4.0"
   },
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
     "ext-openssl": "Can be used as a polyfill if libsodium is not installed",
     "ext-mcrypt": "Can be used as a polyfill if either libsodium and openssl are not installed (libsodium and openssl are more secure)",
+    "ext-apcu": "For better performance and stability",
+    "ext-imap": "Required by the extension \"Mail to ticket automation\"",
     "ext-ldap": "Required to use LDAP as an identity provider",
-    "ext-posix": "Not required by the core, but some extensions uses it.",
-    "ext-imap": "Required by the extension \"Mail to ticket automation\""
+    "ext-posix": "Not required by the core, but some extensions uses it."
   },
   "config": {
     "platform": {
-      "php": "7.4.0"
+      "php": "8.1.0"
     },
     "vendor-dir": "lib",
     "preferred-install": {
@@ -54,7 +60,10 @@
     },
     "sort-packages": true,
     "classmap-authoritative": true,
-    "platform-check": true
+    "platform-check": true,
+    "allow-plugins": {
+      "symfony/runtime": true
+    }
   },
   "autoload": {
     "classmap": [
@@ -72,6 +81,9 @@
       "application/logindefault.class.inc.php",
       "application/loginexternal.class.inc.php",
       "application/loginurl.class.inc.php"
+    ],
+    "files": [
+      "sources/alias.php"
     ]
   },
   "conflict": {
@@ -81,11 +93,15 @@
     "symfony": {
       "allow-contrib": false,
       "require": "3.4.*"
+    },
+    "runtime": {
+      "dotenv_path": "resources/symfony/.env"
     }
   },
   "scripts": {
-    "post-install-cmd": ["@rmDeniedTestDir"],
-    "post-update-cmd": ["@rmDeniedTestDir"],
-    "rmDeniedTestDir":  "@php .make/composer/rmDeniedTestDir.php"
+    "post-install-cmd": ["@rmUnnecessaryFolders", "@tcpdfCustomFonts"],
+    "post-update-cmd": ["@rmUnnecessaryFolders", "@tcpdfCustomFonts"],
+    "rmUnnecessaryFolders":  "@php .make/dependencies/rmUnnecessaryFolders.php --manager composer",
+    "tcpdfCustomFonts":  "@php .make/dependencies/composer/tcpdf/tcpdfUpdateFonts.php"
   }
 }

core/MyHelpers.class.inc.php

@@ -521,6 +521,6 @@ class Str
 
 	public static function islowcase($sString)
 	{
-		return (strtolower($sString) == $sString);
+		return (mb_strtolower($sString) == $sString);
 	}
 }

core/action.class.inc.php

@@ -17,6 +17,11 @@
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
+use Combodo\iTop\Service\Notification\NotificationsRepository;
+use Combodo\iTop\Service\Notification\NotificationsService;
+use Combodo\iTop\Service\Router\Router;
 
 /**
  * Persistent classes (internal): user defined actions
@@ -76,6 +81,7 @@ abstract class Action extends cmdbAbstractObject
 
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list",
 			array("linked_class" => "lnkTriggerAction", "ext_key_to_me" => "action_id", "ext_key_to_remote" => "trigger_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array(), "display_style" => 'property')));
+		MetaModel::Init_AddAttribute(new AttributeEnum("asynchronous", array("allowed_values" => new ValueSetEnum(['use_global_setting' => 'Use global settings','yes' => 'Yes' ,'no' => 'No']), "sql" => "asynchronous", "default_value" => 'use_global_setting', "is_null_allowed" => false, "depends_on" => array())));
 
 		// Display lists
 		// - Attributes to be displayed for the complete details
@@ -167,6 +173,100 @@ abstract class Action extends cmdbAbstractObject
 			$this->m_aCheckWarnings[] = Dict::S('Action:WarningNoTriggerLinked');
 		}
 	}
+
+	/**
+	 * @since 3.2.0 N°5472 method creation
+	 */
+	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		parent::DisplayBareRelations($oPage, false);
+
+		if ($oPage instanceof iTopWebPage) {
+			$this->GenerateLastExecutionsTab($oPage, $bEditMode);
+		}
+	}
+
+	/**
+	 * @since 3.2.0 N°5472 method creation
+	 */
+	protected function GenerateLastExecutionsTab(iTopWebPage $oPage, $bEditMode)
+	{
+		$oRouter = Router::GetInstance();
+		$sActionLastExecutionsPageUrl = $oRouter->GenerateUrl('notifications.action.last_executions_tab', ['action_id' => $this->GetKey()]);
+		$oPage->AddAjaxTab('action_errors', $sActionLastExecutionsPageUrl, false, Dict::S('Action:last_executions_tab'));
+	}
+
+	/**
+	 * @param \Combodo\iTop\Application\WebPage\WebPage $oPage
+	 *
+	 * @throws \ApplicationException
+	 * @throws \ArchivedObjectException
+	 * @throws \ConfigException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \InvalidConfigParamException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 * @throws \ReflectionException
+	 * @since 3.2.0 N°5472 method creation
+	 */
+	public function GetLastExecutionsTabContent(WebPage $oPage): void
+	{
+		$oConfig = utils::GetConfig();
+		$sLastExecutionDaysConfigParamName = 'notifications.last_executions_days';
+		$iLastExecutionDays = $oConfig->Get($sLastExecutionDaysConfigParamName);
+
+		if ($iLastExecutionDays < 0) {
+			throw new InvalidConfigParamException("Invalid value for {$sLastExecutionDaysConfigParamName} config parameter. Param desc: " . $oConfig->GetDescription($sLastExecutionDaysConfigParamName));
+		}
+
+		$sActionQueryOql = 'SELECT EventNotification WHERE action_id = :action_id';
+		$aActionQueryParams = ['action_id' => $this->GetKey()];
+		if ($iLastExecutionDays > 0) {
+			$sActionQueryOql .= ' AND date > DATE_SUB(NOW(), INTERVAL :days DAY)';
+			$aActionQueryParams['days'] = $iLastExecutionDays;
+			$sActionQueryLimit = Dict::Format('Action:last_executions_tab_limit_days', $iLastExecutionDays);
+		} else {
+			$sActionQueryLimit = Dict::S('Action:last_executions_tab_limit_none');
+		}
+
+		$oActionFilter = DBObjectSearch::FromOQL($sActionQueryOql, $aActionQueryParams);
+		$oSet = new DBObjectSet($oActionFilter, ['date' => false]);
+
+		$sPanelTitle = Dict::Format('Action:last_executions_tab_panel_title', $sActionQueryLimit);
+		$oExecutionsListBlock = DataTableUIBlockFactory::MakeForResult($oPage, 'action_executions_list', $oSet, ['panel_title' => $sPanelTitle]);
+
+		$oPage->AddUiBlock($oExecutionsListBlock);
+	}
+
+	/**
+	 * Will be overloaded by the children classes to return the value of their global asynchronous setting (eg. `email_asynchronous` for `\ActionEmail`, `prefer_asynchronous` for `\ActionWebhook`, ...)
+	 *
+	 * @return bool true if the global setting for this kind of action if to be executed asynchronously, false otherwise.
+	 * @since 3.2.0
+	 */
+	public static function GetAsynchronousGlobalSetting(): bool
+	{
+		return false;	
+	}
+
+	/**
+	 * @return bool true if that action instance should be executed asynchronously, otherwise false
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @since 3.2.0
+	 */
+	public function IsAsynchronous(): bool
+	{
+		$sAsynchronous = $this->Get('asynchronous');
+		if ($sAsynchronous === 'use_global_setting') {
+			return static::GetAsynchronousGlobalSetting();
+		}
+		return $sAsynchronous === 'yes';
+	}
 }
 
 /**
@@ -201,12 +301,39 @@ 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];
+	}
 }
 
 /**
@@ -257,6 +384,7 @@ class ActionEmail extends ActionNotification
 			"db_table"            => "priv_action_email",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
+			'style' =>  new ormStyle(null, null, null, null, null, '../images/icons/icons8-mailing.svg'),
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -273,7 +401,6 @@ 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())));
 		
@@ -294,6 +421,7 @@ class ActionEmail extends ActionNotification
 				),
 				'fieldset:ActionEmail:trigger' => array(
 					0 => 'trigger_list',
+					1 => 'asynchronous'
 				),
 			),
 			'col:col2' => array(
@@ -328,27 +456,33 @@ class ActionEmail extends ActionNotification
 	protected $m_aMailErrors; //array of strings explaining the issue
 
 	/**
-	 * Return a the list of emails as a string, or a detailed error description
+	 * Return the list of emails as a string, or a detailed error description
 	 *
 	 * @param string $sRecipAttCode
 	 * @param array $aArgs
 	 *
 	 * @return string
 	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
+	 * @throws \CoreWarning
+	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 */
 	protected function FindRecipients($sRecipAttCode, $aArgs)
 	{
+		$oTrigger = $aArgs['trigger->object()'] ?? null;
 		$sOQL = $this->Get($sRecipAttCode);
-		if (strlen($sOQL) === 0) return '';
+		if (utils::IsNullOrEmptyString($sOQL)) return '';
 
 		try
 		{
 			$oSearch = DBObjectSearch::FromOQL($sOQL);
 			if ($this->Get('ignore_notify') === 'no') {
-				// In theory it is possible to notify *any* kind of object, 
+				// In theory, it is possible to notify *any* kind of object,
 				// as long as there is an email attribute in the class
 				// So let's not assume that the selected class is a Person
 				$sFirstSelectedClass = $oSearch->GetClass();
@@ -381,16 +515,29 @@ class ActionEmail extends ActionNotification
 			return "The objects of the class '$sClass' do not have any email attribute";
 		}
 
+		if($oTrigger !== null && in_array('Contact', MetaModel::EnumParentClasses($sClass, ENUM_CHILD_CLASSES_ALL), true)) {
+			$aArgs['trigger_id'] = $oTrigger->GetKey();
+			$aArgs['action_id'] = $this->GetKey();
+
+			$sSubscribedContactsOQL = NotificationsRepository::GetInstance()->GetSearchOQLContactUnsubscribedByTriggerAndAction();
+			$sSubscribedContactsOQL->ApplyParameters($aArgs);
+			$sAlias = $oSearch->GetClassAlias();
+			$oSearch->AddConditionExpression(Expression::FromOQL("`$sAlias`.id NOT IN ($sSubscribedContactsOQL)"));
+		}
+
 		$oSet = new DBObjectSet($oSearch, array() /* order */, $aArgs);
 		$aRecipients = array();
 		while ($oObj = $oSet->Fetch())
 		{
 			$sAddress = trim($oObj->Get($sEmailAttCode));
-			if (strlen($sAddress) > 0)
+			if (utils::IsNotNullOrEmptyString($sAddress))
 			{
 				$aRecipients[] = $sAddress;
 				$this->m_iRecipients++;
 			}
+			if ($oTrigger !== null && in_array('Contact', MetaModel::EnumParentClasses($sClass, ENUM_CHILD_CLASSES_ALL), true)) {
+				NotificationsService::GetInstance()->RegisterSubscription($oTrigger, $this, $oObj);
+			}
 		}
 		return implode(', ', $aRecipients);
 	}
@@ -510,7 +657,7 @@ class ActionEmail extends ActionNotification
 			else
 			{
 				$aErrors = [];
-				$iRes = $oEmail->Send($aErrors, false, $oLog); // allow asynchronous mode
+				$iRes = $oEmail->Send($aErrors, $this->IsAsynchronous() ? Email::ENUM_SEND_FORCE_ASYNCHRONOUS : Email::ENUM_SEND_FORCE_SYNCHRONOUS, $oLog);
 				switch ($iRes)
 				{
 					case EMAIL_SEND_OK:
@@ -539,8 +686,17 @@ class ActionEmail extends ActionNotification
 	 * @param \EventNotification $oLog
 	 *
 	 * @return array
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
 	 * @throws \CoreException
-	 * @throws \Exception
+	 * @throws \CoreUnexpectedValue
+	 * @throws \CoreWarning
+	 * @throws \DictExceptionMissingString
+	 * @throws \DictExceptionUnknownLanguage
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 * @since 3.1.0 N°918
 	 */
 	protected function PrepareMessageContent($aContextArgs, &$oLog): array
@@ -561,15 +717,7 @@ class ActionEmail extends ActionNotification
 			'attachments' => [],
 		];
 		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		$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'));
-		}
+		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
 
 		try
 		{
@@ -601,9 +749,7 @@ class ActionEmail extends ActionNotification
 		}
 		finally {
 			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-			Dict::SetUserLanguage($sPreviousLanguage);
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $aPreviousPluginProperties['language_code'] ?? null);
+			$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
 		}
 		
 		if (!is_null($oLog)) {
@@ -658,10 +804,11 @@ class ActionEmail extends ActionNotification
 		if (isset($aContextArgs['attachments']))
 		{
 			$aAttachmentReport = array();
+			/** @var \ormDocument $oDocument */
 			foreach($aContextArgs['attachments'] as $oDocument)
 			{
 				$aMessageContent['attachments'][] = ['data' => $oDocument->GetData(), 'filename' => $oDocument->GetFileName(), 'mime_type' => $oDocument->GetMimeType()];
-				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData()));
+				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData() ?? ''));
 			}
 			$oLog->Set('attachments', $aAttachmentReport);
 		}
@@ -771,4 +918,13 @@ class ActionEmail extends ActionNotification
 			}
 		}
 	}
+
+	/**
+	 * @inheritDoc
+	 * @since 3.2.0
+	 */
+	public static function GetAsynchronousGlobalSetting(): bool
+	{
+		return utils::GetConfig()->Get('email_asynchronous');
+	}
 }

core/apc-emulation.php

@@ -98,6 +98,31 @@ function apc_delete($key)
 	return $bRet1 || $bRet2;
 }
 
+/**
+ * Checks if APCu emulation key exists
+ *
+ * @param string|string[] $keys A string, or an array of strings, that contain keys.
+ *
+ * @return bool|string[] Returns TRUE if the key exists, otherwise FALSE
+ * Or if an array was passed to keys, then an array is returned that
+ * contains all existing keys, or an empty array if none exist.
+ * @since 3.2.0 N°7068
+ */
+function apc_exists($keys)
+{
+	if (is_array($keys)) {
+		$aExistingKeys = [];
+		foreach ($keys as $sKey) {
+			if (apcFile::ExistsOneFile($sKey)) {
+				$aExistingKeys[] = $sKey;
+			}
+		}
+		return $aExistingKeys;
+	} else {
+		return apcFile::ExistsOneFile($keys);
+	}
+}
+
 class apcFile
 {
 	// Check only once per request
@@ -184,6 +209,16 @@ class apcFile
 		return true;
 	}
 
+	/**
+	 * Check if cache key exists
+	 * @param $sKey
+	 * @return bool
+	 * @since 3.2.0 N°7068
+	 */
+	static public function ExistsOneFile($sKey) {
+		return is_file(self::GetCacheFileName('-' . $sKey)) || is_file(self::GetCacheFileName($sKey));
+	}
+
 	/** Get one cache entry content.
 	 * @param $sKey
 	 * @return bool|mixed

core/asynctask.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   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\Service\Notification\Event\EventiTopNotificationService;
 
 
 /**
@@ -457,3 +458,87 @@ class AsyncSendEmail extends AsyncTask
 		return '';
 	}
 }
+
+/**
+ * An async notification to be sent to iTop users
+ * @since 3.2.0
+ */
+class AsyncSendiTopNotifications extends AsyncTask {
+
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "created",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_async_send_itop_notifications",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeText("recipients", array("allowed_values"=>null, "sql"=>"recipients", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "allowed_values"=>null, "sql"=>"action_id", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "allowed_values"=>null, "sql"=>"trigger_id", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("title", array("allowed_values"=>null, "sql"=>"title", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values"=>null, "sql"=>"object_id", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("object_class", array("allowed_values"=>null, "sql"=>"object_class", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("url", array("allowed_values"=>null, "sql"=>"url", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+
+	}
+
+	/**
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \CoreWarning
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public static function AddToQueue(int $iActionId, int $iTriggerId, array $aRecipients, string $sMessage, string $sTitle, string $sUrl, int $iObjectId, ?string $sObjectClass): void
+	{
+		$oNew = new static();
+		$oNew->Set('action_id', $iActionId);
+		$oNew->Set('trigger_id', $iTriggerId);
+		$oNew->Set('recipients', json_encode($aRecipients));
+		$oNew->Set('message', $sMessage);
+		$oNew->Set('title', $sTitle);
+		$oNew->Set('url', $sUrl);
+		$oNew->Set('object_id', $iObjectId);
+		$oNew->Set('object_class', $sObjectClass);
+		$oNew->SetCurrentDate('date');
+		
+		$oNew->DBInsert();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function DoProcess()
+	{
+		$oAction = MetaModel::GetObject('Action', $this->Get('action_id'));
+		$iTriggerId = $this->Get('trigger_id');
+		$aRecipients = json_decode($this->Get('recipients'));
+		$sMessage = $this->Get('message');
+		$sTitle = $this->Get('title');
+		$sUrl = $this->Get('url');
+		$iObjectId = $this->Get('object_id');
+		$sObjectClass = $this->Get('object_class');
+		$sDate = $this->Get('date');
+		
+		foreach ($aRecipients as $iRecipientId)
+		{
+			$oEvent = EventiTopNotificationService::MakeEventFromAction($oAction, $iRecipientId, $iTriggerId, $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass, $sDate);
+			$oEvent->DBInsertNoReload();
+		}
+		
+		return "Sent";
+	}
+}

core/attributedef.class.inc.php

@@ -6,6 +6,7 @@
 
 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;
@@ -72,6 +73,11 @@ define('DEL_SILENT', 2);
  */
 define('DEL_MOVEUP', 3);
 
+/**
+ * Do nothing at least automatically
+ */
+define('DEL_NONE', 4);
+
 
 /**
  * For Link sets: tracking_level
@@ -3195,9 +3201,19 @@ class AttributeDecimal extends AttributeDBField
 	{
 		$iNbDigits = $this->Get('digits');
 		$iPrecision = $this->Get('decimals');
-		$iNbIntegerDigits = $iNbDigits - $iPrecision - 1; // -1 because the first digit is treated separately in the pattern below
+		$iNbIntegerDigits = $iNbDigits - $iPrecision;
 
-		return "^[\-\+]?[0-9]\d{0,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
+		return "^[\-\+]?\d{1,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
+	}
+
+	/**
+	 * @inheritDoc
+	 * @since 3.2.0
+	 */
+	public function CheckFormat($value)
+	{
+		$sRegExp = $this->GetValidationPattern();
+		return preg_match("/$sRegExp/", $value);
 	}
 
 	public function GetBasicFilterOperators()
@@ -3292,7 +3308,7 @@ class AttributeDecimal extends AttributeDBField
 
 		if (!is_null($value) && ($value !== ''))
 		{
-			$value = sprintf("%01.".$this->Get('decimals')."F", $value);
+			$value = sprintf("%1.".$this->Get('decimals')."F", $value);
 		}
 		return $value; // null or string
 	}
@@ -3509,7 +3525,7 @@ class AttributeBoolean extends AttributeInteger
 		$sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null,
 		$sAttributeQualifier = null
 	) {
-		$sInput = strtolower(trim($sProposedValue));
+		$sInput = mb_strtolower(trim($sProposedValue));
 		if ($bLocalizedValue)
 		{
 			switch ($sInput)
@@ -6513,37 +6529,46 @@ class AttributeDateTime extends AttributeDBField
 		}
 	}
 
-    /**
-     * @inheritDoc
-     *
-     * @param int|string $proposedValue timestamp ({@see DateTime::getTimestamp()) or date as string, following the {@see GetInternalFormat} format.
-     */
+	/**
+	 * @inheritDoc
+	 *
+	 * @param int|DateTime|string $proposedValue possible values :
+	 *                      - timestamp ({@see DateTime::getTimestamp())
+	 *                      - {@see \DateTime} PHP object
+	 *                      - string, following the {@see GetInternalFormat} format.
+	 *
+	 * @throws \CoreUnexpectedValue if invalid value type or the string passed cannot be converted
+	 */
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (is_null($proposedValue))
 		{
 			return null;
 		}
-		if (is_string($proposedValue) && ($proposedValue == "") && $this->IsNullAllowed())
-		{
-			return null;
+
+		if (is_numeric($proposedValue)) {
+			return date(static::GetInternalFormat(), $proposedValue);
 		}
-		if (!is_numeric($proposedValue))
-		{
-			// Check the format
-			try
-			{
-				$oFormat = new DateTimeFormat($this->GetInternalFormat());
+
+		if (is_object($proposedValue) && ($proposedValue instanceof DateTime)) {
+			return $proposedValue->format(static::GetInternalFormat());
+		}
+
+		if (is_string($proposedValue)) {
+			if (($proposedValue === '') && $this->IsNullAllowed()) {
+				return null;
+			}
+			try {
+				$oFormat = new DateTimeFormat(static::GetInternalFormat());
 				$oFormat->Parse($proposedValue);
-			} catch (Exception $e)
-			{
-				throw new Exception('Wrong format for date attribute '.$this->GetCode().', expecting "'.$this->GetInternalFormat().'" and got "'.$proposedValue.'"');
+			} catch (Exception $e) {
+				throw new CoreUnexpectedValue('Wrong format for date attribute '.$this->GetCode().', expecting "'.$this->GetInternalFormat().'" and got "'.$proposedValue.'"');
 			}
 
 			return $proposedValue;
 		}
 
-		return date(static::GetInternalFormat(), $proposedValue);
+		throw new CoreUnexpectedValue('Wrong format for date attribute '.$this->GetCode());
 	}
 
 	public function ScalarToSQL($value)
@@ -8661,6 +8686,20 @@ class AttributeImage extends AttributeBlob
 		parent::__construct($sCode, $aParams);
 	}
 
+	public function Get($sParamName)
+	{
+		$oParamValue = parent::Get($sParamName);
+
+		if ($sParamName === 'default_image') {
+			/** @noinspection NestedPositiveIfStatementsInspection */
+			if (!empty($oParamValue)) {
+				return utils::GetAbsoluteUrlModulesRoot() . $oParamValue;
+			}
+		}
+
+		return $oParamValue;
+	}
+
 	public function GetEditClass()
 	{
 		return "Image";
@@ -13004,7 +13043,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,6 +25,7 @@ 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,6 +6,9 @@
 
 // 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
 
 
@@ -276,21 +279,12 @@ class CellStatus_NullIssue extends CellStatus_Issue
  */
 class ReportValue
 {
-	protected DBObject $oObject;
-	protected string $sAttCode;
-	protected bool $bOriginal;
-
 	/**
 	 * @param DBObject $oObject
 	 * @param string $sAttCode
 	 * @param bool $bOriginal
 	 */
-	public function __construct(DBObject $oObject, string $sAttCode, bool $bOriginal)
-	{
-		$this->oObject = $oObject;
-		$this->sAttCode = $sAttCode;
-		$this->bOriginal = $bOriginal;
-	}
+	public function __construct(protected DBObject $oObject, protected string $sAttCode, protected  bool $bOriginal){}
 
 	public function GetAsHTML(bool $bLocalizedValues)
 	{
@@ -1493,7 +1487,7 @@ EOF
 					<<<EOF
 	function OnTruncatedHistoryToggle(bShowAll)
 	{
-		$('#csv_history_reload').html('<img src="../images/indicator.gif"/>');
+		$('#csv_history_reload').html('<img src="' + GetAbsoluteUrlAppRoot() + 'images/indicator.gif"/>');
 		$.get(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?{$sAppContext}', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
 			{
 				$('#$sAjaxDivId').html(data);

core/bulkexport.class.inc.php

@@ -17,6 +17,9 @@
  * 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
@@ -391,7 +394,7 @@ abstract class BulkExport
 
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/config.class.inc.php

@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.1.1-dev');
+define('ITOP_VERSION', '3.2.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -447,14 +447,14 @@ class Config
 			'show_in_conf_sample' => true,
 		],
 		'export_pdf_font' => [ // @since 2.7.0 PR #49 / N°1947
-			'type' => 'string',
-			'description' => 'Font used when generating a PDF file',
-			'default' => 'DejaVuSans', // DejaVuSans is a UTF-8 Unicode font, embedded in the TCPPDF lib we're using
-			// Standard PDF fonts like helvetica or times newroman are NOT Unicode
-			// A new DroidSansFallback can be used to improve CJK support (se PR #49)
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
+		                       'type'                => 'string',
+		                       'description'         => 'Font used when generating a PDF file',
+		                       'default'             => 'DejaVuSans', // DejaVuSans is a UTF-8 Unicode font, embedded in the TCPPDF lib we're using
+		                       // Standard PDF fonts like helvetica or times newroman are NOT Unicode
+		                       // A new DroidSansFallback can be used to improve CJK support (se PR #49)
+		                       'value'               => '',
+		                       'source_of_value'     => '',
+		                       'show_in_conf_sample' => false,
 		],
 		'access_mode' => [
 			'type' => 'integer',
@@ -889,6 +889,14 @@ 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$',
@@ -1111,6 +1119,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'purge_data.max_chunk_size' => [
+			'type' => 'integer',
+			'description' => 'Maximum number of items deleted per loop. Used in function MetaModel::PurgeData',
+			'default' => 1000,
+			'value' => 1000,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'max_history_length' => [
 			'type' => 'integer',
 			'description' => 'Maximum length of the history table (in the "History" tab on each object) before it gets truncated. Latest modifications are displayed first.',
@@ -1316,9 +1332,9 @@ class Config
 		'draft_attachments_lifetime' => [
 			'type'                => 'integer',
 			'description'         => 'Lifetime (in seconds) of drafts\' attachments and inline images: after this duration, the garbage collector will delete them.',
-			'default' => 86400,
-			'value' => '',
-			'source_of_value' => '',
+			'default'             => 86400,
+			'value'               => '',
+			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
 		'date_and_time_format' => [
@@ -1595,6 +1611,38 @@ 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.send_asynchronously' => [
+			'type' => 'bool',
+			'description' => 'If true then iTop notifications will be sent asynchronously',
+			'default' => false,
+			'value' => false,
+			'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,
+		],
+		'notifications.last_executions_days' => [
+			'type' => 'integer',
+			'description' => 'Number of days to display in the Action\'s last executions tab (0 means no limit)',
+			'default' => 30 + 31, // 2 months
+			'value' => 61,
+			'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.',
@@ -1715,6 +1763,14 @@ 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)
@@ -1842,6 +1898,7 @@ class Config
 	 * @var integer Number of seconds between two reloads of the display (standard)
 	 */
 	protected $m_iStandardReloadInterval;
+
 	/**
 	 * @var integer Number of seconds between two reloads of the display (fast)
 	 */
@@ -1894,6 +1951,15 @@ 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.
 	 *
@@ -1938,6 +2004,7 @@ 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();
@@ -2098,6 +2165,7 @@ 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()
@@ -2233,6 +2301,11 @@ class Config
 		return $this->m_sEncryptionKey;
 	}
 
+	public function GetAppSecret()
+	{
+		return $this->m_sAppSecret;
+	}
+
 	public function GetEncryptionLibrary()
 	{
 		return $this->m_sEncryptionLibrary;
@@ -2349,6 +2422,12 @@ class Config
 		$this->m_sEncryptionKey = $sKey;
 	}
 
+	public function SetAppSecret($sKey)
+	{
+		$this->m_sAppSecret = $sKey;
+	}
+
+
 	public function SetCSVImportCharsets($aCharsets)
 	{
 		$this->m_aCharsets = $aCharsets;
@@ -2400,6 +2479,7 @@ 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)
 		{
@@ -2490,9 +2570,9 @@ class Config
 
 			// Old fashioned integer settings
 			$aIntValues = array(
-				'fast_reload_interval' => $this->m_iFastReloadInterval,
-				'max_display_limit' => $this->m_iMaxDisplayLimit,
-				'min_display_limit' => $this->m_iMinDisplayLimit,
+				'fast_reload_interval'     => $this->m_iFastReloadInterval,
+				'max_display_limit'        => $this->m_iMaxDisplayLimit,
+				'min_display_limit'        => $this->m_iMinDisplayLimit,
 				'standard_reload_interval' => $this->m_iStandardReloadInterval,
 			);
 			foreach ($aIntValues as $sKey => $iValue)
@@ -2512,7 +2592,8 @@ class Config
 				'encryption_key' => $this->m_sEncryptionKey,
 				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,
-				'password_hash_algo' => $this->m_iPasswordHashAlgo
+				'password_hash_algo' => $this->m_iPasswordHashAlgo,
+				'application.secret' => $this->m_sAppSecret,
 			);
 			foreach ($aOtherValues as $sKey => $value)
 			{

core/csvbulkexport.class.inc.php

@@ -8,11 +8,13 @@ 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\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\Select\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
@@ -101,7 +103,7 @@ class CSVBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/datamodel.core.xml

@@ -1,5 +1,444 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+  <classes>
+    <class id="lnkActionNotificationToContact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>core/cmdb,application</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_lnk_action_notif_to_contact</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="action_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </naming>
+        <uniqueness_rules>
+          <rule>
+            <attributes>
+              <attribute id="action_id"/>
+              <attribute id="contact_id"/>
+              <attribute id="trigger_id"/>
+            </attributes>
+            <filter/>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
+      </properties>
+      <fields>
+        <field id="action_id" xsi:type="AttributeExternalKey">
+          <sql>action_id</sql>
+          <target_class>ActionNotification</target_class>
+          <default_value/>
+          <is_null_allowed>false</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>
+        <field id="trigger_id" xsi:type="AttributeExternalKey">
+          <sql>trigger_id</sql>
+          <target_class>Trigger</target_class>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="subscribed" xsi:type="AttributeBoolean">
+          <sql>subscribed</sql>
+          <default_value>true</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="col:col1">
+              <items>
+                <item id="fieldset:lnkActionNotificationToContact:content">
+                  <items>
+                    <item id="action_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="contact_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="title">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <list>
+          <items>
+            <item id="action_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+            <item id="title">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <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="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-notification.svg</icon>
+        </style>
+      </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 />
+        </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>
+                <item id="fieldset:ActioniTopNotification:trigger">
+                  <items>
+                    <item id="trigger_list">
+                      <rank>10</rank>
+                    </item>
+                    <item id="asynchronous">
+                      <rank>20</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, array(), $aContextArgs);
+		$bIsAsync = $this->IsAsynchronous();
+		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
+		
+		if($bIsAsync === true){
+		$aRecipients = [];
+		}
+		
+		$sMessage = MetaModel::ApplyParams($this->Get('message'), $aContextArgs);
+		$sTitle = MetaModel::ApplyParams($this->Get('title'), $aContextArgs);
+		$sUrl = MetaModel::ApplyParams($this->Get('url'), $aContextArgs);
+    $iObjectId = 0;
+    $sObjectClass = null;
+		if (array_key_exists('this->object()', $aContextArgs)) {
+				$iObjectId = $aContextArgs['this->object()']->GetKey();
+				$sObjectClass = get_class($aContextArgs['this->object()']);
+    }
+    
+		while ($oRecipient = $oRecipientsSet->Fetch()) {
+		  // Skip recipients that have no users
+		  if (get_class($oRecipient) === Person::class && UserRights::GetUserFromPerson($oRecipient) === null) {
+				continue;
+			}
+		  if (!\Combodo\iTop\Service\Notification\NotificationsService::GetInstance()->IsSubscribed($oTrigger, $this, $oRecipient)) {
+				continue;
+			}
+			
+      if($bIsAsync === true) {
+        $aRecipients[] = $oRecipient->GetKey();      
+      } else { 
+        $oEvent = Combodo\iTop\Service\Notification\Event\EventiTopNotificationService::MakeEventFromAction($this, $oRecipient->GetKey(), $oTrigger->GetKey(), $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
+        $oEvent->DBInsertNoReload();
+      }
+
+			\Combodo\iTop\Service\Notification\NotificationsService::GetInstance()->RegisterSubscription($oTrigger, $this, $oRecipient);
+		}
+		if ($bIsAsync === true) {
+		    AsyncSendiTopNotifications::AddToQueue($this->GetKey(), $oTrigger->GetKey(), $aRecipients, $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
+    }
+		$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
+	}
+]]></code>
+        </method>
+        <method id="GetAsynchronousGlobalSetting">
+          <comment></comment>
+          <static>true</static>
+          <access>public</access>
+          <code><![CDATA[
+	public static function GetAsynchronousGlobalSetting(): bool
+	{
+		return utils::GetConfig()->Get('notifications.itop.send_asynchronously');
+	}
+]]></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 />
+        </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>
+        <details>
+          <items>
+            <item id="date">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="message">
+              <rank>30</rank>
+            </item>
+            <item id="contact_id">
+              <rank>40</rank>
+            </item>
+            <item id="trigger_id">
+              <rank>50</rank>
+            </item>
+            <item id="action_id">
+              <rank>60</rank>
+            </item>
+            <item id="read">
+              <rank>70</rank>
+            </item>
+            <item id="url">
+              <rank>80</rank>
+            </item>
+          </items>
+        </details>
+        <summary>
+        <items>
+          <item id="date">
+            <rank>10</rank>
+          </item>
+          <item id="message">
+            <rank>20</rank>
+          </item>
+        </items>
+        </summary>
+      </presentation>
+      <methods/>
+    </class>
+  </classes>
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -282,8 +721,50 @@
           <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>

core/dbobject.class.php

@@ -4,12 +4,14 @@
  * @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;
 
 /**
@@ -2356,10 +2358,10 @@ abstract class DBObject implements iDisplay
 			$oUniquenessQuery->AddConditionForInOperatorUsingParam('finalclass', $aChildClassesWithRuleDisabled, false);
 		}
 
-        $oUniquenessQuery->AllowAllData();
+		$oUniquenessQuery->AllowAllData();
 
-        return $oUniquenessQuery;
-    }
+		return $oUniquenessQuery;
+	}
 
 	/**
 	 * @param string $sAttCode
@@ -4743,7 +4745,7 @@ abstract class DBObject implements iDisplay
 			}
 		}
 		$oDate->modify($sModifier);
-		$this->Set($sAttCode, $oDate->getTimestamp());
+		$this->Set($sAttCode, $oDate);
 	}
 
 	/**
@@ -5360,16 +5362,19 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
 	 */
-	protected function GetReferencingObjects($bAllowAllData = false)
+	protected function GetReferencingObjectsForDeletion($bAllowAllData = false)
 	{
 		$aDependentObjects = array();
 		$aRererencingMe = MetaModel::EnumReferencingClasses(get_class($this));
 		foreach($aRererencingMe as $sRemoteClass => $aExtKeys)
 		{
+			/** @var \AttributeExternalKey $oExtKeyAttDef */
 			foreach($aExtKeys as $sExtKeyAttCode => $oExtKeyAttDef)
 			{
+				// skip if external key doesn't require the deletion cascading
+				if($oExtKeyAttDef->GetDeletionPropagationOption() === DEL_NONE) continue;
+
 				// skip if this external key is behind an external field
-				/** @var \AttributeDefinition $oExtKeyAttDef */
 				if (!$oExtKeyAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) continue;
 
 				$oSearch = new DBObjectSearch($sRemoteClass);
@@ -5433,13 +5438,11 @@ abstract class DBObject implements iDisplay
 		$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:
 		// www.php.net/manual/fr/function.set-time-limit.php#72305
 		$iPreviousTimeLimit = ini_get('max_execution_time');
 
-		foreach ($aDependentObjects as $aPotentialDeletes)
+		foreach ($this->GetReferencingObjectsForDeletion(true /* allow all data */) as $aPotentialDeletes)
 		{
 			foreach ($aPotentialDeletes as $aData)
 			{

core/designdocument.class.inc.php

@@ -74,10 +74,12 @@ class DesignDocument extends DOMDocument
 	/**
 	 * Overload of the standard API
 	 *
-	 * @param $filename
+	 * @param string $filename
 	 * @param int $options
+	 *
+	 * @return bool
 	 */
-	public function load($filename, $options = null)
+	public function load(string $filename, int $options = 0): bool
 	{
 		if (is_file($filename)) {
 			libxml_clear_errors();
@@ -86,6 +88,8 @@ class DesignDocument extends DOMDocument
 				IssueLog::Error("Error loading $filename", LogAPI::CHANNEL_DEFAULT, $aErrors);
 			}
 		}
+
+		return true;
 	}
 
 	/**

core/displayablegraph.class.inc.php

@@ -21,6 +21,9 @@ 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;
 
 /**
@@ -34,6 +37,7 @@ class DisplayableNode extends GraphNode
 {
 	public $x;
 	public $y;
+	public bool $bFiltered;
 
 	/**
 	 * Create a new node inside a graph
@@ -1580,7 +1584,7 @@ EOF
 	 * @param string $sContextKey
 	 * @param array $aContextParams
 	 * @param array $aExcludedObjects
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param bool $bLazyLoading
 	 *
@@ -1602,7 +1606,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param bool $bLazyLoading
 	 *

core/email.class.inc.php

@@ -46,6 +46,15 @@ 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,4 +1,7 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\WebPage;
+
 /**
  * Copyright (C) 2013-2023 Combodo SARL
  *

core/excelbulkexport.class.inc.php

@@ -11,6 +11,8 @@ 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');
 
@@ -69,7 +71,7 @@ class ExcelBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/htmlbulkexport.class.inc.php

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

core/htmlsanitizer.class.inc.php

@@ -15,6 +15,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 Masterminds\HTML5;
+
 /**
  * Base class for all possible implementations of HTML Sanitization
  */
@@ -287,7 +289,7 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		'u' => array(),
 		'em' => array(),
 		'strong' => array(),
-		'img' => array('src', 'style', 'alt', 'title'),
+		'img' => array('src', 'style', 'alt', 'title', 'width', 'height'),
 		'ul' => array('style'),
 		'ol' => array('reversed', 'start', 'style', 'type'),
 		'li' => array('style', 'value'),
@@ -321,6 +323,8 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		'hr' => array('style'),
 		'pre' => array(),
 		'center' => array(),
+		'figure' => array('class'), // Ckeditor 5 puts images in figures
+		'mark' => array('class')
 	);
 
 	protected static $aAttrsWhiteList = array(
@@ -332,6 +336,7 @@ class HTMLDOMSanitizer extends DOMSanitizer
 	 * @see https://www.itophub.io/wiki/page?id=2_6_0%3Aadmin%3Arich_text_limitations
 	 */
 	protected static $aStylesWhiteList = array(
+		'aspect-ratio',
 		'background-color',
 		'border',
 		'border-collapse',

core/inlineimage.class.inc.php

@@ -536,6 +536,11 @@ JS
 
 		$sAbsoluteUrlAppRoot = utils::GetAbsoluteUrlAppRoot();
 		$sToggleFullScreen = utils::EscapeHtml(Dict::S('UI:ToggleFullScreen'));
+		return <<<JS
+		$('.htmlEditor').each(function() {
+			CombodoCKEditorHandler.EnableImageUpload('#' + $(this).attr('id'), '$sAbsoluteUrlAppRoot'+'pages/ajax.render.php?operation=cke_img_upload&temp_id=$sTempId&obj_class=$sObjClass&obj_key=$iObjKey');
+		});
+JS;
 
 		return
 			<<<JS
@@ -605,6 +610,13 @@ JS
 JS
 		;
 	}
+	public static function EnableCKEditor5ImageUpload(DBObject $oObject, $sTempId){
+		return <<<JS
+		// Hook the file upload of all CKEditor instances
+JS;
+
+	}
+
 
 	/**
 	 * @inheritDoc

core/log.class.inc.php

@@ -575,6 +575,12 @@ class LogChannels
 	 */
 	public const DATATABLE = 'Datatable';
 
+	/**
+	 * @var string Everything related to the data integrity
+	 * @since 3.2.0
+	 */
+	public const DATA_INTEGRITY = 'DataIntegrity';
+
 	public const DEADLOCK = 'DeadLock';
 	/**
 	 * @var string Everything related to PHP sessions tracking
@@ -1090,6 +1096,11 @@ class DeadLockLog extends LogAPI
  */
 class DeprecatedCallsLog extends LogAPI
 {
+	/**
+	 * @var string
+	 * @since 3.2.0 N°4897
+	 */
+	public const ENUM_CHANNEL_PHP_API = 'deprecated-php-api';
 	public const ENUM_CHANNEL_PHP_METHOD = 'deprecated-php-method';
 	/**
 	 * @var string
@@ -1283,6 +1294,35 @@ class DeprecatedCallsLog extends LogAPI
 		static::Warning($sMessage, static::ENUM_CHANNEL_FILE);
 	}
 
+	/**
+	 * @param string $sImplementationClass Class implementing the deprecated API
+	 * @param string $sDeprecatedApi Class name of the deprecated API
+	 * @param string $sDeprecatedMethod Method name of the deprecated API
+	 * @param string|null $sAdditionalMessage Additional message, mostly used to explain what API to use instead
+	 *
+	 * @return void
+	 * @since 3.2.0 N°4897
+	 */
+	public static function NotifyDeprecatedPhpApi(string $sImplementationClass, string $sDeprecatedApi, string $sDeprecatedMethod, ?string $sAdditionalMessage = null): void
+	{
+		try {
+			if (!static::IsLogLevelEnabled(self::LEVEL_WARNING, self::ENUM_CHANNEL_PHP_API)) {
+				return;
+			}
+		}
+		catch (ConfigException $oException) {
+			return;
+		}
+
+		$sMessage = "Implementation of {$sDeprecatedApi}::{$sDeprecatedMethod}() in class {$sImplementationClass}";
+
+		if (!is_null($sAdditionalMessage)) {
+			$sMessage .= " : $sAdditionalMessage";
+		}
+
+		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_API);
+	}
+
 	/**
 	 * @param string|null $sAdditionalMessage
 	 *

core/metamodel.class.php

@@ -7168,32 +7168,45 @@ abstract class MetaModel
 	 */
 	public static function PurgeData($oFilter)
 	{
+		$iMaxChunkSize = MetaModel::GetConfig()->Get('purge_data.max_chunk_size');
 		$sTargetClass = $oFilter->GetClass();
-		$oSet = new DBObjectSet($oFilter);
-		$oSet->OptimizeColumnLoad(array($sTargetClass => array('finalclass')));
-		$aIdToClass = $oSet->GetColumnAsArray('finalclass', true);
+		$iNbIdsDeleted = 0;
+		$bExecuteQuery = true;
 
-		$aIds = array_keys($aIdToClass);
-		if (count($aIds) > 0)
-		{
-			$aQuotedIds = CMDBSource::Quote($aIds);
-			$sIdList = implode(',', $aQuotedIds);
-			$aTargetClasses = array_merge(
-				self::EnumChildClasses($sTargetClass, ENUM_CHILD_CLASSES_ALL),
-				self::EnumParentClasses($sTargetClass, ENUM_PARENT_CLASSES_EXCLUDELEAF)
-			);
-			foreach($aTargetClasses as $sSomeClass)
-			{
-				$sTable = MetaModel::DBGetTable($sSomeClass);
-				$sPKField = MetaModel::DBGetKey($sSomeClass);
+		// This loop allows you to delete objects in batches of $iMaxChunkSize elements
+		while ($bExecuteQuery) {
+			$oSet = new DBObjectSet($oFilter);
+			$oSet->SetLimit($iMaxChunkSize);
+			$oSet->OptimizeColumnLoad(array($sTargetClass => array('finalclass')));
+			$aIdToClass = $oSet->GetColumnAsArray('finalclass', true);
 
-				$sDeleteSQL = "DELETE FROM `$sTable` WHERE `$sPKField` IN ($sIdList)";
-				CMDBSource::DeleteFrom($sDeleteSQL);
+			$aIds = array_keys($aIdToClass);
+			$iNbIds = count($aIds);
+			if ($iNbIds > 0) {
+				$aQuotedIds = CMDBSource::Quote($aIds);
+				$sIdList = implode(',', $aQuotedIds);
+				$aTargetClasses = array_merge(
+					self::EnumChildClasses($sTargetClass, ENUM_CHILD_CLASSES_ALL),
+					self::EnumParentClasses($sTargetClass, ENUM_PARENT_CLASSES_EXCLUDELEAF)
+				);
+				foreach ($aTargetClasses as $sSomeClass) {
+					$sTable = MetaModel::DBGetTable($sSomeClass);
+					$sPKField = MetaModel::DBGetKey($sSomeClass);
+
+					$sDeleteSQL = "DELETE FROM `$sTable` WHERE `$sPKField` IN ($sIdList)";
+					CMDBSource::DeleteFrom($sDeleteSQL);
+				}
+				$iNbIdsDeleted += $iNbIds;
+			}
+
+			// stop loop if query returned fewer objects than  $iMaxChunkSize. In this case, all objects have been deleted.
+			if ($iNbIds < $iMaxChunkSize) {
+				$bExecuteQuery = false;
 			}
 		}
-		return count($aIds);
-	}
 
+		return $iNbIdsDeleted;
+	}
 	// Links
 	//
 	//

core/oql/build/PHP/ParserGenerator.php

@@ -739,7 +739,7 @@ class PHP_ParserGenerator
             while (isset($errmsg[$restart]) && $errmsg[$restart] == ' ') {
                 $restart++;
             }
-            printf("%s%.${end}s\n", $prefix, $errmsg);
+            printf("%s%.{$end}s\n", $prefix, $errmsg);
             $errmsg = substr($errmsg, $restart);
         }
     }
@@ -771,7 +771,7 @@ class PHP_ParserGenerator
             for ($j = $i; $j < $this->nsymbol; $j += $skip) {
                 $sp = $this->symbols[$j];
                 //assert( sp->index==j );
-                printf(" %3d %-${maxlen}.${maxlen}s", $j, $sp->name);
+                printf(" %3d %-{$maxlen}.{$maxlen}s", $j, $sp->name);
             }
             print "\n";
         }

core/oql/build/PHP/ParserGenerator/Action.php

@@ -231,19 +231,19 @@ class PHP_ParserGenerator_Action
         switch ($this->type)
         {
         case self::SHIFT:
-            fprintf($fp, "%${indent}s shift  %d", $this->sp->name, $this->x->statenum);
+            fprintf($fp, "%{$indent}s shift  %d", $this->sp->name, $this->x->statenum);
             break;
         case self::REDUCE:
-            fprintf($fp, "%${indent}s reduce %d", $this->sp->name, $this->x->index);
+            fprintf($fp, "%{$indent}s reduce %d", $this->sp->name, $this->x->index);
             break;
         case self::ACCEPT:
-            fprintf($fp, "%${indent}s accept", $this->sp->name);
+            fprintf($fp, "%{$indent}s accept", $this->sp->name);
             break;
         case self::ERROR:
-            fprintf($fp, "%${indent}s error", $this->sp->name);
+            fprintf($fp, "%{$indent}s error", $this->sp->name);
             break;
         case self::CONFLICT:
-            fprintf($fp, "%${indent}s reduce %-3d ** Parsing conflict **", $this->sp->name, $this->x->index);
+            fprintf($fp, "%{$indent}s reduce %-3d ** Parsing conflict **", $this->sp->name, $this->x->index);
             break;
         case self::SH_RESOLVED:
         case self::RD_RESOLVED:

core/ormcaselog.class.inc.php

@@ -20,6 +20,7 @@ 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);
@@ -515,7 +516,7 @@ class ormCaseLog {
 					$sScript = '<script src="'.$sFileAbsUrl.'"></></script>';
 					$sHtml .= $sScript;
 				} else {
-					$oP->add_linked_script($sFileAbsUrl);
+					$oP->LinkScriptFromURI($sFileAbsUrl);
 				}
 			}
 		}

core/ormdocument.class.inc.php

@@ -17,6 +17,7 @@
  * 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/ormstopwatch.class.inc.php

@@ -217,7 +217,7 @@ class ormStopWatch
 		}
 		else
 		{
-			$aProperties['Elapsed'] = 'running <img src="../images/indicator.gif">';
+			$aProperties['Elapsed'] = 'running <img src="' . utils::GetAbsoluteUrlAppRoot() . 'images/indicator.gif">';
 		}
 
 		$aProperties['Started'] = $oAttDef->SecondsToDate($this->iStarted);

core/pdfbulkexport.class.inc.php

@@ -8,10 +8,13 @@ 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\SelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\Select\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
@@ -49,7 +52,7 @@ class PDFBulkExport extends HTMLBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock
@@ -68,8 +71,6 @@ class PDFBulkExport extends HTMLBulkExport
 
 				//page format
 				$oSelectFormat = SelectUIBlockFactory::MakeForSelectWithLabel("page_size", Dict::S('Core:BulkExport:PDFPageSize'));
-				$oSelectFormat->SetIsLabelBefore(false);
-				//$oSelectFormat->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetFormat->AddSubBlock($oSelectFormat);
 
 				$aPossibleFormat = ['A3', 'A4', 'Letter'];
@@ -79,10 +80,7 @@ class PDFBulkExport extends HTMLBulkExport
 				}
 				$oFieldSetFormat->AddSubBlock(new Html('</br>'));
 
-				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation",
-					Dict::S('Core:BulkExport:PDFPageOrientation'));
-				$oSelectOrientation->SetIsLabelBefore(false);
-				//$oSelectOrientation->AddCSSClass('ibo-input-checkbox');
+				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation", Dict::S('Core:BulkExport:PDFPageOrientation'));
 				$oFieldSetFormat->AddSubBlock($oSelectOrientation);
 
 				$aPossibleOrientation = ['P', 'L'];

core/spreadsheetbulkexport.class.inc.php

@@ -10,6 +10,8 @@ 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
@@ -34,7 +36,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tabularbulkexport.class.inc.php

@@ -6,6 +6,7 @@
 
 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.
@@ -22,7 +23,7 @@ abstract class TabularBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tagsetfield.class.inc.php

@@ -17,6 +17,8 @@
  * 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
@@ -296,7 +298,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

@@ -53,9 +53,10 @@ abstract class Trigger extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeEnumSet("context", array("allowed_values" => null, "possible_values" => new ValueSetEnumPadded($aTags, true), "sql" => "context", "depends_on" => array(), "is_null_allowed" => true, "max_items" => 12)));
 		// "complement" is a computed field, fed by Trigger sub-classes, in general in ComputeValues method, for eg. the TriggerOnObject fed it with target_class info
 		MetaModel::Init_AddAttribute(new AttributeString("complement", array("allowed_values" => null, "sql" => "complement", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("subscription_policy", array("allowed_values" => new ValueSetEnum(Combodo\iTop\Core\Trigger\Enum\SubscriptionPolicy::cases()),  "sql" => "subscription_policy", "default_value" => \Combodo\iTop\Core\Trigger\Enum\SubscriptionPolicy::AllowNoChannel->value, "is_null_allowed" => false, "depends_on" => array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('finalclass', 'description', 'context', 'action_list', 'complement')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('finalclass', 'description', 'context', 'subscription_policy', 'action_list', 'complement')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'complement')); // Attributes to be displayed for a list
 		// Search criteria
 		//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -111,19 +112,31 @@ abstract class Trigger extends cmdbAbstractObject
 			return;
 		}
 
+		$aContextArgs['trigger->object()'] = $this;
+
 		// Find the related actions
 		$oLinkedActions = $this->Get('action_list');
-		while ($oLink = $oLinkedActions->Fetch())
-		{
-			/** @var \DBObject $oLink */
-			$iActionId = $oLink->Get('action_id');
-			/** @var \Action $oAction */
-			$oAction = MetaModel::GetObject('Action', $iActionId);
-			if ($oAction->IsActive())
-			{
-                $oKPI = new ExecutionKPI();
-				$oAction->DoExecute($this, $aContextArgs);
-                $oKPI->ComputeStatsForExtension($oAction, 'DoExecute');
+
+		// Order actions as expected
+		$aActionListOrdered = [];
+		while ($oLink = $oLinkedActions->Fetch()) {
+			$aActionListOrdered[(int) $oLink->Get('order')][] = $oLink;
+		}
+		ksort($aActionListOrdered);
+
+		// Execute actions
+		foreach ($aActionListOrdered as $aActionSubList) {
+			foreach ($aActionSubList as $oLink) /** @var \DBObject $oLink */ {
+				/** @var \DBObject $oLink */
+				$iActionId = $oLink->Get('action_id');
+				/** @var \Action $oAction */
+				$oAction = MetaModel::GetObject('Action', $iActionId);
+				if ($oAction->IsActive()) {
+					$oKPI = new ExecutionKPI();
+					$aContextArgs['action->object()'] = $oAction;
+					$oAction->DoExecute($this, $aContextArgs);
+					$oKPI->ComputeStatsForExtension($oAction, 'DoExecute');
+				}
 			}
 		}
 	}
@@ -172,7 +185,7 @@ abstract class TriggerOnObject extends Trigger
 		MetaModel::Init_AddAttribute(new AttributeOQL("filter", array("allowed_values" => null, "sql" => "filter", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('default_search', array('description', 'target_class'));  // Default criteria of the search banner
@@ -372,7 +385,7 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
 		// Search criteria
 	}
@@ -405,7 +418,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeClassState("state", array("class_field" => 'target_class', "allowed_values" => null, "sql" => "state", "default_value" => null, "is_null_allowed" => false, "depends_on" => array('target_class'))));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -438,7 +451,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -471,7 +484,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -504,7 +517,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -537,7 +550,7 @@ class TriggerOnObjectDelete extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -572,7 +585,7 @@ class TriggerOnObjectUpdate extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeClassAttCodeSet('target_attcodes', array("allowed_values" => null, "class_field" => "target_class", "sql" => "target_attcodes", "default_value" => null, "is_null_allowed" => true, "max_items" => 20, "min_items" => 0, "attribute_definition_exclusion_list" => "AttributeDashboard,AttributeExternalField,AttributeFinalClass,AttributeFriendlyName,AttributeObsolescenceDate,AttributeObsolescenceFlag,AttributeSubItem", "attribute_definition_list" => null, "depends_on" => array('target_class'))));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'target_attcodes', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'target_attcodes', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -668,7 +681,7 @@ class TriggerOnObjectMention extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeOQL("mentioned_filter", array("allowed_values" => null, "sql" => "mentioned_filter", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'mentioned_filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'mentioned_filter', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -827,7 +840,7 @@ class TriggerOnThresholdReached extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeString("threshold_index", array("allowed_values" => null, "sql" => "threshold_index", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'stop_watch_code', 'threshold_index', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'stop_watch_code', 'threshold_index', 'filter', 'subscription_policy', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'threshold_index', 'threshold_index')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form

core/userrights.class.inc.php

@@ -1,6 +1,7 @@
 <?php
 
 use Combodo\iTop\Application\Helper\Session;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 define('UR_ALLOWED_NO', 0);
 define('UR_ALLOWED_YES', 1);
@@ -867,6 +868,8 @@ class UserRights
 	 */
 	public static function Login($sLogin, $sAuthentication = 'any')
 	{
+		self::ResetCurrentUserData();
+
 		$oUser = self::FindUser($sLogin, $sAuthentication);
 		if (is_null($oUser))
 		{

core/valuesetdef.class.inc.php

@@ -476,6 +476,7 @@ class ValueSetEnum extends ValueSetDefinition
 	 * @param bool $bLocalizedSort
 	 *
 	 * @since 3.1.0 N°1646 Add $bLocalizedSort parameter
+	 * @since 3.2.0 N°7157 $Values can be an array of backed-enum cases
 	 */
 	public function __construct($Values, bool $bSortByValues = false)
 	{
@@ -523,13 +524,21 @@ class ValueSetEnum extends ValueSetDefinition
 	 */
 	protected function LoadValues($aArgs)
 	{
+		$aValues = [];
 		if (is_array($this->m_values))
 		{
-			$aValues = $this->m_values;
+			foreach ($this->m_values as $key => $value) {
+				// Handle backed-enum case
+				if (is_object($value) && enum_exists(get_class($value))) {
+					$aValues[$value->value] = $value->value;
+					continue;
+				}
+
+				$aValues[$key] = $value;
+			}
 		}
 		elseif (is_string($this->m_values) && strlen($this->m_values) > 0)
 		{
-			$aValues = array();
 			foreach (explode(",", $this->m_values) as $sVal)
 			{
 				$sVal = trim($sVal);
@@ -539,7 +548,7 @@ class ValueSetEnum extends ValueSetDefinition
 		}
 		else
 		{
-			$aValues = array();
+			$aValues = [];
 		}
 		$this->m_aValues = $aValues;
 		return true;

core/xmlbulkexport.class.inc.php

@@ -8,6 +8,8 @@ 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
@@ -30,7 +32,7 @@ class XMLBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

css/backoffice/_shame.scss

@@ -49,3 +49,63 @@
 .ibo-navigation-menu.ibo-is-active .ibo-navigation-menu--drawer{
     transform: translate3d(0,0,0);
 }
+
+// Toggler legacy CSS that has somehow been added to iTop 3.0 and that is now used by some extensions
+// Round Toggle
+/* The switch - the box around the slider */
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 36px;
+  height: 20px;
+  vertical-align: baseline;
+}
+
+/* Hide default HTML checkbox */
+.switch input {
+  display: none;
+}
+
+/* The slider */
+.slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: $ibo-color-secondary-600;
+  transition: .4s;
+}
+
+.slider:before {
+  position: absolute;
+  content: "";
+  height: 15px;
+  width: 15px;
+  left: 3px;
+  bottom: 3px;
+  background-color: $ibo-color-secondary-300;
+  transition: .4s;
+}
+
+input:checked + .slider {
+  background-color: $ibo-color-primary-600;
+}
+
+input:focus + .slider {
+  box-shadow: 0 0 1px $ibo-color-primary-600;
+}
+
+input:checked + .slider:before {
+  transform: translateX(14.5px);
+}
+
+/* Rounded sliders */
+.slider.round {
+  border-radius: 20px;
+}
+
+.slider.round:before {
+  border-radius: 7px;
+}

css/backoffice/base/_base.scss

@@ -11,10 +11,6 @@ $ibo-scrollbar--scrollbar-thumb-background-color: $ibo-color-grey-300 !default;
 $ibo-scrollbar--scrollbar-thumb-border: none !default;
 $ibo-scrollbar--scrollbar-thumb-border-radius: $ibo-border-radius-500 !default;
 
-$ibo-hyperlink-color: $ibo-color-primary-700 !default;
-$ibo-hyperlink-color--on-hover: $ibo-color-primary-800 !default;
-$ibo-hyperlink-color--on-active: $ibo-color-primary-900 !default;
-
 $ibo-svg-illustration--fill: $ibo-color-primary-500 !default;
 
 $ibo-content-block--background-color: $ibo-color-white-100 !default;
@@ -29,10 +25,6 @@ $ibo-content-block--border: 1px solid $ibo-color-grey-400 !default;
 	--ibo-scrollbar--scrollbar-thumb-background-color: #{$ibo-scrollbar--scrollbar-thumb-background-color};
 	--ibo-scrollbar--scrollbar-thumb-border: #{$ibo-scrollbar--scrollbar-thumb-border};
 	--ibo-scrollbar--scrollbar-thumb-border-radius: #{$ibo-scrollbar--scrollbar-thumb-border-radius};
-
-	--ibo-hyperlink-color: #{$ibo-hyperlink-color};
-	--ibo-hyperlink-color--on-hover: #{$ibo-hyperlink-color--on-hover};
-	--ibo-hyperlink-color--on-active: #{$ibo-hyperlink-color--on-active};
 }
 
 /* Box sizing reset */
@@ -73,17 +65,19 @@ html{
 /* Hyperlinks reset, ensure that they are of the right color and without decoration everywhere (of course this can be overloaded in some components) */
 a{
 	color: var(--ibo-hyperlink-color);
-	text-decoration: none;
+	text-decoration: var(--ibo-hyperlink-text-decoration);
 
 	&:hover,
 	&:active,
 	&:visited{
-		text-decoration: none;
+    text-decoration: var(--ibo-hyperlink-text-decoration);
 	}
 	&:hover{
 		color: var(--ibo-hyperlink-color--on-hover);
+		text-decoration: var(--ibo-hyperlink-text-decoration--on-hover);
 	}
 	&:active{
 		color: var(--ibo-hyperlink-color--on-active);
+		text-decoration: var(--ibo-hyperlink-text-decoration--on-active);
 	}
 }

css/backoffice/components/_alert.scss

@@ -41,7 +41,7 @@ $ibo-alert-colors: (
 	$bg-color: nth($aColorValues, 1);
 	$highlight-color: nth($aColorValues, 2);
 	$text-color: nth($aColorValues, 3);
-	.ibo-alert.ibo-is-#{$sColor} {
+	%ibo-alert-#{$sColor}, .ibo-alert.ibo-is-#{$sColor} {
 		background-color: $bg-color;
 		color: $text-color;
     a {

css/backoffice/components/_all.scss

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

css/backoffice/components/_newsroom-menu.scss

@@ -19,9 +19,19 @@ $ibo-navigation-menu--notifications--item--content--padding-x: 14px !default;
 $ibo-navigation-menu--notifications--item--content--img--max-height: 100px !default;
 $ibo-navigation-menu--notifications--item--content--img--padding: 5px !default;
 
-$ibo-navigation-menu--notifications--item--new-message-indicator--width: 10px !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--height: 10px !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-blue-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--width: 13px !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--height: 13px !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-red-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-red-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-orange-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-orange-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-blue-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-blue-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-4--background-color: $ibo-navigation-menu--notifications--item--new-message-indicator--background-color !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-4--border: $ibo-navigation-menu--notifications--item--new-message-indicator--border !default;
+
 $ibo-navigation-menu--notifications--item--new-message-indicator--border-radius: $ibo-border-radius-full !default;
 $ibo-navigation-menu--notifications--item--new-message-indicator--margin-top: $ibo-spacing-200 !default;
 
@@ -36,31 +46,30 @@ $ibo-popover-menu--item--no-message--image--svg--padding : 15px !default;
 #ibo-navigation-menu--notifications-menu {
   flex-flow: column;
   min-width: $ibo-navigation-menu--notifications-menu--min-width;
-  .ibo-navigation-menu--notifications--messages-section{
+  .ibo-navigation-menu--notifications--messages-section {
     overflow: auto;
   }
 }
-.ibo-navigation-menu--notifications--show-all-messages, .ibo-navigation-menu--notifications-dismiss-all, .ibo-navigation-menu--notifications-show-all-multiple{
+.ibo-navigation-menu--notifications--show-all-messages, .ibo-navigation-menu--notifications-dismiss-all, .ibo-navigation-menu--notifications-show-all-multiple {
   overflow-x: inherit;
   text-align: center;
   min-height: 45px;
 }
 
-.ibo-navigation-menu--notifications--item--image{
+.ibo-navigation-menu--notifications--item--image {
   max-width: $ibo-navigation-menu--notifications--item--image--max-width;
   max-height: $ibo-navigation-menu--notifications--item--image--max-height;
   margin: $ibo-navigation-menu--notifications--item--image--margin-y $ibo-navigation-menu--notifications--item--image--margin-x;
   border-radius: $ibo-navigation-menu--notifications--item--image--border-radius;
 }
 
-img.ibo-navigation-menu--notifications--item--image[src=""]{
+.ibo-navigation-menu--notifications--item--image[src=""] {
   display: none;
 }
-img.ibo-navigation-menu--notifications--item--image:not([src=""]) ~ i.ibo-navigation-menu--notifications--item--image
-{
+.ibo-navigation-menu--notifications--item--image:not([src=""]) ~ .ibo-navigation-menu--notifications--item--image {
   display: none;
 }
-.ibo-navigation-menu--notifications--item--bottom-text{
+.ibo-navigation-menu--notifications--item--bottom-text {
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -68,41 +77,63 @@ img.ibo-navigation-menu--notifications--item--image:not([src=""]) ~ i.ibo-naviga
   align-self: center;
   margin-left: $ibo-navigation-menu--notifications--item--bottom-text--margin-left;
 }
-.ibo-navigation-menu--notifications--item--content{
+.ibo-navigation-menu--notifications--item--content {
   padding: $ibo-navigation-menu--notifications--item--content--padding-y $ibo-navigation-menu--notifications--item--content--padding-x;
-  img{
+
+  img {
     max-height: $ibo-navigation-menu--notifications--item--content--img--max-height;
     padding: $ibo-navigation-menu--notifications--item--content--img--padding;
   }
 }
-.ibo-navigation-menu--notifications-item{
+.ibo-navigation-menu--notifications-item {
   display: flex;
   flex-direction: row;
+
+  .ibo-navigation-menu--notifications--item--content a {
+    @extend %ibo-hyperlink-forced-colors;
+  }
 }
-.ibo-navigation-menu--notifications--item--new-message-indicator{
+.ibo-navigation-menu--notifications--item--new-message-indicator {
   width: $ibo-navigation-menu--notifications--item--new-message-indicator--width;
   height: $ibo-navigation-menu--notifications--item--new-message-indicator--height;
   background-color: $ibo-navigation-menu--notifications--item--new-message-indicator--background-color;
+  border: $ibo-navigation-menu--notifications--item--new-message-indicator--border;
   border-radius: $ibo-navigation-menu--notifications--item--new-message-indicator--border-radius;
   margin-top: $ibo-navigation-menu--notifications--item--new-message-indicator--margin-top;
+  &.ibo-is-priority-1{
+    background-color: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color;
+    border: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border;
+  }
+  &.ibo-is-priority-2{
+    background-color: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color;
+    border: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border;
+  }
+  &.ibo-is-priority-3{
+    background-color: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color;
+    border: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border;
+  }
+  &.ibo-is-priority-4{
+    background-color: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-4--background-color;
+    border: $ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-4--border;
+  }
 }
 
-.ibo-navigation-menu--notifications-show-all-multiple ~ .ibo-popover-menu{
-  .ibo-navigation-menu--notifications--item--new-message-indicator{
+.ibo-navigation-menu--notifications-show-all-multiple ~ .ibo-popover-menu {
+  .ibo-navigation-menu--notifications--item--new-message-indicator {
     display: inline-block;
     margin-right: $ibo-navigation-menu--notifications-show-all-multiple--ibo-popover-menu--indicator--margin-right;
   }
-  .ibo-navigation-menu--notifications-show-all-multiple--counter{
+  .ibo-navigation-menu--notifications-show-all-multiple--counter {
     @extend %ibo-font-weight-600;
   }
 }
-.ibo-navigation-menu--notifications-dismiss-all--icon{
+.ibo-navigation-menu--notifications-dismiss-all--icon {
   margin: $ibo-navigation-menu--notifications-dismiss-all--icon--margin;
 }
-.ibo-popover-menu--item--no-message{
+.ibo-popover-menu--item--no-message {
   text-align: center;
 }
-.ibo-popover-menu--item--no-message--image>svg{
+.ibo-popover-menu--item--no-message--image > svg {
   display: flex;
   width: $ibo-popover-menu--item--no-message--image--svg--width;
   height: $ibo-popover-menu--item--no-message--image--svg--height;

css/backoffice/components/_panel.scss

@@ -85,6 +85,9 @@ $ibo-panel--collapsible-toggler--margin-right: $ibo-spacing-300 !default;
 $ibo-panel--collapsible-toggler--font-size: $ibo-font-size-250 !default;
 $ibo-panel--collapsible-toggler--color: $ibo-color-grey-700 !default;
 
+$ibo-panel--is-selectable--body--after--z-index: $ibo-panel--header--z-index + 1 !default;
+$ibo-panel--is-selectable--body--after--font-size: $ibo-font-size-700 !default;
+
 /* Rules */
 .ibo-panel {
   --ibo-main-color: #{map-get($ibo-panel-colors, 'neutral')}; /* --ibo-main-color is to allow overload from custom dynamic value from the DM. The overload will be done through an additional CSS class of a particular DM class or DM attribute */
@@ -128,6 +131,30 @@ $ibo-panel--collapsible-toggler--color: $ibo-color-grey-700 !default;
       }
     }
   }
+  &.ibo-is-selectable .ibo-panel--body::after {
+    @include ibo-selectable;
+    position: absolute;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    height: 100%;
+    width: 100%;
+    z-index: $ibo-panel--is-selectable--body--after--z-index;
+    font-size: $ibo-panel--is-selectable--body--after--font-size;
+  }
+  &.ibo-is-selectable:hover .ibo-panel--body::after {
+    @include ibo-selectable-hover;
+    display: flex;
+  }
+  &.ibo-is-selected .ibo-panel--body::after {
+    @include ibo-selected;
+    display: flex;
+  }
+  &.ibo-is-selected:hover .ibo-panel--body::after {
+    @include ibo-selected-hover;
+    display: flex;
+  }
 }
 
 .ibo-panel--header {

css/backoffice/components/_toast.scss

@@ -0,0 +1,62 @@
+/*
+ * @copyright   Copyright (C) 2010-2024 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/* SCSS variables */
+$ibo-toast--padding-y: $ibo-spacing-400 !default;
+$ibo-toast--padding-right: $ibo-spacing-300 !default;
+$ibo-toast--padding-left: $ibo-spacing-500 !default;
+$ibo-toast--border-radius: $ibo-border-radius-300 !default;
+$ibo-toast--box-shadow: $ibo-elevation-200 !default;
+$ibo-toast--max-width: calc(50% - 20px) !default;
+
+@keyframes decreaseHighlight {
+  0% {
+    height: 100%;
+  }
+  8%{
+    border-radius: 0 0 0 3px;
+  }
+  100% {
+    height: 0;
+  }
+}
+
+.ibo-toast {
+  display: inline-flex;
+  position: fixed;
+  align-items: center;
+
+  max-width: $ibo-toast--max-width ;
+  padding: $ibo-toast--padding-y $ibo-toast--padding-right $ibo-toast--padding-y $ibo-toast--padding-left;
+  border-radius: $ibo-toast--border-radius;
+
+  box-shadow: $ibo-toast--box-shadow;
+  transition: all 0.4s cubic-bezier(0.215, 0.61, 0.355, 1);
+  z-index: 2147483647;
+  &::before {
+    @include ibo-vertical-highlight;
+    top: initial;
+    bottom: 0;
+    border-radius: $ibo-toast--border-radius 0 0 $ibo-toast--border-radius;
+  }
+  &.ibo-is-auto-closeable::before{
+    animation: decreaseHighlight 5s linear forwards;
+  }
+  &:hover::before {
+    animation: none; /* Pause animation on hover */
+  }
+  &.ibo-is-error{
+    @extend %ibo-alert-danger;
+  }
+  &.ibo-is-warning{
+    @extend %ibo-alert-warning;
+  }
+  &.ibo-is-success{
+    @extend %ibo-alert-success;
+  }
+  &.ibo-is-information{
+    @extend %ibo-alert-information;
+  }
+}

css/backoffice/components/datatable/_datatableconfig.scss

@@ -22,6 +22,9 @@ $ibo-datatableconfig--settings-panel--option--margin-right: $ibo-spacing-200 !de
 }
 .ibo-datatableconfig--attributes-panel--per-page--input{
   margin: $ibo-datatableconfig--attributes-panel--per-page--input--margin-y $ibo-datatableconfig--attributes-panel--per-page--input--margin-x;
+  max-width: 4em;
+  @extend .ibo-input;
+  display: initial;
 }
 
 .ibo-datatableconfig--settings-panel .ibo-panel--body{

css/backoffice/components/input/_all.scss

@@ -16,3 +16,4 @@
 @import "input-one-way-password";
 @import "input-set";
 @import "input-text";
+@import "input-toggler";

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

@@ -49,10 +49,7 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
 .ibo-input-select {
   display: inline-flex;
   min-width: $ibo-input-select--value--min-midth;
-
-  &:not(.ibo-input-select-autocomplete):not(.ibo-input-selectize) {
-    appearance: none;
-  }
+  appearance: none;
 
   &.ibo-input-selectize {
     padding-right: 0;
@@ -108,7 +105,7 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
       outline: none !important; /* Overwrite browsers default focus outline */
     }
   }
-  
+
   &.input-active{
     border: 1px solid $ibo-input--focus--border-color;
   }
@@ -123,15 +120,16 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
 }
 .ibo-input-select-wrapper::after{
 	position: absolute;
+  z-index: 1;
 	content: "\f0d7";
 	font-family: "Font Awesome 5 Free";
 	font-weight: 600;
-	
+
 	height: $ibo-input-select-wrapper--after--height;
 	margin-left: $ibo-input-select-wrapper--after--margin-left;
 	margin-top: $ibo-input-select-wrapper--after--margin-top;
 	padding-top: $ibo-input-select-wrapper--after--padding-top;
-	
+
 	background-color: $ibo-input-select-wrapper--after--background-color;
 	color: $ibo-input-select-wrapper--after--color;
 	pointer-events: none;
@@ -146,6 +144,7 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
 
 .ibo-input-select-wrapper--with-buttons:not(.ibo-input-select-autocomplete-wrapper)::after {
   position: absolute;
+  z-index: 1;
   content: "\f0d7";
   font-family: "Font Awesome 5 Free";
   font-weight: 600;
@@ -163,6 +162,7 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
 }
 .ibo-input-select--action-buttons{
   position: absolute;
+  z-index: 1;
   display: flex;
   height: $ibo-input-select--action-button--height;
   margin-top: $ibo-input-select--action-button--margin-top;
@@ -224,7 +224,11 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
   margin-right: $ibo-input-select--autocomplete-item-image--margin-right;
   background-color: $ibo-input-select--autocomplete-item-image--background-color;
   border: $ibo-input-select--autocomplete-item-image--border;
-
+  &.ibo-is-not-medallion{
+    border: unset;
+    border-radius: 0;
+    background-color: unset;
+  }
   @extend %ibo-fully-centered-content;
 }
 

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

@@ -0,0 +1,72 @@
+/*
+ * @copyright   Copyright (C) 2010-2024 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+$ibo-toggler--wrapper--width: 36px !default;
+$ibo-toggler--wrapper--height: 20px !default;
+
+$ibo-toggler--slider--border-radius: $ibo-border-radius-900 !default;
+$ibo-toggler--slider--background-color: $ibo-color-secondary-600 !default;
+
+$ibo-toggler--slider--before--height: 15px !default;
+$ibo-toggler--slider--before--width: 15px !default;
+$ibo-toggler--slider--before--border-radius: $ibo-border-radius-full !default;
+$ibo-toggler--slider--before--background-color: $ibo-color-grey-100 !default;
+
+$ibo-toggler--slider--checked--background-color: $ibo-color-primary-600 !default;
+$ibo-toggler--slider--focus--box-shadow: 0 0 1px $ibo-color-primary-600 !default;
+
+$ibo-toggler--label--margin-left: 4px !default;
+
+
+.ibo-toggler--wrapper {
+  position: relative;
+  display: inline-block;
+  width: $ibo-toggler--wrapper--width;
+  height: $ibo-toggler--wrapper--height;
+  vertical-align: baseline;
+  .ibo-toggler {
+    display: none;
+  }
+}
+
+.ibo-toggler--slider{
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: $ibo-toggler--slider--border-radius;
+  background-color: $ibo-toggler--slider--background-color;
+  transition: .4s;
+}
+
+.ibo-toggler--slider:before {
+  content: "";
+  position: absolute;
+  left: 3px;
+  bottom: 3px;
+  height: $ibo-toggler--slider--before--height;
+  width: $ibo-toggler--slider--before--width;
+  border-radius: $ibo-toggler--slider--before--border-radius;
+  background-color: $ibo-toggler--slider--before--background-color;
+  transition: .4s;
+}
+
+.ibo-toggler--wrapper input:checked + .ibo-toggler--slider {
+  background-color: $ibo-toggler--slider--checked--background-color;
+}
+
+input:focus + .ibo-toggler--slider {
+  box-shadow: $ibo-toggler--slider--focus--box-shadow;
+}
+
+input:checked + .ibo-toggler--slider:before {
+  transform: translateX(14.5px);
+}
+
+label ~ .ibo-toggler--wrapper {
+  margin-left: $ibo-toggler--label--margin-left;
+}

css/backoffice/components/input/_input.scss

@@ -8,7 +8,11 @@ $ibo-input--width: 100% !default;
 
 $ibo-input--color: $ibo-color-grey-900 !default;
 $ibo-input--background-color: $ibo-color-white-100 !default;
+
 $ibo-input--border-color: $ibo-color-grey-500 !default;
+$ibo-input--border-size: 1px !default;
+$ibo-input--border-style: solid !default;
+$ibo-input--border: $ibo-input--border-size $ibo-input--border-style $ibo-input--border-color !default;
 
 $ibo-input--padding-x: 10px !default;
 $ibo-input--padding-y: $ibo-spacing-0 !default;
@@ -34,13 +38,13 @@ $ibo-input--margin-x: $ibo-spacing-200 !default;
   background-color: $ibo-input--background-color;
   color: $ibo-input--color;
   padding: $ibo-input--padding-y $ibo-input--padding-x;
-  border: 1px solid $ibo-input--border-color;
+  border: $ibo-input--border;
   border-radius: $ibo-input--border-radius;
 
   @extend %ibo-font-ral-nor-150;
   
 	&:focus{
-		border: 1px solid $ibo-input--focus--border-color;
+		border-color: $ibo-input--focus--border-color;
 	}
 	&:disabled{
 		background-color: $ibo-input--disabled--background-color;
@@ -54,8 +58,8 @@ textarea.ibo-input{
   height:unset;
 }
 .ibo-input-wrapper.is-error, .ibo-input-field-wrapper.is-error {
-	.ibo-input, .ibo-input-vanilla,  .cke, textarea {
-    border: 1px solid $ibo-input-wrapper--is-error--border-color;
+	.ibo-input, .ibo-input-vanilla,  .ck-editor, textarea {
+    border-color: $ibo-input-wrapper--is-error--border-color;
   }
   .ibo-input-vanilla input{
     border: 0;

css/backoffice/layout/_top-bar.scss

@@ -62,63 +62,4 @@ $ibo-top-bar--toolbar-dashboard-title--max-width: 350px !default;
 	@extend %ibo-full-height-content;
 	display: flex;
 	align-items: center;
-}
-
-// Round Toggle
-/* The switch - the box around the slider */
-.switch {
-  position: relative;
-  display: inline-block;
-  width: 36px;
-  height: 20px;
-  vertical-align: baseline;
-}
-
-/* Hide default HTML checkbox */
-.switch input {
-  display: none;
-}
-
-/* The slider */
-.slider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: $ibo-color-secondary-600;
-  transition: .4s;
-}
-
-.slider:before {
-  position: absolute;
-  content: "";
-  height: 15px;
-  width: 15px;
-  left: 3px;
-  bottom: 3px;
-  background-color: $ibo-color-secondary-300;
-  transition: .4s;
-}
-
-input:checked + .slider {
-  background-color: $ibo-color-primary-600;
-}
-
-input:focus + .slider {
-  box-shadow: 0 0 1px $ibo-color-primary-600;
-}
-
-input:checked + .slider:before {
-  transform: translateX(14.5px);
-}
-
-/* Rounded sliders */
-.slider.round {
-  border-radius: 20px;
-}
-
-.slider.round:before {
-  border-radius: 7px;
-}
+}