Merge remote-tracking branch 'origin/develop' into feature/new-dashboard-layout

# Conflicts:
#	dictionaries/en.dictionary.itop.ui.php
#	lib/symfony/cache/Adapter/ArrayAdapter.php

.doc/developers.md

@@ -1,9 +0,0 @@
-# Developers
-
-## PHP Code Styles
-We use `PHP CS Fixer` to ensure code formating consistency across PHP codebase.
-You can find the configuration and instructions to run it [here](../tests/php-code-style/README.md).
-
-## PHP Static Analysis
-We use `PHPStan` to ensure code quality and to detect potential bugs in our PHP codebase.
-You can find the configuration and instructions to run it [here](../tests/php-static-analysis/README.md).

.doc/itop-version-history.md

@@ -7,8 +7,7 @@
               'git4': 'grey',
               'git5': 'grey',
               'git6': 'grey',
-              'git7': 'grey',
-              'git8': 'grey'
+              'git7': 'grey'
        }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
 gitGraph
     commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
@@ -87,25 +86,24 @@ gitGraph
     commit id: "2024-01-17a" tag: "2.7.10"
     checkout support/3.0
     commit id: "2024-01-17b" tag: "3.0.4"
-    checkout support/2.7
-    commit id: "2024-09-28" tag: "2.7.11"
-    checkout support/3.1
-    commit id: "2024-09-27" tag: "3.1.2"
     checkout support/3.2
     commit id: "2024-06-25" tag: "3.2.0-beta1" type: REVERSE
     commit id: "2024-08-07" tag: "3.2.0"
-    checkout support/2.7
-    commit id: "2025-02-07a" tag: "2.7.12"
+    commit id: "2024-09-13" tag: "3.2.0-2"
     checkout support/3.1
-    commit id: "2025-02-07b" tag: "3.1.3"
-    checkout support/3.2
-    commit id: "2025-02-07c " tag: "3.2.1"
-    commit id: "2025-03-31 " tag: "3.2.1-1"
-    commit id: "2025-07-28 " tag: "3.2.2"
+    commit id: "2024-09-27" tag: "3.1.2"
     checkout support/2.7
-    commit id: "2025-09-25" tag: "2.7.13"
+    commit id: "2024-09-28" tag: "2.7.11"
+    checkout support/2.7
+    commit id: "2025-02-25" tag: "2.7.12"
+    checkout support/3.1
+    commit id: "2025-02-25 " tag: "3.1.3"
     checkout support/3.2
-    commit id: "2026-04-27 " tag: "3.2.3"
+    commit id: "2025-02-25  " tag: "3.2.1"
+    commit id: "2025-04-08" tag: "3.2.1-1"
+    commit id: "2025-08-19" tag: "3.2.2-1"
+    checkout support/2.7
+    commit id: "2025-10-07" tag: "2.7.13"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,60 +0,0 @@
-name: "Bug report"
-description: "Report a bug that you identified in iTop"
-type: bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please explain why you're creating this issue :
-        - Are you willing to create a PR for the bug fix ? If so, we'll indicate in the issue if we're interested in it.
-        - Then, please describe how to reproduce the issue.
-
-  - type: dropdown
-    id: willing_to_pr
-    attributes:
-      label: Are you willing to create (at a later stage) a PR for that?
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true
-
-  - type: input
-    id: itop_version
-    attributes:
-      label: iTop version
-      description: "Complete iTop version (e.g., 3.2.3)"
-    validations:
-      required: false
-
-  - type: input
-    id: php_version
-    attributes:
-      label: PHP version
-      description: "Complete PHP version (e.g., 8.4.20)"
-    validations:
-      required: false
-
-  - type: textarea
-    id: reproduction_steps
-    attributes:
-      label: Reproduction procedure
-      description: |
-        Please explain step by step how to reproduce the issue on a standard iTop Community.
-        If it requires a custom datamodel, provide the minimal XML delta to reproduce it.
-      placeholder: |
-        1. First go there
-        2. Then do that
-        3. ...
-        4. Finally, see that... (what is expected and what is actually happening)
-    validations:
-      required: false
-
-  - type: upload
-    id: additional_info
-    attributes:
-      label: Additional information (if needed)
-      description: "Add/drag and drop screenshots, logs or any files that can be relevant for your issue."
-    validations:
-      required: false
-      accept: ".png, .jpg, .jpeg, .gif, .webp, .log, .txt, .json, .csv, .xml, .zip"

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,47 +0,0 @@
-name: "Enhancement suggestion"
-description: "Suggest an improvement to iTop"
-type: feature
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please explain why you're creating this issue :
-        - Please describe what's your improvement proposition.
-        - Then tell us if you're willing to create a PR for this enhancement ? If so, we'll indicate in the issue if we're interested in it.
-
-  - type: textarea
-    id: enhancement_details
-    attributes:
-      label: Enhancement details
-      description: |
-        Please explain what you want to improve, and your proposition to make it better.
-        If it requires a custom datamodel, provide the minimal XML delta to reproduce it.
-    validations:
-      required: false
-
-  - type: input
-    id: itop_version
-    attributes:
-      label: iTop version (if appropriate)
-      description: "Complete iTop version (e.g., 3.2.3)"
-    validations:
-      required: false
-
-  - type: dropdown
-    id: willing_to_pr
-    attributes:
-      label: Are you willing to create (at a later stage) a PR for that?
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true
-
-  - type: upload
-    id: additional_info
-    attributes:
-      label: Additional information (if needed)
-      description: "Add/drag and drop screenshots, logs or any files that can be relevant for your issue."
-    validations:
-      required: false
-      accept: ".png, .jpg, .jpeg, .gif, .webp, .log, .txt, .json, .csv, .xml, .zip"

.github/pull_request_template.md

@@ -1,81 +1,83 @@
 <!--
-IMPORTANT: Before creating your PR, please create an issue first to know if Combodo is interested in your contribution (not needed for translations PR).
-Since we may refuse a PR, it's preferable to create an issue first, to avoid spending time coding something that won't be accepted.
 
-Once you've done it, and we confirmed we're interested in it, please follow the guidelines within this PR template before submitting it, it will greatly help us process your PR. 🙏
+IMPORTANT: Please follow the guidelines within this PR template before submitting it, it will greatly help us process your PR. 🙏
 
 Any PRs not following the guidelines or with missing information will not be considered.
+
 -->
 
 ## Base information
+| Question                                                      | Answer 
+|---------------------------------------------------------------|--------
+| Related to a SourceForge thread / Another PR / Combodo ticket? | <!-- Put the URL -->
+| Type of change?                                               | Bug fix / Enhancement / Translations
 
-| Question                                                       | Answer 
-|----------------------------------------------------------------|--------
-| Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL -->                 |
-| Type of change?                                                | Bug fix / Enhancement / Translations
-
-| Question                                                                        | Answer                               |
-|---------------------------------------------------------------------------------|--------------------------------------|
-| Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL -->                 |
-| Type of change?                                                                 | Bug fix / Enhancement / Translations |
 
 ## Symptom (bug) / Objective (enhancement)
-
 <!--
 If it's a bug
   - Explain the symptom in details
   - If possible put error messages, logs or screenshots (you can paste image directly in this editor).
 
 If it's an enhancement
-  - Describe what is blocking you, what is the objective with as many details as possible.
+  - Describe what is blocking you, what is the objective with as much details as possible.
   - Add screenshots if it's related to UI.
 -->
 
-## Reproduction procedure (bug)
 
+## Reproduction procedure (bug)
 <!--
-Please explain step by step how to reproduce the issue on a standard iTop Community.
+Remove this section only if it's NOT a bug.
+
+Otherwise, explain step by step how to reproduce the issue on a standard iTop Community.
+
 If it requires a custom datamodel, provide the minimal XML delta to reproduce it on a standard iTop Community.
 -->
 
 1. On iTop x.y.z <!-- Put complete iTop version (eg. 3.1.0-2) -->
 2. With PHP x.y.z <!-- Put complete PHP version (eg. 8.1.24) -->
-3. First go there
-4. Then do that
-5. ...
-6. Finally, see that... (what is expected and what is actually happening)
+2. First go there
+2. Then do that
+3. ...
+4. Finally, see that...
 
-## Reproduction procedure (enhancement - if needed)
-
-<!--
-Please explain how we can reproduce the feature/behavior you want to improve, and what's your proposition to make it better.
-Add screenshots if it's related to UI.
-If it requires a custom datamodel, provide the minimal XML delta to reproduce it on a standard iTop Community.
--->
 
 ## Cause (bug)
-
 <!--
 Remove this section only if it's NOT a bug.
 
 Otherwise, explain what is the cause of the issue (where in the code and why)
 -->
 
-## Proposed solution (bug and enhancement)
 
+## Proposed solution (bug and enhancement)
 <!--
 Explain in details how you are proposing to solve this:
   - What did you do in the code and why
   - If you changed something in the UI, put before / after screenshots (you can paste image directly in this editor)
 -->
 
-## Checklist before requesting a review
 
+## Checklist before requesting a review
 <!--
 Don't remove these lines, check them once done.
 -->
-
 - [ ] I have performed a self-review of my code
 - [ ] I have tested all changes I made on an iTop instance
 - [ ] I have added a unit test, otherwise I have explained why I couldn't
-- [ ] Is the PR clear and detailed enough so anyone can understand without digging in the code?
+- [ ] Is the PR clear and detailed enough so anyone can understand digging in the code?
+
+## Checklist of things to do before PR is ready to merge
+<!--
+Things that needs to be done in the PR before it can be considered as ready to be merged
+
+Examples:
+- Changes requested in the review
+- Unit test to add
+- Dictionary entries to translate
+- ...
+-->
+
+- [ ] ...
+- [ ] ...
+- [ ] ...

.gitignore

@@ -58,9 +58,6 @@ tests/*/vendor/*
 /tests/php-unit-tests/phpunit.xml
 /tests/php-unit-tests/postbuild_integration.xml
 
-# PHP CS Fixer: Cache file
-/.php-cs-fixer.cache
-
 
 # Jetbrains
 /.idea/**

CONTRIBUTING.md

@@ -4,33 +4,30 @@ You want to contribute to iTop? Many thanks to you! 🎉 👍
 
 Here are some guidelines that will help us integrate your work!
 
-## Contributions
+
+
 
 ### Subjects
-
 You are welcome to create pull requests on any of those subjects:
 
 * 🐛 bug fix
 * 🌐 translation / i18n / l10n
-* 🚸 enhancement
 
-But before creating a PR, please [create a corresponding issue][itop-issues] for review.
-We should review within two weeks, and get back to you to indicate if we're interested in your proposal or not.
-If you don't create an issue, you won't know if we're interested in your contribution, and you may spend time coding something that won't be accepted.
-If you ever want to begin implementation, do so in a fork, and add a link to the corresponding commits in the issue.
+If you want to implement a **new feature**, please [create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) for review.   
+If you ever want to begin implementation, do so in a fork, and add a link to the corresponding commits in the ticket.
 
 For all **security related subjects**, please see our [security policy](SECURITY.md).
 
-All **datamodel modification** should be done in an extension. Beware that such change would
-impact all existing customers, and could prevent them from upgrading!
-Combodo has a long experience of datamodel changes: they are very disruptive!
+All **datamodel modification** should be done in an extension. Beware that such change would 
+impact all existing customers, and could prevent them from 
+upgrading!
+Combodo has a long experience of datamodel changes: they are very disruptive! 
 This is why we avoid them in iTop core, especially the changes on existing objects/fields.   
-If you have an idea you're sure would benefit to all of iTop users, you may
-[create a corresponding issue][itop-issues] to submit it, but be warned that there are lots of good
+If you have an idea you're sure would benefit to all of iTop users, you may 
+[create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) to submit it, but be warned that there are lots of good 
 reasons to refuse such changes.
 
 ### 📄 License and copyright
-
 iTop is distributed under the AGPL-3.0 license (see the [license.txt] file).
 
 The iTop repository is divided in three parts: iTop (mainly PHP/JS/XML sources and dictionaries), images, and third-party libraries.
@@ -40,33 +37,48 @@ Anyhow, you are encouraged to signal your contribution by the mean of `@author`
 If you want to use another license or keep the code ownership (copyright), you may [create an extension][wiki new ext].
 
 [license.txt]: https://github.com/Combodo/iTop/blob/develop/license.txt
-
-[itop-issues]: https://github.com/Combodo/iTop/issues
-
 [wiki new ext]: https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Astart#by_writing_your_own_extension
 
+
 ## 🔀 iTop branch model
 
 When we first start with Git, we were using the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model. As
-there was some confusions about branches to use for current developed release and previous maintained release, and also because we were
-using just a very few of the GitFlow commands, we decided to add just a little modification to this branch model : since April 2020
-we don't have a `master` branch anymore.
+ there was some confusions about branches to use for current developed release and previous maintained release, and also because we were
+ using just a very few of the GitFlow commands, we decided to add just a little modification to this branch model : since april 2020
+  we don't have a `master` branch anymore.
 
-Here are the branches we use and their meaning :
+Here are the branches we use and their meaning : 
 
 - `develop`: ongoing development version
+- `release/*`: if present, that means we are working on a alpha/beta/rc version for shipping
 - `support/*`: maintenance branches for older versions
 
 For example, if no version is currently prepared for shipping we could have:
 
-- `develop` containing future 3.3.0 version
-- `support/3.2`: 3.2.x maintenance version
+- `develop` containing future 3.1.0 version
+- `support/3.0`: 3.0.x maintenance version
+- `support/2.7`: 2.7.x maintenance version
+- `support/2.6`: 2.6.x maintenance version
 
-And when 3.3.0 will be out:
+In this example, when 3.1.0-beta is shipped that will become:
+
+- `develop`: future 3.2.0 version
+- `release/3.1.0`: 3.1.0-beta
+- `support/3.0`: 3.0.x maintenance version
+- `support/2.7`: 2.7.x maintenance version
+- `support/2.6`: 2.6.x maintenance version
+
+And when 3.1.0 final will be out:
+
+- `develop`: future 3.2.0 version
+- `support/3.1`: 3.1.x maintenance version (will host developments for 3.1.1)
+- `support/3.0`: 3.0.x maintenance version
+- `support/2.7`: 2.7.x maintenance version
+- `support/2.6`: 2.6.x maintenance version
+
+Also note that we have a "micro-version" concept : each of those versions have a very small amount of modifications. They are made from
+ `support/*` branches as well. For example 2.6.2-1 and 2.6.2-2 were made from the `support/2.6.2` branch. 
 
-- `develop`: future 3.4.0 version
-- `support/3.3`: 3.3.x maintenance version (will host developments for 3.3.1)
-- `support/3.2`: 3.2.x maintenance version
 
 ## Coding
 
@@ -80,11 +92,12 @@ A [dedicated page](https://www.itophub.io/wiki/page?id=latest%3Acustomization%3A
 2. Create a branch in this fork, based on the develop branch
 3. Code !
 
-Do create a dedicated branch for each modification you want to propose : if you don't, it will be very hard to merge back your work !
+Do create a dedicated branch for each modification you want to propose : if you don't it will be very hard to merge back your work !
 
-Most of the time you should base your developments on the develop branch.    
+Most of the time you should based your developments on the develop branch.    
 That may be different if you want to fix a bug, please use develop anyway and ask in your PR if rebase is possible.
 
+
 ### 🎨 PHP styleguide
 
 Please follow [our guidelines](https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Acoding_standards).
@@ -93,7 +106,7 @@ Please follow [our guidelines](https://www.itophub.io/wiki/page?id=latest%3Acust
 
 Please create tests that covers as much as possible the code you're submitting.
 
-Our tests are located in the `tests/` directory, containing a PHPUnit config file : `phpunit.xml.dist`.
+Our tests are located in the `test/` directory, containing a PHPUnit config file : `phpunit.xml.dist`.
 
 ### Git Commit Messages
 
@@ -125,14 +138,14 @@ When your code is working, please:
 * Rebase your branch on our repo last commit,
 * Create a pull request. _Detailed procedure to work on fork and create PR is available [in GitHub help pages](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)_.
 * Pull request description: mind to add all the information useful to understand why you're suggesting this modification and anything necessary to dive into your work. Especially:
-    - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented
-    - Enhancements: use cases, implementation details if needed
-* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this
-  option [won't be available](https://github.com/orgs/community/discussions/5634))
+  - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented 
+  - Enhancements: use cases, implementation details if needed
+* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this option [won't be available](https://github.com/orgs/community/discussions/5634))
+
 
 ## 🙏 We are thankful
 
-We are thankful for all your contributions to the iTop universe! As a thank-you gift, we will send stickers to every iTop (& extensions) contributors!
+We are thankful for all your contributions to the iTop universe! As a thank you gift, we will send stickers to every iTop (& extensions) contributors!
 
 We have one sticker per contribution type. You might get multiple stickers with one contribution though :)
 
@@ -146,6 +159,6 @@ We have one sticker per contribution type. You might get multiple stickers with
 * Beta tester: Test and give feedback on beta releases
 * Extension developer: Develop and publish an extension
 
-Here is the design of each sticker:
+Here is the design of each stickers for year 2024:
 
-![iTop stickers](.doc/contributing-guide/contributing-stickers-side-by-side.png)
+![iTop stickers 2025](.doc/contributing-guide/2025.contributing-stickers-side-by-side.png)

README.md

@@ -53,7 +53,7 @@ iTop also offers mass import tools to help you become even more efficient.
 [4]: https://www.itophub.io/wiki/page?id=latest:install:requirements
 [5]: https://www.itophub.io/wiki
 [6]: https://store.itophub.io/en_US/
-[7]: .doc/itop-version-history.md
+[7]: itop-version-history.md
 
 [10]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#configuration_management_cmdb
 [11]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#ticketing
@@ -73,9 +73,6 @@ iTop development is sponsored, led, and supported by [Combodo][0].
 
 [0]: https://www.combodo.com
 
-## Developers
-
-You can find information and instructions about our quality tools and how to run them [here](.doc/developers.md).
 
 ## Contributors
 

application/cmdbabstract.class.inc.php

@@ -819,7 +819,6 @@ HTML
 				foreach ($aNotificationClasses as $sNotifClass) {
 					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev WHERE Ev.object_id = :id AND Ev.object_class = :class");
 					$aNotifSearches[$sNotifClass]->SetInternalParams($aParams);
-					$aNotifSearches[$sNotifClass]->AllowAllData();
 					$oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], []);
 					$iNotifsCount += $oNotifSet->Count();
 				}
@@ -833,7 +832,6 @@ HTML
 						'menu' => false,
 						'panel_title' => MetaModel::GetName($sNotifClass),
 						'panel_icon' => MetaModel::GetClassIcon($sNotifClass, false),
-						'display_unauthorized_objects' => true,
 					]);
 				}
 			}
@@ -1035,7 +1033,7 @@ HTML
 							// Add extra data for markup generation
 							// - Attribute code and AttributeDef. class
 							$val['attcode'] = $sAttCode;
-							$val['atttype'] = $oAttDef->GetType();
+							$val['atttype'] = $sAttDefClass;
 							$val['attlabel'] = $sAttLabel;
 							$val['attflags'] = ($bEditMode) ? $this->GetFormAttributeFlags($sAttCode) : OPT_ATT_READONLY;
 
@@ -4495,7 +4493,7 @@ HTML;
 
 			$oDivField = FieldUIBlockFactory::MakeLarge("");
 			//	UIContentBlockUIBlockFactory::MakeStandard(null,["field_container field_large"]);
-			$oDivField->AddDataAttribute("attribute-type", $oAttDef->GetType());
+			$oDivField->AddDataAttribute("attribute-type", $sAttDefClass);
 			$oDivField->AddDataAttribute("attribute-label", $sAttMetaDataLabel);
 			$oDivField->AddDataAttribute("attribute-flag-hidden", false);
 			$oDivField->AddDataAttribute("attribute-flag-read-only", false);
@@ -5064,10 +5062,10 @@ EOF
 			} else {
 				if (count($aObjects) == 1) {
 					$oObj = $aObjects[0];
-					$sSubtitle = Dict::Format('UI:Delete:Confirm_Object', $oObj->GetHyperLink());
+					$sSubtitle = Dict::Format('UI:Delect:Confirm_Object', $oObj->GetHyperLink());
 				} else {
 					$sSubtitle = Dict::Format(
-						'UI:Delete:Confirm_Count_ObjectsOf_Class',
+						'UI:Delect:Confirm_Count_ObjectsOf_Class',
 						count($aObjects),
 						MetaModel::GetName($sClass)
 					);
@@ -5634,7 +5632,7 @@ JS
 	 * @return void
 	 * @since 3.1.0
 	 */
