Fix return type in PHPDoc thanks to @jbostoen

Change to fit convention.

.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

.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

@@ -1,5 +1,9 @@
 <p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
-    <img src="https://www.combodo.com/logos/logo-itop-baseline.svg" width=350>
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="/images/logos/logo-itop-baseline-light.svg">
+  <source media="(prefers-color-scheme: light)" srcset="/images/logos/logo-itop-baseline-dark.svg">
+  <img src="/images/logos/logo-itop-baseline-light.svg" width="350" alt="Logo iTop with baseline" />
+</picture>
 </a></p>
 
 
@@ -90,7 +94,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))

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

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/applicationcontext.class.inc.php

@@ -195,16 +195,31 @@ class ApplicationContext
 	/**
 	 * Returns the context as string with the format name1=value1&name2=value2....
 	 * @return string The context as a string to be appended to an href property
+	 *
 	 */
-	public function GetForLink()
+	public function GetForLink(bool $bWithLeadingAmpersand = false)
 	{
+		// If there are no parameters, return an empty string
+		if(empty($this->aValues)){
+			return '';
+		}
+
+		// Build the query string with ampersand separated parameters
 		$aParams = array();
 		foreach($this->aValues as $sName => $sValue)
 		{
 			$aParams[] = "c[$sName]".'='.urlencode($sValue);
 		}
-		return implode("&", $aParams);
+		$sReturnValue = implode('&', $aParams);
+
+		// add the leading ampersand if requested
+		if($bWithLeadingAmpersand){
+			$sReturnValue = '&' . $sReturnValue;
+		}
+
+		return $sReturnValue;
 	}
+
 	/**
 	 * @since 3.0.0 N°2534 - dashboard: bug with autorefresh that deactivates filtering on organisation
 	 * Returns the params as c[menu]:..., c[org_id]:....
@@ -382,7 +397,7 @@ class ApplicationContext
 		$sUrl = call_user_func(array($sUrlMakerClass, 'MakeObjectUrl'), $sObjClass, $sObjKey);
 	   if (utils::StrLen($sUrl) > 0) {
 		   if ($bWithNavigationContext) {
-			   return $sUrl."&".$oAppContext->GetForLink();
+			   return $sUrl.$oAppContext->GetForLink(true);
 		   } else {
 			   return $sUrl;
 		   }

application/applicationextension.inc.php

@@ -1711,11 +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;
@@ -1929,76 +1924,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

@@ -311,7 +311,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		{
 			$sParams .= $sName.'='.urlencode($value).'&'; // Always add a trailing &
 		}
-		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/'.$oObj->GetUIPage().'?'.$sParams.'class='.get_class($oObj).'&id='.$oObj->getKey().'&'.$oAppContext->GetForLink().'&a=1';
+		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/'.$oObj->GetUIPage().'?'.$sParams.'class='.get_class($oObj).'&id='.$oObj->getKey().$oAppContext->GetForLink(true).'&a=1';
 		$oPage->add_early_script(<<<JS
 	if (!sessionStorage.getItem('$sSessionStorageKey'))
 	{
@@ -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();
@@ -1337,7 +1337,7 @@ HTML
 					}
 				}
 			}
-
+            $aHeader['friendlyname'] = ['label' => MetaModel::GetName($sClassName)];
 			foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
 				$sColLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx) : $sAttCodeEx;
 
@@ -1358,6 +1358,7 @@ HTML
 			$aRow = [];
 			foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
 				$oObj = $aObjects[$sAlias];
+                $aRow["friendlyname"] = $oObj->Get('friendlyname');
 				foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
 					if (is_null($oObj)) {
 						$aRow[$oAttDef->GetCode()] = '';
@@ -3071,7 +3072,7 @@ JS
 		$oPage->add($oAppContext->GetForForm());
 
 		// Hook the cancel button via jQuery so that it can be unhooked easily as well if needed
-		$sDefaultUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_form&class='.$sClass.'&'.$oAppContext->GetForLink();
+		$sDefaultUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_form&class='.$sClass.$oAppContext->GetForLink(true);
 
 		$sCancelButtonOnClickScript = "let fOnClick{$this->m_iFormId}CancelButton = ";
 		if(isset($aExtraParams['js_handlers']['cancel_button_on_click'])){
@@ -3079,7 +3080,7 @@ JS
 		} else {
 			$sCancelButtonOnClickScript .= "function() { BackToDetails('$sClass', $iKey, '$sDefaultUrl', $sJSToken)};";
 		}
-		$sCancelButtonOnClickScript .= "$('#form_{$this->m_iFormId} button.cancel').on('click', fOnClick{$this->m_iFormId}CancelButton);";
+		$sCancelButtonOnClickScript .= "$('#form_{$this->m_iFormId} button.cancel').on('click.navigation.itop', fOnClick{$this->m_iFormId}CancelButton);";
 		$oPage->add_ready_script($sCancelButtonOnClickScript);
 
 		$iFieldsCount = count($aFieldsMap);
@@ -5206,7 +5207,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 +5261,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);
 								}

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();
@@ -524,9 +524,7 @@ EOF
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
 	{
-		if (!array_key_exists('dashboard_div_id', $aExtraParams)) {
-			$aExtraParams['dashboard_div_id'] = utils::Sanitize($this->GetId(), '', 'element_identifier');
-		}
+		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? null, $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
 
 		/** @var \DashboardLayoutMultiCol $oLayout */
 		$oLayout = new $this->sLayoutClass();
@@ -1052,7 +1050,7 @@ EOF
 		$sSelectorHtml .= '</div>';
 
 		$sFile = addslashes($this->GetDefinitionFile());
