Avoid to do 2 request in order to get sharing objects

.doc/README.md

@@ -79,8 +79,6 @@ Then, **for a method** of an eligible class:
 
 ## Installation
 
-Note : PHP7 is required. Migrating to PHP8 requires some additional work which is questionable as an alternative way to generate a documentation is being considered.
-
 ```
 cd .doc
 composer require phpdocumentor/phpdocumentor:~2 --dev

.doc/itop-version-history.md

@@ -79,26 +79,6 @@ gitGraph
     commit id: "2023-08-10" tag: "2.7.9"
     checkout support/3.1
     commit id: "2023-12-20" tag: "3.1.1"
-    checkout develop
-    commit id: "2024-01-15" tag: "Start 3.2" type: HIGHLIGHT
-    branch support/3.2 order: 830
-    checkout support/2.7
-    commit id: "2024-01-17a" tag: "2.7.10"
-    checkout support/3.0
-    commit id: "2024-01-17b" tag: "3.0.4"
-    checkout support/2.7
-    commit id: "2024-09-28" tag: "2.7.11"
-    checkout support/3.1
-    commit id: "2024-09-27" tag: "3.1.2"
-    checkout support/3.2
-    commit id: "2024-06-25" tag: "3.2.0-beta1" type: REVERSE
-    commit id: "2024-08-07" tag: "3.2.0"
-    checkout support/2.7
-    commit id: "2025-02-25" tag: "2.7.12"
-    checkout support/3.1
-    commit id: "2025-02-25 " tag: "3.1.3"
-    checkout support/3.2
-    commit id: "2025-02-25  " tag: "3.2.1"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.doc/phpdoc-templates/combodo-wiki/graphs/class.html.twig

@@ -23,7 +23,7 @@
 
         $(document).ready(function() {
             $("#viewer").iviewer({src: '{{ path('graphs/classes.svg') }}', zoom_animation: false});
-            $('#viewer img').on('dragstart', function(event){
+            $('#viewer img').bind('dragstart', function(event){
                 event.preventDefault();
             });
             $(window).resize();

.github/pull_request_template.md

@@ -65,7 +65,7 @@ Don't remove these lines, check them once done.
 - [ ] I have performed a self-review of my code
 - [ ] I have tested all changes I made on an iTop instance
 - [ ] I have added a unit test, otherwise I have explained why I couldn't
-- [ ] Is the PR clear and detailed enough so anyone can understand digging in the code?
+- [ ] Is the PR clear and detailled enough so anyone can understand digging in the code?
 
 ## Checklist of things to do before PR is ready to merge
 <!--

.github/workflows/action.yml

@@ -1,43 +0,0 @@
-name: Add PRs to Combodo PRs Dashboard
-
-on:
-  pull_request_target:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add PR to Combodo Project
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check if author is a member of the organization
-        id: check-membership
-        run: |
-          ORG="Combodo"
-          AUTHOR=$(jq -r .pull_request.user.login "$GITHUB_EVENT_PATH")
-          RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}" \
-            "https://api.github.com/orgs/$ORG/members/$AUTHOR")
-          if [ "$RESPONSE" == "404" ]; then
-            echo "project_url=https://github.com/orgs/Combodo/projects/5" >> $GITHUB_ENV
-            echo "is_member=false" >> $GITHUB_ENV
-          else
-            echo "project_url=https://github.com/orgs/Combodo/projects/4" >> $GITHUB_ENV
-            echo "is_member=true" >> $GITHUB_ENV
-
-          fi
-
-      - name: Add internal tag if member
-        if: env.is_member == 'true'
-        run: |
-          curl -X POST -H "Authorization: token ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}" \
-            -H "Accept: application/vnd.github.v3+json" \
-            https://api.github.com/repos/Combodo/iTop/issues/${{ github.event.pull_request.number }}/labels \
-            -d '{"labels":["internal"]}'
-        env:
-          is_member: ${{ env.is_member }}
-
-      - name: Add PR to the appropriate project
-        uses: actions/add-to-project@v1.0.2
-        with:
-          project-url: ${{ env.project_url }}
-          github-token: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}

.gitignore

@@ -47,12 +47,6 @@ 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/**
-
-# Symfony: Local env file
-/resources/symfony/.env.local
-
 # 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/rmUnnecessaryFolders.php',
+	'php composer/rmDeniedTestDir.php',
 	'php build/commands/setupCssCompiler.php',
 //	'bash /tmp/gabuzomeu.sh',
 ];

.make/build/commands/setupCssCompiler.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2010-2024 Combodo SAS
+ * Copyright (C) 2010-2023 Combodo SARL
  *
  *   This file is part of iTop.
  *
@@ -27,7 +27,7 @@ $iTopFolder = __DIR__."/../../../";
 require_once("$iTopFolder/approot.inc.php");
 require_once(APPROOT."/application/utils.inc.php");
 
-if (PHP_SAPI !== 'cli')
+if (php_sapi_name() !== 'cli')
 {
 	throw new \Exception('This script can only run from CLI');
 }
@@ -48,4 +48,4 @@ if (!file_exists($sCssFile))
 {
 	fwrite(STDERR, "Failed to compile $sCssFile, exiting.");
 	exit(1);
-}
+}

.make/composer/listOutdated.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2010-2024 Combodo SAS
+ * Copyright (C) 2010-2023 Combodo SARL
  *
  *   This file is part of iTop.
  *
@@ -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/composer/rmDeniedTestDir.php

@@ -0,0 +1,73 @@
+<?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/composer/tcpdf/droidsansfallback.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2013-2024 Combodo SAS
+ * Copyright (C) 2013-2023 Combodo SARL
  *
  * This file is part of iTop.
  *

.make/composer/tcpdf/tcpdfUpdateFonts.php

@@ -13,7 +13,7 @@
  * @link https://github.com/tecnickcom/TCPDF?tab=readme-ov-file#note TCPDF is in support only mode
  */
 
-$sItopRootFolder = realpath(__DIR__ . "/../../../../");
+$sItopRootFolder = realpath(__DIR__ . "/../../../");
 $sCurrentScriptFileName = basename(__FILE__);
 
 
@@ -25,7 +25,7 @@ if (false === file_exists($sTcPdfRootFolder)) {
 	echo $sCurrentScriptFileName.": No TCPDF lib detected, exiting !\n";
 	return;
 }
-$sTcPdfFontsFolder = $sTcPdfRootFolder.'/fonts/';
+$sTcPdfFontsFolder = $sTcPdfRootFolder.'/Fonts/';
 
 
 /**

.make/dependencies/npm/restoreFolderBrowsingProtection.php

@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright (C) 2010-2024 Combodo SAS
- *
- *   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

@@ -1,100 +0,0 @@
-<?php
-/**
- * Copyright (C) 2010-2024 Combodo SAS
- *
- *   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->ListDeniedButStillPresentFilesAbsPaths();
-
-echo "\n";
-foreach ($aDeniedButStillPresent as $sDir)
-{
-	if (false === $oDependenciesHandler::IsQuestionnableFile($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 {
-		if(is_dir($sDir)){
-			SetupUtils::rrmdir($sDir);
-		}
-		else{
-			unlink($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->ListAllowedFilesAbsPaths(),
-	$oDependenciesHandler->ListDeniedFilesAbsPaths()
-);
-$aExistingDirs = $oDependenciesHandler->ListAllFilesAbsPaths();
-$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";

.make/release/changelog.php

@@ -25,34 +25,12 @@
 
 
 if (count($argv) === 1) {
-	echo "⚠ You must pass the base tag/sha1 as parameter\n";
+	echo '⚠ You must pass the base tag/sha1 as parameter';
 	exit(1);
 }
 $sBaseReference = $argv[1];
 
 
-/**
- * Replace the Github emojis codes by their UTF-8 character equivalent
- */
-function ReplaceGitmojis(string $sLine)
-{
-	static $aGitmojis = null;
-
-	if ($aGitmojis === null) {
-		$aRawGitmojis = json_decode(trim(file_get_contents(__DIR__.'/gitmojis.json')), true);
-		if ($aRawGitmojis === false) {
-			echo "\nFailed to parse ".__DIR__."/gitmojis.json, emoji codes will not be replaced by their unicode equivalent.\n";
-		} else {
-			foreach($aRawGitmojis["gitmojis"] as $aGitmoji) {
-				$aGitmojis[$aGitmoji['code']] = $aGitmoji['emoji'];
-			}
-		}
-	}
-	if (is_array($aGitmojis)) {
-		return str_replace(array_keys($aGitmojis), array_values($aGitmojis), $sLine);
-	}
-}
-
 //--- Get log
 $sGitLogCommand = 'git log --decorate --pretty="%h;%s" --date-order --no-merges '.$sBaseReference.'..HEAD';
 $sGitLogRaw = shell_exec($sGitLogCommand);
@@ -95,5 +73,5 @@ echo "\n";
 echo "# Logs line without bug referenced\n";
 echo "sha1;subject\n";
 foreach ($aLogLineNoBug as $sLogLine) {
-	echo ReplaceGitmojis($sLogLine)."\n";
-}
+	echo "$sLogLine\n";
+}

.make/release/gitmojis.json

@@ -1,589 +0,0 @@
-{
-  "$schema": "https://gitmoji.dev/api/gitmojis/schema",
-  "gitmojis": [
-    {
-      "emoji": "🎨",
-      "entity": "🎨",
-      "code": ":art:",
-      "description": "Improve structure / format of the code.",
-      "name": "art",
-      "semver": null
-    },
-    {
-      "emoji": "⚡️",
-      "entity": "⚡",
-      "code": ":zap:",
-      "description": "Improve performance.",
-      "name": "zap",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🔥",
-      "entity": "🔥",
-      "code": ":fire:",
-      "description": "Remove code or files.",
-      "name": "fire",
-      "semver": null
-    },
-    {
-      "emoji": "🐛",
-      "entity": "🐛",
-      "code": ":bug:",
-      "description": "Fix a bug.",
-      "name": "bug",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🚑️",
-      "entity": "🚑",
-      "code": ":ambulance:",
-      "description": "Critical hotfix.",
-      "name": "ambulance",
-      "semver": "patch"
-    },
-    {
-      "emoji": "✨",
-      "entity": "✨",
-      "code": ":sparkles:",
-      "description": "Introduce new features.",
-      "name": "sparkles",
-      "semver": "minor"
-    },
-    {
-      "emoji": "📝",
-      "entity": "📝",
-      "code": ":memo:",
-      "description": "Add or update documentation.",
-      "name": "memo",
-      "semver": null
-    },
-    {
-      "emoji": "🚀",
-      "entity": "🚀",
-      "code": ":rocket:",
-      "description": "Deploy stuff.",
-      "name": "rocket",
-      "semver": null
-    },
-    {
-      "emoji": "💄",
-      "entity": "&#ff99cc;",
-      "code": ":lipstick:",
-      "description": "Add or update the UI and style files.",
-      "name": "lipstick",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🎉",
-      "entity": "🎉",
-      "code": ":tada:",
-      "description": "Begin a project.",
-      "name": "tada",
-      "semver": null
-    },
-    {
-      "emoji": "✅",
-      "entity": "✅",
-      "code": ":white_check_mark:",
-      "description": "Add, update, or pass tests.",
-      "name": "white-check-mark",
-      "semver": null
-    },
-    {
-      "emoji": "🔒️",
-      "entity": "🔒",
-      "code": ":lock:",
-      "description": "Fix security or privacy issues.",
-      "name": "lock",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🔐",
-      "entity": "🔐",
-      "code": ":closed_lock_with_key:",
-      "description": "Add or update secrets.",
-      "name": "closed-lock-with-key",
-      "semver": null
-    },
-    {
-      "emoji": "🔖",
-      "entity": "🔖",
-      "code": ":bookmark:",
-      "description": "Release / Version tags.",
-      "name": "bookmark",
-      "semver": null
-    },
-    {
-      "emoji": "🚨",
-      "entity": "🚨",
-      "code": ":rotating_light:",
-      "description": "Fix compiler / linter warnings.",
-      "name": "rotating-light",
-      "semver": null
-    },
-    {
-      "emoji": "🚧",
-      "entity": "🚧",
-      "code": ":construction:",
-      "description": "Work in progress.",
-      "name": "construction",
-      "semver": null
-    },
-    {
-      "emoji": "💚",
-      "entity": "💚",
-      "code": ":green_heart:",
-      "description": "Fix CI Build.",
-      "name": "green-heart",
-      "semver": null
-    },
-    {
-      "emoji": "⬇️",
-      "entity": "⬇️",
-      "code": ":arrow_down:",
-      "description": "Downgrade dependencies.",
-      "name": "arrow-down",
-      "semver": "patch"
-    },
-    {
-      "emoji": "⬆️",
-      "entity": "⬆️",
-      "code": ":arrow_up:",
-      "description": "Upgrade dependencies.",
-      "name": "arrow-up",
-      "semver": "patch"
-    },
-    {
-      "emoji": "📌",
-      "entity": "📌",
-      "code": ":pushpin:",
-      "description": "Pin dependencies to specific versions.",
-      "name": "pushpin",
-      "semver": "patch"
-    },
-    {
-      "emoji": "👷",
-      "entity": "👷",
-      "code": ":construction_worker:",
-      "description": "Add or update CI build system.",
-      "name": "construction-worker",
-      "semver": null
-    },
-    {
-      "emoji": "📈",
-      "entity": "📈",
-      "code": ":chart_with_upwards_trend:",
-      "description": "Add or update analytics or track code.",
-      "name": "chart-with-upwards-trend",
-      "semver": "patch"
-    },
-    {
-      "emoji": "♻️",
-      "entity": "♻",
-      "code": ":recycle:",
-      "description": "Refactor code.",
-      "name": "recycle",
-      "semver": null
-    },
-    {
-      "emoji": "➕",
-      "entity": "➕",
-      "code": ":heavy_plus_sign:",
-      "description": "Add a dependency.",
-      "name": "heavy-plus-sign",
-      "semver": "patch"
-    },
-    {
-      "emoji": "➖",
-      "entity": "➖",
-      "code": ":heavy_minus_sign:",
-      "description": "Remove a dependency.",
-      "name": "heavy-minus-sign",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🔧",
-      "entity": "🔧",
-      "code": ":wrench:",
-      "description": "Add or update configuration files.",
-      "name": "wrench",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🔨",
-      "entity": "🔨",
-      "code": ":hammer:",
-      "description": "Add or update development scripts.",
-      "name": "hammer",
-      "semver": null
-    },
-    {
-      "emoji": "🌐",
-      "entity": "🌐",
-      "code": ":globe_with_meridians:",
-      "description": "Internationalization and localization.",
-      "name": "globe-with-meridians",
-      "semver": "patch"
-    },
-    {
-      "emoji": "✏️",
-      "entity": "",
-      "code": ":pencil2:",
-      "description": "Fix typos.",
-      "name": "pencil2",
-      "semver": "patch"
-    },
-    {
-      "emoji": "💩",
-      "entity": "",
-      "code": ":poop:",
-      "description": "Write bad code that needs to be improved.",
-      "name": "poop",
-      "semver": null
-    },
-    {
-      "emoji": "⏪️",
-      "entity": "⏪",
-      "code": ":rewind:",
-      "description": "Revert changes.",
-      "name": "rewind",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🔀",
-      "entity": "🔀",
-      "code": ":twisted_rightwards_arrows:",
-      "description": "Merge branches.",
-      "name": "twisted-rightwards-arrows",
-      "semver": null
-    },
-    {
-      "emoji": "📦️",
-      "entity": "&#1F4E6;",
-      "code": ":package:",
-      "description": "Add or update compiled files or packages.",
-      "name": "package",
-      "semver": "patch"
-    },
-    {
-      "emoji": "👽️",
-      "entity": "&#1F47D;",
-      "code": ":alien:",
-      "description": "Update code due to external API changes.",
-      "name": "alien",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🚚",
-      "entity": "&#1F69A;",
-      "code": ":truck:",
-      "description": "Move or rename resources (e.g.: files, paths, routes).",
-      "name": "truck",
-      "semver": null
-    },
-    {
-      "emoji": "📄",
-      "entity": "&#1F4C4;",
-      "code": ":page_facing_up:",
-      "description": "Add or update license.",
-      "name": "page-facing-up",
-      "semver": null
-    },
-    {
-      "emoji": "💥",
-      "entity": "💥",
-      "code": ":boom:",
-      "description": "Introduce breaking changes.",
-      "name": "boom",
-      "semver": "major"
-    },
-    {
-      "emoji": "🍱",
-      "entity": "&#1F371",
-      "code": ":bento:",
-      "description": "Add or update assets.",
-      "name": "bento",
-      "semver": "patch"
-    },
-    {
-      "emoji": "♿️",
-      "entity": "♿",
-      "code": ":wheelchair:",
-      "description": "Improve accessibility.",
-      "name": "wheelchair",
-      "semver": "patch"
-    },
-    {
-      "emoji": "💡",
-      "entity": "💡",
-      "code": ":bulb:",
-      "description": "Add or update comments in source code.",
-      "name": "bulb",
-      "semver": null
-    },
-    {
-      "emoji": "🍻",
-      "entity": "🍻",
-      "code": ":beers:",
-      "description": "Write code drunkenly.",
-      "name": "beers",
-      "semver": null
-    },
-    {
-      "emoji": "💬",
-      "entity": "💬",
-      "code": ":speech_balloon:",
-      "description": "Add or update text and literals.",
-      "name": "speech-balloon",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🗃️",
-      "entity": "🗃",
-      "code": ":card_file_box:",
-      "description": "Perform database related changes.",
-      "name": "card-file-box",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🔊",
-      "entity": "🔊",
-      "code": ":loud_sound:",
-      "description": "Add or update logs.",
-      "name": "loud-sound",
-      "semver": null
-    },
-    {
-      "emoji": "🔇",
-      "entity": "🔇",
-      "code": ":mute:",
-      "description": "Remove logs.",
-      "name": "mute",
-      "semver": null
-    },
-    {
-      "emoji": "👥",
-      "entity": "👥",
-      "code": ":busts_in_silhouette:",
-      "description": "Add or update contributor(s).",
-      "name": "busts-in-silhouette",
-      "semver": null
-    },
-    {
-      "emoji": "🚸",
-      "entity": "🚸",
-      "code": ":children_crossing:",
-      "description": "Improve user experience / usability.",
-      "name": "children-crossing",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🏗️",
-      "entity": "&#1f3d7;",
-      "code": ":building_construction:",
-      "description": "Make architectural changes.",
-      "name": "building-construction",
-      "semver": null
-    },
-    {
-      "emoji": "📱",
-      "entity": "📱",
-      "code": ":iphone:",
-      "description": "Work on responsive design.",
-      "name": "iphone",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🤡",
-      "entity": "🤡",
-      "code": ":clown_face:",
-      "description": "Mock things.",
-      "name": "clown-face",
-      "semver": null
-    },
-    {
-      "emoji": "🥚",
-      "entity": "🥚",
-      "code": ":egg:",
-      "description": "Add or update an easter egg.",
-      "name": "egg",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🙈",
-      "entity": "&#8bdfe7;",
-      "code": ":see_no_evil:",
-      "description": "Add or update a .gitignore file.",
-      "name": "see-no-evil",
-      "semver": null
-    },
-    {
-      "emoji": "📸",
-      "entity": "📸",
-      "code": ":camera_flash:",
-      "description": "Add or update snapshots.",
-      "name": "camera-flash",
-      "semver": null
-    },
-    {
-      "emoji": "⚗️",
-      "entity": "⚗",
-      "code": ":alembic:",
-      "description": "Perform experiments.",
-      "name": "alembic",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🔍️",
-      "entity": "🔍",
-      "code": ":mag:",
-      "description": "Improve SEO.",
-      "name": "mag",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🏷️",
-      "entity": "🏷",
-      "code": ":label:",
-      "description": "Add or update types.",
-      "name": "label",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🌱",
-      "entity": "🌱",
-      "code": ":seedling:",
-      "description": "Add or update seed files.",
-      "name": "seedling",
-      "semver": null
-    },
-    {
-      "emoji": "🚩",
-      "entity": "🚩",
-      "code": ":triangular_flag_on_post:",
-      "description": "Add, update, or remove feature flags.",
-      "name": "triangular-flag-on-post",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🥅",
-      "entity": "🥅",
-      "code": ":goal_net:",
-      "description": "Catch errors.",
-      "name": "goal-net",
-      "semver": "patch"
-    },
-    {
-      "emoji": "💫",
-      "entity": "💫",
-      "code": ":dizzy:",
-      "description": "Add or update animations and transitions.",
-      "name": "dizzy",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🗑️",
-      "entity": "🗑",
-      "code": ":wastebasket:",
-      "description": "Deprecate code that needs to be cleaned up.",
-      "name": "wastebasket",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🛂",
-      "entity": "🛂",
-      "code": ":passport_control:",
-      "description": "Work on code related to authorization, roles and permissions.",
-      "name": "passport-control",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🩹",
-      "entity": "🩹",
-      "code": ":adhesive_bandage:",
-      "description": "Simple fix for a non-critical issue.",
-      "name": "adhesive-bandage",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🧐",
-      "entity": "🧐",
-      "code": ":monocle_face:",
-      "description": "Data exploration/inspection.",
-      "name": "monocle-face",
-      "semver": null
-    },
-    {
-      "emoji": "⚰️",
-      "entity": "⚰",
-      "code": ":coffin:",
-      "description": "Remove dead code.",
-      "name": "coffin",
-      "semver": null
-    },
-    {
-      "emoji": "🧪",
-      "entity": "🧪",
-      "code": ":test_tube:",
-      "description": "Add a failing test.",
-      "name": "test-tube",
-      "semver": null
-    },
-    {
-      "emoji": "👔",
-      "entity": "👔",
-      "code": ":necktie:",
-      "description": "Add or update business logic.",
-      "name": "necktie",
-      "semver": "patch"
-    },
-    {
-      "emoji": "🩺",
-      "entity": "🩺",
-      "code": ":stethoscope:",
-      "description": "Add or update healthcheck.",
-      "name": "stethoscope",
-      "semver": null
-    },
-    {
-      "emoji": "🧱",
-      "entity": "🧱",
-      "code": ":bricks:",
-      "description": "Infrastructure related changes.",
-      "name": "bricks",
-      "semver": null
-    },
-    {
-      "emoji": "🧑‍💻",
-      "entity": "🧑‍💻",
-      "code": ":technologist:",
-      "description": "Improve developer experience.",
-      "name": "technologist",
-      "semver": null
-    },
-    {
-      "emoji": "💸",
-      "entity": "💸",
-      "code": ":money_with_wings:",
-      "description": "Add sponsorships or money related infrastructure.",
-      "name": "money-with-wings",
-      "semver": null
-    },
-    {
-      "emoji": "🧵",
-      "entity": "🧵",
-      "code": ":thread:",
-      "description": "Add or update code related to multithreading or concurrency.",
-      "name": "thread",
-      "semver": null
-    },
-    {
-      "emoji": "🦺",
-      "entity": "🦺",
-      "code": ":safety_vest:",
-      "description": "Add or update code related to validation.",
-      "name": "safety-vest",
-      "semver": null
-    }
-  ]
-}

CONTRIBUTING.md

@@ -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 2024:
+Here is the design of each stickers for year 2022:
 
-![iTop stickers 2024](.doc/contributing-guide/2024.contributing-stickers-side-by-side.png)
+![iTop stickers 2023](.doc/contributing-guide/2023.contributing-stickers-side-by-side.png)

README.md

@@ -1,9 +1,5 @@
-<p align="center"><a href="https://combodo.com" target="_blank">
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="/images/logos/logo-itop-baseline-light.svg">
-  <source media="(prefers-color-scheme: light)" srcset="/images/logos/logo-itop-baseline-dark.svg">
-  <img src="/images/logos/logo-itop-baseline-light.svg" width="350" alt="Logo iTop with baseline" />
-</picture>
+<p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
+    <img src="https://www.combodo.com/logos/logo-itop-baseline.svg" width=350>
 </a></p>
 
 
@@ -80,9 +76,7 @@ We would like to give a special thank you 🤗 to the people from the community
 
 ### Names
 
-- Al Hallak, Amr (a.k.a [@v4yne1](https://github.com/v4yne1))
 - Alves, David
-- Audon, Florian
 - Beck, Pedro
 - Beer, Christian (a.k.a [@ChristianBeer](https://www.github.com/ChristianBeer))
 - Bilger, Jean-François
@@ -94,44 +88,33 @@ We would like to give a special thank you 🤗 to the people from the community
 - Colantoni, Maria Laura
 - Couronné, Guy
 - Dejin, Bie (a.k.a [@bdejin](https://github.com/bdejin))
-- Delicado, Elodie
 - Dvořák, Lukáš
 - Goethals, Stefan
-- Giuva, Vincenzo Katriel (a.k.a [@DarkNight97boss](https://github.com/DarkNight97boss))
 - Gumble, David
-- Heloir, Arthur 
-- Janssens, Jelle (a.k.a [@janssensjelle](https://github.com/janssensjelle))
 - 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
 - Konečný, Kamil
 - Kunin, Vladimir
-- Lassiter, Denis (a.k.a [@delassiter](https://github.com/delassiter))
+- Lassiter, Dennis
 - Lazcano, Federico
 - Lucas, Jonathan
 - Malik, Remie
-- Mantel, Ina 
-- Martin, Pierre (a.k.a [@Worty](https://github.com/worty-syn))
-- Melchiorre, Romain
 - Mindêllo de Andrade, Lucas (a.k.a [@rokam](https://www.github.com/rokam))
 - Mozart de Oliveira, Eduardo (a.k.a [@eduardomozart](https://github.com/eduardomozart))
 - Raenker, Martin
 - Roháč, Richard (a.k.a [@RohacRichard](https://github.com/RohacRichard))
 - Rosenke, Stephan
-- Rossi, Tommaso (a.k.a [@tomrss](https://www.github.com/tomrss))
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Šafránek, Jaroslav (a.k.a [jkcinik](https://sourceforge.net/u/jkcinik/profile/) on SourceForge)
 - Seki, Shoji
 - Shilov, Vladimir
 - Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
-- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya-stukalov))
+- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
 - Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))
-- Toraya, Chairat (a.k.a [@Kyokito1412](https://github.com/Kyokito1412))
 - Tulio, Marco
 - Turrubiates, Miguel
-- Višnjić, Aldin (a.k.a[@viliald](https://github.com/viliald))
-- Vlk, Karel (a.k.a [@vlk-charles](https://www.github.com/vlk-charles))
 
 ### Aliases
 
@@ -152,6 +135,4 @@ We would like to give a special thank you 🤗 to the people from the community
 - [ITOMIG](https://www.itomig.de/)
 - [Pimkie](https://www.pimkie.com/)
 - [Super-Visions](https://www.super-visions.com/)
-- [Defence Tech Cyber Security - Malware Lab](https://github.com/DefenceTechSecurity)
-- Orange Cyberdefense
-- MipihSIB
+

addons/userrights/userrightsmatrix.class.inc.php

@@ -0,0 +1,362 @@
+<?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/>
+
+/**
+ * UserRightsMatrix (User management Module)
+ *
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserRightsMatrixClassGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclasses",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+class UserRightsMatrixClassStimulusGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclassesstimulus",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+class UserRightsMatrixAttributeGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixattributes",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+
+
+
+class UserRightsMatrix extends UserRightsAddOnAPI
+{
+	static public $m_aActionCodes = array(
+		UR_ACTION_READ => 'read',
+		UR_ACTION_MODIFY => 'modify',
+		UR_ACTION_DELETE => 'delete',
+		UR_ACTION_BULK_READ => 'bulk read',
+		UR_ACTION_BULK_MODIFY => 'bulk modify',
+		UR_ACTION_BULK_DELETE => 'bulk delete',
+	);
+
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		// Maybe we should check that no other user with userid == 0 exists
+		$oUser = new UserLocal();
+		$oUser->Set('login', $sAdminUser);
+		$oUser->Set('password', $sAdminPwd);
+		$oUser->Set('contactid', 1); // one is for root !
+		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+
+		// Now record the admin user object
+		$iUserId = $oUser->DBInsertNoReload();
+		$this->SetupUser($iUserId, true);
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	// Deprecated - create a new module !
+	public function Setup()
+	{
+		// Users must be added manually
+		// This procedure will then update the matrix when a new user is found or a new class/attribute appears
+		$oUserSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT User"));
+		while ($oUser = $oUserSet->Fetch())
+		{
+			$this->SetupUser($oUser->GetKey());
+		}
+		return true;
+	}
+
+	protected function SetupUser($iUserId, $bNewUser = false)
+	{
+		foreach(array('bizmodel', 'application', 'gui', 'core/cmdb') as $sCategory)
+		{
+			foreach (MetaModel::GetClasses($sCategory) as $sClass)
+			{
+				foreach (self::$m_aActionCodes as $iActionCode => $sAction)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("action", $sAction);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassStimulusGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("stimulus", $sStimulusCode);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::GetAttributesList($sClass) as $sAttCode)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						foreach (array('read', 'modify') as $sAction)
+						{
+							// Create a new entry
+							$oMyAttGrant = MetaModel::NewObject("UserRightsMatrixAttributeGrant");
+							$oMyAttGrant->Set("userid", $iUserId);
+							$oMyAttGrant->Set("class", $sClass);
+							$oMyAttGrant->Set("attcode", $sAttCode);
+							$oMyAttGrant->Set("action", $sAction);
+							$oMyAttGrant->Set("permission", "yes");
+							$iId = $oMyAttGrant->DBInsertNoReload();
+						}
+					}
+				}
+			}
+		}
+		/*
+		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
+		if ($bNewUser)
+		{
+			$bAddMenu = true;
+		}
+		else
+		{
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT menuNode WHERE type = 'user' AND parent_id = 0 AND user_id = $iUserId"));
+			$bAddMenu = ($oSet->Count() < 1);
+		}
+		if ($bAddMenu)
+		{
+			$oMenu = MetaModel::NewObject('menuNode');
+			$oMenu->Set('type', 'user');
+			$oMenu->Set('parent_id', 0);	// It's a toplevel entry
+			$oMenu->Set('rank', 6);			// Located just above the Admin Tools section (=7)
+			$oMenu->Set('name', 'My Bookmarks');
+			$oMenu->Set('label', 'My Favorite Items');
+			$oMenu->Set('hyperlink', 'UI.php');
+			$oMenu->Set('template', '<p></p><p></p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:32px;">My bookmarks</p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:14px;"><i>This section contains my most favorite search results</i></p>');
+			$oMenu->Set('user_id', $iUserId);
+			$oMenu->DBInsert();
+		}
+		*/
+	}
+
+
+	public function Init()
+	{
+		// Could be loaded in a shared memory (?)
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsMatrix');
+
+?>

addons/userrights/userrightsnull.class.inc.php

@@ -0,0 +1,78 @@
+<?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/>
+
+/**
+ * UserRightsNull
+ * User management Module - say Yeah! to everything
+ *
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class UserRightsNull extends UserRightsAddOnAPI
+{
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return true;
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return true;
+	}
+
+	public function Init()
+	{
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsNull');
+
+?>

addons/userrights/userrightsprofile.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -825,37 +825,48 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		{
 			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
 			// We have to answer NO for objects shared for reading purposes
-			if (self::HasSharing() && SharedObject::GetSharedClassProperties($sClass)) {
-				// This class is shared, GetSelectFilter may allow some objects for read only
-				// But currently we are checking whether the objects might be written...
-				// Let's exclude the objects based on the relevant criteria
+			if (self::HasSharing())
+			{
+				$aClassProps = SharedObject::GetSharedClassProperties($sClass);
+				if ($aClassProps)
+				{
+					// This class is shared, GetSelectFilter may allow some objects for read only
+					// But currently we are checking wether the objects might be written...
+					// Let's exclude the objects based on the relevant criteria
 
-				// Use $oInstanceSet only if sClass is the main class
-				if (!is_a($oInstanceSet->GetClass(), $sClass, true)) {
-					/** @var \DBObjectSet $oInstanceSet */
-					throw new CoreException(__FUNCTION__.': Expecting object set to be of class '.$sClass.' but it is of class '.$oInstanceSet->GetClass(), ['OQL_Query' => $oInstanceSet->GetFilter()->ToOQL(), 'classes' => $oInstanceSet->GetSelectedClasses()]);
-				}
-				$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
-				if (!is_null($sOrgAttCode)) {
-					$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-					if (!is_null($aUserOrgs) && count($aUserOrgs) > 0) {
-						$iCountNO = 0;
-						$iCountYES = 0;
-						$oInstanceSet->Rewind();
-						while ($oObject = $oInstanceSet->Fetch()) {
-							$iOrg = $oObject->Get($sOrgAttCode);
-							if (in_array($iOrg, $aUserOrgs)) {
-								$iCountYES++;
-							} else {
-								$iCountNO++;
+					$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
+					if (!is_null($sOrgAttCode))
+					{
+						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+						if (!is_null($aUserOrgs) && count($aUserOrgs) > 0)
+						{
+							$iCountNO = 0;
+							$iCountYES = 0;
+							$oInstanceSet->Rewind();
+							while($oObject = $oInstanceSet->Fetch())
+							{
+								$iOrg = $oObject->Get($sOrgAttCode);
+								if (in_array($iOrg, $aUserOrgs))
+								{
+									$iCountYES++;
+								}
+								else
+								{
+									$iCountNO++;
+								}
+							}
+							if ($iCountNO == 0)
+							{
+								$iPermission = UR_ALLOWED_YES;
+							}
+							elseif ($iCountYES == 0)
+							{
+								$iPermission = UR_ALLOWED_NO;
+							}
+							else
+							{
+								$iPermission = UR_ALLOWED_DEPENDS;
 							}
-						}
-						if ($iCountNO == 0) {
-							$iPermission = UR_ALLOWED_YES;
-						} elseif ($iCountYES == 0) {
-							$iPermission = UR_ALLOWED_NO;
-						} else {
-							$iPermission = UR_ALLOWED_DEPENDS;
 						}
 					}
 				}
@@ -971,3 +982,4 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 UserRights::SelectModule('UserRightsProfile');
 
+?>

app.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2013-2024 Combodo SAS
+ * Copyright (C) 2013-2023 Combodo SARL
  *
  * This file is part of iTop.
  *

application/DBSearchHelper.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/Html2Text.php

@@ -0,0 +1,331 @@
+<?php
+namespace Html2Text;
+
+if (!function_exists('mb_split'))
+{
+	function mb_split($pattern, $subject, $limit = -1)
+	{
+		return preg_split('/'.$pattern.'/', $subject, $limit);
+	}
+}
+/**
+ * Replace all occurrences of the search string with the replacement string.
+ *
+ * @author Sean Murphy <sean@iamseanmurphy.com>
+ * @copyright Copyright 2012 Sean Murphy. All rights reserved.
+ * @license http://creativecommons.org/publicdomain/zero/1.0/
+ * @link http://php.net/manual/function.str-replace.php
+ *
+ * @param mixed $search
+ * @param mixed $replace
+ * @param mixed $subject
+ * @param int $count
+ * @return mixed
+ */
+function mb_str_replace($search, $replace, $subject, &$count = 0) {
+	if (!is_array($subject)) {
+		// Normalize $search and $replace so they are both arrays of the same length
+		$searches = is_array($search) ? array_values($search) : array($search);
+		$replacements = is_array($replace) ? array_values($replace) : array($replace);
+		$replacements = array_pad($replacements, count($searches), '');
+		foreach ($searches as $key => $search) {
+			$parts = mb_split(preg_quote($search), $subject);
+			if (is_array($parts))
+			{
+				$count += count($parts) - 1;
+				$subject = implode($replacements[$key], $parts);
+			}
+		}
+	} else {
+		// Call mb_str_replace for each subject in array, recursively
+		foreach ($subject as $key => $value) {
+			$subject[$key] = mb_str_replace($search, $replace, $value, $count);
+		}
+	}
+	return $subject;
+}
+
+/******************************************************************************
+ * Copyright (c) 2010 Jevon Wright and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * or
+ *
+ * LGPL which is available at http://www.gnu.org/licenses/lgpl.html
+ *
+ *
+ * Contributors:
+ *    Jevon Wright - initial API and implementation
+ *    Denis Flaven - some fixes for properly handling UTF-8 characters
+ ****************************************************************************/
+
+class Html2Text {
+
+	/**
+	 * Tries to convert the given HTML into a plain text format - best suited for
+	 * e-mail display, etc.
+	 *
+	 * <p>In particular, it tries to maintain the following features:
+	 * <ul>
+	 *   <li>Links are maintained, with the 'href' copied over
+	 *   <li>Information in the &lt;head&gt; is lost
+	 * </ul>
+	 *
+	 * @param string html the input HTML
+	 * @return string the HTML converted, as best as possible, to text
+	 * @throws Html2TextException if the HTML could not be loaded as a {@link DOMDocument}
+	 */
+	static function convert($html) {
+		// replace &nbsp; with spaces
+
+		$html = str_replace("&nbsp;", " ", $html);
+		$html = mb_str_replace("\xc2\xa0", " ", $html); // DO NOT USE str_replace since it breaks the "à" character which is \xc3 \xa0 in UTF-8
+
+		$html = static::fixNewlines($html);
+
+		$doc = new \DOMDocument();
+		if (!@$doc->loadHTML('<?xml encoding="UTF-8">'.$html)) // Forces the UTF-8 character set for HTML fragments
+		{
+			throw new Html2TextException("Could not load HTML - badly formed?", $html);
+		}
+
+		$output = static::iterateOverNode($doc);
+
+		// remove leading and trailing spaces on each line
+		$output = preg_replace("/[ \t]*\n[ \t]*/im", "\n", $output);
+		$output = preg_replace("/ *\t */im", "\t", $output);
+
+		// remove unnecessary empty lines
+		$output = preg_replace("/\n\n\n*/im", "\n\n", $output);
+
+		// remove leading and trailing whitespace
+		$output = trim($output);
+
+		return $output;
+	}
+
+	/**
+	 * Unify newlines; in particular, \r\n becomes \n, and
+	 * then \r becomes \n. This means that all newlines (Unix, Windows, Mac)
+	 * all become \ns.
+	 *
+	 * @param string text text with any number of \r, \r\n and \n combinations
+	 * @return string the fixed text
+	 */
+	static function fixNewlines($text) {
+		// replace \r\n to \n
+		$text = str_replace("\r\n", "\n", $text);
+		// remove \rs
+		$text = str_replace("\r", "\n", $text);
+
+		return $text;
+	}
+
+	static function nextChildName($node) {
+		// get the next child
+		$nextNode = $node->nextSibling;
+		while ($nextNode != null) {
+			if ($nextNode instanceof \DOMElement) {
+				break;
+			}
+			$nextNode = $nextNode->nextSibling;
+		}
+		$nextName = null;
+		if ($nextNode instanceof \DOMElement && $nextNode != null) {
+			$nextName = strtolower($nextNode->nodeName);
+		}
+
+		return $nextName;
+	}
+
+	static function prevChildName($node) {
+		// get the previous child
+		$nextNode = $node->previousSibling;
+		while ($nextNode != null) {
+			if ($nextNode instanceof \DOMElement) {
+				break;
+			}
+			$nextNode = $nextNode->previousSibling;
+		}
+		$nextName = null;
+		if ($nextNode instanceof \DOMElement && $nextNode != null) {
+			$nextName = strtolower($nextNode->nodeName);
+		}
+
+		return $nextName;
+	}
+
+	static function iterateOverNode($node) {
+		if ($node instanceof \DOMText) {
+		  // Replace whitespace characters with a space (equivilant to \s)
+			return preg_replace("/[\\t\\n\\f\\r ]+/im", " ", $node->wholeText);
+		}
+		if ($node instanceof \DOMDocumentType) {
+			// ignore
+			return "";
+		}
+
+		$nextName = static::nextChildName($node);
+		$prevName = static::prevChildName($node);
+
+		$name = strtolower($node->nodeName);
+
+		// start whitespace
+		switch ($name) {
+			case "hr":
+				return "---------------------------------------------------------------\n";
+
+			case "style":
+			case "head":
+			case "title":
+			case "meta":
+			case "script":
+				// ignore these tags
+				return "";
+
+			case "h1":
+			case "h2":
+			case "h3":
+			case "h4":
+			case "h5":
+			case "h6":
+			case "ol":
+			case "ul":
+				// add two newlines, second line is added below
+				$output = "\n";
+				break;
+
+			case "td":
+			case "th":
+				// add tab char to separate table fields
+			   $output = "\t";
+			   break;
+
+			case "tr":
+			case "p":
+			case "div":
+				// add one line
+				$output = "\n";
+				break;
+
+			case "li":
+				$output = "- ";
+				break;
+
+			default:
+				// print out contents of unknown tags
+				$output = "";
+				break;
+		}
+
+		// debug
+		//$output .= "[$name,$nextName]";
+
+		if (isset($node->childNodes)) {
+			for ($i = 0; $i < $node->childNodes->length; $i++) {
+				$n = $node->childNodes->item($i);
+
+				$text = static::iterateOverNode($n);
+
+				$output .= $text;
+			}
+		}
+
+		// end whitespace
+		switch ($name) {
+			case "h1":
+			case "h2":
+			case "h3":
+			case "h4":
+			case "h5":
+			case "h6":
+				$output .= "\n";
+				break;
+
+			case "p":
+			case "br":
+				// add one line
+				if ($nextName != "div")
+					$output .= "\n";
+				break;
+
+			case "div":
+				// add one line only if the next child isn't a div
+				if ($nextName != "div" && $nextName != null)
+					$output .= "\n";
+				break;
+
+			case "a":
+				// links are returned in [text](link) format
+				$href = $node->getAttribute("href");
+
+				$output = trim($output);
+
+				// remove double [[ ]] s from linking images
+				if (substr($output, 0, 1) == "[" && substr($output, -1) == "]") {
+					$output = substr($output, 1, strlen($output) - 2);
+
+					// for linking images, the title of the <a> overrides the title of the <img>
+					if ($node->getAttribute("title")) {
+						$output = $node->getAttribute("title");
+					}
+				}
+
+				// if there is no link text, but a title attr
+				if (!$output && $node->getAttribute("title")) {
+					$output = $node->getAttribute("title");
+				}
+
+				if ($href == null) {
+					// it doesn't link anywhere
+					if ($node->getAttribute("name") != null) {
+						$output = "[$output]";
+					}
+				} else {
+					if ($href == $output || $href == "mailto:$output" || $href == "http://$output" || $href == "https://$output") {
+						// link to the same address: just use link
+						$output;
+					} else {
+						// replace it
+						if ($output) {
+							$output = "[$output]($href)";
+						} else {
+							// empty string
+							$output = $href;
+						}
+					}
+				}
+
+				// does the next node require additional whitespace?
+				switch ($nextName) {
+					case "h1": case "h2": case "h3": case "h4": case "h5": case "h6":
+						$output .= "\n";
+						break;
+				}
+				break;
+
+			case "img":
+				if ($node->getAttribute("title")) {
+					$output = "[" . $node->getAttribute("title") . "]";
+				} elseif ($node->getAttribute("alt")) {
+					$output = "[" . $node->getAttribute("alt") . "]";
+				} else {
+					$output = "";
+				}
+				break;
+
+			case "li":
+				$output .= "\n";
+				break;
+
+			default:
+				// do nothing
+		}
+
+		return $output;
+	}
+
+}

application/Html2TextException.php

@@ -0,0 +1,28 @@
+<?php
+
+/******************************************************************************
+ * Copyright (c) 2010 Jevon Wright and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * or
+ *
+ * LGPL which is available at http://www.gnu.org/licenses/lgpl.html
+ *
+ *
+ * Contributors:
+ *    Jevon Wright - initial API and implementation
+ ****************************************************************************/
+
+namespace Html2Text;
+
+class Html2TextException extends \Exception {
+	var $more_info;
+
+	public function __construct($message = "", $more_info = "") {
+		parent::__construct($message);
+		$this->more_info = $more_info;
+	}
+}

application/ajaxwebpage.class.inc.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ */
+
+// 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
+ *
+ * @deprecated 3.0.0 will be removed in 3.1.0 - moved to AjaxPage
+ */
+class ajax_page extends AjaxPage
+{
+	function __construct($s_title)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('ajax_page is deprecated. Please use AjaxPage instead');
+		parent::__construct($s_title);
+	}
+}
+

application/application.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/applicationcontext.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * Class ApplicationContext
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -195,31 +195,16 @@ class ApplicationContext
 	/**
 	 * Returns the context as string with the format name1=value1&name2=value2....
 	 * @return string The context as a string to be appended to an href property
-	 *
 	 */
-	public function GetForLink(bool $bWithLeadingAmpersand = false)
+	public function GetForLink()
 	{
-		// If there are no parameters, return an empty string
-		if(empty($this->aValues)){
-			return '';
-		}
-
-		// Build the query string with ampersand separated parameters
 		$aParams = array();
 		foreach($this->aValues as $sName => $sValue)
 		{
 			$aParams[] = "c[$sName]".'='.urlencode($sValue);
 		}
-		$sReturnValue = implode('&', $aParams);
-
-		// add the leading ampersand if requested
-		if($bWithLeadingAmpersand){
-			$sReturnValue = '&' . $sReturnValue;
-		}
-
-		return $sReturnValue;
+		return implode("&", $aParams);
 	}
-
 	/**
 	 * @since 3.0.0 N°2534 - dashboard: bug with autorefresh that deactivates filtering on organisation
 	 * Returns the params as c[menu]:..., c[org_id]:....
@@ -397,7 +382,7 @@ class ApplicationContext
 		$sUrl = call_user_func(array($sUrlMakerClass, 'MakeObjectUrl'), $sObjClass, $sObjKey);
 	   if (utils::StrLen($sUrl) > 0) {
 		   if ($bWithNavigationContext) {
-			   return $sUrl.$oAppContext->GetForLink(true);
+			   return $sUrl."&".$oAppContext->GetForLink();
 		   } else {
 			   return $sUrl;
 		   }

application/applicationextension.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2013-2024 Combodo SAS
+ * Copyright (C) 2013-2023 Combodo SARL
  *
  * This file is part of iTop.
  *
@@ -31,7 +31,7 @@ require_once(APPROOT.'application/newsroomprovider.class.inc.php');
  * Definition of interfaces that can be implemented to customize iTop.
  * You may implement such interfaces in a module file (e.g. main.mymodule.php)
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @since       2.7.0
  */
@@ -64,13 +64,13 @@ interface iLoginFSMExtension extends iLoginExtension
 	 * If a page is displayed, the action must exit at this point
 	 * if LoginWebPage::LOGIN_FSM_RETURN_ERROR is returned $iErrorCode must be set
 	 * if LoginWebPage::LOGIN_FSM_RETURN_OK is returned then the login is OK and terminated
-	 * if LoginWebPage::LOGIN_FSM_CONTINUE is returned then the FSM will proceed to next plugin or state
+	 * if LoginWebPage::LOGIN_FSM_RETURN_IGNORE is returned then the FSM will proceed to next plugin or state
 	 *
 	 * @api
 	 * @param string $sLoginState (see LoginWebPage::LOGIN_STATE_...)
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	public function LoginAction($sLoginState, &$iErrorCode);
 }
@@ -83,7 +83,7 @@ interface iLoginFSMExtension extends iLoginExtension
  *  * If a page is displayed, the action must exit at this point
  *  * if LoginWebPage::LOGIN_FSM_RETURN_ERROR is returned $iErrorCode must be set
  *  * if LoginWebPage::LOGIN_FSM_RETURN_OK is returned then the login is OK and terminated
- *  * if LoginWebPage::LOGIN_FSM_CONTINUE is returned then the FSM will proceed to next plugin or to next state
+ *  * if LoginWebPage::LOGIN_FSM_RETURN_IGNORE is returned then the FSM will proceed to next plugin or to next state
  *
  * @api
  * @package LoginExtensibilityAPI
@@ -136,7 +136,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnStart(&$iErrorCode)
 	{
@@ -150,7 +150,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnModeDetection(&$iErrorCode)
 	{
@@ -167,7 +167,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnReadCredentials(&$iErrorCode)
 	{
@@ -181,7 +181,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
@@ -192,7 +192,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
@@ -203,7 +203,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnUsersOK(&$iErrorCode)
 	{
@@ -214,7 +214,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnConnected(&$iErrorCode)
 	{
@@ -225,7 +225,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnError(&$iErrorCode)
 	{
@@ -1158,6 +1158,61 @@ class JSButtonItem extends JSPopupMenuItem
 
 }
 
+/**
+ * Implement this interface to add content to any iTopWebPage
+ *
+ * There are 3 places where content can be added:
+ *
+ * * The north pane: (normaly empty/hidden) at the top of the page, spanning the whole
+ *   width of the page
+ * * The south pane: (normaly empty/hidden) at the bottom of the page, spanning the whole
+ *   width of the page
+ * * The admin banner (two tones gray background) at the left of the global search.
+ *   Limited space, use it for short messages
+ *
+ * Each of the methods of this interface is supposed to return the HTML to be inserted at
+ * the specified place and can use the passed iTopWebPage object to add javascript or CSS definitions
+ *
+ * @api
+ * @package     UIExtensibilityAPI
+ * @since 2.0
+ * @deprecated 3.0.0 If you need to include:
+ *   * JS/CSS files/snippets, use {@see \iBackofficeLinkedScriptsExtension}, {@see \iBackofficeLinkedStylesheetsExtension}, etc instead
+ *   * HTML (and optionally JS/CSS), use {@see \iPageUIBlockExtension} to manipulate {@see \Combodo\iTop\Application\UI\Base\UIBlock} instead
+ */
+interface iPageUIExtension
+{
+	/**
+	 * Add content to the header of the page
+	 *
+	 * @api
+	 * @param iTopWebPage $oPage The page to insert stuff into.
+	 *
+	 * @return string The HTML content to add into the page
+	 */
+	public function GetNorthPaneHtml(iTopWebPage $oPage);
+
+	/**
+	 * Add content to the footer of the page
+	 *
+	 * @api
+	 * @param iTopWebPage $oPage The page to insert stuff into.
+	 *
+	 * @return string The HTML content to add into the page
+	 */
+	public function GetSouthPaneHtml(iTopWebPage $oPage);
+
+	/**
+	 * Add content to the "admin banner"
+	 *
+	 * @api
+	 * @param iTopWebPage $oPage The page to insert stuff into.
+	 *
+	 * @return string The HTML content to add into the page
+	 */
+	public function GetBannerHtml(iTopWebPage $oPage);
+}
+
 /**
  * Implement this interface to add content to any iTopWebPage
  *
@@ -1205,7 +1260,43 @@ interface iPageUIBlockExtension
 }
 
 /**
- * Extend this class instead of iPageUIBlockExtension if you don't need to overload all methods
+ * Extend this class instead of iPageUIExtension if you don't need to overload all methods
+ *
+ * @api
+ * @package     UIExtensibilityAPI
+ * @since       2.7.0
+ * @deprecated 3.0.0 use AbstractPageUIBlockExtension instead
+ */
+abstract class AbstractPageUIExtension implements iPageUIExtension
+{
+	/**
+	 * @inheritDoc
+	 */
+	public function GetNorthPaneHtml(iTopWebPage $oPage)
+	{
+		return '';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function GetSouthPaneHtml(iTopWebPage $oPage)
+	{
+		return '';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function GetBannerHtml(iTopWebPage $oPage)
+	{
+		return '';
+	}
+
+}
+
+/**
+ * Extend this class instead of iPageUIExtension if you don't need to overload all methods
  *
  * @api
  * @package     UIBlockExtensibilityAPI
@@ -1366,23 +1457,6 @@ interface iBackofficeStyleExtension
 	public function GetStyle(): string;
 }
 
-/**
- * Implement this interface to add sass file (SCSS) to the backoffice pages.
- * example: return "css/setup.scss"
- *
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.3.0
- */
-interface iBackofficeSassExtension
-{
-	/**
-	 * @api
-	 * @see \iTopWebPage::$a_styles
-	 * @return string
-	 */
-	public function GetSass(): string;
-}
 /**
  * Implement this interface to add Dict entries
  *
@@ -1637,16 +1711,6 @@ interface iRestServiceProvider
 	public function ExecOperation($sVersion, $sVerb, $aParams);
 }
 
-/**
- * A REST service provider implementing this interface will have its input JSON data sanitized for logging purposes
- * @since 2.7.13, 3.2.1-1
- * @see \iRestServiceProvider
- */
-interface iRestInputSanitizer
-{
-	public function SanitizeJsonInput(string $sJsonInput): string;
-}
-
 /**
  * Minimal REST response structure. Derive this structure to add response data and error codes.
  *
@@ -1738,14 +1802,6 @@ class RestResult
 	 * @api
 	 */
 	public $message;
-	
-	/**
-	 * Sanitize the content of this result to hide sensitive information
-	 */
-	public function SanitizeContent()
-	{
-		// The default implementation does nothing
-	}
 }
 
 /**
@@ -2043,16 +2099,8 @@ class RestUtils
 		elseif (is_string($key))
 		{
 			// OQL
-            try {
-                $oSearch = DBObjectSearch::FromOQL($key);
-            } catch (Exception $e) {
-                throw new CoreOqlException('Query failed to execute', [
-                        'query' => $key,
-                        'exception_class' => get_class($e),
-                        'exception_message' => $e->getMessage(),
-                ]);
-            }
-        }
+			$oSearch = DBObjectSearch::FromOQL($key);
+		}
 		else
 		{
 			throw new Exception("Wrong format for key");
@@ -2225,91 +2273,4 @@ 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;
-}
-
-
-/**
- * Interface to provide messages to be displayed in the "Welcome Popup"
- *
- * @api
- * @since 3.2.0
- */
-interface iWelcomePopupExtension
-{
-	// Importance for ordering messages
-	// Just two levels since less important messages have nothing to do in the welcome popup
-	public const ENUM_IMPORTANCE_CRITICAL = 0;
-	public const ENUM_IMPORTANCE_HIGH = 1;
-	public const DEFAULT_IMPORTANCE = self::ENUM_IMPORTANCE_HIGH;
-
-	/**
-	 * Overload this method if you need to display an icon representing the provider (eg. your own company logo, module icon, ...)
-	 *
-	 * @api
-	 * @return string Relative path (from app. root) of the icon representing the provider
-	 */
-	public function GetIconRelPath(): string;
-
-	/**
-	 * @api
-	 * @return \Combodo\iTop\Application\WelcomePopup\Message[]
-	 */
-	public function GetMessages(): array;
-
-	/**
-	 * Overload this method if the provider needs to do some additional processing after the message ($sMessageId) has been acknowledged by the current user
-	 *
-	 * @param string $sMessageId
-	 * @api
-	 */
-	public function AcknowledgeMessage(string $sMessageId): void;
-}
-
-/**
- * Inherit from this class to provide messages to be displayed in the "Welcome Popup"
- *
- * @api
- * @since 3.2.0
- */
-abstract class AbstractWelcomePopupExtension implements iWelcomePopupExtension
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function GetIconRelPath(): string
-	{
-		return \Combodo\iTop\Application\Branding::$aLogoPaths[\Combodo\iTop\Application\Branding::ENUM_LOGO_TYPE_MAIN_LOGO_COMPACT]['default'];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetMessages(): array
-	{
-		return [];
-	}
-	
-	/**
-	 * @inheritDoc
-	 */
-	public function AcknowledgeMessage(string $sMessageId): void
-	{
-		// No need to process the acknowledgment notice by default
-		return;
-	}
 }

application/audit.category.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -22,7 +22,7 @@
  * to check and is linked to a set of rules that determine the valid or invalid objects
  * inside the set
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/audit.domain.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -22,7 +22,7 @@
  * to check and is linked to a set of rules that determine the valid or invalid objects
  * inside the set
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/audit.rule.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -23,7 +23,7 @@
  * or the "bad" ones. The core audit engines computes the complement to the definition
  * set when needed to obtain either the valid objects, or the ones with an error
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/capturewebpage.class.inc.php

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

application/clipage.class.inc.php

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

application/cmdbabstract.class.inc.php

@@ -1,10 +1,9 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @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;
@@ -311,7 +310,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		{
 			$sParams .= $sName.'='.urlencode($value).'&'; // Always add a trailing &
 		}
-		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/'.$oObj->GetUIPage().'?'.$sParams.'class='.get_class($oObj).'&id='.$oObj->getKey().$oAppContext->GetForLink(true).'&a=1';
+		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/'.$oObj->GetUIPage().'?'.$sParams.'class='.get_class($oObj).'&id='.$oObj->getKey().'&'.$oAppContext->GetForLink().'&a=1';
 		$oPage->add_early_script(<<<JS
 	if (!sessionStorage.getItem('$sSessionStorageKey'))
 	{
@@ -698,10 +697,10 @@ HTML
 			$sLinkedClass = $oAttDef->GetLinkedClass();
 
 			// Filter out links pointing to obsolete objects (if relevant)
-            $oOrmLinkSet = $this->Get($sAttCode);
-            $oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
-            $iCount = $oLinkSet->Count();
+			$oOrmLinkSet = $this->Get($sAttCode);
+			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
 
+			$iCount = $oLinkSet->Count();
 			if ($this->IsNew()) {
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
 			} else {
@@ -766,9 +765,9 @@ HTML
 				$oPage->add($sHTMLValue);
 			} else {
 				if ($oAttDef->IsIndirect()) {
-					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly, $iCount);
+					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				} else {
-					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly, $iCount);
+					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				}
 				$oPage->AddUiBlock($oBlockLinkSetViewTable);
 			}
@@ -805,16 +804,16 @@ HTML
 		if (!$this->IsNew()) {
 			// Look for any trigger that considers this object as "In Scope"
 			// If any trigger has been found then display a tab with notifications
-			// If all triggers on an object have been deleted, we consider that we no longer need the event notification information
+			//
 			$aTriggers = $this->GetRelatedTriggersIDs();
 			if (count($aTriggers) > 0) {
 				$iId = $this->GetKey();
-				$aParams = array('class' => get_class($this), 'id' => $iId);
+				$aParams = array('triggers' => $aTriggers, 'id' => $iId);
 				$aNotifSearches = array();
 				$iNotifsCount = 0;
 				$aNotificationClasses = MetaModel::EnumChildClasses('EventNotification');
 				foreach ($aNotificationClasses as $sNotifClass) {
-					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev WHERE Ev.object_id = :id AND Ev.object_class = :class");
+					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev JOIN Trigger AS T ON Ev.trigger_id = T.id WHERE T.id IN (:triggers) AND Ev.object_id = :id");
 					$aNotifSearches[$sNotifClass]->SetInternalParams($aParams);
 					$oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], array());
 					$iNotifsCount += $oNotifSet->Count();
@@ -1061,6 +1060,11 @@ HTML
 			}
 		}
 
+		// Fields with CKEditor need to have the highlight.js lib loaded even if they are in read-only, as it is needed to format code snippets
+		if ($bHasFieldsWithRichTextEditor) {
+			WebResourcesHelper::EnableCKEditorToWebPage($oPage);
+		}
+
 		return $aFieldsMap;
 	}
 
@@ -1113,10 +1117,8 @@ HTML
 		}
 
 		// Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage.
-		/** @var \iTopWebPage $oPage */
-		$oKPI = new ExecutionKPI();
+		/** @var iTopWebPage $oPage */
 		$aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareHeader');
 		if (false === empty($aHeadersBlocks['subtitle'])) {
 			$oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']);
 		}
@@ -1129,12 +1131,8 @@ HTML
 		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB, '', $oObjectDetails);
 		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
 		$oPage->SetCurrentTab('UI:PropertiesTab');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareProperties($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareProperties');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareRelations($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareRelations');
 
 
 		// Note: Adding the JS snippet which enables the image upload should have been done directly by the ActivityPanel which would have kept the independance principle
@@ -1337,7 +1335,7 @@ HTML
 					}
 				}
 			}
-            $aHeader['friendlyname'] = ['label' => MetaModel::GetName($sClassName)];
+
 			foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
 				$sColLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx) : $sAttCodeEx;
 
@@ -1358,7 +1356,6 @@ HTML
 			$aRow = [];
 			foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
 				$oObj = $aObjects[$sAlias];
-                $aRow["friendlyname"] = $oObj->Get('friendlyname');
 				foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
 					if (is_null($oObj)) {
 						$aRow[$oAttDef->GetCode()] = '';
@@ -2310,7 +2307,7 @@ JS
 					$sHidden = "<input type=\"hidden\" id=\"{$iId}_count\" value=\"$iEntriesCount\"/>"; // To know how many entries the case log already contains
 
 					$sHTMLValue = "$sHeader<div class=\"ibo-caselog-entry-form--text-input\" $sStyle data-role=\"ibo-caselog-entry-form--text-input\">";
-					$sHTMLValue .= "<textarea class=\"htmlEditor ibo-input-richtext-placeholder\" style=\"border:0;width:100%\" title=\"$sHelpText\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" rows=\"8\" cols=\"40\" id=\"$iId\">".CKEditorHelper::PrepareCKEditorValueTextEncodingForTextarea($sEditValue)."</textarea>";
+					$sHTMLValue .= "<textarea class=\"htmlEditor ibo-input-richtext-placeholder\" style=\"border:0;width:100%\" title=\"$sHelpText\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" rows=\"8\" cols=\"40\" id=\"$iId\">".utils::EscapeHtml($sEditValue)."</textarea>";
 					$sHTMLValue .= "$sPreviousLog</div>{$sValidationSpan}{$sReloadSpan}$sHidden";
 
 					// Note: This should be refactored for all types of attribute (see at the end of this function) but as we are doing this for a maintenance release, we are scheduling it for the next main release in to order to avoid regressions as much as possible.
@@ -2322,10 +2319,39 @@ JS
 
 					$oPage->add_ready_script("$('#$iId').on('keyup change validate', function(evt, sFormId) { return ValidateCaseLogField('$iId', $bMandatory, sFormId, $sNullValue, $sOriginalValue) } );"); // Custom validation function
 
-					// configure CKEditor
-					CKEditorHelper::ConfigureCKEditorElementForWebPage($oPage, $iId, $sOriginalValue, true, [
-						'placeholder' => Dict::S('UI:CaseLogTypeYourTextHere'),
-					]);
+					// Replace the text area with CKEditor
+					// 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['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(
+<<<EOF
+$('#$iId').on('update', function(evt){
+	BlockField('cke_$iId', $('#$iId').attr('disabled'));
+	//Delayed execution - ckeditor must be properly initialized before setting readonly
+	var retryCount = 0;
+	var oMe = $('#$iId');
+	var delayedSetReadOnly = function () {
+		if (oMe.data('ckeditorInstance').editable() == undefined && retryCount++ < 10) {
+			setTimeout(delayedSetReadOnly, retryCount * 100); //Wait a while longer each iteration
+		}
+		else
+		{
+			oMe.data('ckeditorInstance').setReadOnly(oMe.prop('disabled'));
+		}
+	};
+	setTimeout(delayedSetReadOnly, 50);
+});
+EOF
+					);
 					break;
 
 				case 'HTML':
@@ -2403,7 +2429,7 @@ HTML;
 					$sInputType = self::ENUM_INPUT_TYPE_IMAGE;
 					$aEventsList[] = 'validate';
 					$aEventsList[] = 'change';
-					$oPage->LinkScriptFromAppRoot('js/edit_image.js');
+					$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/edit_image.js');
 					$oDocument = $value; // Value is an ormDocument objectm
 					$sDefaultUrl = $oAttDef->Get('default_image');
 					if (is_object($oDocument) && !$oDocument->IsEmpty()) {
@@ -2519,11 +2545,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->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_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->add_ready_script(
 						<<<JS
 $('#{$iId}_field_set').field_set($sFieldSetOptions);
@@ -2549,9 +2575,9 @@ JS
 				case 'Set':
 				case 'TagSet':
 					$sInputType = self::ENUM_INPUT_TYPE_TAGSET;
-					$oPage->LinkScriptFromAppRoot('js/selectize.min.js');
-					$oPage->LinkStylesheetFromAppRoot('css/selectize.default.css');
-					$oPage->LinkScriptFromAppRoot('js/jquery.itop-set-widget.js');
+					$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->add_dict_entry('Core:AttributeSet:placeholder');
 
@@ -2582,13 +2608,6 @@ JS
 					$iFieldSize = $oAttDef->GetMaxSize();
 					if ($aAllowedValues !== null)
 					{
-
-						// convert AttributeBoolean value due to issue with radio style when value is false
-						// @see N°2443 - Boolean don't accept yes/no value
-						if($oAttDef instanceof AttributeBoolean){
-							$value = $value === false ? 0 : 1;
-						}
-
 						// Discrete list of values, use a SELECT or RADIO buttons depending on the config
 						$sDisplayStyle = $oAttDef->GetDisplayStyle();
 						switch ($sDisplayStyle)
@@ -2931,11 +2950,11 @@ JS
 				$sStatesSelection .= '</select>';
 				$sStatesSelection .= '<input type="hidden" id="obj_state_orig" name="obj_state_orig" value="'.$this->GetState().'"/>';
 				$oPage->add_ready_script(<<<JS
-$('.state_select_{$this->m_iFormId}').on('change', function() {
+$('.state_select_{$this->m_iFormId}').change( function() {
 	if ($('#obj_state_orig').val() != $(this).val()) {
 		$('.state_select_{$this->m_iFormId}').val($(this).val());
 		$('#form_{$this->m_iFormId}').data('force_submit', true);
-		$('#form_{$this->m_iFormId}').trigger('submit');
+		$('#form_{$this->m_iFormId}').submit();
 	}
 });
 JS
@@ -3072,7 +3091,7 @@ JS
 		$oPage->add($oAppContext->GetForForm());
 
 		// Hook the cancel button via jQuery so that it can be unhooked easily as well if needed
-		$sDefaultUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_form&class='.$sClass.$oAppContext->GetForLink(true);
+		$sDefaultUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_form&class='.$sClass.'&'.$oAppContext->GetForLink();
 
 		$sCancelButtonOnClickScript = "let fOnClick{$this->m_iFormId}CancelButton = ";
 		if(isset($aExtraParams['js_handlers']['cancel_button_on_click'])){
@@ -3080,7 +3099,7 @@ JS
 		} else {
 			$sCancelButtonOnClickScript .= "function() { BackToDetails('$sClass', $iKey, '$sDefaultUrl', $sJSToken)};";
 		}
-		$sCancelButtonOnClickScript .= "$('#form_{$this->m_iFormId} button.cancel').on('click.navigation.itop', fOnClick{$this->m_iFormId}CancelButton);";
+		$sCancelButtonOnClickScript .= "$('#form_{$this->m_iFormId} button.cancel').on('click', fOnClick{$this->m_iFormId}CancelButton);";
 		$oPage->add_ready_script($sCancelButtonOnClickScript);
 
 		$iFieldsCount = count($aFieldsMap);
@@ -3433,7 +3452,7 @@ EOF
 								// Dummy collapsible section created in order to get JS files
 								$oCollapsibleSection = new CollapsibleSection('');
 								foreach ($oCollapsibleSection->GetJsFilesUrlRecursively(true) as $sJSFile) {
-									$oPage->LinkScriptFromURI($sJSFile);
+									$oPage->add_linked_script($sJSFile);
 								}
 							}
 							$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, $aArgs);
@@ -3446,18 +3465,8 @@ EOF
 					}
 					$sInputType = '';
 					$sInputId   = 'att_'.$iFieldIndex;
-					$value = $this->Get($sAttCode);
-					$sDisplayValue = $this->GetEditValue($sAttCode);
-					if ($oAttDef instanceof AttributeDateTime && !$oAttDef->IsNullAllowed() && $value === $oAttDef->GetNullValue()) {
-						$value = $oAttDef->GetDefaultValue($this);
-						if ($value !== $oAttDef->GetNullValue()) {
-							// Set default date
-							$this->Set($sAttCode, $value);
-							$sDisplayValue = $this->GetEditValue($sAttCode);
-						}
-					}
 					$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
-						$value, $sDisplayValue, $sInputId, '', $iExpectCode,
+						$this->Get($sAttCode), $this->GetEditValue($sAttCode), $sInputId, '', $iExpectCode,
 						$aArgs, true, $sInputType);
 					$aAttrib    = array(
 						'label' => '<span>'.$oAttDef->GetLabel().'</span>',
@@ -3925,7 +3934,7 @@ HTML;
 	public static function GetShortcutActions($sFinalClass)
 	{
 		$sShortcutActions = MetaModel::GetConfig()->Get('shortcut_actions');
-		$aShortcutActions = array_map('trim', explode(',', $sShortcutActions));
+		$aShortcutActions = explode(',', $sShortcutActions);
 
 		return $aShortcutActions;
 	}
@@ -4313,15 +4322,24 @@ HTML;
 
 			case 'Image':
 				$value = null;
-				$aDimensions = null;
 				$oImage = utils::ReadPostedDocument("attr_{$sFormPrefix}{$sAttCode}", 'fcontents');
-				$oImage = $oImage->ResizeImageToFit(
-					$oAttDef->Get('storage_max_width'),
-					$oAttDef->Get('storage_max_height'),
-					$aDimensions
-				);
-				if (is_null($aDimensions)) {
-					IssueLog::Warning($sClass . ':' . $this->GetKey() . '/' . $sAttCode . ': Image could not be resized. Mimetype: ' . $oImage->GetMimeType() . ', filename: ' . $oImage->GetFileName());
+				if (!is_null($oImage->GetData()))
+				{
+					$aSize = utils::GetImageSize($oImage->GetData());
+					if (is_array($aSize) && $aSize[0] > 0 && $aSize[1] > 0)
+					{
+						$oImage = utils::ResizeImageToFit(
+							$oImage,
+							$aSize[0],
+							$aSize[1],
+							$oAttDef->Get('storage_max_width'),
+							$oAttDef->Get('storage_max_height')
+						);
+					}
+					else
+					{
+						IssueLog::Warning($sClass . ':' . $this->GetKey() . '/' . $sAttCode . ': Image could not be resized. Mimetype: ' . $oImage->GetMimeType() . ', filename: ' . $oImage->GetFileName());
+					}
 				}
 				$aOtherData = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null, 'raw_data');
 				if (is_array($aOtherData))
@@ -4566,6 +4584,26 @@ HTML;
 		InlineImage::FinalizeInlineImages($this);
 	}
 
+	/**
+	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
+	 */
+	protected function DBCloneTracked_Internal($newKey = null)
+	{
+        /** @var cmdbAbstractObject $oNewObj */
+        $oNewObj = MetaModel::GetObject(get_class($this), parent::DBCloneTracked_Internal($newKey));
+
+		// Invoke extensions after insertion (the object must exist, have an id, etc.)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
+		{
+            $oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBInsert($oNewObj, self::GetCurrentChange());
+            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
+		}
+
+		return $oNewObj;
+	}
+
 	public function DBUpdate()
 	{
 		$this->LogCRUDEnter(__METHOD__);
@@ -4639,24 +4677,26 @@ HTML;
 		return $oDeletionPlan;
 	}
 
-	final protected function PreDeleteActions(): void
+	protected function PostDeleteActions(): void
 	{
+		parent::PostDeleteActions();
+	}
+
+	/**
+	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
+	 */
+	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
+	{
+		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBDelete()");
-			$oKPI = new ExecutionKPI();
+            $oKPI = new ExecutionKPI();
 			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
-			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
+            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
 		}
 
-		parent::PreDeleteActions();
-	}
-
-	final protected function PostDeleteActions(): void
-	{
-		parent::PostDeleteActions();
+		return parent::DBDeleteTracked_Internal($oDeletionPlan);
 	}
 
 	public function IsModified()
@@ -4672,7 +4712,6 @@ HTML;
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
 			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified()");
 			$oKPI = new ExecutionKPI();
 			$bIsModified = $oExtensionInstance->OnIsModified($this);
 			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnIsModified');
@@ -4732,8 +4771,6 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnCheckToWrite()");
             $oKPI = new ExecutionKPI();
 			$aNewIssues = $oExtensionInstance->OnCheckToWrite($this);
             $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToWrite');
@@ -4784,8 +4821,6 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			$sExtensionClass = get_class($oExtensionInstance);
-			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnCheckToDelete()");
             $oKPI = new ExecutionKPI();
 			$aNewIssues = $oExtensionInstance->OnCheckToDelete($this);
             $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToDelete');
@@ -4810,6 +4845,110 @@ HTML;
 		}
 	}
 
+	/**
+	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
+	 *
+	 * @param WebPage $oPage
+	 * @param string $sAttCode
+	 * @param string $sComment
+	 * @param string $sPrefix
+	 * @param bool $bEditMode
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 * @throws \Exception
+	 * @deprecated 3.0.0, will be removed in 3.1.0
+	 */
+	public function DisplayCaseLog(WebPage $oPage, $sAttCode, $sComment = '', $sPrefix = '', $bEditMode = false)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		$oPage->SetCurrentTab('UI:PropertiesTab');
+		$sClass = get_class($this);
+
+		if ($this->IsNew()) {
+			$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
+		} else {
+			$iFlags = $this->GetAttributeFlags($sAttCode);
+		}
+
+		if ($iFlags & OPT_ATT_HIDDEN) {
+			// The case log is hidden do nothing
+		} else
+		{
+			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+			$sAttDefClass = get_class($oAttDef);
+			$sAttLabel = $oAttDef->GetLabel();
+			$sAttMetaDataLabel = utils::HtmlEntities($sAttLabel);
+			$sAttMetaDataFlagHidden = (($iFlags & OPT_ATT_HIDDEN) === OPT_ATT_HIDDEN) ? 'true' : 'false';
+			$sAttMetaDataFlagReadOnly = (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY) ? 'true' : 'false';
+			$sAttMetaDataFlagMandatory = (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY) ? 'true' : 'false';
+			$sAttMetaDataFlagMustChange = (($iFlags & OPT_ATT_MUSTCHANGE) === OPT_ATT_MUSTCHANGE) ? 'true' : 'false';
+			$sAttMetaDataFlagMustPrompt = (($iFlags & OPT_ATT_MUSTPROMPT) === OPT_ATT_MUSTPROMPT) ? 'true' : 'false';
+			$sAttMetaDataFlagSlave = (($iFlags & OPT_ATT_SLAVE) === OPT_ATT_SLAVE) ? 'true' : 'false';
+
+			$sInputId = $this->m_iFormId.'_'.$sAttCode;
+
+			if ((!$bEditMode) || ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)))
+			{
+				// Check if the attribute is not read-only because of a synchro...
+				if ($iFlags & OPT_ATT_SLAVE)
+				{
+					$aReasons = array();
+					$sTip = '';
+					foreach($aReasons as $aRow) {
+						$sDescription = utils::EscapeHtml($aRow['description']);
+						$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
+						$sTip .= "<div class=\"synchro-source\">";
+						$sTip .= "<div class=\"synchro-source-title\">Synchronized with {$aRow['name']}</div>";
+						$sTip .= "<div class=\"synchro-source-description\">$sDescription</div>";
+					}
+					$sTip = addslashes($sTip);
+					$oPage->add_ready_script("$('#synchro_$sInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+				}
+
+				// Attribute is read-only
+				$sHTMLValue = $this->GetAsHTML($sAttCode);
+				$sHTMLValue .= '<input type="hidden" id="'.$sInputId.'" name="attr_'.$sPrefix.$sAttCode.'" value="'.utils::EscapeHtml($this->GetEditValue($sAttCode)).'"/>';
+				$aFieldsMap[$sAttCode] = $sInputId;
+			}
+			else
+			{
+				$sValue = $this->Get($sAttCode);
+				$sDisplayValue = $this->GetEditValue($sAttCode);
+				$aArgs = array('this' => $this, 'formPrefix' => $sPrefix);
+
+				$sCommentAsHtml = ($sComment != '') ? '<span>'.$sComment.'</span><br/>' : '';
+				$sFieldAsHtml = self::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', $iFlags, $aArgs);
+				$sHTMLValue = <<<HTML
+<div class="field_data">
+	<div class="field_value">
+		$sCommentAsHtml
+		$sFieldAsHtml
+	</div>
+</div>
+HTML;
+
+				$aFieldsMap[$sAttCode] = $sInputId;
+			}
+
+			$oPage->add(<<<HTML
+<fieldset>
+	<legend>{$sAttLabel}</legend>
+	<div class="field_container field_large" data-attribute-code="{$sAttCode}" data-attribute-type="{$sAttDefClass}" data-attribute-label="{$sAttMetaDataLabel}"
+		data-attribute-flag-hidden="{$sAttMetaDataFlagHidden}" data-attribute-flag-read-only="{$sAttMetaDataFlagReadOnly}" data-attribute-flag-mandatory="{$sAttMetaDataFlagMandatory}"
+		data-attribute-flag-must-change="{$sAttMetaDataFlagMustChange}" data-attribute-flag-must-prompt="{$sAttMetaDataFlagMustPrompt}" data-attribute-flag-slave="{$sAttMetaDataFlagSlave}">
+		{$sHTMLValue}
+	</div>
+</fieldset>
+HTML
+			);
+		}
+	}
+
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
@@ -5053,7 +5192,7 @@ HTML;
 							$aKeys = array_keys($aValues[$sAttCode]);
 							$currValue = $aKeys[0]; // The only value is the first key
 							if ($oAttDef->GetEditClass() == 'LinkedSet') {
-                                $oOrmLinkSet = $oDummyObj->Get($sAttCode);
+								$oOrmLinkSet = $oDummyObj->Get($sAttCode);
 								LinkSetDataTransformer::StringToOrmLinkSet($aValues[$sAttCode][$currValue]['edit_value'], $oOrmLinkSet);
 
 							} else {
@@ -5107,7 +5246,7 @@ HTML;
 								}
 								$oDummyObj->Set($sAttCode, $oTagSet);
 							} else if ($oAttDef->GetEditClass() == 'LinkedSet') {
-                                $oOrmLinkSet = $oDummyObj->Get($sAttCode);
+								$oOrmLinkSet = $oDummyObj->Get($sAttCode);
 								foreach ($aMultiValues as $key => $sValue) {
 									LinkSetDataTransformer::StringToOrmLinkSet($sValue['edit_value'], $oOrmLinkSet);
 								}
@@ -5786,14 +5925,14 @@ JS
 	 *
 	 * @since 3.1.0
 	 */
-	final protected function FireEventCheckToWrite(?string $sStimulusBeingApplied): void
+	final protected function FireEventCheckToWrite(): void
 	{
-		$this->FireEvent(EVENT_DB_CHECK_TO_WRITE, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_CHECK_TO_WRITE, ['is_new' => $this->IsNew()]);
 	}
 
-	final protected function FireEventBeforeWrite(?string $sStimulusBeingApplied)
+	final protected function FireEventBeforeWrite()
 	{
-		$this->FireEvent(EVENT_DB_BEFORE_WRITE, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_BEFORE_WRITE, ['is_new' => $this->IsNew()]);
 	}
 
 	/**
@@ -5805,11 +5944,11 @@ JS
 	 * @throws \CoreException
 	 * @since 3.1.0
 	 */
-	final protected function FireEventAfterWrite(array $aChanges, bool $bIsNew, ?string $sStimulusBeingApplied): void
+	final protected function FireEventAfterWrite(array $aChanges, bool $bIsNew): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
-		$this->RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
-		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges, 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEventDbLinksChangedForCurrentObject();
+		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges]);
 	}
 
 	//////////////
@@ -5921,6 +6060,31 @@ JS
 		}
 	}
 
+	/**
+	 * Fire the EVENT_DB_LINKS_CHANGED event if current object is registered
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 *
+	 * @since 3.1.0 N°5906
+	 */
+	final protected function FireEventDbLinksChangedForCurrentObject(): void
+	{
+		if (true === static::IsEventDBLinksChangedBlocked()) {
+			return;
+		}
+
+		$sClass = get_class($this);
+		$sId = $this->GetKey();
+		$bIsObjectAwaitingEventDbLinksChanged = self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+		if (false === $bIsObjectAwaitingEventDbLinksChanged) {
+			return;
+		}
+		self::FireEventDbLinksChangedForObject($this);
+		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+	}
+
 	/**
 	 * Fire the EVENT_DB_LINKS_CHANGED event if given object is registered, and unregister it
 	 *
@@ -5950,9 +6114,7 @@ JS
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
 		$oObject = MetaModel::GetObject($sClass, $sId, false);
-		if (!is_null($oObject)) {
-			self::FireEventDbLinksChangedForObject($oObject);
-		}
+		self::FireEventDbLinksChangedForObject($oObject);
 		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 	}
 
@@ -5960,11 +6122,13 @@ JS
 	{
 		self::SetEventDBLinksChangedBlocked(true);
 		// N°6408 The object can have been deleted
-		$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
-
-		// Update the object if needed
-		if (count($oObject->ListChanges()) !== 0) {
-			$oObject->DBUpdate();
+		if (!is_null($oObject)) {
+			MetaModel::StartReentranceProtection($oObject);
+			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
+			MetaModel::StopReentranceProtection($oObject);
+			if (count($oObject->ListChanges()) !== 0) {
+				$oObject->DBUpdate();
+			}
 		}
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
 	}
@@ -6042,9 +6206,9 @@ JS
 	 * @inheritDoc
 	 * @throws \CoreException
 	 */
-	final protected function FireEventComputeValues(?string $sStimulusBeingApplied): void
+	final protected function FireEventComputeValues(): void
 	{
-		$this->FireEvent(EVENT_DB_COMPUTE_VALUES, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_COMPUTE_VALUES);
 	}
 
 	/**

application/compilecssservice.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2013-2024 Combodo SAS
+ * Copyright (C) 2013-2023 Combodo SARL
  *
  * This file is part of iTop.
  *

application/csvpage.class.inc.php

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

application/dashboard.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -296,21 +296,21 @@ abstract class Dashboard
 	public function FromParams($aParams)
 	{
 		$this->sLayoutClass = $aParams['layout_class'];
-		if (!is_subclass_of($this->sLayoutClass,DashboardLayout::class)) {
-			throw new InvalidParameterException('Invalid parameter layout_class "'.$aParams['layout_class'].'"');
-		}
 		$this->sTitle = $aParams['title'];
 		$this->bAutoReload = $aParams['auto_reload'] == 'true';
 		$this->iAutoReloadSec = max(MetaModel::GetConfig()->Get('min_reload_interval'), (int) $aParams['auto_reload_sec']);
 		
-		foreach($aParams['cells'] as $aCell) {
+		foreach($aParams['cells'] as $aCell)
+		{
 			$aCellDashlets = array();
-			foreach($aCell as $aDashletParams) {
+			foreach($aCell as $aDashletParams)
+			{
 				$sDashletClass = $aDashletParams['dashlet_class'];
 				$sId = $aDashletParams['dashlet_id'];
 				/** @var \Dashlet $oNewDashlet */
 				$oNewDashlet = new $sDashletClass($this->oMetaModel, $sId);
-				if (isset($aDashletParams['dashlet_type'])) {
+				if (isset($aDashletParams['dashlet_type']))
+				{
 					$oNewDashlet->SetDashletType($aDashletParams['dashlet_type']);
 				}
 				$oForm = $oNewDashlet->GetForm();
@@ -480,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').on('change', function(ev) {
+	$('#attr_auto_reload').change( function(ev) {
 		$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
 	} );
 
@@ -524,7 +524,9 @@ EOF
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
 	{
-		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? null, $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+		if (!array_key_exists('dashboard_div_id', $aExtraParams)) {
+			$aExtraParams['dashboard_div_id'] = utils::Sanitize($this->GetId(), '', 'element_identifier');
+		}
 
 		/** @var \DashboardLayoutMultiCol $oLayout */
 		$oLayout = new $this->sLayoutClass();
@@ -561,8 +563,8 @@ JS
 		}
 
 		if (!$bEditMode) {
-			$oPage->LinkScriptFromAppRoot('js/dashlet.js');
-			$oPage->LinkScriptFromAppRoot('js/dashboard.js');
+			$oPage->add_linked_script('../js/dashlet.js');
+			$oPage->add_linked_script('../js/dashboard.js');
 		}
 
 		return $oDashboard;
@@ -1050,7 +1052,7 @@ EOF
 		$sSelectorHtml .= '</div>';
 
 		$sFile = addslashes($this->GetDefinitionFile());
-		$sReloadURL = json_encode($this->GetReloadURL());
+		$sReloadURL = $this->GetReloadURL();
 
 		$bFromDashboardPage = isset($aAjaxParams['from_dashboard_page']) ? isset($aAjaxParams['from_dashboard_page']) : false;
 		if ($bFromDashboardPage) {
@@ -1116,8 +1118,8 @@ JS
 	 */
 	protected function RenderEditionTools(WebPage $oPage, DashboardLayoutUIBlock $oDashboard, $aExtraParams)
 	{
-		$oPage->LinkScriptFromAppRoot('node_modules/blueimp-file-upload/js/jquery.iframe-transport.js');
-		$oPage->LinkScriptFromAppRoot('node_modules/blueimp-file-upload/js/jquery.fileupload.js');
+		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.iframe-transport.js');
+		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.fileupload.js');
 		$sId = utils::Sanitize($this->GetId(), '', 'element_identifier');
 
 		$sMenuTogglerId = "ibo-dashboard-menu-toggler-{$sId}";
@@ -1139,6 +1141,7 @@ JS
 			->AddCSSClass('ibo-action-button');
 
 		$oToolbar->AddSubBlock($oActionButton);
+
 		$aActions = array();
 		$sFile = addslashes(utils::LocalPath($this->sDefinitionFile));
 		$sJSExtraParams = json_encode($aExtraParams);
@@ -1163,7 +1166,7 @@ JS
 		$oToolbar->AddSubBlock($oActionButton)
 			->AddSubBlock($oActionsMenu);
 
-		$sReloadURL = json_encode($this->GetReloadURL());
+		$sReloadURL = $this->GetReloadURL();
 		$oPage->add_script(
 			<<<EOF
 function EditDashboard(sId, sDashboardFile, aExtraParams)
@@ -1263,14 +1266,14 @@ EOF
 		$sOkButtonLabel = Dict::S('UI:Button:Save');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		
-		$sId = json_encode($this->sId);
-		$sLayoutClass = json_encode($this->sLayoutClass);
+		$sId = utils::HtmlEntities($this->sId);
+		$sLayoutClass = utils::HtmlEntities($this->sLayoutClass);
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
-		$sTitle = json_encode($this->sTitle);
-		$sFile = json_encode($this->GetDefinitionFile());
+		$sTitle = utils::HtmlEntities($this->sTitle);
+		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
-		$sReloadURL = json_encode($this->GetReloadURL());
+		$sReloadURL = $this->GetReloadURL();
 
 		$sExitConfirmationMessage = addslashes(Dict::S('UI:NavigateAwayConfirmationMessage'));
 		$sCancelConfirmationMessage = addslashes(Dict::S('UI:CancelConfirmationMessage'));
@@ -1324,15 +1327,15 @@ $('#dashboard_editor').dialog({
 });
 
 $('#dashboard_editor .ui-layout-center').runtimedashboard({
-	dashboard_id: $sId, 
-	layout_class: $sLayoutClass, 
-	title: $sTitle,
+	dashboard_id: '$sId', 
+	layout_class: '$sLayoutClass', 
+	title: '$sTitle',
 	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: '$sFile', 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: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	new_dashlet_parameters: {operation: 'new_dashlet'}
 });
 

application/dashboardlayout.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -24,7 +24,7 @@ use Combodo\iTop\Application\WebPage\WebPage;
 /**
  * Dashboard presentation
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 abstract class DashboardLayout

application/dashlet.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2012-2024 Combodo SAS
+// Copyright (C) 2012-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -30,7 +30,7 @@ require_once(APPROOT.'application/forms.class.inc.php');
 /**
  * Base class for all 'dashlets' (i.e. widgets to be inserted into a dashboard)
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 abstract class Dashlet
@@ -1967,10 +1967,7 @@ class DashletHeaderStatic extends Dashlet
 		$sIcon = $this->aProperties['icon'];
 
 		$oIconSelect = $this->oModelReflection->GetIconSelectionField('icon');
-		$sIconPath = '';
-		if (Utils::IsNotNullOrEmptyString($sIcon)) {
-			$sIconPath = utils::HtmlEntities($oIconSelect->MakeFileUrl($sIcon));
-		}
+		$sIconPath = utils::HtmlEntities($oIconSelect->MakeFileUrl($sIcon));
 
 		return DashletFactory::MakeForDashletHeaderStatic($this->oModelReflection->DictString($sTitle), $sIconPath);
 	}
@@ -1984,7 +1981,6 @@ class DashletHeaderStatic extends Dashlet
 		$oForm->AddField($oField);
 
 		$oField = $this->oModelReflection->GetIconSelectionField('icon', Dict::S('UI:DashletHeaderStatic:Prop-Icon'), $this->aProperties['icon']);
-		$oField->AddAllowedValue(['value' => '', 'label' => Dict::S('UI:DashletIcon:None'), 'icon' => '']);
 		$oForm->AddField($oField);
 	}
 
@@ -2097,10 +2093,7 @@ class DashletHeaderDynamic extends Dashlet
 		$sGroupBy = $this->aProperties['group_by'];
 
 		$oIconSelect = $this->oModelReflection->GetIconSelectionField('icon');
-		$sIconPath = '';
-		if (Utils::IsNotNullOrEmptyString($sIcon)) {
-			$sIconPath = $oIconSelect->MakeFileUrl($sIcon);
-		}
+		$sIconPath = $oIconSelect->MakeFileUrl($sIcon);
 
 		$aValues = $this->GetValues();
 		if (count($aValues) > 0) {
@@ -2145,7 +2138,7 @@ class DashletHeaderDynamic extends Dashlet
 		$oSet = new DBObjectSet($oFilter);
 		$iCount = $oSet->Count();
 		$oAppContext = new ApplicationContext();
-		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($oFilter->serialize());
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($oFilter->serialize());
 		$oSubTitle->AddHtml('<a class="summary" href="'.$sHyperlink.'">'.Dict::Format(str_replace('_', ':', $sSubtitle), $iCount).'</a>');
 
 		return $oPanel;
@@ -2230,7 +2223,6 @@ class DashletHeaderDynamic extends Dashlet
 		$oForm->AddField($oField);
 
 		$oField = $this->oModelReflection->GetIconSelectionField('icon', Dict::S('UI:DashletHeaderDynamic:Prop-Icon'), $this->aProperties['icon']);
-		$oField->AddAllowedValue(['value' => '', 'label' => Dict::S('UI:DashletIcon:None'), 'icon' => '']);
 		$oForm->AddField($oField);
 
 		$oField = new DesignerTextField('subtitle', Dict::S('UI:DashletHeaderDynamic:Prop-Subtitle'), $this->aProperties['subtitle']);

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.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -40,36 +40,6 @@
       <presentation/>
       <methods/>
     </class>
-    <class id="WelcomePopupAcknowledge" _delta="define">
-      <parent>DBObject</parent>
-      <properties>
-        <comment>/** Acknowledge welcome popup messages */</comment>
-        <abstract>false</abstract>
-        <category/>
-        <key_type>autoincrement</key_type>
-        <db_table>priv_welcome_popup_acknowledge</db_table>
-      </properties>
-      <fields>
-        <field id="message_uuid" xsi:type="AttributeString">
-          <sql>message_uuid</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="user_id" xsi:type="AttributeExternalKey">
-          <sql>user_id</sql>
-          <target_class>User</target_class>
-          <is_null_allowed>false</is_null_allowed>
-          <on_target_delete>DEL_SILENT</on_target_delete>
-        </field>
-        <field id="acknowledge_date" xsi:type="AttributeDateTime">
-          <sql>acknowledge_date</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-      </fields>
-      <presentation/>
-      <methods/>
-    </class>
   </classes>
   <portals>
     <portal id="backoffice" _delta="define">
@@ -111,6 +81,7 @@
     <menu id="UserManagement" xsi:type="TemplateMenuNode" _delta="define">
       <rank>10</rank>
       <parent>AdminTools</parent>
+      <template_file/>
     </menu>
     <menu id="UserAccountsMenu" xsi:type="OQLMenuNode" _delta="define">
       <rank>11</rank>
@@ -140,6 +111,7 @@
     <menu id="Queries" xsi:type="TemplateMenuNode" _delta="define">
       <rank>30</rank>
       <parent>AdminTools</parent>
+      <template_file/>
     </menu>
     <menu id="RunQueriesMenu" xsi:type="WebPageMenuNode" _delta="define">
       <rank>31</rank>
@@ -183,10 +155,6 @@
         <decoration_classes>fas fa-cog</decoration_classes>
       </style>
     </menu>
-    <menu id="Integrations" xsi:type="TemplateMenuNode" _delta="define">
-      <rank>50</rank>
-      <parent>ConfigurationTools</parent>
-    </menu>
     <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
       <rank>20</rank>
       <parent>ConfigurationTools</parent>
@@ -219,9 +187,7 @@
   </menus>
   <events>
     <event id="EVENT_DB_BEFORE_WRITE" _delta="define">
-      <name>Before create or update</name>
-      <description><![CDATA[An object is about to be written into the database.
-The object can be modified.]]></description>
+      <description>An object is about to be written into the database. The object can be modified.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -235,10 +201,6 @@ The object can be modified.]]></description>
           <description>Creation flag</description>
           <type>boolean</type>
         </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -246,11 +208,7 @@ The object can be modified.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_CHECK_TO_WRITE" _delta="define">
-      <name>Check to write</name>
-      <description><![CDATA[Check an object before it is written into the database (no change possible).
-Call $this->AddCheckIssue($sErrorMessage) to report a blocking issue.
-Call $this->AddCheckWarning($sWarningMessage) to display a warning.
-      ]]></description>
+      <description>Check an object before it is written into the database (no change possible). Call DBObject::AddCheckIssue() to signal an issue</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -264,10 +222,6 @@ Call $this->AddCheckWarning($sWarningMessage) to display a warning.
           <description>Creation flag</description>
           <type>boolean</type>
         </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -275,9 +229,7 @@ Call $this->AddCheckWarning($sWarningMessage) to display a warning.
       </event_data>
     </event>
     <event id="EVENT_DB_AFTER_WRITE" _delta="define">
-      <name>After create or update</name>
-      <description><![CDATA[An object has been written into the database.
-The modifications can be propagated to other objects.]]></description>
+      <description>An object has been written into the database. The modifications can be propagated to other objects.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -292,13 +244,9 @@ The modifications can be propagated to other objects.]]></description>
           <type>boolean</type>
         </event_datum>
         <event_datum id="changes">
-          <description><![CDATA[For updates, the list of changes done during this operation]]></description>
+          <description>For updates, the list of changes done during this operation</description>
           <type>array</type>
         </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -306,9 +254,7 @@ The modifications can be propagated to other objects.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_CHECK_TO_DELETE" _delta="define">
-      <name>Check to delete</name>
-      <description><![CDATA[Check an object before it is deleted from the database.
-Call $this->AddDeleteIssue($sIssueMessage) to signal an issue.]]></description>
+      <description>Check an object before it is deleted from the database. Call DBObject::AddDeleteIssue() to signal an issue</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -325,8 +271,7 @@ Call $this->AddDeleteIssue($sIssueMessage) to signal an issue.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_ABOUT_TO_DELETE" _delta="define">
-      <name>Before delete</name>
-      <description><![CDATA[An object is about to be deleted from the database]]></description>
+      <description>An object is about to be deleted from the database</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -343,8 +288,7 @@ Call $this->AddDeleteIssue($sIssueMessage) to signal an issue.]]></description>
       </event_data>
     </event>
     <event id="EVENT_DB_AFTER_DELETE" _delta="define">
-      <name>After delete</name>
-      <description><![CDATA[An object has been deleted into the database]]></description>
+      <description>An object has been deleted into the database</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -361,9 +305,7 @@ Call $this->AddDeleteIssue($sIssueMessage) to signal an issue.]]></description>
       </event_data>
     </event>
     <event id="EVENT_ENUM_TRANSITIONS" _delta="define">
-      <name>Enum transitions</name>
-      <description><![CDATA[Manage the allowed transitions in current object state.
-The only action allowed is to deny transitions with $this->DenyTransition($sTransitionCode)]]></description>
+      <description>Manage the allowed transitions in current object state. The only action allowed is to deny transitions with DBObject::DenyTransition()</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -383,8 +325,7 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
       </event_data>
     </event>
     <event id="EVENT_DB_LINKS_CHANGED" _delta="define">
-      <name>Links on object have changed</name>
-      <description><![CDATA[At least one link class was changed]]></description>
+      <description>At least one link class was changed</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -400,9 +341,7 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
       </event_data>
     </event>
     <event id="EVENT_DB_OBJECT_RELOAD" _delta="define">
-      <name>Object reload</name>
-      <internal>true</internal>
-      <description><![CDATA[An object has been re-loaded from the database]]></description>
+      <description>An object has been re-loaded from the database</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -418,8 +357,7 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
       </event_data>
     </event>
     <event id="EVENT_DB_COMPUTE_VALUES" _delta="define">
-      <name>Recompute object values</name>
-      <description><![CDATA[An object needs to be recomputed after changes]]></description>
+      <description>An object needs to be recomputed after changes</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -429,14 +367,6 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
           <description>The object inserted</description>
           <type>DBObject</type>
         </event_datum>
-        <event_datum id="is_new">
-          <description>Creation flag</description>
-          <type>boolean</type>
-        </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -444,8 +374,7 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
       </event_data>
     </event>
     <event id="EVENT_DB_ARCHIVE" _delta="define">
-      <name>Object archived</name>
-      <description><![CDATA[An object has been archived]]></description>
+      <description>An object has been archived</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -461,8 +390,7 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
       </event_data>
     </event>
     <event id="EVENT_DB_UNARCHIVE" _delta="define">
-      <name>Object unarchived</name>
-      <description><![CDATA[An object has been unarchived]]></description>
+      <description>An object has been unarchived</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -478,9 +406,7 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
       </event_data>
     </event>
     <event id="EVENT_DB_SET_ATTRIBUTES_FLAGS" _delta="define">
-      <name>Set attributes flags</name>
-      <description><![CDATA[Set object attributes flags.
-Call $this->AddAttributeFlags($sAttCode, $iFlags) for all the attributes to be set for this target state.]]></description>
+      <description>Set object attributes flags. Call cmdbAbstractObject::AddAttributeFlags() for all the attributes to be set for this target state.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -491,7 +417,7 @@ Call $this->AddAttributeFlags($sAttCode, $iFlags) for all the attributes to be s
         </event_datum>
         <event_datum id="target_state">
           <description>The target state in which to evaluate the flags</description>
-          <type>string</type>
+          <type>array</type>
         </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
@@ -500,9 +426,7 @@ Call $this->AddAttributeFlags($sAttCode, $iFlags) for all the attributes to be s
       </event_data>
     </event>
     <event id="EVENT_DB_SET_INITIAL_ATTRIBUTES_FLAGS" _delta="define">
-      <name>Set initial attributes flags</name>
-      <description><![CDATA[Set object initial attributes flags.
-Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial attributes to be set initially.]]></description>
+      <description>Set object initial attributes flags. Call cmdbAbstractObject::AddInitialAttributeFlags() for all the initial attributes to be set initially.</description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -518,8 +442,7 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
       </event_data>
     </event>
     <event id="EVENT_DOWNLOAD_DOCUMENT" _delta="define">
-      <name>Document downloaded</name>
-      <description><![CDATA[A document has been downloaded from the GUI]]></description>
+      <description>A document has been downloaded from the GUI</description>
       <sources>
         <source id="Document">Document</source>
       </sources>
@@ -547,9 +470,7 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
       </event_data>
     </event>
     <event id="EVENT_LOGIN" _delta="define">
-      <name>Login</name>
-      <internal>true</internal>
-      <description><![CDATA[Inform the listeners about the connection states]]></description>
+      <description>Inform the listeners about the connection states</description>
       <event_data>
         <event_datum id="code">
           <description>The login step result code (LoginWebPage::EXIT_CODE_...) </description>

application/datatable.class.inc.php

@@ -0,0 +1,879 @@
+<?php
+
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
+use Combodo\iTop\Application\WebPage\WebPage;
+use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
+
+/**
+ * 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
+ *
+ * @deprecated 3.0.0 use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable
+ */
+
+class DataTable
+{
+	protected $iListId;		// Unique ID inside the web page
+	/** @var string */
+	private $sDatatableContainerId;
+	protected $sTableId;	// identifier for saving the settings (combined with the class aliases)
+	protected $oSet;		// The set of objects to display
+	protected $aClassAliases;	// The aliases (alias => class) inside the set
+	protected $iNbObjects;		// Total number of objects in the set
+	protected $bUseCustomSettings;	// Whether or not the current display uses custom settings
+	protected $oDefaultSettings;	// the default settings for displaying such a list
+	protected $bShowObsoleteData;
+
+	/**
+	 * @param string $iListId  Unique ID for this div/table in the page
+	 * @param DBObjectSet $oSet The set of data to display
+	 * @param array$aClassAliases The list of classes/aliases to be displayed in this set $sAlias => $sClassName
+	 * @param string $sTableId A string (or null) identifying this table in order to persist its settings
+	 *
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function __construct($iListId, $oSet, $aClassAliases, $sTableId = null)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable');
+		$this->iListId = utils::GetSafeId($iListId); // Make a "safe" ID for jQuery
+		$this->sDatatableContainerId = 'datatable_'.utils::GetSafeId($iListId);
+		$this->oSet = $oSet;
+		$this->aClassAliases = $aClassAliases;
+		$this->sTableId = $sTableId;
+		$this->iNbObjects = $oSet->Count();
+		$this->bUseCustomSettings = false;
+		$this->oDefaultSettings = null;
+		$this->bShowObsoleteData = $oSet->GetShowObsoleteData();
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param DataTableSettings $oSettings
+	 * @param $bActionsMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \MySQLException
+	 */
+	public function Display(WebPage $oPage, DataTableSettings $oSettings, $bActionsMenu, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		$this->oDefaultSettings = $oSettings;
+
+		// Identified tables can have their own specific settings
+		$oCustomSettings = DataTableSettings::GetTableSettings($this->aClassAliases, $this->sTableId);
+		
+		if ($oCustomSettings != null)
+		{
+			// Custom settings overload the default ones
+			$this->bUseCustomSettings = true;
+			if ($this->oDefaultSettings->iDefaultPageSize == 0)
+			{
+				$oCustomSettings->iDefaultPageSize = 0;
+			}
+		}
+		else
+		{
+			$oCustomSettings = $oSettings;
+		}
+
+		if ($oCustomSettings->iDefaultPageSize > 0)
+		{
+			$this->oSet->SetLimit($oCustomSettings->iDefaultPageSize);
+		}
+		$this->oSet->SetOrderBy($oCustomSettings->GetSortOrder());
+
+		// Load only the requested columns
+		$aColumnsToLoad = array();
+		foreach($oCustomSettings->aColumns as $sAlias => $aColumnsInfo)
+		{
+			foreach($aColumnsInfo as $sAttCode => $aData)
+			{
+				if ($sAttCode != '_key_')
+				{
+					if ($aData['checked'])
+					{
+						$aColumnsToLoad[$sAlias][] = $sAttCode;
+					}
+					else
+					{
+						// See if this column is a must to load			
+						$sClass = $this->aClassAliases[$sAlias];
+						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+						if ($oAttDef->AlwaysLoadInTables()) {
+							$aColumnsToLoad[$sAlias][] = $sAttCode;
+						}
+					}
+				}
+			}
+		}
+		$this->oSet->OptimizeColumnLoad($aColumnsToLoad);
+
+
+		$bToolkitMenu = true;
+		if (isset($aExtraParams['toolkit_menu']))
+		{
+			$bToolkitMenu = (bool) $aExtraParams['toolkit_menu'];
+		}
+		if (UserRights::IsPortalUser())
+		{
+			// Portal users have a limited access to data, for now they can only see what's configured for them
+			$bToolkitMenu = false;
+		}
+		
+		return $this->GetAsHTML($oPage, $oCustomSettings->iDefaultPageSize, $oCustomSettings->iDefaultPageSize, 0, $oCustomSettings->aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 * @param $aColumns
+	 * @param $bActionsMenu
+	 * @param $bToolkitMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
+	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		$sObjectsCount = $this->GetObjectCount($oPage, $sSelectMode);
+		$sPager = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
+		$sActionsMenu = '';
+		$sToolkitMenu = '';
+		if ($bActionsMenu) {
+			$sActionsMenu = $this->GetActionsMenu($oPage, $aExtraParams);
+		}
+//		if ($bToolkitMenu)
+//		{
+//			$sToolkitMenu = $this->GetToolkitMenu($oPage, $aExtraParams);
+//		}
+
+		$sDataTable = $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+		$sConfigDlg = $this->GetTableConfigDlg($oPage, $aColumns, $bViewLink, $iDefaultPageSize);
+
+		$sHtml = "<table id=\"{$this->sDatatableContainerId}\" class=\"datatable\">";
+		$sHtml .= "<tr><td>";
+		$sHtml .= "<table style=\"width:100%;\">";
+		$sHtml .= "<tr><td class=\"pagination_container\">$sObjectsCount</td><td class=\"menucontainer\">$sToolkitMenu $sActionsMenu</td></tr>";
+		$sHtml .= "<tr>$sPager</tr>";
+		$sHtml .= "</table>";
+		$sHtml .= "</td></tr>";
+		$sHtml .= "<tr><td class=\"datacontents\">$sDataTable</td></tr>";
+		$sHtml .= "</table>\n";
+		$oPage->add_at_the_end($sConfigDlg);
+
+		$aExtraParams['show_obsolete_data'] = $this->bShowObsoleteData;
+
+		$aOptions = array(
+			'sPersistentId' => '',
+			'sFilter' => $this->oSet->GetFilter()->serialize(),
+			'oColumns' => $aColumns,
+			'sSelectMode' => $sSelectMode,
+			'sViewLink' => ($bViewLink ? 'true' : 'false'),
+			'iNbObjects' => $this->iNbObjects,
+			'iDefaultPageSize' => $iDefaultPageSize,
+			'iPageSize' =>  $iPageSize,
+			'iPageIndex' =>  $iPageIndex,
+			'oClassAliases' => $this->aClassAliases,
+			'sTableId' => $this->sTableId,
+			'oExtraParams' => $aExtraParams,
+			'sRenderUrl' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php',
+			'oRenderParameters' => array('str' => ''), // Forces JSON to encode this as a object...
+			'oDefaultSettings' => array('str' => ''), // Forces JSON to encode this as a object...
+			'oLabels' => array('moveup' => Dict::S('UI:Button:MoveUp'), 'movedown' => Dict::S('UI:Button:MoveDown')),
+		);
+		if($this->oDefaultSettings != null)
+		{
+			$aOptions['oDefaultSettings'] = $this->GetAsHash($this->oDefaultSettings);
+		}
+		$sJSOptions = json_encode($aOptions);
+		$oPage->add_ready_script("$('#{$this->sDatatableContainerId}').datatable($sJSOptions);");
+
+		return $sHtml;
+	}
+
+	/**
+	 * When refreshing the body of a paginated table, get the rows of the table (inside the TBODY)
+	 * return string The HTML rows to insert inside the <tbody> node
+	 */
+	public function GetAsHTMLTableRows(WebPage $oPage, $iPageSize, $aColumns, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		if ($iPageSize < 1)
+		{
+			$iPageSize = -1; // convention: no pagination
+		}
+		$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
+		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+		
+		$sHtml = '';
+		foreach($aValues as $aRow)
+		{
+			$sHtml .= $oPage->GetTableRow($aRow, $aAttribs);
+		}
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $sSelectMode
+	 *
+	 * @return string
+	 */
+	protected function GetObjectCount(WebPage $oPage, $sSelectMode)
+	{
+		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
+		{
+			$sHtml = '<div class="pagination_objcount">'.Dict::Format('UI:Pagination:HeaderSelection', '<span id="total">'.$this->iNbObjects.'</span>', '<span class="selectedCount">0</span>').'</div>';
+		}
+		else
+		{
+			$sHtml = '<div class="pagination_objcount">'.Dict::Format('UI:Pagination:HeaderNoSelection', '<span id="total">'.$this->iNbObjects.'</span>').'</div>';
+		}
+		return $sHtml;		
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 *
+	 * @return string
+	 */
+	protected function GetPager(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex)
+	{
+		$sHtml = '';
+		if ($iPageSize < 1) // Display all
+		{
+			$sPagerStyle = 'style="display:none"'; // no limit: display the full table, so hide the "pager" UI
+												   // WARNING: mPDF does not take the "display" style into account
+												   // when applied to a <td> or a <table> tag, so make sure you apply this to a div
+		}
+		else
+		{
+			$sPagerStyle = '';
+		}
+		
+		$sCombo = '<select class="pagesize">';
+		if($iPageSize < 1)
+		{
+			$sCombo .= "<option selected=\"selected\" value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
+		}
+		else
+		{
+			for($iPage = 1; $iPage < 5; $iPage++)
+			{
+				$iNbItems = $iPage * $iDefaultPageSize;
+				$sSelected = ($iNbItems == $iPageSize) ? 'selected="selected"' : '';
+				$sCombo .= "<option  $sSelected value=\"$iNbItems\">$iNbItems</option>";
+			}
+			$sCombo .= "<option value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
+		}
+
+		$sCombo .= '</select>';
+		
+		$sPages = Dict::S('UI:Pagination:PagesLabel');
+		$sPageSizeCombo = Dict::Format('UI:Pagination:PageSize', $sCombo);
+		
+		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
+		if ($iNbPages == 1)
+		{
+			// No need to display the pager
+			$sPagerStyle = 'style="display:none"';
+		}
+		$aPagesToDisplay = array();
+		for($idx = 0; $idx <= min(4, $iNbPages-1); $idx++)
+		{
+			if ($idx == 0)
+			{
+				$aPagesToDisplay[$idx] = '<span page="0" class="curr_page">1</span>';
+			}
+			else
+			{
+				$aPagesToDisplay[$idx] = "<span id=\"gotopage_$idx\" class=\"gotopage\" page=\"$idx\">".(1+$idx)."</span>";
+			}
+		}
+		$iLastPageIdx = $iNbPages - 1;
+		if (!isset($aPagesToDisplay[$iLastPageIdx]))
+		{
+			unset($aPagesToDisplay[$idx - 1]); // remove the last page added to make room for the very last page
+			$aPagesToDisplay[$iLastPageIdx] = "<span id=\"gotopage_$iLastPageIdx\" class=\"gotopage\" page=\"$iLastPageIdx\">... $iNbPages</span>";
+		}
+		$sPagesLinks = implode('', $aPagesToDisplay);
+		$sPagesList = '['.implode(',', array_keys($aPagesToDisplay)).']';
+
+		$sSelectionMode = ($iNbPages == 1) ? '' : 'positive';
+		$sHtml =
+<<<EOF
+		<td colspan="2">
+		<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><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>$sPageSizeCombo</td>
+		<td><span id="loading">&nbsp;</span><input type="hidden" name="selectionMode" value="$sSelectionMode"></input>
+		</td>
+		</tr>
+		</table>
+		</div>
+		</td>
+EOF;
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ApplicationException
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 * @throws \ReflectionException
+	 * @throws \Twig\Error\LoaderError
+	 * @throws \Twig\Error\RuntimeError
+	 * @throws \Twig\Error\SyntaxError
+	 */
+	protected function GetActionsMenu(WebPage $oPage, $aExtraParams)
+	{
+		$oMenuBlock = new MenuBlock($this->oSet->GetFilter(), 'list');
+		$oBlock = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $this->iListId);
+
+		return ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	protected function GetToolkitMenu(WebPage $oPage, $aExtraParams)
+	{
+		if (!$oPage->IsPrintableVersion())
+		{
+			$sMenuTitle = Dict::S('UI:ConfigureThisList');
+			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li aria-label="'.Dict::S('UI:Menu:Toolkit').'"><i class="fas fa-tools"></i><i class="fas fa-caret-down"></i><ul>';
+	
+			$oMenuItem1 = new JSPopupMenuItem('iTop::ConfigureList', $sMenuTitle, "$('#datatable_dlg_".$this->iListId."').dialog('open');");
+			$aActions = array(
+				$oMenuItem1->GetUID() => $oMenuItem1->GetMenuItem(),
+			);
+			$this->oSet->Rewind();
+			utils::GetPopupMenuItems($oPage, iPopupMenuExtension::MENU_OBJLIST_TOOLKIT, $this->oSet, $aActions, $this->sTableId, $this->iListId);
+			$this->oSet->Rewind();
+			$sHtml .= $oPage->RenderPopupMenuItems($aActions);
+		}
+		else
+		{
+			$sHtml = '';
+		}
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aColumns
+	 * @param $bViewLink
+	 * @param $iDefaultPageSize
+	 *
+	 * @return string
+	 */
+	protected function GetTableConfigDlg(WebPage $oPage, $aColumns, $bViewLink, $iDefaultPageSize)
+	{
+		$sHtml = "<div id=\"datatable_dlg_{$this->iListId}\" style=\"display: none;\">";
+		$sHtml .= "<form onsubmit=\"return false\">";
+		$sChecked = ($this->bUseCustomSettings) ? '' : 'checked';
+		$sHtml .= "<p><input id=\"dtbl_dlg_settings_{$this->iListId}\" type=\"radio\" name=\"settings\" $sChecked value=\"defaults\"><label for=\"dtbl_dlg_settings_{$this->iListId}\">&nbsp;".Dict::S('UI:UseDefaultSettings').'</label></p>';
+		$sHtml .= "<fieldset>";
+		$sChecked = ($this->bUseCustomSettings) ? 'checked':  '';
+		$sHtml .= "<legend class=\"transparent\"><input id=\"dtbl_dlg_specific_{$this->iListId}\" type=\"radio\" class=\"specific_settings\" name=\"settings\" $sChecked value=\"specific\"><label for=\"dtbl_dlg_specific_{$this->iListId}\">&nbsp;".Dict::S('UI:UseSpecificSettings')."</label></legend>";
+		$sHtml .= Dict::S('UI:ColumnsAndSortOrder').'<br/><ul class="sortable_field_list" id="sfl_'.$this->iListId.'"></ul>';
+		
+		$sHtml .= '<p>'.Dict::Format('UI:Display_X_ItemsPerPage', '<input type="text" size="4" name="page_size" value="'.$iDefaultPageSize.'">').'</p>';
+		$sHtml .= "</fieldset>";
+		$sHtml .= "<fieldset>";
+		$sSaveChecked = ($this->sTableId != null) ? 'checked' : '';
+		$sCustomDisabled = ($this->sTableId == null) ? 'disabled="disabled" stay-disabled="true" ' : '';
+		$sCustomChecked = ($this->sTableId != null) ? 'checked' : '';
+		$sGenericChecked = ($this->sTableId == null) ? 'checked' : '';
+		$sHtml .= "<legend class=\"transparent\"><input id=\"dtbl_dlg_save_{$this->iListId}\" type=\"checkbox\" $sSaveChecked name=\"save_settings\"><label for=\"dtbl_dlg_save_{$this->iListId}\">&nbsp;".Dict::S('UI:UseSavetheSettings')."</label></legend>";
+		$sHtml .= "<p><input id=\"dtbl_dlg_this_list_{$this->iListId}\" type=\"radio\" name=\"scope\" $sCustomChecked $sCustomDisabled value=\"this_list\"><label for=\"dtbl_dlg_this_list_{$this->iListId}\">&nbsp;".Dict::S('UI:OnlyForThisList').'</label>&nbsp;&nbsp;&nbsp;&nbsp;';
+		$sHtml .= "<input id=\"dtbl_dlg_all_{$this->iListId}\" type=\"radio\" name=\"scope\" $sGenericChecked value=\"defaults\"><label for=\"dtbl_dlg_all_{$this->iListId}\">&nbsp;".Dict::S('UI:ForAllLists').'</label></p>';
+		$sHtml .= "</fieldset>";
+		$sHtml .= '<table style="width:100%"><tr><td style="text-align:center;">';
+		$sHtml .= '<button type="button" onclick="$(\'#'.$this->sDatatableContainerId.'\').datatable(\'onDlgCancel\'); $(\'#datatable_dlg_'.$this->iListId.'\').dialog(\'close\')">'.Dict::S('UI:Button:Cancel').'</button>';
+		$sHtml .= '</td><td style="text-align:center;">';
+		$sHtml .= '<button type="submit" onclick="$(\'#'.$this->sDatatableContainerId.'\').datatable(\'onDlgOk\');$(\'#datatable_dlg_'.$this->iListId.'\').dialog(\'close\');">'.Dict::S('UI:Button:Ok').'</button>';
+		$sHtml .= '</td></tr></table>';
+		$sHtml .= "</form>";
+		$sHtml .= "</div>";
+		
+		$sDlgTitle = addslashes(Dict::S('UI:ListConfigurationTitle'));
+		$oPage->add_ready_script("$('#datatable_dlg_{$this->iListId}').dialog({autoOpen: false, title: '$sDlgTitle', width: 500, close: function() { $('#{$this->sDatatableContainerId}').datatable('onDlgCancel'); } });");
+
+		return $sHtml;
+	}
+
+	/**
+	 * @param $oSetting
+	 *
+	 * @return array
+	 */
+	public function GetAsHash($oSetting)
+	{
+		$aSettings = array('iDefaultPageSize' => $oSetting->iDefaultPageSize, 'oColumns' => $oSetting->aColumns);
+		return $aSettings;
+	}
+
+	/**
+	 * @param array $aColumns
+	 * @param string $sSelectMode
+	 * @param bool $bViewLink
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 */
+	protected function GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink)
+	{
+		$aAttribs = array();
+		if ($sSelectMode == 'multiple')
+		{
+			$aAttribs['form::select'] = array(
+				'label' => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->iListId}:not(:disabled)', this.checked);\" class=\"checkAll\"></input>",
+				'description' => Dict::S('UI:SelectAllToggle+'),
+				'metadata' => array(),
+			);
+		}
+		else if ($sSelectMode == 'single')
+		{
+			$aAttribs['form::select'] = array('label' => '', 'description' => '', 'metadata' => array());
+		}
+
+		foreach($this->aClassAliases as $sAlias => $sClassName)
+		{
+			foreach($aColumns[$sAlias] as $sAttCode => $aData)
+			{
+				if ($aData['checked'])
+				{
+					if ($sAttCode == '_key_')
+					{
+						$sAttLabel = MetaModel::GetName($sClassName);
+
+						$aAttribs['key_'.$sAlias] = array(
+							'label' => $sAttLabel,
+							'description' => '',
+							'metadata' => array(
+								'object_class' => $sClassName,
+								'attribute_label' => $sAttLabel,
+							),
+						);
+					}
+					else
+					{
+						$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
+						$sAttDefClass = get_class($oAttDef);
+						$sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode);
+
+						$aAttribs[$sAttCode.'_'.$sAlias] = array(
+							'label' => $sAttLabel,
+							'description' => $oAttDef->GetOrderByHint(),
+							'metadata' => array(
+								'object_class' => $sClassName,
+								'attribute_code' => $sAttCode,
+								'attribute_type' => $sAttDefClass,
+								'attribute_label' => $sAttLabel,
+							),
+						);
+					}
+				}
+			}
+		}
+		return $aAttribs;
+	}
+
+
+	/**
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 */
+	protected function GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+	{
+		$bLocalize = true;
+		if (isset($aExtraParams['localize_values']))
+		{
+			$bLocalize = (bool) $aExtraParams['localize_values'];
+		}
+
+		$aValues = array();
+		$aAttDefsCache = array();
+		$this->oSet->Seek(0);
+		$iMaxObjects = $iPageSize;
+		while (($aObjects = $this->oSet->FetchAssoc()) && ($iMaxObjects != 0))
+		{
+			$bFirstObject = true;
+			$aRow = array();
+			foreach($this->aClassAliases as $sAlias => $sClassName)
+			{
+				if (is_object($aObjects[$sAlias]))
+				{
+					$sHilightClass = $aObjects[$sAlias]->GetHilightClass();
+					if ($sHilightClass != '')
+					{
+						$aRow['@class'] = $sHilightClass;	
+					}
+					if ((($sSelectMode == 'single') || ($sSelectMode == 'multiple')) && $bFirstObject)
+					{
+						if (array_key_exists('selection_enabled', $aExtraParams) && isset($aExtraParams['selection_enabled'][$aObjects[$sAlias]->GetKey()]))
+						{
+							$sDisabled = ($aExtraParams['selection_enabled'][$aObjects[$sAlias]->GetKey()]) ? '' : ' disabled="disabled"';
+						}
+						else
+						{
+							$sDisabled = '';
+						}
+						if ($sSelectMode == 'single')
+						{
+							$aRow['form::select'] = "<input type=\"radio\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
+						}
+						else
+						{
+							$aRow['form::select'] = "<input type=\"checkbox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
+						}
+					}
+					foreach($aColumns[$sAlias] as $sAttCode => $aData)
+					{
+						if ($aData['checked'])
+						{
+							if ($sAttCode == '_key_')
+							{
+								$aRow['key_'.$sAlias] = array(
+									'value_raw' => $aObjects[$sAlias]->GetKey(),
+									'value_html' => $aObjects[$sAlias]->GetHyperLink(),
+								);
+							}
+							else
+							{
+								// Prepare att. def. classes cache to avoid retrieving AttDef for each row
+								if(!isset($aAttDefsCache[$sClassName][$sAttCode]))
+								{
+									$aAttDefClassesCache[$sClassName][$sAttCode] = get_class(MetaModel::GetAttributeDef($sClassName, $sAttCode));
+								}
+
+								// Only retrieve raw (stored) value for simple fields
+								$bExcludeRawValue = false;
+								foreach (cmdbAbstractObject::GetAttDefClassesToExcludeFromMarkupMetadataRawValue() as $sAttDefClassToExclude)
+								{
+									if (is_a($aAttDefClassesCache[$sClassName][$sAttCode], $sAttDefClassToExclude, true))
+									{
+										$bExcludeRawValue = true;
+										break;
+									}
+								}
+
+								if($bExcludeRawValue)
+								{
+									$aRow[$sAttCode.'_'.$sAlias] = $aObjects[$sAlias]->GetAsHTML($sAttCode, $bLocalize);
+								}
+								else
+								{
+									$aRow[$sAttCode.'_'.$sAlias] = array(
+										'value_raw' => $aObjects[$sAlias]->Get($sAttCode),
+										'value_html' => $aObjects[$sAlias]->GetAsHTML($sAttCode, $bLocalize),
+									);
+								}
+							}
+						}
+					}
+				}
+				else
+				{
+					foreach($aColumns[$sAlias] as $sAttCode => $aData)
+					{
+						if ($aData['checked'])
+						{
+							if ($sAttCode == '_key_')
+							{
+								$aRow['key_'.$sAlias] = '';
+							}
+							else
+							{
+								$aRow[$sAttCode.'_'.$sAlias] = '';
+							}
+						}
+					}
+				}
+				$bFirstObject = false;
+			}
+			$aValues[] = $aRow;
+			$iMaxObjects--;
+		}
+		return $aValues;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 */
+	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+	{
+		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
+		if ($iPageSize < 1)
+		{
+			$iPageSize = -1; // convention: no pagination
+		}
+		$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
+
+		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+
+		$sHtml = '<table class="listContainer object-list">';
+
+		foreach($this->oSet->GetFilter()->GetInternalParams() as $sName => $sValue)
+		{
+			$aExtraParams['query_params'][$sName] = $sValue;
+		}
+		$aExtraParams['show_obsolete_data'] = $this->bShowObsoleteData;
+
+		$sHtml .= "<tr><td>";
+		$sHtml .= $oPage->GetTable($aAttribs, $aValues);
+		$sHtml .= '</td></tr>';
+		$sHtml .= '</table>';
+		$iCount = $this->iNbObjects;
+
+		$aArgs = $this->oSet->GetArgs();
+		$sExtraParams = addslashes(str_replace('"', "'", json_encode(array_merge($aExtraParams, $aArgs)))); // JSON encode, change the style of the quotes and escape them
+		$sSelectModeJS = '';
+		$sHeaders = '';
+		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
+		{
+			$sSelectModeJS = $sSelectMode;
+			$sHeaders = 'headers: { 0: {sorter: false}},';
+		}
+		$sDisplayKey = ($bViewLink) ? 'true' : 'false';
+		// Protect against duplicate elements in the Zlist
+		$aUniqueOrderedList = array();
+		foreach($this->aClassAliases as $sAlias => $sClassName)
+		{
+			foreach($aColumns[$sAlias] as $sAttCode => $aData)
+			{
+				if ($aData['checked'])
+				{
+					$aUniqueOrderedList[$sAttCode] = true;
+				}
+			}
+		}
+		$aUniqueOrderedList = array_keys($aUniqueOrderedList);
+		$sJSColumns = json_encode($aColumns);
+		$sJSClassAliases = json_encode($this->aClassAliases);
+		$sCssCount = isset($aExtraParams['cssCount']) ? ", cssCount: '{$aExtraParams['cssCount']}'" : '';
+		$this->oSet->ApplyParameters();
+		// Display the actual sort order of the table
+		$aRealSortOrder = $this->oSet->GetRealSortOrder();
+		$aDefaultSort = array();
+		$iColOffset = 0;
+		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
+		{
+			$iColOffset += 1;
+		}
+		if ($bViewLink)
+		{
+//			$iColOffset += 1;
+		}
+		foreach($aRealSortOrder as $sColCode => $bAscending)
+		{
+			$iPos = array_search($sColCode, $aUniqueOrderedList);
+			if ($iPos !== false)
+			{
+				$aDefaultSort[] = "[".($iColOffset+$iPos).",".($bAscending ? '0' : '1')."]";
+			}
+			else if (($iPos = array_search(preg_replace('/_friendlyname$/', '', $sColCode), $aUniqueOrderedList)) !== false)
+			{
+				// if sorted on the friendly name of an external key, then consider it sorted on the column that shows the links
+				$aDefaultSort[] = "[".($iColOffset+$iPos).",".($bAscending ? '0' : '1')."]";
+			}
+			else if($sColCode == 'friendlyname' && $bViewLink)
+			{
+				$aDefaultSort[] = "[".($iColOffset).",".($bAscending ? '0' : '1')."]";
+			}
+		}
+		$sFakeSortList = '';
+		if (count($aDefaultSort) > 0)
+		{
+			$sFakeSortList = '['.implode(',', $aDefaultSort).']';
+		}
+		$sOQL = addslashes($this->oSet->GetFilter()->serialize());
+		$oPage->add_ready_script(
+<<<JS
+var oTable = $('#{$this->sDatatableContainerId} table.listResults');
+oTable.tableHover();
+oTable
+	.tablesorter({ $sHeaders widgets: ['myZebra', 'truncatedList']})
+	.tablesorterPager({
+		container: $('#pager{$this->iListId}'),
+		totalRows:$iCount,
+		size: $iPageSize,
+		filter: '$sOQL',
+		extra_params: '$sExtraParams',
+		select_mode: '$sSelectModeJS',
+		displayKey: $sDisplayKey,
+		table_id: '{$this->sDatatableContainerId}',
+		columns: $sJSColumns,
+		class_aliases: $sJSClassAliases $sCssCount
+	});
+JS
+	);
+		if ($sFakeSortList != '')
+		{
+			$oPage->add_ready_script("oTable.trigger(\"fakesorton\", [$sFakeSortList]);");
+		}
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $iDefaultPageSize
+	 * @param $iStart
+	 */
+	public function UpdatePager(WebPage $oPage, $iDefaultPageSize, $iStart)
+	{
+		$iPageSize = $iDefaultPageSize;
+		$iPageIndex = 0;
+		$sHtml = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
+		$oPage->add_ready_script("$('#pager{$this->iListId}').html('".json_encode($sHtml)."');");
+		if ($iDefaultPageSize < 1)
+		{
+			$oPage->add_ready_script("$('#pager{$this->iListId}').parent().hide()");
+		}
+		else
+		{
+			$oPage->add_ready_script("$('#pager{$this->iListId}').parent().show()");
+		}
+	}
+}
+
+/**
+ * Simplified version of the data table with less "decoration" (and no paging)
+ * which is optimized for printing
+ */
+class PrintableDataTable extends DataTable
+{
+	/**
+	 * @param WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 * @param $aColumns
+	 * @param $bActionsMenu
+	 * @param $bToolkitMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		return $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, -1, $bViewLink, $aExtraParams);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+	{
+		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
+		if ($iPageSize < 1)
+		{
+			$iPageSize = -1; // convention: no pagination
+		}
+		$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
+	
+		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+	
+		$sHtml = $oPage->GetTable($aAttribs, $aValues);
+		
+		return $sHtml;
+	}
+}

application/displayblock.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -263,8 +263,6 @@ class DisplayBlock
 				/** param for export.php */
 				'refresh_action',
 				/**to add refresh button in datatable*/
-				'object_count',
-				/** int number of objects in list */
 			], DataTableUIBlockFactory::GetAllowedParams()),
 			static::ENUM_STYLE_LIST_SEARCH => array_merge([
 				'update_history',
@@ -572,7 +570,7 @@ class DisplayBlock
 		} else {
 			// render it as an Ajax (asynchronous) call
 			$oHtml->AddCSSClass("loading");
-			$oHtml->AddHtml("<p><img src=\"".utils::GetAbsoluteUrlAppRoot()."images/indicator_arrows.gif\"> ".Dict::S('UI:Loading').'</p>');
+			$oHtml->AddHtml("<p><img src=\"../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.'" },
@@ -708,7 +706,7 @@ class DisplayBlock
 				if ($bDoSearch)
 				{
 					// Keep the table_id identifying this table if we're performing a search
-					$sTableId = utils::ReadParam('_table_id_', null, false, utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+					$sTableId = utils::ReadParam('_table_id_', null, false, 'raw_data');
 					if ($sTableId != null)
 					{
 						$aExtraParams['table_id'] = $sTableId;
@@ -1126,7 +1124,7 @@ JS
 						$oSingleGroupByValueFilter->SetShowObsoleteData($this->m_bShowObsoleteData);
 					}
 					$sHyperlink = utils::GetAbsoluteUrlAppRoot()
-						.'pages/UI.php?operation=search'.$oAppContext->GetForLink(true)
+						.'pages/UI.php?operation=search&'.$oAppContext->GetForLink()
 						.'&filter='.rawurlencode($oSingleGroupByValueFilter->serialize());
 					$aCounts[$sStateValue] = ['link' => $sHyperlink, 'label' => $aCounts[$sStateValue]];
 				}
@@ -1234,7 +1232,7 @@ JS
 		$iCount = $this->m_oSet->Count();
 		$sClassLabel = MetaModel::GetName($sClass);
 		$sClassIconUrl = MetaModel::GetClassIcon($sClass, false);
-		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize());
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize());
 
 		$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
 		$aRefreshParams = [
@@ -1243,7 +1241,7 @@ JS
 		];
 
 		if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY)) {
-			$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.$oAppContext->GetForLink(true);
+			$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.'&'.$oAppContext->GetForLink();
 			$sCreateActionLabel = Dict::Format('UI:Button:Create');
 			$oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, $sCreateActionUrl,
 				$sCreateActionLabel, $aRefreshParams);
@@ -1291,7 +1289,7 @@ JS
 
 			$aData = array();
 			$oAppContext = new ApplicationContext();
-			$sParams = $oAppContext->GetForLink(true);
+			$sParams = $oAppContext->GetForLink();
 			foreach ($aGroupBy as $iRow => $iCount) {
 				// Build the search for this subset
 				$oSubsetSearch = $this->m_oFilter->DeepClone();
@@ -1306,7 +1304,7 @@ JS
 
 				$aData[] = array(
 					'group' => $aLabels[$iRow],
-					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1$sParams&filter=$sFilter\">$iCount</a>"
+					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter\">$iCount</a>"
 				); // TO DO: add the context information
 			}
 			$aAttribs = array(
@@ -1638,7 +1636,7 @@ JS
 		$sGroupByExpr = isset($aExtraParams['group_by_expr']) ? '&params[group_by_expr]='.$aExtraParams['group_by_expr'] : '';
 		$sFilter = $this->m_oFilter->serialize(false, $aQueryParams);
 		$oContext = new ApplicationContext();
-		$sContextParam = $oContext->GetForLink(true);
+		$sContextParam = $oContext->GetForLink();
 		$sAggregationFunction = isset($aExtraParams['aggregation_function']) ? $aExtraParams['aggregation_function'] : '';
 		$sAggregationAttr = isset($aExtraParams['aggregation_attribute']) ? $aExtraParams['aggregation_attribute'] : '';
 		$sLimit = isset($aExtraParams['limit']) ? $aExtraParams['limit'] : '';
@@ -1646,7 +1644,7 @@ JS
 		$sOrderDirection = isset($aExtraParams['order_direction']) ? $aExtraParams['order_direction'] : '';
 
 		if (isset($aExtraParams['group_by_label'])) {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam;
 		} else {
 			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam;
 		}
@@ -1683,14 +1681,11 @@ JS
 		$oBlock = null;
 		$sJSURLs = '';
 
-		$oContext = new ApplicationContext();
-		$sContextParam = $oContext->GetForLink(true);
-
 		if (isset($aExtraParams['group_by'])) {
 			$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
 			$aRes = CMDBSource::QueryToArray($sSql);
-
-
+			$oContext = new ApplicationContext();
+			$sContextParam = $oContext->GetForLink();
 
 			$iTotalCount = 0;
 			$aURLs = array();
@@ -1710,14 +1705,14 @@ JS
 				$oSubsetSearch = $this->m_oFilter->DeepClone();
 				$oCondition = new BinaryExpression($oGroupByExp, '=', new ScalarExpression($sValue));
 				$oSubsetSearch->AddConditionExpression($oCondition);
-				$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).$sContextParam;
+				$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).'&'.$sContextParam;
 			}
 			$sJSURLs = json_encode($aURLs);
 		}
 		if (isset($aExtraParams['group_by_label'])) {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).'&'.$sContextParam;
 		} else {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).'&'.$sContextParam;
 		}
 
 		switch ($sChartType) {
@@ -1790,7 +1785,7 @@ JS
 
 		$oBlock->sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv';
 		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
-		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
+		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
 		// Pass the parameters via POST, since expression may be very long
 		$aParamsToPost = array(
 			'expression' => $this->m_oFilter->ToOQL(true),
@@ -1865,11 +1860,7 @@ class MenuBlock extends DisplayBlock
 		$aSelectedClasses = $this->GetFilter()->GetSelectedClasses();
 		$bIsForLinkset = isset($aExtraParams['target_attr']);
 		$oSet = new CMDBObjectSet($this->GetFilter());
-		if(isset($aExtraParams['object_count'])){
-			$iSetCount = $aExtraParams['object_count'];
-		} else {
-			$iSetCount = $oSet->Count();
-		}
+		$iSetCount = $oSet->Count();
 		/** @var string $sRefreshAction JS snippet to run when clicking on the refresh button of the menu */
 		$sRefreshAction = $aExtraParams['refresh_action'] ?? '';
 		$bIsCreationInModal = isset($aExtraParams['creation_in_modal']) && $aExtraParams['creation_in_modal'] === true;
@@ -1894,7 +1885,10 @@ class MenuBlock extends DisplayBlock
 			&& (!isset($aExtraParams['menu']) || $aExtraParams['menu'] === "1" || $aExtraParams['menu'] === true)
 		) {
 			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink(true);
+			$sContext = $oAppContext->GetForLink();
+			if (utils::IsNotNullOrEmptyString($sContext)) {
+				$sContext = '&'.$sContext;
+			}
 
 
 			$sFilter = $this->GetFilter()->serialize();
@@ -2030,8 +2024,8 @@ class MenuBlock extends DisplayBlock
 					$sSelectedClassName = MetaModel::GetName($sSelectedClass);
 
 					// Check rights on class
-					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
-					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE);
+					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY, $oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE, $sSelectedClass);
 
 					// Refine filter on selected class so bullk actions occur on the right class
 					$oSelectedClassFilter = $this->GetFilter()->DeepClone();
@@ -2224,11 +2218,6 @@ class MenuBlock extends DisplayBlock
 					$aFavoriteRegularActions[$key] = $aRegularActions[$key];
 					unset($aRegularActions[$key]);
 				}
-				// Toolkit actions
-				if (isset($aToolkitActions[$key])) {
-					$aFavoriteRegularActions[$key] = $aToolkitActions[$key];
-					unset($aToolkitActions[$key]);
-				}
 
 				// Transitions
 				if (isset($aTransitionActions[$key])) {
@@ -2318,27 +2307,7 @@ class MenuBlock extends DisplayBlock
 						break;
 
 					case 'UI:Menu:EMail':
-						$sIconClass = 'far fa-envelope fa-lg';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:OpenOQL':
-						$sIconClass = 'fas fa-play fa-sm';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:ExportXLSX':
-						$sIconClass = 'far fa-file-excel fa-lg';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:CSVExport':
-						$sIconClass = 'fas fa-file-csv fa-lg';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:PrintableVersion':
-						$sIconClass = 'fas fa-print';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:ExportPDF':
-						$sIconClass = 'fas fa-file-pdf fa-lg';
+						$sIconClass = 'fas fa-share-alt';
 						$sLabel = '';
 						break;
 
@@ -2350,12 +2319,7 @@ class MenuBlock extends DisplayBlock
 				}
 
 				$sTarget = isset($aAction['target']) ? $aAction['target'] : '';
-				if (!empty($aAction['onclick'])) {
-					$oActionButton = ButtonUIBlockFactory::MakeIconAction($sIconClass, $aAction['label'], $aAction['label'], $sLabel,false); //utils::Sanitize($sActionId.md5($aAction['onclick']), '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER))
-					$oActionButton->SetOnClickJsCode($aAction['onclick']);
-				} else {
-					$oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, utils::Sanitize($sActionId, '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER));
-				}
+				$oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, utils::Sanitize($sActionId, '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER));
 				// ResourceId should not be sanitized
 				$oActionButton->AddDataAttribute('resource-id', $sActionId);
 				$oActionButton->AddCSSClasses(['ibo-action-button', 'ibo-regular-action-button']);
@@ -2614,8 +2578,11 @@ class MenuBlock extends DisplayBlock
 		$sUrl = "{$sRootUrl}pages/{$sUIPage}?{$sUrlParams}";
 
 		$oAppContext = new ApplicationContext();
-		$sContext = $oAppContext->GetForLink(true);
+		$sContext = $oAppContext->GetForLink();
+		if (utils::IsNotNullOrEmptyString($sContext)) {
+			$sUrl .= '&'.$sContext;
+		}
 
-		return $sUrl . $sContext;
+		return $sUrl;
 	}
 }

application/errorpage.class.inc.php

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

application/excelexporter.class.inc.php

@@ -303,7 +303,7 @@ class ExcelExporter
 	{
 		if ($this->sOutputFilePath == null)
 		{
-			return utils::GetDataPath().'bulk_export/'.$this->sToken.'.xlsx';
+			return APPROOT.'data/bulk_export/'.$this->sToken.'.xlsx';
 		}
 		else
 		{
@@ -313,14 +313,14 @@ class ExcelExporter
 	
 	public static function GetExcelFileFromToken($sToken)
 	{
-		return @file_get_contents(utils::GetDataPath().'bulk_export/'.$sToken.'.xlsx');
+		return @file_get_contents(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
 	}
 	
 	public static function CleanupFromToken($sToken)
 	{
-		@unlink(utils::GetDataPath().'bulk_export/'.$sToken.'.status');
-		@unlink(utils::GetDataPath().'bulk_export/'.$sToken.'.data');
-		@unlink(utils::GetDataPath().'bulk_export/'.$sToken.'.xlsx');
+		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.status');
+		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.data');
+		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
 	}
 	
 	public function Cleanup()
@@ -334,7 +334,7 @@ class ExcelExporter
 	 */
 	public static function CleanupOldFiles()
 	{
-		$aFiles = glob(utils::GetDataPath().'bulk_export/*.*');
+		$aFiles = glob(APPROOT.'data/bulk_export/*.*');
 		$iDelay = MetaModel::GetConfig()->Get('xlsx_exporter_cleanup_old_files_delay');
 		
 		if($iDelay > 0)
@@ -416,14 +416,14 @@ class ExcelExporter
 	
 	protected function CheckDataDir()
 	{
-		if(!is_dir(utils::GetDataPath()."bulk_export"))
+		if(!is_dir(APPROOT."data/bulk_export"))
 		{
-			@mkdir(utils::GetDataPath()."bulk_export", 0777, true /* recursive */);
+			@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
 			clearstatcache();
 		}
-		if (!is_writable(utils::GetDataPath()."bulk_export"))
+		if (!is_writable(APPROOT."data/bulk_export"))
 		{
-			throw new Exception('Data directory "'.utils::GetDataPath().'bulk_export" could not be written.');
+			throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
 		}
 	}
 	
@@ -433,12 +433,12 @@ class ExcelExporter
 		{
 			$sToken = $this->sToken;
 		}
-		return utils::GetDataPath()."bulk_export/$sToken.status";
+		return APPROOT."data/bulk_export/$sToken.status";
 	}
 	
 	protected function GetDataFile()
 	{
-		return utils::GetDataPath().'bulk_export/'.$this->sToken.'.data';
+		return APPROOT.'data/bulk_export/'.$this->sToken.'.data';
 	}
 	
 	protected function GetNewToken()

application/exceptions/ApplicationException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/ArchivedObjectException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/BulkChangeException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/CSVParserException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/ConfigException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/CoreCannotSaveObjectException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -60,24 +60,6 @@ class CoreCannotSaveObjectException extends CoreException
 		return $sContent;
 	}
 
-	public function getTextMessage()
-	{
-		$sTitle = Dict::S('UI:Error:SaveFailed');
-        $sContent = $sTitle;
-
-		if (count($this->aIssues) == 1) {
-			$sIssue = reset($this->aIssues);
-            $sContent .= $sIssue;
-		} else {
-			foreach ($this->aIssues as $sError) {
-                $sContent .= " " . $sError . ", ";
-			}
-		}
-
-		return $sContent;
-	}
-
-
 	public function getIssues()
 	{
 		return $this->aIssues;

application/exceptions/CoreException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -67,7 +67,7 @@ class CoreException extends Exception
 
 	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
 	{
-		return utils::EscapeHtml($this->getMessage());
+		return $this->getMessage();
 	}
 
 	/**

application/exceptions/CorePortalInvalidActionRuleException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/CoreTemplateException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/CoreUnexpectedValue.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/CoreWarning.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/DeleteException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/InvalidConfigParamException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/InvalidPasswordAttributeOneWayPassword.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/PageNotFoundException.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/SecurityException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/SynchroExceptionNotStarted.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/UserRightException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/dict/DictException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/dict/DictExceptionMissingString.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/dict/DictExceptionUnknownLanguage.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/iTopXmlException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/mysql/MySQLException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/mysql/MySQLHasGoneAwayException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/mysql/MySQLNoTransactionException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/mysql/MySQLQueryHasNoResultException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/mysql/MySQLTransactionNotClosedException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/oql/CoreOqlException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/oql/CoreOqlMultipleResultsForbiddenException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/process/ProcessException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/process/ProcessFatalException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/exceptions/process/ProcessInvalidConfigException.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/findstylesheetobject.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2013-2024 Combodo SAS
+ * Copyright (C) 2013-2023 Combodo SARL
  *
  * This file is part of iTop.
  *

application/forms.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -21,7 +21,7 @@ use Combodo\iTop\Application\WebPage\WebPage;
  * Helper class to build interactive forms to be used either in stand-alone
  * modal dialog or in "property-sheet" panes.
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 class DesignerForm
@@ -209,7 +209,7 @@ class DesignerForm
 	public function RenderAsPropertySheet($oP, $bReturnHTML = false, $sNotifyParentSelector = null)
 	{
 		$sReturn = '';
-		$sActionUrl = addslashes($this->sSubmitTo ?? '');
+		$sActionUrl = addslashes($this->sSubmitTo);
 		$sJSSubmitParams = json_encode($this->aSubmitParams);
 		$sFormId = $this->GetFormId();
 		if ($this->oParentForm == null) {
@@ -363,7 +363,7 @@ $('#$sDialogId').dialog({
 		buttons: [
 		{ text: "$sOkButtonLabel", click: function() {
 			var oForm = $(this).closest('.ui-dialog').find('form');
-			oForm.trigger('submit');
+			oForm.submit();
 			if (AnimateDlgButtons)
 			{
 				sFormId = oForm.attr('id');
@@ -1330,8 +1330,7 @@ class DesignerComboField extends DesignerFormField
 		{
 			if ($this->bMultipleSelection)
 			{
-				$iSize = max(1, min(8, count($this->aAllowedValues)));
-				$sHtml = "<span><select $sCSSClasses multiple size=\"$iSize\" id=\"$sId\" name=\"$sName\">";
+				$sHtml = "<span><select $sCSSClasses multiple size=\"8\"id=\"$sId\" name=\"$sName\">";
 			}
 			else
 			{
@@ -1501,11 +1500,6 @@ class DesignerIconSelectionField extends DesignerFormField
 		$this->aAllowedValues = $aAllowedValues;
 	}
 
-	public function AddAllowedValue($aValue)
-	{
-		// Add a null value to the list of allowed values
-		$this->aAllowedValues = array_merge([$aValue], $this->aAllowedValues);
-	}
 	public function EnableUpload($sIconUploadUrl)
 	{
 		$this->sUploadUrl = $sIconUploadUrl;

application/iotask.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * Persistent class InputOutputTask
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -36,30 +36,29 @@ class InputOutputTask extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"            => "application",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "name",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_iotask",
-			"db_key_field"        => "id",
+			"category" => "application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_iotask",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values" => new ValueSetEnum('Input, Ouput'), "sql" => "category", "default_value" => "Input", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values" => new ValueSetEnum('File, Database, Web Service'), "sql" => "source_type", "default_value" => "File", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype",
-			array("allowed_values" => new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql" => "source_subtype", "default_value" => "CSV", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values" => null, "sql" => "source_path", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category" => "", "more_values" => "", "sql" => "objects_class", "default_value" => null, "is_null_allowed" => true, "depends_on" => array(), "class_exclusion_list" => null)));
-		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "test_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "verbose_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values" => new ValueSetEnum('Full, Update Only, Creation Only'), "sql" => "options", "default_value" => 'Full', "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values"=>new ValueSetEnum('Input, Ouput'), "sql"=>"category", "default_value"=>"Input", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values"=>new ValueSetEnum('File, Database, Web Service'), "sql"=>"source_type", "default_value"=>"File", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype", array("allowed_values"=>new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql"=>"source_subtype", "default_value"=>"CSV", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values"=>null, "sql"=>"source_path", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category"=>"", "more_values"=>"", "sql"=>"objects_class", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"test_mode", "default_value"=>'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"verbose_mode", "default_value" => 'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values"=>new ValueSetEnum('Full, Update Only, Creation Only'), "sql"=>"options", "default_value"=> 'Full', "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path', 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form

application/itopwebpage.class.inc.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ */
+
+// cannot notify depreciation for now as this is still MASSIVELY used in iTop core !
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader');

application/itopwizardwebpage.class.inc.php

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

application/loginbasic.class.inc.php

@@ -5,7 +5,7 @@ use Combodo\iTop\Application\Helper\Session;
 /**
  * Class LoginBasic
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/logindefault.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -53,12 +53,6 @@ class LoginDefaultBefore extends AbstractLoginFSMExtension
 		{
 			// Force login mode
 			LoginWebPage::SetLoginModeAndReload($sProposedLoginMode);
-		} else {
-			$sRawLoginMode = utils::ReadParam('login_mode', '', false, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
-			if ($sProposedLoginMode !== $sRawLoginMode) {
-				IssueLog::Error("Authentication issue due to login_mode parameter sanitization. Please avoid special characters", null, ['sRawLoginMode' => $sRawLoginMode]);
-				//IssueLog::Error("Authentication issue due to login_mode parameter sanitization. Please avoid special characters", null, ['sRawLoginMode' => utils::HtmlEntities($sRawLoginMode)]);
-			}
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}

application/loginexternal.class.inc.php

@@ -5,7 +5,7 @@ use Combodo\iTop\Application\Helper\Session;
 /**
  * Class LoginExternal
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/loginform.class.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/logintwig.class.inc.php

@@ -2,7 +2,7 @@
 
 /**
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -52,13 +52,12 @@ class LoginTwigContext
 	/**
 	 * Set the absolute path on disk of the folder containing the twig templates
 	 *
+	 * @param string $sPath absolute path of twig templates directory
 	 * @api
-	 *
-	 *@param string $sAbsPath Absolute path of twig templates directory
 	 */
-	public function SetLoaderPath($sAbsPath)
+	public function SetLoaderPath($sPath)
 	{
-		$this->sTwigLoaderPath = $sAbsPath;
+		$this->sTwigLoaderPath = $sPath;
 	}
 
 	/**
@@ -85,27 +84,24 @@ class LoginTwigContext
 	}
 
 	/**
-	 * Add the absolute URL of a CSS file to link to the login screen
+	 * Add the URL of a CSS file to link to the login screen
 	 *
+	 * @param string $sFile URL of the CSS file to link
 	 * @api
-	 *
-	 * @param string $sFileAbsURL Absolute URL of the CSS file to link
 	 */
-	public function AddCSSFile($sFileAbsURL)
+	public function AddCSSFile($sFile)
 	{
-		$this->aCSSFiles[] = $sFileAbsURL;
+		$this->aCSSFiles[] = $sFile;
 	}
 
 	/**
-	 * Add the absolute URL of a javascript file to link to the login screen
-	 *
+	 * Add the URL of a javascript file to link to the login screen
+	 * @param string $sFile URL of the javascript file to link
 	 * @api
-	 *
-	 * @param string $sFileAbsURL Absolute URL of the javascript file to link
 	 */
-	public function AddJsFile($sFileAbsURL)
+	public function AddJsFile($sFile)
 	{
-		$this->aJsFiles[] = $sFileAbsURL;
+		$this->aJsFiles[] = $sFile;
 	}
 
 	/**
@@ -137,7 +133,7 @@ class LoginTwigContext
 	}
 
 	/**
-	 * @return array Absolute URLs of the CSS files
+	 * @return array
 	 */
 	public function GetCSSFiles()
 	{
@@ -145,7 +141,7 @@ class LoginTwigContext
 	}
 
 	/**
-	 * @return array Absolute URLs of the JS files
+	 * @return array
 	 */
 	public function GetJsFiles()
 	{
@@ -278,12 +274,12 @@ class LoginTwigRenderer
 			$aCSSFiles = $oFormData->GetCSSFiles();
 			foreach ($aCSSFiles as $sCSSFile)
 			{
-				$oPage->LinkStylesheetFromURI($sCSSFile);
+				$oPage->add_linked_stylesheet($sCSSFile);
 			}
 			$aJsFiles = $oFormData->GetJsFiles();
 			foreach ($aJsFiles as $sJsFile)
 			{
-				$oPage->LinkScriptFromURI($sJsFile);
+				$oPage->add_linked_script($sJsFile);
 
 			}
 		}

application/loginurl.class.inc.php

@@ -5,7 +5,7 @@ use Combodo\iTop\Application\Helper\Session;
 /**
  * Class LoginURL
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 

application/loginwebpage.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * Class LoginWebPage
  *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -97,8 +97,8 @@ class LoginWebPage extends NiceWebPage
 	
 	public function SetStyleSheet()
 	{
-		$this->LinkStylesheetFromAppRoot('css/login.css');
-		$this->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css');
+		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/login.css');
+		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css');
 	}
 
 	/**
@@ -971,7 +971,7 @@ class LoginWebPage extends NiceWebPage
 		}
 		else if($ret === false)
 		{
-			throw new Exception('Nowhere to go: Your combination of user Profiles denies you access to any '.ITOP_APPLICATION_SHORT.' portal. Please contact your administrator');
+			throw new Exception('Nowhere to go??');
 		}
 		else
 		{

application/maintenancemsg.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2013-2024 Combodo SAS
+ * Copyright (C) 2013-2023 Combodo SARL
  *
  * This file is part of iTop.
  *
@@ -91,6 +91,15 @@ function _MaintenanceJsonMessage($sTitle, $sMessage)
 		$oP->AddData($aMessage);
 		$oP->Output();
 	} else {
-		_MaintenanceTextMessage($sMessage);
+		@include_once(APPROOT."/application/ajaxwebpage.class.inc.php");
+		if (class_exists('ajax_page')) {
+			$oP = new ajax_page($sTitle);
+			$oP->add_header('Access-Control-Allow-Origin: *');
+			$oP->SetContentType('application/json');
+			$oP->add('{"code":100, "message":"'.$sMessage.'"}');
+			$oP->Output();
+		} else {
+			_MaintenanceTextMessage($sMessage);
+		}
 	}
 }

application/menunode.class.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -10,6 +10,7 @@ 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');
 require_once(APPROOT."/application/user.dashboard.class.inc.php");
 
 
@@ -124,7 +125,9 @@ class ApplicationMenu
 	 */
 	public static function CheckMenuIdEnabled($sMenuId)
 	{
-		if (self::IsMenuIdEnabled($sMenuId) === false)
+		self::LoadAdditionalMenus();
+		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
+		if (is_null($oMenuNode) || !$oMenuNode->IsEnabled())
 		{
 			require_once(APPROOT.'/setup/setuppage.class.inc.php');
 			$oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError'));
@@ -135,19 +138,6 @@ 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
@@ -279,11 +269,9 @@ class ApplicationMenu
 			$oMenuNode = static::GetMenuNode($sMenuGroupIdx);
 
 			if (!($oMenuNode instanceof MenuGroup)) {
-				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, [
+				IssueLog::Error('Menu node was not displayed as a menu group as it is actually not a menu group', LogChannels::CONSOLE, [
 					'menu_node_class' => get_class($oMenuNode),
-					'menu_node_id' => $oMenuNode->GetMenuID(),
 					'menu_node_label' => $oMenuNode->GetLabel(),
-					'current_user_id' => UserRights::GetUserId(),
 				]);
 				continue;
 			}
@@ -998,11 +986,15 @@ class MenuGroup extends MenuNode
  */
 class TemplateMenuNode extends MenuNode
 {
+	/**
+	 * @var string
+	 */
+	protected $sTemplateFile;
 
 	/**
 	 * Create a menu item based on a custom template and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sTemplateFile unused deprecated
+	 * @param string $sTemplateFile Path (or URL) to the file that will be used as a template for displaying the page's content
 	 * @param integer $iParentIndex ID of the parent menu
 	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
 	 * @param string $sEnableClass Name of class of object
@@ -1013,6 +1005,17 @@ class TemplateMenuNode extends MenuNode
 	public function __construct($sMenuId, $sTemplateFile, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->sTemplateFile = $sTemplateFile;
+		$this->aReflectionProperties['template_file'] = $sTemplateFile;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		if ($this->sTemplateFile == '') return '';
+		return parent::GetHyperlink($aExtraParams);
 	}
 
 	/**
@@ -1021,7 +1024,18 @@ class TemplateMenuNode extends MenuNode
 	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
-		//DO NOTHING this type of menu is only used for title not clickable
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
+		$sTemplate = @file_get_contents($this->sTemplateFile);
+		if ($sTemplate !== false)
+		{
+			$aExtraParams['table_id'] = 'Menu_'.$this->GetMenuId();
+			$oTemplate = new DisplayTemplate($sTemplate);
+			$oTemplate->Render($oPage, $aExtraParams);
+		}
+		else
+		{
+			$oPage->p("Error: failed to load template file: '{$this->sTemplateFile}'"); // No need to translate ?
+		}
 	}
 }
 
@@ -1132,11 +1146,11 @@ class OQLMenuNode extends MenuNode
 	{
 		$sUsageId = utils::GetSafeId($sUsageId);
 		$oSearch = DBObjectSearch::FromOQL($sOql);
-		$sClass= $oSearch->GetClass();
+		$sClass= 	$oSearch->GetClass();
 		$sIcon = MetaModel::GetClassIcon($sClass, false);
 		if ($bSearchPane) {
 			$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams);
-			$oBlock = new DisplayBlock($oSearch, DisplayBlock::ENUM_STYLE_SEARCH, false /* Asynchronous */, $aParams);
+			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
 			$oPage->add("<div class='sf_results_area ibo-add-margin-top-250' data-target='search_results'>");
 		}

application/newsroomprovider.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2024 Combodo SAS
+// Copyright (C) 2010-2023 Combodo SARL
 //
 //   This file is part of iTop.
 //

application/nicewebpage.class.inc.php

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

application/pdfpage.class.inc.php

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