fix autoload phpunit

* add few APIs to ease tests

* code style

* log testname via IssueLog only through ItopDataTestCase

* code style

* ci: phpunit fix fatal error

.doc/itop-version-history.md

@@ -1,109 +0,0 @@
-# iTop version history
-
-```mermaid
-%%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
-              'git0': 'lawngreen',
-              'git3': 'dodgerblue',
-              'git4': 'grey',
-              'git5': 'grey',
-              'git6': 'grey',
-              'git7': 'grey'
-       }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
-gitGraph
-    commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
-    branch support/2.3 order: 900
-    commit id: "2016-07-08" tag: "2.3.1"
-    commit id: "2016-12-22" tag: "2.3.3"
-    commit id: "2017-04-14" tag: "2.3.4"
-    checkout develop
-    commit id: "2017-07-12" tag: "2.4.0-beta" type: REVERSE
-    commit id: "2017-11-16" tag: "2.4.0" type: HIGHLIGHT
-    branch support/2.4 order: 890
-    commit id: "2018-02-14" tag: "2.4.1"
-    checkout develop
-    commit id: "2018-04-25" tag: "2.5.0-beta" type: REVERSE
-    checkout support/2.4
-    commit id: "2018-06-14" tag: "2.4.2"
-    checkout develop
-    commit id: "2018-06-27" tag: "2.5.0" type: HIGHLIGHT
-    branch support/2.5 order: 880
-    checkout develop
-    commit id: "2019-01-09" tag: "2.6.0" type: HIGHLIGHT
-    branch support/2.6 order: 870
-    commit id: "2019-03-28" tag: "2.6.1"
-    checkout develop
-    commit id: "2019-12-18" tag: "2.7.0-beta" type: REVERSE
-    checkout support/2.5
-    commit id: "2020-01-22" tag: "2.5.4"
-    checkout support/2.6
-    commit id: "2020-01-23" tag: "2.6.3"
-    checkout develop
-    commit id: "2020-01-29" tag: "2.7.0-beta2" type: REVERSE
-    commit id: "2020-04-01" tag: "2.7.0-1" type: HIGHLIGHT
-    checkout support/2.6
-    commit id: "2020-04-22" tag: "2.6.4"
-    checkout develop
-    branch support/2.7 order: 860
-    commit id: "2020-06-26" tag: "2.7.1"
-    checkout support/2.7
-    commit id: "2020-12-09" tag: "2.7.3"
-    commit id: "2021-03-31" tag: "2.7.4"
-    checkout develop
-    commit id: "2021-04-06" tag: "3.0.0-beta" type: REVERSE
-    checkout support/2.7
-    commit id: "2021-07-05" tag: "2.7.5"
-    checkout develop
-    commit id: "2021-07-05." tag: "3.0.0-beta2" type: REVERSE
-    checkout support/2.7
-    commit id: "2021-12-17" tag: "2.7.6"
-    checkout develop
-    commit id: "2022-01-04" tag: "3.0.0" type: HIGHLIGHT
-    branch support/3.0 order: 850
-    commit id: "2022-04-08" tag: "3.0.1"
-    checkout support/2.7
-    commit id: "2022-07-11" tag: "2.7.7"
-    checkout support/3.0
-    commit id: "2022-09-12" tag: "3.0.2-1"
-    checkout develop
-    checkout support/2.7
-    commit id: "2022-12-28" tag: "2.7.8"
-    checkout support/3.0
-    commit id: "2023-04-12" tag: "3.0.3"
-    checkout develop
-    commit id: "2023-06-19" tag: "3.1.0-beta" type: REVERSE
-    commit id: "2023-07-26" tag: "3.1.0-1" type: HIGHLIGHT
-    branch support/3.1 order: 840
-    checkout support/3.1
-    commit id: "2023-08-09" tag: "3.1.0-2"
-    checkout support/2.7
-    commit id: "2023-08-10" tag: "2.7.9"
-    checkout support/3.1
-    commit id: "2023-12-20" tag: "3.1.1"
-    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/3.2
-    commit id: "2024-06-25" tag: "3.2.0-beta1" type: REVERSE
-    commit id: "2024-08-07" tag: "3.2.0"
-    commit id: "2024-09-13" tag: "3.2.0-2"
-    checkout support/3.1
-    commit id: "2024-09-27" tag: "3.1.2"
-    checkout support/2.7
-    commit id: "2024-09-28" tag: "2.7.11"
-    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"
-    commit id: "2025-04-08" tag: "3.2.1-1"
-    commit id: "2025-08-19" tag: "3.2.2-1"
-    checkout support/2.7
-    commit id: "2025-10-07" tag: "2.7.13"
-```
-
-To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.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

@@ -5,7 +5,7 @@ You want to contribute to iTop? Many thanks to you! 🎉 👍
 Here are some guidelines that will help us integrate your work!
 
 
-
+## Contributions
 
 ### Subjects
 You are welcome to create pull requests on any of those subjects:
@@ -161,4 +161,4 @@ We have one sticker per contribution type. You might get multiple stickers with
 
 Here is the design of each stickers for year 2024:
 
-![iTop stickers 2025](.doc/contributing-guide/2025.contributing-stickers-side-by-side.png)
+![iTop stickers 2024](.doc/contributing-guide/2024.contributing-stickers-side-by-side.png)

README.md

@@ -1,4 +1,4 @@
-<p align="center"><a href="https://combodo.com" target="_blank">
+<p align="center"><a href="https://www.combodo.com/itop-193" 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">
@@ -53,7 +53,7 @@ iTop also offers mass import tools to help you become even more efficient.
 [4]: https://www.itophub.io/wiki/page?id=latest:install:requirements
 [5]: https://www.itophub.io/wiki
 [6]: https://store.itophub.io/en_US/
-[7]: itop-version-history.md
+[7]: .doc/itop-version-history.md
 
 [10]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#configuration_management_cmdb
 [11]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#ticketing
@@ -80,9 +80,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,27 +92,19 @@ 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
-- Håkon, Harnes (a.k.a [@hakonharnes](https://github.com/hakonharnes))
-- 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
@@ -126,12 +116,10 @@ We would like to give a special thank you 🤗 to the people from the community
 - 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
@@ -153,6 +141,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,329 @@
+<?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/>
+
+/**
+ * UserRightsMatrix (User management Module)
+ *
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class UserRightsMatrixClassGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"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", ["targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
+		MetaModel::Init_AddAttribute(new AttributeString("class", ["allowed_values" => null, "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", ["allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", ["allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => []]));
+	}
+}
+
+class UserRightsMatrixClassStimulusGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"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", ["targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
+		MetaModel::Init_AddAttribute(new AttributeString("class", ["allowed_values" => null, "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", ["allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", ["allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => []]));
+	}
+}
+
+class UserRightsMatrixAttributeGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"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", ["targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
+		MetaModel::Init_AddAttribute(new AttributeString("class", ["allowed_values" => null, "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", ["allowed_values" => null, "sql" => "attcode", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", ["allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", ["allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => []]));
+	}
+}
+
+class UserRightsMatrix extends UserRightsAddOnAPI
+{
+	public static $m_aActionCodes = [
+		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 (['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 (['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 = [])
+	{
+		$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,77 @@
+<?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/>
+
+/**
+ * UserRightsNull
+ * User management Module - say Yeah! to everything
+ *
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @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 = [])
+	{
+		$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

@@ -334,11 +334,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 		if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator()) {
 			throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
 		}
-
-		$oSet = new \ormLinkSet(get_class($oUser), 'profile_list', \DBObjectSet::FromScratch(\URP_UserProfile::class));
-		$oSet->AddItem(MetaModel::NewObject('URP_UserProfile', ['profileid' => $this->GetKey(), 'reason' => 'CheckIfProfileIsAllowed']));
-
-		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, $oSet)) {
+		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, DBObjectSet::FromObject($this))) {
 			throw new SecurityException(Dict::Format('UI:Error:ObjectCannotBeUpdated'));
 		}
 		if (!UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME)) {
@@ -471,8 +467,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// Add this user to the very specific 'admin' profile
 		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", ['name' => ADMIN_PROFILE_NAME], true /*all data*/);
 		if (is_object($oAdminProfile)) {
-			$oSet = new \ormLinkSet(UserLocal::class, 'profile_list', \DBObjectSet::FromScratch(\URP_UserProfile::class));
-			$oSet->AddItem(MetaModel::NewObject('URP_UserProfile', ['profileid' => $oAdminProfile->GetKey(), 'reason' => 'CreateAdministrator']));
+			$oUserProfile = new URP_UserProfile();
+			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
+			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+			$oSet = DBObjectSet::FromObject($oUserProfile);
 			$oUser->Set('profile_list', $oSet);
 		}
 		$iUserId = $oUser->DBInsertNoReload();

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

@@ -0,0 +1,959 @@
+<?php
+
+/**
+ * Copyright (C) 2013-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
+ */
+
+use Combodo\iTop\Application\WebPage\WebPage;
+
+define('ADMIN_PROFILE_NAME', 'Administrator');
+define('PORTAL_PROFILE_NAME', 'Portal user');
+
+class UserRightsBaseClassGUI extends cmdbAbstractObject
+{
+	// Whenever something changes, reload the privileges
+
+	protected function AfterInsert()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterUpdate()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterDelete()
+	{
+		UserRights::FlushPrivileges();
+	}
+}
+
+class UserRightsBaseClass extends DBObject
+{
+	// Whenever something changes, reload the privileges
+
+	protected function AfterInsert()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterUpdate()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterDelete()
+	{
+		UserRights::FlushPrivileges();
+	}
+}
+
+class URP_Profiles extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category"                   => "addon/userrights",
+			"key_type"                   => "autoincrement",
+			"name_attcode"               => "name",
+			"complementary_name_attcode" => ['description'],
+			"state_attcode"              => "",
+			"reconc_keys"                => [],
+			"db_table"                   => "priv_urp_profiles",
+			"db_key_field"               => "id",
+			"db_finalclass_field"        => "",
+		];
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", ["allowed_values" => null, "sql" => "name", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeString("description", ["allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", ["linked_class" => "URP_UserProfile", "ext_key_to_me" => "profileid", "ext_key_to_remote" => "userid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => []]));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', ['name', 'description', 'user_list']); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', ['name', 'description']); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', ['name', 'description']);
+	}
+
+	protected $m_bCheckReservedNames = true;
+	protected function DisableCheckOnReservedNames()
+	{
+		$this->m_bCheckReservedNames = false;
+	}
+
+	protected static $m_aActions = [
+		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',
+	];
+
+	protected static $m_aCacheActionGrants = null;
+	protected static $m_aCacheStimulusGrants = null;
+	protected static $m_aCacheProfiles = null;
+
+	public static function DoCreateProfile($sName, $sDescription, $bReservedName = false)
+	{
+		if (is_null(self::$m_aCacheProfiles)) {
+			self::$m_aCacheProfiles = [];
+			$oFilterAll = new DBObjectSearch('URP_Profiles');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oProfile = $oSet->Fetch()) {
+				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
+			}
+		}
+
+		$sCacheKey = $sName;
+		if (isset(self::$m_aCacheProfiles[$sCacheKey])) {
+			return self::$m_aCacheProfiles[$sCacheKey];
+		}
+		$oNewObj = MetaModel::NewObject("URP_Profiles");
+		$oNewObj->Set('name', $sName);
+		$oNewObj->Set('description', $sDescription);
+		if ($bReservedName) {
+			$oNewObj->DisableCheckOnReservedNames();
+		}
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheProfiles[$sCacheKey] = $iId;
+		return $iId;
+	}
+
+	public static function DoCreateActionGrant($iProfile, $iAction, $sClass, $bPermission = true)
+	{
+		$sAction = self::$m_aActions[$iAction];
+
+		if (is_null(self::$m_aCacheActionGrants)) {
+			self::$m_aCacheActionGrants = [];
+			$oFilterAll = new DBObjectSearch('URP_ActionGrant');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oGrant = $oSet->Fetch()) {
+				self::$m_aCacheActionGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('action').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
+			}
+		}
+
+		$sCacheKey = "$iProfile-$sAction-$sClass";
+		if (isset(self::$m_aCacheActionGrants[$sCacheKey])) {
+			return self::$m_aCacheActionGrants[$sCacheKey];
+		}
+
+		$oNewObj = MetaModel::NewObject("URP_ActionGrant");
+		$oNewObj->Set('profileid', $iProfile);
+		$oNewObj->Set('permission', $bPermission ? 'yes' : 'no');
+		$oNewObj->Set('class', $sClass);
+		$oNewObj->Set('action', $sAction);
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheActionGrants[$sCacheKey] = $iId;
+		return $iId;
+	}
+
+	public static function DoCreateStimulusGrant($iProfile, $sStimulusCode, $sClass)
+	{
+		if (is_null(self::$m_aCacheStimulusGrants)) {
+			self::$m_aCacheStimulusGrants = [];
+			$oFilterAll = new DBObjectSearch('URP_StimulusGrant');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oGrant = $oSet->Fetch()) {
+				self::$m_aCacheStimulusGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('stimulus').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
+			}
+		}
+
+		$sCacheKey = "$iProfile-$sStimulusCode-$sClass";
+		if (isset(self::$m_aCacheStimulusGrants[$sCacheKey])) {
+			return self::$m_aCacheStimulusGrants[$sCacheKey];
+		}
+		$oNewObj = MetaModel::NewObject("URP_StimulusGrant");
+		$oNewObj->Set('profileid', $iProfile);
+		$oNewObj->Set('permission', 'yes');
+		$oNewObj->Set('class', $sClass);
+		$oNewObj->Set('stimulus', $sStimulusCode);
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheStimulusGrants[$sCacheKey] = $iId;
+		return $iId;
+	}
+
+	/*
+	* Create the built-in Administrator profile with its reserved name
+	*/
+	public static function DoCreateAdminProfile()
+	{
+		self::DoCreateProfile(ADMIN_PROFILE_NAME, 'Has the rights on everything (bypassing any control)', true /* reserved name */);
+	}
+
+	/*
+	* Overload the standard behavior to preserve reserved names
+	*/
+	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		if ($this->m_bCheckReservedNames) {
+			$aChanges = $this->ListChanges();
+			if (array_key_exists('name', $aChanges)) {
+				if ($this->GetOriginal('name') == ADMIN_PROFILE_NAME) {
+					$this->m_aCheckIssues[] = "The name of the Administrator profile must not be changed";
+				} elseif ($this->Get('name') == ADMIN_PROFILE_NAME) {
+					$this->m_aCheckIssues[] = ADMIN_PROFILE_NAME." is a reserved to the built-in Administrator profile";
+				} elseif ($this->GetOriginal('name') == PORTAL_PROFILE_NAME) {
+					$this->m_aCheckIssues[] = "The name of the User Portal profile must not be changed";
+				} elseif ($this->Get('name') == PORTAL_PROFILE_NAME) {
+					$this->m_aCheckIssues[] = PORTAL_PROFILE_NAME." is a reserved to the built-in User Portal profile";
+				}
+			}
+		}
+	}
+
+	public function GetGrantAsHtml($oUserRights, $sClass, $sAction)
+	{
+		$iGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
+		if (!is_null($iGrant)) {
+			return '<span class="ibo-user-rights ibo-is-success">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
+		} else {
+			return '<span class="ibo-user-rights ibo-is-failure">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+		}
+	}
+
+	public function DoShowGrantSumary($oPage)
+	{
+		if ($this->GetRawName() == "Administrator") {
+			// Looks dirty, but ok that's THE ONE
+			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
+			return;
+		}
+
+		// Note: for sure, we assume that the instance is derived from UserRightsProfile
+		$oUserRights = UserRights::GetModuleInstance();
+
+		$aDisplayData = [];
+		foreach (MetaModel::GetClasses('bizmodel') as $sClass) {
+			// Skip non instantiable classes
+			if (MetaModel::IsAbstract($sClass)) {
+				continue;
+			}
+
+			$aStimuli = [];
+			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus) {
+				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
+				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes')) {
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.utils::EscapeHtml($oStimulus->GetDescription()).'">'.utils::EscapeHtml($oStimulus->GetLabel()).'</span>';
+				}
+			}
+			$sStimuli = implode(', ', $aStimuli);
+
+			$aDisplayData[] = [
+				'class' => MetaModel::GetName($sClass),
+				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'),
+				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Read'),
+				'write' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Modify'),
+				'bulkwrite' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Modify'),
+				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Delete'),
+				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Delete'),
+				'stimuli' => $sStimuli,
+			];
+		}
+
+		$aDisplayConfig = [];
+		$aDisplayConfig['class'] = ['label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+')];
+		$aDisplayConfig['read'] = ['label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+')];
+		$aDisplayConfig['bulkread'] = ['label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+')];
+		$aDisplayConfig['write'] = ['label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+')];
+		$aDisplayConfig['bulkwrite'] = ['label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+')];
+		$aDisplayConfig['delete'] = ['label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+')];
+		$aDisplayConfig['bulkdelete'] = ['label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+')];
+		$aDisplayConfig['stimuli'] = ['label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+')];
+		$oPage->table($aDisplayConfig, $aDisplayData);
+	}
+
+	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		parent::DisplayBareRelations($oPage, $bEditMode);
+
+		$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
+		$this->DoShowGrantSumary($oPage);
+	}
+}
+
+class URP_UserProfile extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category"            => "addon/userrights",
+			"key_type"            => "autoincrement",
+			"name_attcode"        => ["userlogin", "profile"],
+			"state_attcode"       => "",
+			"reconc_keys"         => [],
+			"db_table"            => "priv_urp_userprofile",
+			"db_key_field"        => "id",
+			"db_finalclass_field" => "",
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
+		];
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", ["targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey(
+			"profileid",
+			["targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => [], "allow_target_creation" => false]
+		));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", ["allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name"]));
+
+		MetaModel::Init_AddAttribute(new AttributeString("reason", ["allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => []]));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', ['userid', 'profileid', 'reason']); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', ['userid', 'profileid', 'reason']); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', ['userid', 'profileid']); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', ['userid', 'profileid']); // Criteria of the advanced search form
+	}
+}
+
+class URP_UserOrg extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => ["userlogin", "allowed_org_name"],
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"db_table" => "priv_urp_userorg",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		];
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", ["targetclass" => "User", "jointype" => "", "allowed_values" => null, "sql" => "userid", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", ["allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"]));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("allowed_org_id", ["targetclass" => "Organization", "jointype" => "", "allowed_values" => null, "sql" => "allowed_org_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("allowed_org_name", ["allowed_values" => null, "extkey_attcode" => 'allowed_org_id', "target_attcode" => "name"]));
+
+		MetaModel::Init_AddAttribute(new AttributeString("reason", ["allowed_values" => null, "sql" => "reason", "default_value" => null, "is_null_allowed" => true, "depends_on" => []]));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', ['userid', 'allowed_org_id', 'reason']); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', ['allowed_org_id', 'reason']); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', ['userid', 'allowed_org_id']); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', ['userid', 'allowed_org_id']); // Criteria of the advanced search form
+	}
+}
+
+class URP_ActionGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"db_table" => "priv_urp_grant_actions",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		];
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", ["targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_SILENT, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", ["allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name"]));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", ["class_category" => "", "more_values" => "", "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", ["allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => []]));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", ["allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', ['profileid', 'class', 'permission', 'action']); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', ['class', 'permission', 'action']); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', ['profileid', 'class', 'permission', 'action']); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', ['profileid', 'class', 'permission', 'action']); // Criteria of the advanced search form
+	}
+}
+
+class URP_StimulusGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"db_table" => "priv_urp_grant_stimulus",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		];
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", ["targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_SILENT, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", ["allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name"]));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", ["class_category" => "", "more_values" => "", "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", ["allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => []]));
+
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", ["allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', ['profileid', 'class', 'permission', 'stimulus']); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', ['class', 'permission', 'stimulus']); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', ['profileid', 'class', 'permission', 'stimulus']); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', ['profileid', 'class', 'permission', 'stimulus']); // Criteria of the advanced search form
+	}
+}
+
+class URP_AttributeGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams =
+		[
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "actiongrantid",
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"db_table" => "priv_urp_grant_attributes",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		];
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", ["targetclass" => "URP_ActionGrant", "jointype" => "", "allowed_values" => null, "sql" => "actiongrantid", "is_null_allowed" => false, "on_target_delete" => DEL_SILENT, "depends_on" => []]));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", ["allowed_values" => null, "sql" => "attcode", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', ['actiongrantid', 'attcode']); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', ['attcode']); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', ['actiongrantid', 'attcode']); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', ['actiongrantid', 'attcode']); // Criteria of the advanced search form
+	}
+}
+
+class UserRightsProfile extends UserRightsAddOnAPI
+{
+	public static $m_aActionCodes = [
+		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')
+	{
+		// Create a change to record the history of the User object
+		CMDBObject::SetCurrentChangeFromParams('Initialization : create first user admin profile');
+
+		$iContactId = 0;
+		// Support drastic data model changes: no organization class (or not writable)!
+		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization')) {
+			$oOrg = MetaModel::NewObject('Organization');
+			$oOrg->Set('name', 'My Company/Department');
+			$oOrg->Set('code', 'SOMECODE');
+			$iOrgId = $oOrg->DBInsertNoReload();
+
+			// Support drastic data model changes: no Person class  (or not writable)!
+			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person')) {
+				$oContact = MetaModel::NewObject('Person');
+				$oContact->Set('name', 'My last name');
+				$oContact->Set('first_name', 'My first name');
+				if (MetaModel::IsValidAttCode('Person', 'org_id')) {
+					$oContact->Set('org_id', $iOrgId);
+				}
+				$oContact->Set('email', 'my.email@foo.org');
+				$iContactId = $oContact->DBInsertNoReload();
+			}
+		}
+
+		$oUser = new UserLocal();
+		$oUser->Set('login', $sAdminUser);
+		$oUser->Set('password', $sAdminPwd);
+		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0)) {
+			$oUser->Set('contactid', $iContactId);
+		}
+		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+
+		// Add this user to the very specific 'admin' profile
+		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", ['name' => ADMIN_PROFILE_NAME], true /*all data*/);
+		if (is_object($oAdminProfile)) {
+			$oUserProfile = new URP_UserProfile();
+			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
+			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+			$oSet = DBObjectSet::FromObject($oUserProfile);
+			$oUser->Set('profile_list', $oSet);
+		}
+		$oUser->DBInsertNoReload();
+
+		return true;
+	}
+
+	public function Init()
+	{
+	}
+
+	protected $m_aAdmins = []; // id -> bool, true if the user has the well-known admin profile
+	protected $m_aPortalUsers = []; // id -> bool, true if the user has the well-known portal user profile
+
+	protected $m_aProfiles; // id -> object
+	protected $m_aUserProfiles = []; // userid,profileid -> object
+	protected $m_aUserOrgs = []; // userid -> array of orgid
+
+	// Those arrays could be completed on demand (inheriting parent permissions)
+	protected $m_aClassActionGrants = null; // profile, class, action -> actiongrantid (or false if NO, or null/missing if undefined)
+	protected $m_aClassStimulusGrants = []; // profile, class, stimulus -> permission
+
+	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
+	protected $m_aObjectActionGrants = [];
+
+	/**
+	 * Read and cache organizations allowed to the given user
+	 *
+	 * @param User $oUser
+	 * @param string $sClass (not used here but can be used in overloads)
+	 *
+	 * @return array keys of the User allowed org
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	public function GetUserOrgs($oUser, $sClass)
+	{
+		$iUser = $oUser->GetKey();
+		if (!array_key_exists($iUser, $this->m_aUserOrgs)) {
+			$this->m_aUserOrgs[$iUser] = [];
+
+			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
+			if ($sHierarchicalKeyCode !== false) {
+				$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id WHERE UserOrg.userid = :userid';
+				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), [], ['userid' => $iUser]);
+				while ($aRow = $oUserOrgSet->FetchAssoc()) {
+					$oOrg = $aRow['Org'];
+					$this->m_aUserOrgs[$iUser][] = $oOrg->GetKey();
+				}
+			} else {
+				$oSearch = new DBObjectSearch('URP_UserOrg');
+				$oSearch->AllowAllData();
+				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
+				$oSearch->AddConditionExpression($oCondition);
+
+				$oUserOrgSet = new DBObjectSet($oSearch, [], ['userid' => $iUser]);
+				while ($oUserOrg = $oUserOrgSet->Fetch()) {
+					$this->m_aUserOrgs[$iUser][] = $oUserOrg->Get('allowed_org_id');
+				}
+			}
+		}
+		return $this->m_aUserOrgs[$iUser];
+	}
+
+	/**
+	 * Read and cache profiles of the given user
+	 */
+	protected function GetUserProfiles($iUser)
+	{
+		if (!array_key_exists($iUser, $this->m_aUserProfiles)) {
+			$oSearch = new DBObjectSearch('URP_UserProfile');
+			$oSearch->AllowAllData();
+			$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
+			$oSearch->AddConditionExpression($oCondition);
+
+			$this->m_aUserProfiles[$iUser] = [];
+			$oUserProfileSet = new DBObjectSet($oSearch, [], ['userid' => $iUser]);
+			while ($oUserProfile = $oUserProfileSet->Fetch()) {
+				$this->m_aUserProfiles[$iUser][$oUserProfile->Get('profileid')] = $oUserProfile;
+			}
+		}
+		return $this->m_aUserProfiles[$iUser];
+
+	}
+
+	public function ResetCache()
+	{
+		// Loaded by Load cache
+		$this->m_aProfiles = null;
+		$this->m_aUserProfiles = [];
+		$this->m_aUserOrgs = [];
+
+		$this->m_aAdmins = [];
+		$this->m_aPortalUsers = [];
+
+		// Loaded on demand (time consuming as compared to the others)
+		$this->m_aClassActionGrants = null;
+		$this->m_aClassStimulusGrants = null;
+
+		$this->m_aObjectActionGrants = [];
+	}
+
+	// Separate load: this cache is much more time consuming while loading
+	// Thus it is loaded iif required
+	// Could be improved by specifying the profile id
+	public function LoadActionGrantCache()
+	{
+		if (!is_null($this->m_aClassActionGrants)) {
+			return;
+		}
+
+		$oKPI = new ExecutionKPI();
+
+		$oFilter = DBObjectSearch::FromOQL_AllData("SELECT URP_ActionGrant AS p WHERE p.permission = 'yes'");
+		$aGrants = $oFilter->ToDataArray();
+		foreach ($aGrants as $aGrant) {
+			$this->m_aClassActionGrants[$aGrant['profileid']][$aGrant['class']][strtolower($aGrant['action'])] = $aGrant['id'];
+		}
+
+		$oKPI->ComputeAndReport('Load of action grants');
+	}
+
+	public function LoadCache()
+	{
+		if (!is_null($this->m_aProfiles)) {
+			return false;
+		}
+		// Could be loaded in a shared memory (?)
+
+		$oKPI = new ExecutionKPI();
+
+		if (self::HasSharing()) {
+			SharedObject::InitSharedClassProperties();
+		}
+
+		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
+		$this->m_aProfiles = [];
+		while ($oProfile = $oProfileSet->Fetch()) {
+			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile;
+		}
+
+		$this->m_aClassStimulusGrants = [];
+		$oStimGrantSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_StimulusGrant"));
+		$this->m_aStimGrants = [];
+		while ($oStimGrant = $oStimGrantSet->Fetch()) {
+			$this->m_aClassStimulusGrants[$oStimGrant->Get('profileid')][$oStimGrant->Get('class')][$oStimGrant->Get('stimulus')] = $oStimGrant;
+		}
+
+		$oKPI->ComputeAndReport('Load of user management cache (excepted Action Grants)');
+
+		/*
+				echo "<pre>\n";
+				print_r($this->m_aProfiles);
+				print_r($this->m_aUserProfiles);
+				print_r($this->m_aUserOrgs);
+				print_r($this->m_aClassActionGrants);
+				print_r($this->m_aClassStimulusGrants);
+				echo "</pre>\n";
+		exit;
+		*/
+
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		//$this->LoadCache();
+		$iUser = $oUser->GetKey();
+		if (!array_key_exists($iUser, $this->m_aAdmins)) {
+			$bIsAdmin = false;
+			foreach ($this->GetUserProfiles($iUser) as $oUserProfile) {
+				if ($oUserProfile->Get('profile') == ADMIN_PROFILE_NAME) {
+					$bIsAdmin = true;
+					break;
+				}
+			}
+			$this->m_aAdmins[$iUser] = $bIsAdmin;
+		}
+		return $this->m_aAdmins[$iUser];
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		//$this->LoadCache();
+		$iUser = $oUser->GetKey();
+		if (!array_key_exists($iUser, $this->m_aPortalUsers)) {
+			$bIsPortalUser = false;
+			foreach ($this->GetUserProfiles($iUser) as $oUserProfile) {
+				if ($oUserProfile->Get('profile') == PORTAL_PROFILE_NAME) {
+					$bIsPortalUser = true;
+					break;
+				}
+			}
+			$this->m_aPortalUsers[$iUser] = $bIsPortalUser;
+		}
+		return $this->m_aPortalUsers[$iUser];
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = [])
+	{
+		$this->LoadCache();
+
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
+		if ($aObjectPermissions['permission'] == UR_ALLOWED_NO) {
+			return false;
+		}
+
+		// Determine how to position the objects of this class
+		//
+		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
+		if (is_null($sAttCode)) {
+			// No filtering for this object
+			return true;
+		}
+		// Position the user
+		//
+		$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+		if (count($aUserOrgs) == 0) {
+			// No org means 'any org'
+			return true;
+		}
+
+		return $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
+	}
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetProfileActionGrant($iProfile, $sClass, $sAction)
+	{
+		$this->LoadActionGrantCache();
+
+		// Note: action is forced lowercase to be more flexible (historical bug)
+		$sAction = strtolower($sAction);
+		if (isset($this->m_aClassActionGrants[$iProfile][$sClass][$sAction])) {
+			return $this->m_aClassActionGrants[$iProfile][$sClass][$sAction];
+		}
+
+		// Recursively look for the grant record in the class hierarchy
+		$sParentClass = MetaModel::GetParentPersistentClass($sClass);
+		if (empty($sParentClass)) {
+			$iGrant = null;
+		} else {
+			// Recursively look for the grant record in the class hierarchy
+			$iGrant = $this->GetProfileActionGrant($iProfile, $sParentClass, $sAction);
+		}
+
+		$this->m_aClassActionGrants[$iProfile][$sClass][$sAction] = $iGrant;
+		return $iGrant;
+	}
+
+	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
+	{
+		$this->LoadCache();
+
+		// load and cache permissions for the current user on the given class
+		//
+		$iUser = $oUser->GetKey();
+		$aTest = @$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
+		if (is_array($aTest)) {
+			return $aTest;
+		}
+
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$iPermission = UR_ALLOWED_NO;
+		$aAttributes = [];
+		foreach ($this->GetUserProfiles($iUser) as $iProfile => $oProfile) {
+			$iGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
+			if (is_null($iGrant) || !$iGrant) {
+				continue; // loop to the next profile
+			} else {
+				$iPermission = UR_ALLOWED_YES;
+
+				// update the list of attributes with those allowed for this profile
+				//
+				$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_AttributeGrant WHERE actiongrantid = :actiongrantid");
+				$oSet = new DBObjectSet($oSearch, [], ['actiongrantid' => $iGrant]);
+				$aProfileAttributes = $oSet->GetColumnAsArray('attcode', false);
+				if (count($aProfileAttributes) == 0) {
+					$aAllAttributes = array_keys(MetaModel::ListAttributeDefs($sClass));
+					$aAttributes = array_merge($aAttributes, $aAllAttributes);
+				} else {
+					$aAttributes = array_merge($aAttributes, $aProfileAttributes);
+				}
+			}
+		}
+
+		$aRes = [
+			'permission' => $iPermission,
+			'attributes' => $aAttributes,
+		];
+		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
+		return $aRes;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
+		$iPermission = $aObjectPermissions['permission'];
+
+		// Note: In most cases the object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+
+		if ($iPermission != UR_ALLOWED_YES) {
+			// It is already NO for everyone... that's the final word!
+		} elseif ($iActionCode == UR_ACTION_READ) {
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+		} elseif ($iActionCode == UR_ACTION_BULK_READ) {
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+		} elseif ($oInstanceSet) {
+			// 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()) {
+				$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
+
+					$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;
+							}
+						}
+					}
+				}
+			}
+		}
+		return $iPermission;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+
+		// Note: The object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
+		$aAttributes = $aObjectPermissions['attributes'];
+		if (in_array($sAttCode, $aAttributes)) {
+			return $aObjectPermissions['permission'];
+		} else {
+			return UR_ALLOWED_NO;
+		}
+	}
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode)
+	{
+		$this->LoadCache();
+
+		if (isset($this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode])) {
+			return $this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode];
+		} else {
+			return null;
+		}
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+		// Note: this code is VERY close to the code of IsActionAllowed()
+		$iUser = $oUser->GetKey();
+
+		// Note: The object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+		$iPermission = UR_ALLOWED_NO;
+		foreach ($this->GetUserProfiles($iUser) as $iProfile => $oProfile) {
+			$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
+			if (!is_null($oGrantRecord)) {
+				// no need to fetch the record, we've requested the records having permission = 'yes'
+				$iPermission = UR_ALLOWED_YES;
+			}
+		}
+		return $iPermission;
+	}
+
+	public function FlushPrivileges()
+	{
+		$this->ResetCache();
+	}
+
+	/**
+	 * Find out which attribute is corresponding the the dimension 'owner org'
+	 * returns null if no such attribute has been found (no filtering should occur)
+	 */
+	public static function GetOwnerOrganizationAttCode($sClass)
+	{
+		$sAttCode = null;
+
+		$aCallSpec = [$sClass, 'MapContextParam'];
+		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization')) {
+			$sAttCode = 'id';
+		} elseif (is_callable($aCallSpec)) {
+			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode)) {
+				// Skip silently. The data model checker will tell you something about this...
+				$sAttCode = null;
+			}
+		} elseif (MetaModel::IsValidAttCode($sClass, 'org_id')) {
+			$sAttCode = 'org_id';
+		}
+
+		return $sAttCode;
+	}
+
+	/**
+	 * Determine wether the objects can be shared by the mean of a class SharedObject
+	 **/
+	protected static function HasSharing()
+	{
+		static $bHasSharing;
+		if (!isset($bHasSharing)) {
+			$bHasSharing = class_exists('SharedObject');
+		}
+		return $bHasSharing;
+	}
+}
+
+UserRights::SelectModule('UserRightsProfile');