-		$sReloadURL = $this->GetReloadURL();
+		$sReloadURL = json_encode($this->GetReloadURL());
 
 		$bFromDashboardPage = isset($aAjaxParams['from_dashboard_page']) ? isset($aAjaxParams['from_dashboard_page']) : false;
 		if ($bFromDashboardPage) {
@@ -1141,7 +1139,6 @@ JS
 			->AddCSSClass('ibo-action-button');
 
 		$oToolbar->AddSubBlock($oActionButton);
-
 		$aActions = array();
 		$sFile = addslashes(utils::LocalPath($this->sDefinitionFile));
 		$sJSExtraParams = json_encode($aExtraParams);
@@ -1166,7 +1163,7 @@ JS
 		$oToolbar->AddSubBlock($oActionButton)
 			->AddSubBlock($oActionsMenu);
 
-		$sReloadURL = $this->GetReloadURL();
+		$sReloadURL = json_encode($this->GetReloadURL());
 		$oPage->add_script(
 			<<<EOF
 function EditDashboard(sId, sDashboardFile, aExtraParams)
@@ -1273,7 +1270,7 @@ EOF
 		$sTitle = json_encode($this->sTitle);
 		$sFile = json_encode($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
-		$sReloadURL = $this->GetReloadURL();
+		$sReloadURL = json_encode($this->GetReloadURL());
 
 		$sExitConfirmationMessage = addslashes(Dict::S('UI:NavigateAwayConfirmationMessage'));
 		$sCancelConfirmationMessage = addslashes(Dict::S('UI:CancelConfirmationMessage'));

application/dashlet.class.inc.php

@@ -2138,7 +2138,7 @@ class DashletHeaderDynamic extends Dashlet
 		$oSet = new DBObjectSet($oFilter);
 		$iCount = $oSet->Count();
 		$oAppContext = new ApplicationContext();
-		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($oFilter->serialize());
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($oFilter->serialize());
 		$oSubTitle->AddHtml('<a class="summary" href="'.$sHyperlink.'">'.Dict::Format(str_replace('_', ':', $sSubtitle), $iCount).'</a>');
 
 		return $oPanel;

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>

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',
@@ -1126,7 +1124,7 @@ JS
 						$oSingleGroupByValueFilter->SetShowObsoleteData($this->m_bShowObsoleteData);
 					}
 					$sHyperlink = utils::GetAbsoluteUrlAppRoot()
-						.'pages/UI.php?operation=search&'.$oAppContext->GetForLink()
+						.'pages/UI.php?operation=search'.$oAppContext->GetForLink(true)
 						.'&filter='.rawurlencode($oSingleGroupByValueFilter->serialize());
 					$aCounts[$sStateValue] = ['link' => $sHyperlink, 'label' => $aCounts[$sStateValue]];
 				}
@@ -1234,7 +1232,7 @@ JS
 		$iCount = $this->m_oSet->Count();
 		$sClassLabel = MetaModel::GetName($sClass);
 		$sClassIconUrl = MetaModel::GetClassIcon($sClass, false);
-		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize());
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize());
 
 		$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
 		$aRefreshParams = [
@@ -1243,7 +1241,7 @@ JS
 		];
 
 		if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY)) {
-			$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.'&'.$oAppContext->GetForLink();
+			$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.$oAppContext->GetForLink(true);
 			$sCreateActionLabel = Dict::Format('UI:Button:Create');
 			$oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, $sCreateActionUrl,
 				$sCreateActionLabel, $aRefreshParams);
@@ -1291,7 +1289,7 @@ JS
 
 			$aData = array();
 			$oAppContext = new ApplicationContext();
-			$sParams = $oAppContext->GetForLink();
+			$sParams = $oAppContext->GetForLink(true);
 			foreach ($aGroupBy as $iRow => $iCount) {
 				// Build the search for this subset
 				$oSubsetSearch = $this->m_oFilter->DeepClone();
@@ -1306,7 +1304,7 @@ JS
 
 				$aData[] = array(
 					'group' => $aLabels[$iRow],
-					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter\">$iCount</a>"
+					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1$sParams&filter=$sFilter\">$iCount</a>"
 				); // TO DO: add the context information
 			}
 			$aAttribs = array(
@@ -1638,7 +1636,7 @@ JS
 		$sGroupByExpr = isset($aExtraParams['group_by_expr']) ? '&params[group_by_expr]='.$aExtraParams['group_by_expr'] : '';
 		$sFilter = $this->m_oFilter->serialize(false, $aQueryParams);
 		$oContext = new ApplicationContext();
-		$sContextParam = $oContext->GetForLink();
+		$sContextParam = $oContext->GetForLink(true);
 		$sAggregationFunction = isset($aExtraParams['aggregation_function']) ? $aExtraParams['aggregation_function'] : '';
 		$sAggregationAttr = isset($aExtraParams['aggregation_attribute']) ? $aExtraParams['aggregation_attribute'] : '';
 		$sLimit = isset($aExtraParams['limit']) ? $aExtraParams['limit'] : '';
@@ -1646,7 +1644,7 @@ JS
 		$sOrderDirection = isset($aExtraParams['order_direction']) ? $aExtraParams['order_direction'] : '';
 
 		if (isset($aExtraParams['group_by_label'])) {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).$sContextParam;
 		} else {
 			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam;
 		}
@@ -1683,11 +1681,14 @@ JS
 		$oBlock = null;
 		$sJSURLs = '';
 
+		$oContext = new ApplicationContext();
+		$sContextParam = $oContext->GetForLink(true);
+
 		if (isset($aExtraParams['group_by'])) {
 			$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
 			$aRes = CMDBSource::QueryToArray($sSql);
-			$oContext = new ApplicationContext();
-			$sContextParam = $oContext->GetForLink();
+
+
 
 			$iTotalCount = 0;
 			$aURLs = array();
@@ -1707,14 +1708,14 @@ JS
 				$oSubsetSearch = $this->m_oFilter->DeepClone();
 				$oCondition = new BinaryExpression($oGroupByExp, '=', new ScalarExpression($sValue));
 				$oSubsetSearch->AddConditionExpression($oCondition);
-				$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).'&'.$sContextParam;
+				$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).$sContextParam;
 			}
 			$sJSURLs = json_encode($aURLs);
 		}
 		if (isset($aExtraParams['group_by_label'])) {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).'&'.$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).$sContextParam;
 		} else {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).'&'.$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).$sContextParam;
 		}
 
 		switch ($sChartType) {
@@ -1787,7 +1788,7 @@ JS
 
 		$oBlock->sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv';
 		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
-		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
+		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
 		// Pass the parameters via POST, since expression may be very long
 		$aParamsToPost = array(
 			'expression' => $this->m_oFilter->ToOQL(true),
@@ -1862,11 +1863,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;
@@ -1891,10 +1888,7 @@ class MenuBlock extends DisplayBlock
 			&& (!isset($aExtraParams['menu']) || $aExtraParams['menu'] === "1" || $aExtraParams['menu'] === true)
 		) {
 			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink();
-			if (utils::IsNotNullOrEmptyString($sContext)) {
-				$sContext = '&'.$sContext;
-			}
+			$sContext = $oAppContext->GetForLink(true);
 
 
 			$sFilter = $this->GetFilter()->serialize();
@@ -2584,11 +2578,8 @@ class MenuBlock extends DisplayBlock
 		$sUrl = "{$sRootUrl}pages/{$sUIPage}?{$sUrlParams}";
 
 		$oAppContext = new ApplicationContext();
-		$sContext = $oAppContext->GetForLink();
-		if (utils::IsNotNullOrEmptyString($sContext)) {
-			$sUrl .= '&'.$sContext;
-		}
+		$sContext = $oAppContext->GetForLink(true);
 
-		return $sUrl;
+		return $sUrl . $sContext;
 	}
 }

application/excelexporter.class.inc.php

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

application/exceptions/CoreCannotSaveObjectException.php

