Preparing next version

.doc/README.md

@@ -0,0 +1,99 @@
+# Phpdoc dokuwiki template
+This directory contains a template for rendering iTop phpdoc as dokuwiki pages.
+
+
+Conventional tags that you should use:
+ * `@internal` : exclude from the documentation.
+ * `@api` : it means that a method is an api, thus it may be interacted with.
+ * `@see` : it points to another documented method
+ * `@link` : external url 
+   * if you point to another page of the wiki, please use relative links.
+ * `@example` : let you provide example of code
+ * `@param`, `@return`, `@throws`, ... 
+
+
+## Special instructions
+
+Some iTop specific tags were added : 
+ * `@api-advanced`: it means that a method is an `@api` but mark it also as "complex" to use
+ * `@overwritable-hook`: used to mark a method as "designed to be extended"
+ * `@extension-hook`: not used for now 
+ * `@phpdoc-tuning-exclude-inherited`: once this tag is present on a class, it's inherited methods won't be showed.
+
+ 
+### known limitations:
+#### `@see` tags must be very specific: 
+   * always prefix class members (attributes or methods) with `ClassName::` (do not use self) 
+   * for methods always suffix them with `()`, 
+   * do not reference variables since they are not documented. If you have to, always prefix them with `$`
+ 
+examples: 
+```
+/** 
+ * @see DBObject
+ * @see DBObject::Get()
+ * @see DBObject::$foo
+ */
+```   
+
+#### Do not use inline tags, they do not work properly, example: 
+```
+/** 
+ * This is a texts with an inline tag {@see [FQSEN] [<description>]} it must never be used 
+ */
+```
+   
+#### The `@example` tag must respect this very precise syntax 
+ * the sentence in the first line (next to the tag) is the title, it  must be enclosed by double quotes 
+ * the following lines are the sample code. 
+ * 💔 since we simply hack the official tag, this syntax must be respected carefully 💔
+example: 
+```
+/** 
+* @example "This is the title of the multiline example"
+* $foo = DBObject::Get('foo');
+* DBObject::Set('foo', ++$foo);
+*/
+```  
+    
+## How content is included into the documentation
+
+**For a class** those requirements have to be respected: 
+ - the file containing the class must be listed in `/phpdoc/files/file[]` of  `.doc/phpdoc-objects-manipulation.dist.xml`
+ - the class **must not** have the tag `@internal`
+ - the class **must** have at least one of: `@api`, `@api-advanced`, `@overwritable-hook`, `@extension-hook` 
+
+Then, **for a method** of an eligible class: 
+ - **public** methods **must** have at least one of: `@api`, `@api-advanced`, `@overwritable-hook`, `@extension-hook` 
+ - **protected** methods **must** have at least one of: `@overwritable-hook`, `@extension-hook` 
+ - **private** methods are **always excluded** 
+
+**Class properties** and **constants** are never documented (this is subject to change).
+
+
+
+
+## A note about the rendering engine
+  
+:notebook: as spaces are used to mark code, the templates (`.doc/phpdoc-templates/combodo-wiki/*`) have very few indentation, thus they are awful to read (sorry).
+
+## Installation
+
+```
+cd .doc
+composer require phpdocumentor/phpdocumentor:~2 --dev
+```
+
+## Generation
+
+1. Switch to this directory : `cd /path/to/itop/.doc`
+2. `composer install`
+3. `./bin/build-doc-object-manipulation`
+3. `./bin/build-doc-extensions`
+4. Get the generated files from `/path/to/itop/data/phpdocumentor/output`
+
+## Dokuwiki requirements
+ * the template uses the [wrap plugin](https://www.dokuwiki.org/plugin:wrap).
+ * the generated files have to be placed under an arbitrary directory of `[/path/to/dokuwiki]/data/pages`.
+ * the html has to be activated [config:htmlok](https://www.dokuwiki.org/config:htmlok)
+ * the generated files have to be in lowercase

.doc/bin/build-doc-extensions

@@ -0,0 +1,6 @@
+#!/bin/sh -x
+
+rm -rf /tmp/phpdoc-twig-cache/ && rm -rf data/phpdocumentor/output/extensions/ && rm -rf data/phpdocumentor/temp/extensions/ && ./vendor/bin/phpdoc -c ./phpdoc-extensions.dist.xml -vvv
+
+# now wee need to lowercase every generated file because dokuwiki can't handle uppercase
+cd ../data/phpdocumentor/output/extensions/ && for i in $(ls | grep [A-Z]); do mv -i $i $(echo $i | tr 'A-Z' 'a-z'); done

.doc/bin/build-doc-object-manipulation

@@ -0,0 +1,7 @@
+#!/bin/sh -x
+
+rm -rf /tmp/phpdoc-twig-cache/ &&  rm -rf ../data/phpdocumentor/output/objects-manipulation/ &&  rm -rf ../data/phpdocumentor/temp/objects-manipulation/ && ./vendor/bin/phpdoc -c ./phpdoc-objects-manipulation.dist.xml -vvv
+
+
+# now wee need to lowercase every generated file because dokuwiki can't handle uppercase
+cd ../data/phpdocumentor/output/objects-manipulation/ && for i in $( ls | grep [A-Z] ); do mv -i $i `echo $i | tr 'A-Z' 'a-z'`; done

.doc/composer.json

@@ -0,0 +1,6 @@
+{
+    "require-dev": {
+        "phpdocumentor/phpdocumentor": "~2",
+	"jms/serializer": "1.7.*"
+    }
+}

.doc/itop-version-history.md

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

.doc/phpdoc-extensions.dist.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+  <title><![CDATA[iTop extensions]]></title>
+
+  <parser>
+    <target>../data/phpdocumentor/temp/extensions</target>
+  </parser>
+
+  <transformer>
+    <target>../data/phpdocumentor/output/extensions</target>
+  </transformer>
+
+  <transformations>
+    <template name="phpdoc-templates/combodo-wiki"/>
+  </transformations>
+
+  <files>
+    <file>../application/applicationextension.inc.php</file>
+  </files>
+</phpdoc>

.doc/phpdoc-objects-manipulation.dist.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+
+  <!--
+    /**
+    The documentation of this file can be found here : https://docs.phpdoc.org/references/configuration.html
+    it has to be completed by the CLI parameters documentation which is more comprehensive: https://docs.phpdoc.org/references/commands/project_run.html#usage
+
+    usage:
+    vendor/bin/phpdoc -c phpdoc-objects-manipulation.dist.xml
+
+    */
+  -->
+
+  <title><![CDATA[iTop's objects manipulation API]]></title>
+
+  <parser>
+    <default-package-name>iTopORM</default-package-name>
+    <target>../data/phpdocumentor/temp/objects-manipulation</target>
+    <visibility>public,protected</visibility>
+    <markers>
+      <!--<item>TODO</item>-->
+      <!--<item>FIXME</item>-->
+    </markers>
+      <extensions>
+          <extension>php</extension>
+      </extensions>
+  </parser>
+
+  <transformer>
+    <target>../data/phpdocumentor/output/objects-manipulation</target>
+  </transformer>
+
+  <transformations>
+    <template name="phpdoc-templates/combodo-wiki"/>
+  </transformations>
+
+  <!--<logging>-->
+    <!--<level>warn</level>-->
+    <!--<paths>-->
+      <!--&lt;!&ndash;<default>data/phpdocumentor/log/objects-manipulation/{DATE}.log</default>&ndash;&gt;-->
+      <!--&lt;!&ndash;<errors>data/phpdocumentor/log/objects-manipulation/{DATE}.errors.log</errors>&ndash;&gt;-->
+
+      <!--<default>{APP_ROOT}/data/log/{DATE}.log</default>-->
+      <!--<errors>{APP_ROOT}/data/log/{DATE}.errors.log</errors>-->
+    <!--</paths>-->
+  <!--</logging>-->
+
+  <files>
+    <file>../core/dbobject.class.php</file>
+    <file>../core/dbobjectsearch.class.php</file>
+    <file>../core/metamodel.class.php</file>
+    <file>../core/dbobjectset.class.php</file>
+    <file>../core/dbsearch.class.php</file>
+    <file>../core/dbunionsearch.class.php</file>
+  </files>
+
+</phpdoc>

.doc/phpdoc-templates/combodo-wiki/class.txt.twig

@@ -0,0 +1,136 @@
+{% extends 'layout.txt.twig' %}
+
+{% block content %}
+<wrap button>[[start|🔙 Back]]</wrap>
+
+{% if node.tags['internal'] is defined %}
+====== {{ node.name }} ======
+<WRAP alert>This class is "internal", and thus is not documented!</WRAP>
+{% elseif node.tags['api'] is not defined and node.tags['api-advanced'] is not defined and node.tags['overwritable-hook'] is not defined and node.tags['extension-hook'] is not defined %}
+====== {{ node.name }} ======
+<WRAP alert>This class is neither "api", "api-advanced", "overwritable-hook" or "extension-hook", and thus is not documented!</WRAP>
+{% else %}
+
+====== {{ node.name }} ======
+
+{% if node.deprecated %}<wrap danger>deprecated</wrap>{% endif %}
+{% if node.abstract %}<wrap warning>abstract</wrap>{% endif %}
+{% if node.final %}<wrap notice>final</wrap>{% endif %}
+{% include 'includes/wrap-tags.txt.twig' with {structure:node, wrap: 'safety', wrapTags: ['api', 'api-advanced', 'overwritable-hook', 'extension-hook']} %}
+
+
+
+{% if node.deprecated %}
+=== **<del>Deprecated</del>**===
+//{{ node.tags.deprecated[0].description }}//
+{% endif %}
+
+
+== {{  node.summary|replace({"\n":""})|raw }} ==
+<html>{{ node.description|markdown|raw }}</html>
+
+
+{% include 'includes/code-examples.txt.twig' with {structure:node, title_level: '====='} %}
+
+
+{% set class = node.parent %}
+{% block hierarchy_element %}
+
+{% if class and class.name is defined and class.name|trim != '' %}
+==== parent ====
+{% set child = class %}
+{% set class = class.parent %}
+{{ block('hierarchy_element') }}
+[[{{ child.name }}|{{ child.name }}]]
+{% endif %}
+{% endblock %}
+
+
+{% for interface in node.interfaces|sort_asc %}
+{% if loop.first %}
+==== Implements ====
+{% endif %}
+{% if loop.length > 1 %}  * {% endif %}{{ interface.fullyQualifiedStructuralElementName ?: interface }}
+{% endfor %}
+
+
+{% for trait in node.usedTraits|sort_asc %}
+{% if loop.first %}
+==== Uses traits ====
+{% endif %}
+{% if loop.length > 1 %}  * {% endif %}{{ trait.fullyQualifiedStructuralElementName ?: trait }}
+{% endfor %}
+
+
+{% include 'includes/see-also.txt.twig' with {structure:node, title_level: '==='} %}
+
+{% include 'includes/tags.txt.twig' with {structure:node, title_level: '=====', blacklist:  ['link', 'see', 'abstract', 'example', 'method', 'property', 'property-read', 'property-write', 'package', 'subpackage', 'phpdoc-tuning-exclude-inherited', 'api', 'api-advanced', 'overwritable-hook', 'extension-hook', 'copyright', 'license', 'code-example']} %}
+
+{% set methods = node.inheritedMethods.merge(node.methods.merge(node.magicMethods)) %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'api'} %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'api-advanced'} %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'overwritable-hook'} %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'extension-hook'} %}
+
+
+{% include 'includes/code-examples.txt.twig' with {structure:node, title_level: '=====', sub_title_level: '=='} %}
+
+<WRAP clear />
+
+{% for method in methods|sort_asc
+    if method.visibility == 'public'
+    and (
+        method.tags['api'] is defined
+        or method.tags['api-advanced'] is defined
+        or method.tags['overwritable-hook'] is defined
+        or method.tags['extension-hook'] is defined
+    )
+    and (
+        node.tags['phpdoc-tuning-exclude-inherited'] is not defined
+        or method.parent.name == node.name
+    )
+%}
+{%- if loop.first %}
+===== Public methods =====
+{% endif %}
+{{ block('method') }}
+{% endfor %}
+{% for method in methods|sort_asc if method.visibility == 'protected' and (method.tags['overwritable-hook'] is defined or method.tags['extension-hook'] is defined) %}
+{%- if loop.first %}
+===== Protected methods =====
+{% endif %}
+{{ block('method') }}
+{% endfor %}
+
+
+
+
+
+{% set constants = node.inheritedConstants.merge(node.constants) %}
+{% if constants|length > 0 %}
+===== Constants =====
+{% for constant in constants|sort_asc %}
+{{ block('constant') }}
+{% endfor %}
+{% endif %}
+
+
+{#{% set properties = node.inheritedProperties.merge(node.properties.merge(node.magicProperties)) %}#}
+{#{% for property in properties|sort_asc if property.visibility == 'public' %}#}
+{#{%- if loop.first %}#}
+{#===== Public properties =====#}
+{#{% endif %}#}
+{#{{ block('property') }}#}
+{#{% endfor %}#}
+{#{% for property in properties|sort_asc if property.visibility == 'protected' %}#}
+{#{%- if loop.first %}#}
+{#===== Protected properties =====#}
+{#{% endif %}#}
+{#{{ block('property') }}#}
+{#{% endfor %}#}
+
+
+{%- endif %} {#{% elseif node.tags['xxx'] is not defined and ... #}
+
+<wrap button>[[start|🔙 Back]]</wrap>
+{% endblock %}

.doc/phpdoc-templates/combodo-wiki/elements/constant.txt.twig

@@ -0,0 +1,31 @@
+{% block constant %}
+
+<WRAP group box >
+<WRAP twothirds column >
+==== {{ constant.name }} ====
+</WRAP>{# twothirds column#}
+
+<WRAP third column>
+{% if constant.deprecated %}<wrap danger>deprecated</wrap> {% endif %}
+{% if (node.parent is not null and constant.parent.fullyQualifiedStructuralElementName != node.fullyQualifiedStructuralElementName) %}<wrap notice>inherited</wrap> {% endif %}
+</WRAP>{# third column#}
+
+== {{ constant.summary|replace({"\n":""})|raw }} ==
+<html>{{ constant.description|markdown|raw }}</html>
+
+{% if constant.deprecated %}
+=== Deprecated ===
+{{ constant.tags.deprecated[0].description|raw }}
+{% endif %}
+
+{% include 'includes/inherited-from.txt.twig' with {structure:constant} %}
+
+{% include 'includes/see-also.txt.twig' with {structure:constant, title_level: '=='} %}
+
+{% include 'includes/uses.txt.twig' with {structure:constant, title_level: '=='} %}
+
+{% include 'includes/tags.txt.twig' with {structure:constant, title_level: '==', blacklist:  ['link', 'see', 'var', 'deprecated', 'uses', 'package', 'subpackage', 'todo', 'code-example']} %}
+
+</WRAP>{# group #}
+
+{% endblock %}

.doc/phpdoc-templates/combodo-wiki/elements/method.txt.twig

@@ -0,0 +1,95 @@
+{% block method %}
+
+
+<WRAP group box >
+<WRAP twothirds column >
+==== {{ method.name }} ====
+</WRAP>{# twothirds column#}
+<WRAP third column >
+{% include 'includes/wrap-tags.txt.twig' with {structure:method, wrap: 'safety', wrapTags: ['api', 'api-advanced', 'overwritable-hook', 'extension-hook']} %}
+{% if method.deprecated %}<wrap danger>deprecated</wrap> {% endif %}
+{% if (node.parent is not null and method.parent.fullyQualifiedStructuralElementName != node.fullyQualifiedStructuralElementName) %}<wrap notice>inherited</wrap> {% endif %}
+{% if method.abstract %}<wrap warning>abstract</wrap> {% endif %}
+{% if method.final %}<wrap notice>final</wrap> {% endif %}
+<wrap notice>{{ method.visibility }}</wrap>
+{% if method.static %}<wrap warning>static</wrap> {% endif %}
+</WRAP>{# third column#}
+
+
+== {{  method.summary|replace({"\n":""})|raw }} ==
+<html>{{ method.description|markdown|raw }}</html>
+
+<code php>{% if method.abstract %}abstract {% endif %}{% if method.final %}final {% endif %}{{ method.visibility }} {% if method.static %}static {% endif %}{{ method.name }}({% for argument in method.arguments %}{{ argument.isVariadic ? '...' }}{{ argument.name }}{{ argument.default ? (' = '~argument.default)|raw }}{% if not loop.last %}, {% endif %}{% endfor %})</code>
+
+<WRAP twothirds column >
+
+
+=== Parameters ===
+{% if method.arguments|length > 0 -%}
+^ types ^ name ^ default ^ description ^
+{% for argument in method.arguments -%}
+| **<nowiki>{{ argument.types|join('|')|raw }}</nowiki>** | {{ argument.name }} {{ argument.isVariadic ? '<small style="color: gray">variadic</small>' }}  |   <nowiki>{{ argument.default|raw }}</nowiki>   | {{ argument.description|trim|replace("\n", ' ')|raw }} |{{ "\r\n" }}
+{%- endfor %}
+{% else %}
+//none//
+{% endif %}
+
+
+{#=== Parameters ===#}
+{#{% if method.arguments|length > 0 -%}#}
+{#{% for argument in method.arguments -%}#}
+{#== {{ argument.name }} ==#}
+
+
+{#{% set varDesc %}#}
+    {#<span style="margin:0 10px; 0 20px; font-weight: bold;">{{ argument.types|join('|') }}</span>#}
+    {#{{ argument.isVariadic ? '<small style="color: gray">variadic</small>' }}#}
+    {#{{ argument.description|raw }}#}
+{#{% endset %}#}
+{#<html>{{ varDesc|markdown|raw }}</html>#}
+{#{%- endfor %}#}
+{#{% else %}#}
+{#<wrap tip>This method has no parameter</wrap>#}
+{#{% endif %}#}
+
+
+{% if method.response and method.response.types|join() != 'void' %}
+=== Returns ===
+<html>{{ ('**' ~ method.response.types|join('|')|trim ~ '** ' ~ method.response.description)|markdown|raw }}</html>
+{% endif %}
+
+</WRAP>{# twothirds column#}
+
+<WRAP third column >
+
+{% if method.tags.throws|length > 0 or method.tags.throw|length > 0 %}
+=== Throws ===
+{% for exception in method.tags.throws -%}
+{% if loop.length > 1 %}  * {% endif %}''{{ exception.types|join('|')|raw }}'' <nowiki>{{ exception.description|raw }}</nowiki>
+{% endfor %}
+{% endif %}
+
+{% include 'includes/inherited-from.txt.twig' with {structure:method} %}
+
+{% include 'includes/see-also.txt.twig' with {structure:method, title_level: '==='} %}
+
+{% include 'includes/uses.txt.twig' with {structure:method, title_level: '==='} %}
+
+{% include 'includes/used-by.txt.twig' with {structure:method, title_level: '==='} %}
+
+{% include 'includes/tags-with-description.txt.twig' with {structure:method, title_level: '===', WRAP: 'info', tagsWithDescription: ['api', 'api-advanced', 'overwritable-hook', 'extension-hook']} %}
+
+{% include 'includes/tags.txt.twig' with {structure:method, title_level: '===', blacklist:  ['todo', 'link', 'see', 'abstract', 'example', 'param', 'return', 'access', 'deprecated', 'throws', 'throw', 'uses', 'api', 'api-advanced', 'overwritable-hook', 'extension-hook', 'used-by', 'inheritdoc', 'code-example']} %}
+
+</WRAP>{# third column#}
+
+
+
+{% include 'includes/code-examples.txt.twig' with {structure:method, title_level: '==='} %}
+
+</WRAP>{# group #}
+
+
+
+
+{% endblock %}

.doc/phpdoc-templates/combodo-wiki/elements/property.txt.twig

@@ -0,0 +1,49 @@
+{% block property %}
+
+<WRAP group box>
+<WRAP twothirds column >
+==== ${{ property.name }} ====
+</WRAP>{# twothirds column#}
+
+<WRAP third column>
+{% if property.deprecated %}<wrap danger>deprecated</wrap> {% endif %}
+{% if (node.parent is not null and property.parent.fullyQualifiedStructuralElementName != node.fullyQualifiedStructuralElementName) %}<wrap notice>inherited</wrap> {% endif %}
+</WRAP>{# third column#}
+
+
+
+
+== {{ property.summary|replace({"\n":""})|raw }} ==
+<html>{{ property.description|markdown|raw }}</html>
+{% if property.var.0.description %}<html>{{ property.var.0.description|markdown|raw }}</html>{% endif %}
+
+
+
+{#{% if property.types %}#}
+{#== Type ==#}
+{#{% for type in property.types  %}#}
+{#{% if loop.length > 1 %}  * {% endif %}{{ type|raw }} : {{ type.description|raw }}#}
+{#{% endfor %}#}
+{#{{ property.types|join('|')|raw }}#}
+{#{% endif %}#}
+
+
+{% if property.deprecated %}
+== Deprecated ==
+  {{ property.tags.deprecated[0].description }}
+{% endif %}
+
+{% include 'includes/inherited-from.txt.twig' with {structure:property} %}
+
+{% include 'includes/see-also.txt.twig' with {structure:property, title_level: '=='} %}
+
+{% include 'includes/uses.txt.twig' with {structure:property, title_level: ''} %}
+
+{% include 'includes/tags.txt.twig' with {structure:property, title_level: '==', blacklist:  ['link', 'see', 'access', 'var', 'deprecated', 'uses', 'todo', 'code-example']} %}
+
+
+<code php>{{ property.visibility }}  ${{ property.name }}{% if property.types %} : {{ property.types|join('|')|raw }}{% endif %}</code>
+
+</WRAP>{# group #}
+
+{% endblock %}

.doc/phpdoc-templates/combodo-wiki/file.source.txt.twig

@@ -0,0 +1 @@
+{{ node.source|raw }}

.doc/phpdoc-templates/combodo-wiki/file.txt.twig

@@ -0,0 +1,122 @@
+{% extends 'layout.txt.twig' %}
+
+{% block javascripts %}
+
+{% endblock %}
+
+{% block content %}
+    {#<section class="row-fluid">#}
+        {#<div class="span2 sidebar">#}
+            {#{% set namespace = project.namespace %}#}
+            {#{{ block('sidebarNamespaces') }}#}
+        {#</div>#}
+    {#</section>#}
+    {#<section class="row-fluid">#}
+====== {{ node.path|split('/')|slice(0,-1)|join('/') }}{{ node.name }} ======
+{{ node.summary }}
+<html>{{ node.description|markdown|raw }}</html>
+
+{% if node.traits|length > 0 %}
+
+===== Traits =====
+{% for trait in node.traits %}
+    <tr>
+        <td>{{ trait|raw }}</td>
+        <td><em>{{ trait.summary }}</em></td>
+    </tr>
+{% endfor %}
+{% endif %}
+
+
+{% if node.interfaces|length > 0 %}
+===== Interfaces =====
+    {% for interface in node.interfaces %}
+        <tr>
+            <td>{{ interface|raw }}</td>
+            <td><em>{{ interface.summary }}</em></td>
+        </tr>
+    {% endfor %}
+{% endif %}
+
+{% if node.classes|length > 0 %}
+===== Classes =====
+{% for class in node.classes %}
+{{ class|raw }}
+<em>{{ class.summary }}</em>
+{% endfor %}
+{% endif %}
+
+{% if node.package is not empty and node.package != '\\' %}
+    ===== Package =====
+    {{ node.subpackage ? (node.package ~ '\\' ~ node.subpackage) : node.package }}
+{% endif %}
+
+{% for tagName,tags in node.tags if tagName in ['link', 'see'] %}
+    {% if loop.first %}
+        ===== See also =====
+    {% endif %}
+    {% for tag in tags %}
+        <dd><a href="{{ tag.reference ?: tag.link }}"><div class="namespace-wrapper">{{ tag.description ?: tag.reference }}</div></a></dd>
+    {% endfor %}
+{% endfor %}
+
+                    <h2>Tags</h2>
+                    <table class="table table-condensed">
+                        {% for tagName,tags in node.tags if tagName not in ['link', 'see', 'package', 'subpackage'] %}
+                            <tr>
+                                <th>
+                                    {{ tagName }}
+                                </th>
+                                <td>
+                                    {% for tag in tags %}
+                                        {{ tag.description|markdown|raw }}
+                                    {% endfor %}
+                                </td>
+                            </tr>
+                        {% else %}
+                            <tr><td colspan="2"><em>None found</em></td></tr>
+                        {% endfor %}
+                    </table>
+
+                </aside>
+            </div>
+
+            {% if node.constants|length > 0 %}
+            <div class="row-fluid">
+                <section class="span8 content file">
+                    <h2>Constants</h2>
+                </section>
+                <aside class="span4 detailsbar"></aside>
+            </div>
+
+                {% for constant in node.constants %}
+                    {{ block('constant') }}
+                {% endfor %}
+            {% endif %}
+
+            {% if node.functions|length > 0 %}
+            <div class="row-fluid">
+                <section class="span8 content file">
+                    <h2>Functions</h2>
+                </section>
+                <aside class="span4 detailsbar"></aside>
+            </div>
+
+                {% for method in node.functions %}
+                    {{ block('method') }}
+                {% endfor %}
+            {% endif %}
+
+        </div>
+    </section>
+
+    <div id="source-view" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="source-view-label" aria-hidden="true">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <h3 id="source-view-label">{{ node.file.name }}</h3>
+        </div>
+        <div class="modal-body">
+            <pre data-src="{{ path('files/' ~ node.path ~ '.txt')|raw }}" class="language-php line-numbers"></pre>
+        </div>
+    </div>
+{% endblock %}

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

@@ -0,0 +1,42 @@
+{% extends 'layout.html.twig' %}
+
+{% block stylesheets %}
+    <link href="{{ path('css/jquery.iviewer.css') }}" rel="stylesheet" media="all"/>
+    <style>
+        #viewer {
+            position: relative;
+            width: 100%;
+        }
+        .wrapper {
+            overflow: hidden;
+        }
+    </style>
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{{ path('js/jquery.mousewheel.js') }}" type="text/javascript"></script>
+    <script src="{{ path('js/jquery.iviewer.js') }}" type="text/javascript"></script>
+    <script type="text/javascript">
+        $(window).resize(function(){
+            $("#viewer").height($(window).height() - 100);
+        });
+
+        $(document).ready(function() {
+            $("#viewer").iviewer({src: '{{ path('graphs/classes.svg') }}', zoom_animation: false});
+            $('#viewer img').bind('dragstart', function(event){
+                event.preventDefault();
+            });
+            $(window).resize();
+        });
+    </script>
+{% endblock %}
+
+{% block content %}
+    <div class="row-fluid">
+        <div class="span12">
+            <div class="wrapper">
+                <div id="viewer" class="viewer"></div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

.doc/phpdoc-templates/combodo-wiki/htaccess.dist

@@ -0,0 +1,5 @@
+# Fixes a vulnerability in CentOS: http://stackoverflow.com/questions/20533279/prevent-php-from-parsing-non-php-files-such-as-somefile-php-txt
+<FilesMatch \.php\.txt$>
+    RemoveHandler .php
+    ForceType text/plain
+</FilesMatch>

.doc/phpdoc-templates/combodo-wiki/includes/code-examples.txt.twig

@@ -0,0 +1,34 @@
+{% if title_level is not defined %}
+    {%- set title_level = '==' -%}
+{% endif %}
+
+{% if sub_title_level is not defined %}
+    {%- set sub_title_level = title_level|slice(1) -%}
+{% endif %}
+{% if sub_title_level == '=' %}
+    {%- set sub_title_level = '' -%}
+{% endif %}
+
+{#{% for tagName,tags in structure.tags if tagName in ['code-example'] %}#}
+{#{% if loop.first %}#}
+{#{{title_level}} Examples {{title_level}}#}
+{#{% endif %}#}
+{#{% for tag in tags %}#}
+{#{%- set descToken = tag.description|split("\n", 2) -%}#}
+{#{%- set title = descToken[0] -%}#}
+{#{%- set code = descToken[1] -%}#}
+{#{{sub_title_level}} {{ title }} {{sub_title_level}}#}
+{#<code php>{{ code|raw }}</code>#}
+{#{% endfor %}#}
+{#{% endfor %}#}
+
+
+{% for tagName,tags in structure.tags if tagName in ['example'] %}
+{% if loop.first %}
+{{title_level}} Examples {{title_level}}
+{% endif %}
+{% for tag in tags %}
+{{ sub_title_level }} {{ tag.filePath|escape }}{{ sub_title_level }}
+<code php>{{ tag.description|raw }}</code>
+{% endfor %}
+{% endfor %}

.doc/phpdoc-templates/combodo-wiki/includes/inherited-from.txt.twig

@@ -0,0 +1,12 @@
+{% if title_level is not defined %}
+    {% set title_level='' %}
+{% endif %}
+
+{% if (node.parent is null) %}
+{{title_level}} File {{ structure.path }} {{title_level}}
+{% endif %}
+
+{% if (node.parent is not null and structure.parent.fullyQualifiedStructuralElementName != node.fullyQualifiedStructuralElementName) %}
+{{title_level}} Inherited from {{title_level}}
+[[{{structure.parent}}|{{structure.parent}}]]
+{% endif %}

.doc/phpdoc-templates/combodo-wiki/includes/namespace-structure-toc.html.twig

@@ -0,0 +1,26 @@
+{% for structure in structures|sort_asc if structure.tags['internal'] is not defined and (structure.tags['api'] is defined or structure.tags['api-advanced'] is  defined or structure.tags['overwritable-hook'] is  defined or structure.tags['extension-hook'] is  defined ) %}
+{#{{ structure|raw }}#}
+
+{% set structureName = structure|trim('\\', 'left') %}
+
+<WRAP group box>
+<WRAP twothirds column >
+==== {{ structureName }} ====
+</WRAP>{# twothirds column#}
+
+<WRAP third column>
+{% if structure.deprecated %}<wrap danger>deprecated</wrap>{% endif %}
+{% if structure.abstract %}<wrap warning>abstract</wrap>{% endif %}
+{% if structure.final %}<wrap notice>final</wrap>{% endif %}
+{% if (node.parent is not null and structure.parent.fullyQualifiedStructuralElementName != node.fullyQualifiedStructuralElementName) %}<wrap notice>inherited</wrap> {% endif %}
+{% include 'includes/wrap-tags.txt.twig' with {structure:structure, wrap: 'safety', wrapTags: ['api', 'api-advanced', 'overwritable-hook', 'extension-hook']} %}
+</WRAP>{# third column#}
+
+
+{{ structure.summary|raw }}
+[[{{structureName}}|More information]]
+
+</WRAP>{# group #}
+
+{% endfor %}
+

.doc/phpdoc-templates/combodo-wiki/includes/see-also.txt.twig

@@ -0,0 +1,26 @@
+{% if title_level is not defined %}
+    {%- set title_level='==' -%}
+{% endif %}
+{% for tagName,tags in structure.tags if tagName in ['link', 'see'] %}
+{% if loop.first %}
+{{title_level}} See also {{title_level}}
+{% endif %}
+{% for tag in tags %}
+{%- set linkTag = tag.reference|trim('\\', 'left') -%}
+{% if not('()' in linkTag or '$' in linkTag or node.name in linkTag or  '::' in linkTag ) %}
+    {%- set linkTag = linkTag|lower -%}
+{% elseif node.name~'::' in linkTag %}
+    {%- set linkTag = linkTag|replace({(node.name~'::'): '#'})|lower -%}
+{% elseif '::' in linkTag -%}
+    {%- set linkTag = linkTag|replace({'::': '#'})|lower -%}
+{% else %}
+    {%- set linkTag = '#' ~ linkTag|lower -%}
+{%- endif %}
+
+{% if loop.length > 1 %}  * {% endif %}{% if tag.reference is not empty -%}
+    [[{{linkTag}}|{{ (tag.reference)|trim('\\', 'left') }}]] {% if tag.description|trim is not empty %}: {{ tag.description|trim('\\', 'left') }} {% endif %}
+{%- else -%}
+    {#{{ tag.description|trim('\\', 'left') }}#}
+{% endif %}
+{% endfor %}
+{% endfor %}

.doc/phpdoc-templates/combodo-wiki/includes/tag-synthesys.txt.twig

@@ -0,0 +1,56 @@
+{% if tag is not defined -%}
+    {# Do not display @api if @api-advanced is also present #}
+    {%- set tag = "api" -%}
+{%- endif %}
+
+{% if hidden_by is not defined -%}
+    {# Do not display @api if @api-advanced is also present #}
+    {%- set hidden_by = {"api" : "api-advanced"} -%}
+{%- endif %}
+
+
+
+{% for method in methods|sort_asc
+    if (method.visibility == 'public')
+    and (
+        method.tags[tag] is defined
+        and (
+            hidden_by[tag] is not defined or method.tags[hidden_by[tag]] is not defined
+        )
+    )
+%}
+{%- if loop.first %}
+{% if tag == 'api' %}
+===== API synthesis =====
+<WRAP>
+List of the public API methods.
+When manipulating {{ node.name }}, You can call those methods:
+</WRAP>
+{% elseif tag == 'api-advanced' %}
+===== Advanced API synthesis =====
+<WRAP>
+List of advanced API methods
+Beware they usage is recommended to advanced users only.
+</WRAP>
+{% elseif tag == 'overwritable-hook' %}
+===== overwritable-hook synthesis =====
+<WRAP >When inheriting from {{ node.name }},
+you can overwrite those methods in order to add custom logic:
+</WRAP>
+{% elseif tag == 'extension-hook' %}
+===== extension-hook synthesis =====
+<WRAP >
+When inheriting from {{ node.name }},
+you can extend the behaviour of iTop by implementing:
+</WRAP>
+{% endif %}
+{% endif %}
+{% set sanitizedMethod = method|trim('\\', 'left')|replace({(node.name~'::'): ''}) %}
+{% if '::' in sanitizedMethod -%}
+{%- if node.tags['phpdoc-tuning-exclude-inherited'] is not defined %}
+  * [[{{sanitizedMethod|replace({'::': '#'})|lower}}|↪{{sanitizedMethod}}]] — {{  method.summary|replace({"\n":""})|raw }}
+{% endif %}
+{%- else %}
+  * [[#{{sanitizedMethod}}|{{sanitizedMethod}}]] — {{  method.summary|replace({"\n":""})|raw }}
+{% endif %}
+{% endfor %}

.doc/phpdoc-templates/combodo-wiki/includes/tags-with-description.txt.twig

@@ -0,0 +1,20 @@
+{% if title_level is not defined %}
+    {% set title_level = '==' %}
+{% endif %}
+
+
+{%- for tagName,tags in structure.tags if tagName in tagsWithDescription -%}
+    {%- for tag in tags -%}
+        {%- if tag.description is not empty -%}
+{%- if WRAP is defined -%}
+    <WRAP {{WRAP}}>
+{%- endif -%}
+{{title_level}} {{ tagName }} {{title_level}}
+{{ tag.description|escape }}
+{%- if WRAP is defined -%}
+    </WRAP>
+{%- endif -%}
+        {%- endif -%}
+    {%- endfor -%}
+{%- endfor -%}
+

.doc/phpdoc-templates/combodo-wiki/includes/tags.txt.twig

@@ -0,0 +1,22 @@
+{% if title_level is not defined %}
+    {% set title_level='=====' %}
+{% endif %}
+
+{% if blacklist is not defined %}
+    {% set blacklist =['link', 'see', 'abstract', 'example', 'method', 'property', 'property-read', 'property-write', 'package', 'subpackage', 'api', 'api-advanced', 'todo', 'code-example'] %}
+{% endif %}
+{% if hidden_by is not defined -%}
+    {# Do not display @api if @api-advanced is also present #}
+    {%- set hidden_by = {"api" : "api-advanced"} -%}
+{%- endif %}
+
+{#^ {% for tagName,tags in structure.tags if tagName not in blacklist -%}#}
+{#{{ tagName }} ^#}
+{#{%- endfor %}#}
+
+{% for tagName,tags in structure.tags if tagName not in blacklist and (hidden_by[tagName] is not defined or structure.tags[hidden_by[tagName]] is not defined) %}
+{%- if loop.first %}
+{{title_level}} Tags {{title_level}}
+{% endif %}
+^ {{ tagName }} | {% for tag in tags %}{{ tag.version ? tag.version ~ ' '  : '' }}{{ tag.description}}{% endfor %}   |
+{% endfor %}

.doc/phpdoc-templates/combodo-wiki/includes/used-by.txt.twig

@@ -0,0 +1,24 @@
+{% if title_level is not defined %}
+    {% set title_level='' %}
+{% endif %}
+{% for tagName,tags in structure.tags if tagName in ['used-by'] %}
+{% if loop.first %}
+{{title_level}} Used by {{title_level}}
+{% endif %}
+{% for tag in tags %}
+{% if loop.length > 1 %}  * {% endif %}{{ tag.reference ?: tag.link }} : {{ tag.description ?: tag.reference }}
+{% endfor %}
+{% endfor %}
+
+
+
+
+
+{#{% for tagName,tags in method.tags if tagName in ['uses'] %}#}
+    {#{% if loop.first %}#}
+        {#<dt>Uses</dt>#}
+    {#{% endif %}#}
+    {#{% for tag in tags %}#}
+        {#<dd>{{ tag.reference|raw }}</dd>#}
+    {#{% endfor %}#}
+{#{% endfor %}#}

.doc/phpdoc-templates/combodo-wiki/includes/uses.txt.twig

@@ -0,0 +1,24 @@
+{% if title_level is not defined %}
+    {% set title_level='' %}
+{% endif %}
+{% for tagName,tags in structure.tags if tagName in ['uses'] %}
+{% if loop.first %}
+{{title_level}} Uses {{title_level}}
+{% endif %}
+{% for tag in tags %}
+{% if loop.length > 1 %}  * {% endif %}{{ tag.reference ?: tag.link }} : {{ tag.description ?: tag.reference }}
+{% endfor %}
+{% endfor %}
+
+
+
+
+
+{#{% for tagName,tags in method.tags if tagName in ['uses'] %}#}
+    {#{% if loop.first %}#}
+        {#<dt>Uses</dt>#}
+    {#{% endif %}#}
+    {#{% for tag in tags %}#}
+        {#<dd>{{ tag.reference|raw }}</dd>#}
+    {#{% endfor %}#}
+{#{% endfor %}#}

.doc/phpdoc-templates/combodo-wiki/includes/wrap-tags.txt.twig

@@ -0,0 +1,11 @@
+{% if wrap is not defined -%}
+    {% set wrap = 'notice' %}
+{%- endif -%}
+{% if hidden_by is not defined -%}
+    {# Do not display @api if @api-advanced is also present #}
+    {%- set hidden_by = {"api" : "api-advanced"} -%}
+{%- endif %}
+
+{%- for tagName,tags in structure.tags if tagName in wrapTags and (hidden_by[tagName] is not defined or structure.tags[hidden_by[tagName]] is not defined) %}
+ <wrap {{wrap}}>{{tagName}}</wrap>
+{% endfor %}

.doc/phpdoc-templates/combodo-wiki/interface.txt.twig

@@ -0,0 +1,121 @@
+{% extends 'layout.txt.twig' %}
+
+{% block content %}
+<wrap button>[[start|🔙 Back]]</wrap>
+
+{% if node.tags['internal'] is defined %}
+====== {{ node.name }} ======
+<WRAP alert>This interface is "internal", and thus is not documented!</WRAP>
+{% elseif node.tags['api'] is not defined and node.tags['api-advanced'] is not defined and node.tags['overwritable-hook'] is not defined and node.tags['extension-hook'] is not defined %}
+====== {{ node.name }} ======
+<WRAP alert>This interface is neither "api", "overwritable-hook" or "extension-hook", and thus is not documented!</WRAP>
+{% else %}
+
+====== {{ node.name }} ======
+
+{% if node.deprecated %}<wrap danger>deprecated</wrap>{% endif %}
+{% if node.abstract %}<wrap warning>abstract</wrap>{% endif %}
+{% if node.final %}<wrap notice>final</wrap>{% endif %}
+{% include 'includes/wrap-tags.txt.twig' with {structure:node, wrap: 'safety', wrapTags: ['api', 'api-advanced', 'overwritable-hook', 'extension-hook']} %}
+
+
+
+{% if node.deprecated %}
+=== **<del>Deprecated</del>**===
+//{{ node.tags.deprecated[0].description }}//
+{% endif %}
+
+
+== {{  node.summary|replace({"\n":""})|raw }} ==
+<html>{{ node.description|markdown|raw }}</html>
+
+
+{% include 'includes/code-examples.txt.twig' with {structure:node, title_level: '====='} %}
+
+
+{% set class = node.parent %}
+{% block hierarchy_element %}
+
+{% if class and class.name is defined and class.name|trim != '' %}
+==== parent ====
+{% set child = class %}
+{% set class = class.parent %}
+{{ block('hierarchy_element') }}
+[[{{ child.name }}|{{ child.name }}]]
+{% endif %}
+{% endblock %}
+
+
+{% for interface in node.interfaces|sort_asc %}
+{% if loop.first %}
+==== Implements ====
+{% endif %}
+{% if loop.length > 1 %}  * {% endif %}{{ interface.fullyQualifiedStructuralElementName ?: interface }}
+{% endfor %}
+
+
+{% for trait in node.usedTraits|sort_asc %}
+{% if loop.first %}
+==== Uses traits ====
+{% endif %}
+{% if loop.length > 1 %}  * {% endif %}{{ trait.fullyQualifiedStructuralElementName ?: trait }}
+{% endfor %}
+
+
+{% include 'includes/see-also.txt.twig' with {structure:node, title_level: '==='} %}
+
+{% include 'includes/tags.txt.twig' with {structure:node, title_level: '=====', blacklist:  ['link', 'see', 'abstract', 'example', 'method', 'property', 'property-read', 'property-write', 'package', 'subpackage', 'phpdoc-tuning-exclude-inherited', 'api', 'api-advanced', 'overwritable-hook', 'extension-hook', 'copyright', 'license', 'code-example']} %}
+
+
+{% set methods = node.inheritedMethods.merge(node.methods) %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'api'} %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'api-advanced'} %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'overwritable-hook'} %}
+{% include 'includes/tag-synthesys.txt.twig' with {methods:methods, tag:'extension-hook'} %}
+
+<WRAP clear />
+
+
+{% for method in methods|sort_asc if method.visibility == 'public' %}
+{%- if loop.first %}
+===== Public methods =====
+{% endif %}
+{{ block('method') }}
+{% endfor %}
+{% for method in methods|sort_asc if method.visibility == 'protected' %}
+{%- if loop.first %}
+===== Protected methods =====
+{% endif %}
+{{ block('method') }}
+{% endfor %}
+
+
+
+{% set constants = node.inheritedConstants.merge(node.constants) %}
+{% if constants|length > 0 %}
+===== Constants =====
+{% for constant in constants|sort_asc %}
+{{ block('constant') }}
+{% endfor %}
+{% endif %}
+
+
+{#{% set properties = node.inheritedProperties.merge(node.properties) %}#}
+{#{% for property in properties|sort_asc if property.visibility == 'public' %}#}
+{#{%- if loop.first %}#}
+{#===== Public properties =====#}
+{#{% endif %}#}
+{#{{ block('property') }}#}
+{#{% endfor %}#}
+{#{% for property in properties|sort_asc if property.visibility == 'protected' %}#}
+{#{%- if loop.first %}#}
+{#===== Protected properties =====#}
+{#{% endif %}#}
+{#{{ block('property') }}#}
+{#{% endfor %}#}
+
+
+{%- endif %} {#{% elseif node.tags['xxx'] is not defined and ... #}
+
+<wrap button>[[start|🔙 Back]]</wrap>
+{% endblock %}

.doc/phpdoc-templates/combodo-wiki/layout.txt.twig

@@ -0,0 +1,5 @@
+{% use 'elements/constant.txt.twig' %}
+{% use 'elements/property.txt.twig' %}
+{% use 'elements/method.txt.twig' %}
+
+{% block content %}{% endblock %}

.doc/phpdoc-templates/combodo-wiki/namespace.txt.twig

@@ -0,0 +1,51 @@
+{% extends 'layout.txt.twig' %}
+
+{% block content %}
+{% set namespace = project.namespace %}
+{{ block('sidebarNamespaces') }}
+     
+{#{{ node.parent|raw }}#}
+{#====== {{ node.parent.fullyQualifiedStructuralElementName }}{{ node.name }} ======#}
+
+{% if node.children|length > 0 %}
+=====Namespaces=====
+{% include 'includes/namespace-structure-toc.html.twig' with {structures: node.children} %}
+----
+{% endif %}
+
+{% if node.traits|length > 0 %}
+===== Traits =====
+{% include 'includes/namespace-structure-toc.html.twig' with {structures: node.traits} %}
+----
+{%- endif %}
+
+{% if node.interfaces|length > 0 %}
+===== Interfaces =====
+{% include 'includes/namespace-structure-toc.html.twig' with {structures: node.interfaces} %}
+----
+{% endif %}
+
+{% if node.classes|length > 0 %}
+===== Classes =====
+{% include 'includes/namespace-structure-toc.html.twig' with {structures: node.classes} %}
+----
+{% endif %}
+
+
+
+{#{% if node.constants|length > 0 %}#}
+{#===== Constants =====#}
+{#{% for constant in node.constants|sort_asc %}#}
+{#    {{ block('constant') }}#}
+{#{% endfor %}#}
+{#{% endif %}#}
+
+{#{% if node.functions|length > 0 %}#}
+{#===== Functions =====#}
+
+{#{% for method in node.functions|sort_asc %}#}
+{#    {{ block('method') }}#}
+{#{% endfor %}#}
+{#{% endif %}#}
+
+{% endblock %}

.doc/phpdoc-templates/combodo-wiki/reports/deprecated.html.twig

@@ -0,0 +1,49 @@
+
+====== Deprecated elements ======
+
+{#{% for element in project.indexes.elements if element.deprecated %}#}
+    {#{% if element.file.path != previousPath %}#}
+        {#<li><a href="#{{ element.file.path }}"><i class="icon-file"></i> {{ element.file.path }}</a></li>#}
+    {#{% endif %}#}
+    {#{% set previousPath = element.file.path %}#}
+{#{% endfor %}#}
+
+{% for element in project.indexes.elements if element.deprecated %}
+    {% if element.file.path != previousPath %}
+    {% if previousPath %}
+</WRAP>{# group #}
+    {% endif %}
+    {#<a name="{{ element.file.path }}" id="{{ element.file.path }}"></a>#}
+===== {{ element.file.path }} ({{ element.tags.deprecated.count }} found)=====
+
+<WRAP group >
+<WRAP third column >
+Element
+</WRAP>{# third column#}
+<WRAP third column >
+Line
+</WRAP>{# third column#}
+<WRAP third column >
+Description
+</WRAP>{# third column#}
+
+{% endif %}
+{% for tag in element.tags.deprecated %}
+<WRAP group >
+<WRAP third column >
+    {{ element.fullyQualifiedStructuralElementName }}
+</WRAP>{# third column#}
+<WRAP third column >
+    {{ element.line }}
+</WRAP>{# third column#}
+<WRAP third column >
+    {{ tag.description }}
+</WRAP>{# third column#}
+
+{% endfor %}
+</WRAP>{# group #}
+{% set previousPath = element.file.path %}
+{% else %}
+<WRAP info>No deprecated elements have been found in this project.</WRAP>
+{% endfor %}
+

.doc/phpdoc-templates/combodo-wiki/template.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<template>
+  <author>Bruno DA SILVA</author>
+  <email>contact [at] combodo.com</email>
+  <version>1.0.0</version>
+  <copyright>Combodo 2018</copyright>
+  <description><![CDATA[
+
+      Forked from the clean theme of https://github.com/phpDocumentor/phpDocumentor2 provided under the MIT licence.
+      The original work is copyright "Mike van Riel".
+
+      ------------------------------------------------------------------------------------------------------------------
+
+      To improve performance you can add the following to your .htaccess:
+
+      <ifModule mod_deflate.c>
+          <filesMatch "\.(js|css|html)$">
+              SetOutputFilter DEFLATE
+          </filesMatch>
+      </ifModule>
+  ]]></description>
+  <transformations>
+    <transformation writer="twig" query="namespace" source="templates/combodo-wiki/namespace.txt.twig" artifact="start.txt"/>
+    <transformation writer="twig" query="indexes.classes" source="templates/combodo-wiki/class.txt.twig" artifact="{{name}}.txt"/>
+    <transformation writer="twig" query="indexes.interfaces" source="templates/combodo-wiki/interface.txt.twig" artifact="{{name}}.txt" />
+  </transformations>
+</template>

.github/workflows/action.yml

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

.make/dependencies/composer/tcpdf/tcpdfUpdateFonts.php

@@ -25,7 +25,7 @@ if (false === file_exists($sTcPdfRootFolder)) {
 	echo $sCurrentScriptFileName.": No TCPDF lib detected, exiting !\n";
 	return;
 }
-$sTcPdfFontsFolder = $sTcPdfRootFolder.'/fonts/';
+$sTcPdfFontsFolder = $sTcPdfRootFolder.'/Fonts/';
 
 
 /**

README.md

@@ -1,9 +1,5 @@
 <p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="/images/logos/logo-itop-baseline-light.svg">
-  <source media="(prefers-color-scheme: light)" srcset="/images/logos/logo-itop-baseline-dark.svg">
-  <img src="/images/logos/logo-itop-baseline-light.svg" width="350" alt="Logo iTop with baseline" />
-</picture>
+    <img src="https://www.combodo.com/logos/logo-itop-baseline.svg" width=350>
 </a></p>
 
 
@@ -110,7 +106,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Raenker, Martin
 - Roháč, Richard (a.k.a [@RohacRichard](https://github.com/RohacRichard))
 - Rosenke, Stephan
-- Rossi, Tommaso (a.k.a [@tomrss](https://www.github.com/tomrss))
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Šafránek, Jaroslav (a.k.a [jkcinik](https://sourceforge.net/u/jkcinik/profile/) on SourceForge)
 - Seki, Shoji
@@ -120,7 +115,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))
 - Tulio, Marco
 - Turrubiates, Miguel
-- Vlk, Karel (a.k.a [@vlk-charles](https://www.github.com/vlk-charles))
 
 ### Aliases
 

addons/userrights/userrightsprofile.class.inc.php

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

application/applicationcontext.class.inc.php

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

application/applicationextension.inc.php

@@ -64,13 +64,13 @@ interface iLoginFSMExtension extends iLoginExtension
 	 * If a page is displayed, the action must exit at this point
 	 * if LoginWebPage::LOGIN_FSM_RETURN_ERROR is returned $iErrorCode must be set
 	 * if LoginWebPage::LOGIN_FSM_RETURN_OK is returned then the login is OK and terminated
-	 * if LoginWebPage::LOGIN_FSM_CONTINUE is returned then the FSM will proceed to next plugin or state
+	 * if LoginWebPage::LOGIN_FSM_RETURN_IGNORE is returned then the FSM will proceed to next plugin or state
 	 *
 	 * @api
 	 * @param string $sLoginState (see LoginWebPage::LOGIN_STATE_...)
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	public function LoginAction($sLoginState, &$iErrorCode);
 }
@@ -83,7 +83,7 @@ interface iLoginFSMExtension extends iLoginExtension
  *  * If a page is displayed, the action must exit at this point
  *  * if LoginWebPage::LOGIN_FSM_RETURN_ERROR is returned $iErrorCode must be set
  *  * if LoginWebPage::LOGIN_FSM_RETURN_OK is returned then the login is OK and terminated
- *  * if LoginWebPage::LOGIN_FSM_CONTINUE is returned then the FSM will proceed to next plugin or to next state
+ *  * if LoginWebPage::LOGIN_FSM_RETURN_IGNORE is returned then the FSM will proceed to next plugin or to next state
  *
  * @api
  * @package LoginExtensibilityAPI
@@ -136,7 +136,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnStart(&$iErrorCode)
 	{
@@ -150,7 +150,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnModeDetection(&$iErrorCode)
 	{
@@ -167,7 +167,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnReadCredentials(&$iErrorCode)
 	{
@@ -181,7 +181,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
@@ -192,7 +192,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
@@ -203,7 +203,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnUsersOK(&$iErrorCode)
 	{
@@ -214,7 +214,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnConnected(&$iErrorCode)
 	{
@@ -225,7 +225,7 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
-	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
+	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
 	 */
 	protected function OnError(&$iErrorCode)
 	{
@@ -1711,11 +1711,6 @@ interface iRestServiceProvider
 	public function ExecOperation($sVersion, $sVerb, $aParams);
 }
 
-interface iRestInputSanitizer
-{
-	public function SanitizeJsonInput(string $sJsonInput): string;
-}
-
 /**
  * Minimal REST response structure. Derive this structure to add response data and error codes.
  *
@@ -1807,14 +1802,6 @@ class RestResult
 	 * @api
 	 */
 	public $message;
-	
-	/**
-	 * Sanitize the content of this result to hide sensitive information
-	 */
-	public function SanitizeContent()
-	{
-		// The default implementation does nothing
-	}
 }
 
 /**

application/cmdbabstract.class.inc.php

@@ -311,7 +311,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		{
 			$sParams .= $sName.'='.urlencode($value).'&'; // Always add a trailing &
 		}
-		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/'.$oObj->GetUIPage().'?'.$sParams.'class='.get_class($oObj).'&id='.$oObj->getKey().$oAppContext->GetForLink(true).'&a=1';
+		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/'.$oObj->GetUIPage().'?'.$sParams.'class='.get_class($oObj).'&id='.$oObj->getKey().'&'.$oAppContext->GetForLink().'&a=1';
 		$oPage->add_early_script(<<<JS
 	if (!sessionStorage.getItem('$sSessionStorageKey'))
 	{
@@ -1113,10 +1113,8 @@ HTML
 		}
 
 		// Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage.
-		/** @var \iTopWebPage $oPage */
-		$oKPI = new ExecutionKPI();
+		/** @var iTopWebPage $oPage */
 		$aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareHeader');
 		if (false === empty($aHeadersBlocks['subtitle'])) {
 			$oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']);
 		}
@@ -1129,12 +1127,8 @@ HTML
 		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB, '', $oObjectDetails);
 		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
 		$oPage->SetCurrentTab('UI:PropertiesTab');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareProperties($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareProperties');
-		$oKPI = new ExecutionKPI();
 		$this->DisplayBareRelations($oPage, $bEditMode);
-		$oKPI->ComputeStatsForExtension($this, 'DisplayBareRelations');
 
 
 		// Note: Adding the JS snippet which enables the image upload should have been done directly by the ActivityPanel which would have kept the independance principle
@@ -1337,7 +1331,7 @@ HTML
 					}
 				}
 			}
-            $aHeader['friendlyname'] = ['label' => MetaModel::GetName($sClassName)];
+
 			foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
 				$sColLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx) : $sAttCodeEx;
 
@@ -1358,7 +1352,6 @@ HTML
 			$aRow = [];
 			foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
 				$oObj = $aObjects[$sAlias];
-                $aRow["friendlyname"] = $oObj->Get('friendlyname');
 				foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
 					if (is_null($oObj)) {
 						$aRow[$oAttDef->GetCode()] = '';
@@ -3072,7 +3065,7 @@ JS
 		$oPage->add($oAppContext->GetForForm());
 
 		// Hook the cancel button via jQuery so that it can be unhooked easily as well if needed
-		$sDefaultUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_form&class='.$sClass.$oAppContext->GetForLink(true);
+		$sDefaultUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_form&class='.$sClass.'&'.$oAppContext->GetForLink();
 
 		$sCancelButtonOnClickScript = "let fOnClick{$this->m_iFormId}CancelButton = ";
 		if(isset($aExtraParams['js_handlers']['cancel_button_on_click'])){
@@ -3080,7 +3073,7 @@ JS
 		} else {
 			$sCancelButtonOnClickScript .= "function() { BackToDetails('$sClass', $iKey, '$sDefaultUrl', $sJSToken)};";
 		}
-		$sCancelButtonOnClickScript .= "$('#form_{$this->m_iFormId} button.cancel').on('click.navigation.itop', fOnClick{$this->m_iFormId}CancelButton);";
+		$sCancelButtonOnClickScript .= "$('#form_{$this->m_iFormId} button.cancel').on('click', fOnClick{$this->m_iFormId}CancelButton);";
 		$oPage->add_ready_script($sCancelButtonOnClickScript);
 
 		$iFieldsCount = count($aFieldsMap);
@@ -3446,18 +3439,8 @@ EOF
 					}
 					$sInputType = '';
 					$sInputId   = 'att_'.$iFieldIndex;
-					$value = $this->Get($sAttCode);
-					$sDisplayValue = $this->GetEditValue($sAttCode);
-					if ($oAttDef instanceof AttributeDateTime && !$oAttDef->IsNullAllowed() && $value === $oAttDef->GetNullValue()) {
-						$value = $oAttDef->GetDefaultValue($this);
-						if ($value !== $oAttDef->GetNullValue()) {
-							// Set default date
-							$this->Set($sAttCode, $value);
-							$sDisplayValue = $this->GetEditValue($sAttCode);
-						}
-					}
 					$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
-						$value, $sDisplayValue, $sInputId, '', $iExpectCode,
+						$this->Get($sAttCode), $this->GetEditValue($sAttCode), $sInputId, '', $iExpectCode,
 						$aArgs, true, $sInputType);
 					$aAttrib    = array(
 						'label' => '<span>'.$oAttDef->GetLabel().'</span>',
@@ -5940,14 +5923,14 @@ JS
 	 *
 	 * @since 3.1.0
 	 */
-	final protected function FireEventCheckToWrite(?string $sStimulusBeingApplied): void
+	final protected function FireEventCheckToWrite(): void
 	{
-		$this->FireEvent(EVENT_DB_CHECK_TO_WRITE, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_CHECK_TO_WRITE, ['is_new' => $this->IsNew()]);
 	}
 
-	final protected function FireEventBeforeWrite(?string $sStimulusBeingApplied)
+	final protected function FireEventBeforeWrite()
 	{
-		$this->FireEvent(EVENT_DB_BEFORE_WRITE, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_BEFORE_WRITE, ['is_new' => $this->IsNew()]);
 	}
 
 	/**
@@ -5959,11 +5942,11 @@ JS
 	 * @throws \CoreException
 	 * @since 3.1.0
 	 */
-	final protected function FireEventAfterWrite(array $aChanges, bool $bIsNew, ?string $sStimulusBeingApplied): void
+	final protected function FireEventAfterWrite(array $aChanges, bool $bIsNew): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
 		$this->RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
-		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges, 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges]);
 	}
 
 	//////////////
@@ -6104,9 +6087,7 @@ JS
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
 		$oObject = MetaModel::GetObject($sClass, $sId, false);
-		if (!is_null($oObject)) {
-			self::FireEventDbLinksChangedForObject($oObject);
-		}
+		self::FireEventDbLinksChangedForObject($oObject);
 		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 	}
 
@@ -6114,11 +6095,13 @@ JS
 	{
 		self::SetEventDBLinksChangedBlocked(true);
 		// N°6408 The object can have been deleted
-		$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
+		if (!is_null($oObject)) {
+			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
 
-		// Update the object if needed
-		if (count($oObject->ListChanges()) !== 0) {
-			$oObject->DBUpdate();
+			// Update the object if needed
+			if (count($oObject->ListChanges()) !== 0) {
+				$oObject->DBUpdate();
+			}
 		}
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
 	}
@@ -6196,9 +6179,9 @@ JS
 	 * @inheritDoc
 	 * @throws \CoreException
 	 */
-	final protected function FireEventComputeValues(?string $sStimulusBeingApplied): void
+	final protected function FireEventComputeValues(): void
 	{
-		$this->FireEvent(EVENT_DB_COMPUTE_VALUES, ['is_new' => $this->IsNew(), 'stimulus_applied' => $sStimulusBeingApplied]);
+		$this->FireEvent(EVENT_DB_COMPUTE_VALUES);
 	}
 
 	/**

application/dashboard.class.inc.php

@@ -524,7 +524,9 @@ EOF
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
 	{
-		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? null, $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+		if (!array_key_exists('dashboard_div_id', $aExtraParams)) {
+			$aExtraParams['dashboard_div_id'] = utils::Sanitize($this->GetId(), '', 'element_identifier');
+		}
 
 		/** @var \DashboardLayoutMultiCol $oLayout */
 		$oLayout = new $this->sLayoutClass();
@@ -1050,7 +1052,7 @@ EOF
 		$sSelectorHtml .= '</div>';
 
 		$sFile = addslashes($this->GetDefinitionFile());
-		$sReloadURL = json_encode($this->GetReloadURL());
+		$sReloadURL = $this->GetReloadURL();
 
 		$bFromDashboardPage = isset($aAjaxParams['from_dashboard_page']) ? isset($aAjaxParams['from_dashboard_page']) : false;
 		if ($bFromDashboardPage) {
@@ -1139,6 +1141,7 @@ JS
 			->AddCSSClass('ibo-action-button');
 
 		$oToolbar->AddSubBlock($oActionButton);
+
 		$aActions = array();
 		$sFile = addslashes(utils::LocalPath($this->sDefinitionFile));
 		$sJSExtraParams = json_encode($aExtraParams);
@@ -1163,7 +1166,7 @@ JS
 		$oToolbar->AddSubBlock($oActionButton)
 			->AddSubBlock($oActionsMenu);
 
-		$sReloadURL = json_encode($this->GetReloadURL());
+		$sReloadURL = $this->GetReloadURL();
 		$oPage->add_script(
 			<<<EOF
 function EditDashboard(sId, sDashboardFile, aExtraParams)
@@ -1263,14 +1266,15 @@ EOF
 		$sOkButtonLabel = Dict::S('UI:Button:Save');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		
-		$sId = json_encode($this->sId);
-		$sLayoutClass = json_encode($this->sLayoutClass);
+		$sId = utils::HtmlEntities($this->sId);
+		$sLayoutClass = utils::HtmlEntities($this->sLayoutClass);
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
-		$sTitle = json_encode($this->sTitle);
-		$sFile = json_encode($this->GetDefinitionFile());
+		$sTitle = utils::HtmlEntities($this->sTitle);
+		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
+		$sFileForJS = json_encode($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
-		$sReloadURL = json_encode($this->GetReloadURL());
+		$sReloadURL = $this->GetReloadURL();
 
 		$sExitConfirmationMessage = addslashes(Dict::S('UI:NavigateAwayConfirmationMessage'));
 		$sCancelConfirmationMessage = addslashes(Dict::S('UI:CancelConfirmationMessage'));
@@ -1324,15 +1328,15 @@ $('#dashboard_editor').dialog({
 });
 
 $('#dashboard_editor .ui-layout-center').runtimedashboard({
-	dashboard_id: $sId, 
-	layout_class: $sLayoutClass, 
-	title: $sTitle,
+	dashboard_id: '$sId', 
+	layout_class: '$sLayoutClass', 
+	title: '$sTitle',
 	auto_reload: $sAutoReload, 
 	auto_reload_sec: $sAutoReloadSec,
 	submit_to: '$sUrl', 
-	submit_parameters: {operation: 'save_dashboard', file: $sFile, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	submit_parameters: {operation: 'save_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	render_to: '$sUrl', 
-	render_parameters: {operation: 'render_dashboard', file: $sFile, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	render_parameters: {operation: 'render_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	new_dashlet_parameters: {operation: 'new_dashlet'}
 });
 

application/dashlet.class.inc.php

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

application/datamodel.application.xml

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

application/displayblock.class.inc.php

@@ -706,7 +706,7 @@ class DisplayBlock
 				if ($bDoSearch)
 				{
 					// Keep the table_id identifying this table if we're performing a search
-					$sTableId = utils::ReadParam('_table_id_', null, false, utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+					$sTableId = utils::ReadParam('_table_id_', null, false, 'raw_data');
 					if ($sTableId != null)
 					{
 						$aExtraParams['table_id'] = $sTableId;
@@ -1124,7 +1124,7 @@ JS
 						$oSingleGroupByValueFilter->SetShowObsoleteData($this->m_bShowObsoleteData);
 					}
 					$sHyperlink = utils::GetAbsoluteUrlAppRoot()
-						.'pages/UI.php?operation=search'.$oAppContext->GetForLink(true)
+						.'pages/UI.php?operation=search&'.$oAppContext->GetForLink()
 						.'&filter='.rawurlencode($oSingleGroupByValueFilter->serialize());
 					$aCounts[$sStateValue] = ['link' => $sHyperlink, 'label' => $aCounts[$sStateValue]];
 				}
@@ -1232,7 +1232,7 @@ JS
 		$iCount = $this->m_oSet->Count();
 		$sClassLabel = MetaModel::GetName($sClass);
 		$sClassIconUrl = MetaModel::GetClassIcon($sClass, false);
-		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize());
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize());
 
 		$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
 		$aRefreshParams = [
@@ -1241,7 +1241,7 @@ JS
 		];
 
 		if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY)) {
-			$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.$oAppContext->GetForLink(true);
+			$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.'&'.$oAppContext->GetForLink();
 			$sCreateActionLabel = Dict::Format('UI:Button:Create');
 			$oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, $sCreateActionUrl,
 				$sCreateActionLabel, $aRefreshParams);
@@ -1289,7 +1289,7 @@ JS
 
 			$aData = array();
 			$oAppContext = new ApplicationContext();
-			$sParams = $oAppContext->GetForLink(true);
+			$sParams = $oAppContext->GetForLink();
 			foreach ($aGroupBy as $iRow => $iCount) {
 				// Build the search for this subset
 				$oSubsetSearch = $this->m_oFilter->DeepClone();
@@ -1304,7 +1304,7 @@ JS
 
 				$aData[] = array(
 					'group' => $aLabels[$iRow],
-					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1$sParams&filter=$sFilter\">$iCount</a>"
+					'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter\">$iCount</a>"
 				); // TO DO: add the context information
 			}
 			$aAttribs = array(
@@ -1636,7 +1636,7 @@ JS
 		$sGroupByExpr = isset($aExtraParams['group_by_expr']) ? '&params[group_by_expr]='.$aExtraParams['group_by_expr'] : '';
 		$sFilter = $this->m_oFilter->serialize(false, $aQueryParams);
 		$oContext = new ApplicationContext();
-		$sContextParam = $oContext->GetForLink(true);
+		$sContextParam = $oContext->GetForLink();
 		$sAggregationFunction = isset($aExtraParams['aggregation_function']) ? $aExtraParams['aggregation_function'] : '';
 		$sAggregationAttr = isset($aExtraParams['aggregation_attribute']) ? $aExtraParams['aggregation_attribute'] : '';
 		$sLimit = isset($aExtraParams['limit']) ? $aExtraParams['limit'] : '';
@@ -1644,7 +1644,7 @@ JS
 		$sOrderDirection = isset($aExtraParams['order_direction']) ? $aExtraParams['order_direction'] : '';
 
 		if (isset($aExtraParams['group_by_label'])) {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam;
 		} else {
 			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sChartId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sChartId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam;
 		}
@@ -1681,14 +1681,11 @@ JS
 		$oBlock = null;
 		$sJSURLs = '';
 
-		$oContext = new ApplicationContext();
-		$sContextParam = $oContext->GetForLink(true);
-
 		if (isset($aExtraParams['group_by'])) {
 			$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
 			$aRes = CMDBSource::QueryToArray($sSql);
-
-
+			$oContext = new ApplicationContext();
+			$sContextParam = $oContext->GetForLink();
 
 			$iTotalCount = 0;
 			$aURLs = array();
@@ -1708,14 +1705,14 @@ JS
 				$oSubsetSearch = $this->m_oFilter->DeepClone();
 				$oCondition = new BinaryExpression($oGroupByExp, '=', new ScalarExpression($sValue));
 				$oSubsetSearch->AddConditionExpression($oCondition);
-				$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).$sContextParam;
+				$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).'&'.$sContextParam;
 			}
 			$sJSURLs = json_encode($aURLs);
 		}
 		if (isset($aExtraParams['group_by_label'])) {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).'&'.$sContextParam;
 		} else {
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).$sContextParam;
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$aExtraParams[group_by]&params[chart_type]=$sChartType&params[currentId]=$aExtraParams[currentId]&params[order_direction]=$aExtraParams[order_direction]&params[order_by]=$aExtraParams[order_by]&params[limit]=$aExtraParams[limit]&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId&filter=".rawurlencode($this->m_oFilter->ToOQL()).'&'.$sContextParam;
 		}
 
 		switch ($sChartType) {
@@ -1788,7 +1785,7 @@ JS
 
 		$oBlock->sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv';
 		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
-		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
+		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
 		// Pass the parameters via POST, since expression may be very long
 		$aParamsToPost = array(
 			'expression' => $this->m_oFilter->ToOQL(true),
@@ -1888,7 +1885,10 @@ class MenuBlock extends DisplayBlock
 			&& (!isset($aExtraParams['menu']) || $aExtraParams['menu'] === "1" || $aExtraParams['menu'] === true)
 		) {
 			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink(true);
+			$sContext = $oAppContext->GetForLink();
+			if (utils::IsNotNullOrEmptyString($sContext)) {
+				$sContext = '&'.$sContext;
+			}
 
 
 			$sFilter = $this->GetFilter()->serialize();
@@ -2024,8 +2024,8 @@ class MenuBlock extends DisplayBlock
 					$sSelectedClassName = MetaModel::GetName($sSelectedClass);
 
 					// Check rights on class
-					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
-					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE);
+					$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sSelectedClass)) && UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_MODIFY, $oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+					$bIsBulkDeleteAllowed = (bool) UserRights::IsActionAllowed($sSelectedClass, UR_ACTION_BULK_DELETE, $sSelectedClass);
 
 					// Refine filter on selected class so bullk actions occur on the right class
 					$oSelectedClassFilter = $this->GetFilter()->DeepClone();
@@ -2578,8 +2578,11 @@ class MenuBlock extends DisplayBlock
 		$sUrl = "{$sRootUrl}pages/{$sUIPage}?{$sUrlParams}";
 
 		$oAppContext = new ApplicationContext();
-		$sContext = $oAppContext->GetForLink(true);
+		$sContext = $oAppContext->GetForLink();
+		if (utils::IsNotNullOrEmptyString($sContext)) {
+			$sUrl .= '&'.$sContext;
+		}
 
-		return $sUrl . $sContext;
+		return $sUrl;
 	}
 }

application/exceptions/CoreCannotSaveObjectException.php

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

application/exceptions/CoreException.php

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

application/menunode.class.inc.php

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

application/ui.extkeywidget.class.inc.php

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

application/user.preferences.class.inc.php

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

application/utils.inc.php

@@ -113,11 +113,6 @@ class utils
 	 * @since 2.7.10 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER = 'element_identifier';
-	/**
-	 * @var string For XML / HTML node id/class selector
-	 * @since 3.1.2 3.2.1
-	 */
-	public const ENUM_SANITIZATION_FILTER_ELEMENT_SELECTOR = 'element_selector';
 	/**
 	 * @var string For variables names
 	 * @since 3.0.0
@@ -180,7 +175,6 @@ class utils
 	 */
 	private static $sAbsoluteUrlAppRootCache = null;
 
-
 	protected static function LoadParamFile($sParamFile)
 	{
 		if (!file_exists($sParamFile)) {
@@ -419,26 +413,11 @@ class utils
 	 * @since 2.7.7, 3.0.2, 3.1.0 N°4899 - new 'url' filter
 	 * @since 2.7.10 N°6606 use the utils::ENUM_SANITIZATION_* const
 	 * @since 2.7.10 N°6606 new case for ENUM_SANITIZATION_FILTER_PHP_CLASS
-	 * @since 3.2.1-1 N°8242 Allow value to be an array for every filter
 	 *
 	 * @link https://www.php.net/manual/en/filter.filters.sanitize.php PHP sanitization filters
 	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
-		if (is_array($value))
-		{
-			$retValue = array();
-			foreach ($value as $key => $val)
-			{
-				$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
-				if ($retValue[$key] === false)
-				{
-					return false;
-				}
-			}
-			return $retValue;
-		}
-
 		switch ($sSanitizationFilter)
 		{
 			case static::ENUM_SANITIZATION_FILTER_INTEGER:
@@ -469,50 +448,57 @@ class utils
 			case static::ENUM_SANITIZATION_FILTER_PARAMETER:
 			case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
 			case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
-				switch ($sSanitizationFilter)
+				if (is_array($value))
 				{
-					case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
-						// Same as parameter type but keep the dot character
-						// transaction_id, the dot is mostly for Windows servers when using file storage as the tokens are named *.tmp
-						// - See N°1835
-						// - Note: It must be included at the regexp beginning otherwise you'll get an invalid character error
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
-						break;
+					$retValue = array();
+					foreach ($value as $key => $val)
+					{
+						$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
+						if ($retValue[$key] === false)
+						{
+							$retValue = false;
+							break;
+						}
+					}
+				}
+				else
+				{
+					switch ($sSanitizationFilter)
+					{
+						case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
+							// Same as parameter type but keep the dot character
+							// transaction_id, the dot is mostly for Windows servers when using file storage as the tokens are named *.tmp
+							// - See N°1835
+							// - Note: It must be included at the regexp beginning otherwise you'll get an invalid character error
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_ROUTE:
-					case static::ENUM_SANITIZATION_FILTER_OPERATION:
-						// - Routes should be of the "controller_namespace_code.controller_method_name" form
-						// - Operations should be allowed to be namespaced as well even though then don't have dedicated controller yet
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\.A-Za-z0-9_-]*$/')));
-						break;
+						case static::ENUM_SANITIZATION_FILTER_ROUTE:
+						case static::ENUM_SANITIZATION_FILTER_OPERATION:
+							// - Routes should be of the "controller_namespace_code.controller_method_name" form
+							// - Operations should be allowed to be namespaced as well even though then don't have dedicated controller yet
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[\.A-Za-z0-9_-]*$/')));
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_PARAMETER:
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
-						// Characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
-						break;
+						case static::ENUM_SANITIZATION_FILTER_PARAMETER:
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
+							// Characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
-						break;
+						case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
+							break;
 
-					case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
-						break;
+						case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
+							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
+							break;
 
+					}
 				}
 				break;
 
-			// For XML / HTML node identifiers
 			case static::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER:
 				$retValue = preg_replace('/[^a-zA-Z0-9_-]/', '', $value);
-				$retValue = filter_var($retValue, FILTER_VALIDATE_REGEXP,
-					['options' => ['regexp' => '/^[A-Za-z0-9][A-Za-z0-9_-]*$/']]);
-				break;
-
-			// For XML / HTML node id selector
-			case static::ENUM_SANITIZATION_FILTER_ELEMENT_SELECTOR:
-				$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
-					['options' => ['regexp' => '/^[#\.][A-Za-z0-9][A-Za-z0-9_-]*$/']]);
 				break;
 
 			case static::ENUM_SANITIZATION_FILTER_VARIABLE_NAME:
@@ -521,8 +507,8 @@ class utils
 
 			// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
-				$retValue = filter_var($value, FILTER_SANITIZE_URL);
-				$retValue = filter_var($retValue, FILTER_VALIDATE_URL);
+                // N°6350 - returns only valid URLs
+				$retValue = filter_var($value, FILTER_VALIDATE_URL);
 				break;
 
 			default:
@@ -1451,12 +1437,9 @@ class utils
 	 * @return string A path to a folder into which any module can store cache data
 	 * The corresponding folder is created or cleaned upon code compilation
 	 */
-	public static function GetCachePath(string $sEnvironment = null): string
+	public static function GetCachePath()
 	{
-		if (is_null($sEnvironment)) {
-			$sEnvironment = MetaModel::GetEnvironment();
-		}
-		return static::GetDataPath()."cache-$sEnvironment/";
+		return static::GetDataPath().'cache-'.MetaModel::GetEnvironment().'/';
 	}
 
 	/**
@@ -1516,12 +1499,12 @@ class utils
 			case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
 				/** @var \DBObjectSet $param */
 				$oAppContext = new ApplicationContext();
-				$sContext = $oAppContext->GetForLink(true);
+				$sContext = $oAppContext->GetForLink();
 				$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
 				$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($param->GetFilter()->GetClass());
 				$sOQL = addslashes($param->GetFilter()->ToOQL(true));
 				$sFilter = urlencode($param->GetFilter()->serialize());
-				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter.$sContext;
+				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
 				$oContainerBlock->AddJsFileRelPath('js/tabularfieldsselector.js');
 				$oContainerBlock->AddJsFileRelPath('js/jquery.dragtable.js');
 				$oContainerBlock->AddCssFileRelPath('css/dragtable.css');
@@ -1555,10 +1538,6 @@ class utils
 				}
 				$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL', '$sContext')");
 				$aResult[] = new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')");
-                if (ApplicationMenu::IsMenuIdEnabled('RunQueriesMenu')) {
-                    $oMenuItemPlay = new JSPopupMenuItem('UI:Menu:OpenOQL', Dict::S('UI:Menu:OpenOQL'), "OpenOql('$sOQL')");
-                    $aResult[] = $oMenuItemPlay;
-                }
 
 				break;
 
@@ -1695,8 +1674,8 @@ class utils
 		$oAppContext = new ApplicationContext();
 
 		$sUrl = $sAppRootUrl
-			.'pages/UI.php?operation=search'
-			.$oAppContext->GetForLink(true)
+			.'pages/UI.php?operation=search&'
+			.$oAppContext->GetForLink()
 			.'&filter='.rawurlencode($oDataTableSearchFilter->serialize());
 		$sUrl .= '&aParams='.rawurlencode($sParams); // Not working... yet, cause not handled by UI.php
 
@@ -2079,127 +2058,6 @@ SQL;
 		);
 	}
 
-	/**
-	*  Format a string using vsprintf with safety checks to avoid ValueError
-	*
-	*  This method fills missing arguments with their original format specifiers,
-	*  then calls vsprintf with the complete array.
-	*
-	* @param string $sFormat The format string
-	* @param array $aArgs The arguments to format
-	* @param bool $bLogErrors Whether to log errors (defaults to true)
-	*
-	* @return string The formatted string
-	 * @since 3.2.2
-	*/
-	public static function VSprintf(string $sFormat, array $aArgs, bool $bLogErrors = true): string
-	{
-		// Extract all format specifiers
-		$sPattern = '/%(?:(?:[1-9][0-9]*)\$)?[-+\'0# ]*(?:[0-9]*|\*)?(?:\.(?:[0-9]*|\*))?(?:[hlL])?[diouxXeEfFgGcrs%]/';
-		preg_match_all($sPattern, $sFormat, $aMatches, PREG_OFFSET_CAPTURE);
-
-		// Process matches, keeping track of their positions and excluding escaped percent signs (%%)
-		$aSpecifierMatches = [];
-		foreach ($aMatches[0] as $sMatch) {
-			if ($sMatch[0] !== '%%') {
-				$aSpecifierMatches[] = $sMatch;
-			}
-		}
-
-		// Check for positional specifiers and build position map
-		$bHasPositional = false;
-		$iMaxPosition = 0;
-		$aPositions = [];
-		$aUniquePositions = [];
-
-		foreach ($aSpecifierMatches as $index => $match) {
-			$sSpec = $match[0];
-			if (preg_match('/^%([1-9][0-9]*)\$/', $sSpec, $posMatch)) {
-				$bHasPositional = true;
-				$iPosition = (int)$posMatch[1] - 1; // Convert to 0-based
-				$aPositions[$index] = $iPosition;
-				$aUniquePositions[$iPosition] = true;
-				$iMaxPosition = max($iMaxPosition, $iPosition + 1);
-			} else {
-				$aPositions[$index] = $index;
-				$aUniquePositions[$index] = true;
-				$iMaxPosition = max($iMaxPosition, $index + 1);
-			}
-		}
-
-		// Count unique positions, this tells us how many arguments we actually need
-		$iExpectedCount = count($aUniquePositions);
-		$iActualCount = count($aArgs);
-
-		// If we have enough arguments, just use vsprintf
-		if ($iActualCount >= $iExpectedCount) {
-			return vsprintf($sFormat, $aArgs);
-		}
-		// else log the error if needed
-		if ($bLogErrors) {
-			IssueLog::Warning("Format string requires $iExpectedCount arguments, but only $iActualCount provided. Format: '$sFormat'"	);
-		}
-
-		// Create a replacement map
-		if ($bHasPositional) {
-			// For positional, we need to handle the exact positions
-			$aReplacements = array_fill(0, $iMaxPosition, null);
-
-			// Fill in the real arguments first
-			foreach ($aArgs as $index => $sValue) {
-				if ($index < $iMaxPosition) {
-					$aReplacements[$index] = $sValue;
-				}
-			}
-
-			// For null values in the replacement map, use the original specifier
-			foreach ($aSpecifierMatches as $index => $sMatch) {
-				$iPosition = $aPositions[$index];
-				if ($aReplacements[$iPosition] === null) {
-					// Use the original format specifier when we don't have an argument
-					$aReplacements[$iPosition] = $sMatch[0];
-				}
-			}
-
-			// Remove any remaining nulls (for positions that weren't referenced)
-			$aReplacements = array_filter($aReplacements, static function($val) { return $val !== null; });
-		} else {
-			// For non-positional, we need to map each position
-			$aReplacements = [];
-			$iUsed = 0;
-
-			// Create a map of what values to use for each position
-			$aPositionValues = [];
-			for ($i = 0; $i < $iMaxPosition; $i++) {
-				if (isset($aUniquePositions[$i])) {
-					if ($iUsed < $iActualCount) {
-						// We have an actual argument for this position
-						$aPositionValues[$i] = $aArgs[$iUsed++];
-					} else {
-						// Mark this position to use the original specifier
-						$aPositionValues[$i] = null;
-					}
-				}
-			}
-
-			// Build the replacements array preserving the original order
-			foreach ($aSpecifierMatches as $index => $sMatch) {
-				$iPosition = $aPositions[$index];
-				if (isset($aPositionValues[$iPosition])) {
-					$aReplacements[] = $aPositionValues[$iPosition];
-				} else {
-					// Use the original format specifier when we don't have an argument
-					$aReplacements[] = $sMatch[0];
-					// Mark this position as used, so if it appears again, it gets the same replacement
-					$aPositionValues[$iPosition] = $sMatch[0];
-				}
-			}
-		}
-
-		// Process the format string with our filled-in arguments
-		return vsprintf($sFormat, $aReplacements);
-	}
-
 	/**
 	 * Convert a string containing some (valid) HTML markup to plain text
 	 *
@@ -2518,75 +2376,53 @@ SQL;
 		return $bRet;
 	}
 
-	/**
-	 * @param $sPath
-	 *
-	 * @return false|\ormDocument
-	 * @throws \Exception
-	 *
-	 * @deprecated 3.2.1 use utils::GetDocumentFromSelfURL instead
-	 */
-	public static function IsSelfURL($sPath)
-	{
-		return self::GetDocumentFromSelfURL($sPath);
-	}
-
 	/**
 	 * Check if the given URL is a link to download a document/image on the CURRENT iTop
 	 * In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument
-	 *
-	 * @Since 3.2.1 a local URL is transformed into a local file to read
-	 *
 	 * @param string $sPath
 	 * @return false|ormDocument
 	 * @throws Exception
 	 */
-	public static function GetDocumentFromSelfURL(string $sPath)
+	public static function IsSelfURL($sPath)
 	{
+		$result = false;
 		$sPageUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.document.php';
-		if (utils::StartsWith($sPath, $sPageUrl)) {
+		if (substr($sPath, 0, strlen($sPageUrl)) == $sPageUrl)
+		{
 			// If the URL is an URL pointing to this instance of iTop, then
 			// extract the "query" part of the URL and analyze it
 			$sQuery = parse_url($sPath, PHP_URL_QUERY);
-			if ($sQuery !== null) {
+			if ($sQuery !== null)
+			{
 				$aParams = array();
-				foreach (explode('&', $sQuery) as $sChunk) {
+				foreach(explode('&', $sQuery) as $sChunk)
+				{
 					$aParts = explode('=', $sChunk ?? '');
-					if (count($aParts) != 2) {
-						continue;
-					}
+					if (count($aParts) != 2) continue;
 					$aParams[$aParts[0]] = urldecode($aParts[1]);
 				}
 				$result = array_key_exists('operation', $aParams) && array_key_exists('class', $aParams) && array_key_exists('id', $aParams) && array_key_exists('field', $aParams) && ($aParams['operation'] == 'download_document');
-				if ($result) {
+				if ($result)
+				{
 					// This is a 'download_document' operation, let's retrieve the document directly from the database
 					$sClass = $aParams['class'];
 					$iKey = $aParams['id'];
 					$sAttCode = $aParams['field'];
 
 					$oObj = MetaModel::GetObject($sClass, $iKey, false /* must exist */); // Users rights apply here !!
-					if ($oObj) {
+					if ($oObj)
+					{
 						/**
 						 * @var ormDocument $result
 						 */
-						return clone $oObj->Get($sAttCode);
+						$result = clone $oObj->Get($sAttCode);
+						return $result;
 					}
 				}
 			}
 			throw new Exception('Invalid URL. This iTop URL is not pointing to a valid Document/Image.');
 		}
-
-		if (utils::StartsWith($sPath, utils::GetAbsoluteUrlAppRoot())) {
-			$sFilePath = utils::LocalPath(APPROOT.substr($sPath, strlen(utils::GetAbsoluteUrlAppRoot())));
-			if (false === $sFilePath) {
-				return false;
-			}
-
-			$sFilePath = APPROOT.$sFilePath;
-			return ormDocument::FromFile($sFilePath);
-		}
-
-		return false;
+		return $result;
 	}
 
 	/**
@@ -2594,28 +2430,68 @@ SQL;
 	 * - an URL pointing to a blob (image/document) on the current iTop server
 	 * - an http(s) URL
 	 * - the local file system (but only if you are an administrator)
-	 *
-	 * @param string|null $sPath
+	 * @param string $sPath
 	 * @return ormDocument|null
 	 * @throws Exception
 	 */
 	public static function FileGetContentsAndMIMEType($sPath)
 	{
-		if (utils::IsNullOrEmptyString($sPath)) {
+		$oUploadedDoc = null;
+		$aKnownExtensions = array(
+				'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+				'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+				'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+				'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+				'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+				'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+				'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+				'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+				'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+				'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+				'jpg' => 'image/jpeg',
+				'jpeg' => 'image/jpeg',
+				'gif' => 'image/gif',
+				'png' => 'image/png',
+				'pdf' => 'application/pdf',
+				'doc' => 'application/msword',
+				'dot' => 'application/msword',
+				'xls' => 'application/vnd.ms-excel',
+			'ppt' => 'application/vnd.ms-powerpoint',
+			'vsd' => 'application/x-visio',
+			'vdx' => 'application/visio.drawing',
+			'odt' => 'application/vnd.oasis.opendocument.text',
+			'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+			'odp' => 'application/vnd.oasis.opendocument.presentation',
+			'zip' => 'application/zip',
+			'txt' => 'text/plain',
+			'htm' => 'text/html',
+			'html' => 'text/html',
+			'exe' => 'application/octet-stream',
+		);
+
+		$sData = null;
+		$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
+		$sFileName = 'uploaded-file'; // Default name for downloaded-files
+		$sExtension = '.txt'; // Default file extension in case we don't know the MIME Type
+
+		if(empty($sPath))
+		{
 			// Empty path (NULL or '') means that there is no input, making an empty document.
-			return new ormDocument('', '', '');
+			$oUploadedDoc = new ormDocument('', '', '');
 		}
-
-		if (static::IsURL($sPath)) {
-			$oUploadedDoc = static::GetDocumentFromSelfURL($sPath);
-			if ($oUploadedDoc) {
-				return $oUploadedDoc;
+		elseif (static::IsURL($sPath))
+		{
+			if ($oUploadedDoc = static::IsSelfURL($sPath))
+			{
+				// Nothing more to do, we've got it !!
 			}
-
-			// Remote file, let's use the HTTP headers to find the MIME Type
-			$sData = @file_get_contents($sPath);
-			if ($sData === false) {
-				IssueLog::Error(<<<TXT
+			else
+			{
+				// Remote file, let's use the HTTP headers to find the MIME Type
+				$sData = @file_get_contents($sPath);
+				if ($sData === false)
+				{
+					IssueLog::Error(<<<TXT
 Failed to load the file from URL. This can happen for multiple reasons:
 - Invalid URL
 - URL using HTTPS with an untrusted certificate on the remote server
@@ -2624,40 +2500,54 @@ TXT
 					, LogChannels::CORE, [
 						'URL' => $sPath,
 					]);
-				throw new Exception("Failed to load the file from the URL '$sPath'.");
-			}
-
-			$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
-			$sFileName = 'uploaded-file'; // Default name for downloaded-files
-			$sExtension = '.txt'; // Default file extension in case we don't know the MIME Type
-
-			if (isset($http_response_header)) {
-				$aHeaders = static::ParseHeaders($http_response_header);
-				$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
-				// Compute the file extension from the MIME Type
-				foreach (ormDocument::GetKnownExtensions() as $sExtValue => $sMime) {
-					if ($sMime === $sMimeType) {
-						$sExtension = '.'.$sExtValue;
-						break;
-					}
+					throw new Exception("Failed to load the file from the URL '$sPath'.");
 				}
+				else
+				{
+					if (isset($http_response_header))
+					{
+						$aHeaders = static::ParseHeaders($http_response_header);
+						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
+						// Compute the file extension from the MIME Type
+						foreach ($aKnownExtensions as $sExtValue => $sMime) {
+							if ($sMime === $sMimeType) {
+								$sExtension = '.'.$sExtValue;
+								break;
+							}
+						}
+					}
+					$sPathName = pathinfo($sPath, PATHINFO_FILENAME);
+					if (utils::IsNotNullOrEmptyString($sPathName)) {
+						$sFileName = $sPathName;
+					}
+					$sFileName .= $sExtension;
+				}
+				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
 			}
-			$sPathName = pathinfo($sPath, PATHINFO_FILENAME);
-			if (utils::IsNotNullOrEmptyString($sPathName)) {
-				$sFileName = $sPathName;
-			}
-			$sFileName .= $sExtension;
-
-			return new ormDocument($sData, $sMimeType, $sFileName);
 		}
-
-		// Local file
-		if (UserRights::IsAdministrator()) {
+		else if (UserRights::IsAdministrator())
+		{
 			// Only administrators are allowed to read local files
-			return ormDocument::FromFile($sPath);
-		}
+			$sData = @file_get_contents($sPath);
+			if ($sData === false)
+			{
+				throw new Exception("Failed to load the file '$sPath'. The file does not exist or the current process is not allowed to access it.");
+			}
+			$sExtension = strtolower(pathinfo($sPath, PATHINFO_EXTENSION));
+			$sFileName = basename($sPath);
 
-		return null;
+			if (array_key_exists($sExtension, $aKnownExtensions))
+			{
+				$sMimeType = $aKnownExtensions[$sExtension];
+			}
+			else if (extension_loaded('fileinfo'))
+			{
+				$finfo = new finfo(FILEINFO_MIME);
+				$sMimeType = $finfo->file($sPath);
+			}
+			$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
+		}
+		return $oUploadedDoc;
 	}
 
 	protected static function ParseHeaders($aHeaders)
@@ -3228,13 +3118,30 @@ TXT
 	 * @throws \Exception
 	 * @since 3.0.0
 	 */
-	public static function GetMentionedObjectsFromText(string $sText): array
+	public static function GetMentionedObjectsFromText(string $sText, string $sFormat = self::ENUM_TEXT_FORMAT_HTML): array
 	{
-		$aMentionedObjects = [];
-		$aMentionMatches = [];
-		$sText = html_entity_decode($sText);
+		// First transform text so it can be parsed
+		switch ($sFormat) {
+			case static::ENUM_TEXT_FORMAT_HTML:
+				$sText = static::HtmlToText($sText);
+				break;
+
+			default:
+				// Don't transform it
+				break;
+		}
+
+		// Then parse text to find objects
+		$aMentionedObjects = array();
+		$aMentionMatches = array();
+
+		// Note: As the sanitizer (or CKEditor autocomplete plugin? 🤔) removes data-* attributes from the hyperlink,
+		// - we can't use the following (simpler) regexp that only checks data attributes on hyperlinks, which would have worked for hyperlinks pointing to any GUIs: '/<a\s*([^>]*)data-object-class="([^"]*)"\s*data-object-id="([^"]*)">/i'
+		// - instead we use a regexp to match the following pattern '[Some object label](<APP_ROOT_URL>...&class=<OBJECT_CLASS>&id=<OBJECT_ID>...)' which only works for the backoffice
+		// If we change the sanitizer, we might want to switch to the other regexp as it's universal and easier to read
+		$sAppRootUrlForRegExp = addcslashes(utils::GetAbsoluteUrlAppRoot(), '/&');
+		preg_match_all("/\[([^\]]*)\]\({$sAppRootUrlForRegExp}[^\)]*\&class=([^\)\&]*)\&id=([\d]*)[^\)]*\)/i", $sText, $aMentionMatches);
 
-		preg_match_all('/<a\s*([^>]*)data-object-class="([^"]*)"\s.*data-object-key="([^"]*)"/Ui', $sText, $aMentionMatches);
 		foreach ($aMentionMatches[0] as $iMatchIdx => $sCompleteMatch) {
 			$sMatchedClass = $aMentionMatches[2][$iMatchIdx];
 			$sMatchedId = $aMentionMatches[3][$iMatchIdx];

approot.inc.php

@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.2');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.2.1');
+define('ITOP_CORE_VERSION', '3.2.0');
 
 /**
  * @var string

composer.json

@@ -15,6 +15,8 @@
     "apereo/phpcas": "~1.6.0",
     "firebase/php-jwt": "^6.4.0",
     "guzzlehttp/guzzle": "^7.5.1",
+    "laminas/laminas-mail": "^2.11",
+    "laminas/laminas-servicemanager": "^3.5",
     "league/oauth2-google": "^4.0.1",
     "nikic/php-parser": "^4.14.0",
     "pear/archive_tar": "~1.4.14",
@@ -30,7 +32,6 @@
     "symfony/twig-bundle": "~6.4.0",
     "symfony/var-dumper": "~6.4.0",
     "symfony/yaml": "~6.4.0",
-    "symfony/mailer": "~6.4.0",
     "tecnickcom/tcpdf": "^6.6.0",
     "thenetworg/oauth2-azure": "^2.0",
     "soundasleep/html2text": "~2.1"

core/action.class.inc.php

@@ -181,7 +181,7 @@ abstract class Action extends cmdbAbstractObject
 	{
 		parent::DisplayBareRelations($oPage, false);
 
-		if ($oPage instanceof iTopWebPage && !$this->IsNew()) {
+		if ($oPage instanceof iTopWebPage) {
 			$this->GenerateLastExecutionsTab($oPage, $bEditMode);
 		}
 	}

core/asynctask.class.inc.php

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

core/attributedef.class.inc.php

@@ -142,7 +142,7 @@ abstract class AttributeDefinition
 
 	protected $aCSSClasses;
 
-    public function GetType()
+	public function GetType()
 	{
 		return Dict::S('Core:'.get_class($this));
 	}
@@ -1715,8 +1715,8 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
-	}
-
+	}	
+	
 	/**
 	 * @return int see LINKSET_EDITWHEN_* constants
 	 * @since 3.1.1 3.2.0 N°6385
@@ -1758,7 +1758,7 @@ class AttributeLinkedSet extends AttributeDefinition
 	{
 		return $this->GetOptional('with_php_computation', false);
 	}
-
+	
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
@@ -2069,7 +2069,7 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function GetImportColumns()
 	{
 		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'MEDIUMTEXT'.CMDBSource::GetSqlStringColumnDefinition();
+		$aColumns[$this->GetCode()] = 'TEXT'.CMDBSource::GetSqlStringColumnDefinition();
 
 		return $aColumns;
 	}
@@ -4193,7 +4193,7 @@ class AttributeFinalClass extends AttributeString
  */
 class AttributePassword extends AttributeString implements iAttributeNoGroupBy
 {
-    const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	/**
 	 * Useless constructor, but if not present PHP 7.4.0/7.4.1 is crashing :( (N°2329)
@@ -4270,7 +4270,7 @@ class AttributePassword extends AttributeString implements iAttributeNoGroupBy
  */
 class AttributeEncryptedString extends AttributeString implements iAttributeNoGroupBy
 {
-    const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	protected function GetSQLCol($bFullSpec = false)
 	{
@@ -4995,7 +4995,7 @@ class AttributeCaseLog extends AttributeLongText
 			}
 			else
 			{
-				if (utils::StrLen($proposedValue) > 0)
+				if (strlen($proposedValue) > 0)
 				{
 					//N°5135 - add impersonation information in caselog
 					if (UserRights::IsImpersonated()){
@@ -6346,15 +6346,10 @@ class AttributeDateTime extends AttributeDBField
 
 		$oFormField = parent::MakeFormField($oObject, $oFormField);
 
-        // After call to the parent as it sets the current value
-        $oValue = $oObject->Get($this->GetCode());
-        if ($oValue === $this->GetNullValue()) {
-            $oValue = $this->GetDefaultValue($oObject);
-        }
-        $oFormField->SetCurrentValue($this->GetFormat()->Format($oValue));
+		// After call to the parent as it sets the current value
+		$oFormField->SetCurrentValue($this->GetFormat()->Format($oObject->Get($this->GetCode())));
 
-
-        return $oFormField;
+		return $oFormField;
 	}
 
 	/**
@@ -6438,26 +6433,8 @@ class AttributeDateTime extends AttributeDBField
 
 	public function GetDefaultValue(DBObject $oHostObject = null)
 	{
-		$sDefaultValue = $this->Get('default_value');
-		if (utils::IsNotNullOrEmptyString($sDefaultValue)) {
-			try {
-				$sDefaultDate = Expression::FromOQL($sDefaultValue)->Evaluate([]);
-			} catch (Exception $e) {
-				try {
-					$sDefaultDate = Expression::FromOQL('"'.$sDefaultValue.'"')->Evaluate([]);
-				} catch (Exception $e) {
-					IssueLog::Error("Invalid default value '$sDefaultValue' for field '{$this->GetCode()}' on class '{$this->GetHostClass()}', defaulting to null");
-
-					return $this->GetNullValue();
-				}
-			}
-			try {
-				$oDate = new DateTimeImmutable($sDefaultDate);
-			} catch (Exception $e) {
-				IssueLog::Error("Invalid default value '$sDefaultValue' for field '{$this->GetCode()}' on class '{$this->GetHostClass()}', defaulting to null");
-				return $this->GetNullValue();
-			}
-			return $oDate->format($this->GetInternalFormat());
+		if (!$this->IsNullAllowed()) {
+			return date($this->GetInternalFormat());
 		}
 		return $this->GetNullValue();
 	}
@@ -8165,7 +8142,7 @@ class AttributeURL extends AttributeString
 	 * @since 3.0.3 moved from Config to AttributeURL constant
 	 */
 	public const DEFAULT_VALIDATION_PATTERN = /** @lang RegExp */
-		'(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9:%@+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.,-]*)?(#[a-zA-Z0-9_.-][a-zA-Z0-9+\$_.-]*)?';
+		'(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9:%+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.,-]*)?(#[a-zA-Z0-9_.-][a-zA-Z0-9+\$_.-]*)?';
 
 	/**
 	 * Useless constructor, but if not present PHP 7.4.0/7.4.1 is crashing :( (N°2329)
@@ -9456,13 +9433,8 @@ class AttributeStopWatch extends AttributeDefinition
 							case 'deadline':
 								if ($value)
 								{
-									if (is_int($value))
-									{
-										$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
-										$sRet = AttributeDeadline::FormatDeadline($sDate);
-									} else {
-										$sRet = $value;
-									}
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
+									$sRet = AttributeDeadline::FormatDeadline($sDate);
 								}
 								else
 								{
@@ -10012,7 +9984,7 @@ class AttributeSubItem extends AttributeDefinition
  */
 class AttributeOneWayPassword extends AttributeDefinition implements iAttributeNoGroupBy
 {
-    const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	/**
 	 * Useless constructor, but if not present PHP 7.4.0/7.4.1 is crashing :( (N°2329)
@@ -10954,12 +10926,12 @@ abstract class AttributeSet extends AttributeDBFieldVoid
 			$sDescription = utils::EscapeHtml($this->GetValueDescription($sValue));
 			$oFilter = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sValue'");
 			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink(true);
+			$sContext = $oAppContext->GetForLink();
 			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($oFilter->GetClass());
 			$sFilter = rawurlencode($oFilter->serialize());
 			$sLink = '';
 			if ($bWithLink && $this->bDisplayLink) {
-				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter.$sContext;
+				$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
 				$sLink = ' href="'.$sUrl.'"';
 			}
 
@@ -12276,13 +12248,13 @@ class AttributeTagSet extends AttributeSet
 				$sTagDescription = $oTag->Get('description');
 				$oFilter = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sTagCode'");
 				$oAppContext = new ApplicationContext();
-				$sContext = $oAppContext->GetForLink(true);
+				$sContext = $oAppContext->GetForLink();
 				$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($oFilter->GetClass());
 				$sFilter = rawurlencode($oFilter->serialize());
 
 				$sLink = '';
 				if ($bWithLink && $this->bDisplayLink) {
-					$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter.$sContext;
+					$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
 					$sLink = ' href="'.$sUrl.'"';
 				}
 

core/backgroundprocess.inc.php

@@ -201,7 +201,6 @@ abstract class AbstractWeeklyScheduledProcess implements iScheduledProcess
 			static::MODULE_SETTING_TIME,
 			static::GetDefaultModuleSettingTime()
 		);
-		$sProcessTime = trim($sProcessTime);
 		if (!preg_match('/[0-2]\d:[0-5]\d/', $sProcessTime))
 		{
 			throw new ProcessInvalidConfigException($this->GetModuleName().": wrong format for setting '".static::MODULE_SETTING_TIME."' (found '$sProcessTime')");
@@ -231,7 +230,7 @@ abstract class AbstractWeeklyScheduledProcess implements iScheduledProcess
 			$iFirstDayOfWeek = $aDays[0];
 			$iDayMove = $oNow->format('N') - $iFirstDayOfWeek;
 			$oRet = clone $oNow;
-			$oRet->modify(-$iDayMove.' days');
+			$oRet->modify('-'.$iDayMove.' days');
 			$oRet->modify('+1 weeks');
 		}
 		else
@@ -239,7 +238,7 @@ abstract class AbstractWeeklyScheduledProcess implements iScheduledProcess
 			$iNextDayOfWeek = $aDays[$iNextPos];
 			$iMove = $iNextDayOfWeek - $oNow->format('N');
 			$oRet = clone $oNow;
-			$oRet->modify($iMove.' days');
+			$oRet->modify('+'.$iMove.' days');
 		}
 		list($sHours, $sMinutes) = explode(':', $sProcessTime);
 		$oRet->setTime((int)$sHours, (int)$sMinutes);

core/bulkchange.class.inc.php

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

core/bulkexport.class.inc.php

@@ -25,7 +25,7 @@ define('EXPORTER_DEFAULT_CHUNK_SIZE', 1000);
 class BulkExportException extends Exception
 {
 	protected $sLocalizedMessage;
-	public function __construct($message, $sLocalizedMessage, $code = 0, $previous = null)
+	public function __construct($message, $sLocalizedMessage, $code = null, $previous = null)
 	{
 		parent::__construct($message, $code, $previous);
 		$this->sLocalizedMessage = $sLocalizedMessage;
@@ -70,7 +70,7 @@ class BulkExportResult extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 
-		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("user_id", array("allowed_values"=>null, "sql"=>"user_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("chunk_size", array("allowed_values"=>null, "sql"=>"chunk_size", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("format", array("allowed_values"=>null, "sql"=>"format", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));

core/cmdbchange.class.inc.php

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

core/computing.inc.php

@@ -108,7 +108,7 @@ class DefaultWorkingTimeComputer implements iWorkingTimeComputer
 		// Default implementation: 24x7, no holidays: to compute the deadline, just add
 		// the specified duration to the given date/time
 		$oResult = clone $oStartDate;
-		$oResult->modify($iDuration.' seconds');
+		$oResult->modify('+'.$iDuration.' seconds');
 		if (class_exists('WorkingTimeRecorder'))
 		{
 			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oResult->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_END);

core/config.class.inc.php

@@ -20,8 +20,6 @@
  */
 
 
-use Combodo\iTop\Core\Configuration\ConfigManager;
-
 define('ITOP_APPLICATION', 'iTop');
 define('ITOP_APPLICATION_SHORT', 'iTop');
 
@@ -31,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.2.0-dev');
+define('ITOP_VERSION', '3.2.1-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -73,7 +71,7 @@ define('DEFAULT_MAX_DISPLAY_LIMIT', 30);
 define('DEFAULT_STANDARD_RELOAD_INTERVAL', 5 * 60);
 define('DEFAULT_FAST_RELOAD_INTERVAL', 1 * 60);
 define('DEFAULT_SECURE_CONNECTION_REQUIRED', false);
-define('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|external|basic|token');
+define('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|external|basic');
 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
@@ -1235,14 +1233,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'sessions_tracking.session_handler_extension' => [
-			'type' => 'string',
-			'description' => 'to store more data in itop session files, set your own iSessionHandlerExtension implementation class in this variable',
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'sessions_tracking.gc_threshold' => [
 			'type' => 'integer',
 			'description'         => 'fallback in case cron is not active: probability in percent that session files are cleanup during any itop request (100 means always)',
@@ -1757,14 +1747,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'developer_mode.interface_cache.enabled' => [
-			'type'                => 'bool',
-			'description'         => 'If true then InterfaceDiscovery uses dynamic cache (in developer_mode)',
-			'default'             => false,
-			'value'               => false,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'theme.enable_precompilation' => [
 			'type' => 'bool',
 			'description' => 'If false, theme compilation will not use any precompiled file setup optimization.)',
@@ -2098,21 +2080,76 @@ class Config
 	{
 		$this->CheckFile('configuration', $sConfigFile);
 
-		[$MySettings, $MyModuleSettings, $MyModules] = ConfigManager::GetInstance()->Load($sConfigFile);
+		$sConfigCode = trim(file_get_contents($sConfigFile));
+
+		// Variables created when doing an eval() on the config file
+		/** @var array $MySettings */
+		$MySettings = null;
+		/** @var array $MyModuleSettings */
+		$MyModuleSettings = null;
+		/** @var array $MyModules */
+		$MyModules = null;
+
+		// This does not work on several lines
+		// preg_match('/^<\\?php(.*)\\?'.'>$/', $sConfigCode, $aMatches)...
+		// So, I've implemented a solution suggested in the PHP doc (search for phpWrapper)
+		try
+		{
+			ob_start();
+			eval('?'.'>'.trim($sConfigCode));
+			$sNoise = trim(ob_get_contents());
+			ob_end_clean();
+		}
+		catch (Error $e)
+		{
+			// PHP 7
+			throw new ConfigException('Error in configuration file',
+				array('file' => $sConfigFile, 'error' => $e->getMessage().' at line '.$e->getLine()));
+		}
+		catch (Exception $e)
+		{
+			// well, never reach in case of parsing error :-(
+			// will be improved in PHP 6 ?
+			throw new ConfigException('Error in configuration file',
+				array('file' => $sConfigFile, 'error' => $e->getMessage()));
+		}
+		if (strlen($sNoise) > 0)
+		{
+			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack)
+			throw new ConfigException('Syntax error in configuration file',
+				array('file' => $sConfigFile, 'error' => '<tt>'.utils::EscapeHtml($sNoise, ENT_QUOTES).'</tt>'));
+		}
+
+		if (!isset($MySettings) || !is_array($MySettings))
+		{
+			throw new ConfigException('Missing array in configuration file',
+				array('file' => $sConfigFile, 'expected' => '$MySettings'));
+		}
+
+		if (!array_key_exists('addons', $MyModules))
+		{
+			throw new ConfigException('Missing item in configuration file',
+				array('file' => $sConfigFile, 'expected' => '$MyModules[\'addons\']'));
+		}
+		if (!array_key_exists('user rights', $MyModules['addons']))
+		{
+			// Add one, by default
+			$MyModules['addons']['user rights'] = '/addons/userrights/userrightsnull.class.inc.php';
+		}
 
 		$this->m_aAddons = $MyModules['addons'];
 
-		foreach ($MySettings as $sPropCode => $rawValue)
+		foreach ($MySettings as $sPropCode => $rawvalue)
 		{
 			if ($this->IsProperty($sPropCode))
 			{
-				if (is_string($rawValue))
+				if (is_string($rawvalue))
 				{
-					$value = trim($rawValue);
+					$value = trim($rawvalue);
 				}
 				else
 				{
-					$value = $rawValue;
+					$value = $rawvalue;
 				}
 				$this->Set($sPropCode, $value, $sConfigFile, true);
 			}

core/datamodel.core.xml

@@ -850,18 +850,6 @@
           <field id="language" xsi:type="AttributeApplicationLanguage"/>
         </fields>
       </class>
-      <class id="Event" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>DBObject</parent>
-        <properties>
-          <category>core/cmdb,view_in_gui</category>
-        </properties>
-        <fields>
-          <field id="message" xsi:type="AttributeText"/>
-          <field id="date" xsi:type="AttributeDateTime"/>
-          <field id="userinfo" xsi:type="AttributeString"/>
-        </fields>
-      </class>
       <class id="EventNotification" _delta="define">
         <!-- Generated by toolkit/export-class-to-meta.php -->
         <parent>Event</parent>

core/dbobject.class.php

@@ -212,8 +212,6 @@ abstract class DBObject implements iDisplay
 	private $aEventListeners = [];
 	private array $aAllowedTransitions = [];
 
-	private ?string $sStimulusBeingApplied = null;
-
 	/**
 	 * DBObject constructor.
 	 *
@@ -1208,7 +1206,7 @@ abstract class DBObject implements iDisplay
 			if ($aCallInfo["function"] != "ComputeValues") continue;
 			return; //skip!
 		}
-		$this->FireEventComputeValues($this->sStimulusBeingApplied);
+		$this->FireEventComputeValues();
 		$oKPI = new ExecutionKPI();
 		$this->ComputeValues();
 		$oKPI->ComputeStatsForExtension($this, 'ComputeValues');
@@ -2132,7 +2130,7 @@ abstract class DBObject implements iDisplay
 
 			return "Bad type";
 		}
-		elseif ($oAtt instanceof AttributeSet)
+		elseif (($oAtt instanceof AttributeClassAttCodeSet) || ($oAtt instanceof AttributeEnumSet))
 		{
 			if (is_string($toCheck))
 			{
@@ -2671,7 +2669,7 @@ abstract class DBObject implements iDisplay
 
 			// Ultimate check - ensure DB integrity
 			$this->SetReadOnly('No modification allowed during CheckToCreate');
-			$this->FireEventCheckToWrite($this->sStimulusBeingApplied);
+			$this->FireEventCheckToWrite();
 			$this->SetReadWrite();
 
 			$oKPI = new ExecutionKPI();
@@ -2867,14 +2865,6 @@ abstract class DBObject implements iDisplay
 	protected function ListChangedValues(array $aProposal)
 	{
 		$aDelta = array();
-		$sClass = get_class($this);
-		if (MetaModel::HasLifecycle($sClass) && utils::IsNotNullOrEmptyString($this->sStimulusBeingApplied)) {
-			$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-			if (!in_array($sStateAttCode, $aProposal)) {
-				// Same state but the transition was asked, act as if the state was changed
-				$aDelta[$sStateAttCode] = $this->m_aCurrValues[$sStateAttCode];
-			}
-		}
 		foreach ($aProposal as $sAtt => $proposedValue)
 		{
 			if (!array_key_exists($sAtt, $this->m_aOrigValues))
@@ -3408,7 +3398,7 @@ abstract class DBObject implements iDisplay
 			$this->OnInsert();
 			$oKPI->ComputeStatsForExtension($this, 'OnInsert');
 
-			$this->FireEventBeforeWrite(null);
+			$this->FireEventBeforeWrite();
 
 			// If not automatically computed, then check that the key is given by the caller
 			if (!MetaModel::IsAutoIncrementKey($sRootClass)) {
@@ -3504,7 +3494,6 @@ abstract class DBObject implements iDisplay
 
 			$this->m_bIsInDB = true;
 			$this->m_bDirty = false;
-			$this->m_bFullyLoaded = true;
 			foreach ($this->m_aCurrValues as $sAttCode => $value) {
 				if (is_object($value)) {
 					$value = clone $value;
@@ -3543,7 +3532,7 @@ abstract class DBObject implements iDisplay
 	 */
 	protected function PostInsertActions(): void
 	{
-		$this->FireEventAfterWrite([], true, null);
+		$this->FireEventAfterWrite([], true);
 		$oKPI = new ExecutionKPI();
 		$this->AfterInsert();
 		$oKPI->ComputeStatsForExtension($this, 'AfterInsert');
@@ -3624,13 +3613,13 @@ abstract class DBObject implements iDisplay
 	 */
 	public function DBUpdate()
 	{
-		$this->LogCRUDEnter(__METHOD__);
 		if (!MetaModel::StartReentranceProtection($this)) {
 			$this->LogCRUDExit(__METHOD__, 'Rejected (reentrance)');
 
 			return false;
 		}
 
+		$this->LogCRUDEnter(__METHOD__);
 		if (!$this->m_bIsInDB)
 		{
 			throw new CoreException("DBUpdate: could not update a newly created object, please call DBInsert instead");
@@ -3651,7 +3640,7 @@ abstract class DBObject implements iDisplay
 				$this->OnUpdate();
 				$oKPI->ComputeStatsForExtension($this, 'OnUpdate');
 
-				$this->FireEventBeforeWrite($this->sStimulusBeingApplied);
+				$this->FireEventBeforeWrite();
 
 				// Freeze the changes at this point
 				$this->InitPreviousValuesForUpdatedAttributes();
@@ -3819,7 +3808,7 @@ abstract class DBObject implements iDisplay
 				}
 
 				try {
-					$this->PostUpdateActions($this->m_aPreviousValuesForUpdatedAttributes, $sClass);
+					$this->PostUpdateActions($aChanges, $sClass);
 				}
 				catch (Exception $e) {
 					$this->LogCRUDExit(__METHOD__, 'Error: '.$e->getMessage());
@@ -3862,9 +3851,7 @@ abstract class DBObject implements iDisplay
 	 */
 	protected function PostUpdateActions(array $aChanges): void
 	{
-		$sStimulusBeingApplied = $this->sStimulusBeingApplied;
-		$this->sStimulusBeingApplied = null;
-		$this->FireEventAfterWrite($aChanges, false, $sStimulusBeingApplied);
+		$this->FireEventAfterWrite($aChanges, false);
 		$oKPI = new ExecutionKPI();
 		$this->AfterUpdate();
 		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');
@@ -3876,37 +3863,39 @@ abstract class DBObject implements iDisplay
 		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
 
 		$sClass = get_class($this);
-		if (utils::IsNotNullOrEmptyString($sStimulusBeingApplied))
+		if (MetaModel::HasLifecycle($sClass))
 		{
 			$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-			$sPreviousState = $this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode];
-			// Change state triggers...
-			$aParams = array(
-				'class_list'     => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
-				'previous_state' => $sPreviousState,
-				'new_state'      => $this->Get($sStateAttCode),
-			);
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state'), array(), $aParams);
-			while ($oTrigger = $oSet->Fetch()) {
-				/** @var \TriggerOnStateLeave $oTrigger */
-				try {
-					$oTrigger->DoActivate($this->ToArgs('this'));
+			if (isset($this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode])) {
+				$sPreviousState = $this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode];
+				// Change state triggers...
+				$aParams = array(
+					'class_list'     => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
+					'previous_state' => $sPreviousState,
+					'new_state'      => $this->Get($sStateAttCode),
+				);
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state'), array(), $aParams);
+				while ($oTrigger = $oSet->Fetch()) {
+					/** @var \TriggerOnStateLeave $oTrigger */
+					try {
+						$oTrigger->DoActivate($this->ToArgs('this'));
+					}
+					catch (Exception $e) {
+						$oTrigger->LogException($e, $this);
+						utils::EnrichRaisedException($oTrigger, $e);
+					}
 				}
-				catch (Exception $e) {
-					$oTrigger->LogException($e, $this);
-					utils::EnrichRaisedException($oTrigger, $e);
-				}
-			}
 
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state'), array(), $aParams);
-			while ($oTrigger = $oSet->Fetch()) {
-				/** @var \TriggerOnStateEnter $oTrigger */
-				try {
-					$oTrigger->DoActivate($this->ToArgs('this'));
-				}
-				catch (Exception $e) {
-					$oTrigger->LogException($e, $this);
-					utils::EnrichRaisedException($oTrigger, $e);
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state'), array(), $aParams);
+				while ($oTrigger = $oSet->Fetch()) {
+					/** @var \TriggerOnStateEnter $oTrigger */
+					try {
+						$oTrigger->DoActivate($this->ToArgs('this'));
+					}
+					catch (Exception $e) {
+						$oTrigger->LogException($e, $this);
+						utils::EnrichRaisedException($oTrigger, $e);
+					}
 				}
 			}
 		}
@@ -4034,7 +4023,7 @@ abstract class DBObject implements iDisplay
 		foreach ($aUpdatedLogAttCodes as $sAttCode) {
 			/** @var \ormCaseLog $oUpdatedCaseLog */
 			$oUpdatedCaseLog = $this->Get($sAttCode);
-			$aMentionedObjects = array_merge_recursive($aMentionedObjects, utils::GetMentionedObjectsFromText($oUpdatedCaseLog->GetModifiedEntry(ormCaseLog::ENUM_FORMAT_HTML)));
+			$aMentionedObjects = array_merge_recursive($aMentionedObjects, utils::GetMentionedObjectsFromText($oUpdatedCaseLog->GetModifiedEntry()));
 		}
 
 		// 3 - Trigger for those objects
@@ -4511,8 +4500,6 @@ abstract class DBObject implements iDisplay
 	 */
 	public function ApplyStimulus($sStimulusCode, $bDoNotWrite = false)
 	{
-		$this->LogCRUDEnter(__METHOD__, "Code: $sStimulusCode");
-
 		$sClass = get_class($this);
 		if (!MetaModel::HasLifecycle($sClass))
 		{
@@ -4539,8 +4526,6 @@ abstract class DBObject implements iDisplay
 				} else {
 					$aBackupValues[$sAttCode] = $value;
 				}
-			} else {
-				$aBackupValues[$sAttCode] = $oAttDef->GetNullValue();
 			}
 		}
 
@@ -4548,6 +4533,7 @@ abstract class DBObject implements iDisplay
 
 		// Change the state before proceeding to the actions, this is necessary because an action might
 		// trigger another stimuli (alternative: push the stimuli into a queue)
+		$sPreviousState = $this->Get($sStateAttCode);
 		$sNewState = $aTransitionDef['target_state'];
 		$this->Set($sStateAttCode, $sNewState);
 
@@ -4555,71 +4541,67 @@ abstract class DBObject implements iDisplay
 		//    array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD
 
 		$bSuccess = true;
-		// Prevent current object from being updated by the actions
-		$this->AddCurrentObjectInCrudStack('APPLY_STIMULUS');
-		$bIsNewlyProtected = MetaModel::StartReentranceProtection($this);
-		try {
-			foreach ($aTransitionDef['actions'] as $actionHandler) {
-				if (is_string($actionHandler)) {
-					// Old (pre-2.1.0 modules) action definition without any parameter
-					$aActionCallSpec = array($this, $actionHandler);
-					$sActionDesc = $sClass.'::'.$actionHandler;
+		$sActionDesc = '';
+		foreach ($aTransitionDef['actions'] as $actionHandler)
+		{
+			if (is_string($actionHandler))
+			{
+				// Old (pre-2.1.0 modules) action definition without any parameter
+				$aActionCallSpec = array($this, $actionHandler);
+				$sActionDesc = $sClass.'::'.$actionHandler;
 
-					if (!is_callable($aActionCallSpec)) {
-						throw new CoreException("Unable to call action: $sClass::$actionHandler");
-					}
-					$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
-				} else // if (is_array($actionHandler))
+				if (!is_callable($aActionCallSpec))
 				{
-					// New syntax: 'verb' and typed parameters
-					$sAction = $actionHandler['verb'];
-					$sActionDesc = "$sClass::$sAction";
-					$aParams = array();
-					foreach ($actionHandler['params'] as $aDefinition) {
-						$sParamType = array_key_exists('type', $aDefinition) ? $aDefinition['type'] : 'string';
-						switch ($sParamType) {
-							case 'int':
-								$value = (int)$aDefinition['value'];
-								break;
+					throw new CoreException("Unable to call action: $sClass::$actionHandler");
+				}
+				$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
+			}
+			else // if (is_array($actionHandler))
+			{
+				// New syntax: 'verb' and typed parameters
+				$sAction = $actionHandler['verb'];
+				$sActionDesc = "$sClass::$sAction";
+				$aParams = array();
+				foreach($actionHandler['params'] as $aDefinition)
+				{
+					$sParamType = array_key_exists('type', $aDefinition) ? $aDefinition['type'] : 'string';
+					switch($sParamType)
+					{
+						case 'int':
+							$value = (int)$aDefinition['value'];
+							break;
 
-							case 'float':
-								$value = (float)$aDefinition['value'];
-								break;
+						case 'float':
+							$value = (float)$aDefinition['value'];
+							break;
 
-							case 'bool':
-								$value = (bool)$aDefinition['value'];
-								break;
+						case 'bool':
+							$value = (bool)$aDefinition['value'];
+							break;
 
-							case 'reference':
-								$value = ${$aDefinition['value']};
-								break;
+						case 'reference':
+							$value = ${$aDefinition['value']};
+							break;
 
-							case 'string':
-							default:
-								$value = (string)$aDefinition['value'];
-						}
-						$aParams[] = $value;
+						case 'string':
+						default:
+							$value = (string)$aDefinition['value'];
 					}
-					$aCallSpec = array($this, $sAction);
-					$bRet = call_user_func_array($aCallSpec, $aParams);
-				}
-				// if one call fails, the whole is considered as failed
-				// (in case there is no returned value, null is obtained and means "ok")
-				if ($bRet === false) {
-					IssueLog::Info("Lifecycle action $sActionDesc returned false on object #$sClass:".$this->GetKey());
-					$bSuccess = false;
+					$aParams[] = $value;
 				}
+				$aCallSpec = array($this, $sAction);
+				$bRet = call_user_func_array($aCallSpec, $aParams);
 			}
-		} finally {
-			if ($bIsNewlyProtected) {
-				// Stops protection only if the object was not already protected
-				MetaModel::StopReentranceProtection($this);
+			// if one call fails, the whole is considered as failed
+			// (in case there is no returned value, null is obtained and means "ok")
+			if ($bRet === false)
+			{
+				IssueLog::Info("Lifecycle action $sActionDesc returned false on object #$sClass:".$this->GetKey());
+				$bSuccess = false;
 			}
-			$this->RemoveCurrentObjectInCrudStack();
 		}
 		if ($bSuccess)
 		{
-			$this->sStimulusBeingApplied = $sStimulusCode;
 			// Stop watches
 			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 			{
@@ -4648,7 +4630,6 @@ abstract class DBObject implements iDisplay
 				$this->m_aCurrValues[$sAttCode] = $aBackupValues[$sAttCode];
 			}
 		}
-		$this->LogCRUDExit(__METHOD__, 'Current State: '.$this->Get($sStateAttCode));
 		return $bSuccess;
 	}
 
@@ -6635,7 +6616,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventCheckToWrite(?string $sStimulusBeingApplied): void
+	protected function FireEventCheckToWrite(): void
 	{
 	}
 
@@ -6643,7 +6624,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventBeforeWrite(?string $sStimulusBeingApplied)
+	protected function FireEventBeforeWrite()
 	{
 	}
 
@@ -6653,7 +6634,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventAfterWrite(array $aChanges, bool $bIsNew, ?string $sStimulusBeingApplied): void
+	protected function FireEventAfterWrite(array $aChanges, bool $bIsNew): void
 	{
 	}
 
@@ -6691,7 +6672,7 @@ abstract class DBObject implements iDisplay
 	 * @return void
 	 * @since 3.1.0
 	 */
-	protected function FireEventComputeValues(?string $sStimulusBeingApplied): void
+	protected function FireEventComputeValues(): void
 	{
 	}
 
@@ -6733,13 +6714,12 @@ abstract class DBObject implements iDisplay
 		$oRootClass = MetaModel::GetRootClass($sClass);
 
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if (($oRootClass === $aCrudStackEntry['class']) && ($sConvertedId === $aCrudStackEntry['id'])) {
-				IssueLog::Trace('CRUD '.__METHOD__." $sClass:$sId IS in CRUD Stack", LogChannels::DM_CRUD);
+			if (($oRootClass === $aCrudStackEntry['class'])
+				&& ($sConvertedId === $aCrudStackEntry['id'])) {
 				return true;
 			}
 		}
 
-		IssueLog::Trace('CRUD '.__METHOD__." $sClass:$sId NOT in CRUD Stack", LogChannels::DM_CRUD);
 		return false;
 	}
 
@@ -6757,12 +6737,10 @@ abstract class DBObject implements iDisplay
 		$sRootClass = MetaModel::GetRootClass($sClass);
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
 			if ($sRootClass === $aCrudStackEntry['class']) {
-				IssueLog::Trace("CRUD ".__METHOD__." $sClass IS in CRUD Stack", LogChannels::DM_CRUD);
 				return true;
 			}
 		}
 
-		IssueLog::Trace('CRUD '.__METHOD__." $sClass NOT in CRUD Stack", LogChannels::DM_CRUD);
 		return false;
 	}
 
@@ -6772,20 +6750,17 @@ abstract class DBObject implements iDisplay
 	 * @param string $sCrudType
 	 *
 	 * @return void
-	 * @throws \CoreException
 	 * @since 3.1.0 N°5609
 	 */
 	private function AddCurrentObjectInCrudStack(string $sCrudType): void
 	{
+		$this->LogCRUDDebug(__METHOD__);
 		$sRootClass = MetaModel::GetRootClass(get_class($this));
-		$sKey = (string)$this->GetKey();
 		self::$m_aCrudStack[] = [
 			'type'  => $sCrudType,
 			'class' => $sRootClass,
-			'id'    => $sKey, // GetKey() doesn't have type hinting, so forcing type to avoid getting an int
+			'id'    => (string)$this->GetKey(), // GetKey() doesn't have type hinting, so forcing type to avoid getting an int
 		];
-		$iCount = count(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, "$sCrudType $sRootClass:$sKey count $iCount");
 	}
 
 	/**
@@ -6797,15 +6772,10 @@ abstract class DBObject implements iDisplay
 	 */
 	private function UpdateCurrentObjectInCrudStack(): void
 	{
+		$this->LogCRUDDebug(__METHOD__);
 		$aCurrentCrudStack = array_pop(self::$m_aCrudStack);
-		$sOldId = $aCurrentCrudStack['id'];
-		$sNewId = (string)$this->GetKey();
-		$aCurrentCrudStack['id'] = $sNewId;
+		$aCurrentCrudStack['id'] = (string)$this->GetKey();
 		self::$m_aCrudStack[] = $aCurrentCrudStack;
-		$sClass = $aCurrentCrudStack['class'];
-		$sType = $aCurrentCrudStack['type'];
-		$iCount = count(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, "$sType $sClass:$sOldId => $sClass:$sNewId count $iCount");
 	}
 
 	/**
@@ -6817,11 +6787,7 @@ abstract class DBObject implements iDisplay
 	private function RemoveCurrentObjectInCrudStack(): void
 	{
 		$aRemoved = array_pop(self::$m_aCrudStack);
-		$sType = $aRemoved['type'];
-		$sClass = $aRemoved['class'];
-		$sId = $aRemoved['id'];
-		$iCount = count(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, "$sType $sClass:$sId count $iCount");
+		$this->LogCRUDDebug(__METHOD__, $aRemoved['class'].':'.$aRemoved['id']);
 	}
 
 	/**
@@ -6838,53 +6804,37 @@ abstract class DBObject implements iDisplay
 	protected function LogCRUDEnter($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
-		IssueLog::Debug("CRUD +$sPadding> $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+		IssueLog::Debug("CRUD +$sPadding> $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 	}
 
 	protected function LogCRUDExit($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
 		if (strlen($sComment) === 0) {
 			IssueLog::Trace("CRUD <$sPadding+ $sFunction $sClass:$sKey", LogChannels::DM_CRUD);
 		} else {
-			IssueLog::Debug("CRUD <$sPadding+ $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+			IssueLog::Debug("CRUD <$sPadding+ $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 		}
 	}
 
 	protected function LogCRUDDebug($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
-		IssueLog::Debug("CRUD --$sPadding $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+		IssueLog::Debug("CRUD --$sPadding $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 	}
 
 	protected function LogCRUDError($sFunction, $sComment = '')
 	{
 		$sClass = get_class($this);
-		if (utils::StartsWith($sClass, 'CMDBChange')) {
-			return;
-		}
 		$sKey = $this->GetKey();
-		$sUUID = $this->m_sObjectUniqId;
 		$sPadding = str_pad('', count(self::$m_aCrudStack), '!');
-		IssueLog::Error("CRUD !!$sPadding Error $sFunction $sClass:$sKey ($sUUID) $sComment", LogChannels::DM_CRUD);
+		IssueLog::Error("CRUD !!$sPadding Error $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
 	}
 
 	/**

core/dbproperty.class.inc.php

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

core/dict.class.inc.php

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

core/displayablegraph.class.inc.php

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

core/email.class.inc.php

@@ -114,6 +114,9 @@ class EMail implements iEMail
 	 * @param string $sSerializedMessage The serialized representation of the message
 	 *
 	 * @return \Email
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \Symfony\Component\CssSelector\Exception\SyntaxErrorException
 	 */
 	public static function UnSerializeV2($sSerializedMessage)
 	{
@@ -151,7 +154,7 @@ class EMail implements iEMail
 	 */
 	public function SetInReplyTo(string $sMessageId)
 	{
-		$this->oMailer->SetInReplyTo($sMessageId);
+		$this->AddToHeader('In-Reply-To', $sMessageId);
 	}
 
 	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)

core/event.class.inc.php

@@ -39,7 +39,7 @@ class Event extends DBObject implements iDisplay
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 //		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 

core/htmlsanitizer.class.inc.php

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

core/inlineimage.class.inc.php

@@ -54,7 +54,7 @@ class InlineImage extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeDateTime("expire", array("allowed_values" => null, "sql" => 'expire', "default_value" => 'DATE_ADD(NOW(), INTERVAL 1 DAY)', "is_null_allowed" => false, "depends_on" => array(), "always_load_in_tables" => false)));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("expire", array("allowed_values"=>null, "sql"=>'expire', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeString("temp_id", array("allowed_values"=>null, "sql"=>'temp_id', "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeString("item_class", array("allowed_values"=>null, "sql"=>'item_class', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeObjectKey("item_id", array("class_attcode"=>'item_class', "allowed_values"=>null, "sql"=>'item_id', "is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
@@ -541,6 +541,80 @@ JS
 			CombodoCKEditorHandler.EnableImageUpload('#' + $(this).attr('id'), '$sAbsoluteUrlAppRoot'+'pages/ajax.render.php?operation=cke_img_upload&temp_id=$sTempId&obj_class=$sObjClass&obj_key=$iObjKey');
 		});
 JS;
+
+		return
+			<<<JS
+		// Hook the file upload of all CKEditor instances
+		$('.htmlEditor').each(function() {
+			var oEditor = $(this).ckeditorGet();
+			oEditor.config.filebrowserBrowseUrl = '$sAbsoluteUrlAppRoot'+'pages/ajax.render.php?operation=cke_browse&temp_id=$sTempId&obj_class=$sObjClass&obj_key=$iObjKey';
+			oEditor.on( 'fileUploadResponse', function( evt ) {
+				var fileLoader = evt.data.fileLoader;
+				var xhr = fileLoader.xhr;
+				var data = evt.data;
+				try {
+			        var response = JSON.parse( xhr.responseText );
+		
+			        // Error message does not need to mean that upload finished unsuccessfully.
+			        // It could mean that ex. file name was changes during upload due to naming collision.
+			        if ( response.error && response.error.message ) {
+			            data.message = response.error.message;
+			        }
+		
+			        // But !uploaded means error.
+			        if ( !response.uploaded ) {
+			            evt.cancel();
+			        } else {
+			            data.fileName = response.fileName;
+			           	data.url = response.url;
+						
+			            // Do not call the default listener.
+			            evt.stop();
+			        }
+			    } catch ( err ) {
+			        // Response parsing error.
+			        data.message = fileLoader.lang.filetools.responseError;
+			        window.console && window.console.log( xhr.responseText );
+		
+			        evt.cancel();
+			    }
+			} );
+	
+			oEditor.on( 'fileUploadRequest', function( evt ) {
+				evt.data.fileLoader.uploadUrl += '?operation=cke_img_upload&temp_id=$sTempId&obj_class=$sObjClass';
+			}, null, null, 4 ); // Listener with priority 4 will be executed before priority 5.
+		
+			oEditor.on( 'instanceReady', function() {
+				if(!CKEDITOR.env.iOS && $('#'+oEditor.id+'_toolbox .ibo-vendors-ckeditor--toolbar-fullscreen-button').length == 0)
+				{
+					$('#'+oEditor.id+'_toolbox').append('<span class="ibo-vendors-ckeditor--toolbar-fullscreen-button editor-fullscreen-button" data-role="ibo-vendors-ckeditor--toolbar-fullscreen-button" title="$sToggleFullScreen">&nbsp;</span>');
+					$('#'+oEditor.id+'_toolbox .ibo-vendors-ckeditor--toolbar-fullscreen-button').on('click', function() {
+							oEditor.execCommand('maximize');
+							if ($(this).closest('.cke_maximized').length != 0)
+							{
+								$('#'+oEditor.id+'_toolbar_collapser').trigger('click');
+							}
+					});
+				}
+				if (oEditor.widgets.registered.uploadimage)
+				{
+					oEditor.widgets.registered.uploadimage.onUploaded = function( upload ) {
+					var oData = JSON.parse(upload.xhr.responseText);
+				    	this.replaceWith( '<img src="' + upload.url + '" ' +
+				    		'width="' + oData.width + '" ' +
+							'height="' + oData.height + '">' );
+				    }
+				}
+			});
+		});
+JS
+		;
+	}
+	public static function EnableCKEditor5ImageUpload(DBObject $oObject, $sTempId){
+		return <<<JS
+		// Hook the file upload of all CKEditor instances
+JS;
+
 	}
 
 

core/kpi.class.inc.php

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

core/log.class.inc.php

@@ -745,17 +745,6 @@ abstract class LogAPI
 		static::Log(self::LEVEL_TRACE, $sMessage, $sChannel, $aContext);
 	}
 
-	public static function Exception(string $sMessage, throwable $previous): void
-	{
-		if (is_null($previous)) {
-			$previous = new Exception('');
-		}
-
-		$aContext['error'] = $previous->getMessage();
-		$aContext['stack'] = $previous->getTraceAsString();
-		static::Error($sMessage, static::CHANNEL_DEFAULT, $aContext);
-	}
-
 	/**
 	 * @throws \ConfigException if log wrongly configured
 	 */
@@ -1184,7 +1173,7 @@ class DeprecatedCallsLog extends LogAPI
 
 	/**
 	 * This will catch a message for all E_DEPRECATED and E_USER_DEPRECATED errors.
-	 * This handler is set in {@see DeprecatedCallsLog::Enable}
+	 * This handler is set in DeprecatedCallsLog::Enable
 	 *
 	 * @param int $errno
 	 * @param string $errstr
@@ -1204,22 +1193,52 @@ class DeprecatedCallsLog extends LogAPI
 			return false;
 		}
 
-		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 4);
-		if (isset($aStack[2]['function']) && ($aStack[2]['function'] == 'ForwardToTriggerError')) {
-			// Let the notice bubble up
-			return false;
-		}
-
 		if (false === static::IsLogLevelEnabledSafe(self::LEVEL_WARNING, self::ENUM_CHANNEL_PHP_LIBMETHOD)) {
-			// returns true so that nothing is thrown!
+			// returns true so that nothing is throwned !
 			return true;
 		}
 
-		$aStack = static::StripCallStack($aStack);
-		$sMessage = "$errstr, called from ".static::SummarizeCallStack($aStack);
+		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 4);
+		$iStackDeprecatedMethodLevel = 2; // level 0 = current method, level 1 = @trigger_error, level 2 = method containing the `trigger_error` call (can be either 'trigger_deprecation' or the faulty method), level 3 = In some cases, method containing the 'trigger_deprecation' call
+		// In case current level is actually a 'trigger_deprecation' call, try to go one level further to get the real deprecated method
+		if (array_key_exists($iStackDeprecatedMethodLevel, $aStack) && ($aStack[$iStackDeprecatedMethodLevel]['function'] === 'trigger_deprecation') && array_key_exists($iStackDeprecatedMethodLevel + 1, $aStack)) {
+			$iStackDeprecatedMethodLevel++;
+		}
+
+		$sDeprecatedObject = $aStack[$iStackDeprecatedMethodLevel]['class'];
+		$sDeprecatedMethod = $aStack[$iStackDeprecatedMethodLevel]['function'];
+		if (($sDeprecatedObject === __CLASS__) && ($sDeprecatedMethod === 'Log')) {
+			// We are generating a trigger_error ourselves, we don't want to trace them !
+			return false;
+		}
+		$sCallerFile = $aStack[$iStackDeprecatedMethodLevel]['file'];
+		$sCallerLine = $aStack[$iStackDeprecatedMethodLevel]['line'];
+		$sMessage = "Call to {$sDeprecatedObject}::{$sDeprecatedMethod} in {$sCallerFile}#L{$sCallerLine}";
+
+		$iStackCallerMethodLevel = $iStackDeprecatedMethodLevel + 1; // level 3 = caller of the deprecated method
+		if (array_key_exists($iStackCallerMethodLevel, $aStack)) {
+			$sCallerObject = $aStack[$iStackCallerMethodLevel]['class'] ?? null;
+			$sCallerMethod = $aStack[$iStackCallerMethodLevel]['function'] ?? null;
+			$sMessage .= ' (';
+			if (!is_null($sCallerObject)) {
+				$sMessage .= "{$sCallerObject}::{$sCallerMethod}";
+			} else {
+				$sCallerMethodFile = $aStack[$iStackCallerMethodLevel]['file'];
+				$sCallerMethodLine = $aStack[$iStackCallerMethodLevel]['line'];
+				if (!is_null($sCallerMethod)) {
+					$sMessage .= "call to {$sCallerMethod}() in {$sCallerMethodFile}#L{$sCallerMethodLine}";
+				} else {
+					$sMessage .= "{$sCallerMethodFile}#L{$sCallerMethodLine}";
+				}
+			}
+			$sMessage .= ')';
+		}
+
+		if (!empty($errstr)) {
+			$sMessage .= ' : '.$errstr;
+		}
 
 		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_LIBMETHOD);
-		static::ForwardToTriggerError($sMessage);
 
 		return true;
 	}
@@ -1245,8 +1264,6 @@ class DeprecatedCallsLog extends LogAPI
 	}
 
 	/**
-	 * Call this helper at the beginning of a deprecated file (in its global scope)
-	 *
 	 * @since 3.0.1 3.1.0 N°4725 silently handles ConfigException
 	 * @since 3.0.4 3.1.0 N°4725 remove forgotten throw PHPDoc annotation
 	 *
@@ -1281,12 +1298,9 @@ class DeprecatedCallsLog extends LogAPI
 		}
 
 		static::Warning($sMessage, static::ENUM_CHANNEL_FILE);
-		static::ForwardToTriggerError($sMessage);
 	}
 
 	/**
-	 * Call this helper when calling a deprecated extension method
-	 *
 	 * @param string $sImplementationClass Class implementing the deprecated API
 	 * @param string $sDeprecatedApi Class name of the deprecated API
 	 * @param string $sDeprecatedMethod Method name of the deprecated API
@@ -1313,12 +1327,9 @@ class DeprecatedCallsLog extends LogAPI
 		}
 
 		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_API);
-		static::ForwardToTriggerError($sMessage);
 	}
 
 	/**
-	 * Call this helper within deprecated methods
-	 *
 	 * @param string|null $sAdditionalMessage
 	 *
 	 * @link https://www.php.net/debug_backtrace
@@ -1336,24 +1347,52 @@ class DeprecatedCallsLog extends LogAPI
 		}
 
 		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
+		$sMessage = self::GetMessageFromStack($aStack);
 
-		if (isset($aStack[1]['class'])) {
-			$sFunctionDesc = $aStack[1]['class'].$aStack[1]['type'].$aStack[1]['function'];
-		}
-		else {
-			$sFunctionDesc = $aStack[1]['function'];
-		}
-
-		$sMessage = "Function $sFunctionDesc() is deprecated";
 		if (!is_null($sAdditionalMessage)) {
-			$sMessage .= ': '.$sAdditionalMessage;
+			$sMessage .= ' : '.$sAdditionalMessage;
 		}
 
-		$sMessage .= '. Caller: '.self::SummarizeCallStack(array_slice($aStack, 1));
-
-
 		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_METHOD);
-		static::ForwardToTriggerError($sMessage);
+	}
+
+	/**
+	 * @param array $aDebugBacktrace data from {@see debug_backtrace()}
+	 *
+	 * @return string message to print to the log
+	 */
+	private static function GetMessageFromStack(array $aDebugBacktrace): string
+	{
+		// level 0 = current method
+		// level 1 = deprecated method, containing the `NotifyDeprecatedPhpMethod` call
+		$sMessage = 'Call'.self::GetMessageForCurrentStackLevel($aDebugBacktrace[1], " to ");
+
+		// level 2 = caller of the deprecated method
+		if (array_key_exists(2, $aDebugBacktrace)) {
+			$sMessage .= ' (from ';
+			$sMessage .= self::GetMessageForCurrentStackLevel($aDebugBacktrace[2]);
+			$sMessage .= ')';
+		}
+
+		return $sMessage;
+	}
+
+	private static function GetMessageForCurrentStackLevel(array $aCurrentLevelDebugTrace, ?string $sPrefix = ""): string
+	{
+		$sMessage = "";
+		if (array_key_exists('class', $aCurrentLevelDebugTrace)) {
+			$sDeprecatedObject = $aCurrentLevelDebugTrace['class'];
+			$sDeprecatedMethod = $aCurrentLevelDebugTrace['function'] ?? "";
+			$sMessage = "{$sPrefix}{$sDeprecatedObject}::{$sDeprecatedMethod} in ";
+		}
+
+		if (array_key_exists('file', $aCurrentLevelDebugTrace)) {
+			$sCallerFile = $aCurrentLevelDebugTrace['file'];
+			$sCallerLine = $aCurrentLevelDebugTrace['line'] ?? "";
+			$sMessage .= "{$sCallerFile}#L{$sCallerLine}";
+		}
+
+		return $sMessage;
 	}
 
 	/**
@@ -1383,11 +1422,14 @@ class DeprecatedCallsLog extends LogAPI
 		}
 
 		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_ENDPOINT);
-		static::ForwardToTriggerError($sMessage);
 	}
 
 	public static function Log($sLevel, $sMessage, $sChannel = null, $aContext = array()): void
 	{
+		if (true === utils::IsDevelopmentEnvironment()) {
+			trigger_error($sMessage, E_USER_DEPRECATED);
+		}
+
 		try {
 			parent::Log($sLevel, $sMessage, $sChannel, $aContext);
 		}
@@ -1395,61 +1437,6 @@ class DeprecatedCallsLog extends LogAPI
 			// nothing much we can do... and we don't want to crash the caller !
 		}
 	}
-
-	/**
-	 * Strips some elements from the top of the call stack to skip calls that are not relevant to report the deprecated call
-	 * @param array $aCallStack Call stack as returned by {@see debug_backtrace()}
-	 */
-	protected static function StripCallStack($aCallStack): array
-	{
-		if (!isset($aCallStack[0]['line'])) {
-			$aCallStack = array_slice($aCallStack, 1);
-		}
-		if (isset($aCallStack[1]['function']) && $aCallStack[1]['function'] === 'trigger_deprecation') {
-			$aCallStack = array_slice($aCallStack, 1);
-		}
-
-		return $aCallStack;
-	}
-
-	protected static function SummarizeCallStack($aCallStack, $bRecurse = true)
-	{
-		if (count($aCallStack) == 0) {
-			return null;
-		}
-		$sFileLine = $aCallStack[0]['file'].'#'.$aCallStack[0]['line'];
-		$sSummary = $sFileLine;
-
-		// If possible and meaningful, add the class and method
-		if (isset($aCallStack[1]['class'])) {
-			$sSummary = $aCallStack[1]['class'].$aCallStack[1]['type'].$aCallStack[1]['function']." ($sFileLine)";
-		}
-		elseif (isset($aCallStack[1]['function'])) {
-			if (in_array($aCallStack[1]['function'], ['include', 'require', 'include_once', 'require_once'])) {
-				// No need to show the generic mechanism of inclusion
-				$bRecurse = false;
-			}
-			else {
-				$sSummary = $aCallStack[1]['function']." ($sFileLine)";
-			}
-		}
-
-		if ($bRecurse) {
-			$sUpperSummary = static::SummarizeCallStack(array_slice($aCallStack, 1), false);
-			if (!is_null($sUpperSummary)) {
-				$sSummary .= ', itself called from '.$sUpperSummary;
-			}
-		}
-
-		return $sSummary;
-	}
-
-	private static function ForwardToTriggerError(string $sMessage): void
-	{
-		if (true === utils::IsDevelopmentEnvironment()) {
-			trigger_error($sMessage, E_USER_DEPRECATED);
-		}
-	}
 }
 
 

core/metamodel.class.php

@@ -7081,7 +7081,7 @@ abstract class MetaModel
 	 * @param array $aParams
 	 * @param bool $bAllowAllData
 	 *
-	 * @return \DBObject|null
+	 * @return \DBObject
 	 * @throws \OQLException
 	 */
 	public static function GetObjectFromOQL($sQuery, $aParams = null, $bAllowAllData = false)
@@ -7477,8 +7477,6 @@ abstract class MetaModel
 	 * @param string|null $sFilterInstanceOf [optional] if given, only instance of this string will be returned
 	 *
 	 * @return array classes=>instance implementing the given interface
-	 *
-	 * @see \Combodo\iTop\Service\InterfaceDiscovery\InterfaceDiscovery::FindItopClasses() to add extensibility to modules
 	 */
 	public static function EnumPlugins($sInterface, $sFilterInstanceOf = null)
 	{
@@ -7532,41 +7530,8 @@ abstract class MetaModel
 		return $aEntries;
 	}
 
-	public static function ResetAllCaches($sEnvironment = null)
-	{
-		if (is_null($sEnvironment)) {
-			$sEnvironment = MetaModel::GetEnvironment();
-		}
-
-		$sEnvironmentId = md5(APPROOT).'-'.$sEnvironment;
-		$sAppIdentity = 'itop-'.$sEnvironmentId;
-		require_once(APPROOT.'/core/dict.class.inc.php');
-		Dict::ResetCache($sAppIdentity);
-
-		if (function_exists('apc_delete')) {
-			foreach (self::GetCacheEntries($sEnvironmentId) as $sKey => $aAPCInfo) {
-				$sAPCKey = $aAPCInfo['info'];
-				apc_delete($sAPCKey);
-			}
-		}
-
-		require_once(APPROOT.'core/userrights.class.inc.php');
-		UserRights::FlushPrivileges();
-
-		// Reset the opcache since otherwise the PHP "model" files may still be cached !!
-		if (function_exists('opcache_reset')) {
-			// Zend opcode cache
-			opcache_reset();
-		}
-
-		require_once(APPROOT.'setup/setuputils.class.inc.php');
-		SetupUtils::rrmdir(utils::GetCachePath($sEnvironment));
-	}
-
 	/**
-	 * @internal
 	 * @param string $sEnvironmentId
-	 * @deprecated 3.2.1
 	 */
 	public static function ResetCache($sEnvironmentId = null)
 	{
@@ -7590,13 +7555,6 @@ abstract class MetaModel
 
 		require_once(APPROOT.'core/userrights.class.inc.php');
 		UserRights::FlushPrivileges();
-
-		// Reset the opcache since otherwise the PHP "model" files may still be cached !!
-		if (function_exists('opcache_reset'))
-		{
-			// Zend opcode cache
-			opcache_reset();
-		}
 	}
 
 	/**

core/modelreflection.class.inc.php

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

core/oql/build/PHP/Lempar.php

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

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

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

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

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

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

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

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

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

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

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

core/oql/build/build.bash

@@ -2,7 +2,6 @@
 #
 # Rebuild the iTop Lexer / Parser
 # PEAR is required to build (really?)
-# PHP 8.0+ is not supported by the parser generator
 # Launch this batch from the core/oql/build directory
 # with ./build.bash
 #

core/oql/build/build.cmd

@@ -1,6 +1,5 @@
 rem must be run with current directory = the directory of the batch
 rem PEAR is required to build
-rem  PHP 8.0+ is not supported by the parser generator
 php -d include_path=".;C:\iTop\PHP\PEAR" ".\PHP\LexerGenerator\cli.php" ..\oql-lexer.plex
 php ".\PHP\ParserGenerator\cli.php" ..\oql-parser.y
 php -r "echo date('Y-m-d');" > ..\version.txt

core/oql/expression.class.inc.php

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

core/oql/oql-lexer.php

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

core/oql/oql-parser.php

@@ -40,7 +40,7 @@ class OQLParser_yyToken implements ArrayAccess
 
 	// Return type mixed is not supported by PHP 7.4, we can remove the following PHP attribute and add the return type once iTop min PHP version is PHP 8.0+
 	#[\ReturnTypeWillChange]
-	function offsetGet($offset)
+    function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
@@ -99,7 +99,7 @@ class OQLParser_yyStackEntry
 
 // declare_class is output here
 #line 24 "..\oql-parser.y"
-class OQLParserRaw#line 104 "..\oql-parser.php"
+class OQLParserRaw#line 102 "..\oql-parser.php"
 {
 /* First off, code is included which follows the "include_class" declaration
 ** in the input file. */
@@ -1180,7 +1180,7 @@ static public $yy_action = array(
 #line 30 "..\oql-parser.y"
 
 throw new OQLParserStackOverFlowException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol);
-#line 1188 "..\oql-parser.php"
+#line 1186 "..\oql-parser.php"
             return;
         }
         $yytos = new OQLParser_yyStackEntry;
@@ -1482,49 +1482,49 @@ throw new OQLParserStackOverFlowException($this->m_sSourceQuery, $this->m_iLine,
     */
 #line 37 "..\oql-parser.y"
     function yy_r0(){ $this->my_result = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 1490 "..\oql-parser.php"
+#line 1488 "..\oql-parser.php"
 #line 41 "..\oql-parser.y"
     function yy_r3(){
 	$this->_retvalue = new OqlUnionQuery($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
-#line 1495 "..\oql-parser.php"
+#line 1493 "..\oql-parser.php"
 #line 48 "..\oql-parser.y"
     function yy_r5(){
 	$this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + -2]->minor));
     }
-#line 1500 "..\oql-parser.php"
+#line 1498 "..\oql-parser.php"
 #line 51 "..\oql-parser.y"
     function yy_r6(){
 	$this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + -2]->minor));
     }
-#line 1505 "..\oql-parser.php"
+#line 1503 "..\oql-parser.php"
 #line 55 "..\oql-parser.y"
     function yy_r7(){
 	$this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + -4]->minor);
     }
-#line 1510 "..\oql-parser.php"
+#line 1508 "..\oql-parser.php"
 #line 58 "..\oql-parser.y"
     function yy_r8(){
 	$this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + -6]->minor);
     }
-#line 1515 "..\oql-parser.php"
+#line 1513 "..\oql-parser.php"
 #line 63 "..\oql-parser.y"
     function yy_r9(){
 	$this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 1520 "..\oql-parser.php"
+#line 1518 "..\oql-parser.php"
 #line 66 "..\oql-parser.y"
     function yy_r10(){
 	array_push($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor);
 	$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
     }
-#line 1526 "..\oql-parser.php"
+#line 1524 "..\oql-parser.php"
 #line 71 "..\oql-parser.y"
     function yy_r11(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 1529 "..\oql-parser.php"
+#line 1527 "..\oql-parser.php"
 #line 72 "..\oql-parser.y"
     function yy_r12(){ $this->_retvalue = null;    }
-#line 1532 "..\oql-parser.php"
+#line 1530 "..\oql-parser.php"
 #line 74 "..\oql-parser.y"
     function yy_r13(){
 	// insert the join statement on top of the existing list
@@ -1532,63 +1532,63 @@ throw new OQLParserStackOverFlowException($this->m_sSourceQuery, $this->m_iLine,
 	// and return the updated array
 	$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
-#line 1540 "..\oql-parser.php"
+#line 1538 "..\oql-parser.php"
 #line 80 "..\oql-parser.y"
     function yy_r14(){
 	$this->_retvalue = Array($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 1545 "..\oql-parser.php"
+#line 1543 "..\oql-parser.php"
 #line 86 "..\oql-parser.y"
     function yy_r16(){
 	// create an array with one single item
 	$this->_retvalue = new OqlJoinSpec($this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
-#line 1551 "..\oql-parser.php"
+#line 1549 "..\oql-parser.php"
 #line 91 "..\oql-parser.y"
     function yy_r17(){
 	// create an array with one single item
 	$this->_retvalue = new OqlJoinSpec($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
-#line 1557 "..\oql-parser.php"
+#line 1555 "..\oql-parser.php"
 #line 96 "..\oql-parser.y"
     function yy_r18(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, '=', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1560 "..\oql-parser.php"
+#line 1558 "..\oql-parser.php"
 #line 97 "..\oql-parser.y"
     function yy_r19(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'BELOW', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1563 "..\oql-parser.php"
+#line 1561 "..\oql-parser.php"
 #line 98 "..\oql-parser.y"
     function yy_r20(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'BELOW_STRICT', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1566 "..\oql-parser.php"
+#line 1564 "..\oql-parser.php"
 #line 99 "..\oql-parser.y"
     function yy_r21(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_BELOW', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1569 "..\oql-parser.php"
+#line 1567 "..\oql-parser.php"
 #line 100 "..\oql-parser.y"
     function yy_r22(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_BELOW_STRICT', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1572 "..\oql-parser.php"
+#line 1570 "..\oql-parser.php"
 #line 101 "..\oql-parser.y"
     function yy_r23(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'ABOVE', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1575 "..\oql-parser.php"
+#line 1573 "..\oql-parser.php"
 #line 102 "..\oql-parser.y"
     function yy_r24(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'ABOVE_STRICT', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1578 "..\oql-parser.php"
+#line 1576 "..\oql-parser.php"
 #line 103 "..\oql-parser.y"
     function yy_r25(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_ABOVE', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1581 "..\oql-parser.php"
+#line 1579 "..\oql-parser.php"
 #line 104 "..\oql-parser.y"
     function yy_r26(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_ABOVE_STRICT', $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1584 "..\oql-parser.php"
+#line 1582 "..\oql-parser.php"
 #line 106 "..\oql-parser.y"
     function yy_r27(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 1587 "..\oql-parser.php"
+#line 1585 "..\oql-parser.php"
 #line 111 "..\oql-parser.y"
     function yy_r31(){ $this->_retvalue = new FunctionOqlExpression($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor);     }
-#line 1590 "..\oql-parser.php"
+#line 1588 "..\oql-parser.php"
 #line 112 "..\oql-parser.y"
     function yy_r32(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
-#line 1593 "..\oql-parser.php"
+#line 1591 "..\oql-parser.php"
 #line 113 "..\oql-parser.y"
     function yy_r33(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1596 "..\oql-parser.php"
+#line 1594 "..\oql-parser.php"
 #line 119 "..\oql-parser.y"
     function yy_r37(){
     if ($this->yystack[$this->yyidx + -1]->minor == 'MATCHES')
@@ -1600,43 +1600,43 @@ throw new OQLParserStackOverFlowException($this->m_sSourceQuery, $this->m_iLine,
         $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
     }
-#line 1608 "..\oql-parser.php"
+#line 1606 "..\oql-parser.php"
 #line 136 "..\oql-parser.y"
     function yy_r42(){
 	$this->_retvalue = new ListOqlExpression($this->yystack[$this->yyidx + -1]->minor);
     }
-#line 1613 "..\oql-parser.php"
+#line 1611 "..\oql-parser.php"
 #line 139 "..\oql-parser.y"
     function yy_r43(){
 	$this->_retvalue = new NestedQueryOqlExpression($this->yystack[$this->yyidx + -1]->minor);
     }
-#line 1618 "..\oql-parser.php"
+#line 1616 "..\oql-parser.php"
 #line 154 "..\oql-parser.y"
     function yy_r47(){
 	$this->_retvalue = array();
     }
-#line 1623 "..\oql-parser.php"
+#line 1621 "..\oql-parser.php"
 #line 165 "..\oql-parser.y"
     function yy_r51(){ $this->_retvalue = new IntervalOqlExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);     }
-#line 1626 "..\oql-parser.php"
+#line 1624 "..\oql-parser.php"
 #line 178 "..\oql-parser.y"
     function yy_r61(){ $this->_retvalue = new ScalarOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
-#line 1629 "..\oql-parser.php"
+#line 1627 "..\oql-parser.php"
 #line 180 "..\oql-parser.y"
     function yy_r63(){ $this->_retvalue = new ScalarOqlExpression(null);     }
-#line 1632 "..\oql-parser.php"
+#line 1630 "..\oql-parser.php"
 #line 182 "..\oql-parser.y"
     function yy_r64(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
-#line 1635 "..\oql-parser.php"
+#line 1633 "..\oql-parser.php"
 #line 183 "..\oql-parser.y"
     function yy_r65(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -2]->minor);     }
-#line 1638 "..\oql-parser.php"
+#line 1636 "..\oql-parser.php"
 #line 184 "..\oql-parser.y"
     function yy_r66(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor;     }
-#line 1641 "..\oql-parser.php"
+#line 1639 "..\oql-parser.php"
 #line 187 "..\oql-parser.y"
     function yy_r67(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1));     }
-#line 1644 "..\oql-parser.php"
+#line 1642 "..\oql-parser.php"
 #line 189 "..\oql-parser.y"
     function yy_r68(){
 	if ($this->yystack[$this->yyidx + 0]->minor[0] == '`')
@@ -1649,22 +1649,22 @@ throw new OQLParserStackOverFlowException($this->m_sSourceQuery, $this->m_iLine,
 	}
 	$this->_retvalue = new OqlName($name, $this->m_iColPrev);
     }
-#line 1657 "..\oql-parser.php"
+#line 1655 "..\oql-parser.php"
 #line 200 "..\oql-parser.y"
     function yy_r69(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor;    }
-#line 1660 "..\oql-parser.php"
+#line 1658 "..\oql-parser.php"
 #line 201 "..\oql-parser.y"
     function yy_r70(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor;    }
-#line 1663 "..\oql-parser.php"
+#line 1661 "..\oql-parser.php"
 #line 202 "..\oql-parser.y"
     function yy_r71(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor);    }
-#line 1666 "..\oql-parser.php"
+#line 1664 "..\oql-parser.php"
 #line 203 "..\oql-parser.y"
     function yy_r72(){$this->_retvalue=stripslashes(substr($this->yystack[$this->yyidx + 0]->minor, 1, strlen($this->yystack[$this->yyidx + 0]->minor) - 2));    }
-#line 1669 "..\oql-parser.php"
+#line 1667 "..\oql-parser.php"
 #line 206 "..\oql-parser.y"
     function yy_r73(){$this->_retvalue=$this->yystack[$this->yyidx + 0]->minor;    }
-#line 1672 "..\oql-parser.php"
+#line 1670 "..\oql-parser.php"
 
     /**
      * placeholder for the left hand side in a reduce operation.
@@ -1768,7 +1768,7 @@ throw new OQLParserStackOverFlowException($this->m_sSourceQuery, $this->m_iLine,
 #line 33 "..\oql-parser.y"
 
 throw new OQLParserParseFailureException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol);
-#line 1777 "..\oql-parser.php"
+#line 1775 "..\oql-parser.php"
     }
 
     /**
@@ -1783,7 +1783,7 @@ throw new OQLParserParseFailureException($this->m_sSourceQuery, $this->m_iLine,
 #line 25 "..\oql-parser.y"
  
 throw new OQLParserSyntaxErrorException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol, $this->tokenName($yymajor), $TOKEN);
-#line 1793 "..\oql-parser.php"
+#line 1791 "..\oql-parser.php"
     }
 
     /**
@@ -2043,4 +2043,4 @@ class OQLParser extends OQLParserRaw
 	}
 }
 
-#line 2054 "..\oql-parser.php"
+#line 2052 "..\oql-parser.php"

core/oql/oqlinterpreter.class.inc.php

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

core/ormdocument.class.inc.php

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

core/ownershiplock.class.inc.php

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

core/restservices.class.inc.php

@@ -44,8 +44,6 @@ class ObjectResult
 	 * @var string
 	 * @api
 	 */
-    use SanitizeTrait;
-
 	public $message;
 	/**
 	 * @var mixed|null
@@ -76,52 +74,6 @@ class ObjectResult
 		$this->fields = array();
 	}
 
-	/**
-	 * Creates an ObjectResult from a DBObject.
-	 *
-	 * @param DBObject $oObj The object.
-	 * @param array|null $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
-	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 * @param integer $iCode An error code (RestResult::OK is no issue has been found)
-	 * @param string $sMessage Description of the error if any, an empty string otherwise
-	 * 
-	 * @return ObjectResult
-	 */
-	public static function FromDBObject(DBObject $oObj, ?array $aFieldSpec = null, $bExtendedOutput = false, $iCode = 0, $sMessage = '') : ObjectResult {
-
-		$oObjRes = new ObjectResult($oObj::class, $oObj->GetKey());
-		$oObjRes->code = $iCode;
-		$oObjRes->message = $sMessage;
-
-		$aFields = null;
-		if (!is_null($aFieldSpec))
-		{
-			// Enum all classes in the hierarchy, starting with the current one
-			foreach (MetaModel::EnumParentClasses($oObj::class, ENUM_PARENT_CLASSES_ALL, false) as $sRefClass)
-			{
-				if (array_key_exists($sRefClass, $aFieldSpec))
-				{
-					$aFields = $aFieldSpec[$sRefClass];
-					break;
-				}
-			}
-		}
-		if (is_null($aFields))
-		{
-			// No fieldspec given, or not found...
-			$aFields = array('id', 'friendlyname');
-		}
-
-		foreach ($aFields as $sAttCode)
-		{
-			$oObjRes->AddField($oObj, $sAttCode, $bExtendedOutput);
-		}
-
-		return $oObjRes;
-
-	}
-
-
 	/**
 	 * Helper to make an output value for a given attribute
 	 *
@@ -204,19 +156,6 @@ class ObjectResult
 	{
 		$this->fields[$sAttCode] = $this->MakeResultValue($oObject, $sAttCode, $bExtendedOutput);
 	}
-
-public function SanitizeContent()
-	{
-		foreach($this->fields as $sFieldAttCode => $fieldValue)
-		{
-            try {
-			$oAttDef = MetaModel::GetAttributeDef($this->class, $sFieldAttCode);
-            } catch (Exception $e) { // for special cases like ID
-                continue;
-            }
-                $this->SanitizeFieldIfSensitive($this->fields, $sFieldAttCode, $fieldValue, $oAttDef);
-		}
-	}
 }
 
 
@@ -250,21 +189,38 @@ class RestResultWithObjects extends RestResult
 	 */
 	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
 	{
-		$oObjRes = ObjectResult::FromDBObject($oObject, $aFieldSpec, $bExtendedOutput, $iCode, $sMessage);
+		$sClass = get_class($oObject);
+		$oObjRes = new ObjectResult($sClass, $oObject->GetKey());
+		$oObjRes->code = $iCode;
+		$oObjRes->message = $sMessage;
+
+		$aFields = null;
+		if (!is_null($aFieldSpec))
+		{
+			// Enum all classes in the hierarchy, starting with the current one
+			foreach (MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, false) as $sRefClass)
+			{
+				if (array_key_exists($sRefClass, $aFieldSpec))
+				{
+					$aFields = $aFieldSpec[$sRefClass];
+					break;
+				}
+			}
+		}
+		if (is_null($aFields))
+		{
+			// No fieldspec given, or not found...
+			$aFields = array('id', 'friendlyname');
+		}
+
+		foreach ($aFields as $sAttCode)
+		{
+			$oObjRes->AddField($oObject, $sAttCode, $bExtendedOutput);
+		}
 
 		$sObjKey = get_class($oObject).'::'.$oObject->GetKey();
 		$this->objects[$sObjKey] = $oObjRes;
 	}
-
-public function SanitizeContent()
-	{
-		parent::SanitizeContent();
-
-		foreach($this->objects as $sObjKey => $oObjRes)
-		{
-			$oObjRes->SanitizeContent();
-		}
-	}
 }
 
 /**
@@ -352,10 +308,9 @@ class RestDelete
  *
  * @package     Core
  */
-class CoreServices implements iRestServiceProvider, iRestInputSanitizer
+class CoreServices implements iRestServiceProvider
 {
-    use SanitizeTrait;
-    /**
+	/**
 	 * Enumerate services delivered by this class
 	 * 	 
 	 * @param string $sVersion The version (e.g. 1.0) supported by the services
@@ -573,18 +528,18 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
             }
 			else
 			{
-                                if (!$bExtendedOutput && RestUtils::GetOptionalParam($aParams, 'output_fields', '*') != '*')
+                                if (!$bExtendedOutput && RestUtils::GetOptionalParam($aParams, 'output_fields', '*') != '*') 
                                 {
                                         $aFields = $aShowFields[$sClass];
                                         //Id is not a valid attribute to optimize
-                                        if (in_array('id', $aFields))
+                                        if (in_array('id', $aFields)) 
                                         {
                                             unset($aFields[array_search('id', $aFields)]);
                                         }
                                         $aAttToLoad = array($oObjectSet->GetClassAlias() => $aFields);
                                         $oObjectSet->OptimizeColumnLoad($aAttToLoad);
                                 }
-
+                                
 				while ($oObject = $oObjectSet->Fetch())
 				{
 					$oResult->AddObject(0, '', $oObject, $aShowFields, $bExtendedOutput);
@@ -782,33 +737,6 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 		return $oResult;
 	}
 
-	public function SanitizeJsonInput(string $sJsonInput): string
-	{
-        $sSanitizedJsonInput = $sJsonInput;
-        $aJsonData = json_decode($sSanitizedJsonInput, true);
-        $sOperation = $aJsonData['operation'];
-
-        switch ($sOperation) {
-            case 'core/check_credentials':
-                if (isset($aJsonData['password'])) {
-                    $aJsonData['password'] = '*****';
-                }
-                break;
-            case 'core/update':
-            case 'core/create':
-            default :
-            $sClass = $aJsonData['class'];
-            if (isset($aJsonData['fields'])) {
-                foreach ($aJsonData['fields'] as $sFieldAttCode => $fieldValue) {
-                    $oAttDef = MetaModel::GetAttributeDef($sClass, $sFieldAttCode);
-                    $this->SanitizeFieldIfSensitive($aJsonData['fields'], $sFieldAttCode, $fieldValue, $oAttDef);
-                }
-            }
-            break;
-        }
-		return json_encode($aJsonData, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
-	}
-
 	/**
 	 * Helper for object deletion	
 	 */
@@ -947,50 +875,3 @@ class CoreServices implements iRestServiceProvider, iRestInputSanitizer
 		return $iLimit * max(0, $iPage - 1);
 	}
 }
-
-trait SanitizeTrait
-{
-    /**
-     * Sanitize a field if it is sensitive.
-     *
-     * @param array $fields The fields array
-     * @param string $sFieldAttCode The attribute code
-     * @param mixed $oAttDef The attribute definition
-     * @throws Exception
-     */
-    private function SanitizeFieldIfSensitive(array &$fields, string $sFieldAttCode, $fieldValue, $oAttDef): void
-    {
-        // for simple attribute
-        if ($oAttDef instanceof iAttributeNoGroupBy) // iAttributeNoGroupBy is equivalent to sensitive attribute
-        {
-            $fields[$sFieldAttCode] = '*****';
-            return;
-        }
-        // for 1-n / n-n relation
-        if ($oAttDef instanceof AttributeLinkedSet) {
-            foreach ($fieldValue as $i => $aLnkValues) {
-                foreach ($aLnkValues as $sLnkAttCode => $sLnkValue) {
-                    $oLnkAttDef = MetaModel::GetAttributeDef($oAttDef->GetLinkedClass(), $sLnkAttCode);
-                    if ($oLnkAttDef instanceof iAttributeNoGroupBy) { // 1-n relation
-                        $fields[$sFieldAttCode][$i][$sLnkAttCode] = '*****';
-                    }
-                    elseif ($oAttDef instanceof AttributeLinkedSetIndirect && $oLnkAttDef instanceof AttributeExternalField) { // for n-n relation
-                        $oExtKeyAttDef = MetaModel::GetAttributeDef($oLnkAttDef->GetTargetClass(), $oLnkAttDef->GetExtAttCode());
-                        if ($oExtKeyAttDef instanceof iAttributeNoGroupBy) {
-                            $fields[$sFieldAttCode][$i][$sLnkAttCode] = '*****';
-                        }
-                    }
-                }
-            }
-            return;
-        }
-
-        // for external attribute
-        if ($oAttDef instanceof AttributeExternalField) {
-            $oExtKeyAttDef = MetaModel::GetAttributeDef($oAttDef->GetTargetClass(), $oAttDef->GetExtAttCode());
-            if ($oExtKeyAttDef instanceof iAttributeNoGroupBy) {
-                $fields[$sFieldAttCode] = '*****';
-            }
-        }
-    }
-}

core/userrights.class.inc.php

@@ -1921,56 +1921,52 @@ class UserRights
 	 */
 	protected static function FindUser($sLogin, $sAuthentication = 'any', $bAllowDisabledUsers = false)
 	{
-		if ($sAuthentication === 'any') {
-			$oUser = self::FindUser($sLogin, 'internal', $bAllowDisabledUsers);
-			if ($oUser !== null) {
-				return $oUser;
+		if ($sAuthentication == 'any')
+		{
+			$oUser = self::FindUser($sLogin, 'internal');
+			if ($oUser == null)
+			{
+				$oUser = self::FindUser($sLogin, 'external');
+			}
+		}
+		else
+		{
+			if (!isset(self::$m_aCacheUsers))
+			{
+				self::$m_aCacheUsers = array('internal' => array(), 'external' => array());
 			}
 
-			return self::FindUser($sLogin, 'external', $bAllowDisabledUsers);
-		}
+			if (!isset(self::$m_aCacheUsers[$sAuthentication][$sLogin]))
+			{
+				switch($sAuthentication)
+				{
+					case 'external':
+					$sBaseClass = 'UserExternal';
+					break;
 
-		if (!isset(self::$m_aCacheUsers)) {
-			self::$m_aCacheUsers = [ 'internal' => [], 'external' => [] ];
-		}
+					case 'internal':
+					$sBaseClass = 'UserInternal';
+					break;
 
-		if (! isset(self::$m_aCacheUsers[$sAuthentication]) || ! array_key_exists($sLogin, self::$m_aCacheUsers[$sAuthentication])) {
-			switch($sAuthentication) {
-				case 'external':
-				$sBaseClass = 'UserExternal';
-				break;
-
-				case 'internal':
-				$sBaseClass = 'UserInternal';
-				break;
-
-				default:
-				echo "<p>sAuthentication = $sAuthentication</p>\n";
-				assert(false); // should never happen
+					default:
+					echo "<p>sAuthentication = $sAuthentication</p>\n";
+					assert(false); // should never happen
+				}
+				$oSearch = DBObjectSearch::FromOQL("SELECT $sBaseClass WHERE login = :login");
+				$oSearch->AllowAllData();
+				if (!$bAllowDisabledUsers)
+				{
+					$oSearch->AddCondition('status', 'enabled');
+				}
+				$oSet = new DBObjectSet($oSearch, array(), array('login' => $sLogin));
+				$oUser = $oSet->fetch();
+				self::$m_aCacheUsers[$sAuthentication][$sLogin] = $oUser;
 			}
-			$oSearch = DBObjectSearch::FromOQL("SELECT $sBaseClass WHERE login = :login");
-			$oSearch->AllowAllData();
-			if (!$bAllowDisabledUsers) {
-				$oSearch->AddCondition('status', 'enabled');
-			}
-			$oSet = new DBObjectSet($oSearch, array(), array('login' => $sLogin));
-			$oUser = $oSet->fetch();
-
-			self::$m_aCacheUsers[$sAuthentication][$sLogin] = $oUser;
+			$oUser = self::$m_aCacheUsers[$sAuthentication][$sLogin];
 		}
-
-		return self::$m_aCacheUsers[$sAuthentication][$sLogin];
+		return $oUser;
 	}
 
-	/**
-	 * Reset the cache of users
-	 * @return void
-	 */
-	public static function ResetCacheUsers()
-	{
-		self::$m_aCacheUsers = [ 'internal' => [], 'external' => [] ];
-	}
-	
 	/**
 	 * @param string$sClass
 	 * @param array $aAllowedOrgs
@@ -2129,8 +2125,6 @@ class StimulusChecker extends ActionChecker
 {
 	var $sState = null;
 
-	public mixed $iState = null;
-
 	public function __construct(DBSearch $oFilter, $sState, $iStimulusCode)
 	{
 		parent::__construct($oFilter, $iStimulusCode);

core/valuesetdef.class.inc.php

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

css/backoffice/README.md

@@ -1,108 +1,75 @@
-# Description
-This is a brief description of the how the backoffice theme is structured using both BEM and SASS 7-1 systems and how to use them.
-  * [7-1 pattern](#7-1-pattern)
-    * [File structure](#file-structure)
-    * [Usage](#usage)
-  * [BEM methodology](#bem-methodology)
-    * [Principles](#principles)
-    * [Examples](#examples)
+## Description
+This is a brief description of the SASS 7-1 system and how to use it.
+- [File structure](#file-structure)
+- [Usage](#usage)
 
-# 7-1 pattern
 ## File structure
 SCSS files are structured following the [7-1 pattern](https://sass-guidelin.es/#the-7-1-pattern). \
 @rveitch made a great summary with the following, which can also be found [here](https://gist.github.com/rveitch/84cea9650092119527bc).
 
-_Note: Folders with an * are customizations we made to the original 7-1 pattern to best fit our needs_
+_Note: Folders with an * are customizations we made to the original 7-1 pattern to best fit our needs_  
 
 ```
 css/backoffice/
 |
 |– utils/
-|   |– variables/           # Sass Variables used in Functions, Mixins, Helpers, ...
-|   |   |- colors/
-|   |   |   |- _base.scss
-|   |   |   |- _base-palette.scss       # Base colors used everywhere
-|   |   |   |- _lifecycle-palette.scss  # Colors used for lifecycle of an object (e.g. representing states such as new, frozen, done, ...), based on the base colors
-|   |   |   |- _semantic-palette.scss   # Colors used for semantic meaning (e.g. red for errors, green for success, ...), based on the base colors
-|   |   |   ...
-|   |   |
-|   |   |- _depression.scss
-|   |   |- _elevation.scss
-|   |   |- _size.scss                   # Base sizes used everywhere (spacings, ...)
-|   |   |- _spacing.scss
-|   |   |- _typography.scss             # Typography sizes, weights, families, ...
-|   |   ...
-|   |
-|   |– functions/           # Sass Functions
-|   |   |- _color.scss      # Color manipulation functions
-|   |
-|   |– mixins/              # Sass Mixins
-|   |– helpers/             # Class & placeholders helpers
+|   |– _variables.scss   # Sass Variables
+|   |– _functions.scss   # Sass Functions
+|   |– _mixins.scss      # Sass Mixins
+|   |– _helpers.scss     # Class & placeholders helpers
 |
-|– vendors/                 # Third-party libs, should be either:
-|                           # - Overload of the lib SCSS variables (BEST way, but possible only if the lib exposes them. e.g. Bulma)
-|                           # - Overload of the lib necessary CSS classes only (not great as it duplicates some rules in the browser, which add weight and computation. e.g. dataTables)
-|                           # - Duplicate the lib CSS completly to insert SCSS variables (not great as it will be outdated when updating the lib itself. e.g. jQuery UI)
-|   |– _bulma-variables-overload.scss   # Bulma CSS framework
-|   |– _jquery-ui.scss                  # jQuery UI
-|   ...                                 # Etc…
+|– vendors/
+|   |– _bootstrap.scss   # Bootstrap
+|   |– _jquery-ui.scss   # jQuery UI
+|   ...                  # Etc…
 |
 |– base/
-|   |– _reset.scss          # Reset/normalize
-|   |– _typography.scss     # Typography fonts imports
-|   ...                     # Etc…
+|   |– _reset.scss       # Reset/normalize
+|   |– _typography.scss  # Typography rules
+|   ...                  # Etc…
 |
-|– components/              # Components of the UI, each corresponding to a UI block and being usable as a standalone
-|   |– _button.scss
-|   |– _button-group.scss
-|   |– _global-search.scss
-|   |– _quick-create.scss
-|   ...
+|– components/
+|   |– _buttons.scss     # Buttons
+|   |– _carousel.scss    # Carousel
+|   |– _cover.scss       # Cover
+|   |– _dropdown.scss    # Dropdown
+|   ...                  # Etc…
 |
-|– layout/                  # Elements of the UI made of several components, making the layout of the app
-|   |– activity-panel/
-|   |– dashboard/
-|   |– object/              # DM object display (details, summary card, ...)
-|   |– tab-container/
-|   ...
+|– layout/
+|   |– _navigation.scss  # Navigation
+|   |– _grid.scss        # Grid system
+|   |– _header.scss      # Header
+|   |– _footer.scss      # Footer
+|   |– _sidebar.scss     # Sidebar
+|   |– _forms.scss       # Forms
+|   ...                  # Etc…
 |
-|- *application/            # Elements that are not usable as a standalone (like componants and layouts are) and very application (the backoffice) specific
+|- *application/         # Elements that are not usable as a standalone (like componants and layouts are) and very application (the backoffice) specific
 |   |- display-block
 |   |- tabular-fields
 |   ...
 |
-|- *datamodel/              # SCSS / CSS3 variables and CSS classes for *PHP* classes of the DM that are part of the core (not in a module) and cannot be styled otherwise
-|   |- _action.scss
+|- *datamodel/           # SCSS / CSS3 variables and CSS classes for PHP classes of the DM that are part of the core (not in a module) and cannot be styled otherwise
 |   |- _user.scss
 |   ...
 |
-|– pages/                   # SCSS / CSS3 variables and CSS classes for HTML elements specific to backoffice pages
-|   |– _base.scss           # Base for all backoffice pages
-|   |– _audit.scss          # Audit page
-|   |– _csv-import.scss     # CSV Import page
-|   ...                     # Etc…
+|– pages/
+|   |– _home.scss        # Home specific styles
+|   |– _contact.scss     # Contact specific styles
+|   ...                  # Etc…
 |
-|- *blocks-integrations     # Specific rules for the integration of a UI block with another one, those kind of rules should NEVER be in the block partial directly
-|   |- alert/
-|   |   |- _alert-with-blocks.scss          # How an alert should be displayed when after another block
-|   |- button/
-|   |   |- _button-with-button.scss         # How a button should be displayed when after another button
-|   |   |- _button-with-button-group.scss   # How a button should be displayed when before/after a button group
-|   |- panel/
-|   |   |- _panel-with-blocks.scss          # How a panel should be displayed when after another block
-|   |   |- _panel-within-main-content.scss  # How a panel becomes sticky when in the main content
-|   |   |- _panel-within-modal.scss         # How a panel becomes sticky when in a modal
-|   |- _tab-container-within-panel.scss     # Changes the negative margins of the datatable so it overlaps the panel's original padding
+|- *blocks-integrations  # Specific rules for the integration of a block with another one, those kind of rules should never be in the block partial directly
+|   |- _panel-with-datatable.scss   # Changes the negative margins of the datatable so it overlaps the panel's original padding
 |   ...
 |
 |– themes/
-|   |– _page-banner.scss    # ???
-|   ...                     # Etc…
+|   |– _theme.scss       # Default theme
+|   |– _admin.scss       # Admin theme
+|   ...                  # Etc…
 |
 |
-|- _fallback.scss           # Fallback file, should only contain rules that make standard HTML tags fallback to the style of a custom CSS class
-|- _shame.scss              # Shame file, should contain all the ugly hacks (https://sass-guidelin.es/#shame-file)
-`– main.scss                # Main Sass file
+`- _shame.scss           # Shame file, should contain all the ugly hacks (https://sass-guidelin.es/#shame-file)
+`– main.scss             # Main Sass file
 ```
 
 ## Usage
@@ -117,58 +84,7 @@ To avoid common errors, files should be imported in the final file in the follow
 - Components
 - Layout
 - \*Application
-- \*Datamodel
 - Pages
 - \*Block integrations
 - Themes
-- Shame file
-
-# BEM methodology
-## Principles
-[BEM is a methodology](https://getbem.com/) that helps you to create reusable components and code sharing in front‑end development. \
-The main idea is to use discriminant classes instead of nested basic selectors for 2 main reasons:
-  * It's easier to understand the purpose of a specific class when seeing it in the HTML markup of the SCSS file
-  * It's easier to override a specific class when needed as you don't need to use a selector at least as precise/complex as the one you want to override
-
-In our implementation, we start with the code of the UI block, followed by the sub-element, then the property or modifier. Separation is made of `--` instead of `__`.
-
-## Examples
-### Classes and CSS properties example
-```scss
-// SCSS variables:
-// - For CSS properties: CSS class, followed by CSS property
-$ibo-button--padding-y: 6px !default;
-$ibo-button--padding-x: 9px !default;
-$ibo-button--border: 0 !default;
-$ibo-button--border-radius: $ibo-border-radius-400 !default;
-$ibo-button--box-shadow-bottom: 0px 2px 0px !default;
-$ibo-button--box-shadow-top: inset 0px 2px 0px !default;
-
-$ibo-button--label--margin-left: $ibo-spacing-200 !default;
-
-// CSS classes:
-.ibo-button {
-    padding: $ibo-button--padding-y $ibo-button--padding-x;
-    border: $ibo-button--border;
-    border-radius: $ibo-button--border-radius;
-}
-
-.ibo-button--label {
-    margin-left: $ibo-button--label--margin-left;
-}
-```
-
-### States example
-```scss
-// SCSS variables:
-// Same rule as before, but with a `--is-` or `--on--` suffix
-$ibo-quick-create--input--padding: $ibo-spacing-0 default;
-$ibo-quick-create--input--padding-x--is-opened: $ibo-spacing-300 !default;
-$ibo-quick-create--input--padding-y--is-opened: $ibo-spacing-300 !default;
-
-$ibo-quick-create--input--width: $ibo-size-0 !default;
-$ibo-quick-create--input--width--is-opened: 245px !default;
-
-$ibo-quick-create--input--background-color: $ibo-color-white-100 !default;
-$ibo-quick-create--input--background-color--on-hover: $ibo-color-grey-200 !default;
-```
+- Shame file

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

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

css/backoffice/base/_base.scss

@@ -3,18 +3,18 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-scrollbar--scrollbar-width: $common-scrollbar--scrollbar-width !default;
+$ibo-scrollbar--scrollbar-width: 8px !default;
 $ibo-scrollbar--scrollbar-height: $ibo-scrollbar--scrollbar-width !default; /* For horizontal scrollbars */
-$ibo-scrollbar--scrollbar-track-background-color: $common-scrollbar--scrollbar-track-background-color !default;
-$ibo-scrollbar--scrollbar-track-border-radius: $common-scrollbar--scrollbar-track-border-radius !default;
-$ibo-scrollbar--scrollbar-thumb-background-color: $common-scrollbar--scrollbar-thumb-background-color !default;
+$ibo-scrollbar--scrollbar-track-background-color: $ibo-color-transparent !default;
+$ibo-scrollbar--scrollbar-track-border-radius: $ibo-border-radius-500 !default;
+$ibo-scrollbar--scrollbar-thumb-background-color: $ibo-color-grey-300 !default;
 $ibo-scrollbar--scrollbar-thumb-border: none !default;
-$ibo-scrollbar--scrollbar-thumb-border-radius: $common-scrollbar--scrollbar-thumb-border-radius !default;
+$ibo-scrollbar--scrollbar-thumb-border-radius: $ibo-border-radius-500 !default;
 
-$ibo-svg-illustration--fill: $common-svg-illustration--fill !default;
+$ibo-svg-illustration--fill: $ibo-color-primary-500 !default;
 
-$ibo-content-block--background-color: $common-content-block--background-color !default;
-$ibo-content-block--border: $common-content-block--border !default;
+$ibo-content-block--background-color: $ibo-color-white-100 !default;
+$ibo-content-block--border: 1px solid $ibo-color-grey-400 !default;
 
 /* CSS variables */
 :root{

css/backoffice/base/_typography.scss

@@ -4,3 +4,147 @@
  */
 
 /* This is an overload of the default lib. stylesheet to use local fonts instead of the CDN */
+@font-face {
+	font-family: Raleway;
+	font-weight: 100;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway Thin'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-100-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 100;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway Thin'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-100-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 200;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway ExtraLight'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-200-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 200;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway ExtraLight'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-200-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 300;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway Light'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-300-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 300;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway Light'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-300-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 400;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-400-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 400;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-400-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 500;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway Medium'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-500-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 500;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway Medium'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-500-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 600;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway SemiBold'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-600-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 600;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway SemiBold'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-600-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 700;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-700-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 700;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-700-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 800;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway ExtraBold'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-800-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 800;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway ExtraBold'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-800-italic.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 900;
+	font-style: normal;
+  font-display: swap;
+	src: local('Raleway Black'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-900-normal.woff') format('woff'),
+}
+@font-face {
+	font-family: Raleway;
+	font-weight: 900;
+	font-style: italic;
+  font-display: swap;
+	src: local('Raleway Black'),
+	url($approot-relative + 'node_modules/@fontsource/raleway/files/raleway-all-900-italic.woff') format('woff'),
+}

css/backoffice/datamodel/_action.scss

@@ -14,8 +14,8 @@ $ibo-dm-class--Action--complementary-color: $ibo-color-white-100 !default;
 
 .ibo-dm-class--Action {
   --ibo-main-color: #{$ibo-dm-class--Action--main-color};
-  --ibo-main-color--100: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-class--Action--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
-  --ibo-main-color--900: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-class--Action--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
+  --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-class--Action--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
+  --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-class--Action--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
   --ibo-complementary-color: #{$ibo-dm-class--Action--complementary-color};
 }
 
@@ -35,8 +35,8 @@ $ibo-dm-enum--Action-status-enabled--complementary-color: $ibo-lifecycle-active-
 
 .ibo-dm-enum--Action-status-enabled {
   --ibo-main-color: #{$ibo-dm-enum--Action-status-enabled--main-color};
-  --ibo-main-color--100: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-enum--Action-status-enabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
-  --ibo-main-color--900: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-enum--Action-status-enabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
+  --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-enabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
+  --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-enabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
   --ibo-complementary-color: #{$ibo-dm-enum--Action-status-enabled--complementary-color};
 }
 
@@ -56,8 +56,8 @@ $ibo-dm-enum--Action-status-disabled--complementary-color: $ibo-lifecycle-frozen
 
 .ibo-dm-enum--Action-status-disabled {
   --ibo-main-color: #{$ibo-dm-enum--Action-status-disabled--main-color};
-  --ibo-main-color--100: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-enum--Action-status-disabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
-  --ibo-main-color--900: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-enum--Action-status-disabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
+  --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-disabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
+  --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-disabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
   --ibo-complementary-color: #{$ibo-dm-enum--Action-status-disabled--complementary-color};
 }
 
@@ -78,8 +78,8 @@ $ibo-dm-enum--Action-status-test--complementary-color: $ibo-lifecycle-inactive-s
 
 .ibo-dm-enum--Action-status-test {
   --ibo-main-color: #{$ibo-dm-enum--Action-status-test--main-color};
-  --ibo-main-color--100: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-enum--Action-status-test--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
-  --ibo-main-color--900: #{common-adjust-alpha(common-adjust-lightness($ibo-dm-enum--Action-status-test--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
+  --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-test--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)};
+  --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-test--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)};
   --ibo-complementary-color: #{$ibo-dm-enum--Action-status-test--complementary-color};
 }