-	final public function AddAttributeFlags(string $sAttCode, int $iFlags, string $sTargetState = '', ?string $sReason = null): void
+	final public function AddAttributeFlags(string $sAttCode, int $iFlags, string $sTargetState = '', string $sReason = null): void
 	{
 		if (!isset($this->aAttributesFlags[$sTargetState])) {
 			$this->aAttributesFlags[$sTargetState] = [];
@@ -5657,7 +5655,7 @@ JS
 	 * @return void
 	 * @since 3.1.0
 	 */
-	final public function ForceAttributeFlags(string $sAttCode, int $iFlags, string $sTargetState = '', ?string $sReason = null): void
+	final public function ForceAttributeFlags(string $sAttCode, int $iFlags, string $sTargetState = '', string $sReason = null): void
 	{
 		if (!isset($this->aAttributesFlags[$sTargetState])) {
 			$this->aAttributesFlags[$sTargetState] = [];
@@ -5698,7 +5696,7 @@ JS
 	 * @return void
 	 * @since 3.1.0
 	 */
-	final public function AddInitialAttributeFlags(string $sAttCode, int $iFlags, ?string $sReason = null)
+	final public function AddInitialAttributeFlags(string $sAttCode, int $iFlags, string $sReason = null)
 	{
 		if (!isset($this->aInitialAttributesFlags)) {
 			$this->aInitialAttributesFlags = [];
@@ -5720,7 +5718,7 @@ JS
 	 * @return void
 	 * @since 3.1.0
 	 */
-	final public function ForceInitialAttributeFlags(string $sAttCode, int $iFlags, ?string $sReason = null)
+	final public function ForceInitialAttributeFlags(string $sAttCode, int $iFlags, string $sReason = null)
 	{
 		if (!isset($this->aInitialAttributesFlags)) {
 			$this->aInitialAttributesFlags = [];

application/dashboardlayout.class.inc.php

@@ -16,6 +16,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\Dashlet\Service\DashletService;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
@@ -30,7 +31,7 @@ use Combodo\iTop\Application\WebPage\WebPage;
  */
 abstract class DashboardLayout
 {
-	abstract public function Render($oPage, $aDashlets, $bEditMode = false);
+	abstract public function Render($oPage, $aDashlets, $bEditMode = false, array $aExtraParams = []);
 
 	/**
 	 * @param int $iCellIdx
@@ -43,8 +44,8 @@ abstract class DashboardLayout
 	public static function GetInfo()
 	{
 		return [
-			'label' => '',
-			'icon' => '',
+			'label'       => '',
+			'icon'        => '',
 			'description' => '',
 		];
 	}
@@ -74,6 +75,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 			}
 			$idx++;
 		}
+
 		return $aDashlets;
 	}
 
@@ -94,6 +96,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 			}
 			$idx++;
 		}
+
 		return $aCells;
 
 	}
@@ -106,26 +109,39 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	 */
 	public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = [])
 	{
+		/** @var DashletService $oDashletService */
+		$oDashletService = MetaModel::GetService('DashletService');
 		// Trim the list of cells to remove the invisible/empty ones at the end of the array
 		$aCells = $this->TrimCellsArray($aCells);
 
-		$oDashboardLayout = new DashboardLayoutUIBlock();
-		//$oPage->AddUiBlock($oDashboardLayout);
+		$oDashboardLayout = new DashboardLayoutUIBlock($aExtraParams['dashboard_div_id']);
 
 		$iCellIdx = 0;
 		$iNbRows = ceil(count($aCells) / $this->iNbCols);
 
+		// GRID LAYOUT: Global positioning
+		$iGridCurrentX = 0;
+		$iGridCurrentY = 0;
+		$iGridColWidth = (int)(12 / $this->iNbCols);
+
 		//Js given by each dashlet to reload
 		$sJSReload = "";
-
+		$oDashboardGrid = new \Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardGrid();
+		$oDashboardLayout->SetGrid($oDashboardGrid);
 		for ($iRows = 0; $iRows < $iNbRows; $iRows++) {
 			$oDashboardRow = new DashboardRow();
-			$oDashboardLayout->AddDashboardRow($oDashboardRow);
+
+			// GRID LAYOUT: Store the maximum column Y in this row
+			$iGridMaxColY = -1;
 
 			for ($iCols = 0; $iCols < $this->iNbCols; $iCols++) {
 				$oDashboardColumn = new DashboardColumn($bEditMode);
 				$oDashboardColumn->SetCellIndex($iCellIdx);
-				$oDashboardRow->AddDashboardColumn($oDashboardColumn);
+
+				// GRID LAYOUT: Column positioning
+				$iGridCurrentColX = 0;
+				$iGridCurrentColY = 0;
+				$iGridMaxHeightDashlet = -1;
 
 				if (array_key_exists($iCellIdx, $aCells)) {
 					$aDashlets = $aCells[$iCellIdx];
@@ -133,7 +149,41 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 						/** @var \Dashlet $oDashlet */
 						foreach ($aDashlets as $oDashlet) {
 							if ($oDashlet::IsVisible()) {
-								$oDashboardColumn->AddUIBlock($oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams));
+								$sDashletId = $oDashlet->GetID();
+								$sDashletClass = $oDashlet->GetDashletType();
+								$aDashletDenormalizedProperties = $oDashlet->GetModelData();
+								$aDashletsInfo = $oDashletService->GetDashletDefinition($sDashletClass);
+
+								// GRID LAYOUT: Set position relative to grid
+								$iPositionX = $iGridCurrentX + $iGridCurrentColX;
+								$iPositionY = $iGridCurrentY + $iGridCurrentColY;
+								$iWidth = array_key_exists('preferred_width', $aDashletsInfo) ? $aDashletsInfo['preferred_width'] : 1;
+								// GRID LAYOUT: Limit dashlet width to fit column width
+								if ($iWidth > $iGridColWidth) {
+									$iWidth = $iGridColWidth;
+								}
+								$iHeight = array_key_exists('preferred_height', $aDashletsInfo) ? $aDashletsInfo['preferred_height'] : 1;
+								// GRID LAYOUT: Store max height of dashlets in this current column
+								if ($iHeight > $iGridMaxHeightDashlet) {
+									$iGridMaxHeightDashlet = $iHeight;
+								}
+								// GRID LAYOUT: Ensure that dashlet fits in the current row of the column
+								if ($iGridCurrentColX + $iWidth > $iGridColWidth) {
+									$iPositionX = $iGridCurrentX;
+									$iPositionY++;
+								}
+
+								$oDashboardGrid->AddDashlet($oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams), $sDashletId, $sDashletClass, $aDashletDenormalizedProperties, $iPositionX, $iPositionY, $iWidth, $iHeight);
+
+								// GRID LAYOUT: Update column cursor
+								$iGridCurrentColX += $iWidth;
+								if ($iGridCurrentColX >= $iGridColWidth) {
+									$iGridCurrentColX = 0;
+									$iGridCurrentColY += $iGridMaxHeightDashlet;
+									$iGridMaxHeightDashlet = -1;
+								}
+
+								//$oDashboardColumn->AddUIBlock($oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams));
 							}
 						}
 					} else {
@@ -143,10 +193,25 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 					$oDashboardColumn->AddUIBlock(new Html('&nbsp;'));
 				}
 				$iCellIdx++;
+
+				// GRID LAYOUT: Store max y in this current row
+				if ($iGridCurrentColY > $iGridMaxColY) {
+					$iGridMaxColY = $iGridCurrentColY;
+				}
+
+				// GRID LAYOUT: Next column
+				$iGridCurrentX += $iGridColWidth;
+
 			}
+
+			// GRID LAYOUT: Next Row
+			$iGridCurrentY += ($iGridMaxColY + 1);
+			$iGridCurrentX = 0;
+
 			$sJSReload .= $oDashboardRow->GetJSRefreshCallback()." ";
 		}
 
+		// TODO 3.3 We can probably do better with the new dashboard
 		$oPage->add_script("function updateDashboard".$aExtraParams['dashboard_div_id']."(){".$sJSReload."}");
 
 		if ($bEditMode) { // Add one row for extensibility
@@ -168,8 +233,8 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	 */
 	public function GetDashletCoordinates($iCellIdx)
 	{
-		$iColNumber = (int) $iCellIdx % $this->iNbCols;
-		$iRowNumber = (int) floor($iCellIdx / $this->iNbCols);
+		$iColNumber = (int)$iCellIdx % $this->iNbCols;
+		$iRowNumber = (int)floor($iCellIdx / $this->iNbCols);
 
 		return [$iColNumber, $iRowNumber];
 	}
@@ -182,11 +247,12 @@ class DashboardLayoutOneCol extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 1;
 	}
+
 	public static function GetInfo()
 	{
 		return [
-			'label' => 'One Column',
-			'icon' => 'images/layout_1col.png',
+			'label'       => 'One Column',
+			'icon'        => 'images/layout_1col.png',
 			'description' => '',
 		];
 	}
@@ -199,11 +265,12 @@ class DashboardLayoutTwoCols extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 2;
 	}
+
 	public static function GetInfo()
 	{
 		return [
-			'label' => 'Two Columns',
-			'icon' =>  'images/layout_2col.png',
+			'label'       => 'Two Columns',
+			'icon'        => 'images/layout_2col.png',
 			'description' => '',
 		];
 	}
@@ -216,11 +283,12 @@ class DashboardLayoutThreeCols extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 3;
 	}
+
 	public static function GetInfo()
 	{
 		return [
-			'label' => 'Two Columns',
-			'icon' =>  'images/layout_3col.png',
+			'label'       => 'Two Columns',
+			'icon'        => 'images/layout_3col.png',
 			'description' => '',
 		];
 	}

application/datamodel.application.xml

@@ -6,7 +6,7 @@
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
-        <comment>/* Resource access control abstraction. Can be herited by abstract resource access control classes. Generally controlled using UR_ACTION_MODIFY access right. */</comment>
+        <comment>/* Resource access control abstraction. Can be inherited by abstract resource access control classes. Generally controlled using UR_ACTION_MODIFY access right. */</comment>
         <abstract>true</abstract>
       </properties>
       <presentation/>
@@ -851,9 +851,302 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
         </methods>
       </class>
     </classes>
+    <dashlets>
+      <dashlet id="DashletGroupByTable" _delta="define">
+        <label>UI:DashletGroupByTable:Label</label>
+        <icon>images/dashlets/icons8-transaction-list-48.png</icon>
+        <description>UI:DashletGroupByTable:Description</description>
+        <min_width>3</min_width>
+        <min_height>2</min_height>
+        <preferred_width>6</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletGroupByBars" _delta="define">
+        <label>UI:DashletGroupByBars:Label</label>
+        <icon>images/dashlets/icons8-bar-chart-48.png</icon>
+        <description>UI:DashletGroupByBars:Description</description>
+        <min_width>2</min_width>
+        <min_height>2</min_height>
+        <preferred_width>6</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletGroupByPie" _delta="define">
+        <label>UI:DashletGroupByPie:Label</label>
+        <icon>images/dashlets/icons8-pie-chart-48.png</icon>
+        <description>UI:DashletGroupByPie:Description</description>
+        <min_width>2</min_width>
+        <min_height>2</min_height>
+        <preferred_width>6</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletBadge" _delta="define">
+        <label>UI:DashletBadge:Label</label>
+        <icon>images/dashlets/icons8-badge-48.png</icon>
+        <description>UI:DashletBadge:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>3</preferred_width>
+        <preferred_height>1</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletHeaderDynamic" _delta="define">
+        <label>UI:DashletHeaderDynamic:Label</label>
+        <icon>images/dashlets/icons8-header-altered-48.png</icon>
+        <description>UI:DashletHeaderDynamic:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>12</preferred_width>
+        <preferred_height>2</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletHeaderStatic" _delta="define">
+        <label>UI:DashletHeaderStatic:Label</label>
+        <icon>images/dashlets/icons8-header-48.png</icon>
+        <description>UI:DashletHeaderStatic:Description</description>
+        <min_width>4</min_width>
+        <min_height>1</min_height>
+        <preferred_width>12</preferred_width>
+        <preferred_height>1</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletObjectList" _delta="define">
+        <label>UI:DashletObjectList:Label</label>
+        <icon>images/dashlets/icons8-list-48.png</icon>
+        <description>UI:DashletObjectList:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>12</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletPlainText" _delta="define">
+        <label>UI:DashletPlainText:Label</label>
+        <icon>images/dashlets/icons8-text-box-48.png</icon>
+        <description>UI:DashletPlainText:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>2</preferred_width>
+        <preferred_height>1</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletUnknown" _delta="define">
+        <label>UI:DashletUnknown:Label</label>
+        <icon>images/dashlet-unknown.png</icon>
+        <description>UI:DashletUnknown:Description</description>
+        <can_be_created>false</can_be_created>
+        <configuration/>
+      </dashlet>
+    </dashlets>
     <property_types _delta="define">
+      <property_type id="Dashboard" xsi:type="Combodo-AbstractPropertyType"/>
+      <property_type id="DashboardGrid" xsi:type="Combodo-PropertyType">
+        <extends>Dashboard</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>Dashboard</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-String">
+              <label>UI:DashboardEdit:DashboardTitle</label>
+            </node>
+            <node id="refresh" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashboardEdit:AutoReload</label>
+              <values>
+                <value id="0">
+                  <label>No auto-refresh</label>
+                </value>
+                <value id="30">
+                  <label>Every 30 seconds</label>
+                </value>
+                <value id="60">
+                  <label>Every 1 minute</label>
+                </value>
+                <value id="300">
+                  <label>Every 5 minutes</label>
+                </value>
+                <value id="600">
+                  <label>Every 10 minutes</label>
+                </value>
+                <value id="1800">
+                  <label>Every 30 minutes</label>
+                </value>
+                <value id="3600">
+                  <label>Every 1 hour</label>
+                </value>
+              </values>
+            </node>
+            <node id="pos_dashlets" xsi:type="Combodo-ValueType-Collection">
+              <label>Dashlet List</label>
+              <xml-format xsi:type="Combodo-XMLFormat-CollectionWithId">
+                <tag-name>pos_dashlet</tag-name>
+              </xml-format>
+              <prototype>
+                <node id="position_x" xsi:type="Combodo-ValueType-Integer">
+                  <label>X</label>
+                </node>
+                <node id="position_y" xsi:type="Combodo-ValueType-Integer">
+                  <label>Y</label>
+                </node>
+                <node id="width" xsi:type="Combodo-ValueType-Integer">
+                  <label>W</label>
+                </node>
+                <node id="height" xsi:type="Combodo-ValueType-Integer">
+                  <label>H</label>
+                </node>
+                <node id="dashlet" xsi:type="Combodo-ValueType-Polymorphic">
+                  <label>Dashlet</label>
+                  <allowed-types>
+                    <allowed-type>Dashlet</allowed-type>
+                  </allowed-types>
+                </node>
+              </prototype>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
       <property_type id="Dashlet" xsi:type="Combodo-AbstractPropertyType"/>
-      <property_type id="DashletGroupBy" xsi:type="Combodo-PropertyType">
+      <property_type id="DashletGroupByTable" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletGroupBy:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletGroupBy:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletGroupBy:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttributeGroupBy">
+              <label>UI:DashletGroupBy:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+            </node>
+            <node id="style" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashletGroupBy:Prop-Style</label>
+              <values>
+                <value id="bars">
+                  <label>UI:DashletGroupByBars:Label</label>
+                </value>
+                <value id="pie">
+                  <label>UI:DashletGroupByPie:Label</label>
+                </value>
+                <value id="table">
+                  <label>UI:DashletGroupByTable:Label</label>
+                </value>
+              </values>
+            </node>
+            <node id="aggregation_function" xsi:type="Combodo-ValueType-AggregateFunction">
+              <label>UI:DashletGroupBy:Prop-Function</label>
+              <class>{{query.selected_class}}</class> <!-- pour savoir si il y a des attributs additionnables -->
+            </node>
+            <node id="aggregation_attribute" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletGroupBy:Prop-FunctionAttribute</label>
+              <relevance-condition>{{aggregation_function.value != 'count'}}</relevance-condition>
+              <class>{{query.selected_class}}</class>
+              <category>numeric</category>
+            </node>
+            <node id="order_by" xsi:type="Combodo-ValueType-ChoiceFromInput">
+              <label>UI:DashletGroupBy:Prop-OrderField</label>
+              <values>
+                <value id="attribute">
+                  <label>{{aggregation_attribute.label}}</label>
+                </value>
+                <value id="function">
+                  <label>{{aggregation_function.label}}</label>
+                </value>
+              </values>
+            </node>
+            <node id="limit" xsi:type="Combodo-ValueType-Integer">
+              <label>UI:DashletGroupBy:Prop-Limit</label>
+              <relevance-condition>{{order_by.value = 'function'}}</relevance-condition>
+            </node>
+            <node id="order_direction" xsi:type="Combodo-ValueType-Choice">
+              <label>UI:DashletGroupBy:Prop-OrderDirection</label>
+              <values>
+                <value id="asc">
+                  <label>UI:DashletGroupBy:Order:asc</label>
+                </value>
+                <value id="desc">
+                  <label>UI:DashletGroupBy:Order:desc</label>
+                </value>
+              </values>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletGroupByBars" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletGroupBy:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletGroupBy:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletGroupBy:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttributeGroupBy">
+              <label>UI:DashletGroupBy:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+            </node>
+            <node id="style" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashletGroupBy:Prop-Style</label>
+              <values>
+                <value id="bars">
+                  <label>UI:DashletGroupByBars:Label</label>
+                </value>
+                <value id="pie">
+                  <label>UI:DashletGroupByPie:Label</label>
+                </value>
+                <value id="table">
+                  <label>UI:DashletGroupByTable:Label</label>
+                </value>
+              </values>
+            </node>
+            <node id="aggregation_function" xsi:type="Combodo-ValueType-AggregateFunction">
+              <label>UI:DashletGroupBy:Prop-Function</label>
+              <class>{{query.selected_class}}</class> <!-- pour savoir si il y a des attributs additionnables -->
+            </node>
+            <node id="aggregation_attribute" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletGroupBy:Prop-FunctionAttribute</label>
+              <relevance-condition>{{aggregation_function.value != 'count'}}</relevance-condition>
+              <class>{{query.selected_class}}</class>
+              <category>numeric</category>
+            </node>
+            <node id="order_by" xsi:type="Combodo-ValueType-ChoiceFromInput">
+              <label>UI:DashletGroupBy:Prop-OrderField</label>
+              <values>
+                <value id="attribute">
+                  <label>{{aggregation_attribute.label}}</label>
+                </value>
+                <value id="function">
+                  <label>{{aggregation_function.label}}</label>
+                </value>
+              </values>
+            </node>
+            <node id="limit" xsi:type="Combodo-ValueType-Integer">
+              <label>UI:DashletGroupBy:Prop-Limit</label>
+              <relevance-condition>{{order_by.value = 'function'}}</relevance-condition>
+            </node>
+            <node id="order_direction" xsi:type="Combodo-ValueType-Choice">
+              <label>UI:DashletGroupBy:Prop-OrderDirection</label>
+              <values>
+                <value id="asc">
+                  <label>UI:DashletGroupBy:Order:asc</label>
+                </value>
+                <value id="desc">
+                  <label>UI:DashletGroupBy:Order:desc</label>
+                </value>
+              </values>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletGroupByPie" xsi:type="Combodo-PropertyType">
         <extends>Dashlet</extends>
         <definition xsi:type="Combodo-ValueType-PropertyTree">
           <label>UI:DashletGroupBy:Title</label>

application/displayblock.class.inc.php

@@ -726,10 +726,6 @@ class DisplayBlock
 				}
 			}
 
-			if (!$this->m_oFilter->IsAllDataAllowed() && ($aExtraParams['display_unauthorized_objects'] ?? false) === true) {
-				$this->m_oFilter->AllowAllData();
-			}
-
 			$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
 			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, $aOrderBy, $aQueryParams);
 		}
@@ -988,7 +984,7 @@ JS
 			$aFunctions = [$sFctVar => $oFctExpr];
 		}
 
-		if (!empty($sAggregationAttr)) {
+		if (!empty(trim($sAggregationAttr))) {
 			$sClass = $this->m_oFilter->GetClass();
 			$sAggregationAttr = MetaModel::GetLabel($sClass, $sAggregationAttr);
 		}
@@ -1383,10 +1379,7 @@ JS
 
 		// Check the classes that can be read (i.e authorized) by this user...
 		foreach ($aClasses as $sAlias => $sClassName) {
-			if (
-				(UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) !== UR_ALLOWED_NO)
-				|| ($aExtraParams['display_unauthorized_objects'] ?? false) === true
-			) {
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) != UR_ALLOWED_NO) {
 				$aAuthorizedClasses[$sAlias] = $sClassName;
 			}
 		}
@@ -1615,10 +1608,9 @@ JS
 			$iTotalCount = 0;
 			$aURLs = [];
 
-			foreach ($aRes as $iRow => $aRow) {
+			foreach ($aRes as $aRow) {
 				$sValue = $aRow['grouped_by_1'];
 				$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
-				$iTotalCount += $aRow['_itop_count_'];
 				$aValues[] = [
 					'label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'),
 					'label_html' => $sHtmlValue,

application/exceptions/ForgotPasswordUserInputException.php

@@ -1,10 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class ForgotPasswordUserInputException extends Exception
-{
-}

application/loginexternal.class.inc.php

@@ -75,10 +75,13 @@ class LoginExternal extends AbstractLoginFSMExtension
 	}
 
 	/**
-	 * @return bool|mixed
+	 * @return bool
 	 */
 	private function GetAuthUser()
 	{
-		return MetaModel::GetConfig()->GetExternalAuthenticationVariable();
+		$sExtAuthVar = MetaModel::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
+		eval('$sAuthUser = isset('.$sExtAuthVar.') ? '.$sExtAuthVar.' : false;'); // Retrieve the value
+		/** @var string $sAuthUser */
+		return $sAuthUser; // Retrieve the value
 	}
 }