@@ -63,14 +63,14 @@ class CoreCannotSaveObjectException extends CoreException
 	public function getTextMessage()
 	{
 		$sTitle = Dict::S('UI:Error:SaveFailed');
-		$sContent = utils::HtmlEntities($sTitle);
+        $sContent = $sTitle;
 
 		if (count($this->aIssues) == 1) {
 			$sIssue = reset($this->aIssues);
-			$sContent .= utils::HtmlEntities($sIssue);
+            $sContent .= $sIssue;
 		} else {
 			foreach ($this->aIssues as $sError) {
-				$sContent .= " ".utils::HtmlEntities($sError).", ";
+                $sContent .= " " . $sError . ", ";
 			}
 		}
 

application/exceptions/CoreException.php

@@ -67,7 +67,7 @@ class CoreException extends Exception
 
 	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
 	{
-		return $this->getMessage();
+		return utils::EscapeHtml($this->getMessage());
 	}
 
 	/**

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/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/ui.extkeywidget.class.inc.php

@@ -250,7 +250,7 @@ class UIExtKeyWidget
 					foreach ($aAdditionalField as $sAdditionalField) {
 						array_push($aArguments, $oObj->Get($sAdditionalField));
 					}
-					$aOption['additional_field'] = utils::HtmlEntities(vsprintf($sFormatAdditionalField, $aArguments));
+					$aOption['additional_field'] = utils::HtmlEntities(utils::VSprintf($sFormatAdditionalField, $aArguments));
 				}
 				if (!empty($sObjectImageAttCode)) {
 					// Try to retrieve image for contact

application/utils.inc.php

@@ -521,8 +521,8 @@ class utils
 
 			// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
-                // N°6350 - returns only valid URLs
-				$retValue = filter_var($value, FILTER_VALIDATE_URL);
+				$retValue = filter_var($value, FILTER_SANITIZE_URL);
+				$retValue = filter_var($retValue, FILTER_VALIDATE_URL);
 				break;
 
 			default:
@@ -1516,12 +1516,12 @@ class utils
 			case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
 				/** @var \DBObjectSet $param */
 				$oAppContext = new ApplicationContext();
-				$sContext = $oAppContext->GetForLink();
+				$sContext = $oAppContext->GetForLink(true);
 				$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
 				$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($param->GetFilter()->GetClass());
 				$sOQL = addslashes($param->GetFilter()->ToOQL(true));
 				$sFilter = urlencode($param->GetFilter()->serialize());
-				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
+				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter.$sContext;
 				$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
 				$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
 				$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
@@ -1555,6 +1555,10 @@ class utils
 				}
 				$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL', '$sContext')");
 				$aResult[] = new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')");
+                if (ApplicationMenu::IsMenuIdEnabled('RunQueriesMenu')) {
+                    $oMenuItemPlay = new JSPopupMenuItem('UI:Menu:OpenOQL', Dict::S('UI:Menu:OpenOQL'), "OpenOql('$sOQL')");
+                    $aResult[] = $oMenuItemPlay;
+                }
 
 				break;
 
@@ -1691,8 +1695,8 @@ class utils
 		$oAppContext = new ApplicationContext();
 
 		$sUrl = $sAppRootUrl
-			.'pages/UI.php?operation=search&'
-			.$oAppContext->GetForLink()
+			.'pages/UI.php?operation=search'
+			.$oAppContext->GetForLink(true)
 			.'&filter='.rawurlencode($oDataTableSearchFilter->serialize());
 		$sUrl .= '&aParams='.rawurlencode($sParams); // Not working... yet, cause not handled by UI.php
 
@@ -1947,7 +1951,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
@@ -2075,6 +2079,127 @@ SQL;
 		);
 	}
 
