N° 5874 - Quick create: improvement for newcomer

Hide Popular section when empty

.doc/README.md

@@ -0,0 +1,101 @@
+# 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
+
+Note : PHP7 is required. Migrating to PHP8 requires some additional work which is questionable as an alternative way to generate a documentation is being considered.
+
+```
+cd .doc
+composer require phpdocumentor/phpdocumentor:~2 --dev
+```
+
+## 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

@@ -86,22 +86,13 @@ gitGraph
     commit id: "2024-01-17a" tag: "2.7.10"
     checkout support/3.0
     commit id: "2024-01-17b" tag: "3.0.4"
+    checkout support/2.7
+    commit id: "2024-09-28" tag: "2.7.11"
+    checkout support/3.1
+    commit id: "2024-09-27" tag: "3.1.2"
     checkout support/3.2
     commit id: "2024-06-25" tag: "3.2.0-beta1" type: REVERSE
     commit id: "2024-08-07" tag: "3.2.0"
-    commit id: "2024-09-13" tag: "3.2.0-2"
-    checkout support/3.1
-    commit id: "2024-09-27" tag: "3.1.2"
-    checkout support/2.7
-    commit id: "2024-09-28" tag: "2.7.11"
-    checkout support/2.7
-    commit id: "2025-02-25" tag: "2.7.12"
-    checkout support/3.1
-    commit id: "2025-02-25 " tag: "3.1.3"
-    checkout support/3.2
-    commit id: "2025-02-25  " tag: "3.2.1"
-    commit id: "2025-04-08" tag: "3.2.1-1"
-    commit id: "2025-08-19" tag: "3.2.2-1"
 ```
 
 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>

.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://combodo.com" 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>
+<p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
+    <img src="https://www.combodo.com/logos/logo-itop-baseline.svg" width=350>
 </a></p>
 
 
@@ -53,7 +49,7 @@ iTop also offers mass import tools to help you become even more efficient.
 [4]: https://www.itophub.io/wiki/page?id=latest:install:requirements
 [5]: https://www.itophub.io/wiki
 [6]: https://store.itophub.io/en_US/
-[7]: itop-version-history.md
+[7]: .doc/itop-version-history.md
 
 [10]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#configuration_management_cmdb
 [11]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#ticketing
@@ -80,9 +76,7 @@ We would like to give a special thank you 🤗 to the people from the community
 
 ### Names
 
-- Al Hallak, Amr (a.k.a [@v4yne1](https://github.com/v4yne1))
 - Alves, David
-- Audon, Florian
 - Beck, Pedro
 - Beer, Christian (a.k.a [@ChristianBeer](https://www.github.com/ChristianBeer))
 - Bilger, Jean-François
@@ -94,44 +88,34 @@ We would like to give a special thank you 🤗 to the people from the community
 - Colantoni, Maria Laura
 - Couronné, Guy
 - Dejin, Bie (a.k.a [@bdejin](https://github.com/bdejin))
-- Delicado, Elodie
 - Dvořák, Lukáš
 - Goethals, Stefan
 - Giuva, Vincenzo Katriel (a.k.a [@DarkNight97boss](https://github.com/DarkNight97boss))
 - Gumble, David
-- Heloir, Arthur 
-- Janssens, Jelle (a.k.a [@janssensjelle](https://github.com/janssensjelle))
 - Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
 - Kaltefleiter, Lars (a.k.a [@larhip](https://www.github.com/larhip))
 - Khamit, Shamil
 - Kincel, Martin
 - Konečný, Kamil
 - Kunin, Vladimir
-- Lassiter, Denis (a.k.a [@delassiter](https://github.com/delassiter))
+- Lassiter, Dennis
 - Lazcano, Federico
 - Lucas, Jonathan
 - Malik, Remie
-- Mantel, Ina 
-- Martin, Pierre (a.k.a [@Worty](https://github.com/worty-syn))
-- Melchiorre, Romain
 - Mindêllo de Andrade, Lucas (a.k.a [@rokam](https://www.github.com/rokam))
 - Mozart de Oliveira, Eduardo (a.k.a [@eduardomozart](https://github.com/eduardomozart))
 - Raenker, Martin
 - 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
 - Shilov, Vladimir
 - Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
-- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya-stukalov))
+- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
 - Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))
-- Toraya, Chairat (a.k.a [@Kyokito1412](https://github.com/Kyokito1412))
 - Tulio, Marco
 - Turrubiates, Miguel
-- Višnjić, Aldin (a.k.a[@viliald](https://github.com/viliald))
-- Vlk, Karel (a.k.a [@vlk-charles](https://www.github.com/vlk-charles))
 
 ### Aliases
 
@@ -152,6 +136,4 @@ We would like to give a special thank you 🤗 to the people from the community
 - [ITOMIG](https://www.itomig.de/)
 - [Pimkie](https://www.pimkie.com/)
 - [Super-Visions](https://www.super-visions.com/)
-- [Defence Tech Cyber Security - Malware Lab](https://github.com/DefenceTechSecurity)
-- Orange Cyberdefense
-- MipihSIB
+

addons/userrights/userrightsmatrix.class.inc.php

@@ -0,0 +1,362 @@
+<?php
+// Copyright (C) 2010-2024 Combodo SAS
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsMatrix (User management Module)
+ *
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserRightsMatrixClassGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclasses",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+class UserRightsMatrixClassStimulusGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclassesstimulus",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+class UserRightsMatrixAttributeGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixattributes",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+
+
+
+class UserRightsMatrix extends UserRightsAddOnAPI
+{
+	static public $m_aActionCodes = array(
+		UR_ACTION_READ => 'read',
+		UR_ACTION_MODIFY => 'modify',
+		UR_ACTION_DELETE => 'delete',
+		UR_ACTION_BULK_READ => 'bulk read',
+		UR_ACTION_BULK_MODIFY => 'bulk modify',
+		UR_ACTION_BULK_DELETE => 'bulk delete',
+	);
+
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		// Maybe we should check that no other user with userid == 0 exists
+		$oUser = new UserLocal();
+		$oUser->Set('login', $sAdminUser);
+		$oUser->Set('password', $sAdminPwd);
+		$oUser->Set('contactid', 1); // one is for root !
+		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+
+		// Now record the admin user object
+		$iUserId = $oUser->DBInsertNoReload();
+		$this->SetupUser($iUserId, true);
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	// Deprecated - create a new module !
+	public function Setup()
+	{
+		// Users must be added manually
+		// This procedure will then update the matrix when a new user is found or a new class/attribute appears
+		$oUserSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT User"));
+		while ($oUser = $oUserSet->Fetch())
+		{
+			$this->SetupUser($oUser->GetKey());
+		}
+		return true;
+	}
+
+	protected function SetupUser($iUserId, $bNewUser = false)
+	{
+		foreach(array('bizmodel', 'application', 'gui', 'core/cmdb') as $sCategory)
+		{
+			foreach (MetaModel::GetClasses($sCategory) as $sClass)
+			{
+				foreach (self::$m_aActionCodes as $iActionCode => $sAction)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("action", $sAction);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassStimulusGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("stimulus", $sStimulusCode);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::GetAttributesList($sClass) as $sAttCode)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						foreach (array('read', 'modify') as $sAction)
+						{
+							// Create a new entry
+							$oMyAttGrant = MetaModel::NewObject("UserRightsMatrixAttributeGrant");
+							$oMyAttGrant->Set("userid", $iUserId);
+							$oMyAttGrant->Set("class", $sClass);
+							$oMyAttGrant->Set("attcode", $sAttCode);
+							$oMyAttGrant->Set("action", $sAction);
+							$oMyAttGrant->Set("permission", "yes");
+							$iId = $oMyAttGrant->DBInsertNoReload();
+						}
+					}
+				}
+			}
+		}
+		/*
+		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
+		if ($bNewUser)
+		{
+			$bAddMenu = true;
+		}
+		else
+		{
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT menuNode WHERE type = 'user' AND parent_id = 0 AND user_id = $iUserId"));
+			$bAddMenu = ($oSet->Count() < 1);
+		}
+		if ($bAddMenu)
+		{
+			$oMenu = MetaModel::NewObject('menuNode');
+			$oMenu->Set('type', 'user');
+			$oMenu->Set('parent_id', 0);	// It's a toplevel entry
+			$oMenu->Set('rank', 6);			// Located just above the Admin Tools section (=7)
+			$oMenu->Set('name', 'My Bookmarks');
+			$oMenu->Set('label', 'My Favorite Items');
+			$oMenu->Set('hyperlink', 'UI.php');
+			$oMenu->Set('template', '<p></p><p></p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:32px;">My bookmarks</p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:14px;"><i>This section contains my most favorite search results</i></p>');
+			$oMenu->Set('user_id', $iUserId);
+			$oMenu->DBInsert();
+		}
+		*/
+	}
+
+
+	public function Init()
+	{
+		// Could be loaded in a shared memory (?)
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsMatrix');
+
+?>

addons/userrights/userrightsnull.class.inc.php

@@ -0,0 +1,78 @@
+<?php
+// Copyright (C) 2010-2024 Combodo SAS
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsNull
+ * User management Module - say Yeah! to everything
+ *
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class UserRightsNull extends UserRightsAddOnAPI
+{
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return true;
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return true;
+	}
+
+	public function Init()
+	{
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsNull');
+
+?>

addons/userrights/userrightsprofile.class.inc.php

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

@@ -0,0 +1,25 @@
+<?php
+/**
+ * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ */
+
+// cannot notify depreciation for now as this is still load in autoloader
+//DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader');
+use Combodo\iTop\Application\WebPage\AjaxPage;
+
+/**
+ * Class ajax_page
+ *
+ * @deprecated 3.0.0 will be removed in 3.1.0 - moved to AjaxPage
+ */
+class ajax_page extends AjaxPage
+{
+	function __construct($s_title)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('ajax_page is deprecated. Please use AjaxPage instead');
+		parent::__construct($s_title);
+	}
+}
+

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/backoffice/AbstractApplicationUIExtension.php

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

application/applicationextension/backoffice/AbstractPageUIBlockExtension.php

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

application/applicationextension/backoffice/AbstractPreferencesExtension.php

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

application/applicationextension/backoffice/AbstractWelcomePopupExtension.php

@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Inherit from this class to provide messages to be displayed in the "Welcome Popup"
- *
- * @api
- * @since 3.2.0
- */
-abstract class AbstractWelcomePopupExtension implements iWelcomePopupExtension
-{
-    /**
-     * @inheritDoc
-     */
-    public function GetIconRelPath(): string
-    {
-        return \Combodo\iTop\Application\Branding::$aLogoPaths[\Combodo\iTop\Application\Branding::ENUM_LOGO_TYPE_MAIN_LOGO_COMPACT]['default'];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function GetMessages(): array
-    {
-        return [];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function AcknowledgeMessage(string $sMessageId): void
-    {
-        // No need to process the acknowledgment notice by default
-        return;
-    }
-}

application/applicationextension/backoffice/ApplicationPopupMenuItem.php

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

application/applicationextension/backoffice/JSButtonItem.php

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

application/applicationextension/backoffice/JSPopupMenuItem.php

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

application/applicationextension/backoffice/SeparatorPopupMenuItem.php

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

application/applicationextension/backoffice/URLButtonItem.php

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

application/applicationextension/backoffice/URLPopupMenuItem.php

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

application/applicationextension/backoffice/iApplicationUIExtension.php

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

application/applicationextension/backoffice/iBackofficeDictEntriesExtension.php

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

application/applicationextension/backoffice/iBackofficeDictEntriesPrefixesExtension.php

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

application/applicationextension/backoffice/iBackofficeEarlyScriptExtension.php

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

application/applicationextension/backoffice/iBackofficeInitScriptExtension.php

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

application/applicationextension/backoffice/iBackofficeLinkedScriptsExtension.php

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

application/applicationextension/backoffice/iBackofficeLinkedStylesheetsExtension.php

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

application/applicationextension/backoffice/iBackofficeReadyScriptExtension.php

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

application/applicationextension/backoffice/iBackofficeSassExtension.php

@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add sass file (SCSS) to the backoffice pages.
- * example: return "css/setup.scss"
- *
- * @api
- * @package BackofficeUIExtensibilityAPI
- * @since 3.3.0
- */
-interface iBackofficeSassExtension
-{
-    /**
-     * @return string
-     * @see \iTopWebPage::$a_styles
-     * @api
-     */
-    public function GetSass(): string;
-}

application/applicationextension/backoffice/iBackofficeScriptExtension.php

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

application/applicationextension/backoffice/iBackofficeStyleExtension.php

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

application/applicationextension/backoffice/iFieldRendererMappingsExtension.php

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

application/applicationextension/backoffice/iPageUIBlockExtension.php

@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Implement this interface to add content to any iTopWebPage
- *
- * There are 3 places where content can be added:
- *
- * * The north pane: (normaly empty/hidden) at the top of the page, spanning the whole
- *   width of the page
- * * The south pane: (normaly empty/hidden) at the bottom of the page, spanning the whole
- *   width of the page
- * * The admin banner (two tones gray background) at the left of the global search.
- *   Limited space, use it for short messages
- *
- * Each of the methods of this interface is supposed to return the HTML to be inserted at
- * the specified place and can use the passed iTopWebPage object to add javascript or CSS definitions
- *
- * @api
- * @package     BackofficeUIExtensibilityAPI
- * @since 3.0.0
- */
-interface iPageUIBlockExtension
-{
-    /**
-     * Add content to the "admin banner"
-     *
-     * @api
-     * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null The Block to add into the page
-     */
-    public function GetBannerBlock();
-
-    /**
-     * Add content to the header of the page
-     *
-     * @api
-     * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null The Block to add into the page
-     */
-    public function GetHeaderBlock();
-
-    /**
-     * Add content to the footer of the page
-     *
-     * @api
-     * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null The Block to add into the page
-     */
-    public function GetFooterBlock();
-}

application/applicationextension/backoffice/iPopupMenuExtension.php

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

application/applicationextension/backoffice/iPreferencesExtension.php

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

application/applicationextension/backoffice/iWelcomePopupExtension.php

@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Interface to provide messages to be displayed in the "Welcome Popup"
- *
- * @api
- * @since 3.2.0
- */
-interface iWelcomePopupExtension
-{
-    // Importance for ordering messages
-    // Just two levels since less important messages have nothing to do in the welcome popup
-    public const ENUM_IMPORTANCE_CRITICAL = 0;
-    public const ENUM_IMPORTANCE_HIGH = 1;
-    public const DEFAULT_IMPORTANCE = self::ENUM_IMPORTANCE_HIGH;
-
-    /**
-     * Overload this method if you need to display an icon representing the provider (eg. your own company logo, module icon, ...)
-     *
-     * @return string Relative path (from app. root) of the icon representing the provider
-     * @api
-     */
-    public function GetIconRelPath(): string;
-
-    /**
-     * @return \Combodo\iTop\Application\WelcomePopup\Message[]
-     * @api
-     */
-    public function GetMessages(): array;
-
-    /**
-     * Overload this method if the provider needs to do some additional processing after the message ($sMessageId) has been acknowledged by the current user
-     *
-     * @param string $sMessageId
-     * @api
-     */
-    public function AcknowledgeMessage(string $sMessageId): void;
-}

application/applicationextension/iBackupExtraFilesExtension.php

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

application/applicationextension/iKPILoggerExtension.php

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

application/applicationextension/iModuleExtension.php

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

application/applicationextension/login/AbstractLoginFSMExtension.php

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

application/applicationextension/login/iLoginExtension.php

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

application/applicationextension/login/iLoginFSMExtension.php

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @api
- * @package     LoginExtensibilityAPI
- * @since 2.7.0
- */
-interface iLoginFSMExtension extends iLoginExtension
-{
-    /**
-     * Execute action for this login state
-     * If a page is displayed, the action must exit at this point
-     * if LoginWebPage::LOGIN_FSM_RETURN_ERROR is returned $iErrorCode must be set
-     * if LoginWebPage::LOGIN_FSM_RETURN_OK is returned then the login is OK and terminated
-     * if LoginWebPage::LOGIN_FSM_CONTINUE is returned then the FSM will proceed to next plugin or state
-     *
-     * @param string $sLoginState (see LoginWebPage::LOGIN_STATE_...)
-     * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
-     *
-     * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_CONTINUE
-     * @api
-     */
-    public function LoginAction($sLoginState, &$iErrorCode);
-}

application/applicationextension/login/iLoginUIExtension.php

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

application/applicationextension/login/iLogoutExtension.php

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

application/applicationextension/portal/AbstractPortalUIExtension.php

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

application/applicationextension/portal/iPortalUIExtension.php

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

application/applicationextension/rest/RestResult.php

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

application/applicationextension/rest/RestUtils.php

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

application/applicationextension/rest/iRestInputSanitizer.php

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

application/applicationextension/rest/iRestServiceProvider.php

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

application/capturewebpage.class.inc.php

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

application/clipage.class.inc.php

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

application/cmdbabstract.class.inc.php

@@ -214,15 +214,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	 */
 	protected static bool $bBlockEventDBLinksChanged = false;
 
-	/**
-	 * If set to true, the object is considered as modified, whatever the actual state is.
-	 * This is used when an object is modified indirectly (eg. through a linked set)
-	 *
-	 * @var bool
-	 *
-	 * @since 3.3.0 N°8210 - Remove iApplicationObjectExtension
-	 */
-	private bool $bIsMarkedAsModified = false;
 
 	/**
 	 * Constructor from a row of data (as a hash 'attcode' => value)
@@ -320,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'))
 	{
@@ -707,10 +698,10 @@ HTML
 			$sLinkedClass = $oAttDef->GetLinkedClass();
 
 			// Filter out links pointing to obsolete objects (if relevant)
-            $oOrmLinkSet = $this->Get($sAttCode);
-            $oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
-            $iCount = $oLinkSet->Count();
+			$oOrmLinkSet = $this->Get($sAttCode);
+			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
 
+			$iCount = $oLinkSet->Count();
 			if ($this->IsNew()) {
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
 			} else {
@@ -759,10 +750,10 @@ HTML
 			$oPage->SetCurrentTab($sTabCode, $oAttDef->GetLabel().$sCount, $sTabDescription);
 
 			$aArgs = array('this' => $this);
-
+			
 			$sEditWhen = $oAttDef->GetEditWhen();
 			// Calculate if edit_when allows to edit based on current $bEditMode
-			$bIsEditableBasedOnEditWhen =  ($sEditWhen === LINKSET_EDITWHEN_ALWAYS) ||
+			$bIsEditableBasedOnEditWhen =  ($sEditWhen === LINKSET_EDITWHEN_ALWAYS) || 
 				($bEditMode ? $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION : $sEditWhen === LINKSET_EDITWHEN_ON_HOST_DISPLAY);
 
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)) || !$bIsEditableBasedOnEditWhen;
@@ -775,9 +766,9 @@ HTML
 				$oPage->add($sHTMLValue);
 			} else {
 				if ($oAttDef->IsIndirect()) {
-					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly, $iCount);
+					$oBlockLinkSetViewTable = new BlockIndirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				} else {
-					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly, $iCount);
+					$oBlockLinkSetViewTable = new BlockDirectLinkSetViewTable($oPage, $this, $sClass, $sAttCode, $oAttDef, $bReadOnly);
 				}
 				$oPage->AddUiBlock($oBlockLinkSetViewTable);
 			}
@@ -1122,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']);
 		}
@@ -1138,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
@@ -1218,6 +1203,35 @@ HTML
 		return DataTableUIBlockFactory::MakeForObject($oPage, $sTableId, $oSet, $aExtraParams);
 	}
 
+	/**
+	 * Get the HTML fragment corresponding to the display of a table representing a set of objects
+	 *
+	 * @param WebPage $oPage The page object is used for out-of-band information (mostly scripts) output
+	 * @param \DBObjectSet $oSet The set of objects to display
+	 * @param array $aExtraParams key used :
+	 *      <ul>
+	 *          <li>view_link : if true then for extkey will display links with friendly name and make column sortable, default true
+	 *          <li>menu : if true prints DisplayBlock menu, default true
+	 *          <li>display_aliases : list of query aliases that will be printed, defaults to [] (displays all)
+	 *          <li>zlist : name of the zlist to use, false to disable zlist lookup, default to 'list'
+	 *          <li>extra_fields : list of <alias>.<attcode> to add to the result, separator ',', defaults to empty string
+	 *      </ul>
+	 *
+	 * @return String The HTML fragment representing the table of objects. <b>Warning</b> : no JS added to handled
+	 *     pagination or table sorting !
+	 *
+	 * @see DisplayBlock to get a similar table but with the JS for pagination & sorting
+	 *
+	 * @deprecated 3.0.0 use GetDisplaySetBlock
+	 */
+	public static function GetDisplaySet(WebPage $oPage, DBObjectSet $oSet, $aExtraParams = array())
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetDisplaySetBlock');
+		$oPage->AddUiBlock(static::GetDisplaySetBlock($oPage, $oSet, $aExtraParams));
+
+		return "";
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param \DBObjectSet $oSet
@@ -1317,7 +1331,7 @@ HTML
 					}
 				}
 			}
-            $aHeader['friendlyname'] = ['label' => MetaModel::GetName($sClassName)];
+
 			foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
 				$sColLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx) : $sAttCodeEx;
 
@@ -1338,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()] = '';
@@ -1391,6 +1404,129 @@ HTML
 		//DataTableUIBlockFactory::MakeForStaticData('', $aHeader, $aRows);
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aExtraParams key used :
+	 *      <ul>
+	 *          <li>view_link : if true then for extkey will display links with friendly name and make column sortable, default true
+	 *          <li>menu : if true prints DisplayBlock menu, default true
+	 *          <li>display_aliases : list of query aliases that will be printed, defaults to [] (displays all)
+	 *          <li>zlist : name of the zlist to use, false to disable zlist lookup, default to 'list'
+	 *          <li>extra_fields : list of <alias>.<attcode> to add to the result, separator ',', defaults to empty string
+	 *      </ul>
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @deprecated 3.0.0
+	 */
+	public static function GetDisplayExtendedSet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		if (empty($aExtraParams['currentId'])) {
+			$iListId = utils::GetUniqueId(); // Works only if not in an Ajax page !!
+		} else {
+			$iListId = $aExtraParams['currentId'];
+		}
+		$aList = array();
+
+		// Initialize and check the parameters
+		$bViewLink = isset($aExtraParams['view_link']) ? $aExtraParams['view_link'] : true;
+		$bDisplayMenu = isset($aExtraParams['menu']) ? $aExtraParams['menu'] == true : true;
+		// Check if there is a list of aliases to limit the display to...
+		$aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',',
+			$aExtraParams['display_aliases']) : array();
+		$sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
+
+		$aExtraFieldsRaw = isset($aExtraParams['extra_fields']) ? explode(',',
+			trim($aExtraParams['extra_fields'])) : array();
+		$aExtraFields = array();
+		$sAttCode = '';
+		foreach($aExtraFieldsRaw as $sFieldName)
+		{
+			// Ignore attributes not of the main queried class
+			if (preg_match('/^(.*)\.(.*)$/', $sFieldName, $aMatches))
+			{
+				$sClassAlias = $aMatches[1];
+				$sAttCode = $aMatches[2];
+				if (array_key_exists($sClassAlias, $oSet->GetSelectedClasses()))
+				{
+					$aExtraFields[$sClassAlias][] = $sAttCode;
+				}
+			}
+			else
+			{
+				$aExtraFields['*'] = $sAttCode;
+			}
+		}
+
+		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
+		$aAuthorizedClasses = array();
+		foreach($aClasses as $sAlias => $sClassName)
+		{
+			if ((UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) &&
+				((count($aDisplayAliases) == 0) || (in_array($sAlias, $aDisplayAliases))))
+			{
+				$aAuthorizedClasses[$sAlias] = $sClassName;
+			}
+		}
+		foreach($aAuthorizedClasses as $sAlias => $sClassName)
+		{
+			if (array_key_exists($sAlias, $aExtraFields))
+			{
+				$aList[$sAlias] = $aExtraFields[$sAlias];
+			}
+			else
+			{
+				$aList[$sAlias] = array();
+			}
+			if ($sZListName !== false)
+			{
+				$aDefaultList = self::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
+
+				$aList[$sAlias] = array_merge($aDefaultList, $aList[$sAlias]);
+			}
+
+			// Filter the list to removed linked set since we are not able to display them here
+			foreach ($aList[$sAlias] as $index => $sAttCode)
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
+				if ($oAttDef instanceof AttributeLinkedSet)
+				{
+					// Removed from the display list
+					unset($aList[$sAlias][$index]);
+				}
+			}
+
+			if (empty($aList[$sAlias]))
+			{
+				unset($aList[$sAlias], $aAuthorizedClasses[$sAlias]);
+			}
+		}
+
+		$sSelectMode = 'none';
+
+		$oDataTable = new DataTable($iListId, $oSet, $aAuthorizedClasses);
+
+		$oSettings = DataTableSettings::GetDataModelSettings($aAuthorizedClasses, $bViewLink, $aList);
+
+		$bDisplayLimit = isset($aExtraParams['display_limit']) ? $aExtraParams['display_limit'] : true;
+		if ($bDisplayLimit)
+		{
+			$iDefaultPageSize = appUserPreferences::GetPref('default_page_size',
+				MetaModel::GetConfig()->GetMinDisplayLimit());
+			$oSettings->iDefaultPageSize = $iDefaultPageSize;
+		}
+
+		$oSettings->aSortOrder = MetaModel::GetOrderByDefault($sClassName);
+
+		return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams);
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
@@ -1579,7 +1715,7 @@ HTML
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
 	 * @throws \Exception
-	 *
+	 * 
 	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
 	 */
 	public static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = array())
@@ -2080,7 +2216,7 @@ JS
 						);
 
 						// test query link
-						$sTestResId = 'query_res_'.$sFieldPrefix.$sAttCode.$sNameSuffix;
+						$sTestResId = 'query_res_'.$sFieldPrefix.$sAttCode.$sNameSuffix; //$oPage->GetUniqueId();
 						$sBaseUrl = utils::GetAbsoluteUrlAppRoot().'pages/run_query.php?expression=';
 						$sTestQueryLbl = Dict::S('UI:Edit:TestQuery');
 						$oTestQueryButton = ButtonUIBlockFactory::MakeIconAction(
@@ -2530,7 +2666,7 @@ HTML;
 					}
 					break;
 			}
-			$sPattern = addslashes($oAttDef->GetValidationPattern()); //'^([0-9]+)$';
+			$sPattern = addslashes($oAttDef->GetValidationPattern()); //'^([0-9]+)$';			
 			if (!empty($aEventsList))
 			{
 				if (!is_numeric($sNullValue))
@@ -2788,11 +2924,11 @@ JS
 				$sStatesSelection .= '</select>';
 				$sStatesSelection .= '<input type="hidden" id="obj_state_orig" name="obj_state_orig" value="'.$this->GetState().'"/>';
 				$oPage->add_ready_script(<<<JS
-$('.state_select_{$this->m_iFormId}').on('change', function() {
+$('.state_select_{$this->m_iFormId}').change( function() {
 	if ($('#obj_state_orig').val() != $(this).val()) {
 		$('.state_select_{$this->m_iFormId}').val($(this).val());
 		$('#form_{$this->m_iFormId}').data('force_submit', true);
-		$('#form_{$this->m_iFormId}').trigger('submit');
+		$('#form_{$this->m_iFormId}').submit();
 	}
 });
 JS
@@ -2929,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'])){
@@ -2937,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);
@@ -3303,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>',
@@ -3441,13 +3567,15 @@ EOF
 		} else {
 			//we can directly apply the stimuli
 			$sExceptionMessage = null;
-			$bApplyStimulus = false;
 			try {
-				$bApplyStimulus = $this->ApplyStimulus($sStimulus); // will write the object in the DB
-			} catch (Exception $oException) {
+			$bApplyStimulus = $this->ApplyStimulus($sStimulus); // will write the object in the DB
+			}
+			catch (Exception $oException) {
 				// Catch any exception happening during the stimulus
+				$bApplyStimulus = false;
 				$sExceptionMessage =   ($oException instanceof CoreCannotSaveObjectException) ? $oException->getHtmlMessage() : $oException->getMessage();
-			} finally {
+			}
+			finally {
 				if ($sOwnershipToken !== null) {
 					// Release the concurrent lock, if any
 					iTopOwnershipLock::ReleaseLock($sClass, $iKey, $sOwnershipToken);
@@ -3455,8 +3583,9 @@ EOF
 				if (!$bApplyStimulus) {
 					// Throw an application oriented exception if necessary
 					throw new ApplicationException($sExceptionMessage ?? Dict::S('UI:FailedToApplyStimuli'));
+				} else {
+					return true;
 				}
-				return true;
 			}
 		}
 
@@ -3696,7 +3825,7 @@ HTML;
 	public function GetHilightClass()
 	{
 		// Possible return values are:
-		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
 		$current = parent::GetHilightClass(); // Default computation
 
 		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
@@ -3779,7 +3908,7 @@ HTML;
 	public static function GetShortcutActions($sFinalClass)
 	{
 		$sShortcutActions = MetaModel::GetConfig()->Get('shortcut_actions');
-		$aShortcutActions = array_map('trim', explode(',', $sShortcutActions));
+		$aShortcutActions = explode(',', $sShortcutActions);
 
 		return $aShortcutActions;
 	}
@@ -4167,15 +4296,24 @@ HTML;
 
 			case 'Image':
 				$value = null;
-				$aDimensions = null;
 				$oImage = utils::ReadPostedDocument("attr_{$sFormPrefix}{$sAttCode}", 'fcontents');
-				$oImage = $oImage->ResizeImageToFit(
-					$oAttDef->Get('storage_max_width'),
-					$oAttDef->Get('storage_max_height'),
-					$aDimensions
-				);
-				if (is_null($aDimensions)) {
-					IssueLog::Warning($sClass . ':' . $this->GetKey() . '/' . $sAttCode . ': Image could not be resized. Mimetype: ' . $oImage->GetMimeType() . ', filename: ' . $oImage->GetFileName());
+				if (!is_null($oImage->GetData()))
+				{
+					$aSize = utils::GetImageSize($oImage->GetData());
+					if (is_array($aSize) && $aSize[0] > 0 && $aSize[1] > 0)
+					{
+						$oImage = utils::ResizeImageToFit(
+							$oImage,
+							$aSize[0],
+							$aSize[1],
+							$oAttDef->Get('storage_max_width'),
+							$oAttDef->Get('storage_max_height')
+						);
+					}
+					else
+					{
+						IssueLog::Warning($sClass . ':' . $this->GetKey() . '/' . $sAttCode . ': Image could not be resized. Mimetype: ' . $oImage->GetMimeType() . ', filename: ' . $oImage->GetFileName());
+					}
 				}
 				$aOtherData = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null, 'raw_data');
 				if (is_array($aOtherData))
@@ -4396,6 +4534,21 @@ HTML;
 		return $res;
 	}
 
+	protected function PostInsertActions(): void
+	{
+		parent::PostInsertActions();
+
+		// Invoke extensions after insertion (the object must exist, have an id, etc.)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBInsert()");
+			$oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBInsert($this, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
+		}
+	}
+
 	/**
 	 * @inheritdoc
 	 * Attaches InlineImages to the current object
@@ -4405,6 +4558,28 @@ HTML;
 		InlineImage::FinalizeInlineImages($this);
 	}
 
+	/**
+	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
+	 */
+	protected function DBCloneTracked_Internal($newKey = null)
+	{
+        /** @var cmdbAbstractObject $oNewObj */
+        $oNewObj = MetaModel::GetObject(get_class($this), parent::DBCloneTracked_Internal($newKey));
+
+		// Invoke extensions after insertion (the object must exist, have an id, etc.)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
+		{
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBInsert()");
+            $oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBInsert($oNewObj, self::GetCurrentChange());
+            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBInsert');
+		}
+
+		return $oNewObj;
+	}
+
 	public function DBUpdate()
 	{
 		$this->LogCRUDEnter(__METHOD__);
@@ -4428,6 +4603,21 @@ HTML;
 		return $res;
 	}
 
+	protected function PostUpdateActions(array $aChanges): void
+	{
+		parent::PostUpdateActions($aChanges);
+
+		// Invoke extensions after the update (could be before)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBUpdate()");
+			$oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBUpdate($this, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBUpdate');
+		}
+	}
+
 	/**
 	 * @param string $sMessageIdPrefix
 	 *
@@ -4463,11 +4653,45 @@ HTML;
 		return $oDeletionPlan;
 	}
 
+	final protected function PreDeleteActions(): void
+	{
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
+		{
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBDelete()");
+			$oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
+		}
+
+		parent::PreDeleteActions();
+	}
+
 	final protected function PostDeleteActions(): void
 	{
 		parent::PostDeleteActions();
 	}
 
+	/**
+	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
+	 */
+	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
+	{
+		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
+		{
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBDelete()");
+            $oKPI = new ExecutionKPI();
+			$oExtensionInstance->OnDBDelete($this, self::GetCurrentChange());
+            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnDBDelete');
+		}
+
+		return parent::DBDeleteTracked_Internal($oDeletionPlan);
+	}
+
 	public function IsModified()
 	{
 		if (parent::IsModified())
@@ -4475,20 +4699,25 @@ HTML;
 			return true;
 		}
 
-		return $this->bIsMarkedAsModified;
-	}
+		// Plugins
+		//
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
+		{
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified()");
+			$oKPI = new ExecutionKPI();
+			$bIsModified = $oExtensionInstance->OnIsModified($this);
+			$oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnIsModified');
+			if ($bIsModified) {
+				$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified() -> true");
+				return true;
+			} else {
+				$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified() -> false");
+			}
+		}
 
-	/**
-	 * Override the default modification state of the object.
-	 *
-	 * The object is considered as modified, whatever the actual state is.
-	 * This is used when an object is modified indirectly (eg. through a linked set)
-	 *
-	 * @return void
-	 */
-	public function MarkObjectAsModified(): void
-	{
-		$this->bIsMarkedAsModified = true;
+		return false;
 	}
 
 	/**
@@ -4502,7 +4731,7 @@ HTML;
 	}
 
 	/**
-	 * Whether to bypass the checks of user rights when writing this object
+	 * Whether to bypass the checks of user rights when writing this object, could be used in {@link \iApplicationObjectExtension::OnCheckToWrite()}
 	 *
 	 * @return bool
 	 */
@@ -4531,6 +4760,22 @@ HTML;
 	{
 		parent::DoCheckToWrite();
 
+		// Plugins
+		//
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
+		{
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnCheckToWrite()");
+            $oKPI = new ExecutionKPI();
+			$aNewIssues = $oExtensionInstance->OnCheckToWrite($this);
+            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToWrite');
+			if (is_array($aNewIssues) && (count($aNewIssues) > 0)) // Some extensions return null instead of an empty array
+			{
+				$this->m_aCheckIssues = array_merge($this->m_aCheckIssues, $aNewIssues);
+			}
+		}
+
 		// User rights
 		//
 		if (!$this->bAllowWrite)
@@ -4567,6 +4812,22 @@ HTML;
 	{
 		parent::DoCheckToDelete($oDeletionPlan);
 
+		// Plugins
+		//
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
+		{
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnCheckToDelete()");
+            $oKPI = new ExecutionKPI();
+			$aNewIssues = $oExtensionInstance->OnCheckToDelete($this);
+            $oKPI->ComputeStatsForExtension($oExtensionInstance, 'OnCheckToDelete');
+			if (is_array($aNewIssues) && count($aNewIssues) > 0)
+			{
+				$this->m_aDeleteIssues = array_merge($this->m_aDeleteIssues, $aNewIssues);
+			}
+		}
+
 		// User rights
 		//
 		if (! $this->bAllowDelete)
@@ -4582,6 +4843,110 @@ HTML;
 		}
 	}
 
+	/**
+	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
+	 *
+	 * @param WebPage $oPage
+	 * @param string $sAttCode
+	 * @param string $sComment
+	 * @param string $sPrefix
+	 * @param bool $bEditMode
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 * @throws \Exception
+	 * @deprecated 3.0.0, will be removed in 3.1.0
+	 */
+	public function DisplayCaseLog(WebPage $oPage, $sAttCode, $sComment = '', $sPrefix = '', $bEditMode = false)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		$oPage->SetCurrentTab('UI:PropertiesTab');
+		$sClass = get_class($this);
+
+		if ($this->IsNew()) {
+			$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
+		} else {
+			$iFlags = $this->GetAttributeFlags($sAttCode);
+		}
+
+		if ($iFlags & OPT_ATT_HIDDEN) {
+			// The case log is hidden do nothing
+		} else
+		{
+			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+			$sAttDefClass = get_class($oAttDef);
+			$sAttLabel = $oAttDef->GetLabel();
+			$sAttMetaDataLabel = utils::HtmlEntities($sAttLabel);
+			$sAttMetaDataFlagHidden = (($iFlags & OPT_ATT_HIDDEN) === OPT_ATT_HIDDEN) ? 'true' : 'false';
+			$sAttMetaDataFlagReadOnly = (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY) ? 'true' : 'false';
+			$sAttMetaDataFlagMandatory = (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY) ? 'true' : 'false';
+			$sAttMetaDataFlagMustChange = (($iFlags & OPT_ATT_MUSTCHANGE) === OPT_ATT_MUSTCHANGE) ? 'true' : 'false';
+			$sAttMetaDataFlagMustPrompt = (($iFlags & OPT_ATT_MUSTPROMPT) === OPT_ATT_MUSTPROMPT) ? 'true' : 'false';
+			$sAttMetaDataFlagSlave = (($iFlags & OPT_ATT_SLAVE) === OPT_ATT_SLAVE) ? 'true' : 'false';
+
+			$sInputId = $this->m_iFormId.'_'.$sAttCode;
+
+			if ((!$bEditMode) || ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)))
+			{
+				// Check if the attribute is not read-only because of a synchro...
+				if ($iFlags & OPT_ATT_SLAVE)
+				{
+					$aReasons = array();
+					$sTip = '';
+					foreach($aReasons as $aRow) {
+						$sDescription = utils::EscapeHtml($aRow['description']);
+						$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
+						$sTip .= "<div class=\"synchro-source\">";
+						$sTip .= "<div class=\"synchro-source-title\">Synchronized with {$aRow['name']}</div>";
+						$sTip .= "<div class=\"synchro-source-description\">$sDescription</div>";
+					}
+					$sTip = addslashes($sTip);
+					$oPage->add_ready_script("$('#synchro_$sInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+				}
+
+				// Attribute is read-only
+				$sHTMLValue = $this->GetAsHTML($sAttCode);
+				$sHTMLValue .= '<input type="hidden" id="'.$sInputId.'" name="attr_'.$sPrefix.$sAttCode.'" value="'.utils::EscapeHtml($this->GetEditValue($sAttCode)).'"/>';
+				$aFieldsMap[$sAttCode] = $sInputId;
+			}
+			else
+			{
+				$sValue = $this->Get($sAttCode);
+				$sDisplayValue = $this->GetEditValue($sAttCode);
+				$aArgs = array('this' => $this, 'formPrefix' => $sPrefix);
+
+				$sCommentAsHtml = ($sComment != '') ? '<span>'.$sComment.'</span><br/>' : '';
+				$sFieldAsHtml = self::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', $iFlags, $aArgs);
+				$sHTMLValue = <<<HTML
+<div class="field_data">
+	<div class="field_value">
+		$sCommentAsHtml
+		$sFieldAsHtml
+	</div>
+</div>
+HTML;
+
+				$aFieldsMap[$sAttCode] = $sInputId;
+			}
+
+			$oPage->add(<<<HTML
+<fieldset>
+	<legend>{$sAttLabel}</legend>
+	<div class="field_container field_large" data-attribute-code="{$sAttCode}" data-attribute-type="{$sAttDefClass}" data-attribute-label="{$sAttMetaDataLabel}"
+		data-attribute-flag-hidden="{$sAttMetaDataFlagHidden}" data-attribute-flag-read-only="{$sAttMetaDataFlagReadOnly}" data-attribute-flag-mandatory="{$sAttMetaDataFlagMandatory}"
+		data-attribute-flag-must-change="{$sAttMetaDataFlagMustChange}" data-attribute-flag-must-prompt="{$sAttMetaDataFlagMustPrompt}" data-attribute-flag-slave="{$sAttMetaDataFlagSlave}">
+		{$sHTMLValue}
+	</div>
+</fieldset>
+HTML
+			);
+		}
+	}
+
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
@@ -4646,6 +5011,66 @@ HTML;
 		}
 	}
 
+	/**
+	 * @param $sCurrentState
+	 * @param $sStimulus
+	 * @param $bOnlyNewOnes
+	 *
+	 * @return array
+	 * @throws \ApplicationException
+	 * @throws \CoreException
+	 * @deprecated Since iTop 2.4, use DBObject::GetTransitionAttributes() instead.
+	 */
+	public function GetExpectedAttributes($sCurrentState, $sStimulus, $bOnlyNewOnes)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('Since iTop 2.4, use DBObject::GetTransitionAttributes() instead');
+		$aTransitions = $this->EnumTransitions();
+		if (!isset($aTransitions[$sStimulus])) {
+			// Invalid stimulus
+			throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus,
+				$this->GetName(), $this->GetStateLabel()));
+		}
+		$aTransition = $aTransitions[$sStimulus];
+		$sTargetState = $aTransition['target_state'];
+		$aTargetStates = MetaModel::EnumStates(get_class($this));
+		$aTargetState = $aTargetStates[$sTargetState];
+		$aCurrentState = $aTargetStates[$this->GetState()];
+		$aExpectedAttributes = $aTargetState['attribute_list'];
+		$aCurrentAttributes = $aCurrentState['attribute_list'];
+
+		$aComputedAttributes = array();
+		foreach($aExpectedAttributes as $sAttCode => $iExpectCode)
+		{
+			if (!array_key_exists($sAttCode, $aCurrentAttributes))
+			{
+				$aComputedAttributes[$sAttCode] = $iExpectCode;
+			}
+			else
+			{
+				if (!($aCurrentAttributes[$sAttCode] & (OPT_ATT_HIDDEN | OPT_ATT_READONLY)))
+				{
+					$iExpectCode = $iExpectCode & ~(OPT_ATT_MUSTPROMPT | OPT_ATT_MUSTCHANGE); // Already prompted/changed, reset the flags
+				}
+				// Later: better check if the attribute is not *null*
+				if (($iExpectCode & OPT_ATT_MANDATORY) && ($this->Get($sAttCode) != ''))
+				{
+					$iExpectCode = $iExpectCode & ~(OPT_ATT_MANDATORY); // If the attribute is present, then no need to request its presence
+				}
+
+				$aComputedAttributes[$sAttCode] = $iExpectCode;
+			}
+
+			$aComputedAttributes[$sAttCode] = $aComputedAttributes[$sAttCode] & ~(OPT_ATT_READONLY | OPT_ATT_HIDDEN); // Don't care about this form now
+
+			if ($aComputedAttributes[$sAttCode] == 0)
+			{
+				unset($aComputedAttributes[$sAttCode]);
+			}
+		}
+
+		return $aComputedAttributes;
+	}
+
 	/**
 	 * Display a form for modifying several objects at once
 	 * The form will be submitted to the current page, with the specified additional values
@@ -4765,7 +5190,7 @@ HTML;
 							$aKeys = array_keys($aValues[$sAttCode]);
 							$currValue = $aKeys[0]; // The only value is the first key
 							if ($oAttDef->GetEditClass() == 'LinkedSet') {
-                                $oOrmLinkSet = $oDummyObj->Get($sAttCode);
+								$oOrmLinkSet = $oDummyObj->Get($sAttCode);
 								LinkSetDataTransformer::StringToOrmLinkSet($aValues[$sAttCode][$currValue]['edit_value'], $oOrmLinkSet);
 
 							} else {
@@ -4819,7 +5244,7 @@ HTML;
 								}
 								$oDummyObj->Set($sAttCode, $oTagSet);
 							} else if ($oAttDef->GetEditClass() == 'LinkedSet') {
-                                $oOrmLinkSet = $oDummyObj->Get($sAttCode);
+								$oOrmLinkSet = $oDummyObj->Get($sAttCode);
 								foreach ($aMultiValues as $key => $sValue) {
 									LinkSetDataTransformer::StringToOrmLinkSet($sValue['edit_value'], $oOrmLinkSet);
 								}
@@ -5498,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()]);
 	}
 
 	/**
@@ -5517,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, 'cmdb_change' => self::GetCurrentChange()]);
+		$this->FireEvent(EVENT_DB_AFTER_WRITE, ['is_new' => $bIsNew, 'changes' => $aChanges]);
 	}
 
 	//////////////
@@ -5559,7 +5984,7 @@ JS
 	final protected function FireEventAfterDelete(): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
-		$this->FireEvent(EVENT_DB_AFTER_DELETE, ['cmdb_change' => self::GetCurrentChange()]);
+		$this->FireEvent(EVENT_DB_AFTER_DELETE);
 	}
 
 	/**
@@ -5662,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);
 	}
 
@@ -5672,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);
 	}
@@ -5754,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/csvpage.class.inc.php

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

application/dashboard.class.inc.php

@@ -296,21 +296,21 @@ abstract class Dashboard
 	public function FromParams($aParams)
 	{
 		$this->sLayoutClass = $aParams['layout_class'];
-		if (!is_subclass_of($this->sLayoutClass,DashboardLayout::class)) {
-			throw new InvalidParameterException('Invalid parameter layout_class "'.$aParams['layout_class'].'"');
-		}
 		$this->sTitle = $aParams['title'];
 		$this->bAutoReload = $aParams['auto_reload'] == 'true';
 		$this->iAutoReloadSec = max(MetaModel::GetConfig()->Get('min_reload_interval'), (int) $aParams['auto_reload_sec']);
 		
-		foreach($aParams['cells'] as $aCell) {
+		foreach($aParams['cells'] as $aCell)
+		{
 			$aCellDashlets = array();
-			foreach($aCell as $aDashletParams) {
+			foreach($aCell as $aDashletParams)
+			{
 				$sDashletClass = $aDashletParams['dashlet_class'];
 				$sId = $aDashletParams['dashlet_id'];
 				/** @var \Dashlet $oNewDashlet */
 				$oNewDashlet = new $sDashletClass($this->oMetaModel, $sId);
-				if (isset($aDashletParams['dashlet_type'])) {
+				if (isset($aDashletParams['dashlet_type']))
+				{
 					$oNewDashlet->SetDashletType($aDashletParams['dashlet_type']);
 				}
 				$oForm = $oNewDashlet->GetForm();
@@ -524,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

@@ -1967,10 +1967,7 @@ class DashletHeaderStatic extends Dashlet
 		$sIcon = $this->aProperties['icon'];
 
 		$oIconSelect = $this->oModelReflection->GetIconSelectionField('icon');
-		$sIconPath = '';
-		if (Utils::IsNotNullOrEmptyString($sIcon)) {
-			$sIconPath = utils::HtmlEntities($oIconSelect->MakeFileUrl($sIcon));
-		}
+		$sIconPath = utils::HtmlEntities($oIconSelect->MakeFileUrl($sIcon));
 
 		return DashletFactory::MakeForDashletHeaderStatic($this->oModelReflection->DictString($sTitle), $sIconPath);
 	}
@@ -1984,7 +1981,6 @@ class DashletHeaderStatic extends Dashlet
 		$oForm->AddField($oField);
 
 		$oField = $this->oModelReflection->GetIconSelectionField('icon', Dict::S('UI:DashletHeaderStatic:Prop-Icon'), $this->aProperties['icon']);
-		$oField->AddAllowedValue(['value' => '', 'label' => Dict::S('UI:DashletIcon:None'), 'icon' => '']);
 		$oForm->AddField($oField);
 	}
 
@@ -2097,10 +2093,7 @@ class DashletHeaderDynamic extends Dashlet
 		$sGroupBy = $this->aProperties['group_by'];
 
 		$oIconSelect = $this->oModelReflection->GetIconSelectionField('icon');
-		$sIconPath = '';
-		if (Utils::IsNotNullOrEmptyString($sIcon)) {
-			$sIconPath = $oIconSelect->MakeFileUrl($sIcon);
-		}
+		$sIconPath = $oIconSelect->MakeFileUrl($sIcon);
 
 		$aValues = $this->GetValues();
 		if (count($aValues) > 0) {
@@ -2145,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;
@@ -2230,7 +2223,6 @@ class DashletHeaderDynamic extends Dashlet
 		$oForm->AddField($oField);
 
 		$oField = $this->oModelReflection->GetIconSelectionField('icon', Dict::S('UI:DashletHeaderDynamic:Prop-Icon'), $this->aProperties['icon']);
-		$oField->AddAllowedValue(['value' => '', 'label' => Dict::S('UI:DashletIcon:None'), 'icon' => '']);
 		$oForm->AddField($oField);
 
 		$oField = new DesignerTextField('subtitle', Dict::S('UI:DashletHeaderDynamic:Prop-Subtitle'), $this->aProperties['subtitle']);

application/datamodel.application.xml

@@ -111,6 +111,7 @@
     <menu id="UserManagement" xsi:type="TemplateMenuNode" _delta="define">
       <rank>10</rank>
       <parent>AdminTools</parent>
+      <template_file/>
     </menu>
     <menu id="UserAccountsMenu" xsi:type="OQLMenuNode" _delta="define">
       <rank>11</rank>
@@ -140,6 +141,7 @@
     <menu id="Queries" xsi:type="TemplateMenuNode" _delta="define">
       <rank>30</rank>
       <parent>AdminTools</parent>
+      <template_file/>
     </menu>
     <menu id="RunQueriesMenu" xsi:type="WebPageMenuNode" _delta="define">
       <rank>31</rank>
@@ -186,6 +188,7 @@
     <menu id="Integrations" xsi:type="TemplateMenuNode" _delta="define">
       <rank>50</rank>
       <parent>ConfigurationTools</parent>
+      <template_file/>
     </menu>
     <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
       <rank>20</rank>
@@ -235,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>
@@ -264,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>
@@ -295,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>
@@ -429,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>
@@ -562,70 +545,7 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
       </event_data>
     </event>
   </events>
-  <forms>
-    <form id="DashletHeaderDynamicProperties" xsi:type="FormType">
-      <form_types>
-        <form_type id="title" xsi:type="TextType">
-          <options>
-            <label>UI:DashletHeaderDynamic:Prop-Title</label>
-            <default>UI:DashletHeaderDynamic:Prop-Title:Default</default>
-          </options>
-        </form_type>
-        <form_type id="icon" xsi:type="IconType">
-          <options>
-            <label>UI:DashletHeaderDynamic:Prop-Icon</label>
-            <default>images/icons/icons8-customer.svg</default>
-          </options>
-        </form_type>
-        <form_type id="subtitle" xsi:type="TextType">
-          <options>
-            <label>UI:DashletHeaderDynamic:Prop-Subtitle</label>
-            <default>UI:DashletHeaderDynamic:Prop-Subtitle:Default</default>
-          </options>
-        </form_type>
-        <form_type id="query" xsi:type="QueryType">
-          <options>
-            <label>UI:DashletHeaderDynamic:Prop-Query</label>
-            <default>SELECT Contact</default>
-          </options>
-        </form_type>
-        <form_type id="group_by" xsi:type="GroupByAttcodeType">
-          <options>
-            <label>UI:DashletHeaderDynamic:Prop-GroupBy</label>
-            <default>status</default>
-            <class_source>query</class_source>
-          </options>
-        </form_type>
-        <form_type id="values" xsi:type="ValuesFromAttcodeType">
-          <options>
-            <label>UI:DashletHeaderDynamic:Prop-Values</label>
-            <default>
-              <values>
-                <value id="active"/>
-                <value id="inactive"/>
-              </values>
-            </default>
-            <attcode_source>group_by</attcode_source>
-          </options>
-        </form_type>
-      </form_types>
-    </form>
-  </forms>
   <meta>
-    <form_type_definitions>
-      <form_type_definition id="IconType">
-        <options>
-          <option id="label">
-            <mandatory>true</mandatory>
-            <type>string</type>
-          </option>
-          <option id="default">
-            <mandatory>true</mandatory>
-            <type>string</type>
-          </option>
-        </options>
-      </form_type_definition>
-    </form_type_definitions>
     <classes>
       <class id="cmdbAbstractObject" _delta="define">
         <methods>

application/datatable.class.inc.php

@@ -0,0 +1,880 @@
+<?php
+
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
+use Combodo\iTop\Application\WebPage\WebPage;
+use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
+
+/**
+ * Copyright (C) 2013-2024 Combodo SAS
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ *
+ * @deprecated 3.0.0 use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable
+ */
+
+class DataTable
+{
+	protected $iListId;		// Unique ID inside the web page
+	/** @var string */
+	private $sDatatableContainerId;
+	protected $sTableId;	// identifier for saving the settings (combined with the class aliases)
+	protected $oSet;		// The set of objects to display
+	protected $aClassAliases;	// The aliases (alias => class) inside the set
+	protected $iNbObjects;		// Total number of objects in the set
+	protected $bUseCustomSettings;	// Whether or not the current display uses custom settings
+	protected $oDefaultSettings;	// the default settings for displaying such a list
+	protected $bShowObsoleteData;
+
+	/**
+	 * @param string $iListId  Unique ID for this div/table in the page
+	 * @param DBObjectSet $oSet The set of data to display
+	 * @param array$aClassAliases The list of classes/aliases to be displayed in this set $sAlias => $sClassName
+	 * @param string $sTableId A string (or null) identifying this table in order to persist its settings
+	 *
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function __construct($iListId, $oSet, $aClassAliases, $sTableId = null)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable');
+		$this->iListId = utils::GetSafeId($iListId); // Make a "safe" ID for jQuery
+		$this->sDatatableContainerId = 'datatable_'.utils::GetSafeId($iListId);
+		$this->oSet = $oSet;
+		$this->aClassAliases = $aClassAliases;
+		$this->sTableId = $sTableId;
+		$this->iNbObjects = $oSet->Count();
+		$this->bUseCustomSettings = false;
+		$this->oDefaultSettings = null;
+		$this->bShowObsoleteData = $oSet->GetShowObsoleteData();
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param DataTableSettings $oSettings
+	 * @param $bActionsMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \MySQLException
+	 */
+	public function Display(WebPage $oPage, DataTableSettings $oSettings, $bActionsMenu, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		$this->oDefaultSettings = $oSettings;
+
+		// Identified tables can have their own specific settings
+		$oCustomSettings = DataTableSettings::GetTableSettings($this->aClassAliases, $this->sTableId);
+		
+		if ($oCustomSettings != null)
+		{
+			// Custom settings overload the default ones
+			$this->bUseCustomSettings = true;
+			if ($this->oDefaultSettings->iDefaultPageSize == 0)
+			{
+				$oCustomSettings->iDefaultPageSize = 0;
+			}
+		}
+		else
+		{
+			$oCustomSettings = $oSettings;
+		}
+
+		if ($oCustomSettings->iDefaultPageSize > 0)
+		{
+			$this->oSet->SetLimit($oCustomSettings->iDefaultPageSize);
+		}
+		$this->oSet->SetOrderBy($oCustomSettings->GetSortOrder());
+
+		// Load only the requested columns
+		$aColumnsToLoad = array();
+		foreach($oCustomSettings->aColumns as $sAlias => $aColumnsInfo)
+		{
+			foreach($aColumnsInfo as $sAttCode => $aData)
+			{
+				if ($sAttCode != '_key_')
+				{
+					if ($aData['checked'])
+					{
+						$aColumnsToLoad[$sAlias][] = $sAttCode;
+					}
+					else
+					{
+						// See if this column is a must to load			
+						$sClass = $this->aClassAliases[$sAlias];
+						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+						if ($oAttDef->AlwaysLoadInTables()) {
+							$aColumnsToLoad[$sAlias][] = $sAttCode;
+						}
+					}
+				}
+			}
+		}
+		$this->oSet->OptimizeColumnLoad($aColumnsToLoad);
+
+
+		$bToolkitMenu = true;
+		if (isset($aExtraParams['toolkit_menu']))
+		{
+			$bToolkitMenu = (bool) $aExtraParams['toolkit_menu'];
+		}
+		if (UserRights::IsPortalUser())
+		{
+			// Portal users have a limited access to data, for now they can only see what's configured for them
+			$bToolkitMenu = false;
+		}
+		
+		return $this->GetAsHTML($oPage, $oCustomSettings->iDefaultPageSize, $oCustomSettings->iDefaultPageSize, 0, $oCustomSettings->aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 * @param $aColumns
+	 * @param $bActionsMenu
+	 * @param $bToolkitMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
+	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		$sObjectsCount = $this->GetObjectCount($oPage, $sSelectMode);
+		$sPager = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
+		$sActionsMenu = '';
+		$sToolkitMenu = '';
+		if ($bActionsMenu) {
+			$sActionsMenu = $this->GetActionsMenu($oPage, $aExtraParams);
+		}
+//		if ($bToolkitMenu)
+//		{
+//			$sToolkitMenu = $this->GetToolkitMenu($oPage, $aExtraParams);
+//		}
+
+		$sDataTable = $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+		$sConfigDlg = $this->GetTableConfigDlg($oPage, $aColumns, $bViewLink, $iDefaultPageSize);
+
+		$sHtml = "<table id=\"{$this->sDatatableContainerId}\" class=\"datatable\">";
+		$sHtml .= "<tr><td>";
+		$sHtml .= "<table style=\"width:100%;\">";
+		$sHtml .= "<tr><td class=\"pagination_container\">$sObjectsCount</td><td class=\"menucontainer\">$sToolkitMenu $sActionsMenu</td></tr>";
+		$sHtml .= "<tr>$sPager</tr>";
+		$sHtml .= "</table>";
+		$sHtml .= "</td></tr>";
+		$sHtml .= "<tr><td class=\"datacontents\">$sDataTable</td></tr>";
+		$sHtml .= "</table>\n";
+		$oPage->add_at_the_end($sConfigDlg);
+
+		$aExtraParams['show_obsolete_data'] = $this->bShowObsoleteData;
+
+		$aOptions = array(
+			'sPersistentId' => '',
+			'sFilter' => $this->oSet->GetFilter()->serialize(),
+			'oColumns' => $aColumns,
+			'sSelectMode' => $sSelectMode,
+			'sViewLink' => ($bViewLink ? 'true' : 'false'),
+			'iNbObjects' => $this->iNbObjects,
+			'iDefaultPageSize' => $iDefaultPageSize,
+			'iPageSize' =>  $iPageSize,
+			'iPageIndex' =>  $iPageIndex,
+			'oClassAliases' => $this->aClassAliases,
+			'sTableId' => $this->sTableId,
+			'oExtraParams' => $aExtraParams,
+			'sRenderUrl' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php',
+			'oRenderParameters' => array('str' => ''), // Forces JSON to encode this as a object...
+			'oDefaultSettings' => array('str' => ''), // Forces JSON to encode this as a object...
+			'oLabels' => array('moveup' => Dict::S('UI:Button:MoveUp'), 'movedown' => Dict::S('UI:Button:MoveDown')),
+		);
+		if($this->oDefaultSettings != null)
+		{
+			$aOptions['oDefaultSettings'] = $this->GetAsHash($this->oDefaultSettings);
+		}
+		$sJSOptions = json_encode($aOptions);
+		$oPage->add_ready_script("$('#{$this->sDatatableContainerId}').datatable($sJSOptions);");
+
+		return $sHtml;
+	}
+
+	/**
+	 * When refreshing the body of a paginated table, get the rows of the table (inside the TBODY)
+	 * return string The HTML rows to insert inside the <tbody> node
+	 */
+	public function GetAsHTMLTableRows(WebPage $oPage, $iPageSize, $aColumns, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		if ($iPageSize < 1)
+		{
+			$iPageSize = -1; // convention: no pagination
+		}
+		$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
+		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+		
+		$sHtml = '';
+		foreach($aValues as $aRow)
+		{
+			$sHtml .= $oPage->GetTableRow($aRow, $aAttribs);
+		}
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $sSelectMode
+	 *
+	 * @return string
+	 */
+	protected function GetObjectCount(WebPage $oPage, $sSelectMode)
+	{
+		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
+		{
+			$sHtml = '<div class="pagination_objcount">'.Dict::Format('UI:Pagination:HeaderSelection', '<span id="total">'.$this->iNbObjects.'</span>', '<span class="selectedCount">0</span>').'</div>';
+		}
+		else
+		{
+			$sHtml = '<div class="pagination_objcount">'.Dict::Format('UI:Pagination:HeaderNoSelection', '<span id="total">'.$this->iNbObjects.'</span>').'</div>';
+		}
+		return $sHtml;		
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 *
+	 * @return string
+	 */
+	protected function GetPager(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex)
+	{
+		$sHtml = '';
+		if ($iPageSize < 1) // Display all
+		{
+			$sPagerStyle = 'style="display:none"'; // no limit: display the full table, so hide the "pager" UI
+												   // WARNING: mPDF does not take the "display" style into account
+												   // when applied to a <td> or a <table> tag, so make sure you apply this to a div
+		}
+		else
+		{
+			$sPagerStyle = '';
+		}
+		
+		$sCombo = '<select class="pagesize">';
+		if($iPageSize < 1)
+		{
+			$sCombo .= "<option selected=\"selected\" value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
+		}
+		else
+		{
+			for($iPage = 1; $iPage < 5; $iPage++)
+			{
+				$iNbItems = $iPage * $iDefaultPageSize;
+				$sSelected = ($iNbItems == $iPageSize) ? 'selected="selected"' : '';
+				$sCombo .= "<option  $sSelected value=\"$iNbItems\">$iNbItems</option>";
+			}
+			$sCombo .= "<option value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
+		}
+
+		$sCombo .= '</select>';
+		
+		$sPages = Dict::S('UI:Pagination:PagesLabel');
+		$sPageSizeCombo = Dict::Format('UI:Pagination:PageSize', $sCombo);
+		
+		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
+		if ($iNbPages == 1)
+		{
+			// No need to display the pager
+			$sPagerStyle = 'style="display:none"';
+		}
+		$aPagesToDisplay = array();
+		for($idx = 0; $idx <= min(4, $iNbPages-1); $idx++)
+		{
+			if ($idx == 0)
+			{
+				$aPagesToDisplay[$idx] = '<span page="0" class="curr_page">1</span>';
+			}
+			else
+			{
+				$aPagesToDisplay[$idx] = "<span id=\"gotopage_$idx\" class=\"gotopage\" page=\"$idx\">".(1+$idx)."</span>";
+			}
+		}
+		$iLastPageIdx = $iNbPages - 1;
+		if (!isset($aPagesToDisplay[$iLastPageIdx]))
+		{
+			unset($aPagesToDisplay[$idx - 1]); // remove the last page added to make room for the very last page
+			$aPagesToDisplay[$iLastPageIdx] = "<span id=\"gotopage_$iLastPageIdx\" class=\"gotopage\" page=\"$iLastPageIdx\">... $iNbPages</span>";
+		}
+		$sPagesLinks = implode('', $aPagesToDisplay);
+		$sPagesList = '['.implode(',', array_keys($aPagesToDisplay)).']';
+
+		$sAppRootUrl = utils::GetAbsoluteUrlAppRoot();
+		$sSelectionMode = ($iNbPages == 1) ? '' : 'positive';
+		$sHtml =
+<<<EOF
+		<td colspan="2">
+		<div $sPagerStyle>
+		<table id="pager{$this->iListId}" class="pager"><tr>
+		<td>$sPages</td>
+		<td><img src="{$sAppRootUrl}images/first.png" class="first"/>AAAA</td>
+		<td><img src="{$sAppRootUrl}images/prev.png" class="prev"/></td>
+		<td><span id="index">$sPagesLinks</span></td>
+		<td><img src="{$sAppRootUrl}images/next.png" class="next"/></td>
+		<td><img src="{$sAppRootUrl}images/last.png" class="last"/></td>
+		<td>$sPageSizeCombo</td>
+		<td><span id="loading">&nbsp;</span><input type="hidden" name="selectionMode" value="$sSelectionMode"></input>
+		</td>
+		</tr>
+		</table>
+		</div>
+		</td>
+EOF;
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ApplicationException
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 * @throws \ReflectionException
+	 * @throws \Twig\Error\LoaderError
+	 * @throws \Twig\Error\RuntimeError
+	 * @throws \Twig\Error\SyntaxError
+	 */
+	protected function GetActionsMenu(WebPage $oPage, $aExtraParams)
+	{
+		$oMenuBlock = new MenuBlock($this->oSet->GetFilter(), 'list');
+		$oBlock = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $this->iListId);
+
+		return ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	protected function GetToolkitMenu(WebPage $oPage, $aExtraParams)
+	{
+		if (!$oPage->IsPrintableVersion())
+		{
+			$sMenuTitle = Dict::S('UI:ConfigureThisList');
+			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li aria-label="'.Dict::S('UI:Menu:Toolkit').'"><i class="fas fa-tools"></i><i class="fas fa-caret-down"></i><ul>';
+	
+			$oMenuItem1 = new JSPopupMenuItem('iTop::ConfigureList', $sMenuTitle, "$('#datatable_dlg_".$this->iListId."').dialog('open');");
+			$aActions = array(
+				$oMenuItem1->GetUID() => $oMenuItem1->GetMenuItem(),
+			);
+			$this->oSet->Rewind();
+			utils::GetPopupMenuItems($oPage, iPopupMenuExtension::MENU_OBJLIST_TOOLKIT, $this->oSet, $aActions, $this->sTableId, $this->iListId);
+			$this->oSet->Rewind();
+			$sHtml .= $oPage->RenderPopupMenuItems($aActions);
+		}
+		else
+		{
+			$sHtml = '';
+		}
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aColumns
+	 * @param $bViewLink
+	 * @param $iDefaultPageSize
+	 *
+	 * @return string
+	 */
+	protected function GetTableConfigDlg(WebPage $oPage, $aColumns, $bViewLink, $iDefaultPageSize)
+	{
+		$sHtml = "<div id=\"datatable_dlg_{$this->iListId}\" style=\"display: none;\">";
+		$sHtml .= "<form onsubmit=\"return false\">";
+		$sChecked = ($this->bUseCustomSettings) ? '' : 'checked';
+		$sHtml .= "<p><input id=\"dtbl_dlg_settings_{$this->iListId}\" type=\"radio\" name=\"settings\" $sChecked value=\"defaults\"><label for=\"dtbl_dlg_settings_{$this->iListId}\">&nbsp;".Dict::S('UI:UseDefaultSettings').'</label></p>';
+		$sHtml .= "<fieldset>";
+		$sChecked = ($this->bUseCustomSettings) ? 'checked':  '';
+		$sHtml .= "<legend class=\"transparent\"><input id=\"dtbl_dlg_specific_{$this->iListId}\" type=\"radio\" class=\"specific_settings\" name=\"settings\" $sChecked value=\"specific\"><label for=\"dtbl_dlg_specific_{$this->iListId}\">&nbsp;".Dict::S('UI:UseSpecificSettings')."</label></legend>";
+		$sHtml .= Dict::S('UI:ColumnsAndSortOrder').'<br/><ul class="sortable_field_list" id="sfl_'.$this->iListId.'"></ul>';
+		
+		$sHtml .= '<p>'.Dict::Format('UI:Display_X_ItemsPerPage', '<input type="text" size="4" name="page_size" value="'.$iDefaultPageSize.'">').'</p>';
+		$sHtml .= "</fieldset>";
+		$sHtml .= "<fieldset>";
+		$sSaveChecked = ($this->sTableId != null) ? 'checked' : '';
+		$sCustomDisabled = ($this->sTableId == null) ? 'disabled="disabled" stay-disabled="true" ' : '';
+		$sCustomChecked = ($this->sTableId != null) ? 'checked' : '';
+		$sGenericChecked = ($this->sTableId == null) ? 'checked' : '';
+		$sHtml .= "<legend class=\"transparent\"><input id=\"dtbl_dlg_save_{$this->iListId}\" type=\"checkbox\" $sSaveChecked name=\"save_settings\"><label for=\"dtbl_dlg_save_{$this->iListId}\">&nbsp;".Dict::S('UI:UseSavetheSettings')."</label></legend>";
+		$sHtml .= "<p><input id=\"dtbl_dlg_this_list_{$this->iListId}\" type=\"radio\" name=\"scope\" $sCustomChecked $sCustomDisabled value=\"this_list\"><label for=\"dtbl_dlg_this_list_{$this->iListId}\">&nbsp;".Dict::S('UI:OnlyForThisList').'</label>&nbsp;&nbsp;&nbsp;&nbsp;';
+		$sHtml .= "<input id=\"dtbl_dlg_all_{$this->iListId}\" type=\"radio\" name=\"scope\" $sGenericChecked value=\"defaults\"><label for=\"dtbl_dlg_all_{$this->iListId}\">&nbsp;".Dict::S('UI:ForAllLists').'</label></p>';
+		$sHtml .= "</fieldset>";
+		$sHtml .= '<table style="width:100%"><tr><td style="text-align:center;">';
+		$sHtml .= '<button type="button" onclick="$(\'#'.$this->sDatatableContainerId.'\').datatable(\'onDlgCancel\'); $(\'#datatable_dlg_'.$this->iListId.'\').dialog(\'close\')">'.Dict::S('UI:Button:Cancel').'</button>';
+		$sHtml .= '</td><td style="text-align:center;">';
+		$sHtml .= '<button type="submit" onclick="$(\'#'.$this->sDatatableContainerId.'\').datatable(\'onDlgOk\');$(\'#datatable_dlg_'.$this->iListId.'\').dialog(\'close\');">'.Dict::S('UI:Button:Ok').'</button>';
+		$sHtml .= '</td></tr></table>';
+		$sHtml .= "</form>";
+		$sHtml .= "</div>";
+		
+		$sDlgTitle = addslashes(Dict::S('UI:ListConfigurationTitle'));
+		$oPage->add_ready_script("$('#datatable_dlg_{$this->iListId}').dialog({autoOpen: false, title: '$sDlgTitle', width: 500, close: function() { $('#{$this->sDatatableContainerId}').datatable('onDlgCancel'); } });");
+
+		return $sHtml;
+	}
+
+	/**
+	 * @param $oSetting
+	 *
+	 * @return array
+	 */
+	public function GetAsHash($oSetting)
+	{
+		$aSettings = array('iDefaultPageSize' => $oSetting->iDefaultPageSize, 'oColumns' => $oSetting->aColumns);
+		return $aSettings;
+	}
+
+	/**
+	 * @param array $aColumns
+	 * @param string $sSelectMode
+	 * @param bool $bViewLink
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 */
+	protected function GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink)
+	{
+		$aAttribs = array();
+		if ($sSelectMode == 'multiple')
+		{
+			$aAttribs['form::select'] = array(
+				'label' => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->iListId}:not(:disabled)', this.checked);\" class=\"checkAll\"></input>",
+				'description' => Dict::S('UI:SelectAllToggle+'),
+				'metadata' => array(),
+			);
+		}
+		else if ($sSelectMode == 'single')
+		{
+			$aAttribs['form::select'] = array('label' => '', 'description' => '', 'metadata' => array());
+		}
+
+		foreach($this->aClassAliases as $sAlias => $sClassName)
+		{
+			foreach($aColumns[$sAlias] as $sAttCode => $aData)
+			{
+				if ($aData['checked'])
+				{
+					if ($sAttCode == '_key_')
+					{
+						$sAttLabel = MetaModel::GetName($sClassName);
+
+						$aAttribs['key_'.$sAlias] = array(
+							'label' => $sAttLabel,
+							'description' => '',
+							'metadata' => array(
+								'object_class' => $sClassName,
+								'attribute_label' => $sAttLabel,
+							),
+						);
+					}
+					else
+					{
+						$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
+						$sAttDefClass = get_class($oAttDef);
+						$sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode);
+
+						$aAttribs[$sAttCode.'_'.$sAlias] = array(
+							'label' => $sAttLabel,
+							'description' => $oAttDef->GetOrderByHint(),
+							'metadata' => array(
+								'object_class' => $sClassName,
+								'attribute_code' => $sAttCode,
+								'attribute_type' => $sAttDefClass,
+								'attribute_label' => $sAttLabel,
+							),
+						);
+					}
+				}
+			}
+		}
+		return $aAttribs;
+	}
+
+
+	/**
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 */
+	protected function GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+	{
+		$bLocalize = true;
+		if (isset($aExtraParams['localize_values']))
+		{
+			$bLocalize = (bool) $aExtraParams['localize_values'];
+		}
+
+		$aValues = array();
+		$aAttDefsCache = array();
+		$this->oSet->Seek(0);
+		$iMaxObjects = $iPageSize;
+		while (($aObjects = $this->oSet->FetchAssoc()) && ($iMaxObjects != 0))
+		{
+			$bFirstObject = true;
+			$aRow = array();
+			foreach($this->aClassAliases as $sAlias => $sClassName)
+			{
+				if (is_object($aObjects[$sAlias]))
+				{
+					$sHilightClass = MetaModel::GetHilightClass($sClassName, $aObjects[$sAlias]);
+					if ($sHilightClass != '')
+					{
+						$aRow['@class'] = $sHilightClass;	
+					}
+					if ((($sSelectMode == 'single') || ($sSelectMode == 'multiple')) && $bFirstObject)
+					{
+						if (array_key_exists('selection_enabled', $aExtraParams) && isset($aExtraParams['selection_enabled'][$aObjects[$sAlias]->GetKey()]))
+						{
+							$sDisabled = ($aExtraParams['selection_enabled'][$aObjects[$sAlias]->GetKey()]) ? '' : ' disabled="disabled"';
+						}
+						else
+						{
+							$sDisabled = '';
+						}
+						if ($sSelectMode == 'single')
+						{
+							$aRow['form::select'] = "<input type=\"radio\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
+						}
+						else
+						{
+							$aRow['form::select'] = "<input type=\"checkbox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
+						}
+					}
+					foreach($aColumns[$sAlias] as $sAttCode => $aData)
+					{
+						if ($aData['checked'])
+						{
+							if ($sAttCode == '_key_')
+							{
+								$aRow['key_'.$sAlias] = array(
+									'value_raw' => $aObjects[$sAlias]->GetKey(),
+									'value_html' => $aObjects[$sAlias]->GetHyperLink(),
+								);
+							}
+							else
+							{
+								// Prepare att. def. classes cache to avoid retrieving AttDef for each row
+								if(!isset($aAttDefsCache[$sClassName][$sAttCode]))
+								{
+									$aAttDefClassesCache[$sClassName][$sAttCode] = get_class(MetaModel::GetAttributeDef($sClassName, $sAttCode));
+								}
+
+								// Only retrieve raw (stored) value for simple fields
+								$bExcludeRawValue = false;
+								foreach (cmdbAbstractObject::GetAttDefClassesToExcludeFromMarkupMetadataRawValue() as $sAttDefClassToExclude)
+								{
+									if (is_a($aAttDefClassesCache[$sClassName][$sAttCode], $sAttDefClassToExclude, true))
+									{
+										$bExcludeRawValue = true;
+										break;
+									}
+								}
+
+								if($bExcludeRawValue)
+								{
+									$aRow[$sAttCode.'_'.$sAlias] = $aObjects[$sAlias]->GetAsHTML($sAttCode, $bLocalize);
+								}
+								else
+								{
+									$aRow[$sAttCode.'_'.$sAlias] = array(
+										'value_raw' => $aObjects[$sAlias]->Get($sAttCode),
+										'value_html' => $aObjects[$sAlias]->GetAsHTML($sAttCode, $bLocalize),
+									);
+								}
+							}
+						}
+					}
+				}
+				else
+				{
+					foreach($aColumns[$sAlias] as $sAttCode => $aData)
+					{
+						if ($aData['checked'])
+						{
+							if ($sAttCode == '_key_')
+							{
+								$aRow['key_'.$sAlias] = '';
+							}
+							else
+							{
+								$aRow[$sAttCode.'_'.$sAlias] = '';
+							}
+						}
+					}
+				}
+				$bFirstObject = false;
+			}
+			$aValues[] = $aRow;
+			$iMaxObjects--;
+		}
+		return $aValues;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 */
+	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+	{
+		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
+		if ($iPageSize < 1)
+		{
+			$iPageSize = -1; // convention: no pagination
+		}
+		$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
+
+		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+
+		$sHtml = '<table class="listContainer object-list">';
+
+		foreach($this->oSet->GetFilter()->GetInternalParams() as $sName => $sValue)
+		{
+			$aExtraParams['query_params'][$sName] = $sValue;
+		}
+		$aExtraParams['show_obsolete_data'] = $this->bShowObsoleteData;
+
+		$sHtml .= "<tr><td>";
+		$sHtml .= $oPage->GetTable($aAttribs, $aValues);
+		$sHtml .= '</td></tr>';
+		$sHtml .= '</table>';
+		$iCount = $this->iNbObjects;
+
+		$aArgs = $this->oSet->GetArgs();
+		$sExtraParams = addslashes(str_replace('"', "'", json_encode(array_merge($aExtraParams, $aArgs)))); // JSON encode, change the style of the quotes and escape them
+		$sSelectModeJS = '';
+		$sHeaders = '';
+		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
+		{
+			$sSelectModeJS = $sSelectMode;
+			$sHeaders = 'headers: { 0: {sorter: false}},';
+		}
+		$sDisplayKey = ($bViewLink) ? 'true' : 'false';
+		// Protect against duplicate elements in the Zlist
+		$aUniqueOrderedList = array();
+		foreach($this->aClassAliases as $sAlias => $sClassName)
+		{
+			foreach($aColumns[$sAlias] as $sAttCode => $aData)
+			{
+				if ($aData['checked'])
+				{
+					$aUniqueOrderedList[$sAttCode] = true;
+				}
+			}
+		}
+		$aUniqueOrderedList = array_keys($aUniqueOrderedList);
+		$sJSColumns = json_encode($aColumns);
+		$sJSClassAliases = json_encode($this->aClassAliases);
+		$sCssCount = isset($aExtraParams['cssCount']) ? ", cssCount: '{$aExtraParams['cssCount']}'" : '';
+		$this->oSet->ApplyParameters();
+		// Display the actual sort order of the table
+		$aRealSortOrder = $this->oSet->GetRealSortOrder();
+		$aDefaultSort = array();
+		$iColOffset = 0;
+		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
+		{
+			$iColOffset += 1;
+		}
+		if ($bViewLink)
+		{
+//			$iColOffset += 1;
+		}
+		foreach($aRealSortOrder as $sColCode => $bAscending)
+		{
+			$iPos = array_search($sColCode, $aUniqueOrderedList);
+			if ($iPos !== false)
+			{
+				$aDefaultSort[] = "[".($iColOffset+$iPos).",".($bAscending ? '0' : '1')."]";
+			}
+			else if (($iPos = array_search(preg_replace('/_friendlyname$/', '', $sColCode), $aUniqueOrderedList)) !== false)
+			{
+				// if sorted on the friendly name of an external key, then consider it sorted on the column that shows the links
+				$aDefaultSort[] = "[".($iColOffset+$iPos).",".($bAscending ? '0' : '1')."]";
+			}
+			else if($sColCode == 'friendlyname' && $bViewLink)
+			{
+				$aDefaultSort[] = "[".($iColOffset).",".($bAscending ? '0' : '1')."]";
+			}
+		}
+		$sFakeSortList = '';
+		if (count($aDefaultSort) > 0)
+		{
+			$sFakeSortList = '['.implode(',', $aDefaultSort).']';
+		}
+		$sOQL = addslashes($this->oSet->GetFilter()->serialize());
+		$oPage->add_ready_script(
+<<<JS
+var oTable = $('#{$this->sDatatableContainerId} table.listResults');
+oTable.tableHover();
+oTable
+	.tablesorter({ $sHeaders widgets: ['myZebra', 'truncatedList']})
+	.tablesorterPager({
+		container: $('#pager{$this->iListId}'),
+		totalRows:$iCount,
+		size: $iPageSize,
+		filter: '$sOQL',
+		extra_params: '$sExtraParams',
+		select_mode: '$sSelectModeJS',
+		displayKey: $sDisplayKey,
+		table_id: '{$this->sDatatableContainerId}',
+		columns: $sJSColumns,
+		class_aliases: $sJSClassAliases $sCssCount
+	});
+JS
+	);
+		if ($sFakeSortList != '')
+		{
+			$oPage->add_ready_script("oTable.trigger(\"fakesorton\", [$sFakeSortList]);");
+		}
+		return $sHtml;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $iDefaultPageSize
+	 * @param $iStart
+	 */
+	public function UpdatePager(WebPage $oPage, $iDefaultPageSize, $iStart)
+	{
+		$iPageSize = $iDefaultPageSize;
+		$iPageIndex = 0;
+		$sHtml = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
+		$oPage->add_ready_script("$('#pager{$this->iListId}').html('".json_encode($sHtml)."');");
+		if ($iDefaultPageSize < 1)
+		{
+			$oPage->add_ready_script("$('#pager{$this->iListId}').parent().hide()");
+		}
+		else
+		{
+			$oPage->add_ready_script("$('#pager{$this->iListId}').parent().show()");
+		}
+	}
+}
+
+/**
+ * Simplified version of the data table with less "decoration" (and no paging)
+ * which is optimized for printing
+ */
+class PrintableDataTable extends DataTable
+{
+	/**
+	 * @param WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 * @param $aColumns
+	 * @param $bActionsMenu
+	 * @param $bToolkitMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
+	{
+		return $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, -1, $bViewLink, $aExtraParams);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+	{
+		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
+		if ($iPageSize < 1)
+		{
+			$iPageSize = -1; // convention: no pagination
+		}
+		$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
+	
+		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+	
+		$sHtml = $oPage->GetTable($aAttribs, $aValues);
+		
+		return $sHtml;
+	}
+}

application/displayblock.class.inc.php

@@ -263,8 +263,6 @@ class DisplayBlock
 				/** param for export.php */
 				'refresh_action',
 				/**to add refresh button in datatable*/
-				'object_count',
-				/** int number of objects in list */
 			], DataTableUIBlockFactory::GetAllowedParams()),
 			static::ENUM_STYLE_LIST_SEARCH => array_merge([
 				'update_history',
@@ -419,7 +417,7 @@ class DisplayBlock
 		$oSet->OptimizeColumnLoad(array($oSet->GetClassAlias() => array())); // No need to load all the columns just to get the id
 		while($oObject = $oSet->Fetch())
 		{
-			$aKeys[] = $oObject->GetKey();
+			$aKeys[] = $oObject->GetKey();	
 		}
 		$oSet->Rewind();
 		if (count($aKeys) > 0)
@@ -772,6 +770,10 @@ class DisplayBlock
 				$oBlock = $this->RenderList($aExtraParams, $oPage);
 			break;
 
+			case 'links':
+				$oBlock = $this->RenderLinks($oPage, $aExtraParams);
+				break;
+
 			case static::ENUM_STYLE_ACTIONS:
 				$oBlock = $this->RenderActions($aExtraParams);
 				break;
@@ -791,11 +793,11 @@ class DisplayBlock
 			case static::ENUM_STYLE_CHART:
 				$oBlock = $this->RenderChart($sId, $aQueryParams, $aExtraParams);
 				break;
-
+			
 			case static::ENUM_STYLE_CHART_AJAX:
 				$oBlock = $this->RenderChartAjax($aExtraParams);
 				break;
-
+			
 			default:
 			// Unsupported style, do nothing.
 			$sHtml .= Dict::format('UI:Error:UnsupportedStyleOfBlock', $this->m_sStyle);
@@ -893,7 +895,7 @@ JS
 
 		$sClass = $this->m_oFilter->GetClass();
 		$bConditionAdded = false;
-
+		
 		// If the condition is an external key with a class having a hierarchy, use a "below" criteria
 		if (MetaModel::IsValidAttCode($sClass, $sFilterCode))
 		{
@@ -902,13 +904,13 @@ JS
 			if ($oAttDef->IsExternalKey())
 			{
 				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
-
+				
 				if ($sHierarchicalKeyCode !== false)
 				{
 					$oFilter = new DBObjectSearch($oAttDef->GetTargetClass());
 					if (($sOpCode == 'IN') && is_array($condition))
 					{
-						$oFilter->AddConditionExpression(self::GetConditionIN($oFilter, 'id', $condition));
+						$oFilter->AddConditionExpression(self::GetConditionIN($oFilter, 'id', $condition));						
 					}
 					else
 					{
@@ -931,21 +933,21 @@ JS
 				$bConditionAdded = true;
 			}
 		}
-
+		
 		// In all other cases, just add the condition directly
 		if (!$bConditionAdded)
 		{
 			$this->m_oFilter->AddCondition($sFilterCode, $condition, null); // Use the default 'loose' operator
 		}
 	}
-
+	
 	static protected function GetConditionIN($oFilter, $sFilterCode, $condition)
 	{
 		$oField = new FieldExpression($sFilterCode,  $oFilter->GetClassAlias());
 		$sListExpr = '('.implode(', ', CMDBSource::Quote($condition)).')';
 		$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
 		$oNewCondition = Expression::FromOQL($sOQLCondition);
-		return $oNewCondition;
+		return $oNewCondition;		
 	}
 
 	/**
@@ -1122,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]];
 				}
@@ -1230,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 = [
@@ -1239,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);
@@ -1287,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();
@@ -1302,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(
@@ -1561,6 +1563,54 @@ JS
 		return $oContentBlock;
 	}
 
+	/**
+	 * @deprecated 3.1.0 N°5957
+	 *
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 *
+	 * @return \Combodo\iTop\Application\UI\Base\Component\Html\Html|\Combodo\iTop\Application\UI\Base\Layout\UIContentBlock|string
+	 * @throws \ApplicationException
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 * @throws \ReflectionException
+	 */
+	protected function RenderLinks(WebPage $oPage, array $aExtraParams)
+	{
+		// Note: No deprecation ticket yet as we want to wait and see if people / code actually use this method, in which case we might keep it.
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('This method is most likely not used throughout the application and will be removed soon. If you ever see this message, please inform us.');
+
+		$oBlock = null;
+		if (($this->m_oSet->CountWithLimit(1) > 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES)) {
+			$oBlock = cmdbAbstractObject::GetDisplaySetBlock($oPage, $this->m_oSet, $aExtraParams);
+		} else {
+			$sClass = $this->m_oFilter->GetClass();
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $this->m_aParams['target_attr']);
+			$sTargetClass = $oAttDef->GetTargetClass();
+			$oBlock = new Html('<p>'.Dict::Format('UI:NoObject_Class_ToDisplay', MetaModel::GetName($sTargetClass)).'</p>');
+			$bDisplayMenu = isset($this->m_aParams['menu']) ? $this->m_aParams['menu'] == true : true;
+			if ($bDisplayMenu) {
+				if ((UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES)) {
+					$sDefaults = '';
+					if (isset($this->m_aParams['default'])) {
+						foreach ($this->m_aParams['default'] as $sName => $sValue) {
+							$sDefaults .= '&'.urlencode($sName).'='.urlencode($sValue);
+						}
+					}
+					$oBlock->AddHtml("<p><a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=modify_links&class=$sClass&sParams&link_attr=".$aExtraParams['link_attr']."&id=".$aExtraParams['object_id']."&target_class=$sTargetClass&addObjects=true$sDefaults\">".Dict::Format('UI:ClickToCreateNew',
+							Metamodel::GetName($sClass))."</a></p>\n");
+				}
+			}
+		}
+		return $oBlock;
+	}
+
 	/**
 	 * @param string|null $sChartId
 	 * @param array $aQueryParams
@@ -1586,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'] : '';
@@ -1594,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;
 		}
@@ -1631,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();
@@ -1658,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) {
@@ -1738,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),
@@ -1813,11 +1860,7 @@ class MenuBlock extends DisplayBlock
 		$aSelectedClasses = $this->GetFilter()->GetSelectedClasses();
 		$bIsForLinkset = isset($aExtraParams['target_attr']);
 		$oSet = new CMDBObjectSet($this->GetFilter());
-		if(isset($aExtraParams['object_count'])){
-			$iSetCount = $aExtraParams['object_count'];
-		} else {
-			$iSetCount = $oSet->Count();
-		}
+		$iSetCount = $oSet->Count();
 		/** @var string $sRefreshAction JS snippet to run when clicking on the refresh button of the menu */
 		$sRefreshAction = $aExtraParams['refresh_action'] ?? '';
 		$bIsCreationInModal = isset($aExtraParams['creation_in_modal']) && $aExtraParams['creation_in_modal'] === true;
@@ -1842,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();
@@ -1978,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();
@@ -2172,11 +2218,6 @@ class MenuBlock extends DisplayBlock
 					$aFavoriteRegularActions[$key] = $aRegularActions[$key];
 					unset($aRegularActions[$key]);
 				}
-				// Toolkit actions
-				if (isset($aToolkitActions[$key])) {
-					$aFavoriteRegularActions[$key] = $aToolkitActions[$key];
-					unset($aToolkitActions[$key]);
-				}
 
 				// Transitions
 				if (isset($aTransitionActions[$key])) {
@@ -2266,27 +2307,7 @@ class MenuBlock extends DisplayBlock
 						break;
 
 					case 'UI:Menu:EMail':
-						$sIconClass = 'far fa-envelope fa-lg';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:OpenOQL':
-						$sIconClass = 'fas fa-play fa-sm';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:ExportXLSX':
-						$sIconClass = 'far fa-file-excel fa-lg';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:CSVExport':
-						$sIconClass = 'fas fa-file-csv fa-lg';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:PrintableVersion':
-						$sIconClass = 'fas fa-print';
-						$sLabel = '';
-						break;
-					case 'UI:Menu:ExportPDF':
-						$sIconClass = 'fas fa-file-pdf fa-lg';
+						$sIconClass = 'fas fa-share-alt';
 						$sLabel = '';
 						break;
 
@@ -2298,12 +2319,7 @@ class MenuBlock extends DisplayBlock
 				}
 
 				$sTarget = isset($aAction['target']) ? $aAction['target'] : '';
-				if (!empty($aAction['onclick'])) {
-					$oActionButton = ButtonUIBlockFactory::MakeIconAction($sIconClass, $aAction['label'], $aAction['label'], $sLabel,false); //utils::Sanitize($sActionId.md5($aAction['onclick']), '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER))
-					$oActionButton->SetOnClickJsCode($aAction['onclick']);
-				} else {
-					$oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, utils::Sanitize($sActionId, '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER));
-				}
+				$oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, utils::Sanitize($sActionId, '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER));
 				// ResourceId should not be sanitized
 				$oActionButton->AddDataAttribute('resource-id', $sActionId);
 				$oActionButton->AddCSSClasses(['ibo-action-button', 'ibo-regular-action-button']);
@@ -2562,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/errorpage.class.inc.php

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

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

@@ -363,7 +363,7 @@ $('#$sDialogId').dialog({
 		buttons: [
 		{ text: "$sOkButtonLabel", click: function() {
 			var oForm = $(this).closest('.ui-dialog').find('form');
-			oForm.trigger('submit');
+			oForm.submit();
 			if (AnimateDlgButtons)
 			{
 				sFormId = oForm.attr('id');
@@ -1501,11 +1501,6 @@ class DesignerIconSelectionField extends DesignerFormField
 		$this->aAllowedValues = $aAllowedValues;
 	}
 
-	public function AddAllowedValue($aValue)
-	{
-		// Add a null value to the list of allowed values
-		$this->aAllowedValues = array_merge([$aValue], $this->aAllowedValues);
-	}
 	public function EnableUpload($sIconUploadUrl)
 	{
 		$this->sUploadUrl = $sIconUploadUrl;

application/iotask.class.inc.php

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