application/loginwebpage.class.inc.php

@@ -221,15 +221,15 @@ class LoginWebPage extends NiceWebPage
 
 			if ($oUser != null) {
 				if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token')) {
-					throw new ForgotPasswordUserInputException('External accounts do not allow password reset');
+					throw new Exception(Dict::S('UI:ResetPwd-Error-NotPossible'));
 				}
 				if (!$oUser->CanChangePassword()) {
-					throw new ForgotPasswordUserInputException('The account does not allow password reset');
+					throw new Exception(Dict::S('UI:ResetPwd-Error-FixedPwd'));
 				}
 
 				$sTo = $oUser->GetResetPasswordEmail(); // throws Exceptions if not allowed
 				if ($sTo == '') {
-					throw new ForgotPasswordUserInputException('Missing email address for this account');
+					throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmail'));
 				}
 
 				// This token allows the user to change the password without knowing the previous one
@@ -255,21 +255,17 @@ class LoginWebPage extends NiceWebPage
 
 					case EMAIL_SEND_ERROR:
 					default:
-						throw new ForgotPasswordApplicationException('Failed to send the password reset email for '.$oUser->Get('friendlyname').': '.implode(', ', $aIssues));
+						IssueLog::Error('Failed to send the email with the NEW password for '.$oUser->Get('friendlyname').': '.implode(', ', $aIssues));
+						throw new Exception(Dict::S('UI:ResetPwd-Error-Send'));
 				}
 			}
 
-		} catch (ForgotPasswordApplicationException $e) {
-			IssueLog::Error('Failed to process the forgot password request for user "'.$sAuthUser.'" [reason='.get_class($e).']: '.$e->getMessage());
-		} catch (ForgotPasswordUserInputException $e) {
-			IssueLog::Info('Failed to process the forgot password request for user "'.$sAuthUser.'" [reason='.get_class($e).']: '.$e->getMessage());
-		} catch (\Throwable $e) {
-			IssueLog::Error('Unexpected error while processing the forgot password request for user "'.$sAuthUser.'": '.$e->getMessage());
+			$oTwigContext = new LoginTwigRenderer();
+			$aVars = $oTwigContext->GetDefaultVars();
+			$oTwigContext->Render($this, 'forgotpwdsent.html.twig', $aVars);
+		} catch (Exception $e) {
+			$this->DisplayForgotPwdForm(true, $e->getMessage());
 		}
-
-		$oTwigContext = new LoginTwigRenderer();
-		$aVars = $oTwigContext->GetDefaultVars();
-		$oTwigContext->Render($this, 'forgotpwdsent.html.twig', $aVars);
 	}
 
 	public function DisplayResetPwdForm($sErrorMessage = null)

application/menunode.class.inc.php

@@ -6,6 +6,7 @@
  */
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory;
 use Combodo\iTop\Application\WebPage\ErrorPage;
 use Combodo\iTop\Application\WebPage\iTopWebPage;
 use Combodo\iTop\Application\WebPage\WebPage;
@@ -1218,7 +1219,6 @@ class NewObjectMenuNode extends MenuNode
 	}
 }
 
-require_once(APPROOT.'application/dashboard.class.inc.php');
 /**
  * This class defines a menu item which content is based on XML dashboard.
  */
@@ -1279,13 +1279,14 @@ class DashboardMenuNode extends MenuNode
 		if ($oDashboard != null) {
 			WebResourcesHelper::EnableC3JSToWebPage($oPage);
 
+			// TODO 3.3 this works for dashboard menu, what about other places ?
+			$oPageLayout = PageContentFactory::MakeForDashboard();
+			$oPage->SetContentLayout($oPageLayout, $oPage);
 			$sDivId = utils::Sanitize($this->sMenuId, '', 'element_identifier');
-			$oPage->add('<div id="'.$sDivId.'" class="ibo-dashboard" data-role="ibo-dashboard">');
 			$aExtraParams['dashboard_div_id'] = $sDivId;
 			$aExtraParams['from_dashboard_page'] = true;
 			$oDashboard->SetReloadURL($this->GetHyperlink($aExtraParams));
 			$oDashboard->Render($oPage, false, $aExtraParams);
-			$oPage->add('</div>');
 
 			$bEdit = utils::ReadParam('edit', false);
 			if ($bEdit) {
@@ -1311,37 +1312,6 @@ class DashboardMenuNode extends MenuNode
 			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @throws CoreException
-	 * @throws Exception
-	 */
-	public function RenderEditor(WebPage $oPage)
-	{
-		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null) {
-			$oDashboard->RenderEditor($oPage);
-		} else {
-			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
-		}
-	}
-
-	/**
-	 * @param $oDashlet
-	 * @throws Exception
-	 */
-	public function AddDashlet($oDashlet)
-	{
-		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null) {
-			$oDashboard->AddDashlet($oDashlet);
-			$oDashboard->Save();
-		} else {
-			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
-		}
-	}
-
 }
 
 /**
@@ -1423,21 +1393,12 @@ class ShortcutMenuNode extends MenuNode
 	public function GetHyperlink($aExtraParams)
 	{
 		$sContext = $this->oShortcut->Get('context');
-		try {
-			$aContext = utils::Unserialize($sContext);
-			if (isset($aContext['menu'])) {
-				unset($aContext['menu']);
-			}
-			foreach ($aContext as $sArgName => $sArgValue) {
-				$aExtraParams[$sArgName] = $sArgValue;
-			}
-		} catch (Exception $e) {
-			IssueLog::Warning("User shortcut corrupted, delete the shortcut", LogChannels::CONSOLE, [
-				'shortcut_name' => $this->oShortcut->GetName(),
-				'root_cause' => $e->getMessage(),
-			]);
-			// delete the shortcut
-			$this->oShortcut->DBDelete();
+		$aContext = unserialize($sContext);
+		if (isset($aContext['menu'])) {
+			unset($aContext['menu']);
+		}
+		foreach ($aContext as $sArgName => $sArgValue) {
+			$aExtraParams[$sArgName] = $sArgValue;
 		}
 		return parent::GetHyperlink($aExtraParams);
 	}

application/newsroomprovider.class.inc.php

@@ -34,7 +34,7 @@ interface iNewsroomProvider
 	 * @param User $oUser The user for who to check if the provider is applicable.
 	 * return bool
 	 */
-	public function IsApplicable(?User $oUser = null);
+	public function IsApplicable(User $oUser = null);
 
 	/**
 	 * The human readable (localized) label for this provider
@@ -139,7 +139,7 @@ abstract class NewsroomProviderBase implements iNewsroomProvider
 	 */
 	abstract public function GetViewAllURL();
 
-	public function IsApplicable(?User $oUser = null)
+	public function IsApplicable(User $oUser = null)
 	{
 		return false;
 	}

application/query.class.inc.php

@@ -151,7 +151,7 @@ abstract class Query extends cmdbAbstractObject
 	 * @return string|null
 	 * @since 3.1.0
 	 */
-	abstract public function GetExportUrl(?array $aValues = null): ?string;
+	abstract public function GetExportUrl(array $aValues = null): ?string;
 
 	/**
 	 * Update last export information.
@@ -227,7 +227,7 @@ class QueryOQL extends Query
 	}
 
 	/** @inheritdoc */
-	public function GetExportUrl(?array $aValues = null): ?string
+	public function GetExportUrl(array $aValues = null): ?string
 	{
 		try {
 			// retrieve attributes

application/themehandler.class.inc.php

@@ -924,6 +924,11 @@ CSS;
 	public static function CloneThemeParameterAndIncludeVersion($aThemeParameters, $bSetupCompilationTimestamp, $aImportsPaths)
 	{
 		$aThemeParametersVariable = [];
+		if (array_key_exists('variables', $aThemeParameters)) {
+			if (is_array($aThemeParameters['variables'])) {
+				$aThemeParametersVariable = array_merge([], $aThemeParameters['variables']);
+			}
+		}
 
 		if (array_key_exists('variable_imports', $aThemeParameters)) {
 			if (is_array($aThemeParameters['variable_imports'])) {
@@ -931,14 +936,6 @@ CSS;
 			}
 		}
 
-		// Variables defined in theme XML have the priority over variables defined in XML imports files
-		// They're defined after so they overwrite previous parameters
-		if (array_key_exists('variables', $aThemeParameters)) {
-			if (is_array($aThemeParameters['variables'])) {
-				$aThemeParametersVariable = array_merge($aThemeParametersVariable, $aThemeParameters['variables']);
-			}
-		}
-
 		$aThemeParametersVariable['$version'] = $bSetupCompilationTimestamp;
 		return $aThemeParametersVariable;
 	}
@@ -970,9 +967,7 @@ CSS;
 				}
 			}
 		}
-		array_map(function ($sVariableValue) {
-			return ltrim($sVariableValue);
-		}, $aVariablesResults);
+		array_map(function ($sVariableValue) { return ltrim($sVariableValue); }, $aVariablesResults);
 		return $aVariablesResults;
 	}
 

application/ui.linksdirectwidget.class.inc.php

@@ -228,7 +228,7 @@ JS
 			<<<HTML
 <form id="ObjectsAddForm_{$this->sInputid}">
     <div id="SearchResultsToAdd_{$this->sInputid}">
-        <div style="border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+        <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
     </div>
     <input type="hidden" id="count_{$this->sInputid}" value="0"/>
 </form>

application/ui.searchformforeignkeys.class.inc.php

@@ -27,9 +27,6 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys
 {
-	private $m_sRemoteClass;
-	private $m_iInputId;
-
 	public function __construct($sTargetClass, $iInputId = null)
 	{
 		$this->m_sRemoteClass = $sTargetClass;
@@ -43,7 +40,7 @@ class UISearchFormForeignKeys
 	 *
 	 * @throws \Exception
 	 */
-	public function ShowModalSearchForeignKeys($oPage)
+	public function ShowModalSearchForeignKeys($oPage, $sTitle)
 	{
 
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
@@ -63,17 +60,52 @@ class UISearchFormForeignKeys
 			]
 		));
 		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$sCancel = Dict::S('UI:Button:Cancel');
+		$sAdd = Dict::S('UI:Button:Add');
 
 		$oPage->add(
 			<<<HTML
 <form id="ObjectsAddForm_{$this->m_iInputId}">
     <div id="SearchResultsToAdd_{$this->m_iInputId}" style="vertical-align:top;height:100%;overflow:auto;padding:0;border:0;">
-        <div style="border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+        <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
     </div>
     <input type="hidden" id="count_{$this->m_iInputId}" value="0"/>
 </form>
 HTML
 		);
+
+		$oPage->add_ready_script(
+			<<<JS
+ $('#dlg_{$this->m_iInputId}').dialog({ 
+ 			width: $(window).width()*0.8, 
+ 			height: $(window).height()*0.8, 
+ 			autoOpen: false, 
+ 			modal: true, 
+ 			resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes,
+            buttons: [
+				{
+					text: Dict.S('UI:Button:Cancel'),
+					class: "cancel ibo-is-alternative ibo-is-neutral",
+					click: function() {
+						$('#dlg_{$this->m_iInputId}').dialog('close');
+					}
+				},
+				{
+					text:  Dict.S('UI:Button:Add'),
+					id: 'btn_ok_{$this->m_iInputId}',
+					class: "ok ibo-is-regular ibo-is-primary",
+					click: function() {
+						oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);							
+					}
+				},
+			],
+
+ });
+$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});
+$('#SearchFormToAdd_{$this->m_iInputId} form').on('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);
+$('#SearchFormToAdd_{$this->m_iInputId}').on('resize', oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);
+JS
+		);
 	}
 
 	public function GetFullListForeignKeysFromSelection($oPage, $oFullSetFilter)
@@ -87,4 +119,31 @@ HTML
 			IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
 		}
 	}
+
+	/**
+	 * Search for objects to be linked to the current object (i.e "remote" objects)
+	 *
+	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
+	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of m_sRemoteClass
+	 *
+	 * @throws \Exception
+	 */
+	public function ListResultsSearchForeignKeys(WebPage $oP, $sRemoteClass = '')
+	{
+		if ($sRemoteClass != '') {
+			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
+			$oFilter = new DBObjectSearch($sRemoteClass);
+		} else {
+			// No remote class specified use the one defined in the linkedset
+			$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+		}
+
+		$oBlock = new DisplayBlock($oFilter, 'list', false);
+		$oBlock->Display(
+			$oP,
+			"ResultsToAdd_{$this->m_iInputId}",
+			['menu' => false, 'cssCount' => "#count_{$this->m_iInputId}", 'selection_mode' => true, 'table_id' => "add_{$this->m_iInputId}"]
+		);
+	}
+
 }

application/utils.inc.php

@@ -122,11 +122,6 @@ class utils
 	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_VARIABLE_NAME = 'variable_name';
-	/**
-	 * @var string For module codes (e.g. `itop-portal-base`, `combodo-webhook-integration`, `some-module-code-x.y`, ...)
-	 * @since 3.2.3 3.3.0 N°8554
-	 */
-	public const ENUM_SANITIZATION_FILTER_MODULE_CODE = 'module_code';
 	/**
 	 * @var string
 	 * @since 2.7.10 3.0.0
@@ -186,9 +181,6 @@ class utils
 
 	protected static function LoadParamFile($sParamFile)
 	{
-		if (utils::RealPath($sParamFile, APPROOT) !== false) {
-			throw new Exception("File '".utils::HtmlEntities($sParamFile)."' should be outside iTop");
-		}
 		if (!file_exists($sParamFile)) {
 			throw new Exception("Could not find the parameter file: '".utils::HtmlEntities($sParamFile)."'");
 		}
@@ -398,7 +390,6 @@ class utils
 	 * @since 2.7.10 N°6606 use the utils::ENUM_SANITIZATION_* const
 	 * @since 2.7.10 N°6606 new case for ENUM_SANITIZATION_FILTER_PHP_CLASS
 	 * @since 3.2.1-1 N°8242 Allow value to be an array for every filter
-	 * @since 3.2.3 3.3.0 N°8554 new case for ENUM_SANITIZATION_FILTER_MODULE_CODE
 	 *
 	 * @link https://www.php.net/manual/en/filter.filters.sanitize.php PHP sanitization filters
 	 */
@@ -486,7 +477,7 @@ class utils
 				);
 				break;
 
-				// For XML / HTML node selector
+				// For XML / HTML node id selector
 			case static::ENUM_SANITIZATION_FILTER_ELEMENT_SELECTOR:
 				$retValue = filter_var(
 					$value,
@@ -499,15 +490,6 @@ class utils
 				$retValue = preg_replace('/[^a-zA-Z0-9_]/', '', $value);
 				break;
 
-			case static::ENUM_SANITIZATION_FILTER_MODULE_CODE:
-				// Module codes allow all alphabets letters, numbers, dash and dot characters
-				$retValue = filter_var(
-					$value,
-					FILTER_VALIDATE_REGEXP,
-					['options' => ['regexp' => '/^[\p{L}\d.-]+$/u']]
-				);
-				break;
-
 				// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
 				$retValue = filter_var($value, FILTER_SANITIZE_URL);
@@ -1302,7 +1284,7 @@ class utils
 	 * @throws \CoreException
 	 * @throws \Exception
 	 */
-	public static function ExecITopScript(string $sScriptName, array $aArguments, ?string $sAuthUser = null, ?string $sAuthPwd = null)
+	public static function ExecITopScript(string $sScriptName, array $aArguments, string $sAuthUser = null, string $sAuthPwd = null)
 	{
 		$aDisabled = explode(', ', ini_get('disable_functions'));
 		if (in_array('exec', $aDisabled)) {
@@ -1392,7 +1374,7 @@ class utils
 	 * @return string A path to a folder into which any module can store cache data
 	 * The corresponding folder is created or cleaned upon code compilation
 	 */
-	public static function GetCachePath(?string $sEnvironment = null): string
+	public static function GetCachePath(string $sEnvironment = null): string
 	{
 		if (is_null($sEnvironment)) {
 			$sEnvironment = MetaModel::GetEnvironment();
@@ -1455,12 +1437,6 @@ class utils
 
 			case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
 				/** @var \DBObjectSet $param */
-
-				// Check if the user has the right to read the objects of this list, otherwise do not propose any action (eg. configure this list, export, etc.)
-				if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_READ, $param) !== UR_ALLOWED_YES) {
-					break;
-				}
-
 				$oAppContext = new ApplicationContext();
 				$sContext = $oAppContext->GetForLink(true);
 				$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
@@ -1544,7 +1520,7 @@ class utils
 				$sUploadDashboardTransactId = utils::GetNewTransactionId();
 				$aResult = [
 					new SeparatorPopupMenuItem(),
-					new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sDashboardId.'&file='.$sDashboardFileURL),
+					new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?route=dashboard.export&id='.$sDashboardId.'&file='.$sDashboardFileURL),
 					new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sDashboardId', file: '$sDashboardFileJS', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn', transaction: '$sUploadDashboardTransactId' })"),
 				];
 				if ($oDashboard->GetReloadURL()) {
@@ -2105,9 +2081,7 @@ SQL;
 			}
 
 			// Remove any remaining nulls (for positions that weren't referenced)
-			$aReplacements = array_filter($aReplacements, static function ($val) {
-				return $val !== null;
-			});
+			$aReplacements = array_filter($aReplacements, static function ($val) { return $val !== null; });
 		} else {
 			// For non-positional, we need to map each position
 			$aReplacements = [];
@@ -3014,6 +2988,12 @@ TXT
 		return $sAcronym;
 	}
 
+	public static function IsTrue(mixed $value): bool
+	{
+		$bVal = (is_string($value) ? filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : (bool) $value);
+		return ($bVal === null ? false : $bVal);
+	}
+
 	//----------------------------------------------
 	// Text manipulation
 	//----------------------------------------------
@@ -3146,50 +3126,4 @@ TXT
 
 		return $aTrace;
 	}
-
-	/**
-	 * PHP unserialize encapsulation, allow throwing exception when not allowed object class is detected (for security hardening)
-	 *
-	 * @param string $data data to unserialize
-	 * @param array $aOptions PHP @unserialise options
-	 * @param bool $bThrowNotAllowedObjectClassException flag to throw exception
-	 *
-	 * @return mixed PHP @unserialise return
-	 * @throws Exception
-	 */
-	public static function Unserialize(string $data, array $aOptions = ['allowed_classes' => false], bool $bThrowNotAllowedObjectClassException = true): mixed
-	{
-		$data = unserialize($data, $aOptions);
-
-		if ($bThrowNotAllowedObjectClassException) {
-			try {
-				self::AssertNoIncompleteClassDetected($data);
-			} catch (Exception $e) {
-				throw new CoreException('Unserialization failed because an incomplete class was detected.', [], '', $e);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Assert that data provided doesn't contain any incomplete class.
-	 *
-	 * @throws Exception
-	 */
-	public static function AssertNoIncompleteClassDetected(mixed $data): void
-	{
-		if (is_object($data)) {
-			if ($data instanceof __PHP_Incomplete_Class) {
-				throw new Exception('__PHP_Incomplete_Class_Name object detected');
-			}
-			foreach (get_object_vars($data) as $property) {
-				self::AssertNoIncompleteClassDetected($property);
-			}
-		} elseif (is_array($data)) {
-			foreach ($data as $value) {
-				self::AssertNoIncompleteClassDetected($value);
-			}
-		}
-	}
 }

bootstrap.inc.php

@@ -42,6 +42,20 @@ define('ITOP_DEFAULT_ENV', 'production');
 define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
 define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
 
+// TODO 3.3 To deprecate
+/**
+ * Exclude the parent class from the list
+ *
+ * @package     iTopORM
+ */
+define('ENUM_CHILD_CLASSES_EXCLUDETOP', 1);
+/**
+ * Include the parent class in the list
+ *
+ * @package     iTopORM
+ */
+define('ENUM_CHILD_CLASSES_ALL', 2);
+
 $fItopStarted = microtime(true);
 $iItopInitialMemory = memory_get_usage(true);
 

composer.json

@@ -4,7 +4,7 @@
   "type": "project",
   "license": "AGPL-3.0-only",
   "require": {
-    "php": ">=8.2.0 <8.5.0",
+    "php": ">=8.1.0 <8.4.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -12,50 +12,38 @@
     "ext-json": "*",
     "ext-mysqli": "*",
     "ext-soap": "*",
-    "apereo/phpcas": "dev-master",
+    "apereo/phpcas": "~1.6.0",
+    "firebase/php-jwt": "^6.4.0",
     "guzzlehttp/guzzle": "^7.5.1",
     "league/oauth2-google": "^4.0.1",
     "nikic/php-parser": "dev-master",
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "^7.2.0",
     "psr/log": "^3.0.0",
-    "scssphp/scssphp": "dev-combodo/1.x",
+    "scssphp/scssphp": "^1.12.1",
+    "soundasleep/html2text": "~2.1",
     "symfony/console": "~6.4.0",
     "symfony/dotenv": "~6.4.0",
     "symfony/form": "^6.4",
     "symfony/framework-bundle": "~6.4.0",
     "symfony/http-foundation": "~6.4.0",
     "symfony/http-kernel": "~6.4.0",
-    "symfony/runtime": "~6.4.0",
-    "symfony/security-csrf": "~6.4.0",
+    "symfony/mailer": "^6.4",
+    "symfony/security-csrf": "^6.4",
     "symfony/twig-bundle": "~6.4.0",
-    "symfony/validator" : "~6.4.0",
-    "symfony/var-dumper": "~6.4.0",
+    "symfony/validator" : "^6.4",
     "symfony/yaml": "~6.4.0",
-    "symfony/mailer": "~6.4.0",
     "tecnickcom/tcpdf": "^6.6.0",
-    "thenetworg/oauth2-azure": "^2.0",
-    "soundasleep/html2text": "~2.1"
+    "thenetworg/oauth2-azure": "^2.0"
   },
   "require-dev": {
-    "symfony/debug-bundle": "~6.4.0",
     "symfony/stopwatch": "~6.4.0",
     "symfony/web-profiler-bundle": "~6.4.0"
   },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/Combodo/PHP-Parser"
-    },
-    {
-      "type": "vcs",
-      "url": "https://github.com/EsupPortail/phpCAS"
-    },
-    {
-      "type": "vcs",
-      "url": "https://github.com/combodo-itop-libs/scssphp"
-    }
-  ],
+  "repositories": [{
+    "type": "vcs",
+    "url": "https://github.com/Combodo/PHP-Parser"
+  }],
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
     "ext-openssl": "Can be used as a polyfill if libsodium is not installed",