+	/**
+	*  Format a string using vsprintf with safety checks to avoid ValueError
+	*
+	*  This method fills missing arguments with their original format specifiers,
+	*  then calls vsprintf with the complete array.
+	*
+	* @param string $sFormat The format string
+	* @param array $aArgs The arguments to format
+	* @param bool $bLogErrors Whether to log errors (defaults to true)
+	*
+	* @return string The formatted string
+	 * @since 3.2.2
+	*/
+	public static function VSprintf(string $sFormat, array $aArgs, bool $bLogErrors = true): string
+	{
+		// Extract all format specifiers
+		$sPattern = '/%(?:(?:[1-9][0-9]*)\$)?[-+\'0# ]*(?:[0-9]*|\*)?(?:\.(?:[0-9]*|\*))?(?:[hlL])?[diouxXeEfFgGcrs%]/';
+		preg_match_all($sPattern, $sFormat, $aMatches, PREG_OFFSET_CAPTURE);
+
+		// Process matches, keeping track of their positions and excluding escaped percent signs (%%)
+		$aSpecifierMatches = [];
+		foreach ($aMatches[0] as $sMatch) {
+			if ($sMatch[0] !== '%%') {
+				$aSpecifierMatches[] = $sMatch;
+			}
+		}
+
+		// Check for positional specifiers and build position map
+		$bHasPositional = false;
+		$iMaxPosition = 0;
+		$aPositions = [];
+		$aUniquePositions = [];
+
+		foreach ($aSpecifierMatches as $index => $match) {
+			$sSpec = $match[0];
+			if (preg_match('/^%([1-9][0-9]*)\$/', $sSpec, $posMatch)) {
+				$bHasPositional = true;
+				$iPosition = (int)$posMatch[1] - 1; // Convert to 0-based
+				$aPositions[$index] = $iPosition;
+				$aUniquePositions[$iPosition] = true;
+				$iMaxPosition = max($iMaxPosition, $iPosition + 1);
+			} else {
+				$aPositions[$index] = $index;
+				$aUniquePositions[$index] = true;
+				$iMaxPosition = max($iMaxPosition, $index + 1);
+			}
+		}
+
+		// Count unique positions, this tells us how many arguments we actually need
+		$iExpectedCount = count($aUniquePositions);
+		$iActualCount = count($aArgs);
+
+		// If we have enough arguments, just use vsprintf
+		if ($iActualCount >= $iExpectedCount) {
+			return vsprintf($sFormat, $aArgs);
+		}
+		// else log the error if needed
+		if ($bLogErrors) {
+			IssueLog::Warning("Format string requires $iExpectedCount arguments, but only $iActualCount provided. Format: '$sFormat'"	);
+		}
+
+		// Create a replacement map
+		if ($bHasPositional) {
+			// For positional, we need to handle the exact positions
+			$aReplacements = array_fill(0, $iMaxPosition, null);
+
+			// Fill in the real arguments first
+			foreach ($aArgs as $index => $sValue) {
+				if ($index < $iMaxPosition) {
+					$aReplacements[$index] = $sValue;
+				}
+			}
+
+			// For null values in the replacement map, use the original specifier
+			foreach ($aSpecifierMatches as $index => $sMatch) {
+				$iPosition = $aPositions[$index];
+				if ($aReplacements[$iPosition] === null) {
+					// Use the original format specifier when we don't have an argument
+					$aReplacements[$iPosition] = $sMatch[0];
+				}
+			}
+
+			// Remove any remaining nulls (for positions that weren't referenced)
+			$aReplacements = array_filter($aReplacements, static function($val) { return $val !== null; });
+		} else {
+			// For non-positional, we need to map each position
+			$aReplacements = [];
+			$iUsed = 0;
+
+			// Create a map of what values to use for each position
+			$aPositionValues = [];
+			for ($i = 0; $i < $iMaxPosition; $i++) {
+				if (isset($aUniquePositions[$i])) {
+					if ($iUsed < $iActualCount) {
+						// We have an actual argument for this position
+						$aPositionValues[$i] = $aArgs[$iUsed++];
+					} else {
+						// Mark this position to use the original specifier
+						$aPositionValues[$i] = null;
+					}
+				}
+			}
+
+			// Build the replacements array preserving the original order
+			foreach ($aSpecifierMatches as $index => $sMatch) {
+				$iPosition = $aPositions[$index];
+				if (isset($aPositionValues[$iPosition])) {
+					$aReplacements[] = $aPositionValues[$iPosition];
+				} else {
+					// Use the original format specifier when we don't have an argument
+					$aReplacements[] = $sMatch[0];
+					// Mark this position as used, so if it appears again, it gets the same replacement
+					$aPositionValues[$iPosition] = $sMatch[0];
+				}
+			}
+		}
+
+		// Process the format string with our filled-in arguments
+		return vsprintf($sFormat, $aReplacements);
+	}
+
 	/**
 	 * Convert a string containing some (valid) HTML markup to plain text
 	 *

approot.inc.php

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

core/action.class.inc.php

@@ -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/attributedef.class.inc.php

@@ -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 '';
 		}
 
@@ -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)
@@ -5020,7 +4995,7 @@ class AttributeCaseLog extends AttributeLongText
 			}
 			else
 			{
-				if (strlen($proposedValue) > 0)
+				if (utils::StrLen($proposedValue) > 0)
 				{
 					//N°5135 - add impersonation information in caselog
 					if (UserRights::IsImpersonated()){
@@ -10979,12 +10954,12 @@ abstract class AttributeSet extends AttributeDBFieldVoid
 			$sDescription = utils::EscapeHtml($this->GetValueDescription($sValue));
 			$oFilter = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sValue'");
 			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink();
+			$sContext = $oAppContext->GetForLink(true);
 			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($oFilter->GetClass());
 			$sFilter = rawurlencode($oFilter->serialize());
 			$sLink = '';
 			if ($bWithLink && $this->bDisplayLink) {
-				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
+				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter.$sContext;
 				$sLink = ' href="'.$sUrl.'"';
 			}
 
@@ -12301,13 +12276,13 @@ class AttributeTagSet extends AttributeSet
 				$sTagDescription = $oTag->Get('description');
 				$oFilter = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sTagCode'");
 				$oAppContext = new ApplicationContext();
-				$sContext = $oAppContext->GetForLink();
+				$sContext = $oAppContext->GetForLink(true);
 				$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($oFilter->GetClass());
 				$sFilter = rawurlencode($oFilter->serialize());
 
 				$sLink = '';
 				if ($bWithLink && $this->bDisplayLink) {
-					$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
+					$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter.$sContext;
 					$sLink = ' href="'.$sUrl.'"';
 				}
 

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]);
 					}
 				}
 			}
@@ -1428,7 +1406,7 @@ class BulkChange
 		$aDetails = array();
 		while ($oChange = $oBulkChanges->Fetch())
 		{
-			$sDate = '<a href="csvimport.php?step=10&changeid='.$oChange->GetKey().'&'.$oAppContext->GetForLink().'">'.$oChange->Get('date').'</a>';
+			$sDate = '<a href="csvimport.php?step=10&changeid='.$oChange->GetKey().$oAppContext->GetForLink(true).'">'.$oChange->Get('date').'</a>';
 			$sUser = $oChange->GetUserName();
 			if (preg_match('/^(.*)\\(CSV\\)$/i', $oChange->Get('userinfo'), $aMatches))
 			{
@@ -1510,7 +1488,7 @@ EOF
 	function OnTruncatedHistoryToggle(bShowAll)
 	{
 		$('#csv_history_reload').html('<img src="' + GetAbsoluteUrlAppRoot() + 'images/indicator.gif"/>');
-		$.get(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?{$sAppContext}', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
+		$.get(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?$sAppContext', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
 			{
 				$('#$sAjaxDivId').html(data);
 			}

core/bulkexport.class.inc.php

@@ -25,7 +25,7 @@ define('EXPORTER_DEFAULT_CHUNK_SIZE', 1000);
 class BulkExportException extends Exception
 {
 	protected $sLocalizedMessage;
-	public function __construct($message, $sLocalizedMessage, $code = null, $previous = null)
+	public function __construct($message, $sLocalizedMessage, $code = 0, $previous = null)
 	{
 		parent::__construct($message, $code, $previous);
 		$this->sLocalizedMessage = $sLocalizedMessage;
@@ -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/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');
@@ -1233,6 +1233,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'sessions_tracking.session_handler_extension' => [
+			'type' => 'string',
+			'description' => 'to store more data in itop session files, set your own iSessionHandlerExtension implementation class in this variable',
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'sessions_tracking.gc_threshold' => [
 			'type' => 'integer',
 			'description'         => 'fallback in case cron is not active: probability in percent that session files are cleanup during any itop request (100 means always)',
@@ -1436,14 +1444,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 +1803,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>
@@ -1024,12 +1008,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

@@ -760,10 +760,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 +818,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
 	 *

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/dict.class.inc.php

@@ -206,7 +206,7 @@ class Dict
 		}
 
 		try{
-			return vsprintf($sLocalizedFormat, $aArguments);
+			return utils::VSprintf($sLocalizedFormat, $aArguments);
 		} catch(\Throwable $e){
 			\IssueLog::Error("Cannot format dict key", null, ["sFormatCode" => $sFormatCode, "sLangCode" => $sLangCode, 'exception_msg' => $e->getMessage() ]);
 			return $sFormatCode.' - '.implode(', ', $aArguments);

core/displayablegraph.class.inc.php

@@ -1470,8 +1470,8 @@ class DisplayableGraph extends SimpleGraph
 		try {
 			$this->InitFromGraphviz();
 			$sExportAsPdfURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_pdf&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
-			$sContext = $oAppContext->GetForLink();
-			$sDrillDownURL = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details&class=%1$s&id=%2$s&'.$sContext;
+			$sContext = $oAppContext->GetForLink(true);
+			$sDrillDownURL = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details&class=%1$s&id=%2$s'.$sContext;
 			$sExportAsDocumentURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_attachment&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
 			$sLoadFromURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_json&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
 			$sAttachmentExportTitle = '';

core/event.class.inc.php

@@ -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/kpi.class.inc.php

@@ -469,7 +469,8 @@ class ExecutionKPI
             // Invoke extensions to log the KPI operation
             /** @var \iKPILoggerExtension $oExtensionInstance */
             foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