app.php

@@ -18,30 +18,13 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-namespace Combodo\iTop\Forms\Twig\Extension;
+use Combodo\iTop\Kernel;
 
-use Dict;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
+require_once __DIR__.'/lib/autoload_runtime.php';
 
-/**
- * Extension to provide compatibility with Symfony/Twig standard functions
- *
- * @package Combodo\iTop\Forms\Twig\Extension
- */
-class FormCompatibilityExtension extends AbstractExtension
-{
-	/** @inheritdoc */
-	public function getFilters(): array
-	{
-		return [
+require_once('approot.inc.php');
+require_once('application/startup.inc.php');
 
-			// Alias of dict_s, to be compatible with Symfony/Twig standard
-			new TwigFilter('trans', function ($sStringCode, $aData = null, $sTransDomain = false) {
-				return Dict::S($sStringCode);
-			}),
-
-		];
-	}
-
-}
+return function (array $context) {
+	return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+};

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-2024 Combodo SAS
+ */
+
+// 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
+{
+	public function __construct($s_title)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('ajax_page is deprecated. Please use AjaxPage instead');
+		parent::__construct($s_title);
+	}
+}

application/applicationextension/backoffice/AbstractApplicationUIExtension.php

@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Extend this class instead of implementing iApplicationUIExtension if you don't need to overload
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since       2.7.0
- */
-abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function OnDisplayProperties($oObject, \Combodo\iTop\Application\WebPage\WebPage $oPage, $bEditMode = false)
-	{
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function OnDisplayRelations($oObject, \Combodo\iTop\Application\WebPage\WebPage $oPage, $bEditMode = false)
-	{
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function OnFormSubmit($oObject, $sFormPrefix = '')
-	{
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function OnFormCancel($sTempId)
-	{
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function EnumUsedAttributes($oObject)
-	{
-		return [];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetIcon($oObject)
-	{
-		return '';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetHilightClass($oObject)
-	{
-		return HILIGHT_CLASS_NONE;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function EnumAllowedActions(DBObjectSet $oSet)
-	{
-		return [];
-	}
-
-}

application/applicationextension/backoffice/AbstractPageUIBlockExtension.php

@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Extend this class instead of iPageUIBlockExtension if you don't need to overload all methods
- *
- * @api
- * @package     UIBlockExtensibilityAPI
- * @since       3.0.0
- */
-abstract class AbstractPageUIBlockExtension implements iPageUIBlockExtension
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function GetBannerBlock()
-	{
-		return null;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetHeaderBlock()
-	{
-		return null;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetFooterBlock()
-	{
-		return null;
-	}
-}

application/applicationextension/backoffice/AbstractPreferencesExtension.php

@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Extend this class instead of implementing iPreferencesExtension if you don't need to overload all methods
- *
- * @api
- * @package     PreferencesExtensibilityAPI
- * @since       2.7.0
- */
-abstract class AbstractPreferencesExtension implements iPreferencesExtension
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function DisplayPreferences(\Combodo\iTop\Application\WebPage\WebPage $oPage)
-	{
-		// Do nothing
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function ApplyPreferences(\Combodo\iTop\Application\WebPage\WebPage $oPage, $sOperation)
-	{
-		// Do nothing
-	}
-
-}

application/applicationextension/backoffice/AbstractWelcomePopupExtension.php

@@ -1,35 +0,0 @@
-<?php
-
-/**
- * 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/applicationextension/backoffice/ApplicationPopupMenuItem.php

@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Base class for the various types of custom menus
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since 2.0
- */
-abstract class ApplicationPopupMenuItem
-{
-	/** @ignore */
-	protected $sUID;
-	/** @ignore */
-	protected $sLabel;
-	/** @ignore */
-	protected $sTooltip;
-	/** @ignore */
-	protected $sIconClass;
-	/** @ignore */
-	protected $aCssClasses;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
-	 * @param string $sLabel The display label of the menu (must be localized)
-	 * @api
-	 */
-	public function __construct($sUID, $sLabel)
-	{
-		$this->sUID = $sUID;
-		$this->sLabel = $sLabel;
-		$this->sTooltip = '';
-		$this->sIconClass = '';
-		$this->aCssClasses = [];
-	}
-
-	/**
-	 * Get the UID
-	 *
-	 * @return string The unique identifier
-	 * @ignore
-	 */
-	public function GetUID()
-	{
-		return $this->sUID;
-	}
-
-	/**
-	 * Get the label
-	 *
-	 * @return string The label
-	 * @ignore
-	 */
-	public function GetLabel()
-	{
-		return $this->sLabel;
-	}
-
-	/**
-	 * Get the CSS classes
-	 *
-	 * @return array
-	 * @ignore
-	 */
-	public function GetCssClasses()
-	{
-		return $this->aCssClasses;
-	}
-
-	/**
-	 * @param $aCssClasses
-	 * @api
-	 */
-	public function SetCssClasses($aCssClasses)
-	{
-		$this->aCssClasses = $aCssClasses;
-	}
-
-	/**
-	 * Adds a CSS class to the CSS classes that will be put on the menu item
-	 *
-	 * @param $sCssClass
-	 * @api
-	 */
-	public function AddCssClass($sCssClass)
-	{
-		$this->aCssClasses[] = $sCssClass;
-	}
-
-	/**
-	 * @param $sTooltip
-	 *
-	 * @api
-	 * @since 3.0.0
-	 */
-	public function SetTooltip($sTooltip)
-	{
-		$this->sTooltip = $sTooltip;
-	}
-
-	/**
-	 * @return string
-	 *
-	 * @api
-	 * @since 3.0.0
-	 */
-	public function GetTooltip()
-	{
-		return $this->sTooltip;
-	}
-
-	/**
-	 * @param $sIconClass
-	 *
-	 * @api
-	 * @since 3.0.0
-	 */
-	public function SetIconClass($sIconClass)
-	{
-		$this->sIconClass = $sIconClass;
-	}
-
-	/**
-	 * @return string
-	 *
-	 * @api
-	 * @since 3.0.0
-	 */
-	public function GetIconClass()
-	{
-		return $this->sIconClass;
-	}
-
-	/**
-	 * Returns the components to create a popup menu item in HTML
-	 *
-	 * @return array A hash array: array('label' => , 'url' => , 'target' => , 'onclick' => )
-	 * @ignore
-	 */
-	abstract public function GetMenuItem();
-
-	/** @ignore */
-	public function GetLinkedScripts()
-	{
-		return [];
-	}
-}

application/applicationextension/backoffice/JSButtonItem.php

@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Class for adding an item as a button that runs some JS code
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since 2.0
- */
-class JSButtonItem extends JSPopupMenuItem
-{
-}

application/applicationextension/backoffice/JSPopupMenuItem.php

@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Class for adding an item into a popup menu that triggers some Javascript code
- *
- * Note: This works only in the backoffice, {@see \JSButtonItem} for the end-user portal
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since 2.0
- */
-class JSPopupMenuItem extends ApplicationPopupMenuItem
-{
-	/** @ignore */
-	protected $sJsCode;
-	/** @ignore */
-	protected $sUrl;
-	/** @ignore */
-	protected $aIncludeJSFiles;
-
-	/**
-	 * Class for adding an item that triggers some Javascript code
-	 *
-	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
-	 * @param string $sLabel The display label of the menu (must be localized)
-	 * @param string $sJSCode In case the menu consists in executing some havascript code inside the page, pass it here. If supplied $sURL
-	 *     ans $sTarget will be ignored
-	 * @param array $aIncludeJSFiles An array of file URLs to be included (once) to provide some JS libraries for the page.
-	 * @api
-	 */
-	public function __construct($sUID, $sLabel, $sJSCode, $aIncludeJSFiles = [])
-	{
-		parent::__construct($sUID, $sLabel);
-		$this->sJsCode = $sJSCode;
-		$this->sUrl = '#';
-		$this->aIncludeJSFiles = $aIncludeJSFiles;
-	}
-
-	/** @ignore */
-	public function GetMenuItem()
-	{
-		// Note: the semicolumn is a must here!
-		return [
-			'label' => $this->GetLabel(),
-			'onclick' => $this->GetJsCode().'; return false;',
-			'url' => $this->GetUrl(),
-			'css_classes' => $this->GetCssClasses(),
-			'icon_class' => $this->sIconClass,
-			'tooltip' => $this->sTooltip,
-		];
-	}
-
-	/** @ignore */
-	public function GetLinkedScripts()
-	{
-		return $this->aIncludeJSFiles;
-	}
-
-	/** @ignore */
-	public function GetJsCode()
-	{
-		return $this->sJsCode;
-	}
-
-	/** @ignore */
-	public function GetUrl()
-	{
-		return $this->sUrl;
-	}
-}

application/applicationextension/backoffice/SeparatorPopupMenuItem.php

@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Class for adding a separator (horizontal line, not selectable) the output
- * will automatically reduce several consecutive separators to just one
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since 2.0
- */
-class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
-{
-	public static $idx = 0;
-
-	/**
-	 * Constructor
-	 * @api
-	 */
-	public function __construct()
-	{
-		parent::__construct('_separator_'.(self::$idx++), '');
-	}
-
-	/** @ignore */
-	public function GetMenuItem()
-	{
-		return ['label' => '<hr class="menu-separator">', 'url' => '', 'css_classes' => $this->aCssClasses];
-	}
-}

application/applicationextension/backoffice/URLButtonItem.php

@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Class for adding an item as a button that browses to the given URL
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since 2.0
- */
-class URLButtonItem extends URLPopupMenuItem
-{
-}

application/applicationextension/backoffice/URLPopupMenuItem.php

@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Class for adding an item into a popup menu that browses to the given URL
- *
- * Note: This works only in the backoffice, {@see \URLButtonItem} for the end-user portal
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since 2.0
- */
-class URLPopupMenuItem extends ApplicationPopupMenuItem
-{
-	/** @ignore */
-	protected $sUrl;
-	/** @ignore */
-	protected $sTarget;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
-	 * @param string $sLabel The display label of the menu (must be localized)
-	 * @param string $sUrl If the menu is an hyperlink, provide the absolute hyperlink here
-	 * @param string $sTarget In case the menu is an hyperlink and a specific target is needed (_blank for example), pass it here
-	 * @api
-	 */
-	public function __construct($sUID, $sLabel, $sUrl, $sTarget = '_top')
-	{
-		parent::__construct($sUID, $sLabel);
-		$this->sUrl = $sUrl;
-		$this->sTarget = $sTarget;
-	}
-
-	/** @ignore */
-	public function GetMenuItem()
-	{
-		return ['label' => $this->GetLabel(),
-			'url' => $this->GetUrl(),
-			'target' => $this->GetTarget(),
-			'css_classes' => $this->aCssClasses,
-			'icon_class' => $this->sIconClass,
-			'tooltip' => $this->sTooltip,
-		];
-	}
-
-	/** @ignore */
-	public function GetUrl()
-	{
-		return $this->sUrl;
-	}
-
-	/** @ignore */
-	public function GetTarget()
-	{
-		return $this->sTarget;
-	}
-}

application/applicationextension/backoffice/iApplicationUIExtension.php

@@ -1,173 +0,0 @@
-<?php
-
-/**
- * Implement this interface to change the behavior of the GUI for some objects.
- *
- * All methods are invoked by iTop for a given object. There are basically two usages:
- *
- * 1) To tweak the form of an object, you will have to implement a specific behavior within:
- *
- * * OnDisplayProperties (bEditMode = true)
- * * OnFormSubmit
- * * OnFormCancel
- *
- * 2) To tune the display of the object details, you can use:
- *
- * * OnDisplayProperties
- * * OnDisplayRelations
- * * GetIcon
- * * GetHilightClass
- *
- * Please note that some of the APIs can be called several times for a single page displayed.
- * Therefore it is not recommended to perform too many operations, such as querying the database.
- * A recommended pattern is to cache data by the mean of static members.
- *
- * @api
- * @package     UIExtensibilityAPI
- */
-interface iApplicationUIExtension
-{
-	/**
-	 *    Invoked when an object is being displayed (wiew or edit)
-	 *
-	 * The method is called right after the main tab has been displayed.
-	 * You can add output to the page, either to change the display, or to add a form input
-	 *
-	 * Example:
-	 * <code>
-	 * if ($bEditMode)
-	 * {
-	 *    $oPage->p('Age of the captain: &lt;input type="text" name="captain_age"/&gt;');
-	 * }
-	 * else
-	 * {
-	 *    $oPage->p('Age of the captain: '.$iCaptainAge);
-	 * }
-	 * </code>
-	 *
-	 * @api
-	 *
-	 *@param \Combodo\iTop\Application\WebPage\WebPage $oPage The output context
-	 * @param boolean $bEditMode True if the edition form is being displayed
-	 *
-	 * @param DBObject $oObject The object being displayed
-	 *
-	 * @return void
-	 */
-	public function OnDisplayProperties($oObject, \Combodo\iTop\Application\WebPage\WebPage $oPage, $bEditMode = false);
-
-	/**
-	 * Invoked when an object is being displayed (wiew or edit)
-	 *
-	 * The method is called rigth after all the tabs have been displayed
-	 *
-	 * @api
-	 *
-	 *@param \Combodo\iTop\Application\WebPage\WebPage $oPage The output context
-	 * @param boolean $bEditMode True if the edition form is being displayed
-	 *
-	 * @param DBObject $oObject The object being displayed
-	 *
-	 * @return void
-	 */
-	public function OnDisplayRelations($oObject, \Combodo\iTop\Application\WebPage\WebPage $oPage, $bEditMode = false);
-
-	/**
-	 * Invoked when the end-user clicks on Modify from the object edition form
-	 *
-	 * The method is called after the changes from the standard form have been
-	 * taken into account, and before saving the changes into the database.
-	 *
-	 * @param DBObject $oObject The object being edited
-	 * @param string $sFormPrefix Prefix given to the HTML form inputs
-	 *
-	 * @return void
-	 * @api
-	 */
-	public function OnFormSubmit($oObject, $sFormPrefix = '');
-
-	/**
-	 * Invoked when the end-user clicks on Cancel from the object edition form
-	 *
-	 * Implement here any cleanup. This is necessary when you have injected some
-	 * javascript into the edition form, and if that code requires to store temporary data
-	 * (this is the case when a file must be uploaded).
-	 *
-	 * @param string $sTempId Unique temporary identifier made of session_id and transaction_id. It identifies the object in a unique way.
-	 *
-	 * @return void
-	 * @api
-	 */
-	public function OnFormCancel($sTempId);
-
-	/**
-	 * Not yet called by the framework!
-	 *
-	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
-	 *
-	 * @param DBObject $oObject The object being displayed
-	 *
-	 * @return string[] desc
-	 * @api
-	 */
-	public function EnumUsedAttributes($oObject); // Not yet implemented
-
-	/**
-	 * Not yet called by the framework!
-	 *
-	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
-	 *
-	 * @param DBObject $oObject The object being displayed
-	 *
-	 * @return string Path of the icon, relative to the modules directory.
-	 * @api
-	 */
-	public function GetIcon($oObject); // Not yet implemented
-
-	/**
-	 * Invoked when the object is displayed alone or within a list
-	 *
-	 * Returns a value influencing the appearance of the object depending on its
-	 * state.
-	 *
-	 * Possible values are:
-	 *
-	 * * HILIGHT_CLASS_CRITICAL
-	 * * HILIGHT_CLASS_WARNING
-	 * * HILIGHT_CLASS_OK
-	 * * HILIGHT_CLASS_NONE
-	 *
-	 * @param DBObject $oObject The object being displayed
-	 *
-	 * @return integer The value representing the mood of the object
-	 * @api
-	 */
-	public function GetHilightClass($oObject);
-
-	/**
-	 * Called when building the Actions menu for a single object or a list of objects
-	 *
-	 * Use this to add items to the Actions menu. You will have to specify a label and an URL.
-	 *
-	 * Example:
-	 * <code>
-	 * $oObject = $oSet->fetch();
-	 * if ($oObject instanceof Sheep)
-	 * {
-	 *    return array('View in my app' => 'http://myserver/view_sheeps?id='.$oObject->Get('name'));
-	 * }
-	 * else
-	 * {
-	 *    return array();
-	 * }
-	 * </code>
-	 *
-	 * See also iPopupMenuExtension for greater flexibility
-	 *
-	 * @param DBObjectSet $oSet A set of persistent objects (DBObject)
-	 *
-	 * @return array
-	 * @api
-	 */
-	public function EnumAllowedActions(DBObjectSet $oSet);
-}

application/applicationextension/backoffice/iBackofficeDictEntriesExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add Dict entries
- *
- * @see \iTopWebPage::$a_dict_entries
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeDictEntriesExtension
-{
-	/**
-	 * @return array
-	 * @see \iTopWebPage::a_dict_entries
-	 * @api
-	 */
-	public function GetDictEntries(): array;
-}

application/applicationextension/backoffice/iBackofficeDictEntriesPrefixesExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add Dict entries prefixes
- *
- * @see \iTopWebPage::$a_dict_entries_prefixes
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeDictEntriesPrefixesExtension
-{
-	/**
-	 * @return array
-	 * @see \iTopWebPage::a_dict_entries_prefixes
-	 * @api
-	 */
-	public function GetDictEntriesPrefixes(): array;
-}

application/applicationextension/backoffice/iBackofficeEarlyScriptExtension.php

@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add inline script (JS) to the backoffice pages' head.
- * Will be executed first, BEFORE the DOM interpretation.
- *
- * @see \iTopWebPage::$a_early_scripts
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeEarlyScriptExtension
-{
-	/**
-	 * @return string
-	 * @see \iTopWebPage::$a_early_scripts
-	 * @api
-	 */
-	public function GetEarlyScript(): string;
-}

application/applicationextension/backoffice/iBackofficeInitScriptExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add inline script (JS) to the backoffice pages that will be executed right when the DOM is ready.
- *
- * @see \iTopWebPage::$a_init_scripts
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeInitScriptExtension
-{
-	/**
-	 * @return string
-	 * @see \iTopWebPage::$a_init_scripts
-	 * @api
-	 */
-	public function GetInitScript(): string;
-}

application/applicationextension/backoffice/iBackofficeLinkedScriptsExtension.php

@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add script (JS) files to the backoffice pages
- *
- * @see \iTopWebPage::$a_linked_scripts
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeLinkedScriptsExtension
-{
-	/**
-	 * Each script will be included using this property
-	 * @return array An array of absolute URLs to the files to include
-	 * @see \iTopWebPage::$a_linked_scripts
-	 * @api
-	 */
-	public function GetLinkedScriptsAbsUrls(): array;
-}

application/applicationextension/backoffice/iBackofficeLinkedStylesheetsExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add stylesheets (CSS) to the backoffice pages
- *
- * @see \iTopWebPage::$a_linked_stylesheets
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeLinkedStylesheetsExtension
-{
-	/**
-	 * @return array An array of absolute URLs to the files to include
-	 * @see \iTopWebPage::$a_linked_stylesheets
-	 * @api
-	 */
-	public function GetLinkedStylesheetsAbsUrls(): array;
-}

application/applicationextension/backoffice/iBackofficeReadyScriptExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add inline script (JS) to the backoffice pages that will be executed slightly AFTER the DOM is ready (just after the init. scripts).
- *
- * @see \iTopWebPage::$a_ready_scripts
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeReadyScriptExtension
-{
-	/**
-	 * @return string
-	 * @see \iTopWebPage::$a_ready_scripts
-	 * @api
-	 */
-	public function GetReadyScript(): string;
-}

application/applicationextension/backoffice/iBackofficeSassExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * 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
-{
-	/**
-	 * @return string
-	 * @see \iTopWebPage::$a_styles
-	 * @api
-	 */
-	public function GetSass(): string;
-}

application/applicationextension/backoffice/iBackofficeScriptExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add inline script (JS) to the backoffice pages that will be executed immediately, without waiting for the DOM to be ready.
- *
- * @see \iTopWebPage::$a_scripts
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeScriptExtension
-{
-	/**
-	 * @return string
-	 * @see \iTopWebPage::$a_scripts
-	 * @api
-	 */
-	public function GetScript(): string;
-}

application/applicationextension/backoffice/iBackofficeStyleExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add inline style (CSS) to the backoffice pages' head.
- *
- * @see \iTopWebPage::$a_styles
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iBackofficeStyleExtension
-{
-	/**
-	 * @return string
-	 * @see \iTopWebPage::$a_styles
-	 * @api
-	 */
-	public function GetStyle(): string;
-}

application/applicationextension/backoffice/iFieldRendererMappingsExtension.php

@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Implement this interface to register a new field renderer mapping to either:
- * - Add the rendering of a new attribute type
- * - Overload the default rendering of an attribute type
- *
- * @since 3.1.0 N°6041
- *
- * @experimental Form / Field / Renderer should be used in more places in next iTop releases, which may introduce major API changes
- */
-interface iFieldRendererMappingsExtension
-{
-	/**
-	 * @return array {
-	 *              array: {
-	 *                  field: string,
-	 *                  form_renderer: string,
-	 *                  field_renderer: string
-	 *              }
-	 *          }  List of field renderer mapping: FQCN field class, FQCN Form Renderer class, FQCN Field Renderer class
-	 *
-	 * Example:
-	 *
-	 * ```php
-	 * [
-	 *  ['field' => 'FQCN\FieldA', 'form_renderer' => 'Combodo\iTop\Renderer\Console\ConsoleFormRenderer', 'field_renderer' => 'FQCN\FieldRendererA'],
-	 *  ['field' => 'FQCN\FieldB', 'form_renderer' => 'Combodo\iTop\Renderer\Console\ConsoleFormRenderer', 'field_renderer' => 'FQCN\FieldRendererB'],
-	 *  ['field' => 'FQCN\FieldA', 'form_renderer' => 'Combodo\iTop\Renderer\Bootstrap\BsFormRenderer', 'field_renderer' => 'FQCN\FieldRendererA'],
-	 *  ['field' => 'FQCN\FieldB', 'form_renderer' => 'Combodo\iTop\Renderer\Bootstrap\BsFormRenderer', 'field_renderer' => 'FQCN\FieldRendererB'],
-	 * ]
-	 * ```
-	 */
-	public static function RegisterSupportedFields(): array;
-}

application/applicationextension/backoffice/iPageUIBlockExtension.php

@@ -1,47 +0,0 @@
-<?php
-
-/**
- * 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     BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iPageUIBlockExtension
-{
-	/**
-	 * Add content to the "admin banner"
-	 *
-	 * @api
-	 * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null The Block to add into the page
-	 */
-	public function GetBannerBlock();
-
-	/**
-	 * Add content to the header of the page
-	 *
-	 * @api
-	 * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null The Block to add into the page
-	 */
-	public function GetHeaderBlock();
-
-	/**
-	 * Add content to the footer of the page
-	 *
-	 * @api
-	 * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null The Block to add into the page
-	 */
-	public function GetFooterBlock();
-}

application/applicationextension/backoffice/iPopupMenuExtension.php

@@ -1,112 +0,0 @@
-<?php
-
-/**
- * New extension to add menu items in the "popup" menus inside iTop. Provides a greater flexibility than
- * iApplicationUIExtension::EnumAllowedActions.
- *
- * To add some menus into iTop, declare a class that implements this interface, it will be called automatically
- * by the application, as long as the class definition is included somewhere in the code
- *
- * @api
- * @package     UIExtensibilityAPI
- * @since 2.0
- */
-interface iPopupMenuExtension
-{
-	/**
-	 * Insert an item into the Actions menu of a list
-	 *
-	 * $param is a DBObjectSet containing the list of objects
-	 * @api
-	 */
-	public const MENU_OBJLIST_ACTIONS = 1;
-	/**
-	 * Insert an item into the Toolkit menu of a list
-	 *
-	 * $param is a DBObjectSet containing the list of objects
-	 * @api
-	 */
-	public const MENU_OBJLIST_TOOLKIT = 2;
-	/**
-	 * Insert an item into the Actions menu on an object details page
-	 *
-	 * $param is a DBObject instance: the object currently displayed
-	 * @api
-	 */
-	public const MENU_OBJDETAILS_ACTIONS = 3;
-	/**
-	 * Insert an item into the Dashboard menu
-	 *
-	 * The dashboad menu is shown on the top right corner when a dashboard
-	 * is being displayed.
-	 *
-	 * $param is a Dashboard instance: the dashboard currently displayed
-	 * @api
-	 */
-	public const MENU_DASHBOARD_ACTIONS = 4;
-	/**
-	 * Insert an item into the User menu (upper right corner)
-	 *
-	 * $param is null
-	 * @api
-	 */
-	public const MENU_USER_ACTIONS = 5;
-	/**
-	 * Insert an item into the Action menu on an object item in an objects list in the portal
-	 *
-	 * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object on
-	 * the current line)
-	 * @api
-	 */
-	public const PORTAL_OBJLISTITEM_ACTIONS = 7;
-	/**
-	 * Insert an item into the Action menu on an object details page in the portal
-	 *
-	 * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object
-	 * currently displayed)
-	 * @api
-	 */
-	public const PORTAL_OBJDETAILS_ACTIONS = 8;
-
-	/**
-	 * Insert an item into the Actions menu of a list in the portal
-	 * Note: This is not implemented yet !
-	 *
-	 * $param is an array('portal_id' => $sPortalId, 'object_set' => $oSet) containing DBObjectSet containing the list of objects
-	 *
-	 * @todo
-	 */
-	public const PORTAL_OBJLIST_ACTIONS = 6;
-	/**
-	 * Insert an item into the user menu of the portal
-	 * Note: This is not implemented yet !
-	 *
-	 * $param is the portal id
-	 *
-	 * @todo
-	 */
-	public const PORTAL_USER_ACTIONS = 9;
-	/**
-	 * Insert an item into the navigation menu of the portal
-	 * Note: This is not implemented yet !
-	 *
-	 * $param is the portal id
-	 *
-	 * @todo
-	 */
-	public const PORTAL_MENU_ACTIONS = 10;
-
-	/**
-	 * Get the list of items to be added to a menu.
-	 *
-	 * This method is called by the framework for each menu.
-	 * The items will be inserted in the menu in the order of the returned array.
-	 *
-	 * @param int $iMenuId The identifier of the type of menu, as listed by the constants MENU_xxx
-	 * @param mixed $param Depends on $iMenuId, see the constants defined above
-	 *
-	 * @return object[] An array of ApplicationPopupMenuItem or an empty array if no action is to be added to the menu
-	 * @api
-	 */
-	public static function EnumItems($iMenuId, $param);
-}

application/applicationextension/backoffice/iPreferencesExtension.php

@@ -1,28 +0,0 @@
-<?php
-
-/**
- * @api
- * @package     PreferencesExtensibilityAPI
- * @since 2.7.0
- */
-interface iPreferencesExtension
-{
-	/**
-	 * @api
-	 *
-	 * @param \Combodo\iTop\Application\WebPage\WebPage $oPage
-	 *
-	 */
-	public function DisplayPreferences(\Combodo\iTop\Application\WebPage\WebPage $oPage);
-
-	/**
-	 * @api
-	 *
-	 * @param string $sOperation
-	 *
-	 * @param \Combodo\iTop\Application\WebPage\WebPage $oPage
-	 *
-	 * @return bool true if the operation has been used
-	 */
-	public function ApplyPreferences(\Combodo\iTop\Application\WebPage\WebPage $oPage, $sOperation);
-}

application/applicationextension/backoffice/iWelcomePopupExtension.php

@@ -1,38 +0,0 @@
-<?php
-
-/**
- * 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, ...)
-	 *
-	 * @return string Relative path (from app. root) of the icon representing the provider
-	 * @api
-	 */
-	public function GetIconRelPath(): string;
-
-	/**
-	 * @return \Combodo\iTop\Application\WelcomePopup\Message[]
-	 * @api
-	 */
-	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;
-}

application/applicationextension/iBackupExtraFilesExtension.php

@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add files to the backup
- *
- * @api
- * @since 3.2.0
- */
-interface iBackupExtraFilesExtension
-{
-	/**
-	 * @return string[] Array of relative paths (from app root) for files and directories to be included in the backup
-	 * @api
-	 */
-	public function GetExtraFilesRelPaths(): array;
-}

application/applicationextension/iKPILoggerExtension.php

@@ -1,25 +0,0 @@
-<?php
-
-/**
- * KPI logging extensibility point
- *
- * KPI Logger extension
- */
-interface iKPILoggerExtension
-{
-	/**
-	 * Init the statistics collected
-	 *
-	 * @return void
-	 */
-	public function InitStats();
-
-	/**
-	 * Add a new KPI to the stats
-	 *
-	 * @param \Combodo\iTop\Core\Kpi\KpiLogData $oKpiLogData
-	 *
-	 * @return mixed
-	 */
-	public function LogOperation($oKpiLogData);
-}

application/applicationextension/iModuleExtension.php

@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Helpers for modules extensibility, with discover performed by the MetaModel.
- *
- *
- * @api
- * @package     Extensibility
- */
-interface iModuleExtension
-{
-	/**
-	 * @api
-	 */
-	public function __construct();
-}

application/applicationextension/login/AbstractLoginFSMExtension.php

@@ -1,159 +0,0 @@
-<?php
-
-/**
- * Login finite state machine
- *
- * Execute the action corresponding to the current login state.
- *
- *  * 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
- *
- * @api
- * @package LoginExtensibilityAPI
- * @since 2.7.0
- */
-abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
-{
-	/**
-	 * @inheritDoc
-	 */
-	abstract public function ListSupportedLoginModes();
-
-	/**
-	 * @inheritDoc
-	 */
-	public function LoginAction($sLoginState, &$iErrorCode)
-	{
-		switch ($sLoginState) {
-			case LoginWebPage::LOGIN_STATE_START:
-				return $this->OnStart($iErrorCode);
-
-			case LoginWebPage::LOGIN_STATE_MODE_DETECTION:
-				return $this->OnModeDetection($iErrorCode);
-
-			case LoginWebPage::LOGIN_STATE_READ_CREDENTIALS:
-				return $this->OnReadCredentials($iErrorCode);
-
-			case LoginWebPage::LOGIN_STATE_CHECK_CREDENTIALS:
-				return $this->OnCheckCredentials($iErrorCode);
-
-			case LoginWebPage::LOGIN_STATE_CREDENTIALS_OK:
-				return $this->OnCredentialsOK($iErrorCode);
-
-			case LoginWebPage::LOGIN_STATE_USER_OK:
-				return $this->OnUsersOK($iErrorCode);
-
-			case LoginWebPage::LOGIN_STATE_CONNECTED:
-				return $this->OnConnected($iErrorCode);
-
-			case LoginWebPage::LOGIN_STATE_ERROR:
-				return $this->OnError($iErrorCode);
-		}
-
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * Initialization
-	 *
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnStart(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * Detect login mode explicitly without respecting configured order (legacy mode)
-	 * In most case do nothing here
-	 *
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnModeDetection(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * Obtain the credentials either if login mode is empty or set to yours.
-	 * This step can be called multiple times by the FSM:
-	 * for example:
-	 * 1 - display login form
-	 * 2 - read the values posted by the user (store that in session)
-	 *
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnReadCredentials(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * Control the validity of the data from the session
-	 * Automatic user provisioning can be done here
-	 *
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnCheckCredentials(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnCredentialsOK(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnUsersOK(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnConnected(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-	 * @api
-	 */
-	protected function OnError(&$iErrorCode)
-	{
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-}

application/applicationextension/login/iLoginExtension.php

@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @api
- * @package     LoginExtensibilityAPI
- * @since       2.7.0
- */
-interface iLoginExtension
-{
-	/**
-	 * Return the list of supported login modes for this plugin
-	 *
-	 * @return array of supported login modes
-	 * @api
-	 */
-	public function ListSupportedLoginModes();
-}

application/applicationextension/login/iLoginFSMExtension.php

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @api
- * @package     LoginExtensibilityAPI
- * @since 2.7.0
- */
-interface iLoginFSMExtension extends iLoginExtension
-{
-	/**
-	 * Execute action for this login state
-	 * 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
-	 *
-	 * @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
-	 * @api
-	 */
-	public function LoginAction($sLoginState, &$iErrorCode);
-}

application/applicationextension/login/iLoginUIExtension.php

@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Login page extensibility
- *
- * @api
- * @package UIExtensibilityAPI
- * @since 2.7.0
- */
-interface iLoginUIExtension extends iLoginExtension
-{
-	/**
-	 * @return LoginTwigContext
-	 * @api
-	 */
-	public function GetTwigContext();
-}

application/applicationextension/login/iLogoutExtension.php

@@ -1,15 +0,0 @@
-<?php
-
-/**
- * @api
- * @package LoginExtensibilityAPI
- * @since 2.7.0
- */
-interface iLogoutExtension extends iLoginExtension
-{
-	/**
-	 * Execute all actions to log out properly
-	 * @api
-	 */
-	public function LogoutAction();
-}

application/applicationextension/portal/AbstractPortalUIExtension.php

@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Extend this class instead of iPortalUIExtension if you don't need to overload all methods
- *
- * @api
- * @package     PortalExtensibilityAPI
- * @since       2.4.0
- */
-abstract class AbstractPortalUIExtension implements iPortalUIExtension
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function GetCSSFiles(\Symfony\Component\DependencyInjection\Container $oContainer)
-	{
-		return [];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetCSSInline(\Symfony\Component\DependencyInjection\Container $oContainer)
-	{
-		return null;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetJSFiles(\Symfony\Component\DependencyInjection\Container $oContainer)
-	{
-		return [];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetJSInline(\Symfony\Component\DependencyInjection\Container $oContainer)
-	{
-		return null;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetBodyHTML(\Symfony\Component\DependencyInjection\Container $oContainer)
-	{
-		return null;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetMainContentHTML(\Symfony\Component\DependencyInjection\Container $oContainer)
-	{
-		return null;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetNavigationMenuHTML(\Symfony\Component\DependencyInjection\Container $oContainer)
-	{
-		return null;
-	}
-}

application/applicationextension/portal/iPortalUIExtension.php

@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add content to any enhanced portal page
- *
- * @api
- * @package     PortalExtensibilityAPI
- *
- * @since 2.4.0 interface creation
- * @since 2.7.0 change method signatures due to Silex to Symfony migration
- */
-interface iPortalUIExtension
-{
-	public const ENUM_PORTAL_EXT_UI_BODY = 'Body';
-	public const ENUM_PORTAL_EXT_UI_NAVIGATION_MENU = 'NavigationMenu';
-	public const ENUM_PORTAL_EXT_UI_MAIN_CONTENT = 'MainContent';
-
-	/**
-	 * Returns an array of CSS file urls
-	 *
-	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
-	 *
-	 * @return array
-	 * @api
-	 */
-	public function GetCSSFiles(\Symfony\Component\DependencyInjection\Container $oContainer);
-
-	/**
-	 * Returns inline (raw) CSS
-	 *
-	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
-	 *
-	 * @return string
-	 * @api
-	 */
-	public function GetCSSInline(\Symfony\Component\DependencyInjection\Container $oContainer);
-
-	/**
-	 * Returns an array of JS file urls
-	 *
-	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
-	 *
-	 * @return array
-	 * @api
-	 */
-	public function GetJSFiles(\Symfony\Component\DependencyInjection\Container $oContainer);
-
-	/**
-	 * Returns raw JS code
-	 *
-	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
-	 *
-	 * @return string
-	 * @api
-	 */
-	public function GetJSInline(\Symfony\Component\DependencyInjection\Container $oContainer);
-
-	/**
-	 * Returns raw HTML code to put at the end of the <body> tag
-	 *
-	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
-	 *
-	 * @return string
-	 * @api
-	 */
-	public function GetBodyHTML(\Symfony\Component\DependencyInjection\Container $oContainer);
-
-	/**
-	 * Returns raw HTML code to put at the end of the #main-wrapper element
-	 *
-	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
-	 *
-	 * @return string
-	 * @api
-	 */
-	public function GetMainContentHTML(\Symfony\Component\DependencyInjection\Container $oContainer);
-
-	/**
-	 * Returns raw HTML code to put at the end of the #topbar and #sidebar elements
-	 *
-	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
-	 *
-	 * @return string
-	 * @api
-	 */
-	public function GetNavigationMenuHTML(\Symfony\Component\DependencyInjection\Container $oContainer);
-}

application/applicationextension/rest/RestResult.php

@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Minimal REST response structure. Derive this structure to add response data and error codes.
- *
- * @api
- * @package     RESTAPI
- * @since 2.0.1
- */
-class RestResult
-{
-	/**
-	 * Result: no issue has been encountered
-	 * @api
-	 */
-	public const OK = 0;
-	/**
-	 * Result: missing/wrong credentials or the user does not have enough rights to perform the requested operation
-	 * @api
-	 */
-	public const UNAUTHORIZED = 1;
-	/**
-	 * Result: the parameter 'version' is missing
-	 * @api
-	 */
-	public const MISSING_VERSION = 2;
-	/**
-	 * Result: the parameter 'json_data' is missing
-	 * @api
-	 */
-	public const MISSING_JSON = 3;
-	/**
-	 * Result: the input structure is not a valid JSON string
-	 * @api
-	 */
-	public const INVALID_JSON = 4;
-	/**
-	 * Result: the parameter 'auth_user' is missing, authentication aborted
-	 * @api
-	 */
-	public const MISSING_AUTH_USER = 5;
-	/**
-	 * Result: the parameter 'auth_pwd' is missing, authentication aborted
-	 * @api
-	 */
-	public const MISSING_AUTH_PWD = 6;
-	/**
-	 * Result: no operation is available for the specified version
-	 * @api
-	 */
-	public const UNSUPPORTED_VERSION = 10;
-	/**
-	 * Result: the requested operation is not valid for the specified version
-	 * @api
-	 */
-	public const UNKNOWN_OPERATION = 11;
-	/**
-	 * Result: the requested operation cannot be performed because it can cause data (integrity) loss
-	 * @api
-	 */
-	public const UNSAFE = 12;
-	/**
-	 * Result: the request page number is not valid. It must be an integer greater than 0
-	 * @api
-	 */
-	public const INVALID_PAGE = 13;
-	/**
-	 * Result: the operation could not be performed, see the message for troubleshooting
-	 * @api
-	 */
-	public const INTERNAL_ERROR = 100;
-
-	/**
-	 * Default constructor - ok!
-	 * @api
-	 */
-	public function __construct()
-	{
-		$this->code = RestResult::OK;
-	}
-
-	/**
-	 * Result code
-	 * @var int
-	 * @api
-	 */
-	public $code;
-	/**
-	 * Result message
-	 * @var string
-	 * @api
-	 */
-	public $message;
-
-	/**
-	 * Sanitize the content of this result to hide sensitive information
-	 */
-	public function SanitizeContent()
-	{
-		// The default implementation does nothing
-	}
-}

application/applicationextension/rest/RestUtils.php

@@ -1,364 +0,0 @@
-<?php
-
-/**
- * Helpers for implementing REST services
- *
- * @api
- * @package     RESTAPI
- */
-class RestUtils
-{
-	/**
-	 * Registering tracking information. Any further object modification be associated with the given comment, when the modification gets
-	 * recorded into the DB
-	 *
-	 * @param StdClass $oData Structured input data. Must contain 'comment'.
-	 *
-	 * @return void
-	 * @throws Exception
-	 * @api
-	 *
-	 */
-	public static function InitTrackingComment($oData)
-	{
-		$sComment = self::GetMandatoryParam($oData, 'comment');
-		CMDBObject::SetTrackInfo($sComment);
-	}
-
-	/**
-	 * Read a mandatory parameter from  from a Rest/Json structure.
-	 *
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
-	 *
-	 * @return mixed parameter value if present
-	 * @throws Exception If the parameter is missing
-	 * @api
-	 */
-	public static function GetMandatoryParam($oData, $sParamName)
-	{
-		if (isset($oData->$sParamName)) {
-			return $oData->$sParamName;
-		} else {
-			throw new Exception("Missing parameter '$sParamName'");
-		}
-	}
-
-	/**
-	 * Read an optional parameter from a Rest/Json structure.
-	 *
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @param mixed $default Default value if the parameter is not found in the input data
-	 *
-	 * @param StdClass $oData Structured input data.
-	 *
-	 * @return mixed
-	 * @throws Exception
-	 * @api
-	 */
-	public static function GetOptionalParam($oData, $sParamName, $default)
-	{
-		if (isset($oData->$sParamName)) {
-			return $oData->$sParamName;
-		} else {
-			return $default;
-		}
-	}
-
-	/**
-	 * Read a class from a Rest/Json structure.
-	 *
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
-	 *
-	 * @return string
-	 * @throws Exception If the parameter is missing or the class is unknown
-	 * @api
-	 */
-	public static function GetClass($oData, $sParamName)
-	{
-		$sClass = self::GetMandatoryParam($oData, $sParamName);
-		if (!MetaModel::IsValidClass($sClass)) {
-			throw new Exception("$sParamName: '$sClass' is not a valid class'");
-		}
-
-		return $sClass;
-	}
-
-	/**
-	 * Read a list of attribute codes from a Rest/Json structure.
-	 *
-	 * @param StdClass $oData Structured input data.
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 *
-	 * @param string $sClass Name of the class
-	 *
-	 * @return array of class => list of attributes (see RestResultWithObjects::AddObject that uses it)
-	 * @throws Exception
-	 * @api
-	 */
-	public static function GetFieldList($sClass, $oData, $sParamName)
-	{
-		$sFields = self::GetOptionalParam($oData, $sParamName, '*');
-		$aShowFields = [];
-		if ($sFields == '*') {
-			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) {
-				$aShowFields[$sClass][] = $sAttCode;
-			}
-		} elseif ($sFields == '*+') {
-			foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass) {
-				foreach (MetaModel::ListAttributeDefs($sRefClass) as $sAttCode => $oAttDef) {
-					$aShowFields[$sRefClass][] = $sAttCode;
-				}
-			}
-		} else {
-			foreach (explode(',', $sFields) as $sAttCode) {
-				$sAttCode = trim($sAttCode);
-				if (($sAttCode != 'id') && (!MetaModel::IsValidAttCode($sClass, $sAttCode))) {
-					throw new Exception("$sParamName: invalid attribute code '$sAttCode'");
-				}
-				$aShowFields[$sClass][] = $sAttCode;
-			}
-		}
-
-		return $aShowFields;
-	}
-
-	/**
-	 * Read and interpret object search criteria from a Rest/Json structure
-	 *
-	 * @param string $sClass Name of the class
-	 * @param StdClass $oCriteria Hash of attribute code => value (can be a substructure or a scalar, depending on the nature of the
-	 *     attriute)
-	 *
-	 * @return object The object found
-	 * @throws Exception If the input structure is not valid or it could not find exactly one object
-	 * @api
-	 */
-	protected static function FindObjectFromCriteria($sClass, $oCriteria)
-	{
-		$aCriteriaReport = [];
-		if (isset($oCriteria->finalclass)) {
-			if (!MetaModel::IsValidClass($oCriteria->finalclass)) {
-				throw new Exception("finalclass: Unknown class '".$oCriteria->finalclass."'");
-			}
-			if (!MetaModel::IsParentClass($sClass, $oCriteria->finalclass)) {
-				throw new Exception("finalclass: '".$oCriteria->finalclass."' is not a child class of '$sClass'");
-			}
-			$sClass = $oCriteria->finalclass;
-		}
-		$oSearch = new DBObjectSearch($sClass);
-		foreach ($oCriteria as $sAttCode => $value) {
-			$realValue = static::MakeValue($sClass, $sAttCode, $value);
-			$oSearch->AddCondition($sAttCode, $realValue, '=');
-			if (is_object($value) || is_array($value)) {
-				$value = json_encode($value);
-			}
-			$aCriteriaReport[] = "$sAttCode: $value ($realValue)";
-		}
-		$oSet = new DBObjectSet($oSearch);
-		$iCount = $oSet->Count();
-		if ($iCount == 0) {
-			throw new Exception("No item found with criteria: ".implode(', ', $aCriteriaReport));
-		} elseif ($iCount > 1) {
-			throw new Exception("Several items found ($iCount) with criteria: ".implode(', ', $aCriteriaReport));
-		}
-		$res = $oSet->Fetch();
-
-		return $res;
-	}
-
-	/**
-	 * Find an object from a polymorph search specification (Rest/Json)
-	 *
-	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
-	 * @param bool $bAllowNullValue Allow the cases such as key = 0 or key = {null} and return null then
-	 * @param string $sClass Name of the class
-	 *
-	 * @return DBObject The object found
-	 * @throws Exception If the input structure is not valid or it could not find exactly one object
-	 *
-	 * @api
-	 * @see DBObject::CheckChangedExtKeysValues() generic method to check that we can access the linked object isn't used in that use case because values can be literal, OQL, friendlyname
-	 */
-	public static function FindObjectFromKey($sClass, $key, $bAllowNullValue = false)
-	{
-		if (is_object($key)) {
-			$res = static::FindObjectFromCriteria($sClass, $key);
-		} elseif (is_numeric($key)) {
-			if ($bAllowNullValue && ($key == 0)) {
-				$res = null;
-			} else {
-				$res = MetaModel::GetObject($sClass, $key, false);
-				if (is_null($res)) {
-					throw new Exception("Invalid object $sClass::$key");
-				}
-			}
-		} elseif (is_string($key)) {
-			// OQL
-			$oSearch = DBObjectSearch::FromOQL($key);
-			$oSet = new DBObjectSet($oSearch);
-			$iCount = $oSet->Count();
-			if ($iCount == 0) {
-				throw new Exception("No item found for query: $key");
-			} elseif ($iCount > 1) {
-				throw new Exception("Several items found ($iCount) for query: $key");
-			}
-			$res = $oSet->Fetch();
-		} else {
-			throw new Exception("Wrong format for key");
-		}
-
-		return $res;
-	}
-
-	/**
-	 * Search objects from a polymorph search specification (Rest/Json)
-	 *
-	 * @param string $sClass Name of the class
-	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
-	 * @param int $iLimit The limit of results to return
-	 * @param int $iOffset The offset of results to return
-	 *
-	 * @return DBObjectSet The search result set
-	 * @throws Exception If the input structure is not valid
-	 * @api
-	 */
-	public static function GetObjectSetFromKey($sClass, $key, $iLimit = 0, $iOffset = 0)
-	{
-		if (is_object($key)) {
-			if (isset($key->finalclass)) {
-				$sClass = $key->finalclass;
-				if (!MetaModel::IsValidClass($sClass)) {
-					throw new Exception("finalclass: Unknown class '$sClass'");
-				}
-			}
-
-			$oSearch = new DBObjectSearch($sClass);
-			foreach ($key as $sAttCode => $value) {
-				$realValue = static::MakeValue($sClass, $sAttCode, $value);
-				$oSearch->AddCondition($sAttCode, $realValue, '=');
-			}
-		} elseif (is_numeric($key)) {
-			$oSearch = new DBObjectSearch($sClass);
-			$oSearch->AddCondition('id', $key);
-		} 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(),
-				]);
-			}
-		} else {
-			throw new Exception("Wrong format for key");
-		}
-		$oObjectSet = new DBObjectSet($oSearch, [], [], null, $iLimit, $iOffset);
-
-		return $oObjectSet;
-	}
-
-	/**
-	 * Interpret the Rest/Json value and get a valid attribute value
-	 *
-	 * @param string $sAttCode Attribute code
-	 * @param mixed $value Depending on the type of attribute (a scalar, or search criteria, or list of related objects...)
-	 * @param string $sClass Name of the class
-	 *
-	 * @return mixed The value that can be used with DBObject::Set()
-	 * @throws Exception If the specification of the value is not valid.
-	 * @api
-	 */
-	public static function MakeValue($sClass, $sAttCode, $value)
-	{
-		try {
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode)) {
-				throw new Exception("Unknown attribute");
-			}
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			if ($oAttDef instanceof AttributeExternalKey) {
-				$oExtKeyObject = static::FindObjectFromKey($oAttDef->GetTargetClass(), $value, true /* allow null */);
-				$value = ($oExtKeyObject != null) ? $oExtKeyObject->GetKey() : 0;
-			} elseif ($oAttDef instanceof AttributeLinkedSet) {
-				if (!is_array($value)) {
-					throw new Exception("A link set must be defined by an array of objects");
-				}
-				$sLnkClass = $oAttDef->GetLinkedClass();
-				$aLinks = [];
-				foreach ($value as $oValues) {
-					$oLnk = static::MakeObjectFromFields($sLnkClass, $oValues);
-					// Fix for N°1939
-					if (($oAttDef instanceof AttributeLinkedSetIndirect) && ($oLnk->Get($oAttDef->GetExtKeyToRemote()) == 0)) {
-						continue;
-					}
-					$aLinks[] = $oLnk;
-				}
-				$value = DBObjectSet::FromArray($sLnkClass, $aLinks);
-			} elseif ($oAttDef instanceof AttributeTagSet) {
-				if (!is_array($value)) {
-					throw new Exception("A tag set must be defined by an array of tag codes");
-				}
-				$value = $oAttDef->FromJSONToValue($value);
-			} else {
-				$value = $oAttDef->FromJSONToValue($value);
-			}
-		} catch (Exception $e) {
-			throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Interpret a Rest/Json structure that defines attribute values, and build an object
-	 *
-	 * @param array $aFields A hash of attribute code => value specification.
-	 * @param string $sClass Name of the class
-	 *
-	 * @return DBObject The newly created object
-	 * @throws Exception If the specification of the values is not valid
-	 * @api
-	 */
-	public static function MakeObjectFromFields($sClass, $aFields)
-	{
-		$oObject = MetaModel::NewObject($sClass);
-		foreach ($aFields as $sAttCode => $value) {
-			$realValue = static::MakeValue($sClass, $sAttCode, $value);
-			try {
-				$oObject->Set($sAttCode, $realValue);
-			} catch (Exception $e) {
-				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
-			}
-		}
-
-		return $oObject;
-	}
-
-	/**
-	 * Interpret a Rest/Json structure that defines attribute values, and update the given object
-	 *
-	 * @param array $aFields A hash of attribute code => value specification.
-	 * @param DBObject $oObject The object being modified
-	 *
-	 * @return DBObject The object modified
-	 * @throws Exception If the specification of the values is not valid
-	 * @api
-	 */
-	public static function UpdateObjectFromFields($oObject, $aFields)
-	{
-		$sClass = get_class($oObject);
-		foreach ($aFields as $sAttCode => $value) {
-			$realValue = static::MakeValue($sClass, $sAttCode, $value);
-			try {
-				$oObject->Set($sAttCode, $realValue);
-			} catch (Exception $e) {
-				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
-			}
-		}
-
-		return $oObject;
-	}
-}

application/applicationextension/rest/iRestInputSanitizer.php

@@ -1,12 +0,0 @@
-<?php
-
-/**
- * A REST service provider implementing this interface will have its input JSON data sanitized for logging purposes
- *
- * @see \iRestServiceProvider
- * @since 2.7.13, 3.2.1-1
- */
-interface iRestInputSanitizer
-{
-	public function SanitizeJsonInput(string $sJsonInput): string;
-}

application/applicationextension/rest/iRestServiceProvider.php

@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add new operations to the REST/JSON web service
- *
- * @api
- * @package     RESTExtensibilityAPI
- * @since 2.0.1
- */
-interface iRestServiceProvider
-{
-	/**
-	 * Enumerate services delivered by this class
-	 *
-	 * @param string $sVersion The version (e.g. 1.0) supported by the services
-	 *
-	 * @return array An array of hash 'verb' => verb, 'description' => description
-	 * @api
-	 */
-	public function ListOperations($sVersion);
-
-	/**
-	 * Enumerate services delivered by this class
-	 *
-	 * @param string $sVersion The version (e.g. 1.0) supported by the services
-	 * @param string $sVerb
-	 * @param array $aParams
-	 *
-	 * @return RestResult The standardized result structure (at least a message)
-	 * @api
-	 */
-	public function ExecOperation($sVersion, $sVerb, $aParams);
-}

application/capturewebpage.class.inc.php

@@ -0,0 +1,9 @@
+<?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-2024 Combodo SAS
+ */
+
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/CaptureWebPage.php, now loadable using autoloader');

application/clipage.class.inc.php

@@ -0,0 +1,9 @@
+<?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-2024 Combodo SAS
+ */
+
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/CLIPage.php, now loadable using autoloader');

application/cmdbabstract.class.inc.php

@@ -15,6 +15,7 @@ use Combodo\iTop\Application\UI\Base\Component\Button\Button;
 use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\ButtonGroup\ButtonGroupUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSection;
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\StaticTable;
 use Combodo\iTop\Application\UI\Base\Component\Field\Field;
@@ -211,16 +212,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	 */
 	protected static bool $bBlockEventDBLinksChanged = false;
 
-	/**
-	 * If set to true, the object is considered as modified, whatever the actual state is.
-	 * This is used when an object is modified indirectly (eg. through a linked set)
-	 *
-	 * @var bool
-	 *
-	 * @since 3.3.0 N°8210 - Remove iApplicationObjectExtension
-	 */
-	private bool $bIsMarkedAsModified = false;
-
 	/**
 	 * Constructor from a row of data (as a hash 'attcode' => value)
 	 *
@@ -688,8 +679,8 @@ HTML
 			// Filter out links pointing to obsolete objects (if relevant)
 			$oOrmLinkSet = $this->Get($sAttCode);
 			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
-			$iCount = $oLinkSet->Count();
 
+			$iCount = $oLinkSet->Count();
 			if ($this->IsNew()) {
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
 			} else {
@@ -760,9 +751,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);
 			}
@@ -808,16 +799,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 = ['class' => get_class($this), 'id' => $iId];
+				$aParams = ['triggers' => $aTriggers, 'id' => $iId];
 				$aNotifSearches = [];
 				$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], []);
 					$iNotifsCount += $oNotifSet->Count();
@@ -1212,6 +1203,35 @@ HTML
 		return DataTableUIBlockFactory::MakeForObject($oPage, $sTableId, $oSet, $aExtraParams);
 	}
 
+	/**
+	 * Get the HTML fragment corresponding to the display of a table representing a set of objects
+	 *
+	 * @param WebPage $oPage The page object is used for out-of-band information (mostly scripts) output
+	 * @param \DBObjectSet $oSet The set of objects to display
+	 * @param array $aExtraParams key used :
+	 *      <ul>
+	 *          <li>view_link : if true then for extkey will display links with friendly name and make column sortable, default true
+	 *          <li>menu : if true prints DisplayBlock menu, default true
+	 *          <li>display_aliases : list of query aliases that will be printed, defaults to [] (displays all)
+	 *          <li>zlist : name of the zlist to use, false to disable zlist lookup, default to 'list'
+	 *          <li>extra_fields : list of <alias>.<attcode> to add to the result, separator ',', defaults to empty string
+	 *      </ul>
+	 *
+	 * @return String The HTML fragment representing the table of objects. <b>Warning</b> : no JS added to handled
+	 *     pagination or table sorting !
+	 *
+	 * @see DisplayBlock to get a similar table but with the JS for pagination & sorting
+	 *
+	 * @deprecated 3.0.0 use GetDisplaySetBlock
+	 */
+	public static function GetDisplaySet(WebPage $oPage, DBObjectSet $oSet, $aExtraParams = [])
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetDisplaySetBlock');
+		$oPage->AddUiBlock(static::GetDisplaySetBlock($oPage, $oSet, $aExtraParams));
+
+		return "";
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param \DBObjectSet $oSet
@@ -1388,6 +1408,119 @@ HTML
 		//DataTableUIBlockFactory::MakeForStaticData('', $aHeader, $aRows);
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aExtraParams key used :
+	 *      <ul>
+	 *          <li>view_link : if true then for extkey will display links with friendly name and make column sortable, default true
+	 *          <li>menu : if true prints DisplayBlock menu, default true
+	 *          <li>display_aliases : list of query aliases that will be printed, defaults to [] (displays all)
+	 *          <li>zlist : name of the zlist to use, false to disable zlist lookup, default to 'list'
+	 *          <li>extra_fields : list of <alias>.<attcode> to add to the result, separator ',', defaults to empty string
+	 *      </ul>
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @deprecated 3.0.0
+	 */
+	public static function GetDisplayExtendedSet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = [])
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		if (empty($aExtraParams['currentId'])) {
+			$iListId = utils::GetUniqueId(); // Works only if not in an Ajax page !!
+		} else {
+			$iListId = $aExtraParams['currentId'];
+		}
+		$aList = [];
+
+		// Initialize and check the parameters
+		$bViewLink = isset($aExtraParams['view_link']) ? $aExtraParams['view_link'] : true;
+		$bDisplayMenu = isset($aExtraParams['menu']) ? $aExtraParams['menu'] == true : true;
+		// Check if there is a list of aliases to limit the display to...
+		$aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(
+			',',
+			$aExtraParams['display_aliases']
+		) : [];
+		$sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
+
+		$aExtraFieldsRaw = isset($aExtraParams['extra_fields']) ? explode(
+			',',
+			trim($aExtraParams['extra_fields'])
+		) : [];
+		$aExtraFields = [];
+		$sAttCode = '';
+		foreach ($aExtraFieldsRaw as $sFieldName) {
+			// Ignore attributes not of the main queried class
+			if (preg_match('/^(.*)\.(.*)$/', $sFieldName, $aMatches)) {
+				$sClassAlias = $aMatches[1];
+				$sAttCode = $aMatches[2];
+				if (array_key_exists($sClassAlias, $oSet->GetSelectedClasses())) {
+					$aExtraFields[$sClassAlias][] = $sAttCode;
+				}
+			} else {
+				$aExtraFields['*'] = $sAttCode;
+			}
+		}
+
+		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
+		$aAuthorizedClasses = [];
+		foreach ($aClasses as $sAlias => $sClassName) {
+			if ((UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) &&
+				((count($aDisplayAliases) == 0) || (in_array($sAlias, $aDisplayAliases)))) {
+				$aAuthorizedClasses[$sAlias] = $sClassName;
+			}
+		}
+		foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
+			if (array_key_exists($sAlias, $aExtraFields)) {
+				$aList[$sAlias] = $aExtraFields[$sAlias];
+			} else {
+				$aList[$sAlias] = [];
+			}
+			if ($sZListName !== false) {
+				$aDefaultList = self::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
+
+				$aList[$sAlias] = array_merge($aDefaultList, $aList[$sAlias]);
+			}
+
+			// Filter the list to removed linked set since we are not able to display them here
+			foreach ($aList[$sAlias] as $index => $sAttCode) {
+				$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
+				if ($oAttDef instanceof AttributeLinkedSet) {
+					// Removed from the display list
+					unset($aList[$sAlias][$index]);
+				}
+			}
+
+			if (empty($aList[$sAlias])) {
+				unset($aList[$sAlias], $aAuthorizedClasses[$sAlias]);
+			}
+		}
+
+		$sSelectMode = 'none';
+
+		$oDataTable = new DataTable($iListId, $oSet, $aAuthorizedClasses);
+
+		$oSettings = DataTableSettings::GetDataModelSettings($aAuthorizedClasses, $bViewLink, $aList);
+
+		$bDisplayLimit = isset($aExtraParams['display_limit']) ? $aExtraParams['display_limit'] : true;
+		if ($bDisplayLimit) {
+			$iDefaultPageSize = appUserPreferences::GetPref(
+				'default_page_size',
+				MetaModel::GetConfig()->GetMinDisplayLimit()
+			);
+			$oSettings->iDefaultPageSize = $iDefaultPageSize;
+		}
+
+		$oSettings->aSortOrder = MetaModel::GetOrderByDefault($sClassName);
+
+		return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams);
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
@@ -2007,7 +2140,7 @@ JS
 						);
 
 						// test query link
-						$sTestResId = 'query_res_'.$sFieldPrefix.$sAttCode.$sNameSuffix;
+						$sTestResId = 'query_res_'.$sFieldPrefix.$sAttCode.$sNameSuffix; //$oPage->GetUniqueId();
 						$sBaseUrl = utils::GetAbsoluteUrlAppRoot().'pages/run_query.php?expression=';
 						$sTestQueryLbl = Dict::S('UI:Edit:TestQuery');
 						$oTestQueryButton = ButtonUIBlockFactory::MakeIconAction(
@@ -2740,11 +2873,11 @@ JS
 				$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
@@ -3395,18 +3528,12 @@ EOF
 		} else {
 			//we can directly apply the stimuli
 			$sExceptionMessage = null;
-			$bApplyStimulus = false;
 			try {
 				$bApplyStimulus = $this->ApplyStimulus($sStimulus); // will write the object in the DB
 			} catch (Exception $oException) {
 				// Catch any exception happening during the stimulus
+				$bApplyStimulus = false;
 				$sExceptionMessage =   ($oException instanceof CoreCannotSaveObjectException) ? $oException->getHtmlMessage() : $oException->getMessage();
-				\IssueLog::Error(__METHOD__, null, [$oException->getTraceAsString(), $oException->getMessage()]);
-			} catch (\Throwable $e) {
-				//N°4720 : with deprecation removals: ease maintenance via additional logs
-				// Catch any Throwable happening during the stimulus
-				$sExceptionMessage = $e->getMessage();
-				\IssueLog::Error(__METHOD__, null, [$e->getTraceAsString(), $e->getMessage()]);
 			} finally {
 				if ($sOwnershipToken !== null) {
 					// Release the concurrent lock, if any
@@ -3415,8 +3542,9 @@ EOF
 				if (!$bApplyStimulus) {
 					// Throw an application oriented exception if necessary
 					throw new ApplicationException($sExceptionMessage ?? Dict::S('UI:FailedToApplyStimuli'));
+				} else {
+					return true;
 				}
-				return true;
 			}
 		}
 
@@ -3711,7 +3839,7 @@ HTML;
 	public static function GetShortcutActions($sFinalClass)
 	{
 		$sShortcutActions = MetaModel::GetConfig()->Get('shortcut_actions');
-		$aShortcutActions = array_map('trim', explode(',', $sShortcutActions));
+		$aShortcutActions = explode(',', $sShortcutActions);
 
 		return $aShortcutActions;
 	}
@@ -4033,15 +4161,20 @@ 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)) {
@@ -4261,6 +4394,21 @@ HTML;
 		return $res;
 	}
 
+	protected function PostInsertActions(): void
+	{
+		parent::PostInsertActions();
+
+		// Invoke extensions after insertion (the object must exist, have an id, etc.)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBInsert()");
+			$oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBInsert($this, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
+		}
+	}
+
 	/**
 	 * @inheritdoc
 	 * Attaches InlineImages to the current object
@@ -4270,6 +4418,27 @@ 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) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBInsert()");
+			$oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBInsert($oNewObj, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
+		}
+
+		return $oNewObj;
+	}
+
 	public function DBUpdate()
 	{
 		$this->LogCRUDEnter(__METHOD__);
@@ -4293,6 +4462,21 @@ HTML;
 		return $res;
 	}
 
+	protected function PostUpdateActions(array $aChanges): void
+	{
+		parent::PostUpdateActions($aChanges);
+
+		// Invoke extensions after the update (could be before)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBUpdate()");
+			$oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBUpdate($this, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBUpdate');
+		}
+	}
+
 	/**
 	 * @param string $sMessageIdPrefix
 	 *
@@ -4328,31 +4512,67 @@ HTML;
 		return $oDeletionPlan;
 	}
 
+	final protected function PreDeleteActions(): void
+	{
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBDelete()");
+			$oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
+		}
+
+		parent::PreDeleteActions();
+	}
+
 	final 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();
+			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
+		}
+
+		return parent::DBDeleteTracked_Internal($oDeletionPlan);
+	}
+
 	public function IsModified()
 	{
 		if (parent::IsModified()) {
 			return true;
 		}
 
-		return $this->bIsMarkedAsModified;
-	}
+		// Plugins
+		//
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		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');
+			if ($bIsModified) {
+				$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified() -> true");
+				return true;
+			} else {
+				$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified() -> false");
+			}
+		}
 
-	/**
-	 * Override the default modification state of the object.
-	 *
-	 * The object is considered as modified, whatever the actual state is.
-	 * This is used when an object is modified indirectly (eg. through a linked set)
-	 *
-	 * @return void
-	 */
-	public function MarkObjectAsModified(): void
-	{
-		$this->bIsMarkedAsModified = true;
+		return false;
 	}
 
 	/**
@@ -4366,7 +4586,7 @@ HTML;
 	}
 
 	/**
-	 * Whether to bypass the checks of user rights when writing this object
+	 * Whether to bypass the checks of user rights when writing this object, could be used in {@link \iApplicationObjectExtension::OnCheckToWrite()}
 	 *
 	 * @return bool
 	 */
@@ -4395,6 +4615,20 @@ HTML;
 	{
 		parent::DoCheckToWrite();
 
+		// Plugins
+		//
+		/** @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');
+			if (is_array($aNewIssues) && (count($aNewIssues) > 0)) { // Some extensions return null instead of an empty array
+				$this->m_aCheckIssues = array_merge($this->m_aCheckIssues, $aNewIssues);
+			}
+		}
+
 		// User rights
 		//
 		if (!$this->bAllowWrite) {
@@ -4432,6 +4666,20 @@ HTML;
 	{
 		parent::DoCheckToDelete($oDeletionPlan);
 
+		// Plugins
+		//
+		/** @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');
+			if (is_array($aNewIssues) && count($aNewIssues) > 0) {
+				$this->m_aDeleteIssues = array_merge($this->m_aDeleteIssues, $aNewIssues);
+			}
+		}
+
 		// User rights
 		//
 		if (! $this->bAllowDelete) {
@@ -4445,6 +4693,106 @@ 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 = [];
+					$sTip = '';
+					foreach ($aReasons as $aRow) {
+						$sDescription = utils::EscapeHtml($aRow['description']);
+						$sDescription = str_replace(["\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 = ['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
 	 *
@@ -4509,6 +4857,63 @@ HTML;
 		}
 	}
 
+	/**
+	 * @param $sCurrentState
+	 * @param $sStimulus
+	 * @param $bOnlyNewOnes
+	 *
+	 * @return array
+	 * @throws \ApplicationException
+	 * @throws \CoreException
+	 * @deprecated Since iTop 2.4, use DBObject::GetTransitionAttributes() instead.
+	 */
+	public function GetExpectedAttributes($sCurrentState, $sStimulus, $bOnlyNewOnes)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('Since iTop 2.4, use DBObject::GetTransitionAttributes() instead');
+		$aTransitions = $this->EnumTransitions();
+		if (!isset($aTransitions[$sStimulus])) {
+			// Invalid stimulus
+			throw new ApplicationException(Dict::Format(
+				'UI:Error:Invalid_Stimulus_On_Object_In_State',
+				$sStimulus,
+				$this->GetName(),
+				$this->GetStateLabel()
+			));
+		}
+		$aTransition = $aTransitions[$sStimulus];
+		$sTargetState = $aTransition['target_state'];
+		$aTargetStates = MetaModel::EnumStates(get_class($this));
+		$aTargetState = $aTargetStates[$sTargetState];
+		$aCurrentState = $aTargetStates[$this->GetState()];
+		$aExpectedAttributes = $aTargetState['attribute_list'];
+		$aCurrentAttributes = $aCurrentState['attribute_list'];
+
+		$aComputedAttributes = [];
+		foreach ($aExpectedAttributes as $sAttCode => $iExpectCode) {
+			if (!array_key_exists($sAttCode, $aCurrentAttributes)) {
+				$aComputedAttributes[$sAttCode] = $iExpectCode;
+			} else {
+				if (!($aCurrentAttributes[$sAttCode] & (OPT_ATT_HIDDEN | OPT_ATT_READONLY))) {
+					$iExpectCode = $iExpectCode & ~(OPT_ATT_MUSTPROMPT | OPT_ATT_MUSTCHANGE); // Already prompted/changed, reset the flags
+				}
+				// Later: better check if the attribute is not *null*
+				if (($iExpectCode & OPT_ATT_MANDATORY) && ($this->Get($sAttCode) != '')) {
+					$iExpectCode = $iExpectCode & ~(OPT_ATT_MANDATORY); // If the attribute is present, then no need to request its presence
+				}
+
+				$aComputedAttributes[$sAttCode] = $iExpectCode;
+			}
+
+			$aComputedAttributes[$sAttCode] = $aComputedAttributes[$sAttCode] & ~(OPT_ATT_READONLY | OPT_ATT_HIDDEN); // Don't care about this form now
+
+			if ($aComputedAttributes[$sAttCode] == 0) {
+				unset($aComputedAttributes[$sAttCode]);
+			}
+		}
+
+		return $aComputedAttributes;
+	}
+
 	/**
 	 * Display a form for modifying several objects at once
 	 * The form will be submitted to the current page, with the specified additional values
@@ -5364,7 +5769,7 @@ JS
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
 		$this->RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
-		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges, 'stimulus_applied' => $sStimulusBeingApplied, 'cmdb_change' => self::GetCurrentChange()]);
+		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges, 'stimulus_applied' => $sStimulusBeingApplied]);
 	}
 
 	//////////////
@@ -5402,7 +5807,7 @@ JS
 	final protected function FireEventAfterDelete(): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
-		$this->FireEvent(EVENT_DB_AFTER_DELETE, ['cmdb_change' => self::GetCurrentChange()]);
+		$this->FireEvent(EVENT_DB_AFTER_DELETE);
 	}
 
 	/**

application/csvpage.class.inc.php

@@ -0,0 +1,9 @@
+<?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-2024 Combodo SAS
+ */
+
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/CSVPage.php, now loadable using autoloader');

application/dashboard.class.inc.php

@@ -274,9 +274,6 @@ 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']);

application/dashlet.class.inc.php

@@ -1869,10 +1869,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);
 	}
@@ -1886,7 +1883,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);
 	}
 
@@ -1988,10 +1984,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) {
@@ -2119,7 +2112,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>
@@ -45,7 +45,7 @@
       <properties>
         <comment>/** Acknowledge welcome popup messages */</comment>
         <abstract>false</abstract>
-        <category/>
+        <category></category>
         <key_type>autoincrement</key_type>
         <db_table>priv_welcome_popup_acknowledge</db_table>
       </properties>
@@ -111,6 +111,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 +141,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>
@@ -186,6 +188,7 @@
     <menu id="Integrations" xsi:type="TemplateMenuNode" _delta="define">
       <rank>50</rank>
       <parent>ConfigurationTools</parent>
+      <template_file/>
     </menu>
     <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
       <rank>20</rank>

application/datatable.class.inc.php

@@ -0,0 +1,784 @@
+<?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-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
+ *
+ * @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 = [];
+		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 = [
+			'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' => ['str' => ''], // Forces JSON to encode this as a object...
+			'oDefaultSettings' => ['str' => ''], // Forces JSON to encode this as a object...
+			'oLabels' => ['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 = [];
+		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)).']';
+
+		$sAppRootUrl = utils::GetAbsoluteUrlAppRoot();
+		$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="{$sAppRootUrl}images/first.png" class="first"/>AAAA</td>
+		<td><img src="{$sAppRootUrl}images/prev.png" class="prev"/></td>
+		<td><span id="index">$sPagesLinks</span></td>
+		<td><img src="{$sAppRootUrl}images/next.png" class="next"/></td>
+		<td><img src="{$sAppRootUrl}images/last.png" class="last"/></td>
+		<td>$sPageSizeCombo</td>
+		<td><span id="loading">&nbsp;</span><input type="hidden" name="selectionMode" value="$sSelectionMode"></input>
+		</td>
+		</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 = [
+				$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 = ['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 = [];
+		if ($sSelectMode == 'multiple') {
+			$aAttribs['form::select'] = [
+				'label' => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->iListId}:not(:disabled)', this.checked);\" class=\"checkAll\"></input>",
+				'description' => Dict::S('UI:SelectAllToggle+'),
+				'metadata' => [],
+			];
+		} elseif ($sSelectMode == 'single') {
+			$aAttribs['form::select'] = ['label' => '', 'description' => '', 'metadata' => []];
+		}
+
+		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] = [
+							'label' => $sAttLabel,
+							'description' => '',
+							'metadata' => [
+								'object_class' => $sClassName,
+								'attribute_label' => $sAttLabel,
+							],
+						];
+					} else {
+						$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
+						$sAttDefClass = get_class($oAttDef);
+						$sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode);
+
+						$aAttribs[$sAttCode.'_'.$sAlias] = [
+							'label' => $sAttLabel,
+							'description' => $oAttDef->GetOrderByHint(),
+							'metadata' => [
+								'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 = [];
+		$aAttDefsCache = [];
+		$this->oSet->Seek(0);
+		$iMaxObjects = $iPageSize;
+		while (($aObjects = $this->oSet->FetchAssoc()) && ($iMaxObjects != 0)) {
+			$bFirstObject = true;
+			$aRow = [];
+			foreach ($this->aClassAliases as $sAlias => $sClassName) {
+				if (is_object($aObjects[$sAlias])) {
+					$sHilightClass = MetaModel::GetHilightClass($sClassName, $aObjects[$sAlias]);
+					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] = [
+									'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] = [
+										'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 = [];
+		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 = [];
+		$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')."]";
+			} elseif (($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')."]";
+			} elseif ($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

@@ -262,8 +262,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',
@@ -763,6 +761,10 @@ class DisplayBlock
 				$oBlock = $this->RenderList($aExtraParams, $oPage);
 				break;
 
+			case 'links':
+				$oBlock = $this->RenderLinks($oPage, $aExtraParams);
+				break;
+
 			case static::ENUM_STYLE_ACTIONS:
 				$oBlock = $this->RenderActions($aExtraParams);
 				break;
@@ -1528,6 +1530,56 @@ JS
 		return $oContentBlock;
 	}
 
+	/**
+	 * @deprecated 3.1.0 N°5957
+	 *
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 *
+	 * @return \Combodo\iTop\Application\UI\Base\Component\Html\Html|\Combodo\iTop\Application\UI\Base\Layout\UIContentBlock|string
+	 * @throws \ApplicationException
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 * @throws \ReflectionException
+	 */
+	protected function RenderLinks(WebPage $oPage, array $aExtraParams)
+	{
+		// Note: No deprecation ticket yet as we want to wait and see if people / code actually use this method, in which case we might keep it.
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('This method is most likely not used throughout the application and will be removed soon. If you ever see this message, please inform us.');
+
+		$oBlock = null;
+		if (($this->m_oSet->CountWithLimit(1) > 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES)) {
+			$oBlock = cmdbAbstractObject::GetDisplaySetBlock($oPage, $this->m_oSet, $aExtraParams);
+		} else {
+			$sClass = $this->m_oFilter->GetClass();
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $this->m_aParams['target_attr']);
+			$sTargetClass = $oAttDef->GetTargetClass();
+			$oBlock = new Html('<p>'.Dict::Format('UI:NoObject_Class_ToDisplay', MetaModel::GetName($sTargetClass)).'</p>');
+			$bDisplayMenu = isset($this->m_aParams['menu']) ? $this->m_aParams['menu'] == true : true;
+			if ($bDisplayMenu) {
+				if ((UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES)) {
+					$sDefaults = '';
+					if (isset($this->m_aParams['default'])) {
+						foreach ($this->m_aParams['default'] as $sName => $sValue) {
+							$sDefaults .= '&'.urlencode($sName).'='.urlencode($sValue);
+						}
+					}
+					$oBlock->AddHtml("<p><a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=modify_links&class=$sClass&sParams&link_attr=".$aExtraParams['link_attr']."&id=".$aExtraParams['object_id']."&target_class=$sTargetClass&addObjects=true$sDefaults\">".Dict::Format(
+						'UI:ClickToCreateNew',
+						Metamodel::GetName($sClass)
+					)."</a></p>\n");
+				}
+			}
+		}
+		return $oBlock;
+	}
+
 	/**
 	 * @param string|null $sChartId
 	 * @param array $aQueryParams
@@ -1776,11 +1828,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;
@@ -2000,13 +2048,13 @@ class MenuBlock extends DisplayBlock
 									$this->AddMenuSeparator($aRegularActions);
 									foreach ($aRelations as $sRelationCode => $aRelationInfo) {
 										if (array_key_exists('down', $aRelationInfo)) {
-											$aRegularActions['UI:Menu:'.$sRelationCode.'_down'] = [
+											$aRegularActions[$sRelationCode.'_down'] = [
 													'label' => $aRelationInfo['down'],
 													'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}",
 												] + $aActionParams;
 										}
 										if (array_key_exists('up', $aRelationInfo)) {
-											$aRegularActions['UI:Menu:'.$sRelationCode.'_up'] = [
+											$aRegularActions[$sRelationCode.'_up'] = [
 													'label' => $aRelationInfo['up'],
 													'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}",
 												] + $aActionParams;
@@ -2134,11 +2182,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])) {
@@ -2228,39 +2271,9 @@ class MenuBlock extends DisplayBlock
 						break;
 
 					case 'UI:Menu:EMail':
-						$sIconClass = 'far fa-envelope fa-lg';
+						$sIconClass = 'fas fa-share-alt';
 						$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';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:impacts_up':
-						$sIconClass = 'fas fa-sitemap fa-rotate-180';
-						$sLabel = '';
-						$aAction['tooltip'] = Dict::S('Relation:impacts/UpStream');
-						break;
-					case 'UI:Menu:impacts_down':
-						$sIconClass = 'fas fa-sitemap';
-						$sLabel = '';
-						$aAction['tooltip'] = Dict::S('Relation:impacts/DownStream');
-						break;
 
 					default:
 						if (isset($aAction['icon_class']) && (strlen($aAction['icon_class']) > 0)) {
@@ -2270,12 +2283,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']);

application/errorpage.class.inc.php

@@ -0,0 +1,9 @@
+<?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-2024 Combodo SAS
+ */
+
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/ErrorPage.php, now loadable using autoloader');

application/excelexporter.class.inc.php

@@ -273,7 +273,7 @@ class ExcelExporter
 	public function GetExcelFilePath()
 	{
 		if ($this->sOutputFilePath == null) {
-			return utils::GetDataPath().'bulk_export/'.$this->sToken.'.xlsx';
+			return APPROOT.'data/bulk_export/'.$this->sToken.'.xlsx';
 		} else {
 			return $this->sOutputFilePath;
 		}
@@ -281,14 +281,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()
@@ -302,7 +302,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) {
@@ -373,12 +373,12 @@ class ExcelExporter
 
 	protected function CheckDataDir()
 	{
-		if (!is_dir(utils::GetDataPath()."bulk_export")) {
-			@mkdir(utils::GetDataPath()."bulk_export", 0777, true /* recursive */);
+		if (!is_dir(APPROOT."data/bulk_export")) {
+			@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
 			clearstatcache();
 		}
-		if (!is_writable(utils::GetDataPath()."bulk_export")) {
-			throw new Exception('Data directory "'.utils::GetDataPath().'bulk_export" could not be written.');
+		if (!is_writable(APPROOT."data/bulk_export")) {
+			throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
 		}
 	}
 
@@ -387,12 +387,12 @@ class ExcelExporter
 		if ($sToken == null) {
 			$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/forms.class.inc.php

@@ -336,7 +336,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');
@@ -1384,11 +1384,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

@@ -36,13 +36,13 @@ class InputOutputTask extends cmdbAbstractObject
 	{
 		$aParams =
 		[
-			"category"            => "application",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "name",
-			"state_attcode"       => "",
-			"reconc_keys"         => [],
-			"db_table"            => "priv_iotask",
-			"db_key_field"        => "id",
+			"category" => "application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => [],
+			"db_table" => "priv_iotask",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		];
 		MetaModel::Init_Params($aParams);
@@ -50,18 +50,15 @@ class InputOutputTask extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("description", ["allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => []]));
 		MetaModel::Init_AddAttribute(new AttributeEnum("category", ["allowed_values" => new ValueSetEnum('Input, Ouput'), "sql" => "category", "default_value" => "Input", "is_null_allowed" => false, "depends_on" => []]));
 		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", ["allowed_values" => new ValueSetEnum('File, Database, Web Service'), "sql" => "source_type", "default_value" => "File", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeEnum(
-			"source_subtype",
-			["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" => []]
-		));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype", ["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" => []]));
 		MetaModel::Init_AddAttribute(new AttributeString("source_path", ["allowed_values" => null, "sql" => "source_path", "default_value" => "", "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", ["class_category" => "", "more_values" => "", "sql" => "objects_class", "default_value" => null, "is_null_allowed" => true, "depends_on" => [], "class_exclusion_list" => null]));
+		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", ["class_category" => "", "more_values" => "", "sql" => "objects_class", "default_value" => null, "is_null_allowed" => true, "depends_on" => []]));
 		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", ["allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "test_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => []]));
 		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", ["allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "verbose_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => []]));
 		MetaModel::Init_AddAttribute(new AttributeEnum("options", ["allowed_values" => new ValueSetEnum('Full, Update Only, Creation Only'), "sql" => "options", "default_value" => 'Full', "is_null_allowed" => true, "depends_on" => []]));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', ['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', ['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', ['description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options']); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', ['name', 'category', 'objects_class', 'source_type', 'source_subtype']); // Criteria of the std search form

application/itopwebpage.class.inc.php

@@ -0,0 +1,10 @@
+<?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-2024 Combodo SAS
+ */
+
+// 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,9 @@
+<?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-2024 Combodo SAS
+ */
+
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/iTopWizardWebPage.php, now loadable using autoloader');

application/maintenancemsg.php

@@ -86,6 +86,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

@@ -11,6 +11,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");
 
 /**
@@ -343,6 +344,49 @@ class ApplicationMenu
 		return $aSubMenuNodes;
 	}
 
+	/**
+	 * Entry point to display the whole menu into the web page, used by iTopWebPage
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @throws DictExceptionMissingString
+	 *
+	 * @deprecated Will be removed in 3.0.0, use static::GetMenuGroups() instead
+	 */
+	public static function DisplayMenu($oPage, $aExtraParams)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use static::GetMenuGroups() instead');
+		self::LoadAdditionalMenus();
+		// Sort the root menu based on the rank
+		usort(self::$aRootMenus, ['ApplicationMenu', 'CompareOnRank']);
+		$iAccordion = 0;
+		$iActiveAccordion = $iAccordion;
+		$iActiveMenu = self::GetMenuIndexById(self::GetActiveNodeId());
+		foreach (self::$aRootMenus as $aMenu) {
+			if (!self::CanDisplayMenu($aMenu)) {
+				continue;
+			}
+			$oMenuNode = self::GetMenuNode($aMenu['index']);
+			$oPage->AddToMenu('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'" class="navigation-menu-group" data-menu-id="'.$oMenuNode->GetMenuId().'">'.$oMenuNode->GetTitle().'</h3>');
+			$oPage->AddToMenu('<div>');
+			$oPage->AddToMenu('<ul>');
+			$aChildren = self::GetChildren($aMenu['index']);
+			$bActive = self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
+			$oPage->AddToMenu('</ul>');
+			if ($bActive) {
+				$iActiveAccordion = $iAccordion;
+			}
+			$oPage->AddToMenu('</div>');
+			$iAccordion++;
+		}
+
+		$oPage->add_ready_script(
+			<<<EOF
+	// Accordion Menu
+	$("#accordion").css({display:'block'}).accordion({ header: "h3", heightStyle: "content", collapsible: true,  active: $iActiveAccordion, icons: false, animate: true }); // collapsible will be enabled once the item will be selected
+EOF
+		);
+	}
+
 	/**
 	 * Recursively check if the menu and at least one of his sub-menu is enabled
 	 * @param array $aMenu menu entry
@@ -366,6 +410,65 @@ class ApplicationMenu
 		return false;
 	}
 
+	/**
+	 * Handles the display of the sub-menus (called recursively if necessary)
+	 *
+	 * @param WebPage $oPage
+	 * @param array $aMenus
+	 * @param array $aExtraParams
+	 * @param int $iActiveMenu
+	 *
+	 * @return bool True if the currently selected menu is one of the submenus
+	 * @throws DictExceptionMissingString
+	 * @throws \Exception
+	 * @deprecated Will be removed in 3.0.0, use static::GetSubMenuNodes() instead
+	 */
+	protected static function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use static::GetSubMenuNodes() instead');
+		// Sort the menu based on the rank
+		$bActive = false;
+		usort($aMenus, ['ApplicationMenu', 'CompareOnRank']);
+		foreach ($aMenus as $aMenu) {
+			if (!self::CanDisplayMenu($aMenu)) {
+				continue;
+			}
+			$index = $aMenu['index'];
+			$oMenu = self::GetMenuNode($index);
+			if ($oMenu->IsEnabled()) {
+				$aChildren = self::GetChildren($index);
+				$aCSSClasses = ['navigation-menu-item'];
+				if (count($aChildren) > 0) {
+					$aCSSClasses[] = 'submenu';
+				}
+				$sHyperlink = $oMenu->GetHyperlink($aExtraParams);
+				$sItemHtml = '<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" class="'.implode(' ', $aCSSClasses).'" data-menu-id="'.$oMenu->GetMenuID().'">';
+				if ($sHyperlink != '') {
+					$sLinkTarget = '';
+					if ($oMenu->IsHyperLinkInNewWindow()) {
+						$sLinkTarget .= ' target="_blank"';
+					}
+					$sURL = '"'.$oMenu->GetHyperlink($aExtraParams).'"'.$sLinkTarget;
+					$sTitle = utils::HtmlEntities($oMenu->GetTitle());
+					$sItemHtml .= "<a href={$sURL}>{$sTitle}</a>";
+				} else {
+					$sItemHtml .= $oMenu->GetTitle();
+				}
+				$sItemHtml .= '</li>';
+				$oPage->AddToMenu($sItemHtml);
+				if ($iActiveMenu == $index) {
+					$bActive = true;
+				}
+				if (count($aChildren) > 0) {
+					$oPage->AddToMenu('<ul>');
+					$bActive |= self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
+					$oPage->AddToMenu('</ul>');
+				}
+			}
+		}
+		return $bActive;
+	}
+
 	/**
 	 * Helper function to sort the menus based on their rank
 	 * @param array $a
@@ -844,10 +947,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
@@ -858,21 +966,36 @@ 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)
 	{
-		return '';
+		if ($this->sTemplateFile == '') {
+			return '';
+		}
+		return parent::GetHyperlink($aExtraParams);
 	}
+
 	/**
 	 * @inheritDoc
 	 * @throws \Exception
 	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = [])
 	{
-		//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 ?
+		}
 	}
 }
 

application/nicewebpage.class.inc.php

@@ -0,0 +1,9 @@
+<?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-2024 Combodo SAS
+ */
+
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/NiceWebPage.php, now loadable using autoloader');

application/pdfpage.class.inc.php

@@ -0,0 +1,9 @@
+<?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-2024 Combodo SAS
+ */
+
+DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/PDFPage.php, now loadable using autoloader');

application/query.class.inc.php

@@ -231,10 +231,16 @@ class QueryOQL extends Query
 	{
 		try {
 			// retrieve attributes
+			$sFields = trim($this->Get('fields'));
 			$sOql = $this->Get('oql');
 
 			// construct base url depending on version
-			$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
+			$bExportV1Recommended = ($sFields == '');
+			if ($bExportV1Recommended) {
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			} else {
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
+			}
 
 			// search object from OQL
 			$oSearch = DBObjectSearch::FromOQL($sOql);
@@ -258,9 +264,22 @@ class QueryOQL extends Query
 		$oPage->add_script("$('[name=\"attr_oql\"]').addClass('ibo-query-oql ibo-is-code'); $('[data-attribute-code=\"oql\"]').addClass('ibo-query-oql ibo-is-code');");
 
 		if (!$bEditMode) {
-			$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
-
+			$sFields = trim($this->Get('fields'));
+			$bExportV1Recommended = ($sFields == '');
+			if ($bExportV1Recommended) {
+				$oFieldAttDef = MetaModel::GetAttributeDef('QueryOQL', 'fields');
+				$oAlert = AlertUIBlockFactory::MakeForFailure()
+					->SetIsClosable(false)
+					->SetIsCollapsible(false);
+				$oAlert->AddCSSClass('mb-5');
+				$oAlert->AddSubBlock(new Html(Dict::Format('UI:Query:UrlV1', '')));
+				$oPage->AddSubBlock($oAlert);
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			} else {
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
+			}
 			$sOql = $this->Get('oql');
+			$sMessage = null;
 			try {
 				$oSearch = DBObjectSearch::FromOQL($sOql);
 				$aParameters = $oSearch->GetQueryParams();

application/template.class.inc.php

@@ -0,0 +1,380 @@
+<?php
+
+/**
+ * Copyright (C) 2013-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
+ */
+
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+/**
+ * This class manages the special template format used internally to build the iTop web pages
+ *
+ * @deprecated 3.0.0
+ */
+class DisplayTemplate
+{
+	protected $m_sTemplate;
+	protected $m_aTags;
+	protected static $iBlockCount = 0;
+
+	public function __construct($sTemplate)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		$this->m_aTags = [
+			'itopblock',
+			'itopcheck',
+			'itoptabs',
+			'itoptab',
+			'itoptoggle',
+			'itopstring',
+			'sqlblock',
+		];
+		$this->m_sTemplate = $sTemplate;
+	}
+
+	public function Render(WebPage $oPage, $aParams = [])
+	{
+		$this->m_sTemplate = MetaModel::ApplyParams($this->m_sTemplate, $aParams);
+		$iStart = 0;
+		$iEnd = strlen($this->m_sTemplate);
+		$iCount = 0;
+		$iBeforeTagPos = $iStart;
+		$iAfterTagPos = $iStart;
+		while ($sTag = $this->GetNextTag($iStart, $iEnd)) {
+			$sContent = $this->GetTagContent($sTag, $iStart, $iEnd);
+			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
+			$sOuterTag = substr($this->m_sTemplate, $iStart, $iAfterTagPos - $iStart);
+			$oPage->add(substr($this->m_sTemplate, $iBeforeTagPos, $iStart - $iBeforeTagPos));
+			if ($sTag == DisplayBlock::TAG_BLOCK) {
+				try {
+					$oBlock = DisplayBlock::FromTemplate($sOuterTag);
+					if (is_object($oBlock)) {
+						$oBlock->Display($oPage, 'block_'.self::$iBlockCount, $aParams);
+					}
+				} catch (OQLException $e) {
+					$oPage->p('Error in template (please contact your administrator) - Invalid query<!--'.$sOuterTag.'-->');
+				} catch (Exception $e) {
+					$oPage->p('Error in template (please contact your administrator)<!--'.$e->getMessage().'--><!--'.$sOuterTag.'-->');
+				}
+
+				self::$iBlockCount++;
+			} else {
+				$aAttributes = $this->GetTagAttributes($sTag, $iStart, $iEnd);
+				//$oPage->p("Tag: $sTag - ($iStart, $iEnd)");
+				$this->RenderTag($oPage, $sTag, $aAttributes, $sContent);
+
+			}
+			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
+			$iBeforeTagPos = $iAfterTagPos;
+			$iStart = $iEnd;
+			$iEnd = strlen($this->m_sTemplate);
+			$iCount++;
+		}
+		$oPage->add(substr($this->m_sTemplate, $iAfterTagPos));
+	}
+
+	public function GetNextTag(&$iStartPos, &$iEndPos)
+	{
+		$iChunkStartPos = $iStartPos;
+		$sNextTag = null;
+		$iStartPos = $iEndPos;
+		foreach ($this->m_aTags as $sTag) {
+			// Search for the opening tag
+			$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.' ', $iChunkStartPos);
+			if ($iOpeningPos === false) {
+				$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.'>', $iChunkStartPos);
+			}
+			if ($iOpeningPos !== false) {
+				$iClosingPos = stripos($this->m_sTemplate, '</'.$sTag.'>', $iOpeningPos);
+			}
+			if (($iOpeningPos !== false) && ($iClosingPos !== false)) {
+				if ($iOpeningPos < $iStartPos) {
+					// This is the next tag
+					$iStartPos = $iOpeningPos;
+					$iEndPos = $iClosingPos;
+					$sNextTag = $sTag;
+				}
+			}
+		}
+		return $sNextTag;
+	}
+
+	public function GetTagContent($sTag, $iStartPos, $iEndPos)
+	{
+		$sContent  = "";
+		$iContentStart = strpos($this->m_sTemplate, '>', $iStartPos); // Content of tag start immediatly after the first closing bracket
+		if ($iContentStart !== false) {
+			$sContent = substr($this->m_sTemplate, 1 + $iContentStart, $iEndPos - $iContentStart - 1);
+		}
+		return $sContent;
+	}
+
+	public function GetTagAttributes($sTag, $iStartPos, $iEndPos)
+	{
+		$aAttr  = [];
+		$iAttrStart = strpos($this->m_sTemplate, ' ', $iStartPos); // Attributes start just after the first space
+		$iAttrEnd = strpos($this->m_sTemplate, '>', $iStartPos); // Attributes end just before the first closing bracket
+		if (($iAttrStart !== false) && ($iAttrEnd !== false) && ($iAttrEnd > $iAttrStart)) {
+			$sAttributes = substr($this->m_sTemplate, 1 + $iAttrStart, $iAttrEnd - $iAttrStart - 1);
+			$aAttributes = explode(' ', $sAttributes);
+			foreach ($aAttributes as $sAttr) {
+				if (preg_match('/(.+) *= *"(.+)"$/', $sAttr, $aMatches)) {
+					$aAttr[strtolower($aMatches[1])] = $aMatches[2];
+				}
+			}
+		}
+		return $aAttr;
+	}
+
+	protected function RenderTag($oPage, $sTag, $aAttributes, $sContent)
+	{
+		static $iTabContainerCount = 0;
+		switch ($sTag) {
+			case 'itoptabs':
+				$oPage->AddTabContainer('Tabs_'.$iTabContainerCount);
+				$oPage->SetCurrentTabContainer('Tabs_'.$iTabContainerCount);
+				$iTabContainerCount++;
+				//$oPage->p('Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, []); // no params to apply, they have already been applied
+				$oPage->SetCurrentTabContainer('');
+				break;
+
+			case 'itopcheck':
+				$sClassName = $aAttributes['class'];
+				if (MetaModel::IsValidClass($sClassName) && UserRights::IsActionAllowed($sClassName, UR_ACTION_READ)) {
+					$oTemplate = new DisplayTemplate($sContent);
+					$oTemplate->Render($oPage, []); // no params to apply, they have already been applied
+				} else {
+					// Leave a trace for those who'd like to understand why nothing is displayed
+					$oPage->add("<!-- class $sClassName does not exist, skipping some part of the template -->\n");
+				}
+				break;
+
+			case 'itoptab':
+				$oPage->SetCurrentTab($aAttributes['name'], str_replace('_', ' ', $aAttributes['name']));
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, []); // no params to apply, they have already been applied
+				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oPage->SetCurrentTab('');
+				break;
+
+			case 'itoptoggle':
+				$sName = isset($aAttributes['name']) ? $aAttributes['name'] : 'Tagada';
+				$bOpen = isset($aAttributes['open']) ? $aAttributes['open'] : true;
+				$oPage->StartCollapsibleSection(Dict::S($sName), $bOpen);
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, []); // no params to apply, they have already been applied
+				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oPage->EndCollapsibleSection();
+				break;
+
+			case 'itopstring':
+				$oPage->add(Dict::S($sContent));
+				break;
+
+			case 'sqlblock':
+				$oBlock = SqlBlock::FromTemplate($sContent);
+				$oBlock->RenderContent($oPage);
+				break;
+
+			case 'itopblock': // No longer used, handled by DisplayBlock::FromTemplate see above
+				$oPage->add("<!-- Application Error: should be handled by DisplayBlock::FromTemplate -->");
+				break;
+
+			default:
+				// Unknown tag, just ignore it or now -- output an HTML comment
+				$oPage->add("<!-- unsupported tag: $sTag -->");
+		}
+	}
+
+	/**
+	 * Unit test
+	 */
+	public static function UnitTest()
+	{
+		require_once(APPROOT.'/application/startup.inc.php');
+
+		$sAppRootUrl = utils::GetAbsoluteUrlAppRoot();
+		$sTemplate = '<div class="page_header">
+		<div class="actions_details"><a href="#"><span>Actions</span></a></div>
+		<h1>$class$: <span class="hilite">$name$</span></h1>
+		</div>
+		<img src="'.$sAppRootUrl.'images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
+		<itoptabs>
+			<itoptab name="Interfaces">
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</itopblock>
+			</itoptab>
+			<itoptab name="Contacts">
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Contact AS c JOIN lnkContactToCI AS l ON l.contact_id = c.id WHERE l.ci_id = $id$</itopblock>
+			</itoptab>
+			<itoptab name="Documents">
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Document AS d JOIN lnkDocumentToCI as l ON l.document_id = d.id WHERE l.ci_id = $id$)</itopblock>
+			</itoptab>
+		</itoptabs>';
+
+		$oPage = new iTopWebPage('Unit Test');
+		//$oPage->add("Template content: <pre>".htmlentities($sTemplate, ENT_QUOTES, 'UTF-8')."</pre>\n");
+		$oTemplate = new DisplayTemplate($sTemplate);
+		$oTemplate->Render($oPage, ['class' => 'Network device','pkey' => 271, 'name' => 'deliversw01.mecanorama.fr', 'org_id' => 3]);
+		$oPage->output();
+	}
+}
+
+/**
+ * Special type of template for displaying the details of an object
+ * On top of the defaut 'blocks' managed by the parent class, the following placeholders
+ * are available in such a template:
+ * $attribute_code$ An attribute of the object (in edit mode this is the input for the attribute)
+ * $attribute_code->label()$ The label of an attribute
+ * $PlugIn:plugInClass->properties()$ The ouput of OnDisplayProperties of the specified plugInClass
+ */
+class ObjectDetailsTemplate extends DisplayTemplate
+{
+	public function __construct($sTemplate, $oObj, $sFormPrefix = '')
+	{
+		parent::__construct($sTemplate);
+		$this->m_oObj = $oObj;
+		$this->m_sPrefix = $sFormPrefix;
+	}
+
+	public function Render(WebPage $oPage, $aParams = [], $bEditMode = false)
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this->m_oObj));
+		$aTemplateFields = [];
+		preg_match_all('/\\$this->([a-z0-9_]+)\\$/', $this->m_sTemplate, $aMatches);
+		foreach ($aMatches[1] as $sAttCode) {
+			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode)) {
+				$aTemplateFields[] = $sAttCode;
+			} else {
+				$aParams['this->'.$sAttCode] = "<!--Unknown attribute: $sAttCode-->";
+			}
+		}
+		preg_match_all('/\\$this->field\\(([a-z0-9_]+)\\)\\$/', $this->m_sTemplate, $aMatches);
+		foreach ($aMatches[1] as $sAttCode) {
+			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode)) {
+				$aTemplateFields[] = $sAttCode;
+			} else {
+				$aParams['this->field('.$sAttCode.')'] = "<!--Unknown attribute: $sAttCode-->";
+			}
+		}
+		$aFieldsComments = (isset($aParams['fieldsComments'])) ? $aParams['fieldsComments'] : [];
+		$aFieldsMap = [];
+
+		$sClass = get_class($this->m_oObj);
+		// Renders the fields used in the template
+		foreach (MetaModel::ListAttributeDefs(get_class($this->m_oObj)) as $sAttCode => $oAttDef) {
+			$aParams['this->label('.$sAttCode.')'] = $oAttDef->GetLabel();
+			$aParams['this->comments('.$sAttCode.')'] = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
+			$iInputId = '2_'.$sAttCode; // TODO: generate a real/unique prefix...
+			if (in_array($sAttCode, $aTemplateFields)) {
+				if ($this->m_oObj->IsNew()) {
+					$iFlags = $this->m_oObj->GetInitialStateAttributeFlags($sAttCode);
+				} else {
+					$iFlags = $this->m_oObj->GetAttributeFlags($sAttCode);
+				}
+				if (($iFlags & OPT_ATT_MANDATORY) && $this->m_oObj->IsNew()) {
+					$iFlags = $iFlags & ~OPT_ATT_READONLY; // Mandatory fields cannot be read-only when creating an object
+				}
+
+				if ((!$oAttDef->IsWritable()) || ($sStateAttCode == $sAttCode)) {
+					$iFlags = $iFlags | OPT_ATT_READONLY;
+				}
+
+				if ($iFlags & OPT_ATT_HIDDEN) {
+					$aParams['this->label('.$sAttCode.')'] = '';
+					$aParams['this->field('.$sAttCode.')'] = '';
+					$aParams['this->comments('.$sAttCode.')'] = '';
+					$aParams['this->'.$sAttCode] = '';
+				} else {
+					if ($bEditMode && ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE))) {
+						// Check if the attribute is not read-only because of a synchro...
+						$aReasons = [];
+						$sSynchroIcon = '';
+						if ($iFlags & OPT_ATT_SLAVE) {
+							$iSynchroFlags = $this->m_oObj->GetSynchroReplicaFlags($sAttCode, $aReasons);
+							$sAppRooturl = utils::GetAbsoluteUrlAppRoot();
+							$sSynchroIcon = "&nbsp;<img id=\"synchro_$iInputId\" src=\"{$sAppRooturl}images/transp-lock.png\" style=\"vertical-align:middle\"/>";
+							$sTip = '';
+							foreach ($aReasons as $aRow) {
+								$sDescription = utils::EscapeHtml($aRow['description']);
+								$sDescription = str_replace(["\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>";
+							}
+							$oPage->add_ready_script("$('#synchro_$iInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+						}
+
+						// Attribute is read-only
+						$sHTMLValue = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetAsHTML($sAttCode);
+						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.utils::EscapeHtml($this->m_oObj->Get($sAttCode)).'"/></span>';
+						$aFieldsMap[$sAttCode] = $iInputId;
+						$aParams['this->comments('.$sAttCode.')'] = $sSynchroIcon;
+					}
+
+					if ($bEditMode && !($iFlags & OPT_ATT_READONLY)) { //TODO: check the data synchro status...
+						$aParams['this->field('.$sAttCode.')'] = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetFormElementForField(
+							$oPage,
+							$sClass,
+							$sAttCode,
+							$oAttDef,
+							$this->m_oObj->Get($sAttCode),
+							$this->m_oObj->GetEditValue($sAttCode),
+							$iInputId, // InputID
+							'',
+							$iFlags,
+							['this' => $this->m_oObj] // aArgs
+						).'</span>';
+						$aFieldsMap[$sAttCode] = $iInputId;
+					} else {
+						$aParams['this->field('.$sAttCode.')'] = $this->m_oObj->GetAsHTML($sAttCode);
+					}
+					$aParams['this->'.$sAttCode] = "<table class=\"field\"><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";
+				}
+			}
+		}
+
+		// Renders the PlugIns used in the template
+		preg_match_all('/\\$PlugIn:([A-Za-z0-9_]+)->properties\\(\\)\\$/', $this->m_sTemplate, $aMatches);
+		$aPlugInProperties = $aMatches[1];
+		foreach ($aPlugInProperties as $sPlugInClass) {
+			/** @var \iApplicationUIExtension $oInstance */
+			$oInstance = MetaModel::GetPlugins('iApplicationUIExtension', $sPlugInClass);
+			if ($oInstance != null) { // Safety check...
+				$offset = $oPage->start_capture();
+				$oInstance->OnDisplayProperties($this->m_oObj, $oPage, $bEditMode);
+				$sContent = $oPage->end_capture($offset);
+				$aParams["PlugIn:{$sPlugInClass}->properties()"] = $sContent;
+			} else {
+				$aParams["PlugIn:{$sPlugInClass}->properties()"] = "Missing PlugIn: $sPlugInClass";
+			}
+		}
+
+		$offset = $oPage->start_capture();
+		parent::Render($oPage, $aParams);
+		$sContent = $oPage->end_capture($offset);
+		// Remove empty table rows in case some attributes are hidden...
+		$sContent = preg_replace('/<tr[^>]*>\s*(<td[^>]*>\s*<\\/td>)+\s*<\\/tr>/im', '', $sContent);
+		$oPage->add($sContent);
+		return $aFieldsMap;
+	}
+}
+
+//DisplayTemplate::UnitTest();

application/themehandler.class.inc.php

@@ -56,6 +56,18 @@ class ThemeHandler
 		];
 	}
 
+	/**
+	 * Return the ID of the theme currently defined in the config. file
+	 *
+	 * @deprecated 3.0.0, will be removed in 3.1, see N°3898
+	 * @return string
+	 */
+	public static function GetCurrentThemeId()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		static::GetCurrentUserThemeId();
+	}
+
 	/**
 	 * @return string ID of the theme currently defined in the config. file, which applies to all users by default. If non defined, fallback on the default one.
 	 * @since 3.0.0

application/transaction.class.inc.php

@@ -217,26 +217,26 @@ class privUITransactionFile
 	 */
 	public static function GetNewTransactionId()
 	{
-		if (!is_dir(utils::GetDataPath().'transactions')) {
+		if (!is_dir(APPROOT.'data/transactions')) {
 			if (!is_writable(APPROOT.'data')) {
 				throw new Exception('The directory "'.APPROOT.'data" must be writable to the application.');
 			}
 			// condition avoids race condition N°2345
 			// See https://github.com/kalessil/phpinspectionsea/blob/master/docs/probable-bugs.md#mkdir-race-condition
-			if (!mkdir($concurrentDirectory = utils::GetDataPath().'transactions') && !is_dir($concurrentDirectory)) {
-				throw new Exception('Failed to create the directory "'.utils::GetDataPath().'transactions". Ajust the rights on the parent directory or let an administrator create the transactions directory and give the web sever enough rights to write into it.');
+			if (!mkdir($concurrentDirectory = APPROOT.'data/transactions') && !is_dir($concurrentDirectory)) {
+				throw new Exception('Failed to create the directory "'.APPROOT.'data/transactions". Ajust the rights on the parent directory or let an administrator create the transactions directory and give the web sever enough rights to write into it.');
 			}
 		}
 
-		if (!is_writable(utils::GetDataPath().'transactions')) {
-			throw new Exception('The directory "'.utils::GetDataPath().'transactions" must be writable to the application.');
+		if (!is_writable(APPROOT.'data/transactions')) {
+			throw new Exception('The directory "'.APPROOT.'data/transactions" must be writable to the application.');
 		}
 
 		$iCurrentUserId = static::GetCurrentUserId();
 
 		self::CleanupOldTransactions();
 
-		$sTransactionIdFullPath = tempnam(utils::GetDataPath().'transactions', static::GetUserPrefix());
+		$sTransactionIdFullPath = tempnam(APPROOT.'data/transactions', static::GetUserPrefix());
 		file_put_contents($sTransactionIdFullPath, $iCurrentUserId, LOCK_EX);
 
 		$sTransactionIdFileName = basename($sTransactionIdFullPath);
@@ -259,8 +259,8 @@ class privUITransactionFile
 	 */
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
-		// Constraint the transaction file within utils::GetDataPath().'transactions'
-		$sTransactionDir = realpath(utils::GetDataPath().'transactions');
+		// Constraint the transaction file within APPROOT.'data/transactions'
+		$sTransactionDir = realpath(APPROOT.'data/transactions');
 		$sFilepath = utils::RealPath($sTransactionDir.'/'.$id, $sTransactionDir);
 		if (($sFilepath === false) || (strlen($sTransactionDir) == strlen($sFilepath))) {
 			return false;
@@ -328,7 +328,7 @@ class privUITransactionFile
 
 		clearstatcache();
 		$iLimit = time() - 24 * 3600;
-		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : utils::GetDataPath().'transactions/*';
+		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : APPROOT.'data/transactions/*';
 		$aTransactions = glob($sPattern);
 		foreach ($aTransactions as $sFileName) {
 			if (filemtime($sFileName) < $iLimit) {
@@ -346,7 +346,7 @@ class privUITransactionFile
 	{
 		clearstatcache();
 		$aResult = [];
-		$aTransactions = glob(utils::GetDataPath().'transactions/'.self::GetUserPrefix().'*');
+		$aTransactions = glob(APPROOT.'data/transactions/'.self::GetUserPrefix().'*');
 		foreach ($aTransactions as $sFileName) {
 			$aResult[] = date('Y-m-d H:i:s', filemtime($sFileName)).' - '.basename($sFileName);
 		}

application/twigextension.class.inc.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace Combodo\iTop;
+
+use AttributeDate;
+use AttributeDateTime;
+use DeprecatedCallsLog;
+use Dict;
+use Exception;
+use MetaModel;
+use Twig\Environment;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+use utils;
+
+DeprecatedCallsLog::NotifyDeprecatedFile('instead use sources/Application/TwigBase/Twig/Extension.php, which is loaded by the autoloader');
+
+/**
+ * Class TwigExtension
+ *
+ * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
+ * @package Combodo\iTop
+ * @deprecated 3.1.0 N°4034
+ */
+class TwigExtension
+{
+	/**
+	 * Registers Twig extensions such as filters or functions.
+	 * It allows us to access some stuff directly in twig.
+	 *
+	 * @param Environment $oTwigEnv
+	 */
+	public static function RegisterTwigExtensions(Environment &$oTwigEnv)
+	{
+		// Filter to translate a string via the Dict::S function
+		// Usage in twig: {{ 'String:ToTranslate'|dict_s }}
+		$oTwigEnv->addFilter(
+			new TwigFilter(
+				'dict_s',
+				function ($sStringCode, $sDefault = null, $bUserLanguageOnly = false) {
+					return Dict::S($sStringCode, $sDefault, $bUserLanguageOnly);
+				}
+			)
+		);
+
+		// Filter to format a string via the Dict::Format function
+		// Usage in twig: {{ 'String:ToTranslate'|dict_format() }}
+		$oTwigEnv->addFilter(
+			new TwigFilter(
+				'dict_format',
+				function ($sStringCode, $sParam01 = null, $sParam02 = null, $sParam03 = null, $sParam04 = null) {
+					return Dict::Format($sStringCode, $sParam01, $sParam02, $sParam03, $sParam04);
+				}
+			)
+		);
+
+		// Filter to format output
+		// example a DateTime is converted to user format
+		// Usage in twig: {{ 'String:ToFormat'|output_format }}
+		$oTwigEnv->addFilter(
+			new TwigFilter(
+				'date_format',
+				function ($sDate) {
+					try {
+						if (preg_match('@^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$@', trim($sDate))) {
+							return AttributeDateTime::GetFormat()->Format($sDate);
+						}
+						if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate))) {
+							return AttributeDate::GetFormat()->Format($sDate);
+						}
+					} catch (Exception $e) {
+					}
+					return $sDate;
+				}
+			)
+		);
+
+		// Filter to format output
+		// example a DateTime is converted to user format
+		// Usage in twig: {{ 'String:ToFormat'|output_format }}
+		$oTwigEnv->addFilter(
+			new TwigFilter(
+				'size_format',
+				function ($sSize) {
+					return utils::BytesToFriendlyFormat($sSize);
+				}
+			)
+		);
+
+		// Filter to enable base64 encode/decode
+		// Usage in twig: {{ 'String to encode'|base64_encode }}
+		$oTwigEnv->addFilter(new TwigFilter('base64_encode', 'base64_encode'));
+		$oTwigEnv->addFilter(new TwigFilter('base64_decode', 'base64_decode'));
+
+		// Filter to enable json decode  (encode already exists)
+		// Usage in twig: {{ aSomeArray|json_decode }}
+		$oTwigEnv->addFilter(
+			new TwigFilter('json_decode', function ($sJsonString, $bAssoc = false) {
+				return json_decode($sJsonString, $bAssoc);
+			})
+		);
+
+		// Filter to add itopversion to an url
+		$oTwigEnv->addFilter(new TwigFilter('add_itop_version', function ($sUrl) {
+			$sUrl = utils::AddParameterToUrl($sUrl, 'itopversion', ITOP_VERSION);
+
+			return $sUrl;
+		}));
+
+		// Filter to add a module's version to an url
+		$oTwigEnv->addFilter(new TwigFilter('add_module_version', function ($sUrl, $sModuleName) {
+			$sModuleVersion = utils::GetCompiledModuleVersion($sModuleName);
+			$sUrl = utils::AddParameterToUrl($sUrl, 'moduleversion', $sModuleVersion);
+
+			return $sUrl;
+		}));
+
+		// Function to check our current environment
+		// Usage in twig:   {% if is_development_environment() %}
+		$oTwigEnv->addFunction(new TwigFunction('is_development_environment', function () {
+			return utils::IsDevelopmentEnvironment();
+		}));
+
+		// Function to get the URL of a static page in a module
+		// Usage in twig: {{ get_static_page_module_url('itop-my-module', 'path-to-my-page') }}
+		$oTwigEnv->addFunction(new TwigFunction('get_static_page_module_url', function ($sModuleName, $sPage) {
+			return utils::GetAbsoluteUrlModulesRoot().$sModuleName.'/'.$sPage;
+		}));
+
+		// Function to get the URL of a php page in a module
+		// Usage in twig: {{ get_page_module_url('itop-my-module', 'path-to-my-my-page.php') }}
+		$oTwigEnv->addFunction(new TwigFunction('get_page_module_url', function ($sModuleName, $sPage) {
+			return utils::GetAbsoluteUrlModulePage($sModuleName, $sPage);
+		}));
+	}
+
+}

application/utils.inc.php

@@ -1493,6 +1493,9 @@ class utils
 				$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
 				$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
 				$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
+				$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
+				$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
+				$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
 
 				$aResult = [
 					new SeparatorPopupMenuItem(),
@@ -2224,6 +2227,87 @@ SQL;
 		return @getimagesizefromstring($sImageData);
 	}
 
+	/**
+	 * Resize an image attachment so that it fits in the given dimensions
+	 * @param ormDocument $oImage The original image stored as an ormDocument
+	 * @param int $iWidth Image's original width
+	 * @param int $iHeight Image's original height
+	 * @param int $iMaxImageWidth Maximum width for the resized image
+	 * @param int $iMaxImageHeight Maximum height for the resized image
+	 * @return ormDocument The resampled image
+	 */
+	public static function ResizeImageToFit(ormDocument $oImage, $iWidth, $iHeight, $iMaxImageWidth, $iMaxImageHeight)
+	{
+		// If image size smaller than maximums, we do nothing
+		if (($iWidth <= $iMaxImageWidth) && ($iHeight <= $iMaxImageHeight)) {
+			return $oImage;
+		}
+
+		// If gd extension is not loaded, we put a warning in the log and return the image as is
+		if (extension_loaded('gd') === false) {
+			IssueLog::Warning('Image could not be resized as the "gd" extension does not seem to be loaded. It will remain as '.$iWidth.'x'.$iHeight.' instead of '.$iMaxImageWidth.'x'.$iMaxImageHeight);
+			return $oImage;
+		}
+
+		switch ($oImage->GetMimeType()) {
+			case 'image/gif':
+			case 'image/jpeg':
+			case 'image/png':
+				$img = @imagecreatefromstring($oImage->GetData());
+				break;
+
+			default:
+				// Unsupported image type, return the image as-is
+				//throw new Exception("Unsupported image type: '".$oImage->GetMimeType()."'. Cannot resize the image, original image will be used.");
+				return $oImage;
+		}
+		if ($img === false) {
+			//throw new Exception("Warning: corrupted image: '".$oImage->GetFileName()." / ".$oImage->GetMimeType()."'. Cannot resize the image, original image will be used.");
+			return $oImage;
+		} else {
+			// Let's scale the image, preserving the transparency for GIFs and PNGs
+
+			$fScale = min($iMaxImageWidth / $iWidth, $iMaxImageHeight / $iHeight);
+
+			$iNewWidth = $iWidth * $fScale;
+			$iNewHeight = $iHeight * $fScale;
+
+			$new = imagecreatetruecolor($iNewWidth, $iNewHeight);
+
+			// Preserve transparency
+			if (($oImage->GetMimeType() == "image/gif") || ($oImage->GetMimeType() == "image/png")) {
+				imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+				imagealphablending($new, false);
+				imagesavealpha($new, true);
+			}
+
+			imagecopyresampled($new, $img, 0, 0, 0, 0, $iNewWidth, $iNewHeight, $iWidth, $iHeight);
+
+			ob_start();
+			switch ($oImage->GetMimeType()) {
+				case 'image/gif':
+					imagegif($new); // send image to output buffer
+					break;
+
+				case 'image/jpeg':
+					imagejpeg($new, null, 80); // null = send image to output buffer, 80 = good quality
+					break;
+
+				case 'image/png':
+					imagepng($new, null, 5); // null = send image to output buffer, 5 = medium compression
+					break;
+			}
+			$oResampledImage = new ormDocument(ob_get_contents(), $oImage->GetMimeType(), $oImage->GetFileName());
+			@ob_end_clean();
+
+			imagedestroy($img);
+			imagedestroy($new);
+
+			return $oResampledImage;
+		}
+
+	}
+
 	/**
 	 * Create a 128 bit UUID in the format: {########-####-####-####-############}
 	 *
@@ -2335,6 +2419,19 @@ SQL;
 		return $bRet;
 	}
 
+	/**
+	 * @param $sPath
+	 *
+	 * @return false|\ormDocument
+	 * @throws \Exception
+	 *
+	 * @deprecated 3.2.1 use utils::GetDocumentFromSelfURL instead
+	 */
+	public static function IsSelfURL($sPath)
+	{
+		return self::GetDocumentFromSelfURL($sPath);
+	}
+
 	/**
 	 * Check if the given URL is a link to download a document/image on the CURRENT iTop
 	 * In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument
@@ -2685,6 +2782,21 @@ TXT
 		return static::$iNextId++;
 	}
 
+	/**
+	 * @param string $sInterface
+	 * @param string $sClassNameFilter
+	 * @param array $aExcludedPath Reg. exp. of the paths to exclude. Note that backslashes (typically for Windows env.) need to be 4 backslashes, 2 for the escaping backslash, 2 for the actual backslash 😅
+	 *
+	 * @return array classes are returned in the same order as the module dependency tree, so core classes on top
+	 * @since 3.0.0
+	 * @deprecated 3.2.0 Use {@see InterfaceDiscovery::FindItopClasses()} instead
+	 */
+	public static function GetClassesForInterface(string $sInterface, string $sClassNameFilter = '', $aExcludedPath = []): array
+	{
+		$oInterfaceDiscoveryService = InterfaceDiscovery::GetInstance();
+		return $oInterfaceDiscoveryService->FindItopClasses($sInterface);
+	}
+
 	/**
 	 * @return array All keyboard shortcuts config as an array
 	 * @throws \CoreException

application/webpage.class.inc.php

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

application/wizardhelper.class.inc.php

@@ -289,6 +289,22 @@ class WizardHelper
 		return $this->m_aData['m_bReturnNotEditableFields'] ?? false;
 	}
 
+	/**
+	 * @return string JS code to be executed for fields update
+	 * @since 3.0.0 N°3198
+	 * @deprecated 3.0.3-2 3.0.4 3.1.1 3.2.0 Use {@see \WizardHelper::AddJsForUpdateFields()} instead
+	 */
+	public function GetJsForUpdateFields()
+	{
+		$sWizardHelperJsVar = (!is_null($this->m_aData['m_sWizHelperJsVarName'])) ? utils::Sanitize($this->m_aData['m_sWizHelperJsVarName'], '', utils::ENUM_SANITIZATION_FILTER_PARAMETER) : 'oWizardHelper'.$this->GetFormPrefix();
+		$sWizardHelperJson = $this->ToJSON();
+
+		return <<<JS
+{$sWizardHelperJsVar}.m_oData = {$sWizardHelperJson};
+{$sWizardHelperJsVar}.UpdateFields();
+JS;
+	}
+
 	/**
 	 * Add necessary JS snippets (to the page) to be executed for fields update
 	 *
@@ -316,4 +332,30 @@ JS
 		);
 
 	}
+
+	/*
+	 * Function with an old pattern of code
+	 * @deprecated 3.1.0
+	*/
+	public static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
+	{
+		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
+		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
+		foreach ($aSet as $aLinkObj) {
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach ($aLinkObj as $sAttCode => $value) {
+				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
+				if (($oAttDef->IsExternalKey()) && ($value != '') && ($value > 0)) {
+					// For external keys: load the target object so that external fields
+					// get filled too
+					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value);
+					$oLink->Set($sAttCode, $oTargetObj);
+				}
+				$oLink->Set($sAttCode, $value);
+			}
+			$oLink->Set($sExtKeyToMe, $oMe->GetKey());
+			$oSet->AddObject($oLink);
+		}
+		return $oSet;
+	}
 }

application/xmlpage.class.inc.php

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

approot.inc.php

@@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/');
  *
  * @see ITOP_CORE_VERSION to get full iTop core version
  */
-define('ITOP_DESIGN_LATEST_VERSION', '3.3');
+define('ITOP_DESIGN_LATEST_VERSION', '3.2');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.3');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.3.0');
+define('ITOP_CORE_VERSION', '3.2.1');
 
 /**
  * @var string

composer.json

@@ -16,33 +16,30 @@
     "firebase/php-jwt": "^6.4.0",
     "guzzlehttp/guzzle": "^7.5.1",
     "league/oauth2-google": "^4.0.1",
-    "nikic/php-parser": "dev-master",
+    "nikic/php-parser": "^4.14.0",
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "^7.2.0",
     "psr/log": "^3.0.0",
     "scssphp/scssphp": "^1.12.1",
-    "soundasleep/html2text": "~2.1",
     "symfony/console": "~6.4.0",
     "symfony/dotenv": "~6.4.0",
-    "symfony/form": "^6.4",
     "symfony/framework-bundle": "~6.4.0",
     "symfony/http-foundation": "~6.4.0",
     "symfony/http-kernel": "~6.4.0",
-    "symfony/mailer": "^6.4",
-    "symfony/security-csrf": "^6.4",
+    "symfony/runtime": "~6.4.0",
     "symfony/twig-bundle": "~6.4.0",
+    "symfony/var-dumper": "~6.4.0",
     "symfony/yaml": "~6.4.0",
+    "symfony/mailer": "~6.4.0",
     "tecnickcom/tcpdf": "^6.6.0",
-    "thenetworg/oauth2-azure": "^2.0"
+    "thenetworg/oauth2-azure": "^2.0",
+    "soundasleep/html2text": "~2.1"
   },
   "require-dev": {
+    "symfony/debug-bundle": "~6.4.0",
     "symfony/stopwatch": "~6.4.0",
     "symfony/web-profiler-bundle": "~6.4.0"
   },
-  "repositories": [{
-    "type": "vcs",
-    "url": "https://github.com/Combodo/PHP-Parser"
-  }],
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
     "ext-openssl": "Can be used as a polyfill if libsodium is not installed",
@@ -62,7 +59,10 @@
     },
     "sort-packages": true,
     "classmap-authoritative": true,
-    "platform-check": true
+    "platform-check": true,
+    "allow-plugins": {
+      "symfony/runtime": true
+    }
   },
   "autoload": {
     "classmap": [
@@ -71,6 +71,7 @@
       "sources"
     ],
     "exclude-from-classmap": [
+      "application/twigextension.class.inc.php",
       "core/oql/build/PHP/",
       "core/apc-emulation.php",
       "application/startup.inc.php",
@@ -90,7 +91,7 @@
   "extra": {
     "symfony": {
       "allow-contrib": false,
-      "require": "6.4.*"
+      "require": "3.4.*"
     },
     "runtime": {
       "dotenv_path": "resources/symfony/.env"

core/action.class.inc.php

@@ -556,7 +556,6 @@ class ActionEmail extends ActionNotification
 			$oLog->Set('trigger_id', $oTrigger->GetKey());
 			$oLog->Set('action_id', $this->GetKey());
 			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
-			$oLog->Set('object_class', get_class($aContextArgs['this->object()']));
 			// Must be inserted now so that it gets a valid id that will make the link
 			// between an eventual asynchronous task (queued) and the log
 			$oLog->DBInsertNoReload();

core/bulkchange.class.inc.php

@@ -474,10 +474,8 @@ class BulkChange
 	protected $m_bLocalizedValues;
 	/** @var array Cache for resolving external keys based on the given search criterias */
 	protected $m_aExtKeysMappingCache;
-	/** @var int number of columns */
-	protected $m_iNbCol;
 
-	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null, $sDateFormat = null, $bLocalize = false, $iNbCol = 0)
+	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null, $sDateFormat = null, $bLocalize = false)
 	{
 		$this->m_sClass = $sClass;
 		$this->m_aData = $aData;
@@ -489,7 +487,6 @@ class BulkChange
 		$this->m_sDateFormat = $sDateFormat;
 		$this->m_bLocalizedValues = $bLocalize;
 		$this->m_aExtKeysMappingCache = [];
-		$this->m_iNbCol = $iNbCol;
 	}
 
 	protected function ResolveExternalKey($aRowData, $sAttCode, &$aResults)
@@ -519,7 +516,7 @@ class BulkChange
 		//$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol) {
 			// The foreign attribute is one of our reconciliation key
-			if (isset($aRowData[$iCol]) && strlen($aRowData[$iCol]) > 0) {
+			if (strlen($aRowData[$iCol]) > 0) {
 				return false;
 			}
 		}
@@ -1090,9 +1087,6 @@ class BulkChange
 				if ($oAttDef instanceof AttributeDateTime) { // AttributeDate is derived from AttributeDateTime
 					foreach ($this->m_aData as $iRow => $aRowData) {
 						$sFormat = $sDateTimeFormat;
-						if (!isset($this->m_aData[$iRow][$iCol])) {
-							continue;
-						}
 						$sValue = $this->m_aData[$iRow][$iCol];
 						if (!empty($sValue)) {
 							if ($oAttDef instanceof AttributeDate) {
@@ -1139,12 +1133,6 @@ class BulkChange
 		try {
 			foreach ($this->m_aData as $iRow => $aRowData) {
 				set_time_limit(intval($iLoopTimeLimit));
-				// Stop if not the good number of cols in $aRowData
-				if ($this->m_iNbCol > 0 && count($aRowData) != $this->m_iNbCol) {
-					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-NbField', count($aRowData), $this->m_iNbCol));
-					continue;
-				}
-
 				if (isset($aResult[$iRow]["__STATUS__"])) {
 					// An issue at the earlier steps - skip the rest
 					continue;
@@ -1252,11 +1240,7 @@ class BulkChange
 		foreach ($this->m_aData as $iRow => $aRowData) {
 			foreach ($this->m_aAttList as $iCol) {
 				if (!array_key_exists($iCol, $aResult[$iRow])) {
-					if (isset($aRowData[$iCol])) {
-						$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
-					} else {
-						$aResult[$iRow][$iCol] = new CellStatus_Issue('', null, Dict::S('UI:CSVReport-Value-Issue-NoValue'));
-					}
+					$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
 				}
 			}
 			foreach ($this->m_aExtKeys as $sAttCode => $aForeignAtts) {
@@ -1266,11 +1250,7 @@ class BulkChange
 				foreach ($aForeignAtts as $sForeignAttCode => $iCol) {
 					if (!array_key_exists($iCol, $aResult[$iRow])) {
 						// The foreign attribute is one of our reconciliation key
-						if (isset($aRowData[$iCol])) {
-							$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
-						} else {
-							$aResult[$iRow][$iCol] = new CellStatus_Issue('', null, 'UI:CSVReport-Value-Issue-NoValue');
-						}
+						$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
 					}
 				}
 			}

core/bulkexport.class.inc.php

@@ -367,6 +367,15 @@ abstract class BulkExport
 		return [];
 	}
 
+	/**
+	 * @deprecated 3.0.0 use GetFormPart instead
+	 */
+	public function DisplayFormPart(WebPage $oP, $sPartId)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetFormPart instead');
+		$oP->AddSubBlock($this->GetFormPart($oP, $sPartId));
+	}
+
 	/**
 	 * @param WebPage $oP
 	 * @param $sPartId
@@ -448,19 +457,19 @@ abstract class BulkExport
 	 */
 	protected function MakeTmpFile($sExtension)
 	{
-		if (!is_dir(utils::GetDataPath()."bulk_export")) {
-			@mkdir(utils::GetDataPath()."bulk_export", 0777, true /* recursive */);
+		if (!is_dir(APPROOT."data/bulk_export")) {
+			@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
 			clearstatcache();
 		}
-		if (!is_writable(utils::GetDataPath()."bulk_export")) {
-			throw new Exception('Data directory "'.utils::GetDataPath().'bulk_export" could not be written.');
+		if (!is_writable(APPROOT."data/bulk_export")) {
+			throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
 		}
 
 		$iNum = rand();
 		do {
 			$iNum++;
 			$sToken = sprintf("%08x", $iNum);
-			$sFileName = utils::GetDataPath()."bulk_export/$sToken.".$sExtension;
+			$sFileName = APPROOT."data/bulk_export/$sToken.".$sExtension;
 			$hFile = @fopen($sFileName, 'x');
 		} while ($hFile === false);
 

core/cmdbobject.class.inc.php

@@ -38,6 +38,7 @@ require_once('kpi.class.inc.php');
 require_once('dict.class.inc.php');
 
 require_once('attributedef.class.inc.php');
+require_once('filterdef.class.inc.php');
 require_once('stimulus.class.inc.php');
 require_once('valuesetdef.class.inc.php');
 require_once('MyHelpers.class.inc.php');
@@ -384,7 +385,58 @@ abstract class CMDBObject extends DBObject
 		}
 	}
 
+	/**
+	 * Helper to ultimately check user rights before writing (Insert, Update or Delete)
+	 * The check should never fail, because the UI should prevent from such a usage
+	 * Anyhow, if the user has found a workaround... the security gets enforced here
+	 *
+	 * @deprecated 3.0.0 N°2591 will be removed in 3.1.0
+	 *
+	 * @param bool $bSkipStrongSecurity
+	 * @param int $iActionCode
+	 *
+	 * @throws \SecurityException
+	 */
+	protected function CheckUserRights($bSkipStrongSecurity, $iActionCode)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		if (is_null($bSkipStrongSecurity)) {
+			// This is temporary
+			// We have implemented this safety net right before releasing iTop 1.0
+			// and we decided that it was too risky to activate it
+			// Anyhow, users willing to have a very strong security could set
+			// skip_strong_security = 0, in the config file
+			$bSkipStrongSecurity = MetaModel::GetConfig()->Get('skip_strong_security');
+		}
+		if (!$bSkipStrongSecurity) {
+			$sClass = get_class($this);
+			$oSet = DBObjectSet::FromObject($this);
+			if (!UserRights::IsActionAllowed($sClass, $iActionCode, $oSet)) {
+				// Intrusion detected
+				throw new SecurityException('You are not allowed to modify objects of class: '.$sClass);
+			}
+		}
+	}
+
 	public function DBClone($newKey = null)
+	{
+		return $this->DBCloneTracked_Internal();
+	}
+
+	/**
+	 * @deprecated 3.1.0 N°5232 N°6966 simply use {@see DBObject::DBClone()} instead, that will automatically create and persist a CMDBChange object.
+	 *     If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before.
+	 */
+	public function DBCloneTracked(CMDBChange $oChange, $newKey = null)
+	{
+		self::SetCurrentChange($oChange);
+		$this->DBCloneTracked_Internal($newKey);
+	}
+
+	/**
+	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
+	 */
+	protected function DBCloneTracked_Internal($newKey = null)
 	{
 		$newKey = parent::DBClone($newKey);
 		$oClone = MetaModel::GetObject(get_class($this), $newKey);
@@ -413,6 +465,16 @@ abstract class CMDBObject extends DBObject
 		return $oDeletionPlan;
 	}
 
+	/**
+	 * @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)
+	{
+		$ret = parent::DBDelete($oDeletionPlan);
+
+		return $ret;
+	}
+
 	public function DBArchive()
 	{
 		// Note: do the job anyway, so as to repair any DB discrepancy

core/cmdbsource.class.inc.php

@@ -41,6 +41,12 @@ class CMDBSource
 	public const ENUM_DB_VENDOR_MARIADB = 'MariaDB';
 	public const ENUM_DB_VENDOR_PERCONA = 'Percona';
 
+	/**
+	 * @since 2.7.10 3.0.4 3.1.2 3.0.2 N°6889 constant creation
+	 * @internal will be removed in a future version
+	 */
+	public const MYSQL_DEFAULT_PORT = 3306;
+
 	/**
 	 * Error: 1205 SQLSTATE: HY000 (ER_LOCK_WAIT_TIMEOUT)
 	 *   Message: Lock wait timeout exceeded; try restarting transaction
@@ -221,29 +227,27 @@ class CMDBSource
 	 * @param string $sServer server variable to update
 	 * @param int|null $iPort port variable to update, will return null if nothing is specified in $sDbHost
 	 *
-	 * @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost.
+	 * @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost. Use {@see MYSQL_DEFAULT_PORT} if needed
 	 *
 	 * @link http://php.net/manual/en/mysqli.persistconns.php documentation for the "p:" prefix (persistent connexion)
 	 */
 	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
 	{
-		if ($sDbHost != null) {
-			$aConnectInfo = explode(':', $sDbHost);
+		$aConnectInfo = explode(':', $sDbHost);
 
-			$bUsePersistentConnection = false;
-			if (strcasecmp($aConnectInfo[0], 'p') === 0) {
-				$bUsePersistentConnection = true;
-				$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
-			} else {
-				$sServer = $aConnectInfo[0];
-			}
+		$bUsePersistentConnection = false;
+		if (strcasecmp($aConnectInfo[0], 'p') === 0) {
+			$bUsePersistentConnection = true;
+			$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
+		} else {
+			$sServer = $aConnectInfo[0];
+		}
 
-			$iConnectInfoCount = count($aConnectInfo);
-			if ($bUsePersistentConnection && ($iConnectInfoCount == 3)) {
-				$iPort = (int)($aConnectInfo[2]);
-			} elseif (!$bUsePersistentConnection && ($iConnectInfoCount == 2)) {
-				$iPort = (int)($aConnectInfo[1]);
-			}
+		$iConnectInfoCount = count($aConnectInfo);
+		if ($bUsePersistentConnection && ($iConnectInfoCount == 3)) {
+			$iPort = (int)($aConnectInfo[2]);
+		} elseif (!$bUsePersistentConnection && ($iConnectInfoCount == 2)) {
+			$iPort = (int)($aConnectInfo[1]);
 		}
 	}
 
@@ -354,6 +358,15 @@ class CMDBSource
 		return static::QueryToScalar('SELECT VERSION()', 0);
 	}
 
+	/**
+	 * @deprecated Use `CMDBSource::GetDBVersion` instead.
+	 * @uses mysqli_get_server_info
+	 */
+	public static function GetServerInfo()
+	{
+		return mysqli_get_server_info(DbConnectionWrapper::GetDbConnection());
+	}
+
 	/**
 	 * Get the DB vendor between MySQL and its main forks
 	 * @return string

core/config.class.inc.php

@@ -20,9 +20,6 @@
  *
  */
 
-use Combodo\iTop\Config\Validator\iTopConfigAstValidator;
-use Combodo\iTop\Config\Validator\iTopConfigSyntaxValidator;
-
 define('ITOP_APPLICATION', 'iTop');
 define('ITOP_APPLICATION_SHORT', 'iTop');
 
@@ -32,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.3.0-dev');
+define('ITOP_VERSION', '3.2.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -310,6 +307,15 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		// Deprecated in 3.0.0  N°2591 Will be removed in 3.1
+		'skip_strong_security' => [
+			'type' => 'bool',
+			'description' => 'Disable strong security - TEMPORARY: this flag should be removed when we are more confident in the recent change in security',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'query_optimization_enabled' => [
 			'type' => 'bool',
 			'description' => 'The queries are optimized based on the assumption that the DB integrity has been preserved. By disabling the optimization one can ensure that the fetched data is clean... but this can be really slower or not usable at all (some queries will exceed the allowed number of joins in MySQL: 61!)',
@@ -1437,14 +1443,6 @@ class Config
 		'quick_create.max_history_results' => [
 			'type' => 'integer',
 			'description' => 'Max. number of elements in the history',
-			'default' => 5,
-			'value' => 5,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'quick_create.max_popular_results' => [
-			'type' => 'integer',
-			'description' => 'Max. number of elements in the popular classes section',
 			'default' => 10,
 			'value' => 10,
 			'source_of_value' => '',
@@ -1796,10 +1794,11 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'http.request.user_agent' => [
+		'application.secret' => [
 			'type'                => 'string',
-			'description'         => 'HTTP request user agent, use this to set a custom agent on external requests.',
-			'default'             => ITOP_APPLICATION.'/'.ITOP_VERSION,
+			'description'         => 'Application secret, uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).',
+			'default'             => '',
+			'value'               => '',
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
@@ -2008,7 +2007,10 @@ class Config
 			$bLoadConfig = false;
 		}
 
-		$this->m_aAddons = [];
+		$this->m_aAddons = [
+			// Default AddOn, always present can be moved to an official iTop Module later if needed
+			'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
+		];
 
 		foreach ($this->m_aSettings as $sPropCode => $aSettingInfo) {
 			$this->m_aSettings[$sPropCode]['value'] = $aSettingInfo['default'];
@@ -2135,11 +2137,18 @@ class Config
 			);
 		}
 
-		if (!array_key_exists('addons', $MyModules) || !array_key_exists('user rights', $MyModules['addons'])) {
-			// Add one, by default
-			$MyModules['addons']['user rights'] = 'addons/userrights/userrightsprofile.class.inc.php';
-			$this->m_aAddons = $MyModules['addons'];
+		if (!array_key_exists('addons', $MyModules)) {
+			throw new ConfigException(
+				'Missing item in configuration file',
+				['file' => $sConfigFile, 'expected' => '$MyModules[\'addons\']']
+			);
 		}
+		if (!array_key_exists('user rights', $MyModules['addons'])) {
+			// Add one, by default
+			$MyModules['addons']['user rights'] = '/addons/userrights/userrightsnull.class.inc.php';
+		}
+
+		$this->m_aAddons = $MyModules['addons'];
 
 		foreach ($MySettings as $sPropCode => $rawvalue) {
 			if ($this->IsProperty($sPropCode)) {
@@ -2177,6 +2186,7 @@ class Config
 		$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
 		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : [];
 		$this->m_iPasswordHashAlgo = isset($MySettings['password_hash_algo']) ? $MySettings['password_hash_algo'] : $this->m_iPasswordHashAlgo;
+		$this->m_sAppSecret = isset($MySettings['application.secret']) ? trim($MySettings['application.secret']) : $this->m_sAppSecret;
 	}
 
 	protected function Verify()
@@ -2234,21 +2244,11 @@ class Config
 		$this->m_aModuleSettings[$sModule][$sProperty] = $value;
 	}
 
-	/**
-	 * @deprecated 3.3.0 N°8190
-	 */
 	public function GetAddons()
 	{
-		if (array_key_exists("user rights", $this->m_aAddons)) {
-			return $this->m_aAddons;
-		} else {
-			return array_merge($this->m_aAddons, ['user rights' => 'addons/userrights/userrightsprofile.class.inc.php']);
-		}
+		return $this->m_aAddons;
 	}
 
-	/**
-	 * @deprecated 3.3.0 N°8190
-	 */
 	public function SetAddons($aAddons)
 	{
 		$this->m_aAddons = $aAddons;
@@ -2492,6 +2492,7 @@ class Config
 		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
 		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
 		$aSettings['password_hash_algo'] = $this->m_iPasswordHashAlgo;
+		$aSettings['application.secret'] = $this->m_sAppSecret;
 
 		foreach ($this->m_aModuleSettings as $sModule => $aProperties) {
 			foreach ($aProperties as $sProperty => $value) {
@@ -2596,6 +2597,7 @@ class Config
 				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,
 				'password_hash_algo' => $this->m_iPasswordHashAlgo,
+				'application.secret' => $this->m_sAppSecret,
 			];
 			foreach ($aOtherValues as $sKey => $value) {
 				$aConfigSettings[$sKey] = [
@@ -2654,6 +2656,12 @@ class Config
 			$aParserValue = $this->oItopConfigParser->GetVarValue('MyModules', 'addons');
 			if ($aParserValue['found']) {
 				fwrite($hFile, "\t'addons' => {$aParserValue['value']},\n");
+			} else {
+				fwrite($hFile, "\t'addons' => array (\n");
+				foreach ($this->m_aAddons as $sKey => $sFile) {
+					fwrite($hFile, "\t\t'$sKey' => '$sFile',\n");
+				}
+				fwrite($hFile, "\t),\n");
 			}
 			fwrite($hFile, ");\n");
 			fwrite($hFile, '?'.'>'); // Avoid perturbing the syntax highlighting !
@@ -2773,8 +2781,17 @@ class Config
 						}
 					}
 				}
-
-				RunTimeEnvironment::CallInstallerHandler($aModuleInfo, "BeforeWritingConfig", [$this]);
+				if (isset($aModuleInfo['installer'])) {
+					$sModuleInstallerClass = $aModuleInfo['installer'];
+					if (!class_exists($sModuleInstallerClass)) {
+						throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not a PHP class - Module: ".$aModuleInfo['label']);
+					}
+					if (!is_subclass_of($sModuleInstallerClass, 'ModuleInstallerAPI')) {
+						throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not derived from 'ModuleInstallerAPI' - Module: ".$aModuleInfo['label']);
+					}
+					$aCallSpec = [$sModuleInstallerClass, 'BeforeWritingConfig'];
+					call_user_func_array($aCallSpec, [$this]);
+				}
 			}
 		}
 		$this->SetAddOns($aAddOns);
@@ -2924,5 +2941,4 @@ class ConfigPlaceholdersResolver
 		IssueLog::Error($sErrorMessage, self::class, [$sSourceName, $sKey, $sDefault, $sWholeMask]);
 		throw new ConfigException($sErrorMessage);
 	}
-
 }

core/coreexception.class.inc.php

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * This file is only here for compatibility reasons.
+ * It will be removed in future iTop versions (N°6533)
+ *
+ * @deprecated 3.0.0 N°3663 Exception classes were moved to `/application/exceptions`, use autoloader instead of require !
+ */
+
+require_once __DIR__.'/../approot.inc.php';
+
+DeprecatedCallsLog::NotifyDeprecatedFile('Classes were moved to /application/exceptions and can be used directly with the autoloader');

core/datamodel.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="lnkActionNotificationToContact" _delta="define">
       <parent>DBObject</parent>
@@ -121,7 +121,7 @@
       </presentation>
       <methods/>
     </class>
-    <class id="ActionNewsroom" _delta="define">
+    <class id="ActionNewsroom"  _delta="define">
       <php_parent>
         <name>ActionNotification</name>
       </php_parent>
@@ -170,7 +170,7 @@
           <display_max_height>96</display_max_height>
           <storage_max_width>256</storage_max_width>
           <storage_max_height>256</storage_max_height>
-          <default_image/>
+          <default_image />
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <sql>priority</sql>
@@ -205,7 +205,7 @@
         </field>
         <field id="url" xsi:type="AttributeString">
           <sql>url</sql>
-          <default_value>$this-&gt;url()$</default_value>
+          <default_value>$this->url()$</default_value>
           <is_null_allowed>false</is_null_allowed>
         </field>
       </fields>
@@ -377,37 +377,21 @@
       }
     }
 
-		try {
-			if ($bIsAsync === true) {
-				AsyncSendNewsroom::AddToQueue($this->GetKey(), $oTrigger->GetKey(), $aRecipientsIds, $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
-			} else {
-				foreach ($aRecipientsIds as $iRecipientId) {
-					$oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this, $iRecipientId, $oTrigger->GetKey(), $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
-					$oEvent->DBInsertNoReload();
-				}
-			}
-		} catch (CoreCannotSaveObjectException $e) {
-			ExceptionLog::LogException($e);
-			foreach($aRecipientsIds as $iRecipientId) {
-				$oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this,
-					$iRecipientId,
-					$oTrigger->GetKey(),
-					Dict::S('Core:EventNotificationNewsroom:ErrorOnDBInsert'),
-					Dict::S('Core:EventNotificationNewsroom:ErrorNotificationNotSent'),
-					$sUrl,
-					$iObjectId,
-					$sObjectClass
-				);
-				$oEvent->DBInsertNoReload();
-			}
-		}
+		if ($bIsAsync === true) {
+		    AsyncSendNewsroom::AddToQueue($this->GetKey(), $oTrigger->GetKey(), $aRecipientsIds, $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
+    } else {
+      foreach ($aRecipientsIds as $iRecipientId) {
+        $oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this, $iRecipientId, $oTrigger->GetKey(), $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
+          $oEvent->DBInsertNoReload();
+      }
+    }
 
 		$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
 	}
 ]]></code>
         </method>
         <method id="GetAsynchronousGlobalSetting">
-          <comment/>
+          <comment></comment>
           <static>true</static>
           <access>public</access>
           <code><![CDATA[
@@ -419,7 +403,7 @@
         </method>
       </methods>
     </class>
-    <class id="EventNotificationNewsroom" _delta="define">
+    <class id="EventNotificationNewsroom"  _delta="define">
       <php_parent>
         <name>EventNotification</name>
       </php_parent>
@@ -443,7 +427,7 @@
         </reconciliation>
         <order>
           <columns>
-            <column id="date" ascending="false"/>
+            <column id="date" ascending="false" />
           </columns>
         </order>
       </properties>
@@ -457,7 +441,7 @@
           <sql>icon</sql>
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
-          <default_image/>
+          <default_image />
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <sql>priority</sql>
@@ -539,14 +523,14 @@
           </items>
         </details>
         <summary>
-          <items>
-            <item id="date">
-              <rank>10</rank>
-            </item>
-            <item id="message">
-              <rank>20</rank>
-            </item>
-          </items>
+        <items>
+          <item id="date">
+            <rank>10</rank>
+          </item>
+          <item id="message">
+            <rank>20</rank>
+          </item>
+        </items>
         </summary>
         <list>
           <items>
@@ -1046,12 +1030,6 @@
           <type>string</type>
           <default/>
         </property>
-        <property id="class_exclusion_list">
-          <php_param>class_exclusion_list</php_param>
-          <mandatory>false</mandatory>
-          <type>string</type>
-          <default/>
-        </property>
         <property id="min_up">
           <php_param>min_up</php_param>
           <mandatory>true</mandatory>

core/dbobject.class.php

@@ -404,9 +404,11 @@ abstract class DBObject implements iDisplay
 	 * This is mostly used after a lazy load (automatically performed by the framework)
 	 * This will erase any pending changes.
 	 *
+	 * @param bool $bAllowAllData @deprecated This parameter is ignored!!
+	 *
 	 * @throws CoreException
 	 */
-	public function Reload()
+	public function Reload($bAllowAllData = false)
 	{
 		assert($this->m_bIsInDB);
 		$this->FireEvent(EVENT_DB_OBJECT_RELOAD);
@@ -1666,9 +1668,9 @@ abstract class DBObject implements iDisplay
 	 * @throws \CoreException
 	 * @since 3.0.0 N°4106 Method should not be overloaded anymore for performances reasons. It will be set final in 3.1.0 (N°4107)
 	 * @since 3.0.0 N°580 New $sType parameter
-	 * @since 3.3.0 N°4107 Should never be overriden
+	 *
 	 */
-	final public function GetName($sType = FriendlyNameType::SHORT)
+	public function GetName($sType = FriendlyNameType::SHORT)
 	{
 		return utils::EscapeHtml($this->GetRawName($sType));
 	}
@@ -4677,7 +4679,7 @@ abstract class DBObject implements iDisplay
 	public function SetElapsedTime($sAttCode, $sRefAttCode, $sWorkingTimeComputer = null)
 	{
 		if (is_null($sWorkingTimeComputer)) {
-			$sWorkingTimeComputer = MetaModel::GetWorkingTime(get_class($this));
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
 		}
 		$oComputer = new $sWorkingTimeComputer();
 		$aCallSpec = [$oComputer, 'GetOpenDuration'];
@@ -5211,6 +5213,27 @@ abstract class DBObject implements iDisplay
 		set_time_limit(intval($iPreviousTimeLimit));
 	}
 
+	/**
+	 * Caching relying on an object set is not efficient since 2.0.3
+	 * Use GetSynchroData instead
+	 *
+	 * Get all the synchro replica related to this object
+	 *
+	 * @internal
+	 * @deprecated
+	 *
+	 * @return DBObjectSet Set with two columns: R=SynchroReplica S=SynchroDataSource
+	 * @throws \OQLException
+	 */
+	public function GetMasterReplica()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
+		$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), [] /* order by*/, ['dest_class' => get_class($this), 'dest_id' => $this->GetKey()]);
+
+		return $oReplicaSet;
+	}
+
 	/**
 	 * Get all the synchro data related to this object
 	 *

core/dbobjectsearch.class.php

@@ -392,17 +392,8 @@ class DBObjectSearch extends DBSearch
 	 */
 	public function AddCondition($sFilterCode, $value, $sOpCode = null, $bParseSearchString = false)
 	{
-		if (MetaModel::IsValidFilterCode($this->GetClass(), $sFilterCode) == false) {
-			/*	$sArrayDesc = if (count($aData) == 0)
-				{
-					$sArrayDesc = "{}";
-				}
-				else
-				{
-					$sArrayDesc = "{".implode(", ", $aData)."}";
-				}*/
-			throw new CoreException("Wrong value for '".$this->GetClass()."', found '$sFilterCode'");// while expecting a value in $sArrayDesc");
-		}
+		MyHelpers::CheckKeyInArray('filter code in class: '.$this->GetClass(), $sFilterCode, MetaModel::GetFilterAttribList($this->GetClass()));
+
 		$oField = new FieldExpression($sFilterCode, $this->GetClassAlias());
 		if (empty($sOpCode)) {
 			if ($sFilterCode == 'id') {
@@ -1261,32 +1252,34 @@ class DBObjectSearch extends DBSearch
 		$this->m_aParams[$sKey] = $value;
 	}
 
-	public function GetQueryParams()
+	public function GetQueryParams($bExcludeMagicParams = true)
 	{
 		$aParams = [];
 		$this->m_oSearchCondition->RenderExpression(false, $aParams, true);
 
-		$aRet = [];
+		if ($bExcludeMagicParams) {
+			$aRet = [];
 
-		// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams()
-		$aNakedMagicArguments = [];
-		foreach (MetaModel::PrepareQueryArguments([], [], $this->GetExpectedArguments()) as $sArgName => $value) {
-			$iPos = strpos($sArgName, '->object()');
-			if ($iPos === false) {
-				$aNakedMagicArguments[$sArgName] = $value;
-			} else {
-				$aNakedMagicArguments[substr($sArgName, 0, $iPos)] = true;
+			// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams($bExclude magic params)
+			$aNakedMagicArguments = [];
+			foreach (MetaModel::PrepareQueryArguments([], [], $this->GetExpectedArguments()) as $sArgName => $value) {
+				$iPos = strpos($sArgName, '->object()');
+				if ($iPos === false) {
+					$aNakedMagicArguments[$sArgName] = $value;
+				} else {
+					$aNakedMagicArguments[substr($sArgName, 0, $iPos)] = true;
+				}
 			}
-		}
-		foreach ($aParams as $sParam => $foo) {
-			$iPos = strpos($sParam, '->');
-			if ($iPos === false) {
-				$sRefName = $sParam;
-			} else {
-				$sRefName = substr($sParam, 0, $iPos);
-			}
-			if (!array_key_exists($sRefName, $aNakedMagicArguments)) {
-				$aRet[$sParam] = $foo;
+			foreach ($aParams as $sParam => $foo) {
+				$iPos = strpos($sParam, '->');
+				if ($iPos === false) {
+					$sRefName = $sParam;
+				} else {
+					$sRefName = substr($sParam, 0, $iPos);
+				}
+				if (!array_key_exists($sRefName, $aNakedMagicArguments)) {
+					$aRet[$sParam] = $foo;
+				}
 			}
 		}
 

core/dbsearch.class.php

@@ -237,6 +237,78 @@ abstract class DBSearch
 	 */
 	abstract public function IsAny();
 
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function Describe()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditionPointTo($sExtKeyAttCode, $aPointingTo)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditionRefBy($sForeignClass, $sForeignExtKeyAttCode)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditionRelTo($aRelInfo)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditions()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function __DescribeHTML()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
 	/**
 	 * @internal
 	 * @return mixed
@@ -454,9 +526,11 @@ abstract class DBSearch
 	/**
 	 * @internal
 	 *
+	 * @param bool $bExcludeMagicParams
+	 *
 	 * @return mixed
 	 */
-	abstract public function GetQueryParams();
+	abstract public function GetQueryParams($bExcludeMagicParams = true);
 
 	/**
 	 * @internal
@@ -952,14 +1026,14 @@ abstract class DBSearch
 				foreach ($oAttDef->GetOrderBySQLExpressions($sAttClassAlias) as $sSQLExpression) {
 					$aOrderSpec[$sSQLExpression] = $bAscending;
 				}
-
-				// Make sure that the columns used for sorting are present in the loaded columns
-				if (!is_null($aAttToLoad) && !isset($aAttToLoad[$sAttClassAlias][$sAttCode])) {
-					$aAttToLoad[$sAttClassAlias][$sAttCode] = MetaModel::GetAttributeDef($sAttClass, $sAttCode);
-				}
 			} else {
 				$aOrderSpec['`'.$sAttClassAlias.$sAttCode.'`'] = $bAscending;
 			}
+
+			// Make sure that the columns used for sorting are present in the loaded columns
+			if (!is_null($aAttToLoad) && !isset($aAttToLoad[$sAttClassAlias][$sAttCode])) {
+				$aAttToLoad[$sAttClassAlias][$sAttCode] = MetaModel::GetAttributeDef($sAttClass, $sAttCode);
+			}
 		}
 
 		$oSQLQuery = $this->GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount);
@@ -1377,13 +1451,13 @@ abstract class DBSearch
 		}
 
 		$sLogFile = 'queries.latest';
-		file_put_contents(utils::GetDataPath().$sLogFile.'.html', $sHtml);
+		file_put_contents(APPROOT.'data/'.$sLogFile.'.html', $sHtml);
 
 		$sLog = "<?php\n\$aQueriesLog = ".var_export(self::$m_aQueriesLog, true).";";
-		file_put_contents(utils::GetDataPath().$sLogFile.'.log', $sLog);
+		file_put_contents(APPROOT.'data/'.$sLogFile.'.log', $sLog);
 
 		// Cumulate the queries
-		$sAllQueries = utils::GetDataPath().'queries.log';
+		$sAllQueries = APPROOT.'data/queries.log';
 		if (file_exists($sAllQueries)) {
 			// Merge the new queries into the existing log
 			include($sAllQueries);
@@ -1518,6 +1592,16 @@ abstract class DBSearch
 		return $this->ToOQL(true);
 	}
 
+	/**
+	 * @return array{\VariableExpression}
+	 *
+	 * @deprecated use DBSearch::GetExpectedArguments() instead
+	 */
+	public function ListParameters(): array
+	{
+		return $this->GetExpectedArguments();
+	}
+
 	/**
 	 * Get parameters from the condition expression(s)
 	 *

core/dbunionsearch.class.php

@@ -435,11 +435,11 @@ class DBUnionSearch extends DBSearch
 		return $aParams;
 	}
 
-	public function GetQueryParams()
+	public function GetQueryParams($bExcludeMagicParams = true)
 	{
 		$aParams = [];
 		foreach ($this->aSearches as $oSearch) {
-			$aParams = array_merge($oSearch->GetQueryParams(), $aParams);
+			$aParams = array_merge($oSearch->GetQueryParams($bExcludeMagicParams), $aParams);
 		}
 		return $aParams;
 	}

core/designdocument.class.inc.php

@@ -71,12 +71,9 @@ class DesignDocument extends DOMDocument
 	}
 
 	/**
-	 * @param string $source
-	 * @param int $options
-	 *
-	 * @return bool|\DOMDocument
+	 * @inheritDoc
 	 */
-	public function loadXML(string $source, int $options = 0): bool|DOMDocument
+	public function loadXML(string $source, int $options = 0): bool
 	{
 		return parent::loadXML($source, $options | LIBXML_BIGLINES);
 	}
@@ -496,8 +493,7 @@ class DesignElement extends \DOMElement
 			if (!$sSearchId) {
 				$sSearchId = $oRefNode->getAttribute('id');
 			}
-			$sQuotedId = DesignDocument::XPathQuote($sSearchId);
-			$sXPath = './'.$oRefNode->tagName."[@id=$sQuotedId]";
+			$sXPath = './'.$oRefNode->tagName."[@id='$sSearchId']";
 
 			$oRes = $oXPath->query($sXPath, $oRoot);
 		} else {

core/displayablegraph.class.inc.php

@@ -1252,6 +1252,32 @@ class DisplayableGraph extends SimpleGraph
 		return $aContextDefs;
 	}
 
+	/**
+	 * Display the graph inside the given page, with the "filter" drawer above it
+	 *
+	 * @deprecated 3.1.1 3.2.0 N°3767 Use \DisplayableGraph::DisplayFilterBox() and \DisplayableGraph::DisplayGraph() instead
+	 *
+	 * @param WebPage $oP
+	 * @param array $aResults
+	 * @param string $sRelation
+	 * @param ApplicationContext $oAppContext
+	 * @param array $aExcludedObjects
+	 * @param string $sObjClass
+	 * @param int $iObjKey
+	 * @param string $sContextKey
+	 * @param array $aContextParams
+	 * @param bool $bLazyLoading since 2.7.7 3.0.1
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 *
+	 */
+	public function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = [], bool $bLazyLoading = false)
+	{
+		$oP->AddSubBlock($this->DisplayFilterBox($oP, $aResults, $bLazyLoading));
+		$this->DisplayGraph($oP, $sRelation, $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams, $bLazyLoading);
+	}
+
 	/**
 	 * Display only the graph inside the given page, with the parameters of filter box draw with DisplayFilterBox
 	 *
@@ -1390,6 +1416,31 @@ EOF
 		);
 	}
 
+	/**
+	 * @param string $sContextKey
+	 * @param array $aContextParams
+	 * @param array $aExcludedObjects
+	 * @param WebPage $oP
+	 * @param array $aResults
+	 * @param bool $bLazyLoading
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \ReflectionException
+	 * @throws \Twig\Error\LoaderError
+	 * @throws \Twig\Error\RuntimeError
+	 * @throws \Twig\Error\SyntaxError
+	 *
+	 * @deprecated 3.1.1 3.2.0 N°3767 Use \DisplayableGraph::DisplayFilterBox() and \DisplayableGraph::GetFilteringData() instead
+	 */
+	public function DisplayFiltering(string $sContextKey, array $aContextParams, array $aExcludedObjects, WebPage $oP, array $aResults, bool $bLazyLoading = false): array
+	{
+		$oP->Add($this->DisplayFilterBox($oP, $aResults, $bLazyLoading));
+
+		return $this->GetFilteringData($sContextKey, $aContextParams, $aExcludedObjects);
+	}
+
 	/**
 	 * @param WebPage $oP
 	 * @param array $aResults