@@ -67,7 +55,7 @@
   },
   "config": {
     "platform": {
-      "php": "8.2.0"
+      "php": "8.1.0"
     },
     "vendor-dir": "lib",
     "preferred-install": {
@@ -75,10 +63,7 @@
     },
     "sort-packages": true,
     "classmap-authoritative": true,
-    "platform-check": true,
-    "allow-plugins": {
-      "symfony/runtime": true
-    }
+    "platform-check": true
   },
   "autoload": {
     "classmap": [

core/action.class.inc.php

@@ -234,11 +234,10 @@ abstract class Action extends cmdbAbstractObject
 		}
 
 		$oActionFilter = DBObjectSearch::FromOQL($sActionQueryOql, $aActionQueryParams);
-		$oActionFilter->AllowAllData();
 		$oSet = new DBObjectSet($oActionFilter, ['date' => false]);
 
 		$sPanelTitle = Dict::Format('Action:last_executions_tab_panel_title', $sActionQueryLimit);
-		$oExecutionsListBlock = DataTableUIBlockFactory::MakeForResult($oPage, 'action_executions_list', $oSet, ['panel_title' => $sPanelTitle, 'display_unauthorized_objects' => true]);
+		$oExecutionsListBlock = DataTableUIBlockFactory::MakeForResult($oPage, 'action_executions_list', $oSet, ['panel_title' => $sPanelTitle]);
 
 		$oPage->AddUiBlock($oExecutionsListBlock);
 	}

core/bulkchange.class.inc.php

@@ -199,7 +199,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	 * @param null $sAllowedValues : used for additional message that provides allowed values $sAllowedValues for current class
 	 * @param string|null $sAllowedValuesSearch : used to search all allowed values
 	 */
-	public function __construct($sSerializedSearch, $sReason, $sClass = null, $sAllowedValues = null, ?string $sAllowedValuesSearch = null)
+	public function __construct($sSerializedSearch, $sReason, $sClass = null, $sAllowedValues = null, string $sAllowedValuesSearch = null)
 	{
 		parent::__construct(null, null, $sReason);
 		$this->sSerializedSearch = $sSerializedSearch;
@@ -876,7 +876,7 @@ class BulkChange
 		return $aResults;
 	}
 
-	protected function CreateObject(&$aResult, $iRow, $aRowData, ?CMDBChange $oChange = null)
+	protected function CreateObject(&$aResult, $iRow, $aRowData, CMDBChange $oChange = null)
 	{
 		$oTargetObj = MetaModel::NewObject($this->m_sClass);
 
@@ -965,7 +965,7 @@ class BulkChange
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
 	 */
-	protected function UpdateObject(&$aResult, $iRow, $oTargetObj, $aRowData, ?CMDBChange $oChange = null)
+	protected function UpdateObject(&$aResult, $iRow, $oTargetObj, $aRowData, CMDBChange $oChange = null)
 	{
 		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
 
@@ -1008,7 +1008,7 @@ class BulkChange
 	 *
 	 * @throws \BulkChangeException
 	 */
-	protected function UpdateMissingObject(&$aResult, $iRow, $oTargetObj, ?CMDBChange $oChange = null)
+	protected function UpdateMissingObject(&$aResult, $iRow, $oTargetObj, CMDBChange $oChange = null)
 	{
 		$aResult[$iRow] = $this->PrepareMissingObject($oTargetObj, $aErrors);
 
@@ -1043,7 +1043,7 @@ class BulkChange
 		}
 	}
 
-	public function Process(?CMDBChange $oChange = null)
+	public function Process(CMDBChange $oChange = null)
 	{
 		if ($oChange) {
 			CMDBObject::SetCurrentChange($oChange);

core/config.class.inc.php

@@ -78,7 +78,6 @@ define('DEFAULT_EXT_AUTH_VARIABLE', '$_SERVER[\'REMOTE_USER\']');
 define('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random generated key later (if possible)
 define('DEFAULT_ENCRYPTION_LIB', 'Mcrypt'); // We'll define the best encryption available later
 define('DEFAULT_HASH_ALGO', PASSWORD_DEFAULT);
-
 /**
  * Config
  * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries)
@@ -872,14 +871,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'ext_auth_variable' => [
-			'type' => 'string',
-			'description' => 'External authentication expression (allowed: $_SERVER[\'key\'], $_COOKIE[\'key\'], $_REQUEST[\'key\'], getallheaders()[\'Header-Name\'])',
-			'default' => '$_SERVER[\'REMOTE_USER\']',
-			'value' => '$_SERVER[\'REMOTE_USER\']',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'login_debug' => [
 			'type' => 'bool',
 			'description' => 'Activate the login FSM debug',
@@ -937,7 +928,7 @@ class Config
 			'type' => 'string',
 			'description' => 'Actions that are available as direct buttons next to the "Actions" menu',
 			// examples... not used
-			'default' => 'UI:Menu:Modify,UI:Menu:New,UI:Menu:impacts_down,UI:Menu:impacts_up',
+			'default' => 'UI:Menu:Modify,UI:Menu:New',
 			'value' => 'UI:Menu:Modify',
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
@@ -1622,7 +1613,7 @@ class Config
 			'show_in_conf_sample' => false,
 		],
 		'search_manual_submit' => [
-			'type' => 'bool',
+			'type' => 'array',
 			'description' => 'Force manual submit of search all requests',
 			'default' => false,
 			'value' => true,
@@ -1749,14 +1740,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'security.disable_joined_classes_filter' => [
-			'type'                => 'bool',
-			'description'         => 'If true, scope filters aren\'t applied to joined classes or union classes not directly listed in the SELECT clause.',
-			'default'             => true,
-			'value'               => true,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'security.hide_administrators' => [
 			'type'                => 'bool',
 			'description'         => 'If true, non-administrator users will not be able to see the administrator accounts, the Administrator profile and the links between the administrator accounts and their profiles.',
@@ -1765,14 +1748,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'security.disable_exec_forced_login_for_all_enpoints' => [
-			'type'                => 'bool',
-			'description'         => 'If true, when no delegated authentication module is defined, no login will be forced on modules exec endpoints',
-			'default'             => true,
-			'value'               => true,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'behind_reverse_proxy' => [
 			'type' => 'bool',
 			'description' => 'If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)',
@@ -1979,6 +1954,11 @@ class Config
 	 */
 	protected $m_sDefaultLanguage;
 
+	/**
+	 * @var string Name of the PHP variable in which external authentication information is passed by the web server
+	 */
+	protected $m_sExtAuthVariable;
+
 	/**
 	 * @var string Encryption key used for all attributes of type "encrypted string". Can be set to a random value
 	 *             unless you want to import a database from another iTop instance, in which case you must use
@@ -2047,6 +2027,7 @@ class Config
 		$this->m_iFastReloadInterval = DEFAULT_FAST_RELOAD_INTERVAL;
 		$this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED;
 		$this->m_sDefaultLanguage = 'EN US';
+		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
 		$this->m_aCharsets = [];
 		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;
 		$this->m_iPasswordHashAlgo = DEFAULT_HASH_ALGO;
@@ -2192,6 +2173,7 @@ class Config
 		$this->m_aModuleSettings = isset($MyModuleSettings) ? $MyModuleSettings : [];
 
 		$this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US';
+		$this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE;
 		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : $this->m_sEncryptionKey;
 		$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
 		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : [];
@@ -2353,73 +2335,9 @@ class Config
 		return explode('|', $this->m_aSettings['allowed_login_types']['value']);
 	}
 
-	/**
-	 * @return bool|mixed
-	 * @since 3.2.3 return the parsed value instead of an unsecured variable name
-	 */
 	public function GetExternalAuthenticationVariable()
 	{
-		$sExpression = $this->Get('ext_auth_variable');
-		$aParsed = $this->ParseExternalAuthVariableExpression($sExpression);
-		if ($aParsed === null) {
-			return false;
-		}
-
-		$sKey = $aParsed['key'];
-		switch ($aParsed['type']) {
-			case 'server':
-				return $_SERVER[$sKey] ?? false;
-			case 'cookie':
-				return $_COOKIE[$sKey] ?? false;
-			case 'request':
-				return $_REQUEST[$sKey] ?? false;
-			case 'header':
-				if (!function_exists('getallheaders')) {
-					return false;
-				}
-				$aHeaders = getallheaders();
-				if (!is_array($aHeaders)) {
-					return false;
-				}
-				return $aHeaders[$sKey] ?? false;
-		}
-		return false;
-	}
-
-	/**
-	 * @param $sExpression
-	 * @return array|null
-	 */
-	private function ParseExternalAuthVariableExpression($sExpression)
-	{
-		// If it's a configuration parameter it's probably already trimmed, but just in case
-		$sExpression = trim((string) $sExpression);
-		if ($sExpression === '') {
-			return null;
-		}
-
-		// Match $_SERVER/$_COOKIE/$_REQUEST['key'] with optional whitespace and single/double quotes.
-		if (preg_match('/^\$_(SERVER|COOKIE|REQUEST)\s*\[\s*(["\'])\s*([^"\']+)\2\s*\]\s*$/', $sExpression, $aMatches) === 1) {
-			$sContext = strtoupper($aMatches[1]);
-			$sKey = $aMatches[3];
-			return [
-				'type' => strtolower($sContext),
-				'key' => $sKey,
-				'normalized' => '$_'.$sContext.'[\''.$sKey.'\']',
-			];
-		}
-
-		// Match getallheaders()['Header-Name'] in a case-insensitive way.
-		if (preg_match('/^getallheaders\(\)\s*\[\s*(["\'])\s*([^"\']+)\1\s*\]\s*$/i', $sExpression, $aMatches) === 1) {
-			$sKey = $aMatches[2];
-			return [
-				'type' => 'header',
-				'key' => $sKey,
-				'normalized' => 'getallheaders()[\''.$sKey.'\']',
-			];
-		}
-
-		return null;
+		return $this->m_sExtAuthVariable;
 	}
 
 	public function GetCSVImportCharsets()
@@ -2515,7 +2433,7 @@ class Config
 
 	public function SetExternalAuthenticationVariable($sExtAuthVariable)
 	{
-		$this->Set('ext_auth_variable', $sExtAuthVariable);
+		$this->m_sExtAuthVariable = $sExtAuthVariable;
 	}
 
 	public function SetEncryptionKey($sKey)
@@ -2569,6 +2487,7 @@ class Config
 		$aSettings['fast_reload_interval'] = $this->m_iFastReloadInterval;
 		$aSettings['secure_connection_required'] = $this->m_bSecureConnectionRequired;
 		$aSettings['default_language'] = $this->m_sDefaultLanguage;
+		$aSettings['ext_auth_variable'] = $this->m_sExtAuthVariable;
 		$aSettings['encryption_key'] = $this->m_sEncryptionKey;
 		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
 		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
@@ -2671,6 +2590,7 @@ class Config
 			// Old fashioned remaining values
 			$aOtherValues = [
 				'default_language' => $this->m_sDefaultLanguage,
+				'ext_auth_variable' => $this->m_sExtAuthVariable,
 				'encryption_key' => $this->m_sEncryptionKey,
 				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,

core/csvbulkexport.class.inc.php

@@ -5,7 +5,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
@@ -14,6 +13,7 @@ use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\WebPage\Page;
 use Combodo\iTop\Application\WebPage\WebPage;
 
@@ -55,8 +55,6 @@ class CSVBulkExport extends TabularBulkExport
 		$this->aStatusInfo['charset'] = strtoupper(utils::ReadParam('charset', 'UTF-8', true, 'raw_data'));
 		$this->aStatusInfo['formatted_text'] = (bool)utils::ReadParam('formatted_text', 0, true);
 
-		$this->aStatusInfo['ignore_excel_sanitization'] = (bool)utils::ReadParam('ignore_excel_sanitization', 0, true, utils::ENUM_SANITIZATION_FILTER_INTEGER);
-
 		$sDateFormatRadio = utils::ReadParam('csv_date_format_radio', '');
 		switch ($sDateFormatRadio) {
 			case 'default':
@@ -225,10 +223,6 @@ class CSVBulkExport extends TabularBulkExport
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetDate->AddSubBlock($oRadioCustom);
 
-				$oFieldSetSecurity = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:Security'));
-				$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSecurity));
-				$oFieldSetSecurity->AddSubBlock(ExportHelper::GetInputForSanitizeExcelExport());
-
 				$oP->add_ready_script(
 					<<<EOF
 $('#form_part_csv_options').on('preview_updated', function() { FormatDatesInPreview('csv', 'csv'); });
@@ -270,13 +264,6 @@ EOF
 			default:
 				$sRet = trim($oObj->GetAsCSV($sAttCode), '"');
 		}
-
-		// If the option to ignore Excel sanitization is not set or explicitly set to false, apply sanitization
-		if (!(array_key_exists('ignore_excel_sanitization', $this->aStatusInfo)) || $this->aStatusInfo['ignore_excel_sanitization'] === false) {
-			return ExportHelper::SanitizeField($sRet, $this->aStatusInfo['text_qualifier'] ?? '');
-		}
-
-		// The option to ignore Excel sanitization is explicitly set to true: return the raw value without sanitization
 		return $sRet;
 	}
 
@@ -350,12 +337,6 @@ EOF
 							$sField = $oObj->GetAsCSV($sAttCode, $this->aStatusInfo['separator'], $this->aStatusInfo['text_qualifier'], $this->bLocalizeOutput, !$this->aStatusInfo['formatted_text']);
 					}
 				}
-
-				// If the option to ignore Excel sanitization is not set or absent, sanitize the field
-				if (!(array_key_exists('ignore_excel_sanitization', $this->aStatusInfo)) || $this->aStatusInfo['ignore_excel_sanitization'] === false) {
-					$sField = ExportHelper::SanitizeField($sField, $this->aStatusInfo['text_qualifier']);
-				}
-
 				if ($this->aStatusInfo['charset'] != 'UTF-8') {
 					// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
 					// and thus to convert field by field and not the whole row or file at once (see ticket N°991)

core/datamodel.core.xml

@@ -425,7 +425,7 @@
       </php_parent>
       <parent>cmdbAbstractObject</parent>
       <properties>
-        <category>core/cmdb,grant_by_profile,silo</category>
+        <category>core/cmdb,view_in_gui</category>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>priv_event_newsroom</db_table>
@@ -904,7 +904,7 @@
         <!-- Generated by toolkit/export-class-to-meta.php -->
         <parent>Event</parent>
         <properties>
-          <category>core/cmdb,grant_by_profile,silo</category>
+          <category>core/cmdb,view_in_gui</category>
         </properties>
         <fields>
           <field id="message" xsi:type="AttributeText"/>

core/dbobject.class.php

@@ -2567,7 +2567,7 @@ abstract class DBObject implements iDisplay
 	 *
 	 * @see \RestUtils::FindObjectFromKey for the same check in the REST endpoint
 	 */
-	final public function CheckChangedExtKeysValues(?callable $oIsObjectLoadableCallback = null)
+	final public function CheckChangedExtKeysValues(callable $oIsObjectLoadableCallback = null)
 	{
 		if (is_null($oIsObjectLoadableCallback)) {
 			$oIsObjectLoadableCallback = function ($sClass, $sId) {
@@ -3727,7 +3727,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	private function ActivateOnObjectUpdateTriggers(?DBObject $oObject, ?array $aAttributes = null): void
+	private function ActivateOnObjectUpdateTriggers(?DBObject $oObject, array $aAttributes = null): void
 	{
 		if (is_null($oObject)) {
 			return;

core/dbobjectsearch.class.php

@@ -1932,37 +1932,4 @@ class DBObjectSearch extends DBSearch
 	{
 		return $this->GetCriteria()->ListParameters();
 	}
-
-	/**
-	 * @inheritDoc
-	 * @return DBObjectSearch
-	 */
-	protected function ApplyDataFilters(): DBObjectSearch
-	{
-		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
-			return $this;
-		}
-
-		$oSearch = $this;
-		$aClassesToFilter = $this->GetSelectedClasses();
-
-		// Opt-in for joined classes filtering, otherwise only filter the selected class(es)
-		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === false) {
-			$aClassesToFilter = $this->GetJoinedClasses();
-		}
-
-		// Apply filter (this is similar to the one in DBSearch but the factorization could make it less readable)
-		foreach ($aClassesToFilter as $sClassAlias => $sClass) {
-			$oVisibleObjects = UserRights::GetSelectFilter($sClass, $this->GetModifierProperties('UserRightsGetSelectFilter'));
-			if ($oVisibleObjects === false) {
-				$oVisibleObjects = DBObjectSearch::FromEmptySet($sClass);
-			}
-			if (is_object($oVisibleObjects)) {
-				$oVisibleObjects->AllowAllData();
-				$oSearch = $oSearch->Filter($sClassAlias, $oVisibleObjects);
-				$oSearch->SetDataFiltered();
-			}
-		}
-		return $oSearch;
-	}
 }

core/dbsearch.class.php

@@ -650,7 +650,7 @@ abstract class DBSearch
 	 *
 	 * @throws OQLException
 	 */
-	public static function FromOQL($sQuery, $aParams = null, ?ModelReflection $oMetaModel = null)
+	public static function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel = null)
 	{
 		if (empty($sQuery)) {
 			return null;
@@ -1048,7 +1048,21 @@ abstract class DBSearch
 	 */
 	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null)
 	{
-		$oSearch = $this->ApplyDataFilters();
+		$oSearch = $this;
+		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered()) {
+			foreach ($this->GetSelectedClasses() as $sClassAlias => $sClass) {
+				$oVisibleObjects = UserRights::GetSelectFilter($sClass, $this->GetModifierProperties('UserRightsGetSelectFilter'));
+				if ($oVisibleObjects === false) {
+					// Make sure this is a valid search object, saying NO for all
+					$oVisibleObjects = DBObjectSearch::FromEmptySet($sClass);
+				}
+				if (is_object($oVisibleObjects)) {
+					$oVisibleObjects->AllowAllData();
+					$oSearch = $oSearch->Filter($sClassAlias, $oVisibleObjects);
+					$oSearch->SetDataFiltered();
+				}
+			}
+		}
 
 		if (is_array($aGroupByExpr)) {
 			foreach ($aGroupByExpr as $sAlias => $oGroupByExp) {
@@ -1510,33 +1524,4 @@ abstract class DBSearch
 	 * @return array{\VariableExpression}
 	 */
 	abstract public function GetExpectedArguments(): array;
-
-	/**
-	 * Apply data filters to the search, if needed
-	 *
-	 * @return DBSearch
-	 * @throws CoreException
-	 */
-	protected function ApplyDataFilters(): DBSearch
-	{
-		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
-			return $this;
-		}
-
-		$oSearch = $this;
-		$aClassesToFilter = $this->GetSelectedClasses();
-
-		foreach ($aClassesToFilter as $sClassAlias => $sClass) {
-			$oVisibleObjects = UserRights::GetSelectFilter($sClass, $this->GetModifierProperties('UserRightsGetSelectFilter'));
-			if ($oVisibleObjects === false) {
-				$oVisibleObjects = DBObjectSearch::FromEmptySet($sClass);
-			}
-			if (is_object($oVisibleObjects)) {
-				$oVisibleObjects->AllowAllData();
-				$oSearch = $oSearch->Filter($sClassAlias, $oVisibleObjects);
-				$oSearch->SetDataFiltered();
-			}
-		}
-		return $oSearch;
-	}
 }

core/dbunionsearch.class.php

@@ -59,7 +59,7 @@ class DBUnionSearch extends DBSearch
 	public function AllowAllData($bAllowAllData = true)
 	{
 		foreach ($this->aSearches as $oSearch) {
-			$oSearch->AllowAllData($bAllowAllData);
+			$oSearch->AllowAllData();
 		}
 	}
 
@@ -673,30 +673,4 @@ class DBUnionSearch extends DBSearch
 
 		return $aVariableCriteria;
 	}
-
-	/**
-	 * @inheritDoc
-	 * @return DBUnionSearch
-	 */
-	protected function ApplyDataFilters(): DBUnionSearch
-	{
-		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
-			return $this;
-		}
-
-		// Opt-in for joined classes filtering, otherwise fallback on DBSearch filtering
-		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === true) {
-			return parent::ApplyDataFilters();
-		}
-
-		// Apply filters per sub-search
-		$aFilteredSearches = [];
-		foreach ($this->GetSearches() as $oSubSearch) {
-			// Recursively call ApplyDataFilters on sub-searches
-			$aFilteredSearches[] = $oSubSearch->ApplyDataFilters();
-		}
-
-		$oSearch = new DBUnionSearch($aFilteredSearches);
-		return $oSearch;
-	}
 }