-                $sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
+	            //$sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
+	            $sExtension = '';
                 $oKPILogData = new KpiLogData(
                         KpiLogData::TYPE_STATS,
                         $sOperation,

core/metamodel.class.php

@@ -7081,7 +7081,7 @@ abstract class MetaModel
 	 * @param array $aParams
 	 * @param bool $bAllowAllData
 	 *
-	 * @return \DBObject
+	 * @return \DBObject|null
 	 * @throws \OQLException
 	 */
 	public static function GetObjectFromOQL($sQuery, $aParams = null, $bAllowAllData = false)
@@ -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);

core/modelreflection.class.inc.php

@@ -77,7 +77,7 @@ abstract class ModelReflection
 			return $sFormatCode.' - '.implode(', ', $aArguments);
 		}
 
-		return vsprintf($sLocalizedFormat, $aArguments);
+		return utils::VSprintf($sLocalizedFormat, $aArguments);
 	}
 
 	/**

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/restservices.class.inc.php

@@ -76,6 +76,52 @@ class ObjectResult
 		$this->fields = array();
 	}
 
+	/**
+	 * Creates an ObjectResult from a DBObject.
+	 *
+	 * @param DBObject $oObj The object.
+	 * @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 ?
+	 * @param integer $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
+	 * 
+	 * @return ObjectResult
+	 */
+	public static function FromDBObject(DBObject $oObj, ?array $aFieldSpec = null, $bExtendedOutput = false, $iCode = 0, $sMessage = '') : ObjectResult {
+
+		$oObjRes = new ObjectResult($oObj::class, $oObj->GetKey());
+		$oObjRes->code = $iCode;
+		$oObjRes->message = $sMessage;
+
+		$aFields = null;
+		if (!is_null($aFieldSpec))
+		{
+			// Enum all classes in the hierarchy, starting with the current one
+			foreach (MetaModel::EnumParentClasses($oObj::class, ENUM_PARENT_CLASSES_ALL, false) as $sRefClass)
+			{
+				if (array_key_exists($sRefClass, $aFieldSpec))
+				{
+					$aFields = $aFieldSpec[$sRefClass];
+					break;
+				}
+			}
+		}
+		if (is_null($aFields))
+		{
+			// No fieldspec given, or not found...
+			$aFields = array('id', 'friendlyname');
+		}
+
+		foreach ($aFields as $sAttCode)
+		{
+			$oObjRes->AddField($oObj, $sAttCode, $bExtendedOutput);
+		}
+
+		return $oObjRes;
+
+	}
+
+
 	/**
 	 * Helper to make an output value for a given attribute
 	 *
@@ -159,15 +205,16 @@ class ObjectResult
 		$this->fields[$sAttCode] = $this->MakeResultValue($oObject, $sAttCode, $bExtendedOutput);
 	}
 
-	public function SanitizeContent()
+public function SanitizeContent()
 	{
-		foreach($this->fields as $sFieldAttCode => $fieldValue) {
+		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);
+                $this->SanitizeFieldIfSensitive($this->fields, $sFieldAttCode, $fieldValue, $oAttDef);
 		}
 	}
 }
@@ -185,40 +232,6 @@ 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)
-	{
-		$sClass = get_class($oObject);
-		$oObjRes = new ObjectResult($sClass, $oObject->GetKey());
-		$oObjRes->code = $iCode;
-		$oObjRes->message = $sMessage;
-
-		$aFields = null;
-		if (!is_null($aFieldSpec))
-		{
-			// Enum all classes in the hierarchy, starting with the current one
-			foreach (MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, false) as $sRefClass)
-			{
-				if (array_key_exists($sRefClass, $aFieldSpec))
-				{
-					$aFields = $aFieldSpec[$sRefClass];
-					break;
-				}
-			}
-		}
-		if (is_null($aFields))
-		{
-			// No fieldspec given, or not found...
-			$aFields = array('id', 'friendlyname');
-		}
-
-		foreach ($aFields as $sAttCode)
-		{
-			$oObjRes->AddField($oObject, $sAttCode, $bExtendedOutput);
-		}
-
-		return $oObjRes;
-	}
-
 	/**
 	 * Report the given object
 	 *
@@ -237,7 +250,8 @@ class RestResultWithObjects extends RestResult
 	 */
 	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
 	{
-		$oObjRes = $this->PrepareObject($iCode, $sMessage, $oObject, $aFieldSpec, $bExtendedOutput);
+		$oObjRes = ObjectResult::FromDBObject($oObject, $aFieldSpec, $bExtendedOutput, $iCode, $sMessage);
+
 		$sObjKey = get_class($oObject).'::'.$oObject->GetKey();
 		$this->objects[$sObjKey] = $oObjRes;
 	}
