use new method GetOwnerOrganizationAttCode in Attachment

+ test

.doc/README.md

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

.doc/itop-version-history.md

@@ -93,12 +93,6 @@ gitGraph
     checkout support/3.2
     commit id: "2024-06-25" tag: "3.2.0-beta1" type: REVERSE
     commit id: "2024-08-07" tag: "3.2.0"
-    checkout support/2.7
-    commit id: "2025-02-25" tag: "2.7.12"
-    checkout support/3.1
-    commit id: "2025-02-25 " tag: "3.1.3"
-    checkout support/3.2
-    commit id: "2025-02-25  " tag: "3.2.1"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.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
-    }
-  ]
-}

README.md

@@ -90,7 +90,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Dejin, Bie (a.k.a [@bdejin](https://github.com/bdejin))
 - Dvořák, Lukáš
 - Goethals, Stefan
-- Giuva, Vincenzo Katriel (a.k.a [@DarkNight97boss](https://github.com/DarkNight97boss))
 - Gumble, David
 - Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
 - Kaltefleiter, Lars (a.k.a [@larhip](https://www.github.com/larhip))
@@ -107,7 +106,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Raenker, Martin
 - Roháč, Richard (a.k.a [@RohacRichard](https://github.com/RohacRichard))
 - Rosenke, Stephan
-- Rossi, Tommaso (a.k.a [@tomrss](https://www.github.com/tomrss))
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Šafránek, Jaroslav (a.k.a [jkcinik](https://sourceforge.net/u/jkcinik/profile/) on SourceForge)
 - Seki, Shoji
@@ -117,7 +115,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))
 - Tulio, Marco
 - Turrubiates, Miguel
-- Vlk, Karel (a.k.a [@vlk-charles](https://www.github.com/vlk-charles))
 
 ### Aliases
 

addons/userrights/userrightsprofile.class.inc.php

@@ -648,7 +648,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$aConditions =  array();
 
 		// Determine if this class is part of a silo and build the filter for it
-		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
+		$sAttCode = UserRights::GetOwnerOrganizationAttCode($sClass);
 		if (!is_null($sAttCode))
 		{
 			$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
@@ -825,37 +825,48 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		{
 			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
 			// We have to answer NO for objects shared for reading purposes
-			if (self::HasSharing() && SharedObject::GetSharedClassProperties($sClass)) {
-				// This class is shared, GetSelectFilter may allow some objects for read only
-				// But currently we are checking whether the objects might be written...
-				// Let's exclude the objects based on the relevant criteria
+			if (self::HasSharing())
+			{
+				$aClassProps = SharedObject::GetSharedClassProperties($sClass);
+				if ($aClassProps)
+				{
+					// This class is shared, GetSelectFilter may allow some objects for read only
+					// But currently we are checking wether the objects might be written...
+					// Let's exclude the objects based on the relevant criteria
 
-				// Use $oInstanceSet only if sClass is the main class
-				if (!is_a($oInstanceSet->GetClass(), $sClass, true)) {
-					/** @var \DBObjectSet $oInstanceSet */
-					throw new CoreException(__FUNCTION__.': Expecting object set to be of class '.$sClass.' but it is of class '.$oInstanceSet->GetClass(), ['OQL_Query' => $oInstanceSet->GetFilter()->ToOQL(), 'classes' => $oInstanceSet->GetSelectedClasses()]);
-				}
-				$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
-				if (!is_null($sOrgAttCode)) {
-					$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-					if (!is_null($aUserOrgs) && count($aUserOrgs) > 0) {
-						$iCountNO = 0;
-						$iCountYES = 0;
-						$oInstanceSet->Rewind();
-						while ($oObject = $oInstanceSet->Fetch()) {
-							$iOrg = $oObject->Get($sOrgAttCode);
-							if (in_array($iOrg, $aUserOrgs)) {
-								$iCountYES++;
-							} else {
-								$iCountNO++;
+					$sOrgAttCode = UserRights::GetOwnerOrganizationAttCode($sClass);
+					if (!is_null($sOrgAttCode))
+					{
+						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+						if (!is_null($aUserOrgs) && count($aUserOrgs) > 0)
+						{
+							$iCountNO = 0;
+							$iCountYES = 0;
+							$oInstanceSet->Rewind();
+							while($oObject = $oInstanceSet->Fetch())
+							{
+								$iOrg = $oObject->Get($sOrgAttCode);
+								if (in_array($iOrg, $aUserOrgs))
+								{
+									$iCountYES++;
+								}
+								else
+								{
+									$iCountNO++;
+								}
+							}
+							if ($iCountNO == 0)
+							{
+								$iPermission = UR_ALLOWED_YES;
+							}
+							elseif ($iCountYES == 0)
+							{
+								$iPermission = UR_ALLOWED_NO;
+							}
+							else
+							{
+								$iPermission = UR_ALLOWED_DEPENDS;
 							}
-						}
-						if ($iCountNO == 0) {
-							$iPermission = UR_ALLOWED_YES;
-						} elseif ($iCountYES == 0) {
-							$iPermission = UR_ALLOWED_NO;
-						} else {
-							$iPermission = UR_ALLOWED_DEPENDS;
 						}
 					}
 				}
@@ -927,31 +938,11 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 * @param string $sClass
 	 * @return string|null Find out which attribute is corresponding the dimension 'owner org'
 	 *                   returns null if no such attribute has been found (no filtering should occur)
+	 * @deprecated 3.3.0 use @UserRights::GetOwnerOrganizationAttCode instead
 	 */
 	public static function GetOwnerOrganizationAttCode($sClass)
 	{
-		$sAttCode = null;
-
-		$aCallSpec = array($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;
+		return UserRights::GetOwnerOrganizationAttCode($sClass);
 	}
 
 	/**
@@ -971,3 +962,4 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 UserRights::SelectModule('UserRightsProfile');
 
+?>

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

@@ -399,25 +399,25 @@ class URP_ActionGrant extends UserRightsBaseClass
 	{
 		$aParams = array
 		(
-			"category"            => "addon/userrights",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "profileid",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_urp_grant_actions",
-			"db_key_field"        => "id",
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"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", array("targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_SILENT, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category" => "", "more_values" => "", "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => array(), "class_exclusion_list" => null)));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details
@@ -435,25 +435,25 @@ class URP_StimulusGrant extends UserRightsBaseClass
 	{
 		$aParams = array
 		(
-			"category"            => "addon/userrights",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "profileid",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_urp_grant_stimulus",
-			"db_key_field"        => "id",
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"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", array("targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_SILENT, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category" => "", "more_values" => "", "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => array(), "class_exclusion_list" => null)));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details
@@ -778,7 +778,7 @@ exit;
 
 		// Determine how to position the objects of this class
 		//
-		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
+		$sAttCode = UserRights::GetOwnerOrganizationAttCode($sClass);
 		if (is_null($sAttCode))
 		{
 			// No filtering for this object
@@ -909,7 +909,7 @@ exit;
 					// 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);
+					$sOrgAttCode = UserRights::GetOwnerOrganizationAttCode($sClass);
 					if (!is_null($sOrgAttCode))
 					{
 						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
@@ -1015,28 +1015,7 @@ exit;
 	 */	 	
 	public static function GetOwnerOrganizationAttCode($sClass)
 	{
-		$sAttCode = null;
-
-		$aCallSpec = array($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;
+		return UserRights::GetOwnerOrganizationAttCode($sClass);;
 	}
 
 	/**

addons/userrights/userrightsprojection.class.inc.php

@@ -402,7 +402,7 @@ class URP_ClassProjection extends UserRightsBaseClass
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("dimensionid", array("targetclass"=>"URP_Dimensions", "jointype"=> "", "allowed_values"=>null, "sql"=>"dimensionid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("dimension", array("allowed_values"=>null, "extkey_attcode"=> 'dimensionid', "target_attcode"=>"name")));
 
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category" => "", "more_values" => "", "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => array(), "class_exclusion_list" => null)));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
 		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("attribute", array("allowed_values"=>null, "sql"=>"attribute", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
@@ -459,25 +459,25 @@ class URP_ActionGrant extends UserRightsBaseClass
 	{
 		$aParams = array
 		(
-			"category"            => "addon/userrights",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "profileid",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_urp_grant_actions",
-			"db_key_field"        => "id",
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"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", array("targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category" => "", "more_values" => "", "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => array(), "class_exclusion_list" => null)));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details
@@ -495,25 +495,25 @@ class URP_StimulusGrant extends UserRightsBaseClass
 	{
 		$aParams = array
 		(
-			"category"            => "addon/userrights",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "profileid",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_urp_grant_stimulus",
-			"db_key_field"        => "id",
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"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", array("targetclass" => "URP_Profiles", "jointype" => "", "allowed_values" => null, "sql" => "profileid", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values" => null, "extkey_attcode" => 'profileid', "target_attcode" => "name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category" => "", "more_values" => "", "sql" => "class", "default_value" => null, "is_null_allowed" => false, "depends_on" => array(), "class_exclusion_list" => null)));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "permission", "default_value" => "yes", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values" => null, "sql" => "action", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details

application/applicationextension.inc.php

@@ -1711,16 +1711,6 @@ interface iRestServiceProvider
 	public function ExecOperation($sVersion, $sVerb, $aParams);
 }
 
-/**
- * A REST service provider implementing this interface will have its input JSON data sanitized for logging purposes
- * @since 2.7.13, 3.2.1-1
- * @see \iRestServiceProvider
- */
-interface iRestInputSanitizer
-{
-	public function SanitizeJsonInput(string $sJsonInput): string;
-}
-
 /**
  * Minimal REST response structure. Derive this structure to add response data and error codes.
  *
@@ -1812,14 +1802,6 @@ class RestResult
 	 * @api
 	 */
 	public $message;
-	
-	/**
-	 * Sanitize the content of this result to hide sensitive information
-	 */
-	public function SanitizeContent()
-	{
-		// The default implementation does nothing
-	}
 }
 
 /**
@@ -1929,76 +1911,41 @@ class RestUtils
 	 * @return array of class => list of attributes (see RestResultWithObjects::AddObject that uses it)
 	 * @throws Exception
 	 */
-	public static function GetFieldList($sClass, $oData, $sParamName, $bFailIfNotFound = true)
+	public static function GetFieldList($sClass, $oData, $sParamName)
 	{
 		$sFields = self::GetOptionalParam($oData, $sParamName, '*');
-		return match($sFields) {
-			'*' => self::GetFieldListForClass($sClass),
-			'*+' => self::GetFieldListForParentClass($sClass),
-			default => self::GetLimitedFieldListForClass($sClass, $sFields, $sParamName, $bFailIfNotFound),
-		};
-	}
-
-	public static function HasRequestedExtendedOutput(string $sFields): bool
-	{
-		return match($sFields) {
-			'*' => false,
-			'*+' => true,
-			default => substr_count($sFields, ':') > 1,
-		};
-	}
-
-	public static function HasRequestedAllOutputFields(string $sFields): bool
-	{
-		return match($sFields) {
-			'*', '*+' => true,
-			default => false,
-		};
-	}
-
-	protected static function GetFieldListForClass(string $sClass): array
-	{
-		return [$sClass => array_keys(MetaModel::ListAttributeDefs($sClass))];
-	}
-
-	protected static function GetFieldListForParentClass(string $sClass): array
-	{
-		$aFieldList = array();
-		foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass) {
-			$aFieldList = array_merge($aFieldList, self::GetFieldListForClass($sRefClass));
+		$aShowFields = array();
+		if ($sFields == '*')
+		{
+			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+			{
+				$aShowFields[$sClass][] = $sAttCode;
+			}
 		}
-		return $aFieldList;
-	}
-
-	protected static function GetLimitedFieldListForSingleClass(string $sClass, string $sFields, string $sParamName, bool $bFailIfNotFound = true): array
-	{
-		$aFieldList = [$sClass => []];
-		foreach (explode(',', $sFields) as $sAttCode) {
-			$sAttCode = trim($sAttCode);
-			if (($sAttCode == 'id') || (MetaModel::IsValidAttCode($sClass, $sAttCode))) {
-				$aFieldList[$sClass][] = $sAttCode;
-			} else {
-				if ($bFailIfNotFound) {
-					throw new Exception("$sParamName: invalid attribute code '$sAttCode' for class '$sClass'");
+		elseif ($sFields == '*+')
+		{
+			foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass)
+			{
+				foreach (MetaModel::ListAttributeDefs($sRefClass) as $sAttCode => $oAttDef)
+				{
+					$aShowFields[$sRefClass][] = $sAttCode;
 				}
 			}
 		}
-		return $aFieldList;
-	}
-
-	protected static function GetLimitedFieldListForClass(string $sClass, string $sFields, string $sParamName, bool $bFailIfNotFound = true): array
-	{
-		if (!str_contains($sFields, ':')) {
-			return self::GetLimitedFieldListForSingleClass($sClass, $sFields, $sParamName, $bFailIfNotFound);
+		else
+		{
+			foreach (explode(',', $sFields) as $sAttCode)
+			{
+				$sAttCode = trim($sAttCode);
+				if (($sAttCode != 'id') && (!MetaModel::IsValidAttCode($sClass, $sAttCode)))
+				{
+					throw new Exception("$sParamName: invalid attribute code '$sAttCode'");
+				}
+				$aShowFields[$sClass][] = $sAttCode;
+			}
 		}
 
-		$aFieldList = [];
-		$aFieldListParts = explode(';', $sFields);
-		foreach ($aFieldListParts as $sClassFields) {
-			list($sSubClass, $sSubClassFields) = explode(':', $sClassFields);
-			$aFieldList = array_merge($aFieldList, self::GetLimitedFieldListForSingleClass(trim($sSubClass), trim($sSubClassFields), $sParamName, $bFailIfNotFound));
-		}
-		return $aFieldList;
+		return $aShowFields;
 	}
 
 	/**

application/cmdbabstract.class.inc.php

@@ -698,10 +698,10 @@ HTML
 			$sLinkedClass = $oAttDef->GetLinkedClass();
 
 			// Filter out links pointing to obsolete objects (if relevant)
-            $oOrmLinkSet = $this->Get($sAttCode);
-            $oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
-            $iCount = $oLinkSet->Count();
+			$oOrmLinkSet = $this->Get($sAttCode);
+			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
 
+			$iCount = $oLinkSet->Count();
 			if ($this->IsNew()) {
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
 			} else {
@@ -766,9 +766,9 @@ HTML
 				$oPage->add($sHTMLValue);
 			} else {
 				if ($oAttDef->IsIndirect()) {
-					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly, $iCount);
+					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				} else {
-					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly, $iCount);
+					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				}
 				$oPage->AddUiBlock($oBlockLinkSetViewTable);
 			}
@@ -805,16 +805,16 @@ HTML
 		if (!$this->IsNew()) {
 			// Look for any trigger that considers this object as "In Scope"
 			// If any trigger has been found then display a tab with notifications
-			// If all triggers on an object have been deleted, we consider that we no longer need the event notification information
+			//
 			$aTriggers = $this->GetRelatedTriggersIDs();
 			if (count($aTriggers) > 0) {
 				$iId = $this->GetKey();
-				$aParams = array('class' => get_class($this), 'id' => $iId);
+				$aParams = array('triggers' => $aTriggers, 'id' => $iId);
 				$aNotifSearches = array();
 				$iNotifsCount = 0;
 				$aNotificationClasses = MetaModel::EnumChildClasses('EventNotification');
 				foreach ($aNotificationClasses as $sNotifClass) {
-					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev WHERE Ev.object_id = :id AND Ev.object_class = :class");
+					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev JOIN Trigger AS T ON Ev.trigger_id = T.id WHERE T.id IN (:triggers) AND Ev.object_id = :id");
 					$aNotifSearches[$sNotifClass]->SetInternalParams($aParams);
 					$oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], array());
 					$iNotifsCount += $oNotifSet->Count();
@@ -1113,10 +1113,8 @@ HTML
 		}
 
 		// Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage.
-		/** @var \iTopWebPage $oPage */
-		$oKPI = new ExecutionKPI();
+		/** @var iTopWebPage $oPage */
 		$aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareHeader');
 		if (false === empty($aHeadersBlocks['subtitle'])) {
 			$oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']);
 		}
@@ -1129,12 +1127,8 @@ HTML
 		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB, '', $oObjectDetails);
 		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
 		$oPage->SetCurrentTab('UI:PropertiesTab');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareProperties($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareProperties');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareRelations($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareRelations');
 
 
 		// Note: Adding the JS snippet which enables the image upload should have been done directly by the ActivityPanel which would have kept the independance principle
@@ -3445,18 +3439,8 @@ EOF
 					}
 					$sInputType = '';
 					$sInputId   = 'att_'.$iFieldIndex;
-					$value = $this->Get($sAttCode);
-					$sDisplayValue = $this->GetEditValue($sAttCode);
-					if ($oAttDef instanceof AttributeDateTime && !$oAttDef->IsNullAllowed() && $value === $oAttDef->GetNullValue()) {
-						$value = $oAttDef->GetDefaultValue($this);
-						if ($value !== $oAttDef->GetNullValue()) {
-							// Set default date
-							$this->Set($sAttCode, $value);
-							$sDisplayValue = $this->GetEditValue($sAttCode);
-						}
-					}
 					$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
-						$value, $sDisplayValue, $sInputId, '', $iExpectCode,
+						$this->Get($sAttCode), $this->GetEditValue($sAttCode), $sInputId, '', $iExpectCode,
 						$aArgs, true, $sInputType);
 					$aAttrib    = array(
 						'label' => '<span>'.$oAttDef->GetLabel().'</span>',
@@ -5206,7 +5190,7 @@ HTML
 							$aKeys = array_keys($aValues[$sAttCode]);
 							$currValue = $aKeys[0]; // The only value is the first key
 							if ($oAttDef->GetEditClass() == 'LinkedSet') {
-                                $oOrmLinkSet = $oDummyObj->Get($sAttCode);
+								$oOrmLinkSet = $oDummyObj->Get($sAttCode);
 								LinkSetDataTransformer::StringToOrmLinkSet($aValues[$sAttCode][$currValue]['edit_value'], $oOrmLinkSet);
 
 							} else {
@@ -5260,7 +5244,7 @@ HTML
 								}
 								$oDummyObj->Set($sAttCode, $oTagSet);
 							} else if ($oAttDef->GetEditClass() == 'LinkedSet') {
-                                $oOrmLinkSet = $oDummyObj->Get($sAttCode);
+								$oOrmLinkSet = $oDummyObj->Get($sAttCode);
 								foreach ($aMultiValues as $key => $sValue) {
 									LinkSetDataTransformer::StringToOrmLinkSet($sValue['edit_value'], $oOrmLinkSet);
 								}
@@ -5939,14 +5923,14 @@ JS
 	 *
 	 * @since 3.1.0
 	 */
-	final protected function FireEventCheckToWrite(?string $sStimulusBeingApplied): void
+	final protected function FireEventCheckToWrite(): void
 	{
-		$this->FireEvent(EVENT_DB_CHECK_TO_WRITE, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_CHECK_TO_WRITE, ['is_new' => $this->IsNew()]);
 	}
 
-	final protected function FireEventBeforeWrite(?string $sStimulusBeingApplied)
+	final protected function FireEventBeforeWrite()
 	{
-		$this->FireEvent(EVENT_DB_BEFORE_WRITE, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_BEFORE_WRITE, ['is_new' => $this->IsNew()]);
 	}
 
 	/**
@@ -5958,11 +5942,11 @@ JS
 	 * @throws \CoreException
 	 * @since 3.1.0
 	 */
-	final protected function FireEventAfterWrite(array $aChanges, bool $bIsNew, ?string $sStimulusBeingApplied): void
+	final protected function FireEventAfterWrite(array $aChanges, bool $bIsNew): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
 		$this->RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
-		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges, 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges]);
 	}
 
 	//////////////
@@ -6103,9 +6087,7 @@ JS
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
 		$oObject = MetaModel::GetObject($sClass, $sId, false);
-		if (!is_null($oObject)) {
-			self::FireEventDbLinksChangedForObject($oObject);
-		}
+		self::FireEventDbLinksChangedForObject($oObject);
 		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 	}
 
@@ -6113,11 +6095,13 @@ JS
 	{
 		self::SetEventDBLinksChangedBlocked(true);
 		// N°6408 The object can have been deleted
-		$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
+		if (!is_null($oObject)) {
+			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
 
-		// Update the object if needed
-		if (count($oObject->ListChanges()) !== 0) {
-			$oObject->DBUpdate();
+			// Update the object if needed
+			if (count($oObject->ListChanges()) !== 0) {
+				$oObject->DBUpdate();
+			}
 		}
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
 	}
@@ -6195,9 +6179,9 @@ JS
 	 * @inheritDoc
 	 * @throws \CoreException
 	 */
-	final protected function FireEventComputeValues(?string $sStimulusBeingApplied): void
+	final protected function FireEventComputeValues(): void
 	{
-		$this->FireEvent(EVENT_DB_COMPUTE_VALUES, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_COMPUTE_VALUES);
 	}
 
 	/**

application/dashboard.class.inc.php

@@ -296,21 +296,21 @@ abstract class Dashboard
 	public function FromParams($aParams)
 	{
 		$this->sLayoutClass = $aParams['layout_class'];
-		if (!is_subclass_of($this->sLayoutClass,DashboardLayout::class)) {
-			throw new InvalidParameterException('Invalid parameter layout_class "'.$aParams['layout_class'].'"');
-		}
 		$this->sTitle = $aParams['title'];
 		$this->bAutoReload = $aParams['auto_reload'] == 'true';
 		$this->iAutoReloadSec = max(MetaModel::GetConfig()->Get('min_reload_interval'), (int) $aParams['auto_reload_sec']);
 		
-		foreach($aParams['cells'] as $aCell) {
+		foreach($aParams['cells'] as $aCell)
+		{
 			$aCellDashlets = array();
-			foreach($aCell as $aDashletParams) {
+			foreach($aCell as $aDashletParams)
+			{
 				$sDashletClass = $aDashletParams['dashlet_class'];
 				$sId = $aDashletParams['dashlet_id'];
 				/** @var \Dashlet $oNewDashlet */
 				$oNewDashlet = new $sDashletClass($this->oMetaModel, $sId);
-				if (isset($aDashletParams['dashlet_type'])) {
+				if (isset($aDashletParams['dashlet_type']))
+				{
 					$oNewDashlet->SetDashletType($aDashletParams['dashlet_type']);
 				}
 				$oForm = $oNewDashlet->GetForm();
@@ -1266,12 +1266,13 @@ EOF
 		$sOkButtonLabel = Dict::S('UI:Button:Save');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		
-		$sId = json_encode($this->sId);
-		$sLayoutClass = json_encode($this->sLayoutClass);
+		$sId = utils::HtmlEntities($this->sId);
+		$sLayoutClass = utils::HtmlEntities($this->sLayoutClass);
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
-		$sTitle = json_encode($this->sTitle);
-		$sFile = json_encode($this->GetDefinitionFile());
+		$sTitle = utils::HtmlEntities($this->sTitle);
+		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
+		$sFileForJS = json_encode($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
 		$sReloadURL = $this->GetReloadURL();
 
@@ -1327,15 +1328,15 @@ $('#dashboard_editor').dialog({
 });
 
 $('#dashboard_editor .ui-layout-center').runtimedashboard({
-	dashboard_id: $sId, 
-	layout_class: $sLayoutClass, 
-	title: $sTitle,
+	dashboard_id: '$sId', 
+	layout_class: '$sLayoutClass', 
+	title: '$sTitle',
 	auto_reload: $sAutoReload, 
 	auto_reload_sec: $sAutoReloadSec,
 	submit_to: '$sUrl', 
-	submit_parameters: {operation: 'save_dashboard', file: $sFile, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	submit_parameters: {operation: 'save_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	render_to: '$sUrl', 
-	render_parameters: {operation: 'render_dashboard', file: $sFile, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	render_parameters: {operation: 'render_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	new_dashlet_parameters: {operation: 'new_dashlet'}
 });
 

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>
@@ -238,10 +238,6 @@ The object can be modified.]]></description>
           <description>Creation flag</description>
           <type>boolean</type>
         </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -267,10 +263,6 @@ Call $this->AddCheckWarning($sWarningMessage) to display a warning.
           <description>Creation flag</description>
           <type>boolean</type>
         </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -298,10 +290,6 @@ The modifications can be propagated to other objects.]]></description>
           <description><![CDATA[For updates, the list of changes done during this operation]]></description>
           <type>array</type>
         </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>
@@ -432,14 +420,6 @@ The only action allowed is to deny transitions with $this->DenyTransition($sTran
           <description>The object inserted</description>
           <type>DBObject</type>
         </event_datum>
-        <event_datum id="is_new">
-          <description>Creation flag</description>
-          <type>boolean</type>
-        </event_datum>
-        <event_datum id="stimulus_applied">
-          <description>Life cycle stimulus applied (null if not within a transition)</description>
-          <type>string</type>
-        </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
           <type>string</type>

application/displayblock.class.inc.php

@@ -263,8 +263,6 @@ class DisplayBlock
 				/** param for export.php */
 				'refresh_action',
 				/**to add refresh button in datatable*/
-				'object_count',
-				/** int number of objects in list */
 			], DataTableUIBlockFactory::GetAllowedParams()),
 			static::ENUM_STYLE_LIST_SEARCH => array_merge([
 				'update_history',
@@ -1862,11 +1860,7 @@ class MenuBlock extends DisplayBlock
 		$aSelectedClasses = $this->GetFilter()->GetSelectedClasses();
 		$bIsForLinkset = isset($aExtraParams['target_attr']);
 		$oSet = new CMDBObjectSet($this->GetFilter());
-		if(isset($aExtraParams['object_count'])){
-			$iSetCount = $aExtraParams['object_count'];
-		} else {
-			$iSetCount = $oSet->Count();
-		}
+		$iSetCount = $oSet->Count();
 		/** @var string $sRefreshAction JS snippet to run when clicking on the refresh button of the menu */
 		$sRefreshAction = $aExtraParams['refresh_action'] ?? '';
 		$bIsCreationInModal = isset($aExtraParams['creation_in_modal']) && $aExtraParams['creation_in_modal'] === true;
@@ -2030,8 +2024,8 @@ class MenuBlock extends DisplayBlock
 					$sSelectedClassName = MetaModel::GetName($sSelectedClass);
 
 					// Check rights on class
-					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
-					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE);
+					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY, $oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE, $sSelectedClass);
 
 					// Refine filter on selected class so bullk actions occur on the right class
 					$oSelectedClassFilter = $this->GetFilter()->DeepClone();

application/excelexporter.class.inc.php

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

application/iotask.class.inc.php

@@ -36,30 +36,29 @@ class InputOutputTask extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"            => "application",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "name",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_iotask",
-			"db_key_field"        => "id",
+			"category" => "application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_iotask",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values" => new ValueSetEnum('Input, Ouput'), "sql" => "category", "default_value" => "Input", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values" => new ValueSetEnum('File, Database, Web Service'), "sql" => "source_type", "default_value" => "File", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype",
-			array("allowed_values" => new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql" => "source_subtype", "default_value" => "CSV", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values" => null, "sql" => "source_path", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category" => "", "more_values" => "", "sql" => "objects_class", "default_value" => null, "is_null_allowed" => true, "depends_on" => array(), "class_exclusion_list" => null)));
-		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "test_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values" => new ValueSetEnum('Yes,No'), "sql" => "verbose_mode", "default_value" => 'No', "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values" => new ValueSetEnum('Full, Update Only, Creation Only'), "sql" => "options", "default_value" => 'Full', "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values"=>new ValueSetEnum('Input, Ouput'), "sql"=>"category", "default_value"=>"Input", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values"=>new ValueSetEnum('File, Database, Web Service'), "sql"=>"source_type", "default_value"=>"File", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype", array("allowed_values"=>new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql"=>"source_subtype", "default_value"=>"CSV", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values"=>null, "sql"=>"source_path", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category"=>"", "more_values"=>"", "sql"=>"objects_class", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"test_mode", "default_value"=>'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"verbose_mode", "default_value" => 'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values"=>new ValueSetEnum('Full, Update Only, Creation Only'), "sql"=>"options", "default_value"=> 'Full', "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path', 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form

application/menunode.class.inc.php

@@ -1159,11 +1159,11 @@ class OQLMenuNode extends MenuNode
 	{
 		$sUsageId = utils::GetSafeId($sUsageId);
 		$oSearch = DBObjectSearch::FromOQL($sOql);
-		$sClass= $oSearch->GetClass();
+		$sClass= 	$oSearch->GetClass();
 		$sIcon = MetaModel::GetClassIcon($sClass, false);
 		if ($bSearchPane) {
 			$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams);
-			$oBlock = new DisplayBlock($oSearch, DisplayBlock::ENUM_STYLE_SEARCH, false /* Asynchronous */, $aParams);
+			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
 			$oPage->add("<div class='sf_results_area ibo-add-margin-top-250' data-target='search_results'>");
 		}

application/transaction.class.inc.php

@@ -228,7 +228,7 @@ class privUITransactionFile
 	 */
 	public static function GetNewTransactionId()
 	{
-		if (!is_dir(utils::GetDataPath().'transactions'))
+		if (!is_dir(APPROOT.'data/transactions'))
 		{
 			if (!is_writable(APPROOT.'data'))
 			{
@@ -236,22 +236,22 @@ class privUITransactionFile
 			}
 			// 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))
+			if (!mkdir($concurrentDirectory = APPROOT.'data/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.');
+				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'))
+		if (!is_writable(APPROOT.'data/transactions'))
 		{
-			throw new Exception('The directory "'.utils::GetDataPath().'transactions" must be writable to the application.');
+			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);
@@ -274,8 +274,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)))
 		{
@@ -348,7 +348,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)
 		{
@@ -368,7 +368,7 @@ class privUITransactionFile
 	{
 		clearstatcache();
 		$aResult = array();
-		$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/user.preferences.class.inc.php

@@ -249,9 +249,9 @@ class appUserPreferences extends DBObject
 		(
 			"category" => "gui",
 			"key_type" => "autoincrement",
-			"name_attcode" => "login",
+			"name_attcode" => "userid",
 			"state_attcode" => "",
-			"reconc_keys" => array("userid","login"),
+			"reconc_keys" => array("userid"),
 			"db_table" => "priv_app_preferences",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -260,10 +260,8 @@ class appUserPreferences extends DBObject
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributePropertySet("preferences", array("allowed_values"=>null, "sql"=>"preferences", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("org_id", array("allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "org_id")));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login")));
-		MetaModel::Init_SetZListItems('list', array('org_id','preferences'));
-		MetaModel::Init_SetZListItems('default_search', array('userid','login','org_id'));
+		MetaModel::Init_SetZListItems('list', array('preferences',));
+		MetaModel::Init_SetZListItems('default_search', array('userid'));
 	}
 
 	/**

application/utils.inc.php

@@ -180,7 +180,6 @@ class utils
 	 */
 	private static $sAbsoluteUrlAppRootCache = null;
 
-
 	protected static function LoadParamFile($sParamFile)
 	{
 		if (!file_exists($sParamFile)) {
@@ -419,26 +418,11 @@ class utils
 	 * @since 2.7.7, 3.0.2, 3.1.0 N°4899 - new 'url' filter
 	 * @since 2.7.10 N°6606 use the utils::ENUM_SANITIZATION_* const
 	 * @since 2.7.10 N°6606 new case for ENUM_SANITIZATION_FILTER_PHP_CLASS
-	 * @since 3.2.1-1 N°8242 Allow value to be an array for every filter
 	 *
 	 * @link https://www.php.net/manual/en/filter.filters.sanitize.php PHP sanitization filters
 	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
-		if (is_array($value))
-		{
-			$retValue = array();
-			foreach ($value as $key => $val)
-			{
-				$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
-				if ($retValue[$key] === false)
-				{
-					return false;
-				}
-			}
-			return $retValue;
-		}
-
 		switch ($sSanitizationFilter)
 		{
 			case static::ENUM_SANITIZATION_FILTER_INTEGER:
@@ -469,36 +453,52 @@ class utils
 			case static::ENUM_SANITIZATION_FILTER_PARAMETER:
 			case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
 			case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
-				switch ($sSanitizationFilter)
+				if (is_array($value))
 				{
-					case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
-						// Same as parameter type but keep the dot character
-						// transaction_id, the dot is mostly for Windows servers when using file storage as the tokens are named *.tmp
-						// - See N°1835
-						// - Note: It must be included at the regexp beginning otherwise you'll get an invalid character error
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
-						break;
+					$retValue = array();
+					foreach ($value as $key => $val)
+					{
+						$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
+						if ($retValue[$key] === false)
+						{
+							$retValue = false;
+							break;
+						}
+					}
+				}
+				else
+				{
+					switch ($sSanitizationFilter)
+					{
+						case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
+							// Same as parameter type but keep the dot character
+							// transaction_id, the dot is mostly for Windows servers when using file storage as the tokens are named *.tmp
+							// - See N°1835
+							// - Note: It must be included at the regexp beginning otherwise you'll get an invalid character error
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_ROUTE:
-					case static::ENUM_SANITIZATION_FILTER_OPERATION:
-						// - Routes should be of the "controller_namespace_code.controller_method_name" form
-						// - Operations should be allowed to be namespaced as well even though then don't have dedicated controller yet
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\.A-Za-z0-9_-]*$/')));
-						break;
+						case static::ENUM_SANITIZATION_FILTER_ROUTE:
+						case static::ENUM_SANITIZATION_FILTER_OPERATION:
+							// - Routes should be of the "controller_namespace_code.controller_method_name" form
+							// - Operations should be allowed to be namespaced as well even though then don't have dedicated controller yet
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\.A-Za-z0-9_-]*$/')));
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_PARAMETER:
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
-						// Characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
-						break;
+						case static::ENUM_SANITIZATION_FILTER_PARAMETER:
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
+							// Characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
-						break;
+						case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
-						break;
+						case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
+							break;
 
+					}
 				}
 				break;
 
@@ -1451,12 +1451,9 @@ class utils
 	 * @return string A path to a folder into which any module can store cache data
 	 * The corresponding folder is created or cleaned upon code compilation
 	 */
-	public static function GetCachePath(string $sEnvironment = null): string
+	public static function GetCachePath()
 	{
-		if (is_null($sEnvironment)) {
-			$sEnvironment = MetaModel::GetEnvironment();
-		}
-		return static::GetDataPath()."cache-$sEnvironment/";
+		return static::GetDataPath().'cache-'.MetaModel::GetEnvironment().'/';
 	}
 
 	/**
@@ -1947,7 +1944,7 @@ SQL;
 			CURLOPT_HEADER         => false,    // don't return the headers in the output
 			CURLOPT_FOLLOWLOCATION => true,     // follow redirects
 			CURLOPT_ENCODING       => "",       // handle all encodings
-			CURLOPT_USERAGENT      => static::GetConfig()->Get('http.request.user_agent'), // who am i
+			CURLOPT_USERAGENT      => "spider", // who am i
 			CURLOPT_AUTOREFERER    => true,     // set referer on redirect
 			CURLOPT_CONNECTTIMEOUT => 120,      // timeout on connect
 			CURLOPT_TIMEOUT        => 120,      // timeout on response
@@ -2393,75 +2390,53 @@ 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
-	 *
-	 * @Since 3.2.1 a local URL is transformed into a local file to read
-	 *
 	 * @param string $sPath
 	 * @return false|ormDocument
 	 * @throws Exception
 	 */
-	public static function GetDocumentFromSelfURL(string $sPath)
+	public static function IsSelfURL($sPath)
 	{
+		$result = false;
 		$sPageUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.document.php';
-		if (utils::StartsWith($sPath, $sPageUrl)) {
+		if (substr($sPath, 0, strlen($sPageUrl)) == $sPageUrl)
+		{
 			// If the URL is an URL pointing to this instance of iTop, then
 			// extract the "query" part of the URL and analyze it
 			$sQuery = parse_url($sPath, PHP_URL_QUERY);
-			if ($sQuery !== null) {
+			if ($sQuery !== null)
+			{
 				$aParams = array();
-				foreach (explode('&', $sQuery) as $sChunk) {
+				foreach(explode('&', $sQuery) as $sChunk)
+				{
 					$aParts = explode('=', $sChunk ?? '');
-					if (count($aParts) != 2) {
-						continue;
-					}
+					if (count($aParts) != 2) continue;
 					$aParams[$aParts[0]] = urldecode($aParts[1]);
 				}
 				$result = array_key_exists('operation', $aParams) && array_key_exists('class', $aParams) && array_key_exists('id', $aParams) && array_key_exists('field', $aParams) && ($aParams['operation'] == 'download_document');
-				if ($result) {
+				if ($result)
+				{
 					// This is a 'download_document' operation, let's retrieve the document directly from the database
 					$sClass = $aParams['class'];
 					$iKey = $aParams['id'];
 					$sAttCode = $aParams['field'];
 
 					$oObj = MetaModel::GetObject($sClass, $iKey, false /* must exist */); // Users rights apply here !!
-					if ($oObj) {
+					if ($oObj)
+					{
 						/**
 						 * @var ormDocument $result
 						 */
-						return clone $oObj->Get($sAttCode);
+						$result = clone $oObj->Get($sAttCode);
+						return $result;
 					}
 				}
 			}
 			throw new Exception('Invalid URL. This iTop URL is not pointing to a valid Document/Image.');
 		}
-
-		if (utils::StartsWith($sPath, utils::GetAbsoluteUrlAppRoot())) {
-			$sFilePath = utils::LocalPath(APPROOT.substr($sPath, strlen(utils::GetAbsoluteUrlAppRoot())));
-			if (false === $sFilePath) {
-				return false;
-			}
-
-			$sFilePath = APPROOT.$sFilePath;
-			return ormDocument::FromFile($sFilePath);
-		}
-
-		return false;
+		return $result;
 	}
 
 	/**
@@ -2469,28 +2444,68 @@ SQL;
 	 * - an URL pointing to a blob (image/document) on the current iTop server
 	 * - an http(s) URL
 	 * - the local file system (but only if you are an administrator)
-	 *
-	 * @param string|null $sPath
+	 * @param string $sPath
 	 * @return ormDocument|null
 	 * @throws Exception
 	 */
 	public static function FileGetContentsAndMIMEType($sPath)
 	{
-		if (utils::IsNullOrEmptyString($sPath)) {
+		$oUploadedDoc = null;
+		$aKnownExtensions = array(
+				'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+				'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+				'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+				'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+				'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+				'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+				'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+				'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+				'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+				'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+				'jpg' => 'image/jpeg',
+				'jpeg' => 'image/jpeg',
+				'gif' => 'image/gif',
+				'png' => 'image/png',
+				'pdf' => 'application/pdf',
+				'doc' => 'application/msword',
+				'dot' => 'application/msword',
+				'xls' => 'application/vnd.ms-excel',
+			'ppt' => 'application/vnd.ms-powerpoint',
+			'vsd' => 'application/x-visio',
+			'vdx' => 'application/visio.drawing',
+			'odt' => 'application/vnd.oasis.opendocument.text',
+			'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+			'odp' => 'application/vnd.oasis.opendocument.presentation',
+			'zip' => 'application/zip',
+			'txt' => 'text/plain',
+			'htm' => 'text/html',
+			'html' => 'text/html',
+			'exe' => 'application/octet-stream',
+		);
+
+		$sData = null;
+		$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
+		$sFileName = 'uploaded-file'; // Default name for downloaded-files
+		$sExtension = '.txt'; // Default file extension in case we don't know the MIME Type
+
+		if(empty($sPath))
+		{
 			// Empty path (NULL or '') means that there is no input, making an empty document.
-			return new ormDocument('', '', '');
+			$oUploadedDoc = new ormDocument('', '', '');
 		}
-
-		if (static::IsURL($sPath)) {
-			$oUploadedDoc = static::GetDocumentFromSelfURL($sPath);
-			if ($oUploadedDoc) {
-				return $oUploadedDoc;
+		elseif (static::IsURL($sPath))
+		{
+			if ($oUploadedDoc = static::IsSelfURL($sPath))
+			{
+				// Nothing more to do, we've got it !!
 			}
-
-			// Remote file, let's use the HTTP headers to find the MIME Type
-			$sData = @file_get_contents($sPath);
-			if ($sData === false) {
-				IssueLog::Error(<<<TXT
+			else
+			{
+				// Remote file, let's use the HTTP headers to find the MIME Type
+				$sData = @file_get_contents($sPath);
+				if ($sData === false)
+				{
+					IssueLog::Error(<<<TXT
 Failed to load the file from URL. This can happen for multiple reasons:
 - Invalid URL
 - URL using HTTPS with an untrusted certificate on the remote server
@@ -2499,40 +2514,54 @@ TXT
 					, LogChannels::CORE, [
 						'URL' => $sPath,
 					]);
-				throw new Exception("Failed to load the file from the URL '$sPath'.");
-			}
-
-			$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
-			$sFileName = 'uploaded-file'; // Default name for downloaded-files
-			$sExtension = '.txt'; // Default file extension in case we don't know the MIME Type
-
-			if (isset($http_response_header)) {
-				$aHeaders = static::ParseHeaders($http_response_header);
-				$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
-				// Compute the file extension from the MIME Type
-				foreach (ormDocument::GetKnownExtensions() as $sExtValue => $sMime) {
-					if ($sMime === $sMimeType) {
-						$sExtension = '.'.$sExtValue;
-						break;
-					}
+					throw new Exception("Failed to load the file from the URL '$sPath'.");
 				}
+				else
+				{
+					if (isset($http_response_header))
+					{
+						$aHeaders = static::ParseHeaders($http_response_header);
+						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
+						// Compute the file extension from the MIME Type
+						foreach ($aKnownExtensions as $sExtValue => $sMime) {
+							if ($sMime === $sMimeType) {
+								$sExtension = '.'.$sExtValue;
+								break;
+							}
+						}
+					}
+					$sPathName = pathinfo($sPath, PATHINFO_FILENAME);
+					if (utils::IsNotNullOrEmptyString($sPathName)) {
+						$sFileName = $sPathName;
+					}
+					$sFileName .= $sExtension;
+				}
+				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
 			}
-			$sPathName = pathinfo($sPath, PATHINFO_FILENAME);
-			if (utils::IsNotNullOrEmptyString($sPathName)) {
-				$sFileName = $sPathName;
-			}
-			$sFileName .= $sExtension;
-
-			return new ormDocument($sData, $sMimeType, $sFileName);
 		}
-
-		// Local file
-		if (UserRights::IsAdministrator()) {
+		else if (UserRights::IsAdministrator())
+		{
 			// Only administrators are allowed to read local files
-			return ormDocument::FromFile($sPath);
-		}
+			$sData = @file_get_contents($sPath);
+			if ($sData === false)
+			{
+				throw new Exception("Failed to load the file '$sPath'. The file does not exist or the current process is not allowed to access it.");
+			}
+			$sExtension = strtolower(pathinfo($sPath, PATHINFO_EXTENSION));
+			$sFileName = basename($sPath);
 
-		return null;
+			if (array_key_exists($sExtension, $aKnownExtensions))
+			{
+				$sMimeType = $aKnownExtensions[$sExtension];
+			}
+			else if (extension_loaded('fileinfo'))
+			{
+				$finfo = new finfo(FILEINFO_MIME);
+				$sMimeType = $finfo->file($sPath);
+			}
+			$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
+		}
+		return $oUploadedDoc;
 	}
 
 	protected static function ParseHeaders($aHeaders)
@@ -3103,13 +3132,30 @@ TXT
 	 * @throws \Exception
 	 * @since 3.0.0
 	 */
-	public static function GetMentionedObjectsFromText(string $sText): array
+	public static function GetMentionedObjectsFromText(string $sText, string $sFormat = self::ENUM_TEXT_FORMAT_HTML): array
 	{
-		$aMentionedObjects = [];
-		$aMentionMatches = [];
-		$sText = html_entity_decode($sText);
+		// First transform text so it can be parsed
+		switch ($sFormat) {
+			case static::ENUM_TEXT_FORMAT_HTML:
+				$sText = static::HtmlToText($sText);
+				break;
+
+			default:
+				// Don't transform it
+				break;
+		}
+
+		// Then parse text to find objects
+		$aMentionedObjects = array();
+		$aMentionMatches = array();
+
+		// Note: As the sanitizer (or CKEditor autocomplete plugin? 🤔) removes data-* attributes from the hyperlink,
+		// - we can't use the following (simpler) regexp that only checks data attributes on hyperlinks, which would have worked for hyperlinks pointing to any GUIs: '/<a\s*([^>]*)data-object-class="([^"]*)"\s*data-object-id="([^"]*)">/i'
+		// - instead we use a regexp to match the following pattern '[Some object label](<APP_ROOT_URL>...&class=<OBJECT_CLASS>&id=<OBJECT_ID>...)' which only works for the backoffice
+		// If we change the sanitizer, we might want to switch to the other regexp as it's universal and easier to read
+		$sAppRootUrlForRegExp = addcslashes(utils::GetAbsoluteUrlAppRoot(), '/&');
+		preg_match_all("/\[([^\]]*)\]\({$sAppRootUrlForRegExp}[^\)]*\&class=([^\)\&]*)\&id=([\d]*)[^\)]*\)/i", $sText, $aMentionMatches);
 
-		preg_match_all('/<a\s*([^>]*)data-object-class="([^"]*)"\s.*data-object-key="([^"]*)"/Ui', $sText, $aMentionMatches);
 		foreach ($aMentionMatches[0] as $iMatchIdx => $sCompleteMatch) {
 			$sMatchedClass = $aMentionMatches[2][$iMatchIdx];
 			$sMatchedId = $aMentionMatches[3][$iMatchIdx];

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.0');
 
 /**
  * @var string

composer.lock

@@ -3929,82 +3929,6 @@
             ],
             "time": "2023-01-26T09:26:14+00:00"
         },
-        {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.31.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
-                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
         {
             "name": "symfony/polyfill-php83",
             "version": "v1.28.0",
@@ -5052,38 +4976,30 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.16.0",
+            "version": "v3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561"
+                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561",
-                "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "^1.8",
                 "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php81": "^1.29"
+                "symfony/polyfill-php80": "^1.22"
             },
             "require-dev": {
-                "phpstan/phpstan": "^2.0",
                 "psr/container": "^1.0|^2.0",
-                "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
+                "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
             },
             "type": "library",
             "autoload": {
-                "files": [
-                    "src/Resources/core.php",
-                    "src/Resources/debug.php",
-                    "src/Resources/escaper.php",
-                    "src/Resources/string_loader.php"
-                ],
                 "psr-4": {
                     "Twig\\": "src/"
                 }
@@ -5116,7 +5032,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.16.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.8.0"
             },
             "funding": [
                 {
@@ -5128,7 +5044,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-29T08:27:05+00:00"
+            "time": "2023-11-21T18:54:41+00:00"
         },
         {
             "name": "webmozart/assert",

core/action.class.inc.php

@@ -181,7 +181,7 @@ abstract class Action extends cmdbAbstractObject
 	{
 		parent::DisplayBareRelations($oPage, false);
 
-		if ($oPage instanceof iTopWebPage && !$this->IsNew()) {
+		if ($oPage instanceof iTopWebPage) {
 			$this->GenerateLastExecutionsTab($oPage, $bEditMode);
 		}
 	}
@@ -566,7 +566,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/asynctask.class.inc.php

@@ -89,7 +89,7 @@ abstract class AsyncTask extends DBObject
 		// The value is set from null to planned in the setup program
 		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('planned,running,idle,error'), "sql"=>"status", "default_value"=>"planned", "is_null_allowed"=>true, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeDateTime("started", array("allowed_values"=>null, "sql"=>"started", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeDateTime("planned", array("allowed_values"=>null, "sql"=>"planned", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("event_id", array("targetclass"=>"Event", "jointype"=> "", "allowed_values"=>null, "sql"=>"event_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
@@ -489,7 +489,7 @@ class AsyncSendNewsroom extends AsyncTask {
 		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values"=>null, "sql"=>"object_id", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("object_class", array("allowed_values"=>null, "sql"=>"object_class", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("url", array("allowed_values"=>null, "sql"=>"url", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>'NOW()', "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>null, "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 
 	}
 

core/attributedef.class.inc.php

@@ -142,7 +142,7 @@ abstract class AttributeDefinition
 
 	protected $aCSSClasses;
 
-    public function GetType()
+	public function GetType()
 	{
 		return Dict::S('Core:'.get_class($this));
 	}
@@ -1715,8 +1715,8 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
-	}
-
+	}	
+	
 	/**
 	 * @return int see LINKSET_EDITWHEN_* constants
 	 * @since 3.1.1 3.2.0 N°6385
@@ -1758,7 +1758,7 @@ class AttributeLinkedSet extends AttributeDefinition
 	{
 		return $this->GetOptional('with_php_computation', false);
 	}
-
+	
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
@@ -3793,7 +3793,7 @@ class AttributeClass extends AttributeString
 
 	public static function ListExpectedParams()
 	{
-		return array_merge(parent::ListExpectedParams(), array('class_category', 'more_values'));
+		return array_merge(parent::ListExpectedParams(), array("class_category", "more_values"));
 	}
 
 	public function __construct($sCode, $aParams)
@@ -3819,35 +3819,10 @@ class AttributeClass extends AttributeString
 		return $sDefault;
 	}
 
-	/**
-	 * @param array $aArgs
-	 * @param string $sContains
-	 *
-	 * @return array|null
-	 * @throws \CoreException
-	 */
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oValSetDef = $this->GetValuesDef();
-		if (!$oValSetDef) {
-			return null;
-		}
-
-		$aListClass = $oValSetDef->GetValues($aArgs, $sContains);
-		/* @since 3.3.0 remove elements in class_exclusion_list*/
-		$sClassExclusionList = $this->GetOptional('class_exclusion_list',null);
-		if (!empty($sClassExclusionList)) {
-			foreach (explode(',', $sClassExclusionList) as $sClassName) {
-				unset($aListClass[trim($sClassName)]);
-			}
-		}
-
-		return $aListClass;
-	}
-
 	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
 	{
-		if (empty($sValue)) {
+		if (empty($sValue))
+		{
 			return '';
 		}
 
@@ -4218,7 +4193,7 @@ class AttributeFinalClass extends AttributeString
  */
 class AttributePassword extends AttributeString implements iAttributeNoGroupBy
 {
-    const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	/**
 	 * Useless constructor, but if not present PHP 7.4.0/7.4.1 is crashing :( (N°2329)
@@ -4295,7 +4270,7 @@ class AttributePassword extends AttributeString implements iAttributeNoGroupBy
  */
 class AttributeEncryptedString extends AttributeString implements iAttributeNoGroupBy
 {
-    const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	protected function GetSQLCol($bFullSpec = false)
 	{
@@ -4465,7 +4440,7 @@ class AttributeText extends AttributeString
 	{
 		// Is there a way to know the current limitation for mysql?
 		// See mysql_field_len()
-		return 16383; // number of characters (that can be 1-4 bytes long), not of bytes
+		return 65535;
 	}
 
 	public static function RenderWikiHtml($sText, $bWikiOnly = false)
@@ -6371,15 +6346,10 @@ class AttributeDateTime extends AttributeDBField
 
 		$oFormField = parent::MakeFormField($oObject, $oFormField);
 
-        // After call to the parent as it sets the current value
-        $oValue = $oObject->Get($this->GetCode());
-        if ($oValue === $this->GetNullValue()) {
-            $oValue = $this->GetDefaultValue($oObject);
-        }
-        $oFormField->SetCurrentValue($this->GetFormat()->Format($oValue));
+		// After call to the parent as it sets the current value
+		$oFormField->SetCurrentValue($this->GetFormat()->Format($oObject->Get($this->GetCode())));
 
-
-        return $oFormField;
+		return $oFormField;
 	}
 
 	/**
@@ -6463,26 +6433,8 @@ class AttributeDateTime extends AttributeDBField
 
 	public function GetDefaultValue(DBObject $oHostObject = null)
 	{
-		$sDefaultValue = $this->Get('default_value');
-		if (utils::IsNotNullOrEmptyString($sDefaultValue)) {
-			try {
-				$sDefaultDate = Expression::FromOQL($sDefaultValue)->Evaluate([]);
-			} catch (Exception $e) {
-				try {
-					$sDefaultDate = Expression::FromOQL('"'.$sDefaultValue.'"')->Evaluate([]);
-				} catch (Exception $e) {
-					IssueLog::Error("Invalid default value '$sDefaultValue' for field '{$this->GetCode()}' on class '{$this->GetHostClass()}', defaulting to null");
-
-					return $this->GetNullValue();
-				}
-			}
-			try {
-				$oDate = new DateTimeImmutable($sDefaultDate);
-			} catch (Exception $e) {
-				IssueLog::Error("Invalid default value '$sDefaultValue' for field '{$this->GetCode()}' on class '{$this->GetHostClass()}', defaulting to null");
-				return $this->GetNullValue();
-			}
-			return $oDate->format($this->GetInternalFormat());
+		if (!$this->IsNullAllowed()) {
+			return date($this->GetInternalFormat());
 		}
 		return $this->GetNullValue();
 	}
@@ -9481,13 +9433,8 @@ class AttributeStopWatch extends AttributeDefinition
 							case 'deadline':
 								if ($value)
 								{
-									if (is_int($value))
-									{
-										$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
-										$sRet = AttributeDeadline::FormatDeadline($sDate);
-									} else {
-										$sRet = $value;
-									}
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
+									$sRet = AttributeDeadline::FormatDeadline($sDate);
 								}
 								else
 								{
@@ -10037,7 +9984,7 @@ class AttributeSubItem extends AttributeDefinition
  */
 class AttributeOneWayPassword extends AttributeDefinition implements iAttributeNoGroupBy
 {
-    const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	/**
 	 * Useless constructor, but if not present PHP 7.4.0/7.4.1 is crashing :( (N°2329)

core/bulkchange.class.inc.php

@@ -519,7 +519,7 @@ class BulkChange
 		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;
 			}
@@ -1181,9 +1181,6 @@ class BulkChange
 					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))
 						{
@@ -1236,22 +1233,11 @@ class BulkChange
 		$iPreviousTimeLimit = ini_get('max_execution_time');
 		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 
-		$iNBFields = count($this->m_aAttList);
-		foreach ($this->m_aExtKeys as $aReconcilKeys) {
-			$iNBFields += count($aReconcilKeys);
-		}
-
 		// Avoid too many events
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(true);
 		try {
 			foreach ($this->m_aData as $iRow => $aRowData) {
 				set_time_limit(intval($iLoopTimeLimit));
-				// Stop if not the good number of cols in $aRowData
-				if(count($aRowData) != $iNBFields){
-					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-NbField',count($aRowData),$iNBFields) );
-					continue;
-				}
-
 				if (isset($aResult[$iRow]["__STATUS__"])) {
 					// An issue at the earlier steps - skip the rest
 					continue;
@@ -1362,11 +1348,7 @@ class BulkChange
 			{
 				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)
@@ -1380,11 +1362,7 @@ class BulkChange
 					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

@@ -70,7 +70,7 @@ class BulkExportResult extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 
-		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("user_id", array("allowed_values"=>null, "sql"=>"user_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("chunk_size", array("allowed_values"=>null, "sql"=>"chunk_size", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("format", array("allowed_values"=>null, "sql"=>"format", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
@@ -474,14 +474,14 @@ abstract class BulkExport
 	 */
 	protected function MakeTmpFile($sExtension)
 	{
-		if(!is_dir(utils::GetDataPath()."bulk_export"))
+		if(!is_dir(APPROOT."data/bulk_export"))
 		{
-			@mkdir(utils::GetDataPath()."bulk_export", 0777, true /* recursive */);
+			@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
 			clearstatcache();
 		}
-		if (!is_writable(utils::GetDataPath()."bulk_export"))
+		if (!is_writable(APPROOT."data/bulk_export"))
 		{
-			throw new Exception('Data directory "'.utils::GetDataPath().'bulk_export" could not be written.');
+			throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
 		}
 
 		$iNum = rand();
@@ -489,7 +489,7 @@ abstract class BulkExport
 		{
 			$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/cmdbchange.class.inc.php

@@ -33,7 +33,7 @@ class CMDBChange extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("allowed_values"=>null, "sql"=>"user_id", "targetclass"=>"User", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("origin", array("allowed_values"=>new ValueSetEnum(implode(',', [CMDBChangeOrigin::INTERACTIVE, CMDBChangeOrigin::CSV_INTERACTIVE, CMDBChangeOrigin::CSV_IMPORT, CMDBChangeOrigin::WEBSERVICE_SOAP, CMDBChangeOrigin::WEBSERVICE_REST, CMDBChangeOrigin::SYNCHRO_DATA_SOURCE, CMDBChangeOrigin::EMAIL_PROCESSING, CMDBChangeOrigin::CUSTOM_EXTENSION])), "sql"=>"origin", "default_value"=>CMDBChangeOrigin::INTERACTIVE, "is_null_allowed"=>true, "depends_on"=>array())));

core/config.class.inc.php

@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.3.0-dev');
+define('ITOP_VERSION', '3.2.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -1436,14 +1436,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' => '',
@@ -1803,13 +1795,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'http.request.user_agent' => [
-			'type'                => 'string',
-			'description'         => 'HTTP request user agent, use this to set a custom agent on external requests.',
-			'default'             => ITOP_APPLICATION.'/'.ITOP_VERSION,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		]
 	];
 
 	public function IsProperty($sPropCode)

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>cmdbAbstractObject</parent>
@@ -99,7 +99,7 @@
       </presentation>
       <methods/>
     </class>
-    <class id="ActionNewsroom" _delta="define">
+    <class id="ActionNewsroom"  _delta="define">
       <php_parent>
         <name>ActionNotification</name>
       </php_parent>
@@ -148,7 +148,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>
@@ -183,7 +183,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>
@@ -355,37 +355,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[
@@ -397,7 +381,7 @@
         </method>
       </methods>
     </class>
-    <class id="EventNotificationNewsroom" _delta="define">
+    <class id="EventNotificationNewsroom"  _delta="define">
       <php_parent>
         <name>EventNotification</name>
       </php_parent>
@@ -421,7 +405,7 @@
         </reconciliation>
         <order>
           <columns>
-            <column id="date" ascending="false"/>
+            <column id="date" ascending="false" />
           </columns>
         </order>
       </properties>
@@ -435,7 +419,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>
@@ -517,14 +501,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>
@@ -866,18 +850,6 @@
           <field id="language" xsi:type="AttributeApplicationLanguage"/>
         </fields>
       </class>
-      <class id="Event" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>DBObject</parent>
-        <properties>
-          <category>core/cmdb,view_in_gui</category>
-        </properties>
-        <fields>
-          <field id="message" xsi:type="AttributeText"/>
-          <field id="date" xsi:type="AttributeDateTime"/>
-          <field id="userinfo" xsi:type="AttributeString"/>
-        </fields>
-      </class>
       <class id="EventNotification" _delta="define">
         <!-- Generated by toolkit/export-class-to-meta.php -->
         <parent>Event</parent>
@@ -1024,12 +996,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

@@ -212,8 +212,6 @@ abstract class DBObject implements iDisplay
 	private $aEventListeners = [];
 	private array $aAllowedTransitions = [];
 
-	private ?string $sStimulusBeingApplied = null;
-
 	/**
 	 * DBObject constructor.
 	 *
@@ -760,10 +758,10 @@ abstract class DBObject implements iDisplay
      */
 	public function SetTrim($sAttCode, $sValue)
 	{
-		if (!$this->StringFitsInField($sAttCode, $sValue)) {
-			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-			$iMaxSize = $oAttDef->GetMaxSize();
-			$sLength = mb_strlen($sValue);
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		$iMaxSize = $oAttDef->GetMaxSize();
+		$sLength = mb_strlen($sValue);
+		if ($iMaxSize && ($sLength > $iMaxSize)) {
 			$sMessage = " -truncated ($sLength chars)";
 			$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
 		}
@@ -818,24 +816,6 @@ abstract class DBObject implements iDisplay
 		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
 	}
 
-	/**
-	 * @param string $sAttCode
-	 * @param string $sValue
-	 *
-	 * @return bool
-	 * @throws \Exception
-	 *
-	 * @Since 3.2.2
-	 */
-	public function StringFitsInField(string $sAttCode, string $sValue): bool
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		$iMaxSize = $oAttDef->GetMaxSize();
-		$sLength = mb_strlen($sValue);
-
-		return !($iMaxSize && ($sLength > $iMaxSize));
-	}
-
 	/**
 	 * Compute (and optionally start) the StopWatches deadlines
 	 *
@@ -1226,7 +1206,7 @@ abstract class DBObject implements iDisplay
 			if ($aCallInfo["function"] != "ComputeValues") continue;
 			return; //skip!
 		}
-		$this->FireEventComputeValues($this->sStimulusBeingApplied);
+		$this->FireEventComputeValues();
 		$oKPI = new ExecutionKPI();
 		$this->ComputeValues();
 		$oKPI->ComputeStatsForExtension($this, 'ComputeValues');
@@ -2150,7 +2130,7 @@ abstract class DBObject implements iDisplay
 
 			return "Bad type";
 		}
-		elseif ($oAtt instanceof AttributeSet)
+		elseif (($oAtt instanceof AttributeClassAttCodeSet) || ($oAtt instanceof AttributeEnumSet))
 		{
 			if (is_string($toCheck))
 			{
@@ -2689,7 +2669,7 @@ abstract class DBObject implements iDisplay
 
 			// Ultimate check - ensure DB integrity
 			$this->SetReadOnly('No modification allowed during CheckToCreate');
-			$this->FireEventCheckToWrite($this->sStimulusBeingApplied);
+			$this->FireEventCheckToWrite();
 			$this->SetReadWrite();
 
 			$oKPI = new ExecutionKPI();
@@ -2885,14 +2865,6 @@ abstract class DBObject implements iDisplay
 	protected function ListChangedValues(array $aProposal)
 	{
 		$aDelta = array();
-		$sClass = get_class($this);
-		if (MetaModel::HasLifecycle($sClass) && utils::IsNotNullOrEmptyString($this->sStimulusBeingApplied)) {
-			$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-			if (!in_array($sStateAttCode, $aProposal)) {
-				// Same state but the transition was asked, act as if the state was changed
-				$aDelta[$sStateAttCode] = $this->m_aCurrValues[$sStateAttCode];
-			}
-		}
 		foreach ($aProposal as $sAtt => $proposedValue)
 		{
 			if (!array_key_exists($sAtt, $this->m_aOrigValues))
@@ -3426,7 +3398,7 @@ abstract class DBObject implements iDisplay
 			$this->OnInsert();
 			$oKPI->ComputeStatsForExtension($this, 'OnInsert');
 
-			$this->FireEventBeforeWrite(null);
+			$this->FireEventBeforeWrite();
 
 			// If not automatically computed, then check that the key is given by the caller
 			if (!MetaModel::IsAutoIncrementKey($sRootClass)) {
@@ -3561,7 +3533,7 @@ abstract class DBObject implements iDisplay
 	 */
 	protected function PostInsertActions(): void
 	{
-		$this->FireEventAfterWrite([], true, null);
+		$this->FireEventAfterWrite([], true);
 		$oKPI = new ExecutionKPI();
 		$this->AfterInsert();
 		$oKPI->ComputeStatsForExtension($this, 'AfterInsert');
@@ -3642,13 +3614,13 @@ abstract class DBObject implements iDisplay
 	 */
 	public function DBUpdate()
 	{
-		$this->LogCRUDEnter(__METHOD__);
 		if (!MetaModel::StartReentranceProtection($this)) {
 			$this->LogCRUDExit(__METHOD__, 'Rejected (reentrance)');
 
 			return false;
 		}
 
+		$this->LogCRUDEnter(__METHOD__);
 		if (!$this->m_bIsInDB)
 		{
 			throw new CoreException("DBUpdate: could not update a newly created object, please call DBInsert instead");
@@ -3669,7 +3641,7 @@ abstract class DBObject implements iDisplay
 				$this->OnUpdate();
 				$oKPI->ComputeStatsForExtension($this, 'OnUpdate');
 
-				$this->FireEventBeforeWrite($this->sStimulusBeingApplied);
+				$this->FireEventBeforeWrite();
 
 				// Freeze the changes at this point
 				$this->InitPreviousValuesForUpdatedAttributes();
@@ -3837,7 +3809,7 @@ abstract class DBObject implements iDisplay
 				}
 
 				try {
-					$this->PostUpdateActions($this->m_aPreviousValuesForUpdatedAttributes, $sClass);
+					$this->PostUpdateActions($aChanges, $sClass);
 				}
 				catch (Exception $e) {
 					$this->LogCRUDExit(__METHOD__, 'Error: '.$e->getMessage());
@@ -3880,9 +3852,7 @@ abstract class DBObject implements iDisplay
 	 */
 	protected function PostUpdateActions(array $aChanges): void
 	{
-		$sStimulusBeingApplied = $this->sStimulusBeingApplied;
-		$this->sStimulusBeingApplied = null;
-		$this->FireEventAfterWrite($aChanges, false, $sStimulusBeingApplied);
+		$this->FireEventAfterWrite($aChanges, false);
 		$oKPI = new ExecutionKPI();
 		$this->AfterUpdate();
 		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');
@@ -3894,37 +3864,39 @@ abstract class DBObject implements iDisplay
 		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
 
 		$sClass = get_class($this);
-		if (utils::IsNotNullOrEmptyString($sStimulusBeingApplied))
+		if (MetaModel::HasLifecycle($sClass))
 		{
 			$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-			$sPreviousState = $this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode];
-			// Change state triggers...
-			$aParams = array(
-				'class_list'     => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
-				'previous_state' => $sPreviousState,
-				'new_state'      => $this->Get($sStateAttCode),
-			);
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state'), array(), $aParams);
-			while ($oTrigger = $oSet->Fetch()) {
-				/** @var \TriggerOnStateLeave $oTrigger */
-				try {
-					$oTrigger->DoActivate($this->ToArgs('this'));
+			if (isset($this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode])) {
+				$sPreviousState = $this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode];
+				// Change state triggers...
+				$aParams = array(
+					'class_list'     => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
+					'previous_state' => $sPreviousState,
+					'new_state'      => $this->Get($sStateAttCode),
+				);
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state'), array(), $aParams);
+				while ($oTrigger = $oSet->Fetch()) {
+					/** @var \TriggerOnStateLeave $oTrigger */
+					try {
+						$oTrigger->DoActivate($this->ToArgs('this'));
+					}
+					catch (Exception $e) {
+						$oTrigger->LogException($e, $this);
+						utils::EnrichRaisedException($oTrigger, $e);
+					}
 				}
-				catch (Exception $e) {
-					$oTrigger->LogException($e, $this);
-					utils::EnrichRaisedException($oTrigger, $e);
-				}
-			}
 
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state'), array(), $aParams);
-			while ($oTrigger = $oSet->Fetch()) {
-				/** @var \TriggerOnStateEnter $oTrigger */
-				try {
-					$oTrigger->DoActivate($this->ToArgs('this'));
-				}
-				catch (Exception $e) {
-					$oTrigger->LogException($e, $this);
-					utils::EnrichRaisedException($oTrigger, $e);
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state'), array(), $aParams);
+				while ($oTrigger = $oSet->Fetch()) {
+					/** @var \TriggerOnStateEnter $oTrigger */
+					try {
+						$oTrigger->DoActivate($this->ToArgs('this'));
+					}
+					catch (Exception $e) {
+						$oTrigger->LogException($e, $this);
+						utils::EnrichRaisedException($oTrigger, $e);
+					}
 				}
 			}
 		}
@@ -4052,7 +4024,7 @@ abstract class DBObject implements iDisplay
 		foreach ($aUpdatedLogAttCodes as $sAttCode) {
 			/** @var \ormCaseLog $oUpdatedCaseLog */
 			$oUpdatedCaseLog = $this->Get($sAttCode);
-			$aMentionedObjects = array_merge_recursive($aMentionedObjects, utils::GetMentionedObjectsFromText($oUpdatedCaseLog->GetModifiedEntry(ormCaseLog::ENUM_FORMAT_HTML)));
+			$aMentionedObjects = array_merge_recursive($aMentionedObjects, utils::GetMentionedObjectsFromText($oUpdatedCaseLog->GetModifiedEntry()));
 		}
 
 		// 3 - Trigger for those objects
@@ -4529,8 +4501,6 @@ abstract class DBObject implements iDisplay
 	 */
 	public function ApplyStimulus($sStimulusCode, $bDoNotWrite = false)
 	{
-		$this->LogCRUDEnter(__METHOD__, "Code: $sStimulusCode");
-
 		$sClass = get_class($this);
 		if (!MetaModel::HasLifecycle($sClass))
 		{
@@ -4557,8 +4527,6 @@ abstract class DBObject implements iDisplay
 				} else {
 					$aBackupValues[$sAttCode] = $value;
 				}
-			} else {
-				$aBackupValues[$sAttCode] = $oAttDef->GetNullValue();
 			}
 		}
 
@@ -4566,6 +4534,7 @@ abstract class DBObject implements iDisplay
 
 		// Change the state before proceeding to the actions, this is necessary because an action might
 		// trigger another stimuli (alternative: push the stimuli into a queue)
+		$sPreviousState = $this->Get($sStateAttCode);
 		$sNewState = $aTransitionDef['target_state'];
 		$this->Set($sStateAttCode, $sNewState);
 
@@ -4573,71 +4542,67 @@ abstract class DBObject implements iDisplay
 		//    array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD
 
 		$bSuccess = true;
-		// Prevent current object from being updated by the actions
-		$this->AddCurrentObjectInCrudStack('APPLY_STIMULUS');
-		$bIsNewlyProtected = MetaModel::StartReentranceProtection($this);
-		try {
-			foreach ($aTransitionDef['actions'] as $actionHandler) {
-				if (is_string($actionHandler)) {
-					// Old (pre-2.1.0 modules) action definition without any parameter
-					$aActionCallSpec = array($this, $actionHandler);
-					$sActionDesc = $sClass.'::'.$actionHandler;
+		$sActionDesc = '';
+		foreach ($aTransitionDef['actions'] as $actionHandler)
+		{
+			if (is_string($actionHandler))
+			{
+				// Old (pre-2.1.0 modules) action definition without any parameter
+				$aActionCallSpec = array($this, $actionHandler);
+				$sActionDesc = $sClass.'::'.$actionHandler;
 
-					if (!is_callable($aActionCallSpec)) {
-						throw new CoreException("Unable to call action: $sClass::$actionHandler");
-					}
-					$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
-				} else // if (is_array($actionHandler))
+				if (!is_callable($aActionCallSpec))
 				{
-					// New syntax: 'verb' and typed parameters
-					$sAction = $actionHandler['verb'];
-					$sActionDesc = "$sClass::$sAction";
-					$aParams = array();
-					foreach ($actionHandler['params'] as $aDefinition) {
-						$sParamType = array_key_exists('type', $aDefinition) ? $aDefinition['type'] : 'string';
-						switch ($sParamType) {
-							case 'int':
-								$value = (int)$aDefinition['value'];
-								break;
+					throw new CoreException("Unable to call action: $sClass::$actionHandler");
+				}
+				$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
+			}
+			else // if (is_array($actionHandler))
+			{
+				// New syntax: 'verb' and typed parameters
+				$sAction = $actionHandler['verb'];
+				$sActionDesc = "$sClass::$sAction";
+				$aParams = array();
+				foreach($actionHandler['params'] as $aDefinition)
+				{
+					$sParamType = array_key_exists('type', $aDefinition) ? $aDefinition['type'] : 'string';
+					switch($sParamType)
+					{
+						case 'int':
+							$value = (int)$aDefinition['value'];
+							break;
 
-							case 'float':
-								$value = (float)$aDefinition['value'];
-								break;
+						case 'float':
+							$value = (float)$aDefinition['value'];
+							break;
 
-							case 'bool':
-								$value = (bool)$aDefinition['value'];
-								break;
+						case 'bool':
+							$value = (bool)$aDefinition['value'];
+							break;
 
-							case 'reference':
-								$value = ${$aDefinition['value']};
-								break;
+						case 'reference':
+							$value = ${$aDefinition['value']};
+							break;
 
-							case 'string':
-							default:
-								$value = (string)$aDefinition['value'];
-						}
-						$aParams[] = $value;
+						case 'string':
+						default:
+							$value = (string)$aDefinition['value'];
 					}
-					$aCallSpec = array($this, $sAction);
-					$bRet = call_user_func_array($aCallSpec, $aParams);
-				}
-				// if one call fails, the whole is considered as failed
-				// (in case there is no returned value, null is obtained and means "ok")
-				if ($bRet === false) {
-					IssueLog::Info("Lifecycle action $sActionDesc returned false on object #$sClass:".$this->GetKey());
-					$bSuccess = false;
+					$aParams[] = $value;
 				}
+				$aCallSpec = array($this, $sAction);
+				$bRet = call_user_func_array($aCallSpec, $aParams);
 			}
-		} finally {
-			if ($bIsNewlyProtected) {
-				// Stops protection only if the object was not already protected
-				MetaModel::StopReentranceProtection($this);
+			// if one call fails, the whole is considered as failed
+			// (in case there is no returned value, null is obtained and means "ok")
+			if ($bRet === false)
+			{
+				IssueLog::Info("Lifecycle action $sActionDesc returned false on object #$sClass:".$this->GetKey());
+				$bSuccess = false;
 			}
-			$this->RemoveCurrentObjectInCrudStack();
 		}
 		if ($bSuccess)
 		{
-			$this->sStimulusBeingApplied = $sStimulusCode;
 			// Stop watches
 			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 			{
@@ -4666,7 +4631,6 @@ abstract class DBObject implements iDisplay
 				$this->m_aCurrValues[$sAttCode] = $aBackupValues[$sAttCode];
 			}
 		}
-		$this->LogCRUDExit(__METHOD__, 'Current State: '.$this->Get($sStateAttCode));
 		return $bSuccess;
 	}
 
@@ -6653,7 +6617,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventCheckToWrite(?string $sStimulusBeingApplied): void
+	protected function FireEventCheckToWrite(): void
 	{
 	}
 
@@ -6661,7 +6625,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventBeforeWrite(?string $sStimulusBeingApplied)
+	protected function FireEventBeforeWrite()
 	{
 	}
 
@@ -6671,7 +6635,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventAfterWrite(array $aChanges, bool $bIsNew, ?string $sStimulusBeingApplied): void
+	protected function FireEventAfterWrite(array $aChanges, bool $bIsNew): void
 	{
 	}
 
@@ -6709,7 +6673,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventComputeValues(?string $sStimulusBeingApplied): void
+	protected function FireEventComputeValues(): void
 	{
 	}
 
@@ -6751,13 +6715,12 @@ abstract class DBObject implements iDisplay
 		$oRootClass = MetaModel::GetRootClass($sClass);
 
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if (($oRootClass === $aCrudStackEntry['class']) && ($sConvertedId === $aCrudStackEntry['id'])) {
-				IssueLog::Trace('CRUD '.__METHOD__." $sClass:$sId IS in CRUD Stack", LogChannels::DM_CRUD);
+			if (($oRootClass === $aCrudStackEntry['class'])
+				&& ($sConvertedId === $aCrudStackEntry['id'])) {
 				return true;
 			}
 		}
 
-		IssueLog::Trace('CRUD '.__METHOD__." $sClass:$sId NOT in CRUD Stack", LogChannels::DM_CRUD);
 		return false;
 	}
 
@@ -6775,12 +6738,10 @@ abstract class DBObject implements iDisplay
 		$sRootClass = MetaModel::GetRootClass($sClass);
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
 			if ($sRootClass === $aCrudStackEntry['class']) {
-				IssueLog::Trace("CRUD ".__METHOD__." $sClass IS in CRUD Stack", LogChannels::DM_CRUD);
 				return true;
 			}
 		}
 
-		IssueLog::Trace('CRUD '.__METHOD__." $sClass NOT in CRUD Stack", LogChannels::DM_CRUD);
 		return false;
 	}
 
@@ -6790,20 +6751,17 @@ abstract class DBObject implements iDisplay
 	 * @param string $sCrudType
 	 *
 	 * @return void
-	 * @throws \CoreException
 	 * @since 3.1.0 N°5609
 	 */
 	private function AddCurrentObjectInCrudStack(string $sCrudType): void
 	{
+		$this->LogCRUDDebug(__METHOD__);
 		$sRootClass = MetaModel::GetRootClass(get_class($this));
-		$sKey = (string)$this->GetKey();
 		self::$m_aCrudStack[] = [
 			'type'  => $sCrudType,
 			'class' => $sRootClass,
-			'id'    => $sKey, // GetKey() doesn't have type hinting, so forcing type to avoid getting an int
+			'id'    => (string)$this->GetKey(), // GetKey() doesn't have type hinting, so forcing type to avoid getting an int
 		];
-		$iCount = count(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, "$sCrudType $sRootClass:$sKey count $iCount");
 	}
 
 	/**
@@ -6815,15 +6773,10 @@ abstract class DBObject implements iDisplay
 	 */
 	private function UpdateCurrentObjectInCrudStack(): void
 	{
+		$this->LogCRUDDebug(__METHOD__);
 		$aCurrentCrudStack = array_pop(self::$m_aCrudStack);
-		$sOldId = $aCurrentCrudStack['id'];
-		$sNewId = (string)$this->GetKey();
-		$aCurrentCrudStack['id'] = $sNewId;
+		$aCurrentCrudStack['id'] = (string)$this->GetKey();
 		self::$m_aCrudStack[] = $aCurrentCrudStack;
-		$sClass = $aCurrentCrudStack['class'];
-		$sType = $aCurrentCrudStack['type'];
-		$iCount = count(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, "$sType $sClass:$sOldId => $sClass:$sNewId count $iCount");
 	}
 
 	/**
@@ -6835,11 +6788,7 @@ abstract class DBObject implements iDisplay
 	private function RemoveCurrentObjectInCrudStack(): void
 	{
 		$aRemoved = array_pop(self::$m_aCrudStack);
-		$sType = $aRemoved['type'];
-		$sClass = $aRemoved['class'];
-		$sId = $aRemoved['id'];
-		$iCount = count(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, "$sType $sClass:$sId count $iCount");
+		$this->LogCRUDDebug(__METHOD__, $aRemoved['class'].':'.$aRemoved['id']);
 	}
 
 	/**
@@ -6856,53 +6805,37 @@ abstract class DBObject implements iDisplay
 	protected function LogCRUDEnter($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
-		IssueLog::Debug("CRUD +$sPadding> $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+		IssueLog::Debug("CRUD +$sPadding> $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 	}
 
 	protected function LogCRUDExit($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
 		if (strlen($sComment) === 0) {
 			IssueLog::Trace("CRUD <$sPadding+ $sFunction $sClass:$sKey", LogChannels::DM_CRUD);
 		} else {
-			IssueLog::Debug("CRUD <$sPadding+ $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+			IssueLog::Debug("CRUD <$sPadding+ $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 		}
 	}
 
 	protected function LogCRUDDebug($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
-		IssueLog::Debug("CRUD --$sPadding $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+		IssueLog::Debug("CRUD --$sPadding $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 	}
 
 	protected function LogCRUDError($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '!');
-		IssueLog::Error("CRUD !!$sPadding Error $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+		IssueLog::Error("CRUD !!$sPadding Error $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 	}
 
 	/**

core/dbproperty.class.inc.php

@@ -51,7 +51,7 @@ class DBProperty extends DBObject
 		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeDateTime("change_date", array("allowed_values"=>null, "sql"=>"change_date", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("change_date", array("allowed_values"=>null, "sql"=>"change_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("change_comment", array("allowed_values"=>null, "sql"=>"change_comment", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 	}
 

core/dbsearch.class.php

@@ -1552,13 +1552,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

core/event.class.inc.php

@@ -39,7 +39,7 @@ class Event extends DBObject implements iDisplay
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 //		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
@@ -131,7 +131,7 @@ class EventNotification extends Event
 			"db_finalclass_field" => "",
 			"order_by_default" => array('date' => false),
 			'indexes' => array(
-				array( 'object_class', 'object_id'),
+				array('object_id'),
 			)
 		);
 		MetaModel::Init_Params($aParams);
@@ -139,11 +139,9 @@ class EventNotification extends Event
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> "", "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass" => "Action", "jointype" => "", "allowed_values" => null, "sql" => "action_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values" => null, "sql" => "object_id", "default_value" => 0, "is_null_allowed" => false, "depends_on" => array())));
-        //@since 3.2.0
-        MetaModel::Init_AddAttribute(new AttributeClass("object_class", array("class_category"=>"", "more_values"=>"", "sql"=>"object_class", "default_value"=>null, "is_null_allowed"=>true /*to avoid setting AbstractResource as default in database*/, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_class', 'object_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'message')); // Attributes to be displayed for a list
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -178,7 +176,7 @@ class EventNotificationEmail extends EventNotification
 		MetaModel::Init_AddAttribute(new AttributeTable("attachments", array("allowed_values"=>null, "sql"=>"attachments", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_class', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'message', 'to', 'subject', 'attachments')); // Attributes to be displayed for a list
 
 		// Search criteria

core/htmlsanitizer.class.inc.php

@@ -278,7 +278,7 @@ class HTMLDOMSanitizer extends DOMSanitizer
 	protected static $aTagsWhiteList = array(
 		'html' => array(),
 		'body' => array(),
-		'a' => array('href', 'name', 'style', 'class', 'target', 'title', 'data-role', 'data-object-class', 'data-object-id', 'data-object-key'),
+		'a' => array('href', 'name', 'style', 'class', 'target', 'title', 'data-role', 'data-object-class', 'data-object-id'),
 		'p' => array('style', 'class'),
 		'blockquote' => array('style', 'class'),
 		'br' => array(),
@@ -354,8 +354,6 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		'font-style',
 		'height',
 		'margin',
-		'margin-left',
-		'margin-right',
 		'padding',
 		'text-align',
 		'vertical-align',

core/inlineimage.class.inc.php

@@ -54,7 +54,7 @@ class InlineImage extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeDateTime("expire", array("allowed_values" => null, "sql" => 'expire', "default_value" => 'DATE_ADD(NOW(), INTERVAL 1 DAY)', "is_null_allowed" => false, "depends_on" => array(), "always_load_in_tables" => false)));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("expire", array("allowed_values"=>null, "sql"=>'expire', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeString("temp_id", array("allowed_values"=>null, "sql"=>'temp_id', "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeString("item_class", array("allowed_values"=>null, "sql"=>'item_class', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeObjectKey("item_id", array("class_attcode"=>'item_class', "allowed_values"=>null, "sql"=>'item_id', "is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
@@ -140,36 +140,21 @@ class InlineImage extends DBObject
 	 */
 	public function SetDefaultOrgId()
 	{
-		// First check that the organization CAN be fetched from the target class
-		//
-		$sClass = $this->Get('item_class');
-		$aCallSpec = array($sClass, 'MapContextParam');
-		if (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))
-			{
-				// Second: check that the organization CAN be fetched from the current user
-				//
-				if (MetaModel::IsValidClass('Person'))
-				{
-					$aCallSpec = array($sClass, 'MapContextParam');
-					if (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))
-						{
-							// OK - try it
-							//
-							$oCurrentPerson = MetaModel::GetObject('Person', UserRights::GetContactId(), false);
-							if ($oCurrentPerson)
-							{
-						 		$this->Set('item_org_id', $oCurrentPerson->Get($sAttCode));
-						 	}
-						}
-					}
-				}
-			}
+        // If the item class has no organization attribute, then no need to set the organization id
+		if (is_null(UserRights::GetOwnerOrganizationAttCode( $this->Get('item_class')))) {
+			// No need for silos
+			return;
+		}
+        // get  organization attribute code for the person class
+		$sOrgAttrCodeForPerson = UserRights::GetOwnerOrganizationAttCode('Person');
+		if (is_null($sOrgAttrCodeForPerson)) {
+			// No need for silos
+			return;
+		}
+
+		$oCurrentPerson = MetaModel::GetObject('Person', UserRights::GetContactId(), false);
+		if ($oCurrentPerson) {
+			$this->Set('item_org_id', $oCurrentPerson->Get($sOrgAttrCodeForPerson));
 		}
 	}
 

core/metamodel.class.php

@@ -7112,7 +7112,7 @@ abstract class MetaModel
 		if ($iKey < 0) {
 			return "$sTargetClass: $iKey (invalid value)";
 		}
-        $oObj = self::GetObject($sTargetClass, $iKey, false);
+		$oObj = self::GetObject($sTargetClass, $iKey, false);
 		if (is_null($oObj)) {
 			// Whatever we are looking for, the root class is the key to search for
 			$sRootClass = self::GetRootClass($sTargetClass);
@@ -7532,41 +7532,8 @@ abstract class MetaModel
 		return $aEntries;
 	}
 
-	public static function ResetAllCaches($sEnvironment = null)
-	{
-		if (is_null($sEnvironment)) {
-			$sEnvironment = MetaModel::GetEnvironment();
-		}
-
-		$sEnvironmentId = md5(APPROOT).'-'.$sEnvironment;
-		$sAppIdentity = 'itop-'.$sEnvironmentId;
-		require_once(APPROOT.'/core/dict.class.inc.php');
-		Dict::ResetCache($sAppIdentity);
-
-		if (function_exists('apc_delete')) {
-			foreach (self::GetCacheEntries($sEnvironmentId) as $sKey => $aAPCInfo) {
-				$sAPCKey = $aAPCInfo['info'];
-				apc_delete($sAPCKey);
-			}
-		}
-
-		require_once(APPROOT.'core/userrights.class.inc.php');
-		UserRights::FlushPrivileges();
-
-		// Reset the opcache since otherwise the PHP "model" files may still be cached !!
-		if (function_exists('opcache_reset')) {
-			// Zend opcode cache
-			opcache_reset();
-		}
-
-		require_once(APPROOT.'setup/setuputils.class.inc.php');
-		SetupUtils::rrmdir(utils::GetCachePath($sEnvironment));
-	}
-
 	/**
-	 * @internal
 	 * @param string $sEnvironmentId
-	 * @deprecated 3.2.1
 	 */
 	public static function ResetCache($sEnvironmentId = null)
 	{
@@ -7590,13 +7557,6 @@ abstract class MetaModel
 
 		require_once(APPROOT.'core/userrights.class.inc.php');
 		UserRights::FlushPrivileges();
-
-		// Reset the opcache since otherwise the PHP "model" files may still be cached !!
-		if (function_exists('opcache_reset'))
-		{
-			// Zend opcode cache
-			opcache_reset();
-		}
 	}
 
 	/**

core/oql/build/PHP/LexerGenerator/Lexer.php

@@ -182,14 +182,14 @@ class PHP_LexerGenerator_Lexer
             $this->token = self::COMMENTEND;
             return true;
         }
-        if (preg_match('/\G%([a-z]+)/', $this->data, $token, 0, $this->N)) {
+        if (preg_match('/\G%([a-z]+)/', $this->data, $token, null, $this->N)) {
             $this->value = $token[1];
             $this->N += strlen($token[1]) + 1;
             $this->state = 'DeclarePI';
             $this->token = self::PI;
             return true;
         }
-        if (preg_match('/\G[a-zA-Z_][a-zA-Z0-9_]*/', $this->data, $token, 0, $this->N)) {
+        if (preg_match('/\G[a-zA-Z_][a-zA-Z0-9_]*/', $this->data, $token, null, $this->N)) {
             $this->value = $token[0];
             $this->token = self::PATTERN;
             $this->N += strlen($token[0]);
@@ -216,7 +216,7 @@ class PHP_LexerGenerator_Lexer
         if ($this->data[$this->N] == '{') {
             return $this->lexCode();
         }
-        if (!preg_match("/\G[^\n]+/", $this->data, $token, 0, $this->N)) {
+        if (!preg_match("/\G[^\n]+/", $this->data, $token, null, $this->N)) {
             $this->error('Unexpected end of file');
             return false;
         }
@@ -242,7 +242,7 @@ class PHP_LexerGenerator_Lexer
         if ($this->data[$this->N] == '{') {
             return $this->lexCode();
         }
-        if (!preg_match("/\G[^\n]+/", $this->data, $token, 0, $this->N)) {
+        if (!preg_match("/\G[^\n]+/", $this->data, $token, null, $this->N)) {
             $this->error('Unexpected end of file');
             return false;
         }
@@ -406,7 +406,7 @@ class PHP_LexerGenerator_Lexer
         if ($this->data[$this->N] == '\'') {
             return $this->lexQuote('\'');
         }
-        if (preg_match('/\G%([a-zA-Z_]+)/', $this->data, $token, 0, $this->N)) {
+        if (preg_match('/\G%([a-zA-Z_]+)/', $this->data, $token, null, $this->N)) {
             $this->value = $token[1];
             $this->N += strlen($token[1]) + 1;
             $this->state = 'DeclarePIRule';
@@ -419,7 +419,7 @@ class PHP_LexerGenerator_Lexer
         if ($this->data[$this->N] == '"') {
             return $this->lexQuote();
         }
-        if (preg_match('/\G[a-zA-Z_][a-zA-Z0-9_]*/', $this->data, $token, 0, $this->N)) {
+        if (preg_match('/\G[a-zA-Z_][a-zA-Z0-9_]*/', $this->data, $token, null, $this->N)) {
             $this->value = $token[0];
             $this->N += strlen($token[0]);
             $this->token = self::SUBPATTERN;

core/oql/build/PHP/LexerGenerator/Parser.php

@@ -33,19 +33,17 @@ class PHP_LexerGenerator_ParseryyToken implements ArrayAccess
         return $this->_string;
     }
 
-    function offsetExists($offset): bool
+    function offsetExists($offset)
     {
         return isset($this->metadata[$offset]);
     }
 
-	// Return type mixed is not supported by PHP 7.4, we can remove the following PHP attribute and add the return type once iTop min PHP version is PHP 8.0+
-	#[\ReturnTypeWillChange]
     function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
 
-    function offsetSet($offset, $value): void
+    function offsetSet($offset, $value)
     {
         if ($offset === null) {
             if (isset($value[0])) {
@@ -68,7 +66,7 @@ class PHP_LexerGenerator_ParseryyToken implements ArrayAccess
         }
     }
 
-    function offsetUnset($offset): void
+    function offsetUnset($offset)
     {
         unset($this->metadata[$offset]);
     }
@@ -280,7 +278,7 @@ class PHP_LexerGenerator_Parser#line 171 "Parser.php"
                     $match = false;
                     foreach ($yy_yymore_patterns[' . $this->token . '] as $index => $rule) {
                         if (preg_match(\'/\' . $rule . \'/' . $this->patternFlags . '\',
-                                ' . $this->input . ', $yymatches, 0, ' . $this->counter . ')) {
+                                ' . $this->input . ', $yymatches, null, ' . $this->counter . ')) {
                             $yymatches = array_filter($yymatches, \'strlen\'); // remove empty sub-patterns
                             if ($match) {
                                 if (strlen($yymatches[0]) > strlen($match[0][0])) {
@@ -352,7 +350,7 @@ class PHP_LexerGenerator_Parser#line 171 "Parser.php"
             $pattern . '\';' . "\n");
         fwrite($this->out, '
         do {
-            if (preg_match($yy_global_pattern,' . $this->input . ', $yymatches, 0, ' .
+            if (preg_match($yy_global_pattern,' . $this->input . ', $yymatches, null, ' .
              $this->counter .
                     ')) {
                 $yysubmatches = $yymatches;
@@ -410,7 +408,7 @@ class PHP_LexerGenerator_Parser#line 171 "Parser.php"
                         }
                         $yysubmatches = array();
                         if (preg_match(\'/\' . $yy_yymore_patterns[' . $this->token . '][1] . \'/' . $this->patternFlags . '\',
-                              ' . $this->input . ', $yymatches, 0, ' . $this->counter .')) {
+                              ' . $this->input . ', $yymatches, null, ' . $this->counter .')) {
                             $yysubmatches = $yymatches;
                             $yymatches = array_filter($yymatches, \'strlen\'); // remove empty sub-patterns
                             next($yymatches); // skip global match

core/oql/build/PHP/LexerGenerator/Parser.y

@@ -187,7 +187,7 @@ require_once 'PHP/LexerGenerator/Exception.php';
                     $match = false;
                     foreach ($yy_yymore_patterns[' . $this->token . '] as $index => $rule) {
                         if (preg_match(\'/\' . $rule . \'/' . $this->patternFlags . '\',
-                                ' . $this->input . ', $yymatches, 0, ' . $this->counter . ')) {
+                                ' . $this->input . ', $yymatches, null, ' . $this->counter . ')) {
                             $yymatches = array_filter($yymatches, \'strlen\'); // remove empty sub-patterns
                             if ($match) {
                                 if (strlen($yymatches[0]) > strlen($match[0][0])) {
@@ -259,7 +259,7 @@ require_once 'PHP/LexerGenerator/Exception.php';
             $pattern . '\';' . "\n");
         fwrite($this->out, '
         do {
-            if (preg_match($yy_global_pattern,' . $this->input . ', $yymatches, 0, ' .
+            if (preg_match($yy_global_pattern,' . $this->input . ', $yymatches, null, ' .
              $this->counter .
                     ')) {
                 $yysubmatches = $yymatches;
@@ -317,7 +317,7 @@ require_once 'PHP/LexerGenerator/Exception.php';
                         }
                         $yysubmatches = array();
                         if (preg_match(\'/\' . $yy_yymore_patterns[' . $this->token . '][1] . \'/' . $this->patternFlags . '\',
-                              ' . $this->input . ', $yymatches, 0, ' . $this->counter .')) {
+                              ' . $this->input . ', $yymatches, null, ' . $this->counter .')) {
                             $yysubmatches = $yymatches;
                             $yymatches = array_filter($yymatches, \'strlen\'); // remove empty sub-patterns
                             next($yymatches); // skip global match

core/oql/build/PHP/LexerGenerator/Regex/Lexer.php

@@ -110,7 +110,7 @@ class PHP_LexerGenerator_Regex_Lexer
         $yy_global_pattern = '/\G(\\\\\\\\)|\G([^[\\\\^$.|()?*+{}]+)|\G(\\\\[][{}*.^$|?()+])|\G(\\[)|\G(\\|)|\G(\\\\[frnt]|\\\\x[0-9a-fA-F][0-9a-fA-F]?|\\\\[0-7][0-7][0-7]|\\\\x\\{[0-9a-fA-F]+\\})|\G(\\\\[0-9][0-9])|\G(\\\\[abBGcedDsSwW0C]|\\\\c\\\\)|\G(\\^)|\G(\\\\A)|\G(\\))|\G(\\$)|\G(\\*\\?|\\+\\?|[*?+]|\\{[0-9]+\\}|\\{[0-9]+,\\}|\\{[0-9]+,[0-9]+\\})|\G(\\\\[zZ])|\G(\\(\\?)|\G(\\()|\G(\\.)|\G(\\\\[1-9])|\G(\\\\p\\{\\^?..?\\}|\\\\P\\{..?\\}|\\\\X)|\G(\\\\p\\{C[cfnos]?|L[lmotu]?|M[cen]?|N[dlo]?|P[cdefios]?|S[ckmo]?|Z[lps]?\\})|\G(\\\\p\\{\\^C[cfnos]?|L[lmotu]?|M[cen]?|N[dlo]?|P[cdefios]?|S[ckmo]?|Z[lps]?\\})|\G(\\\\p[CLMNPSZ])|\G(\\\\)/';
 
         do {
-            if (preg_match($yy_global_pattern,$this->input, $yymatches, 0, $this->N)) {
+            if (preg_match($yy_global_pattern,$this->input, $yymatches, null, $this->N)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -180,7 +180,7 @@ class PHP_LexerGenerator_Regex_Lexer
                         }
                         $yysubmatches = array();
                         if (preg_match('/' . $yy_yymore_patterns[$this->token][1] . '/',
-                              $this->input, $yymatches, 0, $this->N)) {
+                              $this->input, $yymatches, null, $this->N)) {
                             $yysubmatches = $yymatches;
                             $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                             next($yymatches); // skip global match
@@ -360,7 +360,7 @@ class PHP_LexerGenerator_Regex_Lexer
         $yy_global_pattern = '/\G(\\^)|\G(\\])|\G(.)/';
 
         do {
-            if (preg_match($yy_global_pattern,$this->input, $yymatches, 0, $this->N)) {
+            if (preg_match($yy_global_pattern,$this->input, $yymatches, null, $this->N)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -410,7 +410,7 @@ class PHP_LexerGenerator_Regex_Lexer
                         }
                         $yysubmatches = array();
                         if (preg_match('/' . $yy_yymore_patterns[$this->token][1] . '/',
-                              $this->input, $yymatches, 0, $this->N)) {
+                              $this->input, $yymatches, null, $this->N)) {
                             $yysubmatches = $yymatches;
                             $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                             next($yymatches); // skip global match
@@ -497,7 +497,7 @@ class PHP_LexerGenerator_Regex_Lexer
         $yy_global_pattern = '/\G(\\\\\\\\)|\G(\\])|\G(\\\\[frnt]|\\\\x[0-9a-fA-F][0-9a-fA-F]?|\\\\[0-7][0-7][0-7]|\\\\x\\{[0-9a-fA-F]+\\})|\G(\\\\[bacedDsSwW0C]|\\\\c\\\\|\\\\x\\{[0-9a-fA-F]+\\}|\\\\[0-7][0-7][0-7]|\\\\x[0-9a-fA-F][0-9a-fA-F]?)|\G(\\\\[0-9][0-9])|\G(\\\\[1-9])|\G(\\\\[]\.\-\^])|\G(-(?!]))|\G([^\-\\\\])|\G(\\\\)|\G(.)/';
 
         do {
-            if (preg_match($yy_global_pattern,$this->input, $yymatches, 0, $this->N)) {
+            if (preg_match($yy_global_pattern,$this->input, $yymatches, null, $this->N)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -555,7 +555,7 @@ class PHP_LexerGenerator_Regex_Lexer
                         }
                         $yysubmatches = array();
                         if (preg_match('/' . $yy_yymore_patterns[$this->token][1] . '/',
-                              $this->input, $yymatches, 0, $this->N)) {
+                              $this->input, $yymatches, null, $this->N)) {
                             $yysubmatches = $yymatches;
                             $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                             next($yymatches); // skip global match
@@ -678,7 +678,7 @@ class PHP_LexerGenerator_Regex_Lexer
         $yy_global_pattern = '/\G(\\\\\\\\)|\G(\\\\\\])|\G(\\\\[bacedDsSwW0C]|\\\\c\\\\|\\\\x\\{[0-9a-fA-F]+\\}|\\\\[0-7][0-7][0-7]|\\\\x[0-9a-fA-F][0-9a-fA-F]?)|\G(\\\\[0-9][0-9])|\G(\\\\[1-9])|\G([^\-\\\\])|\G(\\\\)/';
 
         do {
-            if (preg_match($yy_global_pattern,$this->input, $yymatches, 0, $this->N)) {
+            if (preg_match($yy_global_pattern,$this->input, $yymatches, null, $this->N)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -732,7 +732,7 @@ class PHP_LexerGenerator_Regex_Lexer
                         }
                         $yysubmatches = array();
                         if (preg_match('/' . $yy_yymore_patterns[$this->token][1] . '/',
-                              $this->input, $yymatches, 0, $this->N)) {
+                              $this->input, $yymatches, null, $this->N)) {
                             $yysubmatches = $yymatches;
                             $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                             next($yymatches); // skip global match
@@ -842,7 +842,7 @@ class PHP_LexerGenerator_Regex_Lexer
         $yy_global_pattern = '/\G([imsxUX]+-[imsxUX]+|[imsxUX]+|-[imsxUX]+)|\G(:)|\G(\\))|\G(P<[^>]+>)|\G(<=)|\G(<!)|\G(=)|\G(!)|\G(>)|\G(\\(\\?)|\G(#[^)]+)|\G(R)|\G(.)/';
 
         do {
-            if (preg_match($yy_global_pattern,$this->input, $yymatches, 0, $this->N)) {
+            if (preg_match($yy_global_pattern,$this->input, $yymatches, null, $this->N)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -902,7 +902,7 @@ class PHP_LexerGenerator_Regex_Lexer
                         }
                         $yysubmatches = array();
                         if (preg_match('/' . $yy_yymore_patterns[$this->token][1] . '/',
-                              $this->input, $yymatches, 0, $this->N)) {
+                              $this->input, $yymatches, null, $this->N)) {
                             $yysubmatches = $yymatches;
                             $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                             next($yymatches); // skip global match

core/oql/build/PHP/LexerGenerator/Regex/Parser.php

@@ -33,19 +33,17 @@ class PHP_LexerGenerator_Regex_yyToken implements ArrayAccess
         return $this->_string;
     }
 
-    function offsetExists($offset): bool
+    function offsetExists($offset)
     {
         return isset($this->metadata[$offset]);
     }
 
-	// Return type mixed is not supported by PHP 7.4, we can remove the following PHP attribute and add the return type once iTop min PHP version is PHP 8.0+
-	#[\ReturnTypeWillChange]
     function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
 
-    function offsetSet($offset, $value): void
+    function offsetSet($offset, $value)
     {
         if ($offset === null) {
             if (isset($value[0])) {
@@ -68,7 +66,7 @@ class PHP_LexerGenerator_Regex_yyToken implements ArrayAccess
         }
     }
 
-    function offsetUnset($offset): void
+    function offsetUnset($offset)
     {
         unset($this->metadata[$offset]);
     }

core/oql/expression.class.inc.php

@@ -575,15 +575,6 @@ class BinaryExpression extends Expression
 			case 'LIKE':
 				$sType = 'like';
 				break;
-			case 'NOT LIKE':
-				$sType = 'notlike';
-				break;
-			case 'IN':
-				$sType = 'in';
-				break;
-			case 'NOT IN':
-				$sType = 'notin';
-				break;
 			default:
 				throw new Exception("Operator '$sOperator' not yet supported");
 		}
@@ -648,26 +639,7 @@ class BinaryExpression extends Expression
 			case 'like':
 				$sEscaped = preg_quote($mRight, '/');
 				$sEscaped = str_replace(array('%', '_', '\\\\.*', '\\\\.'), array('.*', '.', '%', '_'), $sEscaped);
-				$pregRes = preg_match("/$sEscaped/i", $mLeft);
-				if ($pregRes === false) {
-					throw new Exception("Error in regular expression '$sEscaped'");
-				}
-				$result = ($pregRes === 1);
-				break;
-			case 'notlike':
-				$sEscaped = preg_quote($mRight, '/');
-				$sEscaped = str_replace(array('%', '_', '\\\\.*', '\\\\.'), array('.*', '.', '%', '_'), $sEscaped);
-				$pregRes = preg_match("/$sEscaped/i", $mLeft);
-				if ($pregRes === false) {
-					throw new Exception("Error in regular expression '$sEscaped'");
-				}
-				$result = ($pregRes !== 1);
-				break;
-			case 'in':
-				$result = in_array($mLeft, $mRight);
-				break;
-			case 'notin':
-				$result = !in_array($mLeft, $mRight);
+				$result = (int) preg_match("/$sEscaped/i", $mLeft);
 				break;
 		}
 		return $result;
@@ -2278,12 +2250,7 @@ class ListExpression extends Expression
 */
 	public function Evaluate(array $aArgs)
 	{
-		//throw new Exception('list expression not yet supported');
-		$aResult = [];
-		foreach ($this->m_aExpressions as $oExpressions) {
-			$aResult[] = $oExpressions->Evaluate($aArgs);
-		}
-		return $aResult;
+		throw new Exception('list expression not yet supported');
 	}
 
 	/**

core/oql/oql-lexer.php

@@ -235,7 +235,7 @@ class OQLLexerRaw
                     $match = false;
                     foreach ($yy_yymore_patterns[$this->token] as $index => $rule) {
                         if (preg_match('/' . $rule . '/',
-                                $this->data, $yymatches, 0, $this->count)) {
+                                $this->data, $yymatches, null, $this->count)) {
                             $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                             if ($match) {
                                 if (strlen($yymatches[0]) > strlen($match[0][0])) {

core/oql/oql-parser.y

@@ -71,24 +71,28 @@ class_list(A) ::= class_list(L) COMA class_name(X). {
 where_statement(A) ::= WHERE condition(C). { A = C;}
 where_statement(A) ::= . { A = null;}
 
-join_statement(A) ::= join_statement(S) JOIN join_item(J). {
+join_statement(A) ::= join_item(J) join_statement(S). {
 	// insert the join statement on top of the existing list
-	array_push(S, J);
+	array_unshift(S, J);
 	// and return the updated array
 	A = S;
 }
-join_statement(A) ::= . { A = [];}
+join_statement(A) ::= join_item(J). {
+	A = Array(J);
+}
+join_statement(A) ::= . { A = null;}
 
-join_item(A) ::= class_name(X) AS_ALIAS class_name(Y) ON join_condition(C).
+join_item(A) ::= JOIN class_name(X) AS_ALIAS class_name(Y) ON join_condition(C).
 {
 	// create an array with one single item
 	A = new OqlJoinSpec(X, Y, C);
 }
-join_item(A) ::= class_name(X) ON join_condition(C).
+join_item(A) ::= JOIN class_name(X) ON join_condition(C).
 {
 	// create an array with one single item
 	A = new OqlJoinSpec(X, X, C);
 }
+
 join_condition(A) ::= field_id(X) EQ field_id(Y). { A = new BinaryOqlExpression(X, '=', Y); }
 join_condition(A) ::= field_id(X) BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW', Y); }
 join_condition(A) ::= field_id(X) BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW_STRICT', Y); }

core/oql/oqlinterpreter.class.inc.php

@@ -36,13 +36,7 @@ class UnknownClassOqlException extends OqlNormalizeException
 {
 	public function __construct($sInput, OqlName $oName, $aExpecting = null)
 	{
-		$aAllowedClasses = [];
-		foreach ($aExpecting as $sClass) {
-			if (UserRights::IsActionAllowed($sClass, UR_ACTION_READ)) {
-				$aAllowedClasses[] = $sClass;
-			}
-		}
-		parent::__construct('Unknown class', $sInput, $oName, $aAllowedClasses);
+		parent::__construct('Unknown class', $sInput, $oName, $aExpecting);
 	}
 
 	public function GetUserFriendlyDescription()

core/ormdocument.class.inc.php

@@ -48,42 +48,6 @@ class ormDocument
 	 * @since 3.1.0
 	 */
 	public const DEFAULT_DOWNLOADS_COUNT = 0;
-	private static $aKnownExtensions = [
-		'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-		'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-		'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-		'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-		'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-		'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-		'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-		'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-		'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
-		'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-		'jpg'  => 'image/jpeg',
-		'jpeg' => 'image/jpeg',
-		'gif'  => 'image/gif',
-		'png'  => 'image/png',
-		'pdf'  => 'application/pdf',
-		'doc'  => 'application/msword',
-		'dot'  => 'application/msword',
-		'xls'  => 'application/vnd.ms-excel',
-		'ppt'  => 'application/vnd.ms-powerpoint',
-		'vsd'  => 'application/x-visio',
-		'vdx'  => 'application/visio.drawing',
-		'odt'  => 'application/vnd.oasis.opendocument.text',
-		'ods'  => 'application/vnd.oasis.opendocument.spreadsheet',
-		'odp'  => 'application/vnd.oasis.opendocument.presentation',
-		'zip'  => 'application/zip',
-		'txt'  => 'text/plain',
-		'htm'  => 'text/html',
-		'html' => 'text/html',
-		'exe'  => 'application/octet-stream',
-	];
-
-	public static function GetKnownExtensions(): array
-	{
-		return self::$aKnownExtensions;
-	}
 
 	protected $m_data;
 	protected $m_sMimeType;
@@ -112,36 +76,6 @@ class ormDocument
 		$this->m_iDownloadsCount = $iDownloadsCount;
 	}
 
-	/**
-	 * @param string $sPath Absolute path of the document to read
-	 *
-	 * @return \ormDocument
-	 * @throws \Exception
-	 */
-	public static function FromFile(string $sPath): ormDocument
-	{
-		$sPath = utils::RealPath($sPath, APPROOT);
-		if (false === $sPath) {
-			throw new Exception("Failed to load the file '$sPath'. The file does not exist or the current process is not allowed to access it.");
-		}
-		$sData = @file_get_contents($sPath);
-		if (false === $sData) {
-			throw new Exception("Failed to load the file '$sPath'. The file does not exist or the current process is not allowed to access it.");
-		}
-		$sExtension = strtolower(pathinfo($sPath, PATHINFO_EXTENSION));
-		$sFileName = basename($sPath);
-
-		$sMimeType = 'text/plain';
-		if (array_key_exists($sExtension, ormDocument::$aKnownExtensions)) {
-			$sMimeType = ormDocument::$aKnownExtensions[$sExtension];
-		} else if (extension_loaded('fileinfo')) {
-			$fInfo = new finfo(FILEINFO_MIME);
-			$sMimeType = $fInfo->file($sPath);
-		}
-
-		return new ormDocument($sData, $sMimeType, $sFileName);
-	}
-
 	public function __toString()
 	{
 	    if($this->IsEmpty()) return '';
@@ -380,7 +314,7 @@ class ormDocument
 					'document' => $oDocument,
 					'content_disposition' => $sContentDisposition,
 					);
-				EventService::FireEvent(new EventData(\EVENT_DOWNLOAD_DOCUMENT, $sClass, $aEventData));
+				EventService::FireEvent(new EventData(EVENT_DOWNLOAD_DOCUMENT, $sClass, $aEventData));
 				$oPage->TrashUnexpectedOutput();
 				$oPage->SetContentType($oDocument->GetMimeType());
 				$oPage->SetContentDisposition($sContentDisposition,$oDocument->GetFileName());

core/ownershiplock.class.inc.php

@@ -42,8 +42,8 @@ class iTopOwnershipToken extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeDateTime("acquired", array("allowed_values"=>null, "sql"=>'acquired', "default_value"=>'NOW()', "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("last_seen", array("allowed_values"=>null, "sql"=>'last_seen', "default_value"=>'NOW()', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("acquired", array("allowed_values"=>null, "sql"=>'acquired', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("last_seen", array("allowed_values"=>null, "sql"=>'last_seen', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("obj_class", array("allowed_values"=>null, "sql"=>'obj_class', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("obj_key", array("allowed_values"=>null, "sql"=>'obj_key', "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("token", array("allowed_values"=>null, "sql"=>'token', "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));

core/restservices.class.inc.php

@@ -44,8 +44,6 @@ class ObjectResult
 	 * @var string
 	 * @api
 	 */
-    use SanitizeTrait;
-
 	public $message;
 	/**
 	 * @var mixed|null
@@ -158,18 +156,6 @@ class ObjectResult
 	{
 		$this->fields[$sAttCode] = $this->MakeResultValue($oObject, $sAttCode, $bExtendedOutput);
 	}
-
-	public function SanitizeContent()
-	{
-		foreach($this->fields as $sFieldAttCode => $fieldValue) {
-            try {
-			$oAttDef = MetaModel::GetAttributeDef($this->class, $sFieldAttCode);
-            } catch (Exception $e) { // for special cases like ID
-                continue;
-            }
-			$this->SanitizeFieldIfSensitive($this->fields, $sFieldAttCode, $fieldValue, $oAttDef);
-		}
-	}
 }
 
 
@@ -185,7 +171,23 @@ class RestResultWithObjects extends RestResult
 	/** @var array "DBObject_class:DBObject_key" as key, {@see \ObjectResult} as value */
 	public $objects;
 
-	public function PrepareObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
+	/**
+	 * Report the given object
+	 *
+	 * @api
+	 * @param int $iCode An error code (RestResult::OK is no issue has been found)
+	 * @param string $sMessage Description of the error if any, an empty string otherwise
+	 * @param DBObject $oObject The object being reported
+	 * @param array|null $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
+	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 */
+	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
 	{
 		$sClass = get_class($oObject);
 		$oObjRes = new ObjectResult($sClass, $oObject->GetKey());
@@ -216,80 +218,9 @@ class RestResultWithObjects extends RestResult
 			$oObjRes->AddField($oObject, $sAttCode, $bExtendedOutput);
 		}
 
-		return $oObjRes;
-	}
-
-	/**
-	 * Report the given object
-	 *
-	 * @api
-	 * @param int $iCode An error code (RestResult::OK is no issue has been found)
-	 * @param string $sMessage Description of the error if any, an empty string otherwise
-	 * @param DBObject $oObject The object being reported
-	 * @param array|null $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
-	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 *
-	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 */
-	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
-	{
-		$oObjRes = $this->PrepareObject($iCode, $sMessage, $oObject, $aFieldSpec, $bExtendedOutput);
 		$sObjKey = get_class($oObject).'::'.$oObject->GetKey();
 		$this->objects[$sObjKey] = $oObjRes;
 	}
-
-public function SanitizeContent()
-	{
-		parent::SanitizeContent();
-
-		foreach($this->objects as $sObjKey => $oObjRes)
-		{
-			$oObjRes->SanitizeContent();
-		}
-	}
-}
-
-/**
- * @package RESTAPI
- * @api
- */
-class RestResultWithObjectSets extends RestResultWithObjects
-{
-	private $current_object = null;
-
-	public function MakeNewObjectSet()
-	{
-		$arr = array();
-		$this->current_object = &$arr;
-		$this->objects[] = &$arr;
-	}
-
-	/**
-	 * Report the given object
-	 *
-	 * @api
-	 * @param string $sObjectAlias Name of the subobject, usually the OQL class alias
-	 * @param int $iCode An error code (RestResult::OK is no issue has been found)
-	 * @param string $sMessage Description of the error if any, an empty string otherwise
-	 * @param DBObject $oObject The object being reported
-	 * @param array|null $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
-	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 *
-	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 */
-	public function AppendSubObject($sObjectAlias, $iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
-	{
-		$oObjRes = $this->PrepareObject($iCode, $sMessage, $oObject, $aFieldSpec, $bExtendedOutput);
-		$this->current_object[$sObjectAlias] = $oObjRes;
-	}
 }
 
 /**
@@ -377,10 +308,9 @@ class RestDelete
  *
  * @package     Core
  */
-class CoreServices implements iRestServiceProvider, iRestInputSanitizer
+class CoreServices implements iRestServiceProvider
 {
-    use SanitizeTrait;
-    /**
+	/**
 	 * Enumerate services delivered by this class
 	 * 	 
 	 * @param string $sVersion The version (e.g. 1.0) supported by the services
@@ -571,21 +501,14 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 			break;
 	
 		case 'core/get':
-			$sClassParam =  RestUtils::GetMandatoryParam($aParams, 'class');
+			$sClass = RestUtils::GetClass($aParams, 'class');
 			$key = RestUtils::GetMandatoryParam($aParams, 'key');
-			$sShowFields = RestUtils::GetOptionalParam($aParams, 'output_fields', '*');
+			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
 			$iLimit = (int)RestUtils::GetOptionalParam($aParams, 'limit', 0);
 			$iPage = (int)RestUtils::GetOptionalParam($aParams, 'page', 1);
 
-			// Validate the class(es)
-			$aClass = explode(',', $sClassParam);
-			foreach ($aClass as $sClass) {
-				if (!MetaModel::IsValidClass(trim($sClass))) {
-					throw new Exception("class '$sClass' is not valid");
-				}
-			}
-
-			$oObjectSet = RestUtils::GetObjectSetFromKey($sClassParam, $key, $iLimit, self::getOffsetFromLimitAndPage($iLimit, $iPage));
+			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key, $iLimit, self::getOffsetFromLimitAndPage($iLimit, $iPage));
 			$sTargetClass = $oObjectSet->GetFilter()->GetClass();
 	
 			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ) != UR_ALLOWED_YES)
@@ -603,68 +526,23 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 			    $oResult->code = RestResult::INVALID_PAGE;
 			    $oResult->message = "The request page number is not valid. It must be an integer greater than 0";
             }
-			elseif (count($oObjectSet->GetSelectedClasses()) > 1)
+			else
 			{
-				$oResult = new RestResultWithObjectSets();
-				$aCache = [];
-				$aShowFields = [];
-				foreach ($oObjectSet->GetSelectedClasses() as $sSelectedClass) {
-					$aShowFields = array_merge( $aShowFields, RestUtils::GetFieldList($sSelectedClass, $aParams, 'output_fields', false));
-				}
-
-				while ($oObjects = $oObjectSet->FetchAssoc()) {
-					$oResult->MakeNewObjectSet();
-
-					foreach ($oObjects as $sAlias => $oObject) {
-						if (!$oObject) {
-							continue;
-						}
-
-						if (!array_key_exists($sAlias, $aCache)) {
-							$sClass = get_class($oObject);
-							$bExtendedOutput = RestUtils::HasRequestedExtendedOutput($sShowFields);
-
-							if (!RestUtils::HasRequestedAllOutputFields($sShowFields)) {
-								$aFields = $aShowFields[$sClass];
-								//Id is not a valid attribute to optimize
-								if ($aFields && in_array('id', $aFields)) {
-									unset($aFields[array_search('id', $aFields)]);
-								}
-								$aAttToLoad = [$sAlias => $aFields];
-								$oObjectSet->OptimizeColumnLoad($aAttToLoad);
-							}
-							$aCache[$sAlias] = [
-								'aShowFields' => $aShowFields,
-								'bExtendedOutput' => $bExtendedOutput,
-							];
-						} else {
-							$aShowFields = $aCache[$sAlias]['aShowFields'];
-							$bExtendedOutput = $aCache[$sAlias]['bExtendedOutput'];
-						}
-
-						$oResult->AppendSubObject($sAlias, 0, '', $oObject, $aShowFields, $bExtendedOutput);
-					}
-				}
-				$oResult->message = "Found: ".$oObjectSet->Count();
-			} else {
-				$aShowFields =[];
-				foreach ($aClass  as $sSelectedClass) {
-					$sSelectedClass = trim($sSelectedClass);
-					$aShowFields = array_merge($aShowFields, RestUtils::GetFieldList($sSelectedClass, $aParams, 'output_fields', false));
-				}
-
-                if (!RestUtils::HasRequestedAllOutputFields($sShowFields) && count($aShowFields) == 1) {
-	                $aFields = $aShowFields[$sClass];
-	                //Id is not a valid attribute to optimize
-	                if (in_array('id', $aFields)) {
-	                    unset($aFields[array_search('id', $aFields)]);
-	                }
-	                $aAttToLoad = array($oObjectSet->GetClassAlias() => $aFields);
-	                $oObjectSet->OptimizeColumnLoad($aAttToLoad);
-                }
-
-				while ($oObject = $oObjectSet->Fetch()) {
-					$oResult->AddObject(0, '', $oObject, $aShowFields, RestUtils::HasRequestedExtendedOutput($sShowFields));
+                                if (!$bExtendedOutput && RestUtils::GetOptionalParam($aParams, 'output_fields', '*') != '*') 
+                                {
+                                        $aFields = $aShowFields[$sClass];
+                                        //Id is not a valid attribute to optimize
+                                        if (in_array('id', $aFields)) 
+                                        {
+                                            unset($aFields[array_search('id', $aFields)]);
+                                        }
+                                        $aAttToLoad = array($oObjectSet->GetClassAlias() => $aFields);
+                                        $oObjectSet->OptimizeColumnLoad($aAttToLoad);
+                                }
+                                
+				while ($oObject = $oObjectSet->Fetch())
+				{
+					$oResult->AddObject(0, '', $oObject, $aShowFields, $bExtendedOutput);
 				}
 				$oResult->message = "Found: ".$oObjectSet->Count();
 			}
@@ -859,33 +737,6 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 		return $oResult;
 	}
 
-	public function SanitizeJsonInput(string $sJsonInput): string
-	{
-        $sSanitizedJsonInput = $sJsonInput;
-        $aJsonData = json_decode($sSanitizedJsonInput, true);
-        $sOperation = $aJsonData['operation'];
-
-        switch ($sOperation) {
-            case 'core/check_credentials':
-                if (isset($aJsonData['password'])) {
-                    $aJsonData['password'] = '*****';
-                }
-                break;
-            case 'core/update':
-            case 'core/create':
-            default :
-            $sClass = $aJsonData['class'];
-            if (isset($aJsonData['fields'])) {
-                foreach ($aJsonData['fields'] as $sFieldAttCode => $fieldValue) {
-                    $oAttDef = MetaModel::GetAttributeDef($sClass, $sFieldAttCode);
-                    $this->SanitizeFieldIfSensitive($aJsonData['fields'], $sFieldAttCode, $fieldValue, $oAttDef);
-                }
-            }
-            break;
-        }
-		return json_encode($aJsonData, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
-	}
-
 	/**
 	 * Helper for object deletion	
 	 */
@@ -1024,53 +875,3 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 		return $iLimit * max(0, $iPage - 1);
 	}
 }
-
-/**
- * Sanitizes sensitive fields on a "json ready" representation of a DBObject
- * Useful for logging purposes
- */
-trait SanitizeTrait
-{
-    /**
-     * Sanitize a field if it is sensitive.
-     *
-     * @param array $fields The fields array
-     * @param string $sFieldAttCode The attribute code
-     * @param mixed $oAttDef The attribute definition
-     * @throws Exception
-     */
-    private function SanitizeFieldIfSensitive(array &$fields, string $sFieldAttCode, $fieldValue, $oAttDef): void
-    {
-        // for simple attribute
-        if ($oAttDef instanceof iAttributeNoGroupBy) { // iAttributeNoGroupBy is equivalent to sensitive attribute
-            $fields[$sFieldAttCode] = '*****';
-            return;
-        }
-        // for 1-n / n-n relation
-        if ($oAttDef instanceof AttributeLinkedSet) {
-            foreach ($fieldValue as $i => $aLnkValues) {
-                foreach ($aLnkValues as $sLnkAttCode => $sLnkValue) {
-                    $oLnkAttDef = MetaModel::GetAttributeDef($oAttDef->GetLinkedClass(), $sLnkAttCode);
-                    if ($oLnkAttDef instanceof iAttributeNoGroupBy) { // 1-n relation
-                        $fields[$sFieldAttCode][$i][$sLnkAttCode] = '*****';
-                    }
-                    elseif ($oAttDef instanceof AttributeLinkedSetIndirect && $oLnkAttDef instanceof AttributeExternalField) { // for n-n relation
-                        $oExtKeyAttDef = MetaModel::GetAttributeDef($oLnkAttDef->GetTargetClass(), $oLnkAttDef->GetExtAttCode());
-                        if ($oExtKeyAttDef instanceof iAttributeNoGroupBy) {
-                            $fields[$sFieldAttCode][$i][$sLnkAttCode] = '*****';
-                        }
-                    }
-                }
-            }
-            return;
-        }
-
-        // for external attribute
-        if ($oAttDef instanceof AttributeExternalField) {
-            $oExtKeyAttDef = MetaModel::GetAttributeDef($oAttDef->GetTargetClass(), $oAttDef->GetExtAttCode());
-            if ($oExtKeyAttDef instanceof iAttributeNoGroupBy) {
-                $fields[$sFieldAttCode] = '*****';
-            }
-        }
-    }
-}

core/simplegraph.class.inc.php

@@ -500,17 +500,17 @@ EOF
 		if (file_exists($sDotExecutable))
 		{
 			// create the file with Graphviz
-			if (!is_dir(utils::GetDataPath()))
+			if (!is_dir(APPROOT."data"))
 			{
-				@mkdir(utils::GetDataPath());
+				@mkdir(APPROOT."data");
 			}
-			if (!is_dir(utils::GetDataPath()."tmp"))
+			if (!is_dir(APPROOT."data/tmp"))
 			{
-				@mkdir(utils::GetDataPath()."tmp");
+				@mkdir(APPROOT."data/tmp");
 			}
-			$sImageFilePath = tempnam(utils::GetDataPath()."tmp", 'png-');
+			$sImageFilePath = tempnam(APPROOT."data/tmp", 'png-');
 			$sDotDescription = $this->GetDotDescription();
-			$sDotFilePath = tempnam(utils::GetDataPath()."tmp", 'dot-');
+			$sDotFilePath = tempnam(APPROOT."data/tmp", 'dot-');
 		
 			$rFile = @fopen($sDotFilePath, "w");
 			@fwrite($rFile, $sDotDescription);
@@ -556,17 +556,17 @@ EOF
 		if (file_exists($sDotExecutable))
 		{
 			// create the file with Graphviz
-			if (!is_dir(utils::GetDataPath()))
+			if (!is_dir(APPROOT."data"))
 			{
-				@mkdir(utils::GetDataPath());
+				@mkdir(APPROOT."data");
 			}
-			if (!is_dir(utils::GetDataPath()."tmp"))
+			if (!is_dir(APPROOT."data/tmp"))
 			{
-				@mkdir(utils::GetDataPath()."tmp");
+				@mkdir(APPROOT."data/tmp");
 			}
-			$sXdotFilePath = tempnam(utils::GetDataPath()."tmp", 'xdot-');
+			$sXdotFilePath = tempnam(APPROOT."data/tmp", 'xdot-');
 			$sDotDescription = $this->GetDotDescription(true); // true => don't put (localized) labels in the file, since it makes it harder to parse
-			$sDotFilePath = tempnam(utils::GetDataPath()."tmp", 'dot-');
+			$sDotFilePath = tempnam(APPROOT."data/tmp", 'dot-');
 	
 			$rFile = @fopen($sDotFilePath, "w");
 			@fwrite($rFile, $sDotDescription);

core/trigger.class.inc.php

@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
-
 /**
  * A user defined trigger, to customize the application
  * A trigger will activate an action
@@ -172,20 +170,19 @@ abstract class TriggerOnObject extends Trigger
 	{
 		$aParams = array
 		(
-			"category"            => "grant_by_profile,core/cmdb",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "description",
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
 			"complementary_name_attcode" => ['finalclass', 'complement'],
-			"state_attcode"       => "",
+			"state_attcode" => "",
 			"reconc_keys" => ['description'],
-			"db_table"            => "priv_trigger_onobject",
-			"db_key_field"        => "id",
+			"db_table" => "priv_trigger_onobject",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeClass("target_class",
-			array("class_category" => "bizmodel", "more_values" => "User,UserExternal,UserInternal,UserLDAP,UserLocal", "sql" => "target_class", "default_value" => null, "is_null_allowed" => false, "depends_on" => array(), "class_exclusion_list" => "Attachment")));
+		MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category" => "bizmodel", "more_values" => "User,UserExternal,UserInternal,UserLDAP,UserLocal", "sql" => "target_class", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeOQL("filter", array("allowed_values" => null, "sql" => "filter", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
 
 		// Display lists
@@ -273,36 +270,6 @@ abstract class TriggerOnObject extends Trigger
 		}
 	}
 
-    /**
-     * if the target class is Attachment, then the trigger is read-only
-     * @param $sAttCode
-     * @param $aReasons
-     * @param $sTargetState
-     * @return int
-     * @throws ArchivedObjectException
-     * @throws CoreException
-     */
-    public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState='')
-	{
-       // Force the computed field to be read-only, preventing it to be written
-       if ($this->Get('target_class') == 'Attachment' ) {
-           return OPT_ATT_READONLY;
-       }
-       return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-	}
-
-
-    public function DisplayBareHeader(WebPage $oPage, $bEditMode = false)
-    {
-        $aHeaderBlocks = parent::DisplayBareHeader($oPage, $bEditMode);
-        if ($this->Get('target_class') == 'Attachment' ) {
-            $oPage->AddUiBlock(AlertUIBlockFactory::MakeForWarning('', Dict::S('Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage')));
-            $oPage->add_ready_script("$('#UIMenuModify').hide();");
-        }
-
-        return $aHeaderBlocks;
-    }
-
 	/**
 	 * Activate trigger based on attribute list given instead of changed attributes
 	 *
@@ -562,7 +529,6 @@ class TriggerOnObjectCreate extends TriggerOnObject
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
 		//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
-
 }
 
 /**

core/userrights.class.inc.php

@@ -1921,45 +1921,50 @@ class UserRights
 	 */
 	protected static function FindUser($sLogin, $sAuthentication = 'any', $bAllowDisabledUsers = false)
 	{
-		if ($sAuthentication === 'any') {
-			$oUser = self::FindUser($sLogin, 'internal', $bAllowDisabledUsers);
-			if ($oUser !== null) {
-				return $oUser;
+		if ($sAuthentication == 'any')
+		{
+			$oUser = self::FindUser($sLogin, 'internal');
+			if ($oUser == null)
+			{
+				$oUser = self::FindUser($sLogin, 'external');
+			}
+		}
+		else
+		{
+			if (!isset(self::$m_aCacheUsers))
+			{
+				self::$m_aCacheUsers = array('internal' => array(), 'external' => array());
 			}
 
-			return self::FindUser($sLogin, 'external', $bAllowDisabledUsers);
-		}
+			if (!isset(self::$m_aCacheUsers[$sAuthentication][$sLogin]))
+			{
+				switch($sAuthentication)
+				{
+					case 'external':
+					$sBaseClass = 'UserExternal';
+					break;
 
-		if (!isset(self::$m_aCacheUsers)) {
-			self::$m_aCacheUsers = [ 'internal' => [], 'external' => [] ];
-		}
+					case 'internal':
+					$sBaseClass = 'UserInternal';
+					break;
 
-		if (! isset(self::$m_aCacheUsers[$sAuthentication]) || ! array_key_exists($sLogin, self::$m_aCacheUsers[$sAuthentication])) {
-			switch($sAuthentication) {
-				case 'external':
-				$sBaseClass = 'UserExternal';
-				break;
-
-				case 'internal':
-				$sBaseClass = 'UserInternal';
-				break;
-
-				default:
-				echo "<p>sAuthentication = $sAuthentication</p>\n";
-				assert(false); // should never happen
+					default:
+					echo "<p>sAuthentication = $sAuthentication</p>\n";
+					assert(false); // should never happen
+				}
+				$oSearch = DBObjectSearch::FromOQL("SELECT $sBaseClass WHERE login = :login");
+				$oSearch->AllowAllData();
+				if (!$bAllowDisabledUsers)
+				{
+					$oSearch->AddCondition('status', 'enabled');
+				}
+				$oSet = new DBObjectSet($oSearch, array(), array('login' => $sLogin));
+				$oUser = $oSet->fetch();
+				self::$m_aCacheUsers[$sAuthentication][$sLogin] = $oUser;
 			}
-			$oSearch = DBObjectSearch::FromOQL("SELECT $sBaseClass WHERE login = :login");
-			$oSearch->AllowAllData();
-			if (!$bAllowDisabledUsers) {
-				$oSearch->AddCondition('status', 'enabled');
-			}
-			$oSet = new DBObjectSet($oSearch, array(), array('login' => $sLogin));
-			$oUser = $oSet->fetch();
-
-			self::$m_aCacheUsers[$sAuthentication][$sLogin] = $oUser;
+			$oUser = self::$m_aCacheUsers[$sAuthentication][$sLogin];
 		}
-
-		return self::$m_aCacheUsers[$sAuthentication][$sLogin];
+		return $oUser;
 	}
 
 	/**
@@ -2028,6 +2033,36 @@ class UserRights
 	{
 		return self::$m_sLastLoginStatus;
 	}
+
+
+	/**
+	 * @param string $sClass
+	 * @return string|null Find out which attribute is corresponding the dimension 'owner org'
+	 *                   returns null if no such attribute has been found (no filtering should occur)
+	 * @since 3.3.0
+	 */
+	public static function GetOwnerOrganizationAttCode($sClass)
+	{
+		$sAttCode = null;
+
+		$aCallSpec = array($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;
+	}
+
 }
 
 /**

css/backoffice/application/welcome-popup/_welcome-popup.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/backoffice/base/_base.scss

@@ -4,7 +4,7 @@
  */
 
 $ibo-scrollbar--scrollbar-width: $common-scrollbar--scrollbar-width !default;
-$ibo-scrollbar--scrollbar-height: $common-scrollbar--scrollbar-height !default; /* For horizontal scrollbars */
+$ibo-scrollbar--scrollbar-height: $ibo-scrollbar--scrollbar-width !default; /* For horizontal scrollbars */
 $ibo-scrollbar--scrollbar-track-background-color: $common-scrollbar--scrollbar-track-background-color !default;
 $ibo-scrollbar--scrollbar-track-border-radius: $common-scrollbar--scrollbar-track-border-radius !default;
 $ibo-scrollbar--scrollbar-thumb-background-color: $common-scrollbar--scrollbar-thumb-background-color !default;

css/backoffice/utils/helpers/_fullscreen.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/backoffice/utils/helpers/_sticky-header.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
@@ -14,9 +14,9 @@ $ibo-sticky-sentinel--left: $common-sticky-sentinel--left !default;
 $ibo-sticky-sentinel--right: $common-sticky-sentinel--right !default;
 $ibo-sticky-sentinel--height: $common-sticky-sentinel--height !default;
 $ibo-sticky-sentinel-top--top: $common-sticky-sentinel-top--top !default;
-$ibo-sticky-sentinel-top--height: $common-sticky-sentinel-top--height !default;
+$ibo-sticky-sentinel-top--height: $ibo-sticky-sentinel--height !default;
 $ibo-sticky-sentinel-bottom--bottom: $common-sticky-sentinel-bottom--bottom !default;
-$ibo-sticky-sentinel-bottom--height: $common-sticky-sentinel-bottom--height !default;
+$ibo-sticky-sentinel-bottom--height: $ibo-sticky-sentinel--height !default;
 
 /* Rules */
 .ibo-sticky-sentinel {

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

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
@@ -12,12 +12,12 @@ $ibo-has-description--font-size: $common-has-description--font-size !default; /*
 $ibo-is-code--background-color: $common-is-code--background-color !default;
 $ibo-is-code--padding: $common-is-code--padding !default;
 
-$ibo-hyperlink-color: $common-hyperlink-color !default;
-$ibo-hyperlink-text-decoration: $common-hyperlink-text-decoration !default;
-$ibo-hyperlink-color--on-hover: $common-hyperlink-color--on-hover !default;
-$ibo-hyperlink-text-decoration--on-hover: $common-hyperlink-text-decoration--on-hover !default;
-$ibo-hyperlink-color--on-active: $common-hyperlink-color--on-active !default;
-$ibo-hyperlink-text-decoration--on-active: $common-hyperlink-text-decoration--on-active !default;
+$ibo-hyperlink-color: $ibo-color-primary-700 !default;
+$ibo-hyperlink-text-decoration: none !default;
+$ibo-hyperlink-color--on-hover: $ibo-color-primary-800 !default;
+$ibo-hyperlink-text-decoration--on-hover: $ibo-hyperlink-text-decoration !default;
+$ibo-hyperlink-color--on-active: $ibo-color-primary-900 !default;
+$ibo-hyperlink-text-decoration--on-active: $ibo-hyperlink-text-decoration !default;
 
 $ibo-figure--spacing-x: $common-figure--spacing-x !default; /* Mind that this matches Bulma rule for figure */
 $ibo-figure--spacing-y: $common-figure--spacing-y !default;

css/backoffice/utils/helpers/_text-position.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/backoffice/utils/helpers/_visibility.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/backoffice/utils/variables/_base.scss

@@ -5,5 +5,5 @@
 
 // These are the base variables used throughout the backoffice, if you don't know what to use, these are probably good :)
 
-$ibo-base-variable--text-color: $common-base-variable--text-color !default;
-$ibo-base-variable--border-radius: $common-base-variable--border-radius !default;;
+$ibo-base-variable--text-color: $ibo-color-grey-900 !default;
+$ibo-base-variable--border-radius: $ibo-border-radius-300 !default;;

css/backoffice/utils/variables/_spacing.scss

@@ -3,28 +3,27 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-spacing-0: $common-spacing-0 !default;
-$ibo-spacing-100: $common-spacing-100 !default;
-$ibo-spacing-200: $common-spacing-200 !default;
-$ibo-spacing-300: $common-spacing-300 !default;
-$ibo-spacing-400: $common-spacing-400 !default;
-$ibo-spacing-500: $common-spacing-500 !default;
-$ibo-spacing-600: $common-spacing-600 !default;
-$ibo-spacing-700: $common-spacing-700 !default;
-$ibo-spacing-800: $common-spacing-800 !default;
-$ibo-spacing-900: $common-spacing-900 !default;
-$ibo-spacing-950: $common-spacing-950 !default;
+$ibo-spacing-0: $ibo-size-0 !default;
+$ibo-spacing-100: $ibo-size-50 !default;
+$ibo-spacing-200: $ibo-size-100 !default;
+$ibo-spacing-300: $ibo-size-150 !default;
+$ibo-spacing-400: $ibo-size-200 !default;
+$ibo-spacing-500: $ibo-size-250 !default;
+$ibo-spacing-600: $ibo-size-300 !default;
+$ibo-spacing-700: $ibo-size-350 !default;
+$ibo-spacing-800: $ibo-size-400 !default;
+$ibo-spacing-900: $ibo-size-450 !default;
+$ibo-spacing-950: $ibo-size-500 !default;
 
 :root{
-  --ibo-spacing-0: #{$ibo-spacing-0};
-  --ibo-spacing-100: #{$ibo-spacing-100};
-  --ibo-spacing-200: #{$ibo-spacing-200};
-  --ibo-spacing-300: #{$ibo-spacing-300};
-  --ibo-spacing-400: #{$ibo-spacing-400};
-  --ibo-spacing-500: #{$ibo-spacing-500};
-  --ibo-spacing-600: #{$ibo-spacing-600};
-  --ibo-spacing-700: #{$ibo-spacing-700};
-  --ibo-spacing-800: #{$ibo-spacing-800};
-  --ibo-spacing-900: #{$ibo-spacing-900};
-  --ibo-spacing-950: #{$ibo-spacing-950};
+  --ibo-spacing-0: #{$ibo-size-0};
+  --ibo-spacing-100: #{$ibo-size-50};
+  --ibo-spacing-200: #{$ibo-size-100};
+  --ibo-spacing-300: #{$ibo-size-150};
+  --ibo-spacing-400: #{$ibo-size-200};
+  --ibo-spacing-500: #{$ibo-size-250};
+  --ibo-spacing-600: #{$ibo-size-300};
+  --ibo-spacing-700: #{$ibo-size-350};
+  --ibo-spacing-800: #{$ibo-size-400};
+  --ibo-spacing-900: #{$ibo-size-450};
 }

css/backoffice/utils/variables/_typography.scss

@@ -35,7 +35,7 @@ $ibo-font-weight-950: $common-font-weight-950 !default; /* 950 Extra Black (Ultr
 $ibo-font-family-base: $common-font-family-base !default;
 $ibo-font-family-fallbacks: $common-font-family-fallbacks !default;
 $ibo-font-family-monospace: $common-font-family-monospace !default;
-$ibo-font-family-code: $common-font-family-code !default;
+$ibo-font-family-code: $ibo-font-family-monospace !default;
 
 :root {
   --ibo-font-size-50: #{$ibo-font-size-50};

css/backoffice/utils/variables/colors/_base-palette.scss

@@ -99,28 +99,6 @@ $ibo-color-pink-800: $common-color-pink-800 !default;
 $ibo-color-pink-900: $common-color-pink-900 !default;
 $ibo-color-pink-950: $common-color-pink-950 !default;
 
-$ibo-color-yellow-100: $common-color-yellow-100 !default;
-$ibo-color-yellow-200: $common-color-yellow-200 !default;
-$ibo-color-yellow-300: $common-color-yellow-300 !default;
-$ibo-color-yellow-400: $common-color-yellow-400 !default;
-$ibo-color-yellow-500: $common-color-yellow-500 !default;
-$ibo-color-yellow-600: $common-color-yellow-600 !default;
-$ibo-color-yellow-700: $common-color-yellow-700 !default;
-$ibo-color-yellow-800: $common-color-yellow-800 !default;
-$ibo-color-yellow-900: $common-color-yellow-900 !default;
-$ibo-color-yellow-950: $common-color-yellow-950 !default;
-
-$ibo-color-purple-100: $common-color-purple-100 !default;
-$ibo-color-purple-200: $common-color-purple-200 !default;
-$ibo-color-purple-300: $common-color-purple-300 !default;
-$ibo-color-purple-400: $common-color-purple-400 !default;
-$ibo-color-purple-500: $common-color-purple-500 !default;
-$ibo-color-purple-600: $common-color-purple-600 !default;
-$ibo-color-purple-700: $common-color-purple-700 !default;
-$ibo-color-purple-800: $common-color-purple-800 !default;
-$ibo-color-purple-900: $common-color-purple-900 !default;
-$ibo-color-purple-950: $common-color-purple-950 !default;
-
 $ibo-colors: $common-colors;
 
 /* CSS variables */
@@ -218,26 +196,4 @@ $ibo-colors: $common-colors;
 	--ibo-color-pink-800: #{$ibo-color-pink-800};
 	--ibo-color-pink-900: #{$ibo-color-pink-900};
 	--ibo-color-pink-950: #{$ibo-color-pink-950};
-  
-  --ibo-color-yellow-100: #{$ibo-color-yellow-100};
-  --ibo-color-yellow-200: #{$ibo-color-yellow-200};
-  --ibo-color-yellow-300: #{$ibo-color-yellow-300};
-  --ibo-color-yellow-400: #{$ibo-color-yellow-400};
-  --ibo-color-yellow-500: #{$ibo-color-yellow-500};
-  --ibo-color-yellow-600: #{$ibo-color-yellow-600};
-  --ibo-color-yellow-700: #{$ibo-color-yellow-700};
-  --ibo-color-yellow-800: #{$ibo-color-yellow-800};
-  --ibo-color-yellow-900: #{$ibo-color-yellow-900};
-  --ibo-color-yellow-950: #{$ibo-color-yellow-950};
-
-  --ibo-color-purple-100: #{$ibo-color-purple-100};
-  --ibo-color-purple-200: #{$ibo-color-purple-200};
-  --ibo-color-purple-300: #{$ibo-color-purple-300};
-  --ibo-color-purple-400: #{$ibo-color-purple-400};
-  --ibo-color-purple-500: #{$ibo-color-purple-500};
-  --ibo-color-purple-600: #{$ibo-color-purple-600};
-  --ibo-color-purple-700: #{$ibo-color-purple-700};
-  --ibo-color-purple-800: #{$ibo-color-purple-800};
-  --ibo-color-purple-900: #{$ibo-color-purple-900};
-  --ibo-color-purple-950: #{$ibo-color-purple-950};
 }

css/backoffice/utils/variables/colors/_lifecycle-palette.scss

@@ -5,24 +5,24 @@
 
 /* Lifecycle palette */
 /* - For workflow */
-$ibo-lifecycle-new-state-primary-color: $common-lifecycle-new-state-primary-color !default;
-$ibo-lifecycle-new-state-secondary-color: $common-lifecycle-new-state-secondary-color !default;
-$ibo-lifecycle-neutral-state-primary-color: $common-lifecycle-neutral-state-primary-color !default;
-$ibo-lifecycle-neutral-state-secondary-color: $common-lifecycle-neutral-state-secondary-color !default;
-$ibo-lifecycle-waiting-state-primary-color: $common-lifecycle-waiting-state-primary-color !default;
-$ibo-lifecycle-waiting-state-secondary-color: $common-lifecycle-waiting-state-secondary-color !default;
-$ibo-lifecycle-success-state-primary-color: $common-lifecycle-success-state-primary-color !default;
-$ibo-lifecycle-success-state-secondary-color: $common-lifecycle-success-state-secondary-color !default;
-$ibo-lifecycle-failure-state-primary-color: $common-lifecycle-failure-state-primary-color !default;
-$ibo-lifecycle-failure-state-secondary-color: $common-lifecycle-failure-state-secondary-color !default;
-$ibo-lifecycle-frozen-state-primary-color: $common-lifecycle-frozen-state-primary-color !default;
-$ibo-lifecycle-frozen-state-secondary-color: $common-lifecycle-frozen-state-secondary-color !default;
+$ibo-lifecycle-new-state-primary-color: $ibo-color-blue-800 !default;
+$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-neutral-state-primary-color: $ibo-color-blue-800 !default;
+$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-waiting-state-primary-color: $ibo-color-orange-400 !default;
+$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-success-state-primary-color: $ibo-color-green-700 !default;
+$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-failure-state-primary-color: $ibo-color-pink-700 !default;
+$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-frozen-state-primary-color: $ibo-color-grey-200 !default;
+$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-grey-700 !default;
 
 /* - For basic lifecycle */
-$ibo-lifecycle-active-state-primary-color: $common-lifecycle-active-state-primary-color !default;
-$ibo-lifecycle-active-state-secondary-color: $common-lifecycle-active-state-secondary-color !default;
-$ibo-lifecycle-inactive-state-primary-color: $common-lifecycle-inactive-state-primary-color !default;
-$ibo-lifecycle-inactive-state-secondary-color: $common-lifecycle-inactive-state-secondary-color !default;
+$ibo-lifecycle-active-state-primary-color: $ibo-color-green-700 !default;
+$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-inactive-state-primary-color: $ibo-color-orange-400 !default;
+$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100 !default;
 
 $ibo-lifecycle-states-colors: (
 		'new': (

css/backoffice/utils/variables/colors/_semantic-palette.scss

@@ -5,99 +5,99 @@
 
 /* Semantic palettes */
 /* - Primary color of the brand */
-$ibo-color-primary-100: $common-color-primary-100 !default;
-$ibo-color-primary-200: $common-color-primary-200 !default;
-$ibo-color-primary-300: $common-color-primary-300 !default;
-$ibo-color-primary-400: $common-color-primary-400 !default;
-$ibo-color-primary-500: $common-color-primary-500 !default;
-$ibo-color-primary-600: $common-color-primary-600 !default;
-$ibo-color-primary-700: $common-color-primary-700 !default;
-$ibo-color-primary-800: $common-color-primary-800 !default;
-$ibo-color-primary-900: $common-color-primary-900 !default;
-$ibo-color-primary-950: $common-color-primary-950 !default;
+$ibo-color-primary-100: $ibo-color-orange-100 !default;
+$ibo-color-primary-200: $ibo-color-orange-200 !default;
+$ibo-color-primary-300: $ibo-color-orange-300 !default;
+$ibo-color-primary-400: $ibo-color-orange-400 !default;
+$ibo-color-primary-500: $ibo-color-orange-500 !default;
+$ibo-color-primary-600: $ibo-color-orange-600 !default;
+$ibo-color-primary-700: $ibo-color-orange-700 !default;
+$ibo-color-primary-800: $ibo-color-orange-800 !default;
+$ibo-color-primary-900: $ibo-color-orange-900 !default;
+$ibo-color-primary-950: $ibo-color-orange-950 !default;
 
 /* - Secondary color of the brand */
-$ibo-color-secondary-100: $common-color-secondary-100 !default;
-$ibo-color-secondary-200: $common-color-secondary-200 !default;
-$ibo-color-secondary-300: $common-color-secondary-300 !default;
-$ibo-color-secondary-400: $common-color-secondary-400 !default;
-$ibo-color-secondary-500: $common-color-secondary-500 !default;
-$ibo-color-secondary-600: $common-color-secondary-600 !default;
-$ibo-color-secondary-700: $common-color-secondary-700 !default;
-$ibo-color-secondary-800: $common-color-secondary-800 !default;
-$ibo-color-secondary-900: $common-color-secondary-900 !default;
-$ibo-color-secondary-950: $common-color-secondary-950 !default;
+$ibo-color-secondary-100: $ibo-color-grey-100 !default;
+$ibo-color-secondary-200: $ibo-color-grey-200 !default;
+$ibo-color-secondary-300: $ibo-color-grey-300 !default;
+$ibo-color-secondary-400: $ibo-color-grey-400 !default;
+$ibo-color-secondary-500: $ibo-color-grey-500 !default;
+$ibo-color-secondary-600: $ibo-color-grey-600 !default;
+$ibo-color-secondary-700: $ibo-color-grey-700 !default;
+$ibo-color-secondary-800: $ibo-color-grey-800 !default;
+$ibo-color-secondary-900: $ibo-color-grey-900 !default;
+$ibo-color-secondary-950: $ibo-color-grey-950 !default;
 
 /* - Information: messages / actions that should neither seem as success, warning or failure  */
-$ibo-color-information-100: $common-color-information-100 !default;
-$ibo-color-information-200: $common-color-information-200 !default;
-$ibo-color-information-300: $common-color-information-300 !default;
-$ibo-color-information-400: $common-color-information-400 !default;
-$ibo-color-information-500: $common-color-information-500 !default;
-$ibo-color-information-600: $common-color-information-600 !default;
-$ibo-color-information-700: $common-color-information-700 !default;
-$ibo-color-information-800: $common-color-information-800 !default;
-$ibo-color-information-900: $common-color-information-900 !default;
-$ibo-color-information-950: $common-color-information-950 !default;
+$ibo-color-information-100: $ibo-color-blue-100 !default;
+$ibo-color-information-200: $ibo-color-blue-200 !default;
+$ibo-color-information-300: $ibo-color-blue-300 !default;
+$ibo-color-information-400: $ibo-color-blue-400 !default;
+$ibo-color-information-500: $ibo-color-blue-500 !default;
+$ibo-color-information-600: $ibo-color-blue-600 !default;
+$ibo-color-information-700: $ibo-color-blue-700 !default;
+$ibo-color-information-800: $ibo-color-blue-800 !default;
+$ibo-color-information-900: $ibo-color-blue-900 !default;
+$ibo-color-information-950: $ibo-color-blue-950 !default;
 
 /* Success: messages of success, safe actions, ... */
-$ibo-color-success-100: $common-color-success-100 !default;
-$ibo-color-success-200: $common-color-success-200 !default;
-$ibo-color-success-300: $common-color-success-300 !default;
-$ibo-color-success-400: $common-color-success-400 !default;
-$ibo-color-success-500: $common-color-success-500 !default;
-$ibo-color-success-600: $common-color-success-600 !default;
-$ibo-color-success-700: $common-color-success-700 !default;
-$ibo-color-success-800: $common-color-success-800 !default;
-$ibo-color-success-900: $common-color-success-900 !default;
-$ibo-color-success-950: $common-color-success-950 !default;
+$ibo-color-success-100: $ibo-color-green-100 !default;
+$ibo-color-success-200: $ibo-color-green-200 !default;
+$ibo-color-success-300: $ibo-color-green-300 !default;
+$ibo-color-success-400: $ibo-color-green-400 !default;
+$ibo-color-success-500: $ibo-color-green-500 !default;
+$ibo-color-success-600: $ibo-color-green-600 !default;
+$ibo-color-success-700: $ibo-color-green-700 !default;
+$ibo-color-success-800: $ibo-color-green-800 !default;
+$ibo-color-success-900: $ibo-color-green-900 !default;
+$ibo-color-success-950: $ibo-color-green-950 !default;
 
 /* Warning: messages of warning, actions that would be done carefully, ... */
-$ibo-color-warning-100: $common-color-warning-100 !default;
-$ibo-color-warning-200: $common-color-warning-200 !default;
-$ibo-color-warning-300: $common-color-warning-300 !default;
-$ibo-color-warning-400: $common-color-warning-400 !default;
-$ibo-color-warning-500: $common-color-warning-500 !default;
-$ibo-color-warning-600: $common-color-warning-600 !default;
-$ibo-color-warning-700: $common-color-warning-700 !default;
-$ibo-color-warning-800: $common-color-warning-800 !default;
-$ibo-color-warning-900: $common-color-warning-900 !default;
-$ibo-color-warning-950: $common-color-warning-950 !default;
+$ibo-color-warning-100: $ibo-color-orange-100 !default;
+$ibo-color-warning-200: $ibo-color-orange-200 !default;
+$ibo-color-warning-300: $ibo-color-orange-300 !default;
+$ibo-color-warning-400: $ibo-color-orange-400 !default;
+$ibo-color-warning-500: $ibo-color-orange-500 !default;
+$ibo-color-warning-600: $ibo-color-orange-600 !default;
+$ibo-color-warning-700: $ibo-color-orange-700 !default;
+$ibo-color-warning-800: $ibo-color-orange-800 !default;
+$ibo-color-warning-900: $ibo-color-orange-900 !default;
+$ibo-color-warning-950: $ibo-color-orange-950 !default;
 
 /* Danger: messages of failure, error, ... */
-$ibo-color-error-100: $common-color-error-100 !default;
-$ibo-color-error-200: $common-color-error-200 !default;
-$ibo-color-error-300: $common-color-error-300 !default;
-$ibo-color-error-400: $common-color-error-400 !default;
-$ibo-color-error-500: $common-color-error-500 !default;
-$ibo-color-error-600: $common-color-error-600 !default;
-$ibo-color-error-700: $common-color-error-700 !default;
-$ibo-color-error-800: $common-color-error-800 !default;
-$ibo-color-error-900: $common-color-error-900 !default;
-$ibo-color-error-950: $common-color-error-950 !default;
+$ibo-color-error-100: $ibo-color-red-100 !default;
+$ibo-color-error-200: $ibo-color-red-200 !default;
+$ibo-color-error-300: $ibo-color-red-300 !default;
+$ibo-color-error-400: $ibo-color-red-400 !default;
+$ibo-color-error-500: $ibo-color-red-500 !default;
+$ibo-color-error-600: $ibo-color-red-600 !default;
+$ibo-color-error-700: $ibo-color-red-700 !default;
+$ibo-color-error-800: $ibo-color-red-800 !default;
+$ibo-color-error-900: $ibo-color-red-900 !default;
+$ibo-color-error-950: $ibo-color-red-950 !default;
 
 /* Danger: messages of danger, actions that cannot be undone, ... */
-$ibo-color-danger-100: $common-color-danger-100 !default;
-$ibo-color-danger-200: $common-color-danger-200 !default;
-$ibo-color-danger-300: $common-color-danger-300 !default;
-$ibo-color-danger-400: $common-color-danger-400 !default;
-$ibo-color-danger-500: $common-color-danger-500 !default;
-$ibo-color-danger-600: $common-color-danger-600 !default;
-$ibo-color-danger-700: $common-color-danger-700 !default;
-$ibo-color-danger-800: $common-color-danger-800 !default;
-$ibo-color-danger-900: $common-color-danger-900 !default;
-$ibo-color-danger-950: $common-color-danger-950 !default;
+$ibo-color-danger-100: $ibo-color-red-100 !default;
+$ibo-color-danger-200: $ibo-color-red-200 !default;
+$ibo-color-danger-300: $ibo-color-red-300 !default;
+$ibo-color-danger-400: $ibo-color-red-400 !default;
+$ibo-color-danger-500: $ibo-color-red-500 !default;
+$ibo-color-danger-600: $ibo-color-red-600 !default;
+$ibo-color-danger-700: $ibo-color-red-700 !default;
+$ibo-color-danger-800: $ibo-color-red-800 !default;
+$ibo-color-danger-900: $ibo-color-red-900 !default;
+$ibo-color-danger-950: $ibo-color-red-950 !default;
 
-$ibo-semantic-colors: $common-semantic-colors !default;
+$ibo-semantic-colors: ('primary', 'secondary', 'information', 'success', 'warning', 'danger');
 
-$ibo-caselog-highlight-color-1: $common-caselog-highlight-color-1 !default;
-$ibo-caselog-highlight-color-2: $common-caselog-highlight-color-2 !default;
-$ibo-caselog-highlight-color-3: $common-caselog-highlight-color-3 !default;
-$ibo-caselog-highlight-color-4: $common-caselog-highlight-color-4 !default;
-$ibo-caselog-highlight-color-5: $common-caselog-highlight-color-5 !default;
-$ibo-caselog-highlight-color-6: $common-caselog-highlight-color-6 !default;
-$ibo-caselog-highlight-color-7: $common-caselog-highlight-color-7 !default;
-$ibo-caselog-highlight-colors: $common-caselog-highlight-colors !default;
+$ibo-caselog-highlight-color-1: $ibo-color-green-700 !default;
+$ibo-caselog-highlight-color-2: $ibo-color-pink-700 !default;
+$ibo-caselog-highlight-color-3: $ibo-color-orange-400 !default;
+$ibo-caselog-highlight-color-4: $ibo-color-blue-600 !default;
+$ibo-caselog-highlight-color-5: $ibo-color-cyan-200 !default;
+$ibo-caselog-highlight-color-6: $ibo-color-green-200 !default;
+$ibo-caselog-highlight-color-7: $ibo-color-pink-300 !default;
+$ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-highlight-color-2, $ibo-caselog-highlight-color-3, $ibo-caselog-highlight-color-4, $ibo-caselog-highlight-color-5, $ibo-caselog-highlight-color-6, $ibo-caselog-highlight-color-7) !default;
 
 /* CSS variables */
 :root {

css/backoffice/vendors/ckeditor/_all.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/backoffice/vendors/ckeditor/_overloads.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/c3.min.css

@@ -0,0 +1,5 @@
+/*
+ * @deprecated 3.2.0 N°5621 Moved to NPM
+ */
+
+.c3 svg{font:10px sans-serif;-webkit-tap-highlight-color:transparent}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-title{font:14px sans-serif}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}

css/common/utils/helpers/_sticky-header.scss

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

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

@@ -1,10 +1,10 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 /* SCSS variables */
-$common-has-description--content: "\1F6C8" !default;
+$common-has-description--content: "?" !default;
 $common-has-description--padding-left: $common-spacing-200 !default;
 $common-has-description--color: $common-color-grey-600 !default;
 $common-has-description--font-size: 0.7em !default; /* Font size is em on purpose as we want it to be proportional to its context */

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

@@ -1,4 +1,4 @@
-/*
+/*!
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */

css/common/utils/variables/colors/_base-palette.scss

@@ -99,26 +99,4 @@ $common-color-pink-800: hsla(322, 60%, 37%, 1) !default;
 $common-color-pink-900: hsla(318, 51%, 29%, 1) !default;
 $common-color-pink-950: hsla(318, 51%, 21%, 1) !default;
 
-$common-color-yellow-100: hsla(60, 100%, 97.06%, 1) !default;
-$common-color-yellow-200: hsla(58.1, 96.92%, 87.25%, 1) !default;
-$common-color-yellow-300: hsla(54.69, 91.87%, 75.88%, 1) !default;
-$common-color-yellow-400: hsla(51.32, 89.41%, 66.67%, 1) !default;
-$common-color-yellow-500: hsla(46.96, 80.9%, 60.98%, 1) !default;
-$common-color-yellow-600: hsla(40, 67.2%, 50.98%, 1) !default;
-$common-color-yellow-700: hsla(35.53, 71.03%, 41.96%, 1) !default;
-$common-color-yellow-800: hsla(31.63, 74.57%, 33.92%, 1) !default;
-$common-color-yellow-900: hsla(30, 75.76%, 25.88%, 1) !default;
-$common-color-yellow-950: hsla(29, 80%, 17%, 1) !default;
-
-$common-color-purple-100: hsla(251.43, 91.3%, 95.49%, 1) !default;
-$common-color-purple-200: hsla(250.5, 95.24%, 91.76%, 1) !default;
-$common-color-purple-300: hsla(252.5, 94.74%, 85.1%, 1) !default;
-$common-color-purple-400: hsla(255.14, 91.74%, 76.27%, 1) !default;
-$common-color-purple-500: hsla(258.31, 89.53%, 66.27%, 1) !default;
-$common-color-purple-600: hsla(262.12, 83.26%, 57.84%, 1) !default;
-$common-color-purple-700: hsla(263.39, 69.96%, 50.39%, 1) !default;
-$common-color-purple-800: hsla(263.36, 69.3%, 42.16%, 1) !default;
-$common-color-purple-900: hsla(263.5, 67.42%, 34.9%, 1) !default;
-$common-color-purple-950: hsla(263, 71%, 26%, 1) !default;
-
-$common-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pink', 'yellow', 'purple', 'primary', 'secondary', 'information', 'success', 'warning', 'danger');
+$common-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pink', 'primary', 'secondary', 'information', 'success', 'warning', 'danger');

css/jquery.contextMenu.css

@@ -0,0 +1,146 @@
+/**
+ * @deprecated 3.2.0 N°5621 Moved to NPM
+ */
+
+/*!
+ * jQuery contextMenu - Plugin for simple contextMenu handling
+ *
+ * Version: git-master
+ *
+ * Authors: Rodney Rehm, Addy Osmani (patches for FF)
+ * Web: http://medialize.github.com/jQuery-contextMenu/
+ *
+ * Licensed under
+ *   MIT License http://www.opensource.org/licenses/mit-license
+ *   GPL v3 http://opensource.org/licenses/GPL-3.0
+ *
+ */
+
+.context-menu-list {
+    margin:0; 
+    padding:0;
+    
+    min-width: 120px;
+    max-width: 250px;
+    display: inline-block;
+    position: absolute;
+    list-style-type: none;
+    
+    border: 1px solid #DDD;
+    background: #EEE;
+    
+    -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+       -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+        -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+         -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+            box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+    
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 11px;
+}
+
+.context-menu-item {
+    padding: 2px 2px 2px 24px;
+    background-color: #EEE;
+    position: relative;
+    -webkit-user-select: none;
+       -moz-user-select: -moz-none;
+        -ms-user-select: none;
+            user-select: none;
+}
+
+.context-menu-separator {
+    padding-bottom:0;
+    border-bottom: 1px solid #DDD;
+}
+
+.context-menu-item > label > input,
+.context-menu-item > label > textarea {
+    -webkit-user-select: text;
+       -moz-user-select: text;
+        -ms-user-select: text;
+            user-select: text;
+}
+
+.context-menu-item.hover {
+    cursor: pointer;
+    background-color: #39F;
+}
+
+.context-menu-item.disabled {
+    color: #666;
+}
+
+.context-menu-input.hover,
+.context-menu-item.disabled.hover {
+    cursor: default;
+    background-color: #EEE;
+}
+
+.context-menu-submenu:after {
+    content: ">";
+    color: #666;
+    position: absolute;
+    top: 0;
+    right: 3px;
+    z-index: 1;
+}
+
+/* icons
+    #protip:
+    In case you want to use sprites for icons (which I would suggest you do) have a look at
+    http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement 
+    .context-menu-item.icon:before {}
+ */
+.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
+.context-menu-item.icon-edit { background-image: url(images/page_white_edit.png); }
+.context-menu-item.icon-cut { background-image: url(images/cut.png); }
+.context-menu-item.icon-copy { background-image: url(images/page_white_copy.png); }
+.context-menu-item.icon-paste { background-image: url(images/page_white_paste.png); }
+.context-menu-item.icon-delete { background-image: url(images/page_white_delete.png); }
+.context-menu-item.icon-add { background-image: url(images/page_white_add.png); }
+.context-menu-item.icon-quit { background-image: url(images/door.png); }
+
+/* vertically align inside labels */
+.context-menu-input > label > * { vertical-align: top; }
+
+/* position checkboxes and radios as icons */
+.context-menu-input > label > input[type="checkbox"],
+.context-menu-input > label > input[type="radio"] {
+    margin-left: -17px;
+}
+.context-menu-input > label > span {
+    margin-left: 5px;
+}
+
+.context-menu-input > label,
+.context-menu-input > label > input[type="text"],
+.context-menu-input > label > textarea,
+.context-menu-input > label > select {
+    display: block;
+    width: 100%;
+    
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+         -o-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+.context-menu-input > label > textarea {
+    height: 100px;
+}
+.context-menu-item > .context-menu-list {
+    display: none;
+    /* re-positioned by js */
+    right: -5px;
+    top: 5px;
+}
+
+.context-menu-item.hover > .context-menu-list {
+    display: block;
+}
+
+.context-menu-accesskey {
+    text-decoration: underline;
+}

css/magnific-popup.css

@@ -0,0 +1,378 @@
+/*
+ * @deprecated 3.2.0 N°5621 Moved to NPM
+ */
+
+/* Magnific Popup CSS */
+.mfp-bg {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1042;
+  overflow: hidden;
+  position: fixed;
+  background: #0b0b0b;
+  opacity: 0.8;
+  filter: alpha(opacity=80); }
+
+.mfp-wrap {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1043;
+  position: fixed;
+  outline: none !important;
+  -webkit-backface-visibility: hidden; }
+
+.mfp-container {
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  padding: 0 8px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box; }
+
+.mfp-container:before {
+  content: '';
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle; }
+
+.mfp-align-top .mfp-container:before {
+  display: none; }
+
+.mfp-content {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  margin: 0 auto;
+  text-align: left;
+  z-index: 1045; }
+
+.mfp-inline-holder .mfp-content, .mfp-ajax-holder .mfp-content {
+  width: 100%;
+  cursor: auto; }
+
+.mfp-ajax-cur {
+  cursor: progress; }
+
+.mfp-zoom-out-cur, .mfp-zoom-out-cur .mfp-image-holder .mfp-close {
+  cursor: -moz-zoom-out;
+  cursor: -webkit-zoom-out;
+  cursor: zoom-out; }
+
+.mfp-zoom {
+  cursor: pointer;
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in; }
+
+.mfp-auto-cursor .mfp-content {
+  cursor: auto; }
+
+.mfp-close, .mfp-arrow, .mfp-preloader, .mfp-counter {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none; }
+
+.mfp-loading.mfp-figure {
+  display: none; }
+
+.mfp-hide {
+  display: none !important; }
+
+.mfp-preloader {
+  color: #CCC;
+  position: absolute;
+  top: 50%;
+  width: auto;
+  text-align: center;
+  margin-top: -0.8em;
+  left: 8px;
+  right: 8px;
+  z-index: 1044; }
+  .mfp-preloader a {
+    color: #CCC; }
+    .mfp-preloader a:hover {
+      color: #FFF; }
+
+.mfp-s-ready .mfp-preloader {
+  display: none; }
+
+.mfp-s-error .mfp-content {
+  display: none; }
+
+button.mfp-close, button.mfp-arrow {
+  overflow: visible;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+  display: block;
+  outline: none;
+  padding: 0;
+  z-index: 1046;
+  -webkit-box-shadow: none;
+  box-shadow: none; }
+button::-moz-focus-inner {
+  padding: 0;
+  border: 0; }
+
+.mfp-close {
+  width: 44px;
+  height: 44px;
+  line-height: 44px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  text-decoration: none;
+  text-align: center;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  padding: 0 0 18px 10px;
+  color: #FFF;
+  font-style: normal;
+  font-size: 28px;
+  font-family: Arial, Baskerville, monospace; }
+  .mfp-close:hover, .mfp-close:focus {
+    opacity: 1;
+    filter: alpha(opacity=100); }
+  .mfp-close:active {
+    top: 1px; }
+
+.mfp-close-btn-in .mfp-close {
+  color: #333; }
+
+.mfp-image-holder .mfp-close, .mfp-iframe-holder .mfp-close {
+  color: #FFF;
+  right: -6px;
+  text-align: right;
+  padding-right: 6px;
+  width: 100%; }
+
+.mfp-counter {
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #CCC;
+  font-size: 12px;
+  line-height: 18px;
+  white-space: nowrap; }
+
+.mfp-arrow {
+  position: absolute;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  margin: 0;
+  top: 50%;
+  margin-top: -55px;
+  padding: 0;
+  width: 90px;
+  height: 110px;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
+  .mfp-arrow:active {
+    margin-top: -54px; }
+  .mfp-arrow:hover, .mfp-arrow:focus {
+    opacity: 1;
+    filter: alpha(opacity=100); }
+  .mfp-arrow:before, .mfp-arrow:after, .mfp-arrow .mfp-b, .mfp-arrow .mfp-a {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    position: absolute;
+    left: 0;
+    top: 0;
+    margin-top: 35px;
+    margin-left: 35px;
+    border: medium inset transparent; }
+  .mfp-arrow:after, .mfp-arrow .mfp-a {
+    border-top-width: 13px;
+    border-bottom-width: 13px;
+    top: 8px; }
+  .mfp-arrow:before, .mfp-arrow .mfp-b {
+    border-top-width: 21px;
+    border-bottom-width: 21px;
+    opacity: 0.7; }
+
+.mfp-arrow-left {
+  left: 0; }
+  .mfp-arrow-left:after, .mfp-arrow-left .mfp-a {
+    border-right: 17px solid #FFF;
+    margin-left: 31px; }
+  .mfp-arrow-left:before, .mfp-arrow-left .mfp-b {
+    margin-left: 25px;
+    border-right: 27px solid #3F3F3F; }
+
+.mfp-arrow-right {
+  right: 0; }
+  .mfp-arrow-right:after, .mfp-arrow-right .mfp-a {
+    border-left: 17px solid #FFF;
+    margin-left: 39px; }
+  .mfp-arrow-right:before, .mfp-arrow-right .mfp-b {
+    border-left: 27px solid #3F3F3F; }
+
+.mfp-iframe-holder {
+  padding-top: 40px;
+  padding-bottom: 40px; }
+  .mfp-iframe-holder .mfp-content {
+    line-height: 0;
+    width: 100%;
+    max-width: 900px; }
+  .mfp-iframe-holder .mfp-close {
+    top: -40px; }
+
+.mfp-iframe-scaler {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  padding-top: 56.25%; }
+  .mfp-iframe-scaler iframe {
+    position: absolute;
+    display: block;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #000; }
+
+/* Main image in popup */
+img.mfp-img {
+  width: auto;
+  max-width: 100%;
+  height: auto;
+  display: block;
+  line-height: 0;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 40px 0 40px;
+  margin: 0 auto; }
+
+/* The shadow behind the image */
+.mfp-figure {
+  line-height: 0; }
+  .mfp-figure:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 40px;
+    bottom: 40px;
+    display: block;
+    right: 0;
+    width: auto;
+    height: auto;
+    z-index: -1;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #444; }
+  .mfp-figure small {
+    color: #BDBDBD;
+    display: block;
+    font-size: 12px;
+    line-height: 14px; }
+  .mfp-figure figure {
+    margin: 0; }
+
+.mfp-bottom-bar {
+  margin-top: -36px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 100%;
+  cursor: auto; }
+
+.mfp-title {
+  text-align: left;
+  line-height: 18px;
+  color: #F3F3F3;
+  word-wrap: break-word;
+  padding-right: 36px; }
+
+.mfp-image-holder .mfp-content {
+  max-width: 100%; }
+
+.mfp-gallery .mfp-image-holder .mfp-figure {
+  cursor: pointer; }
+
+@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
+  /**
+       * Remove all paddings around the image on small screen
+       */
+  .mfp-img-mobile .mfp-image-holder {
+    padding-left: 0;
+    padding-right: 0; }
+  .mfp-img-mobile img.mfp-img {
+    padding: 0; }
+  .mfp-img-mobile .mfp-figure:after {
+    top: 0;
+    bottom: 0; }
+  .mfp-img-mobile .mfp-figure small {
+    display: inline;
+    margin-left: 5px; }
+  .mfp-img-mobile .mfp-bottom-bar {
+    background: rgba(0, 0, 0, 0.6);
+    bottom: 0;
+    margin: 0;
+    top: auto;
+    padding: 3px 5px;
+    position: fixed;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box; }
+    .mfp-img-mobile .mfp-bottom-bar:empty {
+      padding: 0; }
+  .mfp-img-mobile .mfp-counter {
+    right: 5px;
+    top: 3px; }
+  .mfp-img-mobile .mfp-close {
+    top: 0;
+    right: 0;
+    width: 35px;
+    height: 35px;
+    line-height: 35px;
+    background: rgba(0, 0, 0, 0.6);
+    position: fixed;
+    text-align: center;
+    padding: 0; }
+ }
+
+@media all and (max-width: 900px) {
+  .mfp-arrow {
+    -webkit-transform: scale(0.75);
+    transform: scale(0.75); }
+
+  .mfp-arrow-left {
+    -webkit-transform-origin: 0;
+    transform-origin: 0; }
+
+  .mfp-arrow-right {
+    -webkit-transform-origin: 100%;
+    transform-origin: 100%; }
+
+  .mfp-container {
+    padding-left: 6px;
+    padding-right: 6px; }
+ }
+
+.mfp-ie7 .mfp-img {
+  padding: 0; }
+.mfp-ie7 .mfp-bottom-bar {
+  width: 600px;
+  left: 50%;
+  margin-left: -300px;
+  margin-top: 5px;
+  padding-bottom: 5px; }
+.mfp-ie7 .mfp-container {
+  padding: 0; }
+.mfp-ie7 .mfp-content {
+  padding-top: 44px; }
+.mfp-ie7 .mfp-close {
+  top: 0;
+  right: 0;
+  padding-top: 0; }

datamodels/2.x/authent-cas/composer.json

@@ -1,5 +1,4 @@
 {
-  "name": "combodo/authent-cas",
   "config" : {
     "classmap-authoritative" : true
   },

datamodels/2.x/authent-cas/composer.lock

@@ -4,15 +4,15 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2f342cfe65023402c1e00d88698d52b9",
+    "content-hash": "d751713988987e9331980363e24189ce",
     "packages": [],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": {},
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.1.0"
 }

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

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

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'CAS:Error:UserNotAllowed' => 'Uživatel není oprávněn',
 	'CAS:Login:SignIn' => 'Přihlásit se prostřednictvím CAS',
 	'CAS:Login:SignInTooltip' => 'Klikni zde pro příhlášení prostřednictvím CAS serveru',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
+Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'CAS:Error:UserNotAllowed' => 'User not allowed~~',
 	'CAS:Login:SignIn' => 'Sign in with CAS~~',
 	'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server~~',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('DE DE', 'German', 'Deutsch', array(
+Dict::Add('DE DE', 'German', 'Deutsch', [
 	'CAS:Error:UserNotAllowed' => 'Benutzer ist nicht zugelassen',
 	'CAS:Login:SignIn' => 'Anmeldung mit CAS',
 	'CAS:Login:SignInTooltip' => 'Hier klicken, um sich am CAS-Server zu authentifizieren',
-));
+]);

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

@@ -1,13 +0,0 @@
-<?php
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2024 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN GB', 'British English', 'British English', array(
-	'CAS:Error:UserNotAllowed' => 'User not allowed',
-	'CAS:Login:SignIn' => 'Sign in with CAS',
-	'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server',
-));

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

@@ -7,8 +7,8 @@
  * @author Miguel Turrubiates <miguel_tf@yahoo.com>
  * @notas       Utilizar codificación UTF-8 para mostrar acentos y otros caracteres especiales 
  */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'CAS:Error:UserNotAllowed' => 'Usuario no permitido',
 	'CAS:Login:SignIn' => 'Iniciar sesión con CAS',
 	'CAS:Login:SignInTooltip' => 'Click para autenticarse con servidor CAS',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('FR FR', 'French', 'Français', array(
+Dict::Add('FR FR', 'French', 'Français', [
 	'CAS:Error:UserNotAllowed' => 'Utilisateur non autorisé',
 	'CAS:Login:SignIn' => 'S\'identifier avec CAS',
 	'CAS:Login:SignInTooltip' => 'Cliquer ici pour s\'identifier avec le serveur CAS',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'CAS:Error:UserNotAllowed' => 'Nem engedélyezett felhasználó',
 	'CAS:Login:SignIn' => 'Bejelentkezés CAS szerverrel',
 	'CAS:Login:SignInTooltip' => 'Kattintson ide az azonosításhoz a CAS szerveren',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
+Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'CAS:Error:UserNotAllowed' => 'Utente non autorizzato',
 	'CAS:Login:SignIn' => 'Accedi con CAS',
 	'CAS:Login:SignInTooltip' => 'Clicca qui per autenticarti con il server CAS',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('JA JP', 'Japanese', '日本語', array(
+Dict::Add('JA JP', 'Japanese', '日本語', [
 	'CAS:Error:UserNotAllowed' => 'User not allowed~~',
 	'CAS:Login:SignIn' => 'Sign in with CAS~~',
 	'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server~~',
-));
+]);

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

@@ -10,8 +10,8 @@
  * @author Jeffrey Bostoen <info@jeffreybostoen.be> (2018 - 2022)
  *
  */
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'CAS:Error:UserNotAllowed' => 'Gebruiker heeft onvoldoende rechten.',
 	'CAS:Login:SignIn' => 'Inloggen met CAS',
 	'CAS:Login:SignInTooltip' => 'Klik hier om aan te melden via de CAS-server',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('PL PL', 'Polish', 'Polski', array(
+Dict::Add('PL PL', 'Polish', 'Polski', [
 	'CAS:Error:UserNotAllowed' => 'Użytkownik niedozwolony',
 	'CAS:Login:SignIn' => 'Zaloguj się za pomocą CAS',
 	'CAS:Login:SignInTooltip' => 'Kliknij tutaj, aby uwierzytelnić się na serwerze CAS',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'CAS:Error:UserNotAllowed' => 'Usuário não permitido',
 	'CAS:Login:SignIn' => 'Autenticar com CAS',
 	'CAS:Login:SignInTooltip' => 'Clique aqui para se autenticar no servidor CAS',
-));
+]);

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

@@ -10,8 +10,8 @@
  * @author Vladimir Kunin <v.b.kunin@gmail.com>
  *
  */
-Dict::Add('RU RU', 'Russian', 'Русский', array(
+Dict::Add('RU RU', 'Russian', 'Русский', [
 	'CAS:Error:UserNotAllowed' => 'Вход не разрешён',
 	'CAS:Login:SignIn' => 'Вход через CAS',
 	'CAS:Login:SignInTooltip' => 'Нажмите здесь, чтобы войти через CAS сервер',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'CAS:Error:UserNotAllowed' => 'User not allowed~~',
 	'CAS:Login:SignIn' => 'Sign in with CAS~~',
 	'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server~~',
-));
+]);

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

@@ -9,8 +9,8 @@
 /**
  *
  */
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'CAS:Error:UserNotAllowed' => 'User not allowed~~',
 	'CAS:Login:SignIn' => 'Sign in with CAS~~',
 	'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server~~',
-));
+]);

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

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

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

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

datamodels/2.x/authent-cas/src/CASLoginExtension.php

@@ -160,7 +160,8 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 	private static function InitCASClient()
 	{
 		$bCASDebug = Config::Get('cas_debug');
-		if ($bCASDebug) {
+		if ($bCASDebug)
+		{
 			phpCAS::setLogger(new CASLogger(APPROOT.'log/cas.log'));
 		}
 
@@ -170,17 +171,18 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 		$iCASPort = Config::Get('cas_port');
 		$sCASContext = Config::Get('cas_context');
 		$sServiceBaseURL = Config::Get('service_base_url', self::GetServiceBaseURL());
-		if (!phpCAS::isInitialized()) {
-			phpCAS::client($sCASVersion, $sCASHost, $iCASPort, $sCASContext, $sServiceBaseURL, false /* session already started */);
-		}
+		phpCAS::client($sCASVersion, $sCASHost, $iCASPort, $sCASContext, $sServiceBaseURL, false /* session already started */);
 		$sCASCACertPath = Config::Get('cas_server_ca_cert_path');
-		if (empty($sCASCACertPath)) {
+		if (empty($sCASCACertPath))
+		{
 			// If no certificate authority is provided, do not attempt to validate
 			// the server's certificate
 			// THIS SETTING IS NOT RECOMMENDED FOR PRODUCTION.
 			// VALIDATING THE CAS SERVER IS CRUCIAL TO THE SECURITY OF THE CAS PROTOCOL!
 			phpCAS::setNoCasServerValidation();
-		} else {
+		}
+		else
+		{
 			phpCAS::setCasServerCACert($sCASCACertPath);
 		}
 	}

datamodels/2.x/authent-cas/vendor/autoload.php

@@ -2,24 +2,6 @@
 
 // autoload.php @generated by Composer
 
-if (PHP_VERSION_ID < 50600) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, $err);
-        } elseif (!headers_sent()) {
-            echo $err;
-        }
-    }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
-}
-
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit2f342cfe65023402c1e00d88698d52b9::getLoader();
+return ComposerAutoloaderInit1878ad96115c3aa0fa5e9fd9807f5db0::getLoader();

datamodels/2.x/authent-cas/vendor/composer/ClassLoader.php

@@ -42,37 +42,35 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
-    /** @var \Closure(string):void */
-    private static $includeFile;
-
-    /** @var string|null */
+    /** @var ?string */
     private $vendorDir;
 
     // PSR-4
     /**
-     * @var array<string, array<string, int>>
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
-     * @var array<string, list<string>>
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
      */
     private $prefixDirsPsr4 = array();
     /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
      */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
     /**
-     * List of PSR-0 prefixes
-     *
-     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
-     *
-     * @var array<string, array<string, list<string>>>
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
      */
     private $prefixesPsr0 = array();
     /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
      */
     private $fallbackDirsPsr0 = array();
 
@@ -80,7 +78,8 @@ class ClassLoader
     private $useIncludePath = false;
 
     /**
-     * @var array<string, string>
+     * @var string[]
+     * @psalm-var array<string, string>
      */
     private $classMap = array();
 
@@ -88,29 +87,29 @@ class ClassLoader
     private $classMapAuthoritative = false;
 
     /**
-     * @var array<string, bool>
+     * @var bool[]
+     * @psalm-var array<string, bool>
      */
     private $missingClasses = array();
 
-    /** @var string|null */
+    /** @var ?string */
     private $apcuPrefix;
 
     /**
-     * @var array<string, self>
+     * @var self[]
      */
     private static $registeredLoaders = array();
 
     /**
-     * @param string|null $vendorDir
+     * @param ?string $vendorDir
      */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
-        self::initializeIncludeClosure();
     }
 
     /**
-     * @return array<string, list<string>>
+     * @return string[]
      */
     public function getPrefixes()
     {
@@ -122,7 +121,8 @@ class ClassLoader
     }
 
     /**
-     * @return array<string, list<string>>
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
      */
     public function getPrefixesPsr4()
     {
@@ -130,7 +130,8 @@ class ClassLoader
     }
 
     /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
      */
     public function getFallbackDirs()
     {
@@ -138,7 +139,8 @@ class ClassLoader
     }
 
     /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
      */
     public function getFallbackDirsPsr4()
     {
@@ -146,7 +148,8 @@ class ClassLoader
     }
 
     /**
-     * @return array<string, string> Array of classname => path
+     * @return string[] Array of classname => path
+     * @psalm-var array<string, string>
      */
     public function getClassMap()
     {
@@ -154,7 +157,8 @@ class ClassLoader
     }
 
     /**
-     * @param array<string, string> $classMap Class to filename map
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
      *
      * @return void
      */
@@ -171,25 +175,24 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string              $prefix  The prefix
-     * @param list<string>|string $paths   The PSR-0 root directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    $paths
+                    (array) $paths
                 );
             }
 
@@ -198,19 +201,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = $paths;
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -219,9 +222,9 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string              $prefix  The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths   The PSR-4 base directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
      *
@@ -229,18 +232,17 @@ class ClassLoader
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    $paths
+                    (array) $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -250,18 +252,18 @@ class ClassLoader
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = $paths;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -270,8 +272,8 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string              $prefix The prefix
-     * @param list<string>|string $paths  The PSR-0 base directories
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
      *
      * @return void
      */
@@ -288,8 +290,8 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string              $prefix The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths  The PSR-4 base directories
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
      *
@@ -423,8 +425,7 @@ class ClassLoader
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            $includeFile = self::$includeFile;
-            $includeFile($file);
+            includeFile($file);
 
             return true;
         }
@@ -475,9 +476,9 @@ class ClassLoader
     }
 
     /**
-     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
      *
-     * @return array<string, self>
+     * @return self[]
      */
     public static function getRegisteredLoaders()
     {
@@ -554,26 +555,18 @@ class ClassLoader
 
         return false;
     }
-
-    /**
-     * @return void
-     */
-    private static function initializeIncludeClosure()
-    {
-        if (self::$includeFile !== null) {
-            return;
-        }
-
-        /**
-         * Scope isolated include.
-         *
-         * Prevents access to $this/self from included files.
-         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = \Closure::bind(static function($file) {
-            include $file;
-        }, null, null);
-    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ *
+ * @param  string $file
+ * @return void
+ * @private
+ */
+function includeFile($file)
+{
+    include $file;
 }

datamodels/2.x/authent-cas/vendor/composer/InstalledVersions.php

@@ -21,31 +21,11 @@ use Composer\Semver\VersionParser;
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
  */
 class InstalledVersions
 {
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
-     */
     private static $installed;
-
-    /**
-     * @var bool
-     */
-    private static $installedIsLocalDir;
-
-    /**
-     * @var bool|null
-     */
     private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
     private static $installedByVendor = array();
 
     /**
@@ -103,7 +83,7 @@ class InstalledVersions
     {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
             }
         }
 
@@ -124,7 +104,7 @@ class InstalledVersions
      */
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints((string) $constraint);
+        $constraint = $parser->parseConstraints($constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
         return $provided->matches($constraint);
@@ -248,7 +228,7 @@ class InstalledVersions
 
     /**
      * @return array
-     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
      */
     public static function getRootPackage()
     {
@@ -262,7 +242,7 @@ class InstalledVersions
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
      */
     public static function getRawData()
     {
@@ -285,7 +265,7 @@ class InstalledVersions
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
     public static function getAllRawData()
     {
@@ -308,23 +288,17 @@ class InstalledVersions
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
      */
     public static function reload($data)
     {
         self::$installed = $data;
         self::$installedByVendor = array();
-
-        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
-        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
-        // so we have to assume it does not, and that may result in duplicate data being returned when listing
-        // all installed packages for example
-        self::$installedIsLocalDir = false;
     }
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
     private static function getInstalled()
     {
@@ -333,27 +307,17 @@ class InstalledVersions
         }
 
         $installed = array();
-        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
-            $selfDir = strtr(__DIR__, '\\', '/');
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                    $required = require $vendorDir.'/composer/installed.php';
-                    self::$installedByVendor[$vendorDir] = $required;
-                    $installed[] = $required;
-                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
-                        self::$installed = $required;
-                        self::$installedIsLocalDir = true;
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
                     }
                 }
-                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
-                    $copiedLocalDir = true;
-                }
             }
         }
 
@@ -361,17 +325,12 @@ class InstalledVersions
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                $required = require __DIR__ . '/installed.php';
-                self::$installed = $required;
+                self::$installed = require __DIR__ . '/installed.php';
             } else {
                 self::$installed = array();
             }
         }
-
-        if (self::$installed !== array() && !$copiedLocalDir) {
-            $installed[] = self::$installed;
-        }
+        $installed[] = self::$installed;
 
         return $installed;
     }

datamodels/2.x/authent-cas/vendor/composer/autoload_classmap.php

@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(