core/designdocument.class.inc.php

@@ -453,7 +453,7 @@ class DesignElement extends \DOMElement
 	 * @throws Exception
 	 * @since 3.1.2 3.2.0 N°6974
 	 */
-	public static function _FindNode(DOMNode $oParent, DesignElement $oRefNode, ?string $sSearchId = null): ?DesignElement
+	public static function _FindNode(DOMNode $oParent, DesignElement $oRefNode, string $sSearchId = null): ?DesignElement
 	{
 		$oNodes = self::_FindNodes($oParent, $oRefNode, $sSearchId);
 		if ($oNodes instanceof DOMNodeList) {
@@ -477,7 +477,7 @@ class DesignElement extends \DOMElement
 	 * @return \DOMNodeList|false|mixed
 	 * @since 3.1.2 3.2.0 N°6974
 	 */
-	public static function _FindNodes(DOMNode $oParent, DesignElement $oRefNode, ?string $sSearchId = null)
+	public static function _FindNodes(DOMNode $oParent, DesignElement $oRefNode, string $sSearchId = null)
 	{
 		if ($oParent instanceof DOMDocument) {
 			$oDoc = $oParent->firstChild->ownerDocument;

core/displayablegraph.class.inc.php

@@ -632,7 +632,7 @@ class DisplayableGroupNode extends DisplayableNode
 		$this->aObjects = [];
 	}
 
-	public function AddObject(?DBObject $oObj = null)
+	public function AddObject(DBObject $oObj = null)
 	{
 		if (is_object($oObj)) {
 			$sPrevClass = $this->GetObjectClass();

core/event.class.inc.php

@@ -26,7 +26,7 @@ class Event extends DBObject implements iDisplay
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -120,7 +120,7 @@ class EventNotification extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -156,7 +156,7 @@ class EventNotificationEmail extends EventNotification
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -178,7 +178,7 @@ class EventNotificationEmail extends EventNotification
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', ['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('list', ['date', 'message', 'to', 'cc', 'bcc', 'subject', 'attachments']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['date', 'message', 'to', 'subject', 'attachments']); // Attributes to be displayed for a list
 
 		// Search criteria
 		//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -192,7 +192,7 @@ class EventIssue extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -286,7 +286,7 @@ class EventWebService extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -321,7 +321,7 @@ class EventRestService extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -356,7 +356,7 @@ class EventLoginUsage extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -394,7 +394,7 @@ class EventOnObject extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,grant_by_profile,silo",
+			"category" => "core/cmdb,view_in_gui",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",

core/excelbulkexport.class.inc.php

@@ -5,13 +5,13 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\WebPage\Page;
 use Combodo\iTop\Application\WebPage\WebPage;
 
@@ -63,8 +63,6 @@ class ExcelBulkExport extends TabularBulkExport
 				// Export from the command line (or scripted) => default format is SQL, as in previous versions of iTop, unless specified otherwise
 				$this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetSQLFormat(), true, 'raw_data');
 		}
-
-		$this->aStatusInfo['ignore_excel_sanitization'] = (bool)utils::ReadParam('ignore_excel_sanitization', 0, true, utils::ENUM_SANITIZATION_FILTER_INTEGER);
 	}
 
 	public function EnumFormParts()
@@ -123,10 +121,6 @@ class ExcelBulkExport extends TabularBulkExport
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetDate->AddSubBlock($oRadioCustom);
 
-				$oFieldSetSecurity = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:Security'));
-				$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSecurity));
-				$oFieldSetSecurity->AddSubBlock(ExportHelper::GetInputForSanitizeExcelExport());
-
 				$oP->add_ready_script(
 					<<<EOF
 $('#form_part_xlsx_options').on('preview_updated', function() { FormatDatesInPreview('excel', 'xlsx'); });
@@ -222,12 +216,6 @@ EOF
 					}
 				}
 		}
-
-		// If the option to ignore Excel sanitization is not set or absent, sanitize the field
-		if (!(array_key_exists('ignore_excel_sanitization', $this->aStatusInfo)) || $this->aStatusInfo['ignore_excel_sanitization'] === false) {
-			return ExportHelper::SanitizeField($sRet, '');
-		}
-
 		return $sRet;
 	}
 

core/inlineimage.class.inc.php

@@ -298,46 +298,6 @@ N°8681	 * @param string|null $sHtml The HTML fragment to process
 		return $sHtml;
 	}
 
-	/**
-	 * Replace <img> tags with a data-img-id attribute by the actual image in base64 representation
-	 * so that the image can be displayed even if the download URL is not accessible (e.g. in unauthenticated approval templates)
-	 *
-	 * @param string $sHtml The HTML fragment to process
-	 *
-	 * @return String The modified HTML
-	 * @since 3.2.3
-	 */
-	public static function ReplaceInlineImagesWithBase64Representation(string $sHtml): String
-	{
-		return preg_replace_callback(
-			'/<img\s+[^>]*'.static::DOM_ATTR_ID.'="(\d+)"[^>]*>/i',
-			function ($matches) {
-
-				// Extract inline image ID from the tag
-				$id = $matches[1];
-
-				try {
-					// Retrieve inline image
-					$oInline = MetaModel::GetObject(InlineImage::class, $id, true, true);
-					$oOrmDocument = $oInline->Get('contents');
-
-					// Replace src image by the base64 representation
-					$sInlineImageAsBase64 = base64_encode($oOrmDocument->GetData());
-					$sDataUri = 'data:'.$oOrmDocument->GetMimeType().';base64,'.$sInlineImageAsBase64;
-					$sImage = preg_replace('/src=["\'][^"\']+["\']/', 'src="'.$sDataUri.'"', $matches[0]);
-
-					// Remove sensitive information (the image ID and secret) from the tag
-					$sImage = preg_replace('/'.static::DOM_ATTR_ID.'="\d+"\s+'.static::DOM_ATTR_SECRET.'="\w+"/', '', $sImage);
-				} catch (Exception $e) {
-					$sImage = '<img src="" alt="'.Dict::S('UI:MissingInlineImage').'">';
-				}
-
-				return $sImage;
-			},
-			$sHtml
-		);
-	}
-
 	/**
 	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
 	 * so that we can later reconstruct the full "src" URL when needed

core/log.class.inc.php

@@ -691,7 +691,7 @@ abstract class LogAPI
 		static::$m_oMockMetaModelConfig = $oMetaModelConfig;
 	}
 
-	public static function Exception(string $sMessage, throwable $oException, ?string $sChannel = null, array $aContext = []): void
+	public static function Exception(string $sMessage, throwable $oException, string $sChannel = null, array $aContext = []): void
 	{
 		$aErrorLogs = [];
 		$aErrorLogs[] = static::PrepareErrorLog($sMessage, $oException, $aContext);

core/metamodel.class.php

@@ -22,6 +22,7 @@ use Combodo\iTop\Application\EventRegister\ApplicationEvents;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
+use Combodo\iTop\Service\ServiceLocator\ServiceLocator;
 
 require_once APPROOT.'core/modulehandler.class.inc.php';
 require_once APPROOT.'core/querymodifier.class.inc.php';
@@ -142,6 +143,8 @@ abstract class MetaModel
 	 */
 	protected static array $m_aReentranceProtection = [];
 
+	private static ServiceLocator $oServiceLocator;
+
 	/**
 	 * MetaModel constructor.
 	 */
@@ -7026,6 +7029,46 @@ abstract class MetaModel
 			}
 		}
 	}
+
+	/**
+	 * (Re)Init the global service locator with a configuration file
+	 *
+	 * @param string|null $sRelativeConfigFileName default to the runtime config file when null
+	 *
+	 * @return void
+	 * @api
+	 * @since 3.3.0
+	 */
+	public static function InitServiceLocator(string $sRelativeConfigFileName = null): void
+	{
+		if (!isset(self::$oServiceLocator)) {
+			self::$oServiceLocator = new ServiceLocator();
+		}
+
+		// Read the runtime service locator configuration
+		self::$oServiceLocator->Init($sRelativeConfigFileName);
+	}
+
+	/**
+	 * Get configured service using a service locator
+	 *
+	 * Example: $oModelReflection = \MetaModel::GetService('ModelReflexion');
+	 *
+	 * @param string $sServiceName Name of the service to get
+	 *
+	 * @return mixed The service object instance corresponding to the service name
+	 * @throws \Combodo\iTop\Service\ServiceLocator\ServiceLocatorException
+	 * @api
+	 * @since 3.3.0
+	 */
+	public static function GetService(string $sServiceName): mixed
+	{
+		if (!isset(self::$oServiceLocator)) {
+			// Read the runtime service locator configuration
+			self::InitServiceLocator();
+		}
+		return self::$oServiceLocator->get($sServiceName);
+	}
 }
 
 // Standard attribute lists

core/modelreflection.class.inc.php

@@ -24,19 +24,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-/**
- * Exclude the parent class from the list
- *
- * @package     iTopORM
- */
-define('ENUM_CHILD_CLASSES_EXCLUDETOP', 1);
-/**
- * Include the parent class in the list
- *
- * @package     iTopORM
-*/
-define('ENUM_CHILD_CLASSES_ALL', 2);
-
 abstract class ModelReflection
 {
 	abstract public function GetClassIcon($sClass, $bImgTag = true);
@@ -89,9 +76,17 @@ abstract class ModelReflection
 	 * @param string $defaultValue
 	 *
 	 * @return \RunTimeIconSelectionField
+	 * @deprecated since 3.3.0 replaced by GetAvailableIcons
 	 */
 	abstract public function GetIconSelectionField($sCode, $sLabel = '', $defaultValue = '');
 
+	/**
+	 * Find available icons for the current context
+	 *
+	 * @return array of ['value', 'label', 'icon'] where 'value' is the relative path on disk, 'label' the name to display and 'icon' is the URL to get the image
+	 */
+	abstract public function GetAvailableIcons(): array;
+
 	abstract public function GetRootClass($sClass);
 	abstract public function EnumChildClasses($sClass, $iOption = ENUM_CHILD_CLASSES_EXCLUDETOP);
 }
@@ -109,6 +104,8 @@ abstract class QueryReflection
 
 class ModelReflectionRuntime extends ModelReflection
 {
+	private static array $aAllIcons = [];
+
 	public function __construct()
 	{
 	}
@@ -255,6 +252,52 @@ class ModelReflectionRuntime extends ModelReflection
 		return new RunTimeIconSelectionField($sCode, $sLabel, $defaultValue);
 	}
 