@@ -253,45 +267,6 @@ public function 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;
-	}
-}
-
 /**
  * @package RESTAPI
  * @api
@@ -571,21 +546,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 +571,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));
-				}
+                                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 ($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));
+				while ($oObject = $oObjectSet->Fetch())
+				{
+					$oResult->AddObject(0, '', $oObject, $aShowFields, $bExtendedOutput);
 				}
 				$oResult->message = "Found: ".$oObjectSet->Count();
 			}
@@ -1025,10 +948,6 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 	}
 }
 
-/**
- * Sanitizes sensitive fields on a "json ready" representation of a DBObject
- * Useful for logging purposes
- */
 trait SanitizeTrait
 {
     /**
@@ -1042,7 +961,8 @@ trait SanitizeTrait
     private function SanitizeFieldIfSensitive(array &$fields, string $sFieldAttCode, $fieldValue, $oAttDef): void
     {
         // for simple attribute
-        if ($oAttDef instanceof iAttributeNoGroupBy) { // iAttributeNoGroupBy is equivalent to sensitive attribute
+        if ($oAttDef instanceof iAttributeNoGroupBy) // iAttributeNoGroupBy is equivalent to sensitive attribute
+        {
             $fields[$sFieldAttCode] = '*****';
             return;
         }

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

@@ -1962,6 +1962,15 @@ class UserRights
 		return self::$m_aCacheUsers[$sAuthentication][$sLogin];
 	}
 
+	/**
+	 * Reset the cache of users
+	 * @return void
+	 */
+	public static function ResetCacheUsers()
+	{
+		self::$m_aCacheUsers = [ 'internal' => [], 'external' => [] ];
+	}
+	
 	/**
 	 * @param string$sClass
 	 * @param array $aAllowedOrgs
@@ -2120,6 +2129,8 @@ class StimulusChecker extends ActionChecker
 {
 	var $sState = null;
 
+	public mixed $iState = null;
+
 	public function __construct(DBSearch $oFilter, $sState, $iStimulusCode)
 	{
 		parent::__construct($oFilter, $iStimulusCode);

core/valuesetdef.class.inc.php

@@ -435,7 +435,7 @@ class ValueSetObjects extends ValueSetDefinition
 				foreach ($aAdditionalField as $sAdditionalField) {
 					array_push($aArguments, $oObject->Get($sAdditionalField));
 				}
-				$aData['additional_field'] = vsprintf($sFormatAdditionalField, $aArguments);
+				$aData['additional_field'] = utils::VSprintf($sFormatAdditionalField, $aArguments);
 			} else {
 				$aData['additional_field'] = '';
 			}

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/_sticky-header.scss

@@ -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

@@ -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/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/_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/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/_text-decoration.scss

@@ -4,7 +4,7 @@
  */
 
 /* 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/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/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/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.1',
 	array(
 		// Identification
 		//

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

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

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -21,12 +21,10 @@
         <db_key_field>id</db_key_field>
         <db_final_class_field/>
         <naming>
-          <format>%1$s</format>
           <attributes>
             <attribute id="login"/>
           </attributes>
         </naming>
-        <display_template/>
         <style>
           <icon/>
         </style>

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

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

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

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

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

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

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

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

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

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

datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss

@@ -21,29 +21,6 @@ $ibo-color-red-600: $nord11;
 $ibo-color-red-700: darken($nord11, 7%);
 $ibo-color-red-800: darken($nord11, 15%);
 $ibo-color-red-900: darken($nord11, 22%);
-$ibo-color-red-950: darken($nord11, 25%);
-
-$ibo-color-error-100: $ibo-color-red-100;
-$ibo-color-error-200: $ibo-color-red-200;
-$ibo-color-error-300: $ibo-color-red-300;
-$ibo-color-error-400: $ibo-color-red-400;
-$ibo-color-error-500: $ibo-color-red-500;
-$ibo-color-error-600: $ibo-color-red-600;
-$ibo-color-error-700: $ibo-color-red-700;
-$ibo-color-error-800: $ibo-color-red-800;
-$ibo-color-error-900: $ibo-color-red-900;
-$ibo-color-error-950: $ibo-color-red-950;
-
-$ibo-color-danger-100: $ibo-color-red-100;
-$ibo-color-danger-200: $ibo-color-red-200;
-$ibo-color-danger-300: $ibo-color-red-300;
-$ibo-color-danger-400: $ibo-color-red-400;
-$ibo-color-danger-500: $ibo-color-red-500;
-$ibo-color-danger-600: $ibo-color-red-600;
-$ibo-color-danger-700: $ibo-color-red-700;
-$ibo-color-danger-800: $ibo-color-red-800;
-$ibo-color-danger-900: $ibo-color-red-900;
-$ibo-color-danger-950: $ibo-color-red-950;
 
 $ibo-color-primary-100: lighten($nord8, 15%);
 $ibo-color-primary-200: darken($ibo-color-primary-100, 7%);

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/datamodel.combodo-backoffice-fullmoon-high-contrast-theme.xml

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

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/module.combodo-backoffice-fullmoon-high-contrast-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-high-contrast-theme/3.3.0',
+	'combodo-backoffice-fullmoon-high-contrast-theme/3.2.1',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/datamodel.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.xml

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

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/module.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.3.0',
+	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.2.1',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/datamodel.combodo-backoffice-fullmoon-tritanopia-theme.xml

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

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/module.combodo-backoffice-fullmoon-tritanopia-theme.php

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

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

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

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

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

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

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

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

@@ -85,11 +85,4 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -84,11 +84,4 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -84,11 +84,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (beim Herunterladen eines Attachment eines Objekts)',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger für das Herunterladen des Attachments der angegebenen Klasse oder einer Unterklasse',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -89,13 +89,6 @@ Dict::Add('EN US', 'English', 'English', array(
 //
 
 Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnAttachmentDownload'                       => 'Trigger (on object\'s attachment download)',
-	'Class:TriggerOnAttachmentDownload+'                      => 'Trigger on object\'s attachment download of [a child class of] the given class',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger',
+	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)',
+	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class',
 ));

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

@@ -81,11 +81,4 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnAttachmentDownload' => 'Disparador (al descargar el archivo adjunto del objeto)',
 	'Class:TriggerOnAttachmentDownload+' => 'Disparador al descargar el archivo adjunto del objeto de [una clase secundaria de] la clase dada',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:TriggerOnAttachmentDownload' => 'Déclencheur sur le téléchargement d\'une pièce jointe d\'un objet',
 	'Class:TriggerOnAttachmentDownload+' => '',
-	'Class:TriggerOnAttachmentCreate'                         => 'Déclencheur sur la création d\'une pièce jointe',
-	'Class:TriggerOnAttachmentCreate+'                        => '',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Ajoute le fichier dans l\'email',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'Si coché, le fichier sera automatiquement attaché à l\'email quand l\'action email est lancée',
-	'Class:TriggerOnAttachmentDelete'                         => 'Déclencheur sur la suppression d\'une pièce jointe',
-	'Class:TriggerOnAttachmentDelete+'                        => '',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Les Triggers sur les objets ne sont pas autorisés sur la classe Attachement. Veuillez utiliser les triggers spécifiques pour cette classe',
 ));

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

@@ -81,11 +81,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (al download di un allegato dell\'oggetto)',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger al download di un allegato di un oggetto di [una sottoclasse di] la classe data',
-    'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-    'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -85,11 +85,4 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (Bij het downloaden van een bijlage)',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger bij het downloaden van een bijlage van een object van de opgegeven klasse (of subklasse ervan)',
-    'Class:TriggerOnAttachmentCreate'                         => 'Trigger (Bij het toevoegen van een bijlage)',
-    'Class:TriggerOnAttachmentCreate+'                        => 'Trigger bij het toevoegen van een bijlage aan een object van de opgegeven klasse (of subklasse ervan)',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Bestand toevoegen in e-mail',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+'=> 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (Bij het verwijderen van een bijlage)',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger bij het verwijderen van een bijlage van een object van de opgegeven klasse (of subklasse ervan)',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:TriggerOnAttachmentDownload' => 'Wyzwalacz (po pobraniu załącznika obiektu)',
 	'Class:TriggerOnAttachmentDownload+' => 'Wyzwalacz po pobraniu załącznika obiektu [klasy podrzędnej] danej klasy',
-    'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-    'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -84,11 +84,4 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate' => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+' => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete' => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+' => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
 	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

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

@@ -83,11 +83,4 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:TriggerOnAttachmentDownload' => '触发器 (于对象附件下载时)',
 	'Class:TriggerOnAttachmentDownload+' => '触发器于指定类型 [子类型] 对象附件下载时',
-	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment create)~~',
-    'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment create~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
-	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment delete)~~',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment delete~~',
-    'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ));

datamodels/2.x/itop-attachments/main.itop-attachments.php

@@ -349,7 +349,9 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 				{
 					$oAttachment->DBDelete();
 					// temporary attachment removed, don't even mention it in the history
-				} else {
+				}
+				else
+				{
 					$oAttachment->SetItem($oObject);
 					$oAttachment->Set('temp_id', '');
 					$oAttachment->DBUpdate();
@@ -769,6 +771,39 @@ class CMDBChangeOpAttachmentRemoved extends CMDBChangeOp
 	}
 }
 
+/**
+ * Class TriggerOnAttachmentDownload
+ *
+ * @since 3.1.0
+ */
+class TriggerOnAttachmentDownload extends TriggerOnAttributeBlobDownload
+{
+	/**
+	 * @inheritDoc
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"state_attcode" => "",
+			"reconc_keys" => ['description'],
+			"db_table" => "priv_trigger_onattdownload",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+	}
+}
+
+
 class AttachmentsHelper
 {
 	/**

datamodels/2.x/itop-attachments/module.itop-attachments.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/3.3.0',
+	'itop-attachments/3.2.1',
 	array(
 		// Identification
 		//
@@ -38,9 +38,6 @@ SetupWebPage::AddModule(
 		'datamodel' => array(
 			'vendor/autoload.php',
 			'main.itop-attachments.php',
-			'src/Trigger/TriggerOnAttachmentCreate.php',
-			'src/Trigger/TriggerOnAttachmentDelete.php',
-			'src/Trigger/TriggerOnAttachmentDownload.php',
 			'renderers.itop-attachments.php',
 		),
 		'webservice' => array(
@@ -204,7 +201,7 @@ SQL;
 			}
 			SetupLog::Info("Initializing attachment/item_org_id - $iUpdated records have been adjusted");
 
-			if (MetaModel::GetAttributeDef('Attachment', 'contact_id') instanceof AttributeExternalKey) {
+			if (MetaModel::GetAttributeDef('Attachment', 'contact_id') instanceof AttributeExternalKey && version_compare($sPreviousVersion, '3.2.0', '<')) {
 				SetupLog::Info("Upgrading itop-attachment from '$sPreviousVersion' to '$sCurrentVersion'. Starting with 3.2.0, contact_id will be added into the DB...");
 				$sUserTableName = MetaModel::DBGetTable('User');
 				$sUserFieldContactId = MetaModel::GetAttributeDef('User', 'contactid')->Get('sql');

datamodels/2.x/itop-attachments/src/Hook/EventListener.php

@@ -10,7 +10,6 @@ namespace Combodo\iTop\Attachments\Hook;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
 use Combodo\iTop\Service\Events\iEventServiceSetup;
-use DBObject;
 use DBObjectSearch;
 use DBObjectSet;
 use Exception;
@@ -19,8 +18,6 @@ use LogChannels;
 use MetaModel;
 use ormDocument;
 use TriggerOnAttachmentDownload;
-use TriggerOnAttachmentCreate;
-use TriggerOnAttachmentDelete;
 
 /**
  * Class EventListener
@@ -40,14 +37,6 @@ class EventListener implements iEventServiceSetup
 			[$this, 'OnAttachmentDownloadActivateTriggers'],
 			'Attachment'
 		);
-        EventService::RegisterListener(
-        \EVENT_ADD_ATTACHMENT_TO_OBJECT,
-            [$this, 'OnAttachmentAddedActivateTriggers']
-        );
-        EventService::RegisterListener(
-            \EVENT_REMOVE_ATTACHMENT_FROM_OBJECT,
-            [$this, 'OnAttachmentRemovedActivateTriggers']
-        );
 	}
 
 	/**
@@ -70,77 +59,7 @@ class EventListener implements iEventServiceSetup
 		/** @var \ormDocument $oDocument */
 		$oDocument = $oEventData->Get('document');
 
-        $this->OnAttachmentActivateTriggers(
-            $oHostObj,
-            $oAttachment,
-            $oDocument,
-            TriggerOnAttachmentDownload::class
-        );
-    }
-
-    /**
-     * Callback when an Attachment is added: Activate corresponding triggers
-     *
-     * @param \Combodo\iTop\Service\Events\EventData $oEventData
-     *
-     * @return void
-     * @throws \CoreException
-     */
-    public function OnAttachmentAddedActivateTriggers(EventData $oEventData): void
-    {
-        /** @var DBObject $oAttachment */
-        $oAttachment = $oEventData->Get('attachment');
-        /** @var DBObject $oHostObj */
-        $oHostObj = $oEventData->Get('object');
-        /** @var ormDocument $oDocument */
-        $oDocument = $oAttachment->Get('contents');
-
-        $this->OnAttachmentActivateTriggers(
-            $oHostObj,
-            $oAttachment,
-            $oDocument,
-            \TriggerOnAttachmentCreate::class
-        );
-    }
-
-    /**
-     * Callback when an Attachment is removed: Activate corresponding triggers
-     *
-     * @param \Combodo\iTop\Service\Events\EventData $oEventData
-     *
-     * @return void
-     * @throws \CoreException
-     */
-    public function OnAttachmentRemovedActivateTriggers(EventData $oEventData): void
-    {
-        /** @var DBObject $oAttachment */
-        $oAttachment = $oEventData->Get('attachment');
-        /** @var DBObject $oHostObj */
-        $oHostObj = $oEventData->Get('object');
-        /** @var ormDocument $oDocument */
-        $oDocument = $oAttachment->Get('contents');
-
-        $this->OnAttachmentActivateTriggers(
-            $oHostObj,
-            $oAttachment,
-            $oDocument,
-            \TriggerOnAttachmentDelete::class
-        );
-    }
-
-    /**
-     * Callback when an Attachment downloaded, added or removed: Activate corresponding triggers
-     *
-     * @param DBObject $oHostObj
-     * @param DBObject $oAttachment
-     * @param ormDocument $oDocument
-     * @param string $sTriggerClass
-     *
-     * @return void
-     * @throws \CoreException
-     */
-    protected function OnAttachmentActivateTriggers(DBObject $oHostObj, DBObject $oAttachment, ormDocument $oDocument, string $sTriggerClass): void
-    {
+		$sTriggerClass = TriggerOnAttachmentDownload::class;
 		$aTriggerContextArgs = [
 			'this->object()' => $oHostObj,
 			'attachment->object()' => $oAttachment,
@@ -156,11 +75,7 @@ class EventListener implements iEventServiceSetup
 		/** @var \Trigger $oTrigger */
 		while ($oTrigger = $oTriggerSet->Fetch()) {
 			try {
-				$aContextArgs = $aTriggerContextArgs;
-				if ($oTrigger->Get('file_in_email')) {
-					$aContextArgs['attachments'] = [$oDocument];
-				}
-				$oTrigger->DoActivate($aContextArgs);
+				$oTrigger->DoActivate($aTriggerContextArgs);
 			} catch (Exception $oException) {
 				IssueLog::Error('Exception occurred during trigger activation in '.EventListener::class.'::'.__METHOD__, LogChannels::NOTIFICATIONS, [
 					'trigger_class' => get_class($oTrigger),

datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentCreate.php

@@ -1,48 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2023 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * Class TriggerOnAttachmentCreate
- *
- * @since 3.3.0
- */
-class TriggerOnAttachmentCreate extends TriggerOnObject
-{
-	/**
-	 * @inheritDoc
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category"            => "grant_by_profile,core/cmdb,application",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "description",
-            "complementary_name_attcode" => ['finalclass', 'complement'],
-			"state_attcode"       => "",
-			"reconc_keys"         => ['description'],
-			"db_table"            => "priv_trigger_onattcreate",
-			"db_key_field"        => "id",
-			"db_finalclass_field" => "",
-			"display_template"    => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeBoolean("file_in_email", array("sql"=>'file_in_email', "is_null_allowed"=>false, "default_value"=>'true', "allowed_values"=>null, "depends_on"=>array(), "always_load_in_tables"=>false)));
-
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'filter', 'action_list', 'target_class', 'file_in_email')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
-	}
-
-}

datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentDelete.php

@@ -1,47 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2023 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * Class TriggerOnAttachmentCreate
- *
- * @since 3.3.0
- */
-class TriggerOnAttachmentDelete extends TriggerOnObject
-{
-	/**
-	 * @inheritDoc
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category"            => "grant_by_profile,core/cmdb,application",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "description",
-            "complementary_name_attcode" => ['finalclass', 'complement'],
-			"state_attcode"       => "",
-			"reconc_keys"         => ['description'],
-			"db_table"            => "priv_trigger_onattdelete",
-			"db_key_field"        => "id",
-			"db_finalclass_field" => "",
-			"display_template"    => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'context', 'filter', 'action_list', 'target_class')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
-
-	}
-
-}

datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentDownload.php

@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Class TriggerOnAttachmentDownload
- *
- * @since 3.1.0
- */
-class TriggerOnAttachmentDownload extends TriggerOnAttributeBlobDownload
-{
-    /**
-     * @inheritDoc
-     * @throws \CoreException
-     * @throws \Exception
-     */
-    public static function Init()
-    {
-        $aParams = array
-        (
-            "category" => "grant_by_profile,core/cmdb,application",
-            "key_type" => "autoincrement",
-            "name_attcode" => "description",
-            "complementary_name_attcode" => ['finalclass', 'complement'],
-            "state_attcode" => "",
-            "reconc_keys" => ['description'],
-            "db_table" => "priv_trigger_onattdownload",
-            "db_key_field" => "id",
-            "db_finalclass_field" => "",
-            "display_template" => "",
-        );
-        MetaModel::Init_Params($aParams);
-        MetaModel::Init_InheritAttributes();
-    }
-}

datamodels/2.x/itop-backup/ajax.backup.php

@@ -120,7 +120,7 @@ try
 			try
 			{
 				set_time_limit(0);
-				$oBB = new BackupExec(utils::GetDataPath().'backups/manual/', 0 /*iRetentionCount*/);
+				$oBB = new BackupExec(APPROOT.'data/backups/manual/', 0 /*iRetentionCount*/);
 				$sRes = $oBB->Process(time() + 36000); // 10 hours to complete should be sufficient!
 			}
 			catch (Exception $e)
@@ -185,7 +185,7 @@ try
 				$oDBRS = new DBRestore($oItopConfig);
 				$oDBRS->SetMySQLBinDir($sMySQLBinDir);
 
-				$sBackupDir = utils::GetDataPath().'backups/';
+				$sBackupDir = APPROOT.'data/backups/';
 				$sBackupFile = $sBackupDir.$sFile;
 				$sRes = $oDBRS->RestoreFromCompressedBackup($sBackupFile, $sEnvironment);
 
@@ -210,7 +210,7 @@ try
 			}
 			$sFile = utils::ReadParam('file', '', false, 'raw_data');
 			$oBackup = new DBBackupScheduled();
-			$sBackupDir = utils::GetDataPath().'backups/';
+			$sBackupDir = APPROOT.'data/backups/';
 			$sBackupFilePath = utils::RealPath($sBackupDir.$sFile, $sBackupDir);
 			if ($sBackupFilePath === false)
 			{

datamodels/2.x/itop-backup/datamodel.itop-backup.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">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
       <rank>50</rank>

datamodels/2.x/itop-backup/dbrestore.class.inc.php

@@ -53,14 +53,7 @@ class DBRestore extends DBBackup
 		$sUser = self::EscapeShellArg($this->sDBUser);
 		$sPwd = self::EscapeShellArg($this->sDBPwd);
 		$sDBName = self::EscapeShellArg($this->sDBName);
-		if (empty($this->sMySQLBinDir))
-		{
-			$sMySQLExe = 'mysql';
-		}
-		else
-		{
-			$sMySQLExe = '"'.$this->sMySQLBinDir.'/mysql"';
-		}
+		$sMySQLExe = DBBackup::MakeSafeMySQLCommand($this->sMySQLBinDir, 'mysql');
 		if (is_null($this->iDBPort))
 		{
 			$sPortOption = '';
@@ -154,7 +147,7 @@ class DBRestore extends DBBackup
 
 				// Load the database
 				//
-				$sDataDir = utils::GetDataPath().'tmp-backup-'.rand(10000, getrandmax());
+				$sDataDir = APPROOT.'data/tmp-backup-'.rand(10000, getrandmax());
 
 				SetupUtils::builddir($sDataDir); // Here is the directory
 				$oArchive->extractTo($sDataDir);
@@ -164,7 +157,7 @@ class DBRestore extends DBBackup
 
 				// Update the code
 				//
-				$sDeltaFile = utils::GetDataPath().$sEnvironment.'.delta.xml';
+				$sDeltaFile = APPROOT.'data/'.$sEnvironment.'.delta.xml';
 
 				if (is_file($sDataDir.'/delta.xml')) {
 					// Extract and rename delta.xml => <env>.delta.xml;
@@ -172,15 +165,15 @@ class DBRestore extends DBBackup
 				} else {
 					@unlink($sDeltaFile);
 				}
-				if (is_dir(utils::GetDataPath().'production-modules/')) {
+				if (is_dir(APPROOT.'data/production-modules/')) {
 					try {
-						SetupUtils::rrmdir(utils::GetDataPath().'production-modules/');
+						SetupUtils::rrmdir(APPROOT.'data/production-modules/');
 					} catch (Exception $e) {
 						throw new BackupException("Can't remove production-modules dir", 0, $e);
 					}
 				}
 				if (is_dir($sDataDir.'/production-modules')) {
-					rename($sDataDir.'/production-modules', utils::GetDataPath().'production-modules/');
+					rename($sDataDir.'/production-modules', APPROOT.'data/production-modules/');
 				}
 
 				$sConfigFile = APPROOT.'conf/'.$sEnvironment.'/config-itop.php';

datamodels/2.x/itop-backup/main.itop-backup.php

@@ -109,7 +109,7 @@ class BackupExec extends AbstractWeeklyScheduledProcess
 	{
 		if (is_null($sBackupDir))
 		{
-			$this->sBackupDir = utils::GetDataPath().'backups/auto/';
+			$this->sBackupDir = APPROOT.'data/backups/auto/';
 		}
 		else
 		{