+	public function GetAvailableIcons(): array
+	{
+		$aFolderList = [
+			APPROOT.'env-'.utils::GetCurrentEnvironment() => utils::GetAbsoluteUrlModulesRoot(),
+			APPROOT.'images/icons' => utils::GetAbsoluteUrlAppRoot().'images/icons',
+		];
+		if (count(self::$aAllIcons) == 0) {
+			foreach ($aFolderList as $sFolderPath => $sUrlPrefix) {
+				$aIcons = self::FindIconsOnDisk($sFolderPath);
+				ksort($aIcons);
+
+				foreach ($aIcons as $sFilePath) {
+					self::$aAllIcons[] = ['value' => $sFilePath, 'label' => basename($sFilePath), 'icon' => $sUrlPrefix.$sFilePath];
+				}
+			}
+		}
+
+		return self::$aAllIcons;
+	}
+
+	private static function FindIconsOnDisk(string $sBaseDir, string $sDir = '', array &$aFilesSpecs = []): array
+	{
+		$aResult = [];
+		// Populate automatically the list of icon files
+		if ($hDir = @opendir($sBaseDir.'/'.$sDir)) {
+			while (($sFile = readdir($hDir)) !== false) {
+				$aMatches = [];
+				if (($sFile != '.') && ($sFile != '..') && ($sFile != 'lifecycle') && is_dir($sBaseDir.'/'.$sDir.'/'.$sFile)) {
+					$sDirSubPath = ($sDir == '') ? $sFile : $sDir.'/'.$sFile;
+					$aResult = array_merge($aResult, self::FindIconsOnDisk($sBaseDir, $sDirSubPath, $aFilesSpecs));
+				}
+				$sSize = filesize($sBaseDir.'/'.$sDir.'/'.$sFile);
+				if (isset($aFilesSpecs[$sFile]) && $aFilesSpecs[$sFile] == $sSize) {
+					continue;
+				}
+				if (preg_match('/\.(png|jpg|jpeg|gif|svg)$/i', $sFile, $aMatches)) { // png, jp(e)g, gif and svg are considered valid
+					$aResult[$sFile.'_'.$sDir] = $sDir.'/'.$sFile;
+					$aFilesSpecs[$sFile] = $sSize;
+				}
+			}
+			closedir($hDir);
+		}
+
+		return $aResult;
+	}
+
 	public function GetRootClass($sClass)
 	{
 		return MetaModel::GetRootClass($sClass);

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

@@ -1656,7 +1656,7 @@ class PHP_ParserGenerator_Data
     function emit_code($out, PHP_ParserGenerator_Rule $rp, &$lineno)
     {
         $linecnt = 0;
-
+        
         /* Generate code to do the reduce action */
         if ($rp->code) {
             $this->tplt_linedir($out, $rp->line, $this->filename);

core/oql/oql-parser.php

@@ -1084,7 +1084,7 @@ static public $yy_action = array(
     function yy_find_shift_action($iLookAhead)
     {
         $stateno = $this->yystack[$this->yyidx]->stateno;
-
+     
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
         if (!isset(self::$yy_shift_ofst[$stateno])) {
             // no shift actions
@@ -1767,7 +1767,7 @@ throw new OQLParserParseFailureException($this->m_sSourceQuery, $this->m_iLine,
     function yy_syntax_error($yymajor, $TOKEN)
     {
 #line 25 "..\oql-parser.y"
-
+ 
 throw new OQLParserSyntaxErrorException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol, $this->tokenName($yymajor), $TOKEN);
 #line 1779 "..\oql-parser.php"
     }
@@ -1806,7 +1806,7 @@ throw new OQLParserSyntaxErrorException($this->m_sSourceQuery, $this->m_iLine, $
 //        $yyact;            /* The parser action. */
 //        $yyendofinput;     /* True if we are at the end of input */
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-
+        
         /* (re)initialize the parser, if necessary */
         if ($this->yyidx === null || $this->yyidx < 0) {
             /* if ($yymajor == 0) return; // not sure why this was here... */
@@ -1819,7 +1819,7 @@ throw new OQLParserSyntaxErrorException($this->m_sSourceQuery, $this->m_iLine, $
             array_push($this->yystack, $x);
         }
         $yyendofinput = ($yymajor==0);
-
+        
         if (self::$yyTraceFILE) {
             fprintf(
                 self::$yyTraceFILE,
@@ -1828,7 +1828,7 @@ throw new OQLParserSyntaxErrorException($this->m_sSourceQuery, $this->m_iLine, $
                 self::$yyTokenName[$yymajor]
             );
         }
-
+        
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
             if ($yymajor < self::YYERRORSYMBOL
@@ -2002,7 +2002,7 @@ class OQLParser extends OQLParserRaw
 		$this->m_sSourceQuery = $sQuery;
 		// no constructor - parent::__construct();
 	}
-
+	
 	public function doParse($token, $value, $iCurrPosition = 0)
 	{
 		$this->m_iColPrev = $this->m_iCol;
@@ -2016,7 +2016,7 @@ class OQLParser extends OQLParserRaw
 		$this->doParse(0, 0);
 		return $this->my_result;
 	}
-
+	
 	public function __destruct()
 	{
 		// Bug in the original destructor, causing an infinite loop !

core/ormcaselog.class.inc.php

@@ -370,7 +370,7 @@ class ormCaseLog
 	/**
 	 * Produces an HTML representation, aimed at being used within the iTop framework
 	 */
-	public function GetAsHTML(?WebPage $oP = null, $bEditMode = false, $aTransfoHandler = null)
+	public function GetAsHTML(WebPage $oP = null, $bEditMode = false, $aTransfoHandler = null)
 	{
 		$bPrintableVersion = (utils::ReadParam('printable', '0') == '1');
 

core/ormdocument.class.inc.php

@@ -350,22 +350,20 @@ class ormDocument
 			if (!is_object($oObj)) {
 				// If access to the document is not granted, check if the access to the host object is allowed
 				$oObj = MetaModel::GetObject($sClass, $id, false, true);
-				$bHasHostRights = false;
 				if ($oObj instanceof Attachment) {
 					$sItemClass = $oObj->Get('item_class');
 					$sItemId = $oObj->Get('item_id');
 					$oHost = MetaModel::GetObject($sItemClass, $sItemId, false, false);
-					if (is_object($oHost)) {
-						$bHasHostRights = true;
+					if (!is_object($oHost)) {
+						$oObj = null;
 					}
 				}
-
-				// We could neither read the object nor get a host object matching our rights
-				if ($bHasHostRights !== true) {
+				if (!is_object($oObj)) {
 					throw new Exception("Invalid id ($id) for class '$sClass' - the object does not exist or you are not allowed to view it");
 				}
 			}
-			if (($sSecretField != null) && !hash_equals($oObj->Get($sSecretField), $sSecretValue)) {
+			if (($sSecretField != null) && ($oObj->Get($sSecretField) != $sSecretValue)) {
+				usleep(200);
 				throw new Exception("Invalid secret for class '$sClass' - the object does not exist or you are not allowed to view it");
 			}
 			/** @var \ormDocument $oDocument */

core/ormlinkset.class.inc.php

@@ -93,7 +93,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * @param DBObjectSet|null $oOriginalSet
 	 * @throws Exception
 	 */
-	public function __construct($sHostClass, $sAttCode, ?DBObjectSet $oOriginalSet = null)
+	public function __construct($sHostClass, $sAttCode, DBObjectSet $oOriginalSet = null)
 	{
 		$this->sHostClass = $sHostClass;
 		$this->sAttCode = $sAttCode;
@@ -470,6 +470,17 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 				|| ($this->oOriginalSet->GetFilter()->ToOQL() == $oFellow->oOriginalSet->GetFilter()->ToOQL())) {
 				$bUpdateFromDelta = true;
 			}
+		} else {
+			//@since 3.2.2 N°2364 - API : remove old linkedset persistance
+			/* Goo pattern to use:
+			* $oCISet = $oTicket->Get(‘functioncis_list’);
+			* $oCISet->AddItem(MetaModel::NewObject(‘lnkFunctionCIToTicket’, array(‘ci_id’=> 12345));
+			* $oCISet->RemoveItem(123456);
+			* $oTicket->Set(‘functionalcis_list’, $oCISet);
+			 */
+			if (!ContextTag::Check(ContextTag::TAG_SETUP)) {
+				DeprecatedCallsLog::NotifyDeprecatedPhpMethod('old pattern - please get previous value of the linked set, modify it and set it back to the host object');
+			}
 		}
 
 		if ($bUpdateFromDelta) {

core/userrights.class.inc.php

@@ -1182,7 +1182,7 @@ class UserRights
 			return self::$m_oUser->GetKey();
 		} else {
 			// find the id out of the login string
-			$oUser = self::FindUser($sLogin, bAllowDisabledUsers: true);
+			$oUser = self::FindUser($sLogin);
 			if (is_null($oUser)) {
 				return null;
 			}
@@ -1375,7 +1375,7 @@ class UserRights
 		if (empty($sLogin)) {
 			$oUser = self::$m_oUser;
 		} else {
-			$oUser = self::FindUser($sLogin, bAllowDisabledUsers: true);
+			$oUser = self::FindUser($sLogin);
 		}
 		if (is_null($oUser)) {
 			return '';

css/backoffice/_shame.scss

@@ -56,8 +56,6 @@ $ibo-shame--slider--is-round--border-radius: 20px !default;
 $ibo-shame--slider--is-round--before--border-radius: 7px !default;
 
 
-$ibo-blockquote--color: $ibo-body-text-color !default;
-
 // N°2847 - Recolor svg illustrations with iTop's primary color
 .ibo-svg-illustration--container > svg *[fill="#6c63ff"]{
 	fill: $ibo-svg-illustration--fill;
@@ -128,11 +126,3 @@ input:checked + .slider:before {
 .slider.round:before {
   border-radius: $ibo-shame--slider--is-round--before--border-radius;
 }
-
-/*
-  Bulma sets blockquote background color through a variable, it affects ckeditor and html display.
-  This rule is needed harmonize the blockquote text color in both contexts.
- */
-.ibo-is-html-content blockquote {
-  color: $ibo-blockquote--color;
-}

css/backoffice/application/bulk/_all.scss

@@ -4,4 +4,3 @@
  */
 
 @import "bulk-modify";
-@import "bulk-export";

css/backoffice/application/bulk/_bulk-export.scss

@@ -1,10 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-#form_part_csv_options:has(#ibo-sanitize-excel-export--input:checked), #form_part_xlsx_options:has(#ibo-sanitize-excel-export--input:checked){
-  #ibo-sanitize-excel-export--alert {
-    display: none;
-  }
-}

css/backoffice/blocks-integrations/dashlet/_dashlet-within-dashboard.scss

@@ -20,4 +20,213 @@ $ibo-dashlet-within-dashboard--dashlet-header-static--margin-top--is-not-first-d
       }
     }
   }
-}
+}
+
+// TODO 3.3: This css is for dashboard editor demo purpose and needs to be updated
+
+ibo-dashboard[data-edit-mode="edit"]{
+  ibo-dashlet .ibo-dashlet{
+    pointer-events: none;
+  }
+}
+
+
+ibo-dashlet{
+  // do not apply to this dashlets
+  container-type: inline-size;
+  
+  &:not([data-dashlet-type="DashletBadge"]):not([data-dashlet-type="DashletHeaderStatic"]){
+    border: 1px solid #ccd4db;
+    border-radius: 5px;
+    background-color: white;
+    padding: 16px;
+    &::before {
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: block;
+        background-color: $ibo-color-blue-800;
+        content: "";
+        width: 100%;
+        height: 8px;
+        padding-bottom: 8px;
+    }
+  }
+
+  // Make the dashlet body take all the available height to allow scrollbars when needed
+  .ibo-dashlet > .ibo-content-block{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    row-gap: 10px;
+    .ibo-panel--header{
+      align-items: flex-start;
+    }
+    > .ibo-panel--body{
+      flex-grow: 1;
+      overflow: auto;
+    }
+  }
+}
+
+
+ibo-dashlet[data-dashlet-type="DashletBadge"] {
+  .ibo-dashlet-badge{
+    max-width: unset;
+  }
+  .ibo-dashlet-badge--body{
+    height: 100%;
+    display: flex;
+  }
+  
+  @container (width < 175px) {
+    .ibo-dashlet-badge--action-list-label, .ibo-dashlet-badge--action-create-label {
+      display: none;
+    }
+  }
+}
+
+ibo-dashboard[data-edit-mode="edit"] ibo-dashlet[data-dashlet-type="DashletHeaderStatic"]{
+  border: 1px solid #ccd4db;
+  background-color: $ibo-color-grey-100;
+  border-radius: 3px;
+  > .ibo-content-block{
+    display: flex;
+    align-items: center;
+    > .ibo-dashlet-header-static{
+      padding: 0;
+      width: 100%;
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletHeaderDynamic"] {
+  > .ibo-content-block > .ibo-content-block{
+    .ibo-panel--body{
+      border: none;
+      padding: 0;
+      &:before{
+        display: none;
+      }
+      .ibo-panel-boy{
+        flex-grow: 1;
+        overflow-y: scroll;
+      }
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletObjectList"] {
+  overflow-y: hidden!important;
+
+  > .ibo-dashlet > .ibo-content-block >  .ibo-content-block{
+    display: flex;
+    max-height: 100%;
+    flex-direction: column;
+
+    .dataTables_wrapper{
+      height: 100%;
+
+      .dataTables_scroll{
+        max-height: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+        .dataTables_scrollHead{
+          overflow: hidden;
+          position: relative;
+          border: 0px;
+          width: 100%;
+          flex-shrink: 0;
+        }
+
+        .dataTables_scrollBody{
+          max-height: unset!important;
+        }
+      }
+    }
+  }
+
+  .ibo-panel--body{
+    margin: 0 -16px;
+    border: none;
+    padding: 0;
+    padding-top: 16px;
+    &:before{
+      display: none;
+    }
+    .ibo-datatable{
+      margin-top: 10px;
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletGroupByTable"] {
+  overflow-y: hidden!important;
+
+  > .ibo-dashlet > .ibo-content-block >  .ibo-content-block{
+    display: flex;
+    max-height: 100%;
+    flex-direction: column;
+
+    .dataTables_wrapper{
+      height: 100%;
+
+      .dataTables_scroll{
+        max-height: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+        .dataTables_scrollHead{
+          overflow: hidden;
+          position: relative;
+          border: 0;
+          width: 100%;
+          flex-shrink: 0;
+        }
+
+        .dataTables_scrollBody{
+          max-height: unset!important;
+        }
+      }
+    }
+
+    .ibo-panel--body{
+      margin: 0 -16px;
+      border: none;
+      padding: 0;
+      padding-top: 16px;
+      &:before{
+        display: none;
+      }
+      .ibo-datatable{
+        margin-top: 10px;
+      }
+    }
+
+  }
+}
+
+
+ibo-dashlet[data-dashlet-type="DashletGroupByPie"] {
+  .ibo-panel--body {
+    border: none;
+    padding: 0;
+    &:before {
+      display: none;
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletGroupByBars"] {
+  .ibo-panel--body {
+    border: none;
+    padding: 0;
+    &:before {
+      display: none;
+    }
+  }
+}
+

css/backoffice/components/_form.scss

@@ -75,3 +75,27 @@ collection-entry-element {
   resize: vertical;
 }
 
+.ibo-form-compact{
+
+  .ibo-field{
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+
+    .ibo-field--label{
+      min-width: 100px;
+      max-width: unset;
+      width: unset;
+    }
+
+    .ibo-input-type-checkbox{
+      align-self: flex-start;
+    }
+
+    .ibo-input-type-date{
+      display: block;
+    }
+}
+
+}
+

css/backoffice/components/_panel.scss

@@ -72,12 +72,9 @@ $ibo-panel--icon--spacing--as-medallion--is-sticking: $ibo-panel--icon--spacing-
 $ibo-panel--icon--bottom--as-medallion--is-sticking: -12px !default;
 $ibo-panel--icon--border--as-medallion--is-sticking: 1px $ibo-panel--base-border-style $ibo-panel--base-border-color !default;
 
-$ibo-panel--icon-background--size--must-contain: contain !default; // deprecated, to be removed in favor of $ibo-panel--icon-img--size--must-contain
-$ibo-panel--icon-background--size--must-cover: cover !default; // deprecated, to be removed in favor of $ibo-panel--icon-img--size--must-cover
-$ibo-panel--icon-background--size--must-zoomout: 66.67% !default; // deprecated, to be removed in favor of $ibo-panel--icon-img--size--must-zoomout
-$ibo-panel--icon-img--size--must-contain: $ibo-panel--icon-background--size--must-contain !default; // TODO remove when dealing with N°9317
-$ibo-panel--icon-img--size--must-cover: $ibo-panel--icon-background--size--must-cover !default; // TODO remove when dealing with N°9317
-$ibo-panel--icon-img--size--must-zoomout: $ibo-panel--icon-background--size--must-zoomout !default; // TODO remove when dealing with N°9317
+$ibo-panel--icon-background--size--must-contain: contain !default;
+$ibo-panel--icon-background--size--must-cover: cover !default;
+$ibo-panel--icon-background--size--must-zoomout: 66.67% !default;
 
 $ibo-panel--title--font-size--is-sticking: $ibo-font-size-150 !default;
 $ibo-panel--title--color: $ibo-color-grey-900 !default;
@@ -182,29 +179,24 @@ $ibo-panel--is-selectable--body--after--font-size: $ibo-font-size-700 !default;
   min-height: $ibo-panel--icon--size;
 }
 
-.ibo-panel--icon-img, .ibo-panel--icon-background { // second class is deprecated, remove it when dealing with N°9317
+.ibo-panel--icon-background {
   width: 100%;
   height: 100%;
-  object-position: center;
-  object-fit: $ibo-panel--icon-img--size--must-contain;
   background-position: center;
   background-repeat: no-repeat;
-  background-size: $ibo-panel--icon-img--size--must-contain;
+  background-size: $ibo-panel--icon-background--size--must-contain;
 }
 
-.ibo-panel--icon-img--must-contain, .ibo-panel--icon-background--must-contain { // second class is deprecated, remove it when dealing with N°9317
-  object-fit: $ibo-panel--icon-img--size--must-contain;
-  background-size: $ibo-panel--icon-img--size--must-contain;
+.ibo-panel--icon-background--must-contain {
+  background-size: $ibo-panel--icon-background--size--must-contain;
 }
 
-.ibo-panel--icon-img--must-cover, .ibo-panel--icon-background--must-cover { // second class is deprecated, remove it when dealing with N°9317
-  object-fit: $ibo-panel--icon-img--size--must-cover;
-  background-size: $ibo-panel--icon-img--size--must-cover;
+.ibo-panel--icon-background--must-cover {
+  background-size: $ibo-panel--icon-background--size--must-cover;
 }
 
-.ibo-panel--icon-img--must-zoomout, .ibo-panel--icon-background--must-zoomout { // second class is deprecated, remove it when dealing with N°9317
-  width: $ibo-panel--icon-img--size--must-zoomout;
-  height: $ibo-panel--icon-img--size--must-zoomout;
+.ibo-panel--icon-background--must-zoomout {
+  background-size: $ibo-panel--icon-background--size--must-zoomout;
 }
 
 .ibo-panel--title {

css/backoffice/components/_quick-create.scss

@@ -247,8 +247,7 @@ $ibo-quick-create--compartment--placeholder-hint--text-color: $ibo-color-grey-70
 
     &:hover {
       cursor: pointer;
-      color: $ibo-hyperlink-color--on-hover;
-      text-decoration: $ibo-hyperlink-text-decoration--on-hover;
+      @extend a;
     }
 
     .highlight {

css/backoffice/components/_search-form.scss

@@ -21,8 +21,6 @@ $ibo-search-form-panel--more-criteria--color: $ibo-color-blue-grey-800 !default;
 $ibo-search-form-panel--more-criteria--background-color: $ibo-color-white-100 !default;
 $ibo-search-form-panel--more-criteria--icon--color: $ibo-color-primary-600 !default;
 $ibo-search-form-panel--more-criteria--border-color: $ibo-search-form-panel--criteria--border-color !default;
-// calc is redundant but avoid SCSS min() from being used instead of CSS min()
-$ibo-search-form-panel--criteria--max-height: calc(min(#{$ibo-size-750}, 50vh)) !default;
 
 $ibo-search-form-panel--items--hover--color: $ibo-color-grey-200 !default;
 
@@ -280,10 +278,9 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 				}
 
 				.sfc_form_group {
-                  display: flex;
-                  flex-direction: column;
-                  margin-top: -1px;
-                  z-index: -1;
+          display: block;
+          margin-top: -1px;
+          z-index: -1;
         }
 			}
 
@@ -349,15 +346,11 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
         display: none;
         max-width: 450px;
         width: max-content;
-        max-height: $ibo-search-form-panel--criteria--max-height;
+        max-height: 520px;
         overflow-x: auto;
         overflow-y: hidden;
 
 				.sfc_fg_operators {
-                    display: flex;
-                    flex-direction: column;
-                    overflow: auto;
-                    min-height: 0;
 					font-size: 12px;
 
 					.sfc_fg_operator {
@@ -394,9 +387,6 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 						}
 
 						.sfc_opc_multichoices {
-                            display: flex;
-                            flex-direction: column;
-                            height: 100%;
 							label > input {
 								vertical-align: text-top;
 								margin-left: $ibo-spacing-0;
@@ -408,6 +398,7 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 							}
 
 							.sfc_opc_mc_items_wrapper {
+								max-height: 415px; /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
 								overflow-y: auto;
 								margin: $ibo-spacing-0 -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
 
@@ -569,14 +560,8 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 			&.search_form_criteria_enum {
 				.sfc_form_group {
 					.sfc_fg_operator_in {
-                        display: flex;
-                        flex-direction: column;
-                        height: 100%;
-                        min-height: 0;
 						> label {
-							display: flex;
-                            height: 100%;
-                            min-height: 0;
+							display: inline-block;
 							width: 100%;
 							line-height: initial;
 							white-space: nowrap;

css/backoffice/components/_title.scss

@@ -11,12 +11,9 @@ $ibo-title--icon--size: 90px !default;
 $ibo-title--icon--size-2: 80px !default;
 $ibo-title--icon--size-3: 70px !default;
 
-$ibo-title--icon-background--size--must-contain: contain !default; // deprecated, to be removed in favor of $ibo-title--icon-img--size--must-contain
-$ibo-title--icon-background--size--must-cover: cover !default; // deprecated, to be removed in favor of $ibo-title--icon-img--size--must-cover
-$ibo-title--icon-background--size--must-zoomout: 66.67% !default; // deprecated, to be removed in favor of $ibo-title--icon-img--size--must-zoomout
-$ibo-title--icon-img--size--must-contain: $ibo-title--icon-background--size--must-contain !default; // TODO remove when dealing with N°9317
-$ibo-title--icon-img--size--must-cover: $ibo-title--icon-background--size--must-cover !default; // TODO remove when dealing with N°9317
-$ibo-title--icon-img--size--must-zoomout: $ibo-title--icon-background--size--must-zoomout !default; // TODO remove when dealing with N°9317
+$ibo-title--icon-background--size--must-contain: contain !default;
+$ibo-title--icon-background--size--must-cover: cover !default;
+$ibo-title--icon-background--size--must-zoomout: 66.67% !default;
 
 
 .ibo-title {
@@ -47,27 +44,24 @@ $ibo-title--icon-img--size--must-zoomout: $ibo-title--icon-background--size--mus
   min-height: $ibo-title--icon--size-3;
 }
 
-.ibo-title--icon-img, .ibo-title--icon-background { // second class is deprecated, remove it when dealing with N°9317
+.ibo-title--icon-background {
   width: 100%;
   height: 100%;
-  object-position: center;
-  object-fit: $ibo-title--icon-img--size--must-contain;
-  background-size: $ibo-title--icon-img--size--must-contain;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: $ibo-title--icon-background--size--must-contain;
 }
 
-.ibo-title--icon-img--must-contain, .ibo-title--icon-background--must-contain { // second class is deprecated, remove it when dealing with N°9317
-  object-fit: $ibo-title--icon-img--size--must-contain;
-  background-size: $ibo-title--icon-img--size--must-contain;
+.ibo-title--icon-background--must-contain {
+  background-size: $ibo-title--icon-background--size--must-contain;
 }
 
-.ibo-title--icon-img--must-cover, .ibo-title--icon-background--must-cover { // second class is deprecated, remove it when dealing with N°9317
-  object-fit: $ibo-title--icon-img--size--must-cover;
-  background-size: $ibo-title--icon-img--size--must-cover;
+.ibo-title--icon-background--must-cover {
+  background-size: $ibo-title--icon-background--size--must-cover;
 }
 
-.ibo-title--icon-img--must-zoomout, .ibo-title--icon-background--must-zoomout { // second class is deprecated, remove it when dealing with N°9317
-  width: $ibo-title--icon-img--size--must-zoomout;
-  height: $ibo-title--icon-img--size--must-zoomout;
+.ibo-title--icon-background--must-zoomout {
+  background-size: $ibo-title--icon-background--size--must-zoomout;
 }
 
 .ibo-title--for-object-details {

css/backoffice/components/dashlet/_dashlet.scss

@@ -19,7 +19,10 @@ $ibo-dashlet-blocker--height: 100% !default;
 .ibo-dashlet {
   position: relative;
   width: calc(#{$ibo-dashlet--width} - #{$ibo-dashlet--elements-spacing-x});
-  margin: calc(#{$ibo-dashlet--elements-spacing-y} / 2) calc(#{$ibo-dashlet--elements-spacing-x} / 2);
+  //margin: calc(#{$ibo-dashlet--elements-spacing-y} / 2) calc(#{$ibo-dashlet--elements-spacing-x} / 2);
+
+  height: 100% !important;
+  width: 100% !important;
 
   &.dashlet-selected {
     position: relative;
@@ -38,4 +41,21 @@ $ibo-dashlet-blocker--height: 100% !default;
   width: $ibo-dashlet-blocker--width;
   height: $ibo-dashlet-blocker--height;
   cursor: not-allowed;
+}
+
+.ibo-dashlet--actions {
+  position: absolute;
+  z-index: 1000;
+  top: 0px;
+  right: 0px;
+  display: none;
+  padding: 4px;
+  border-radius: 4px;
+
+  background-color: $ibo-color-white-100;
+  @extend %ibo-elevation-100;
+}
+
+ibo-dashlet[data-edit-mode="edit"] {
+  z-index: 3;
 }

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

@@ -54,3 +54,32 @@ $ibo-input-select-icon--menu--icon--margin-right: 10px !default;
 		}
 	}
 }
+
+.ts-control > .ibo-input-select-icon--menu--item{
+
+  display: flex;
+  column-gap: 5px;
+  align-items: center;
+  padding: 5px 0;
+
+  > img{
+    width: 20px;
+  }
+
+  &:hover{
+    background: transparent;
+  }
+
+}
+
+.ts-dropdown > .ts-dropdown-content > .ibo-input-select-icon--menu--item{
+
+  display: flex;
+  column-gap: 5px;
+  align-items: center;
+
+  > img{
+    width: 32px;
+  }
+
+}

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

@@ -203,9 +203,8 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
 }
 
 // N°7982 Default selectize stylesheet override
-// N°9468 Dropdown content needs to be a few pixel shorter than the dropdown itself to avoid double scrollbar
 .selectize-dropdown-content{
-  max-height: calc(#{$ibo-input-select-selectize--dropdown--max-height} - 4px);
+  max-height: $ibo-input-select-selectize--dropdown--max-height;
 }
 
 .selectize-dropdown.ui-menu .ui-state-active {

css/backoffice/layout/_all.scss

@@ -15,3 +15,4 @@
 @import "wizard-container/wizard-container";
 @import "object/all";
 @import "activity-panel/all";
+@import "dashlet-panel/all";

css/backoffice/layout/dashboard/_dashboard.scss

@@ -175,3 +175,78 @@ input:checked + .ibo-dashboard--slider:before {
 input:checked + .ibo-dashboard--slider:after {
   content: $ibo-dashboard--slider--before--content;
 }
+
+// TODO 3.3 Cleanup variables
+// TODO 3.3 Move to vendor what's from gridstack
+
+
+.grid-stack {
+  display: block;
+}
+
+.ibo-dashboard[data-edit-mode="edit"] .grid-stack{
+  background-size: calc(100% / 12) var(--gs-cell-height);
+  background-color: $ibo-color-white-100;
+  background-image: linear-gradient(to right, $ibo-color-white-200 8px, transparent 8px), linear-gradient(to bottom, $ibo-color-white-200 8px, transparent 8px);
+  --gs-item-margin-top: 8px;
+  --gs-item-margin-bottom: 0;
+  --gs-item-margin-right: 0;
+  --gs-item-margin-left: 8px;
+}
+
+ibo-dashboard[data-edit-mode="view"] {
+  .ibo-dashboard--form {
+    display: none;
+  }
+}
+
+.ibo-dashboard--form {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+
+  height: 55px;
+  background-color: $ibo-color-blue-200;
+  margin: -16px -36px 24px -36px;
+  padding: 0 36px;
+}
+
+.ibo-dashboard--form--inputs {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 12px;
+
+  @extend %common-font-ral-med-250;
+
+  > [name="dashboard_title"] {
+    width: 300px;
+  }
+
+}
+
+.ibo-dashboard[data-edit-mode="edit"] ibo-dashlet:not([data-edit-mode="edit"]):hover .ibo-dashlet--actions {
+  display: block;
+}
+
+.ibo-dashboard[data-edit-mode="error"] .grid-stack{
+  background-image: url($approot-relative + '/images/alpha-fatal-error.gif');
+}
+
+// Our edit mode dashboard already has its own header, so we hide the standard one
+#ibo-page-header:has(+ ibo-dashboard[data-edit-mode="edit"]) {
+  display: none;
+}
+
+.ibo-dashboard[data-edit-mode="edit"] .ibo-dashboard--grid:has(ibo-dashboard-grid-slot > ibo-dashlet[data-edit-mode="edit"]) .ibo-dashboard--grid--backdrop {
+
+  position: absolute;
+  height: calc(100% + 24px);
+  // 36px is $ibo-page-container--elements-padding-x, handle variable resolution
+  width: calc(100% + 36px + 36px);
+  margin: -24px -#{36px} 0 -#{36px};
+  background-color: $ibo-color-grey-400;
+  z-index: 2;
+  opacity: 60%;
+}

css/backoffice/layout/dashlet-panel/_all.scss

@@ -0,0 +1,2 @@
+@import "dashlet-entry";
+@import "dashlet-panel";

css/backoffice/layout/dashlet-panel/_dashlet-entry.scss

@@ -0,0 +1,51 @@
+// TODO 3.3 Cleanup variables
+
+.ibo-dashlet-entry {
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+
+
+  border: 1px solid $ibo-color-grey-300;
+  border-radius: 5px;
+  padding: 12px;
+  background-color: $ibo-color-grey-100;
+
+  cursor: pointer;
+  text-align: left;
+
+  &:hover {
+    background-color: $ibo-color-grey-200;
+    border-color: $ibo-color-grey-400;
+  }
+  &:active {
+    background-color: $ibo-color-grey-50;
+    border-color: $ibo-color-grey-500;
+  }
+}
+
+.ibo-dashlet-entry--icon {
+  flex-shrink: 0;
+  height: 36px;
+  width: 36px;
+}
+
+.ibo-dashlet-entry--content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  overflow-x: hidden;
+  gap: 4px;
+}
+
+.ibo-dashlet-entry--title {
+  font-size: 14px;
+  font-weight: 600;
+  color: $ibo-color-grey-900;
+}
+
+.ibo-dashlet-entry--description {
+  font-size: 12px;
+  color: $ibo-color-grey-700;
+
+}

css/backoffice/layout/dashlet-panel/_dashlet-panel.scss

@@ -0,0 +1,66 @@
+// TODO 3.3 Cleanup variables
+
+.ibo-dashlet-panel {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  width: 326px;
+  background-color: $ibo-color-white-100;
+}
+
+.ibo-dashlet-panel--title {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+
+  height: 55px;
+  background-color: $ibo-color-white-200;
+  padding: 0 16px;
+  flex-grow: 0;
+  @extend %common-font-ral-med-300;
+}
+
+.ibo-dashlet-panel--entries, .ibo-dashlet-panel--form-container {
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
+
+  padding: 16px;
+  gap: 12px;
+  &.ibo-is-hidden {
+    display: none;
+  }
+}
+
+.ibo-center-container:has(ibo-dashboard[data-edit-mode="view"]) .ibo-dashlet-panel{
+  display: none;
+}
+
+.ibo-dashlet-panel--form-container turbo-frame {
+ height: 100%;
+}
+.ibo-dashlet-panel--form-container .ibo-form {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  > .form {
+    overflow: auto;
+    margin-bottom: 16px;
+  }
+}
+
+.ibo-dashlet-panel--form-container--buttons {
+  display: flex;
+  flex-direction: row !important;
+  justify-content: end;
+  align-items: center;
+
+  margin: 0 -16px -16px -16px;
+  padding: 0 16px;
+  min-height: 60px;
+
+  background-color: $ibo-color-grey-50;
+  border-top: solid 1px $ibo-color-grey-400;
+}

css/backoffice/pages/_datamodel-viewer.scss

@@ -3,29 +3,9 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-datamodel-viewer--viewer-empty--width: max(20%, #{$ibo-size-700}) !default;
-
 $ibo-datamodel-viewer--parent--spacer--padding-y: $ibo-spacing-0 !default;
 $ibo-datamodel-viewer--parent--spacer--padding-x: $ibo-spacing-300 !default;
 
-$ibo-datamodel-viewer--breadcrumb--margin: $ibo-spacing-200 0 !default;
-
-$ibo-datamodel-viewer--classname--font-family: monospace !default;
-$ibo-datamodel-viewer--classname--color: $ibo-color-blue-grey-600 !default;
-
-$ibo-datamodel-viewer--tag--category--color: $ibo-color-blue-grey-800 !default;
-$ibo-datamodel-viewer--tag--category--icon--color: $ibo-color-blue-grey-600 !default;
-
-$ibo-datamodel-viewer--abstract-class-icon--margin-right: $ibo-spacing-300 !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--content: 'A' !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--width: 15px !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--height: 15px !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--line-height: 14px !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--border-radius: 50% !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--border: 1px solid $ibo-color-cyan-500 !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--color: $ibo-color-white-100 !default;
-$ibo-datamodel-viewer--abstract-class-icon--after--background-color: $ibo-color-cyan-500 !default;
-
 $ibo-datamodel-viewer--classes-list--selectize-input--background-color: $ibo-color-white-100 !default;
 $ibo-datamodel-viewer--classes-list--selectize-input--color: $ibo-color-grey-800 !default;
 $ibo-datamodel-viewer--classes-list--selectize-input--border-color: $ibo-color-grey-500 !default;
@@ -36,9 +16,8 @@ $ibo-datamodel-viewer--origin-cell--diameter: 8px !default;
 $ibo-datamodel-viewer--origin-cell--border-radius: $ibo-border-radius-full !default;
 
 $ibo-datamodel-viewer--classes-list--height: 100% !default;
-$ibo-datamodel-viewer--classes-list--width: $ibo-size-700 !default;
+$ibo-datamodel-viewer--classes-list--width: 350px !default;
 $ibo-datamodel-viewer--classes-list--padding-left: $ibo-spacing-600 !default;
-$ibo-datamodel-viewer--classes-list--padding-top: $ibo-spacing-300 !default;
 
 $ibo-datamodel-viewer--lifecycle--code--color: $ibo-color-grey-700 !default;
 $ibo-datamodel-viewer--lifecycle--stimuli--color: $ibo-color-blue-900 !default;
@@ -66,56 +45,6 @@ $ibo-datamodel-viewer--lifecycle-image--margin-bottom: $ibo-spacing-500 !default
   .ibo-panel--subtitle{
     @extend %ibo-font-ral-nor-150;
   }
-  .ibo-datamodel-viewer--empty{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    svg{
-      width: $ibo-datamodel-viewer--viewer-empty--width;
-    }
-  }
-}
-
-.ibo-datamodel-viewer--empty--text {
-  @extend %ibo-font-ral-med-400
-}
-
-.ibo-datamodel-viewer--breadcrumb{
-  @extend %ibo-font-ral-med-150;
-  margin: $ibo-datamodel-viewer--breadcrumb--margin;
-  .ibo-button{
-    text-transform: none; // unset uppercase
-  }
-}
-
-.ibo-datamodel-viewer--classname{
-  color: $ibo-datamodel-viewer--classname--color;
-  @extend %ibo-font-code-100;
-}
-
-.ibo-datamodel-viewer--tag--category{
-  color: $ibo-datamodel-viewer--tag--category--color;
-  .ibo-object-details--tag-icon{
-    color:$ibo-datamodel-viewer--tag--category--icon--color;
-  }
-}
-
-.ibo-datamodel-viewer--icon--abstract{
-  &:after{
-    content: $ibo-datamodel-viewer--abstract-class-icon--after--content;
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-    width: $ibo-datamodel-viewer--abstract-class-icon--after--width;
-    height: $ibo-datamodel-viewer--abstract-class-icon--after--height;
-    line-height: $ibo-datamodel-viewer--abstract-class-icon--after--line-height;
-    border-radius: $ibo-datamodel-viewer--abstract-class-icon--after--border-radius;
-    border: $ibo-datamodel-viewer--abstract-class-icon--after--border;
-    color: $ibo-datamodel-viewer--abstract-class-icon--after--color;
-    background-color: $ibo-datamodel-viewer--abstract-class-icon--after--background-color;
-
-    @extend %ibo-font-ral-bol-50;
-  }
 }
 
 .ibo-datamodel-viewer--parent--spacer{
@@ -151,7 +80,6 @@ $ibo-datamodel-viewer--lifecycle-image--margin-bottom: $ibo-spacing-500 !default
   height: $ibo-datamodel-viewer--classes-list--height;
   width: $ibo-datamodel-viewer--classes-list--width;
   padding-left: $ibo-datamodel-viewer--classes-list--padding-left;
-  padding-top: $ibo-datamodel-viewer--classes-list--padding-top;
   overflow-y: scroll;
 }
 

css/backoffice/vendors/_bulma-variables-overload.scss

@@ -21,7 +21,6 @@ $text-strong: inherit !default;
  * See https://bulma.io/documentation/elements/content/
  */
 $content-block-margin-bottom: 0 !default;
-$content-blockquote-background-color: $ibo-color-grey-200 !default;
 
 /* Table: Reset style as much as possible to match rich text editor preview, which is the browser's default stylesheet.
  * As there is no way to avoid bulma rules, we simply make them invalid by setting an invalid variable value, the rules will then be ignored by the browser.

css/backoffice/vendors/_selectize.scss

@@ -29,7 +29,7 @@ $ibo-vendors-selectize--element--active--background: $ibo-color-blue-100 !defaul
 $ibo-vendors-selectize--element--active--color: $ibo-color-grey-900 !default;
 
 $ibo-vendors-selectize--dropdown--background-color: $ibo-vendors-selectize-input--background-color !default;
-$ibo-vendors-selectize--dropdown--color: $ibo-vendors-selectize-input--color !default;
+$ibo-vendors-selectize--dropdown--color:  $ibo-vendors-selectize-input--color!default;
 
 $ibo-vendors-selectize--header--padding-x: 8px !default;
 $ibo-vendors-selectize--header--padding-y: 5px !default;

css/backoffice/vendors/ckeditor/_overloads.scss

@@ -28,15 +28,6 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-x: $ibo-spacing-300 !default;
 $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
 
 /* CSS3 variables */
-:root {
-  --ck-content-font-family: inherit;
-  --ck-content-font-color: inherit;
-  --ck-content-font-size: inherit;
-  --ck-content-line-height: inherit;
-  --ck-content-word-break: inherit;
-  --ck-content-overflow-wrap: inherit;
-}
-
 .ck {
   --ck-color-list-button-on-background: #{$ibo-vendors-ckeditor--ck-color-list-button-on-background};
   --ck-color-list-button-on-background-focus: #{$ibo-vendors-ckeditor--ck-color-list-button-on-background-focus};

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

@@ -97,19 +97,18 @@
 			$bDebug = isset($aServerParams['debug']) ? $aServerParams['debug'] : false;
 		}
 
-		if (array_key_exists(LDAP_OPT_DEBUG_LEVEL, $aOptions))
-		{
-			// Set debug level before trying to connect, so that debug info appear in the PHP error log if ldap_connect goes wrong
-			$bRet = ldap_set_option(null, LDAP_OPT_DEBUG_LEVEL, $aOptions[LDAP_OPT_DEBUG_LEVEL]);
-			$this->LogInfo($bDebug, "ldap_set_option('LDAP_OPT_DEBUG_LEVEL', '{$aOptions[LDAP_OPT_DEBUG_LEVEL]}') returned ".($bRet ? 'true' : 'false'));
-		}
-
 		$hDS = @ldap_connect($sURI);
 		if ($hDS === false)
 		{
 			$this->LogIssue($bDebug, "ldap_authentication: can not connect to the LDAP server '$sURI'. Check the configuration file config-itop.php.");
 			return false;
 		}
+		if (array_key_exists(LDAP_OPT_DEBUG_LEVEL, $aOptions))
+		{
+			// Set debug level before trying to connect, so that debug info appear in the PHP error log if ldap_connect goes wrong
+			$bRet = ldap_set_option($hDS, LDAP_OPT_DEBUG_LEVEL, $aOptions[LDAP_OPT_DEBUG_LEVEL]);
+			$this->LogInfo($bDebug, "ldap_set_option('LDAP_OPT_DEBUG_LEVEL', '{$aOptions[LDAP_OPT_DEBUG_LEVEL]}') returned ".($bRet ? 'true' : 'false'));
+		}
 		foreach($aOptions as $name => $value)
 		{
 			$bRet = ldap_set_option($hDS, $name, $value);

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/scss/scss-variables.scss

@@ -68,47 +68,47 @@ $ibo-color-information-900: #0f172a !default;
 $ibo-color-information-950: #020617 !default;
 
 
-$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600 !default;
-$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600 !default;
-$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-waiting-state-primary-color: $ibo-color-yellow-700 !default;
-$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700 !default;
-$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-failure-state-primary-color: $ibo-color-orange-800 !default;
-$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200 !default;
-$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700 !default;
+$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600;
+$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600;
+$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-waiting-state-primary-color: $ibo-color-yellow-700;
+$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700;
+$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-failure-state-primary-color: $ibo-color-orange-800;
+$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200;
+$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700;
 
-$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700 !default;
-$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-inactive-state-primary-color: $ibo-color-yellow-700 !default;
-$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700;
+$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-inactive-state-primary-color: $ibo-color-yellow-700;
+$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100;
 
-$ibo-caselog-highlight-color-1: $ibo-color-blue-700 !default;
-$ibo-caselog-highlight-color-2: $ibo-color-yellow-700 !default;
-$ibo-caselog-highlight-color-3: $ibo-color-information-600 !default;
-$ibo-caselog-highlight-color-4: $ibo-color-yellow-500 !default;
-$ibo-caselog-highlight-color-5: $ibo-color-blue-500 !default;
-$ibo-caselog-highlight-color-6: $ibo-color-yellow-300 !default;
-$ibo-caselog-highlight-color-7: $ibo-color-blue-300 !default;
+$ibo-caselog-highlight-color-1: $ibo-color-blue-700;
+$ibo-caselog-highlight-color-2: $ibo-color-yellow-700;
+$ibo-caselog-highlight-color-3: $ibo-color-information-600;
+$ibo-caselog-highlight-color-4: $ibo-color-yellow-500;
+$ibo-caselog-highlight-color-5: $ibo-color-blue-500;
+$ibo-caselog-highlight-color-6: $ibo-color-yellow-300;
+$ibo-caselog-highlight-color-7: $ibo-color-blue-300;
 
-$ibo-input-wrapper--is-error--border-color: $ibo-color-warning-700 !default;
-$ibo-field-validation: $ibo-color-warning-800 !default;
+$ibo-input-wrapper--is-error--border-color: $ibo-color-warning-700;
+$ibo-field-validation: $ibo-color-warning-800;
 
-$ibo-navigation-menu--visual-hint--background-color: $ibo-color-blue-400 !default;
+$ibo-navigation-menu--visual-hint--background-color: $ibo-color-blue-400;
 
-$ibo-wizard-container--background-color: $ibo-color-information-200 !default;
-$ibo-wizard-container--border-color: $ibo-color-information-600 !default;
+$ibo-wizard-container--background-color: $ibo-color-information-200;
+$ibo-wizard-container--border-color: $ibo-color-information-600;
 
-$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-danger-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-danger-500 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-500 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-danger-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-danger-500;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-500;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500;
 
-$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-blue-600 !default;
+$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-blue-600;

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/scss/scss-variables.scss

@@ -32,47 +32,47 @@ $ibo-color-information-900: #0f172a !default;
 $ibo-color-information-950: #020617 !default;
 
 
-$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600 !default;
-$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600 !default;
-$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-waiting-state-primary-color: $ibo-color-red-200 !default;
-$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-red-800 !default;
-$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700 !default;
-$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-failure-state-primary-color: $ibo-color-red-800 !default;
-$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200 !default;
-$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700 !default;
+$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600;
+$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600;
+$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-waiting-state-primary-color: $ibo-color-red-200;
+$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-red-800;
+$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700;
+$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-failure-state-primary-color: $ibo-color-red-800;
+$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200;
+$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700;
 
-$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700 !default;
-$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100 !default;
-$ibo-lifecycle-inactive-state-primary-color: $ibo-color-red-700 !default;
-$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700;
+$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-inactive-state-primary-color: $ibo-color-red-700;
+$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100;
 
-$ibo-caselog-highlight-color-1: $ibo-color-blue-700 !default;
-$ibo-caselog-highlight-color-2: $ibo-color-red-700 !default;
-$ibo-caselog-highlight-color-3: $ibo-color-information-600 !default;
-$ibo-caselog-highlight-color-4: $ibo-color-red-500 !default;
-$ibo-caselog-highlight-color-5: $ibo-color-blue-500 !default;
-$ibo-caselog-highlight-color-6: $ibo-color-red-300 !default;
-$ibo-caselog-highlight-color-7: $ibo-color-blue-300 !default;
+$ibo-caselog-highlight-color-1: $ibo-color-blue-700;
+$ibo-caselog-highlight-color-2: $ibo-color-red-700;
+$ibo-caselog-highlight-color-3: $ibo-color-information-600;
+$ibo-caselog-highlight-color-4: $ibo-color-red-500;
+$ibo-caselog-highlight-color-5: $ibo-color-blue-500;
+$ibo-caselog-highlight-color-6: $ibo-color-red-300;
+$ibo-caselog-highlight-color-7: $ibo-color-blue-300;
 
-$ibo-input-wrapper--is-error--border-color: $ibo-color-pink-700 !default;
-$ibo-field-validation: $ibo-color-pink-800 !default;
+$ibo-input-wrapper--is-error--border-color: $ibo-color-pink-700;
+$ibo-field-validation: $ibo-color-pink-800;
 
-$ibo-navigation-menu--visual-hint--background-color: $ibo-color-pink-600 !default;
+$ibo-navigation-menu--visual-hint--background-color: $ibo-color-pink-600;
 
-$ibo-wizard-container--background-color: $ibo-color-information-200 !default;
-$ibo-wizard-container--border-color: $ibo-color-information-600 !default;
+$ibo-wizard-container--background-color: $ibo-color-information-200;
+$ibo-wizard-container--border-color: $ibo-color-information-600;
 
-$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-pink-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-pink-600 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-400 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100 !default;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-pink-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-pink-600;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-400;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500;
 
-$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-pink-500 !default;
+$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-pink-500;

datamodels/2.x/combodo-db-tools/bin/rebuildhk.php

@@ -10,87 +10,22 @@
  */
 
 use Combodo\iTop\Core\MetaModel\HierarchicalKey;
-use Combodo\iTop\DBTools\Enum\BinExitCode;
-use Combodo\iTop\DBTools\Exception\AuthenticationException;
 
-// env-xxx folders
-if (file_exists(__DIR__.'/../../../approot.inc.php')) {
-	require_once __DIR__.'/../../../approot.inc.php';
-}
-// datamodel/2.x and data/xxx-modules folders
-elseif (file_exists(__DIR__.'/../../../../approot.inc.php')) {
-	require_once __DIR__.'/../../../../approot.inc.php';
-}
+require_once('../../../approot.inc.php');
 require_once APPROOT.'application/startup.inc.php';
 
-// Prepare output page
-$sPageTitle = "Database maintenance tools - Report";
-$bIsModeCLI = utils::IsModeCLI();
-if ($bIsModeCLI) {
-	$oP = new CLIPage($sPageTitle);
-
-	SetupUtils::CheckPhpAndExtensionsForCli($oP, BinExitCode::FATAL->value);
-} else {
-	$oP = new WebPage($sPageTitle);
-}
-
-// Authentication logic
-try {
-	utils::UseParamFile();
-
-	if ($bIsModeCLI) {
-		$sAuthUser = utils::ReadParam('auth_user', null, true, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
-		$sAuthPwd = utils::ReadParam('auth_pwd', null, true, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
-		if (utils::IsNullOrEmptyString($sAuthUser) || utils::IsNullOrEmptyString($sAuthPwd)) {
-			throw new AuthenticationException("Access credentials not provided, usage: php rebuildhk.php --auth_user=<login> --auth_pwd=<password> [--param_file=<file_path>]");
-		}
-		if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd)) {
-			UserRights::Login($sAuthUser);
-		} else {
-			throw new AuthenticationException("Access wrong credentials ('$sAuthUser')");
-		}
-	} else {
-		// Check user rights and prompt if needed
-		LoginWebPage::DoLoginEx(null, true);
+foreach (MetaModel::GetClasses() as $sClass) {
+	if (!MetaModel::HasTable($sClass)) {
+		continue;
 	}
 
-	if (!UserRights::IsAdministrator()) {
-		throw new AuthenticationException("Access restricted to administrators");
-	}
-} catch (AuthenticationException $oException) {
-	$oP->p($oException->getMessage());
-	$oP->output();
-	exit(BinExitCode::ERROR->value);
-} catch (Exception $oException) {
-	$oP->p("Error: ".$oException->GetMessage());
-	$oP->output();
-	exit(BinExitCode::FATAL->value);
-}
-
-// Business logic
-try {
-	foreach (MetaModel::GetClasses() as $sClass) {
-		if (!MetaModel::HasTable($sClass)) {
-			continue;
-		}
-
-		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) {
-			// Check (once) all the attributes that are hierarchical keys
-			if ((MetaModel::GetAttributeOrigin($sClass, $sAttCode) == $sClass) && $oAttDef->IsHierarchicalKey()) {
-				$oP->p("Rebuild hierarchical key $sAttCode from $sClass.");
-				HierarchicalKey::Rebuild($sClass, $sAttCode, $oAttDef);
-			}
+	foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) {
+		// Check (once) all the attributes that are hierarchical keys
+		if ((MetaModel::GetAttributeOrigin($sClass, $sAttCode) == $sClass) && $oAttDef->IsHierarchicalKey()) {
+			echo "Rebuild hierarchical key $sAttCode from $sClass.\n";
+			HierarchicalKey::Rebuild($sClass, $sAttCode, $oAttDef);
 		}
 	}
-
-	$oP->p("Done");
-	$oP->output();
-} catch (AuthenticationException $oException) {
-	$oP->p($oException->getMessage());
-	$oP->output();
-	exit(BinExitCode::ERROR->value);
-} catch (Exception $oException) {
-	$oP->p("Error: ".$oException->GetMessage());
-	$oP->output();
-	exit(BinExitCode::FATAL->value);
 }
+
+echo "Done\n";

datamodels/2.x/combodo-db-tools/bin/report.php

@@ -5,93 +5,22 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\DBTools\Enum\BinExitCode;
-use Combodo\iTop\DBTools\Exception\AuthenticationException;
 use Combodo\iTop\DBTools\Service\DBAnalyzerUtils;
 
-// env-xxx folders
-if (file_exists(__DIR__.'/../../../approot.inc.php')) {
-	require_once __DIR__.'/../../../approot.inc.php';
-}
-// datamodel/2.x and data/xxx-modules folders
-elseif (file_exists(__DIR__.'/../../../../approot.inc.php')) {
-	require_once __DIR__.'/../../../../approot.inc.php';
+require_once('../../../approot.inc.php');
+require_once(APPROOT.'application/startup.inc.php');
+
+require_once('../db_analyzer.class.inc.php');
+require_once('../src/Service/DBAnalyzerUtils.php');
+
+$oDBAnalyzer = new DatabaseAnalyzer(0);
+$aResults = $oDBAnalyzer->CheckIntegrity([]);
+
+if (empty($aResults)) {
+	echo "Database OK\n";
+	exit(0);
 }
 
-require_once APPROOT.'application/startup.inc.php';
-require_once APPROOT.'application/loginwebpage.class.inc.php';
+$sReportFile = DBAnalyzerUtils::GenerateReport($aResults);
 
-require_once __DIR__.'/../db_analyzer.class.inc.php';
-
-// Prepare output page
-$sPageTitle = "Database maintenance tools - Report";
-$bIsModeCLI = utils::IsModeCLI();
-if ($bIsModeCLI) {
-	$oP = new CLIPage($sPageTitle);
-
-	SetupUtils::CheckPhpAndExtensionsForCli($oP, BinExitCode::FATAL->value);
-} else {
-	$oP = new WebPage($sPageTitle);
-}
-
-// Authentication logic
-try {
-	utils::UseParamFile();
-
-	if ($bIsModeCLI) {
-		$sAuthUser = utils::ReadParam('auth_user', null, true, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
-		$sAuthPwd = utils::ReadParam('auth_pwd', null, true, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
-		if (utils::IsNullOrEmptyString($sAuthUser) || utils::IsNullOrEmptyString($sAuthPwd)) {
-			throw new AuthenticationException("Access credentials not provided, usage: php report.php --auth_user=<login> --auth_pwd=<password> [--param_file=<file_path>]");
-		}
-		if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd)) {
-			UserRights::Login($sAuthUser);
-		} else {
-			throw new AuthenticationException("Access wrong credentials ('$sAuthUser')");
-		}
-	} else {
-		// Check user rights and prompt if needed
-		LoginWebPage::DoLoginEx(null, true);
-	}
-
-	if (!UserRights::IsAdministrator()) {
-		throw new AuthenticationException("Access restricted to administrators");
-	}
-} catch (AuthenticationException $oException) {
-	$sExceptionMessage = $oP instanceof WebPage ? utils::EscapeHtml($oException->getMessage()) : $oException->getMessage();
-	$oP->p($sExceptionMessage);
-	$oP->output();
-	exit(BinExitCode::ERROR->value);
-} catch (Exception $oException) {
-	$sExceptionMessage = $oP instanceof WebPage ? utils::EscapeHtml($oException->getMessage()) : $oException->getMessage();
-	$oP->p("Error: ".$sExceptionMessage);
-	$oP->output();
-	exit(BinExitCode::FATAL->value);
-}
-
-// Business logic
-try {
-	$oDBAnalyzer = new DatabaseAnalyzer(0);
-	$aResults = $oDBAnalyzer->CheckIntegrity([]);
-
-	if (empty($aResults)) {
-		$oP->p("Database OK");
-		$oP->output();
-		exit(BinExitCode::SUCCESS->value);
-	}
-
-	$sReportFile = DBAnalyzerUtils::GenerateReport($aResults);
-
-	$oP->p("Report generated: {$sReportFile}.log");
-	$oP->output();
-} catch (AuthenticationException $oException) {
-	$sExceptionMessage = $oP instanceof WebPage ? utils::EscapeHtml($oException->getMessage()) : $oException->getMessage();
-	$oP->p($sExceptionMessage);
-	$oP->output();
-	exit(BinExitCode::ERROR->value);
-} catch (Exception $oException) {
-	$sExceptionMessage = $oP instanceof WebPage ? utils::EscapeHtml($oException->getMessage()) : $oException->getMessage();
-	$oP->p("Error: ".$sExceptionMessage);
-	$oP->output();
-	exit(BinExitCode::FATAL->value);
-}
+echo "Report generated: {$sReportFile}.log\n";

datamodels/2.x/combodo-db-tools/composer.json

@@ -1,9 +0,0 @@
-{
-  "name": "combodo/combodo-db-tools",
-  "license": "AGPL-3.0-only",
-  "autoload": {
-    "psr-4": {
-      "Combodo\\iTop\\DBTools\\": "src/"
-    }
-  }
-}

datamodels/2.x/combodo-db-tools/composer.lock

@@ -1,18 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "38292b9b3a56c6c8776285a17c58034e",
-    "packages": [],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {},
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {},
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
-}

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

@@ -43,7 +43,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => [
-			'vendor/autoload.php',
 			'src/Service/DBToolsUtils.php',
 			'src/Service/DBAnalyzerUtils.php',
 		],

datamodels/2.x/combodo-db-tools/src/Enum/BinExitCode.php

@@ -1,18 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DBTools\Enum;
-
-/**
- * Enum for the exit codes of the bin scripts
- */
-enum BinExitCode: int
-{
-	case SUCCESS = 0;
-	case ERROR = -1;
-	case FATAL = -2;
-}

datamodels/2.x/combodo-db-tools/vendor/autoload.php

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

datamodels/2.x/combodo-db-tools/vendor/composer/ClassLoader.php

@@ -1,579 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    /** @var \Closure(string):void */
-    private static $includeFile;
-
-    /** @var string|null */
-    private $vendorDir;
-
-    // PSR-4
-    /**
-     * @var array<string, array<string, int>>
-     */
-    private $prefixLengthsPsr4 = array();
-    /**
-     * @var array<string, list<string>>
-     */
-    private $prefixDirsPsr4 = array();
-    /**
-     * @var list<string>
-     */
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    /**
-     * List of PSR-0 prefixes
-     *
-     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
-     *
-     * @var array<string, array<string, list<string>>>
-     */
-    private $prefixesPsr0 = array();
-    /**
-     * @var list<string>
-     */
-    private $fallbackDirsPsr0 = array();
-
-    /** @var bool */
-    private $useIncludePath = false;
-
-    /**
-     * @var array<string, string>
-     */
-    private $classMap = array();
-
-    /** @var bool */
-    private $classMapAuthoritative = false;
-
-    /**
-     * @var array<string, bool>
-     */
-    private $missingClasses = array();
-
-    /** @var string|null */
-    private $apcuPrefix;
-
-    /**
-     * @var array<string, self>
-     */
-    private static $registeredLoaders = array();
-
-    /**
-     * @param string|null $vendorDir
-     */
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-        self::initializeIncludeClosure();
-    }
-
-    /**
-     * @return array<string, list<string>>
-     */
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    /**
-     * @return array<string, list<string>>
-     */
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    /**
-     * @return list<string>
-     */
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    /**
-     * @return list<string>
-     */
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    /**
-     * @return array<string, string> Array of classname => path
-     */
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array<string, string> $classMap Class to filename map
-     *
-     * @return void
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string              $prefix  The prefix
-     * @param list<string>|string $paths   The PSR-0 root directories
-     * @param bool                $prepend Whether to prepend the directories
-     *
-     * @return void
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        $paths = (array) $paths;
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string              $prefix  The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths   The PSR-4 base directories
-     * @param bool                $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        $paths = (array) $paths;
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string              $prefix The prefix
-     * @param list<string>|string $paths  The PSR-0 base directories
-     *
-     * @return void
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string              $prefix The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     *
-     * @return void
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     *
-     * @return void
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     *
-     * @return void
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     *
-     * @return void
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            $includeFile = self::$includeFile;
-            $includeFile($file);
-
-            return true;
-        }
-
-        return null;
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    /**
-     * Returns the currently registered loaders keyed by their corresponding vendor directories.
-     *
-     * @return array<string, self>
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return void
-     */
-    private static function initializeIncludeClosure()
-    {
-        if (self::$includeFile !== null) {
-            return;
-        }
-
-        /**
-         * Scope isolated include.
-         *
-         * Prevents access to $this/self from included files.
-         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = \Closure::bind(static function($file) {
-            include $file;
-        }, null, null);
-    }
-}

datamodels/2.x/combodo-db-tools/vendor/composer/InstalledVersions.php

@@ -1,378 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer;
-
-use Composer\Autoload\ClassLoader;
-use Composer\Semver\VersionParser;
-
-/**
- * This class is copied in every Composer installed project and available to all
- *
- * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
- *
- * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
- */
-class InstalledVersions
-{
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
-     */
-    private static $installed;
-
-    /**
-     * @var bool
-     */
-    private static $installedIsLocalDir;
-
-    /**
-     * @var bool|null
-     */
-    private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static $installedByVendor = array();
-
-    /**
-     * Returns a list of all package names which are present, either by being installed, replaced or provided
-     *
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackages()
-    {
-        $packages = array();
-        foreach (self::getInstalled() as $installed) {
-            $packages[] = array_keys($installed['versions']);
-        }
-
-        if (1 === \count($packages)) {
-            return $packages[0];
-        }
-
-        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
-    }
-
-    /**
-     * Returns a list of all package names with a specific type e.g. 'library'
-     *
-     * @param  string   $type
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackagesByType($type)
-    {
-        $packagesByType = array();
-
-        foreach (self::getInstalled() as $installed) {
-            foreach ($installed['versions'] as $name => $package) {
-                if (isset($package['type']) && $package['type'] === $type) {
-                    $packagesByType[] = $name;
-                }
-            }
-        }
-
-        return $packagesByType;
-    }
-
-    /**
-     * Checks whether the given package is installed
-     *
-     * This also returns true if the package name is provided or replaced by another package
-     *
-     * @param  string $packageName
-     * @param  bool   $includeDevRequirements
-     * @return bool
-     */
-    public static function isInstalled($packageName, $includeDevRequirements = true)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether the given package satisfies a version constraint
-     *
-     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
-     *
-     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
-     *
-     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
-     * @param  string        $packageName
-     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
-     * @return bool
-     */
-    public static function satisfies(VersionParser $parser, $packageName, $constraint)
-    {
-        $constraint = $parser->parseConstraints((string) $constraint);
-        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-        return $provided->matches($constraint);
-    }
-
-    /**
-     * Returns a version constraint representing all the range(s) which are installed for a given package
-     *
-     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
-     * whether a given version of a package is installed, and not just whether it exists
-     *
-     * @param  string $packageName
-     * @return string Version constraint usable with composer/semver
-     */
-    public static function getVersionRanges($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            $ranges = array();
-            if (isset($installed['versions'][$packageName]['pretty_version'])) {
-                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
-            }
-            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
-            }
-            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
-            }
-            if (array_key_exists('provided', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
-            }
-
-            return implode(' || ', $ranges);
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getPrettyVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['pretty_version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
-     */
-    public static function getReference($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['reference'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['reference'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
-     */
-    public static function getInstallPath($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @return array
-     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
-     */
-    public static function getRootPackage()
-    {
-        $installed = self::getInstalled();
-
-        return $installed[0]['root'];
-    }
-
-    /**
-     * Returns the raw installed.php data for custom implementations
-     *
-     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
-     * @return array[]
-     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
-     */
-    public static function getRawData()
-    {
-        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-
-        return self::$installed;
-    }
-
-    /**
-     * Returns the raw data of all installed.php which are currently loaded for custom implementations
-     *
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    public static function getAllRawData()
-    {
-        return self::getInstalled();
-    }
-
-    /**
-     * Lets you reload the static array from another file
-     *
-     * This is only useful for complex integrations in which a project needs to use
-     * this class but then also needs to execute another project's autoloader in process,
-     * and wants to ensure both projects have access to their version of installed.php.
-     *
-     * A typical case would be PHPUnit, where it would need to make sure it reads all
-     * the data it needs from this class, then call reload() with
-     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
-     * the project in which it runs can then also use this class safely, without
-     * interference between PHPUnit's dependencies and the project's dependencies.
-     *
-     * @param  array[] $data A vendor/composer/installed.php data set
-     * @return void
-     *
-     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
-     */
-    public static function reload($data)
-    {
-        self::$installed = $data;
-        self::$installedByVendor = array();
-
-        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
-        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
-        // so we have to assume it does not, and that may result in duplicate data being returned when listing
-        // all installed packages for example
-        self::$installedIsLocalDir = false;
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static function getInstalled()
-    {
-        if (null === self::$canGetVendors) {
-            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
-        }
-
-        $installed = array();
-        $copiedLocalDir = false;
-
-        if (self::$canGetVendors) {
-            $selfDir = strtr(__DIR__, '\\', '/');
-            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                $vendorDir = strtr($vendorDir, '\\', '/');
-                if (isset(self::$installedByVendor[$vendorDir])) {
-                    $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                    $required = require $vendorDir.'/composer/installed.php';
-                    self::$installedByVendor[$vendorDir] = $required;
-                    $installed[] = $required;
-                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
-                        self::$installed = $required;
-                        self::$installedIsLocalDir = true;
-                    }
-                }
-                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
-                    $copiedLocalDir = true;
-                }
-            }
-        }
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                $required = require __DIR__ . '/installed.php';
-                self::$installed = $required;
-            } else {
-                self::$installed = array();
-            }
-        }
-
-        if (self::$installed !== array() && !$copiedLocalDir) {
-            $installed[] = self::$installed;
-        }
-
-        return $installed;
-    }
-}

datamodels/2.x/combodo-db-tools/vendor/composer/autoload_classmap.php

@@ -1,15 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Combodo\\iTop\\DBTools\\Enum\\BinExitCode' => $baseDir . '/src/Enum/BinExitCode.php',
-    'Combodo\\iTop\\DBTools\\Exception\\AuthenticationException' => $baseDir . '/src/Exception/AuthenticationException.php',
-    'Combodo\\iTop\\DBTools\\Service\\BinUtils' => $baseDir . '/src/Service/BinUtils.php',
-    'Combodo\\iTop\\DBTools\\Service\\DBAnalyzerUtils' => $baseDir . '/src/Service/DBAnalyzerUtils.php',
-    'Combodo\\iTop\\DBTools\\Service\\DBToolsUtils' => $baseDir . '/src/Service/DBToolsUtils.php',
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-);

datamodels/2.x/combodo-db-tools/vendor/composer/autoload_namespaces.php

@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-);

datamodels/2.x/combodo-db-tools/vendor/composer/autoload_psr4.php

@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Combodo\\iTop\\DBTools\\' => array($baseDir . '/src'),
-);

datamodels/2.x/combodo-db-tools/vendor/composer/autoload_real.php

@@ -1,37 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInit38292b9b3a56c6c8776285a17c58034e
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInit38292b9b3a56c6c8776285a17c58034e', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit38292b9b3a56c6c8776285a17c58034e', 'loadClassLoader'));
-
-        require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit38292b9b3a56c6c8776285a17c58034e::getInitializer($loader));
-
-        $loader->setClassMapAuthoritative(true);
-        $loader->register(true);
-
-        return $loader;
-    }
-}

datamodels/2.x/combodo-db-tools/vendor/composer/autoload_static.php

@@ -1,41 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInit38292b9b3a56c6c8776285a17c58034e
-{
-    public static $prefixLengthsPsr4 = array (
-        'C' =>
-        array (
-            'Combodo\\iTop\\DBTools\\' => 21,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'Combodo\\iTop\\DBTools\\' =>
-        array (
-            0 => __DIR__ . '/../..' . '/src',
-        ),
-    );
-
-    public static $classMap = array (
-        'Combodo\\iTop\\DBTools\\Enum\\BinExitCode' => __DIR__ . '/../..' . '/src/Enum/BinExitCode.php',
-        'Combodo\\iTop\\DBTools\\Exception\\AuthenticationException' => __DIR__ . '/../..' . '/src/Exception/AuthenticationException.php',
-        'Combodo\\iTop\\DBTools\\Service\\BinUtils' => __DIR__ . '/../..' . '/src/Service/BinUtils.php',
-        'Combodo\\iTop\\DBTools\\Service\\DBAnalyzerUtils' => __DIR__ . '/../..' . '/src/Service/DBAnalyzerUtils.php',
-        'Combodo\\iTop\\DBTools\\Service\\DBToolsUtils' => __DIR__ . '/../..' . '/src/Service/DBToolsUtils.php',
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit38292b9b3a56c6c8776285a17c58034e::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit38292b9b3a56c6c8776285a17c58034e::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit38292b9b3a56c6c8776285a17c58034e::$classMap;
-
-        }, null, ClassLoader::class);
-    }
-}

datamodels/2.x/combodo-db-tools/vendor/composer/installed.json

@@ -1,5 +0,0 @@
-{
-    "packages": [],
-    "dev": true,
-    "dev-package-names": []
-}

datamodels/2.x/combodo-db-tools/vendor/composer/installed.php

@@ -1,23 +0,0 @@
-<?php return array(
-    'root' => array(
-        'name' => 'combodo/combodo-db-tools',
-        'pretty_version' => '1.0.0+no-version-set',
-        'version' => '1.0.0.0',
-        'reference' => null,
-        'type' => 'library',
-        'install_path' => __DIR__ . '/../../',
-        'aliases' => array(),
-        'dev' => true,
-    ),
-    'versions' => array(
-        'combodo/combodo-db-tools' => array(
-            'pretty_version' => '1.0.0+no-version-set',
-            'version' => '1.0.0.0',
-            'reference' => null,
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../../',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-    ),
-);

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

@@ -47,7 +47,7 @@ or ask your '.ITOP_APPLICATION_SHORT.' administrator if the '.ITOP_APPLICATION_S
 
 Dict::Add('EN US', 'English', 'English', [
 	'Class:Attachment' => 'Attachment',
-	'Class:Attachment+' => 'File: text or image, linked to a single object. It can\'t be modified, only deleted. Attachment can\'t be created outside of its object edition.',
+	'Class:Attachment+' => '',
 	'Class:Attachment/Attribute:expire' => 'Expire',
 	'Class:Attachment/Attribute:expire+' => '',
 	'Class:Attachment/Attribute:temp_id' => 'Temporary id',

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

@@ -38,8 +38,8 @@ Soit demandez à votre administrateur système s\'il reste de la place disque di
 //
 
 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Attachment' => 'Pièce jointe',
-	'Class:Attachment+' => 'Fichier : texte ou image, associé à un et un seul object, supprimable mais non modifiable, non créable en dehors d\'un objet',
+	'Class:Attachment' => 'Attachement',
+	'Class:Attachment+' => '',
 	'Class:Attachment/Attribute:expire' => 'Expire',
 	'Class:Attachment/Attribute:expire+' => '',
 	'Class:Attachment/Attribute:temp_id' => 'Id Temporaire',
@@ -82,12 +82,12 @@ Dict::Add('FR FR', 'French', 'Français', [
 
 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:TriggerOnAttachmentDownload' => 'Déclencheur sur le téléchargement d\'une pièce jointe d\'un objet',
-	'Class:TriggerOnAttachmentDownload+' => 'Déclencheur sur le téléchargement d\'une pièce jointe depuis un objet de la classe donnée ou d\'une classe enfant.',
+	'Class:TriggerOnAttachmentDownload+' => '',
 	'Class:TriggerOnAttachmentCreate'                         => 'Déclencheur sur la création d\'une pièce jointe',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Déclencheur sur la création d\'une pièce jointe d\'un objet',
+	'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+'                        => 'Déclencheur sur la suppression d\'une pièce jointe d\'un objet',
+	'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-backup/check-backup.php

@@ -199,15 +199,15 @@ function RaiseAlarm($sMessage)
 //////////
 // Main
 
+try {
+	utils::UseParamFile();
+} catch (Exception $e) {
+	echo "Error: ".$e->GetMessage()."\n";
+	exit;
+}
+
 if (utils::IsModeCLI()) {
-	try {
-		utils::UseParamFile();
-	} catch (Exception $e) {
-		echo 'Error: '.$e->GetMessage()."\n";
-		exit;
-	}
-	$oP = new CLIPage('Check backup utility');
-	SetupUtils::CheckPhpAndExtensionsForCli($oP);
+	SetupUtils::CheckPhpAndExtensionsForCli(new CLIPage('Check backup utility'));
 
 	echo date('Y-m-d H:i:s')." - running check-backup utility\n";
 	try {

datamodels/2.x/itop-backup/common.cli-execution.php

@@ -88,15 +88,16 @@ if (utils::IsModeCLI()) {
 	$oP = new CLIPage(GetOperationName());
 
 	SetupUtils::CheckPhpAndExtensionsForCli($oP);
-	try {
-		utils::UseParamFile();
-	} catch (Exception $e) {
-		ExitError($oP, $e->GetMessage());
-	}
 } else {
 	$oP = new WebPage(GetOperationName());
 }
 
+try {
+	utils::UseParamFile();
+} catch (Exception $e) {
+	ExitError($oP, $e->GetMessage());
+}
+
 ExecuteMainOperation($oP);
 
 $oP->output();

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

@@ -24,7 +24,7 @@ class DBRestore extends DBBackup
 	/** @var string */
 	private $sDBUser;
 
-	public function __construct(?\Config $oConfig = null)
+	public function __construct(\Config $oConfig = null)
 	{
 		parent::__construct($oConfig);