N°6759 - Fixing attributes visibility

.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,24 +86,19 @@ 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"
-    checkout support/2.7
-    commit id: "2025-10-07" tag: "2.7.13"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.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').on('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>

CONTRIBUTING.md

@@ -7,17 +7,6 @@ Here are some guidelines that will help us integrate your work!
 
 ## Contributions
 
-
-```
-  _   _            _    _        _                __           _   
- | | | | __ _  ___| | _| |_ ___ | |__   ___ _ __ / _| ___  ___| |_ 
- | |_| |/ _` |/ __| |/ / __/ _ \| '_ \ / _ \ '__| |_ / _ \/ __| __|
- |  _  | (_| | (__|   <| || (_) | |_) |  __/ |  |  _|  __/\__ \ |_ 
- |_| |_|\__,_|\___|_|\_\\__\___/|_.__/ \___|_|  |_|  \___||___/\__|                                              
-```                                                                     
-This repository is part of Hacktoberfest. Contributions are welcome! Feel free to suggest improvements, add translation, fix bugs, or propose new features. Thank you for contributing !
-
-
 ### Subjects
 You are welcome to create pull requests on any of those subjects:
 
@@ -172,4 +161,4 @@ We have one sticker per contribution type. You might get multiple stickers with
 
 Here is the design of each stickers for year 2024:
 
-![iTop stickers 2025](.doc/contributing-guide/2025.contributing-stickers-side-by-side.png)
+![iTop stickers 2024](.doc/contributing-guide/2024.contributing-stickers-side-by-side.png)

README.md

@@ -53,7 +53,7 @@ iTop also offers mass import tools to help you become even more efficient.
 [4]: https://www.itophub.io/wiki/page?id=latest:install:requirements
 [5]: https://www.itophub.io/wiki
 [6]: https://store.itophub.io/en_US/
-[7]: 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
@@ -99,7 +99,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Goethals, Stefan
 - Giuva, Vincenzo Katriel (a.k.a [@DarkNight97boss](https://github.com/DarkNight97boss))
 - Gumble, David
-- Håkon, Harnes (a.k.a [@hakonharnes](https://github.com/hakonharnes))
 - Heloir, Arthur 
 - Janssens, Jelle (a.k.a [@janssensjelle](https://github.com/janssensjelle))
 - Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))

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/login/iTokenLoginUIExtension.php

@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Login page extensibility
- *
- * @api
- * @package UIExtensibilityAPI
- * @since 3.x.x
- */
-interface iTokenLoginUIExtension
-{
-    /**
-     * @return array
-     * @api
-     */
-    public function GetTokenInfo() : array;
-
-	/**
-	 * @return array
-	 * @api
-	 */
-	public function GetUserLogin(array $aTokenInfo) : string;
-}

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/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)
@@ -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;
@@ -1218,6 +1209,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
@@ -1391,6 +1411,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 +1722,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 +2223,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 +2673,7 @@ HTML;
 					}
 					break;
 			}
-			$sPattern = addslashes($oAttDef->GetValidationPattern()); //'^([0-9]+)$';
+			$sPattern = addslashes($oAttDef->GetValidationPattern()); //'^([0-9]+)$';			
 			if (!empty($aEventsList))
 			{
 				if (!is_numeric($sNullValue))
@@ -3441,13 +3584,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 +3600,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 +3842,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
@@ -4396,6 +4542,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
@@ -4428,6 +4589,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,6 +4639,21 @@ 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();
@@ -4475,20 +4666,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 +4698,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 +4727,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 +4779,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)
@@ -4646,6 +4874,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
@@ -5521,7 +5809,7 @@ JS
 	{
 		$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, 'stimulus_applied' => $sStimulusBeingApplied]);
 	}
 
 	//////////////
@@ -5559,7 +5847,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);
 	}
 
 	/**

application/displayblock.class.inc.php

@@ -419,7 +419,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 +772,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 +795,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 +897,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 +906,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 +935,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;		
 	}
 
 	/**
@@ -1561,6 +1565,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

application/loginbasic.class.inc.php

@@ -9,7 +9,7 @@ use Combodo\iTop\Application\Helper\Session;
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-class LoginBasic extends AbstractLoginFSMExtension implements iTokenLoginUIExtension
+class LoginBasic extends AbstractLoginFSMExtension
 {
 	/**
 	 * Return the list of supported login modes for this plugin
@@ -143,21 +143,4 @@ class LoginBasic extends AbstractLoginFSMExtension implements iTokenLoginUIExten
 		}
 		return array($sAuthUser, $sAuthPwd);
 	}
-
-	public function GetTokenInfo(): array
-	{
-		return $this->GetAuthUserAndPassword();
-	}
-
-	public function GetUserLogin(array $aTokenInfo): string
-	{
-		$sLogin = $aTokenInfo[0];
-		$sLoginMode = 'basic';
-		if (UserRights::CheckCredentials($sLogin, $aTokenInfo[1], $sLoginMode, 'internal'))
-		{
-			return $sLogin;
-		}
-
-		throw new Exception("Cannot CheckCredentials user login ($sLogin) with ($sLoginMode) mode");
-	}
 }

application/loginform.class.inc.php

@@ -12,7 +12,7 @@ use Combodo\iTop\Application\Helper\Session;
  *
  * @since 2.7.0
  */
-class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension, iTokenLoginUIExtension
+class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 {
 	private $bForceFormOnError = false;
 
@@ -32,7 +32,8 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension,
 	protected function OnReadCredentials(&$iErrorCode)
 	{
 		if (!Session::IsSet('login_mode') || Session::Get('login_mode') == 'form') {
-			list($sAuthUser, $sAuthPwd) = $this->GetTokenInfo();
+			$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
+			$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
 			if ($this->bForceFormOnError || empty($sAuthUser) || empty($sAuthPwd))
 			{
 				if (array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER))
@@ -67,7 +68,8 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension,
 	{
 		if (Session::Get('login_mode') == 'form')
 		{
-			list($sAuthUser, $sAuthPwd) = $this->GetTokenInfo();
+			$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
+			$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
 			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
 			{
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
@@ -151,23 +153,4 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension,
 
 		return $oLoginContext;
 	}
-
-	public function GetTokenInfo(): array
-	{
-		$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
-		$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
-		return [$sAuthUser, $sAuthPwd];
-	}
-
-	public function GetUserLogin(array $aTokenInfo): string
-	{
-		$sLogin = $aTokenInfo[0];
-		$sLoginMode = 'form';
-		if (UserRights::CheckCredentials($sLogin, $aTokenInfo[1], $sLoginMode, 'internal'))
-		{
-			return $sLogin;
-		}
-
-		throw new Exception("Cannot CheckCredentials user login ($sLogin) with ($sLoginMode) mode");
-	}
 }

application/loginurl.class.inc.php

@@ -9,7 +9,7 @@ use Combodo\iTop\Application\Helper\Session;
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-class LoginURL extends AbstractLoginFSMExtension implements iTokenLoginUIExtension
+class LoginURL extends AbstractLoginFSMExtension
 {
 	/**
 	 * @var bool
@@ -30,7 +30,9 @@ class LoginURL extends AbstractLoginFSMExtension implements iTokenLoginUIExtensi
 	{
 		if (!Session::IsSet('login_mode') && !$this->bErrorOccurred)
 		{
-			list($sAuthUser, $sAuthPwd) = $this->GetTokenInfo();
+			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
+			if (!empty($sAuthUser) && !empty($sAuthPwd))
 			{
 				Session::Set('login_mode', 'url');
 			}
@@ -51,7 +53,8 @@ class LoginURL extends AbstractLoginFSMExtension implements iTokenLoginUIExtensi
 	{
 		if (Session::Get('login_mode') == 'url')
 		{
-			list($sAuthUser, $sAuthPwd) = $this->GetTokenInfo();
+			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
 			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, Session::Get('login_mode'), 'internal'))
 			{
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
@@ -89,23 +92,4 @@ class LoginURL extends AbstractLoginFSMExtension implements iTokenLoginUIExtensi
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
-
-	public function GetTokenInfo(): array
-	{
-		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-		$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-		return [$sAuthUser, $sAuthPwd];
-	}
-
-	public function GetUserLogin(array $aTokenInfo): string
-	{
-		$sLogin = $aTokenInfo[0];
-		$sLoginMode = 'url';
-		if (UserRights::CheckCredentials($sLogin, $aTokenInfo[1], $sLoginMode, 'internal'))
-		{
-			return $sLogin;
-		}
-
-		throw new Exception("Cannot CheckCredentials user login ($sLogin) with ($sLoginMode) mode");
-	}
 }

application/loginwebpage.class.inc.php

@@ -581,26 +581,6 @@ class LoginWebPage extends NiceWebPage
 		return $aPlugins;
 	}
 
-	public static function GetCurrentLoginPlugin(string $sCurrentLoginMode) : iLoginExtension
-	{
-		/** @var iLoginExtension $oLoginExtensionInstance */
-		foreach (MetaModel::EnumPlugins('iLoginFSMExtension') as $oLoginExtensionInstance)
-		{
-			$aLoginModes = $oLoginExtensionInstance->ListSupportedLoginModes();
-			$aLoginModes = (is_array($aLoginModes) ? $aLoginModes : array());
-			foreach ($aLoginModes as $sLoginMode)
-			{
-				// Keep only the plugins for the current login mode + before + after
-				if ($sLoginMode == $sCurrentLoginMode)
-				{
-					return $oLoginExtensionInstance;
-				}
-			}
-		}
-
-		throw new \Exception("should not happen");
-	}
-
 	/**
 	 * Advance Login Finite State Machine to the next step
 	 *

application/menunode.class.inc.php

@@ -358,6 +358,50 @@ class ApplicationMenu
 		return $aSubMenuNodes;
 	}
 
+	/**
+	 * Entry point to display the whole menu into the web page, used by iTopWebPage
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @throws DictExceptionMissingString
+	 *
+	 * @deprecated Will be removed in 3.0.0, use static::GetMenuGroups() instead
+	 */
+	public static function DisplayMenu($oPage, $aExtraParams)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use static::GetMenuGroups() instead');
+		self::LoadAdditionalMenus();
+		// Sort the root menu based on the rank
+		usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
+		$iAccordion = 0;
+		$iActiveAccordion = $iAccordion;
+		$iActiveMenu = self::GetMenuIndexById(self::GetActiveNodeId());
+		foreach (self::$aRootMenus as $aMenu) {
+			if (!self::CanDisplayMenu($aMenu)) {
+				continue;
+			}
+			$oMenuNode = self::GetMenuNode($aMenu['index']);
+			$oPage->AddToMenu('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'" class="navigation-menu-group" data-menu-id="'.$oMenuNode->GetMenuId().'">'.$oMenuNode->GetTitle().'</h3>');
+			$oPage->AddToMenu('<div>');
+			$oPage->AddToMenu('<ul>');
+			$aChildren = self::GetChildren($aMenu['index']);
+			$bActive = self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
+			$oPage->AddToMenu('</ul>');
+			if ($bActive)
+			{
+				$iActiveAccordion = $iAccordion;
+			}
+			$oPage->AddToMenu('</div>');
+			$iAccordion++;
+		}
+
+		$oPage->add_ready_script(
+<<<EOF
+	// Accordion Menu
+	$("#accordion").css({display:'block'}).accordion({ header: "h3", heightStyle: "content", collapsible: true,  active: $iActiveAccordion, icons: false, animate: true }); // collapsible will be enabled once the item will be selected
+EOF
+		);
+	}
+
 	/**
 	 * Recursively check if the menu and at least one of his sub-menu is enabled
 	 * @param array $aMenu menu entry
@@ -387,6 +431,73 @@ class ApplicationMenu
 		return false;
 	}
 
+	/**
+	 * Handles the display of the sub-menus (called recursively if necessary)
+	 *
+	 * @param WebPage $oPage
+	 * @param array $aMenus
+	 * @param array $aExtraParams
+	 * @param int $iActiveMenu
+	 *
+	 * @return bool True if the currently selected menu is one of the submenus
+	 * @throws DictExceptionMissingString
+	 * @throws \Exception
+	 * @deprecated Will be removed in 3.0.0, use static::GetSubMenuNodes() instead
+	 */
+	protected static function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use static::GetSubMenuNodes() instead');
+		// Sort the menu based on the rank
+		$bActive = false;
+		usort($aMenus, array('ApplicationMenu', 'CompareOnRank'));
+		foreach ($aMenus as $aMenu) {
+			if (!self::CanDisplayMenu($aMenu)) {
+				continue;
+			}
+			$index = $aMenu['index'];
+			$oMenu = self::GetMenuNode($index);
+			if ($oMenu->IsEnabled())
+			{
+				$aChildren = self::GetChildren($index);
+				$aCSSClasses = array('navigation-menu-item');
+				if (count($aChildren) > 0)
+				{
+					$aCSSClasses[] = 'submenu';
+				}
+				$sHyperlink = $oMenu->GetHyperlink($aExtraParams);
+				$sItemHtml = '<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" class="'.implode(' ', $aCSSClasses).'" data-menu-id="'.$oMenu->GetMenuID().'">';
+				if ($sHyperlink != '')
+				{
+					$sLinkTarget = '';
+					if ($oMenu->IsHyperLinkInNewWindow())
+					{
+						$sLinkTarget .= ' target="_blank"';
+					}
+					$sURL = '"'.$oMenu->GetHyperlink($aExtraParams).'"'.$sLinkTarget;
+					$sTitle = utils::HtmlEntities($oMenu->GetTitle());
+					$sItemHtml .= "<a href={$sURL}>{$sTitle}</a>";
+				}
+				else
+				{
+					$sItemHtml .= $oMenu->GetTitle();
+				}
+				$sItemHtml .= '</li>';
+				$oPage->AddToMenu($sItemHtml);
+				if ($iActiveMenu == $index)
+				{
+					$bActive = true;
+				}
+				if (count($aChildren) > 0)
+				{
+					$oPage->AddToMenu('<ul>');
+					$bActive |= self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
+					$oPage->AddToMenu('</ul>');
+				}
+			}
+		}
+		return $bActive;
+	}
+
 	/**
 	 * Helper function to sort the menus based on their rank
 	 * @param array $a

application/utils.inc.php

@@ -2424,6 +2424,19 @@ SQL;
 		return $bRet;
 	}
 
+	/**
+	 * @param $sPath
+	 *
+	 * @return false|\ormDocument
+	 * @throws \Exception
+	 *
+	 * @deprecated 3.2.1 use utils::GetDocumentFromSelfURL instead
+	 */
+	public static function IsSelfURL($sPath)
+	{
+		return self::GetDocumentFromSelfURL($sPath);
+	}
+
 	/**
 	 * Check if the given URL is a link to download a document/image on the CURRENT iTop
 	 * In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument

application/wizardhelper.class.inc.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   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.
@@ -31,7 +31,7 @@ require_once(APPROOT.'/application/uiwizard.class.inc.php');
 class WizardHelper
 {
 	protected $m_aData;
-
+	
 	public function __construct()
 	{
 	}
@@ -39,7 +39,7 @@ class WizardHelper
 	 * Constructs the PHP target object from the parameters sent to the web page by the wizard
 	 * @param boolean $bReadUploadedFiles True to also read any uploaded file (for blob/document fields)
 	 * @return object
-	 */
+	 */	 	 	 	
 	public function GetTargetObject($bReadUploadedFiles = false)
 	{
 		if (isset($this->m_aData['m_oCurrentValues']['id']))
@@ -207,7 +207,7 @@ class WizardHelper
 				else
 				{
 					$oObj->Set($sAttCode, $value);
-				}
+				}	
 			}
 		}
 		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
@@ -217,12 +217,12 @@ class WizardHelper
 		$oObj->DoComputeValues();
 		return $oObj;
 	}
-
+	
 	public function GetFieldsForDefaultValue()
 	{
 		return $this->m_aData['m_aDefaultValueRequested'];
 	}
-
+	
 	public function SetDefaultValue($sAttCode, $value)
 	{
 		// Protect against a request for a non existing field
@@ -247,7 +247,7 @@ class WizardHelper
 					$aData[] = $aRow;
 				}
 				$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
-
+				
 			}
 			else
 			{
@@ -256,12 +256,12 @@ class WizardHelper
 			}
 		}
 	}
-
+	
 	public function GetFieldsForAllowedValues()
 	{
 		return $this->m_aData['m_aAllowedValuesRequested'];
 	}
-
+	
 	public function SetAllowedValuesHtml($sAttCode, $sHtml)
 	{
 		// Protect against a request for a non existing field
@@ -270,12 +270,12 @@ class WizardHelper
 			$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
 		}
 	}
-
+	
 	public function ToJSON()
 	{
 		return json_encode($this->m_aData);
 	}
-
+	
 	static public function FromJSON($sJSON)
 	{
 		$oWizHelper = new WizardHelper();
@@ -283,7 +283,7 @@ class WizardHelper
 		$oWizHelper->m_aData = $aData;
 		return $oWizHelper;
 	}
-
+	
 	protected function GetLinkedWizardStructure($oAttDef)
 	{
 		$oWizard = new UIWizard(null, $oAttDef->GetLinkedClass());
@@ -310,7 +310,7 @@ class WizardHelper
 		}
 		return $aFields;
 	}
-
+	
 	public function GetTargetClass()
 	{
 		return $this->m_aData['m_sClass'];
@@ -330,7 +330,7 @@ class WizardHelper
     {
         return isset($this->m_aData['m_sStimulus']) ? $this->m_aData['m_sStimulus'] : null;
     }
-
+	
 	public function GetIdForField($sFieldName)
 	{
 		$sResult = '';
@@ -375,4 +375,31 @@ JS
 		);
 
 	}
+
+	/*
+	 * Function with an old pattern of code
+	 * @deprecated 3.1.0
+	*/
+	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
+	{
+		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
+		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
+		foreach ($aSet as $aLinkObj) {
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach ($aLinkObj as $sAttCode => $value) {
+				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
+				if (($oAttDef->IsExternalKey()) && ($value != '') && ($value > 0))
+				{
+					// For external keys: load the target object so that external fields
+					// get filled too
+					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value);
+					$oLink->Set($sAttCode, $oTargetObj);
+				}
+				$oLink->Set($sAttCode, $value);
+			}
+			$oLink->Set($sExtKeyToMe, $oMe->GetKey());
+			$oSet->AddObject($oLink);
+		}
+		return $oSet;
+	}
 }

composer.json

@@ -15,35 +15,32 @@
     "apereo/phpcas": "~1.6.0",
     "firebase/php-jwt": "^6.4.0",
     "guzzlehttp/guzzle": "^7.5.1",
+    "laminas/laminas-mail": "^2.11",
+    "laminas/laminas-servicemanager": "^3.5",
     "league/oauth2-google": "^4.0.1",
-    "nikic/php-parser": "dev-master",
+    "nikic/php-parser": "~5.6.0",
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "^7.2.0",
     "psr/log": "^3.0.0",
     "scssphp/scssphp": "^1.12.1",
-    "soundasleep/html2text": "~2.1",
     "symfony/console": "~6.4.0",
     "symfony/dotenv": "~6.4.0",
     "symfony/framework-bundle": "~6.4.0",
     "symfony/http-foundation": "~6.4.0",
     "symfony/http-kernel": "~6.4.0",
-    "symfony/mailer": "^6.4",
     "symfony/runtime": "~6.4.0",
     "symfony/twig-bundle": "~6.4.0",
     "symfony/var-dumper": "~6.4.0",
     "symfony/yaml": "~6.4.0",
     "tecnickcom/tcpdf": "^6.6.0",
-    "thenetworg/oauth2-azure": "^2.0"
+    "thenetworg/oauth2-azure": "^2.0",
+    "soundasleep/html2text": "~2.1"
   },
   "require-dev": {
     "symfony/debug-bundle": "~6.4.0",
     "symfony/stopwatch": "~6.4.0",
     "symfony/web-profiler-bundle": "~6.4.0"
   },
-  "repositories": [{
-    "type": "vcs",
-    "url": "https://github.com/Combodo/PHP-Parser"
-  }],
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
     "ext-openssl": "Can be used as a polyfill if libsodium is not installed",

core/bulkexport.class.inc.php

@@ -30,7 +30,7 @@ class BulkExportException extends Exception
 		parent::__construct($message, $code, $previous);
 		$this->sLocalizedMessage = $sLocalizedMessage;
 	}
-
+	
 	public function GetLocalizedMessage()
 	{
 		return $this->sLocalizedMessage;
@@ -42,7 +42,7 @@ class BulkExportMissingParameterException extends BulkExportException
 	{
 		parent::__construct('Missing parameter: '.$sFieldCode, Dict::Format('Core:BulkExport:MissingParameter_Param', $sFieldCode));
 	}
-
+		
 }
 
 /**
@@ -146,7 +146,7 @@ abstract class BulkExport
 	protected $oBulkExportResult;
 	protected $sTmpFile;
 	protected $bLocalizeOutput;
-
+	
 	public function __construct()
 	{
 		$this->oSearch = null;
@@ -247,7 +247,7 @@ abstract class BulkExport
 			fclose($hFile);
 		}
 	}
-
+	
 	public function GetTmpFilePath()
 	{
 		return $this->sTmpFile;
@@ -289,7 +289,7 @@ abstract class BulkExport
     {
         $this->bLocalizeOutput = $bLocalizeOutput;
     }
-
+	
 	/**
 	 * (non-PHPdoc)
 	 * @see iBulkExport::SetObjectList()
@@ -299,12 +299,12 @@ abstract class BulkExport
 		$oSearch->SetShowObsoleteData($this->aStatusInfo['show_obsolete_data']);
 		$this->oSearch = $oSearch;
 	}
-
+	
 	public function SetFormat($sFormatCode)
 	{
-		$this->sFormatCode = $sFormatCode;
+		$this->sFormatCode = $sFormatCode;	
 	}
-
+	
 	/**
 	 * (non-PHPdoc)
 	 * @see iBulkExport::IsFormatSupported()
@@ -322,7 +322,7 @@ abstract class BulkExport
 	{
 		return array(); // return array('csv' => Dict::S('UI:ExportFormatCSV'));
 	}
-
+	
 
 	public function SetHttpHeaders(WebPage $oPage)
 	{
@@ -344,7 +344,7 @@ abstract class BulkExport
 	{
 		return '';
 	}
-
+	
 	public function SaveState()
 	{
 		if ($this->oBulkExportResult === null)
@@ -362,7 +362,7 @@ abstract class BulkExport
 		utils::PopArchiveMode();
 		return $ret;
 	}
-
+	
 	public function Cleanup()
 	{
 		if (($this->oBulkExportResult &&  (!$this->oBulkExportResult->IsNew())))
@@ -383,6 +383,16 @@ abstract class BulkExport
 		return array();
 	}
 
+	/**
+	 * @deprecated 3.0.0 use GetFormPart instead
+	 */
+	public function DisplayFormPart(WebPage $oP, $sPartId)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetFormPart instead');
+		$oP->AddSubBlock($this->GetFormPart($oP, $sPartId));
+	}
+
+
 	/**
 	 * @param WebPage $oP
 	 * @param $sPartId
@@ -402,14 +412,14 @@ abstract class BulkExport
 	{
 		$this->bLocalizeOutput = !((bool)utils::ReadParam('no_localize', 0, true, 'integer'));
 	}
-
+	
 	public function GetResultAsHtml()
 	{
-
+		
 	}
 	public function GetRawResult()
 	{
-
+		
 	}
 
 	/**
@@ -431,17 +441,17 @@ abstract class BulkExport
 	{
 		return 'UTF-8';
 	}
-
+	
 	public function GetStatistics()
 	{
-
+		
 	}
 
 	public function SetFields($sFields)
 	{
 
 	}
-
+	
 	public function GetDownloadFileName()
 	{
 		return Dict::Format('Core:BulkExportOf_Class', MetaModel::GetName($this->oSearch->GetClass())).'.'.$this->GetFileExtension();
@@ -451,7 +461,7 @@ abstract class BulkExport
 	{
 		$this->aStatusInfo = $aStatusInfo;
 	}
-
+	
 	public function GetStatusInfo()
 	{
 		return $this->aStatusInfo;
@@ -483,7 +493,7 @@ abstract class BulkExport
 			$hFile = @fopen($sFileName, 'x');
 		}
 		while($hFile === false);
-
+	
 		fclose($hFile);
 		return $sFileName;
 	}

core/cmdbsource.class.inc.php

@@ -42,6 +42,11 @@ class CMDBSource
 	const ENUM_DB_VENDOR_MARIADB = 'MariaDB';
 	const ENUM_DB_VENDOR_PERCONA = 'Percona';
 
+	/**
+	 * @since 2.7.10 3.0.4 3.1.2 3.0.2 N°6889 constant creation
+	 * @internal will be removed in a future version
+	 */
+	const MYSQL_DEFAULT_PORT = 3306;
 
 	/**
 	 * Error: 1205 SQLSTATE: HY000 (ER_LOCK_WAIT_TIMEOUT)
@@ -215,29 +220,33 @@ class CMDBSource
 	 * @param string $sServer server variable to update
 	 * @param int|null $iPort port variable to update, will return null if nothing is specified in $sDbHost
 	 *
-	 * @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost.
+	 * @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost. Use {@see MYSQL_DEFAULT_PORT} if needed
 	 *
 	 * @link http://php.net/manual/en/mysqli.persistconns.php documentation for the "p:" prefix (persistent connexion)
 	 */
 	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
 	{
-		if ($sDbHost != null) {
-			$aConnectInfo = explode(':', $sDbHost);
+		$aConnectInfo = explode(':', $sDbHost);
 
-			$bUsePersistentConnection = false;
-			if (strcasecmp($aConnectInfo[0], 'p') === 0) {
-				$bUsePersistentConnection = true;
-				$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
-			} else {
-				$sServer = $aConnectInfo[0];
-			}
+		$bUsePersistentConnection = false;
+		if (strcasecmp($aConnectInfo[0], 'p') === 0)
+		{
+			$bUsePersistentConnection = true;
+			$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
+		}
+		else
+		{
+			$sServer = $aConnectInfo[0];
+		}
 
-			$iConnectInfoCount = count($aConnectInfo);
-			if ($bUsePersistentConnection && ($iConnectInfoCount == 3)) {
-				$iPort = (int)($aConnectInfo[2]);
-			} else if (!$bUsePersistentConnection && ($iConnectInfoCount == 2)) {
-				$iPort = (int)($aConnectInfo[1]);
-			}
+		$iConnectInfoCount = count($aConnectInfo);
+		if ($bUsePersistentConnection && ($iConnectInfoCount == 3))
+		{
+			$iPort = (int)($aConnectInfo[2]);
+		}
+		else if (!$bUsePersistentConnection && ($iConnectInfoCount == 2))
+		{
+			$iPort = (int)($aConnectInfo[1]);
 		}
 	}
 
@@ -358,6 +367,15 @@ class CMDBSource
 		return static::QueryToScalar('SELECT VERSION()', 0);
 	}
 
+	/**
+	 * @deprecated Use `CMDBSource::GetDBVersion` instead.
+	 * @uses mysqli_get_server_info
+	 */
+	public static function GetServerInfo()
+	{
+		return mysqli_get_server_info(DbConnectionWrapper::GetDbConnection());
+	}
+
 	/**
 	 * Get the DB vendor between MySQL and its main forks
 	 * @return string

core/config.class.inc.php

@@ -2021,7 +2021,10 @@ class Config
 			$bLoadConfig = false;
 		}
 
-		$this->m_aAddons = [];
+		$this->m_aAddons = array(
+			// Default AddOn, always present can be moved to an official iTop Module later if needed
+			'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
+		);
 
 		foreach ($this->m_aSettings as $sPropCode => $aSettingInfo)
 		{
@@ -2149,13 +2152,19 @@ class Config
 				array('file' => $sConfigFile, 'expected' => '$MySettings'));
 		}
 
-		if (!array_key_exists('addons', $MyModules) || !array_key_exists('user rights', $MyModules['addons']))
+		if (!array_key_exists('addons', $MyModules))
+		{
+			throw new ConfigException('Missing item in configuration file',
+				array('file' => $sConfigFile, 'expected' => '$MyModules[\'addons\']'));
+		}
+		if (!array_key_exists('user rights', $MyModules['addons']))
 		{
 			// Add one, by default
-			$MyModules['addons']['user rights'] = 'addons/userrights/userrightsprofile.class.inc.php';
-			$this->m_aAddons = $MyModules['addons'];
+			$MyModules['addons']['user rights'] = '/addons/userrights/userrightsnull.class.inc.php';
 		}
 
+		$this->m_aAddons = $MyModules['addons'];
+
 		foreach ($MySettings as $sPropCode => $rawvalue)
 		{
 			if ($this->IsProperty($sPropCode))
@@ -2259,21 +2268,11 @@ class Config
 		$this->m_aModuleSettings[$sModule][$sProperty] = $value;
 	}
 
-	/**
-	 * @deprecated 3.3.0 N°8190
-	 */
 	public function GetAddons()
 	{
-		if (array_key_exists("user rights", $this->m_aAddons))		{
-			return $this->m_aAddons;
-		} else {
-			return array_merge($this->m_aAddons,['user rights' => 'addons/userrights/userrightsprofile.class.inc.php']);
-		}
+		return $this->m_aAddons;
 	}
 
-	/**
-	 * @deprecated 3.3.0 N°8190
-	 */
 	public function SetAddons($aAddons)
 	{
 		$this->m_aAddons = $aAddons;
@@ -2707,6 +2706,15 @@ class Config
 			{
 				fwrite($hFile, "\t'addons' => {$aParserValue['value']},\n");
 			}
+			else
+			{
+				fwrite($hFile, "\t'addons' => array (\n");
+				foreach ($this->m_aAddons as $sKey => $sFile)
+				{
+					fwrite($hFile, "\t\t'$sKey' => '$sFile',\n");
+				}
+				fwrite($hFile, "\t),\n");
+			}
 			fwrite($hFile, ");\n");
 			fwrite($hFile, '?'.'>'); // Avoid perturbing the syntax highlighting !
 
@@ -2852,8 +2860,20 @@ class Config
 						}
 					}
 				}
-
-				RunTimeEnvironment::CallInstallerHandler($aModuleInfo, "BeforeWritingConfig", [$this]);
+				if (isset($aModuleInfo['installer']))
+				{
+					$sModuleInstallerClass = $aModuleInfo['installer'];
+					if (!class_exists($sModuleInstallerClass))
+					{
+						throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not a PHP class - Module: ".$aModuleInfo['label']);
+					}
+					if (!is_subclass_of($sModuleInstallerClass, 'ModuleInstallerAPI'))
+					{
+						throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not derived from 'ModuleInstallerAPI' - Module: ".$aModuleInfo['label']);
+					}
+					$aCallSpec = array($sModuleInstallerClass, 'BeforeWritingConfig');
+					call_user_func_array($aCallSpec, array($this));
+				}
 			}
 		}
 		$this->SetAddOns($aAddOns);

core/dbobject.class.php

@@ -62,7 +62,7 @@ require_once('mutex.class.inc.php');
 
 
 /**
- * A persistent object, as defined by the metamodel
+ * A persistent object, as defined by the metamodel 
  *
  * @package     iTopORM
  * @api
@@ -314,9 +314,9 @@ abstract class DBObject implements iDisplay
 
     /**
      * Whether the object is already persisted in DB or not.
-     *
+     * 
      * @api
-     *
+     * 
      * @return bool
      */
 	public function IsNew()
@@ -326,9 +326,9 @@ abstract class DBObject implements iDisplay
 
     /**
      * Returns an Id for memory objects
-     *
+     * 
      * @internal
-     *
+     * 
      * @param string $sClass
      *
      * @return int
@@ -365,7 +365,7 @@ abstract class DBObject implements iDisplay
         $sRet .= "<b title=\"$sRootClass\">$sClass</b>::$iPKey ($sFriendlyname)<br/>\n";
         return $sRet;
 	}
-
+	
     /**
      * Alias of DBObject::Reload()
      *
@@ -388,7 +388,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see m_bFullyLoaded
-     *
+     * 
      * @return bool
      * @throws CoreException
      */
@@ -411,9 +411,11 @@ abstract class DBObject implements iDisplay
      * This is mostly used after a lazy load (automatically performed by the framework)
      * This will erase any pending changes.
      *
+	 * @param bool $bAllowAllData @deprecated This parameter is ignored!!
+	 *
 	 * @throws CoreException
 	 */
-	public function Reload()
+	public function Reload($bAllowAllData = false)
 	{
 		assert($this->m_bIsInDB);
 		$this->FireEvent(EVENT_DB_OBJECT_RELOAD);
@@ -509,7 +511,7 @@ abstract class DBObject implements iDisplay
 		{
 			$aAttList = $aAttToLoad[$sClassAlias];
 		}
-
+		
 		foreach($aAttList as $sAttCode=>$oAttDef)
 		{
 			// Skip links (could not be loaded by the mean of this query)
@@ -569,7 +571,7 @@ abstract class DBObject implements iDisplay
 				$bFullyLoaded = false;
 			}
 		}
-
+		
 		// Load extended data
 		if ($aExtendedDataSpec != null)
 		{
@@ -593,7 +595,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see Set()
-     *
+     * 
      * @param string $sAttCode
      * @param mixed $value
      */
@@ -848,11 +850,11 @@ abstract class DBObject implements iDisplay
 
 	/**
      * Get the label of an attribute.
-     *
+     * 
      * Shortcut to the field's AttributeDefinition->GetLabel()
      *
      * @api
-     *
+     * 
      * @param string $sAttCode
      *
      * @return string
@@ -925,7 +927,7 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      * @see Get
-     *
+     * 
      * @param string $sAttCode
      *
      * @return int|mixed|null
@@ -1030,7 +1032,7 @@ abstract class DBObject implements iDisplay
      * Returns the default value of the $sAttCode.
      *
      * Returns the default value of the given attribute.
-     *
+     * 
      * @internal
      *
      * @param string $sAttCode
@@ -1051,12 +1053,12 @@ abstract class DBObject implements iDisplay
      * @internal
      *
      * @return array|null
-	 */
+	 */	 
 	public function GetExtendedData()
 	{
 		return $this->m_aExtendedData;
 	}
-
+	
 	/**
      * Set the HighlightCode
      *
@@ -1078,7 +1080,7 @@ abstract class DBObject implements iDisplay
 		{
 			$fCurrentRank = $aHighlightScale[$this->m_sHighlightCode]['rank'];
 		}
-
+				
 		if (array_key_exists($sCode, $aHighlightScale))
 		{
 			$fRank = $aHighlightScale[$sCode]['rank'];
@@ -1088,13 +1090,13 @@ abstract class DBObject implements iDisplay
 			}
 		}
 	}
-
+	
 	/**
 	 * Get the current HighlightCode
-     *
+     * 
      * @internal
      * @used-by DBObject::ComputeHighlightCode()
-     *
+     * 
 	 * @return string|null The Hightlight code (null if none set, meaning rank = 0)
 	 */
 	protected function GetHighlightCode()
@@ -1143,7 +1145,7 @@ abstract class DBObject implements iDisplay
      * corresponding to the external key and getting the value from it
      *
      * UNUSED ?
-     *
+     * 
      * @internal
      * @todo: check if this is dead code.
      *
@@ -1214,7 +1216,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * @api
-     *
+     * 
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1260,11 +1262,11 @@ abstract class DBObject implements iDisplay
 
     /**
      * Get the value as it must be in the edit areas (forms)
-     *
+     * 
      * Makes a raw text representation of the value.
      *
      * @internal
-     *
+     * 
      * @param string $sAttCode
      *
      * @return int|mixed|string
@@ -1294,7 +1296,7 @@ abstract class DBObject implements iDisplay
 				else
 				{
 					$sEditValue = 0;
-				}
+				}					
 			}
 			else
 			{
@@ -1310,14 +1312,14 @@ abstract class DBObject implements iDisplay
 
     /**
      * Get $sAttCode formatted as XML
-     *
+     * 
      * The returned value is a text that is suitable for insertion into an XML node.
      * Depending on the type of attribute, the returned text is either:
      *   * A literal, with XML entities already escaped,
      *   * XML
      *
      * @api
-     *
+     * 
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1355,10 +1357,10 @@ abstract class DBObject implements iDisplay
 	}
 
     /**
-     *
+     * 
      * @see GetAsHTML()
      * @see GetOriginal()
-     *
+     * 
      * @param string $sAttCode
      * @param bool   $bLocalize
      *
@@ -1533,7 +1535,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * @internal
-     *
+     * 
      * @param string $sClass
      *
      * @return mixed
@@ -1588,7 +1590,7 @@ abstract class DBObject implements iDisplay
      * Get the id
      *
      * @api
-     *
+     * 
      * @return string|null
      */
 	public function GetKey()
@@ -1599,7 +1601,7 @@ abstract class DBObject implements iDisplay
     /**
      * Primary key Setter
      * Usable only for not yet persisted DBObjects
-     *
+     * 
      * @internal
      *
      * @param int $iNewKey the desired identifier
@@ -1612,7 +1614,7 @@ abstract class DBObject implements iDisplay
 		{
 			throw new CoreException("An object id must be an integer value ($iNewKey)");
 		}
-
+		
 		if ($this->m_bIsInDB && !empty($this->m_iKey) && ($this->m_iKey != $iNewKey))
 		{
 			throw new CoreException("Changing the key ({$this->m_iKey} to $iNewKey) on an object (class {".get_class($this).") wich already exists in the Database");
@@ -1622,7 +1624,7 @@ abstract class DBObject implements iDisplay
 
     /**
      * Get the icon representing this object
-     *
+     * 
      * @api
      *
      * @param boolean $bImgTag If true the result is a full IMG tag (or an empty string if no icon is defined)
@@ -1712,7 +1714,7 @@ abstract class DBObject implements iDisplay
 	 *
 	 * Returns the label as defined in the dictionary for the language of the current user
      *
-     * @api
+     * @api 
      *
 	 * @return string (empty for default name scheme)
 	 */
@@ -1746,9 +1748,9 @@ abstract class DBObject implements iDisplay
 	 * @throws \CoreException
 	 * @since 3.0.0 N°4106 Method should not be overloaded anymore for performances reasons. It will be set final in 3.1.0 (N°4107)
 	 * @since 3.0.0 N°580 New $sType parameter
-	 * @since 3.3.0 N°4107 Should never be overriden
+	 *
 	 */
-	public final function GetName($sType = FriendlyNameType::SHORT)
+	public function GetName($sType = FriendlyNameType::SHORT)
 	{
 		return utils::EscapeHtml($this->GetRawName($sType));
 	}
@@ -1779,7 +1781,7 @@ abstract class DBObject implements iDisplay
 
 	/**
      * Helper to get the state
-     *
+     * 
      * @api
      *
 	 * @return mixed|string '' if no state attribute, object representing its value otherwise
@@ -1801,9 +1803,9 @@ abstract class DBObject implements iDisplay
     /**
      * Get the label (raw text) of the current state
      * helper for MetaModel::GetStateLabel()
-     *
+     * 
      * @api
-     *
+     * 
      * @return mixed|string
      *
      * @throws ArchivedObjectException
@@ -1850,7 +1852,7 @@ abstract class DBObject implements iDisplay
 	 * Define attributes read-only from the end-user perspective
 	 *
 	 * @return array|null List of attcodes
-	 */
+	 */	 	  	 	
 	public static function GetReadOnlyAttributes()
 	{
 		return null;
@@ -1859,14 +1861,14 @@ abstract class DBObject implements iDisplay
 
 	/**
 	 * Get predefined objects
-     *
+     * 
 	 * The predefined objects will be synchronized with the DB at each install/upgrade
      * As soon as a class has predefined objects, then nobody can create nor delete objects
      *
      * @internal
      *
 	 * @return array An array of id => array of attcode => php value(so-called "real value": integer, string, ormDocument, DBObjectSet, etc.)
-	 */
+	 */	 	  	 	
 	public static function GetPredefinedObjects()
 	{
 		return null;
@@ -1995,7 +1997,7 @@ abstract class DBObject implements iDisplay
      * Note: Attributes (and flags) from the target state and the transition are combined.
      *
      * @internal
-     *
+     * 
      * @param string $sStimulus
      * @param string $sOriginState Default is current state
      *
@@ -2195,7 +2197,7 @@ abstract class DBObject implements iDisplay
 
 	/**
      * @internal
-     *
+     * 
 	 * @throws \CoreException
 	 * @throws \OQLException
      *
@@ -4927,7 +4929,7 @@ abstract class DBObject implements iDisplay
 	{
 		if (is_null($sWorkingTimeComputer))
 		{
-			$sWorkingTimeComputer = MetaModel::GetWorkingTime(get_class($this));
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
 		}
 		$oComputer = new $sWorkingTimeComputer();
 		$aCallSpec = array($oComputer, 'GetOpenDuration');
@@ -5321,7 +5323,7 @@ abstract class DBObject implements iDisplay
 				// Keep track of link changes
 				//
 				if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_DETAILS) == 0) continue;
-
+				
 				$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
 				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksTune');
 				if ($oMyChangeOp)
@@ -5518,6 +5520,27 @@ abstract class DBObject implements iDisplay
 		set_time_limit(intval($iPreviousTimeLimit));
 	}
 
+	/**
+	 * Caching relying on an object set is not efficient since 2.0.3
+	 * Use GetSynchroData instead
+	 *
+	 * Get all the synchro replica related to this object
+     *
+     * @internal
+     * @deprecated
+	 *
+	 * @return DBObjectSet Set with two columns: R=SynchroReplica S=SynchroDataSource
+	 * @throws \OQLException
+	 */
+	public function GetMasterReplica()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
+		$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
+		$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
+
+		return $oReplicaSet;
+	}
+
 	/**
 	 * Get all the synchro data related to this object
      *

core/dbsearch.class.php

@@ -236,6 +236,78 @@ abstract class DBSearch
 	 */
 	abstract public function IsAny();
 
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function Describe()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditionPointTo($sExtKeyAttCode, $aPointingTo)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditionRefBy($sForeignClass, $sForeignExtKeyAttCode)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditionRelTo($aRelInfo)
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function DescribeConditions()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
+	/**
+	 * @internal
+	 * @deprecated use ToOQL() instead
+	 * @return string
+	 */
+	public function __DescribeHTML()
+	{
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
+
+		return 'deprecated - use ToOQL() instead';
+	}
+
 	/**
 	 * @internal
 	 * @return mixed
@@ -1644,6 +1716,16 @@ abstract class DBSearch
 		return $this->ToOQL(true);
 	}
 
+	/**
+	 * @return array{\VariableExpression}
+	 *
+	 * @deprecated use DBSearch::GetExpectedArguments() instead
+	 */
+	public function ListParameters(): array
+	{
+		return $this->GetExpectedArguments();
+	}
+
 	/**
 	 * Get parameters from the condition expression(s)
 	 *

core/email.class.inc.php

@@ -114,6 +114,9 @@ class EMail implements iEMail
 	 * @param string $sSerializedMessage The serialized representation of the message
 	 *
 	 * @return \Email
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \Symfony\Component\CssSelector\Exception\SyntaxErrorException
 	 */
 	public static function UnSerializeV2($sSerializedMessage)
 	{

core/inlineimage.class.inc.php

@@ -110,7 +110,7 @@ class InlineImage extends DBObject
 		$aCallSpec = array($sClass, 'MapContextParam');
 		if (is_callable($aCallSpec))
 		{
-			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter					
 			if (MetaModel::IsValidAttCode($sClass, $sAttCode))
 			{
 				$iOrgId = $oItem->Get($sAttCode);
@@ -146,7 +146,7 @@ class InlineImage extends DBObject
 		$aCallSpec = array($sClass, 'MapContextParam');
 		if (is_callable($aCallSpec))
 		{
-			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter					
 			if (MetaModel::IsValidAttCode($sClass, $sAttCode))
 			{
 				// Second: check that the organization CAN be fetched from the current user
@@ -156,7 +156,7 @@ class InlineImage extends DBObject
 					$aCallSpec = array($sClass, 'MapContextParam');
 					if (is_callable($aCallSpec))
 					{
-						$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+						$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter					
 						if (MetaModel::IsValidAttCode($sClass, $sAttCode))
 						{
 							// OK - try it
@@ -192,7 +192,7 @@ class InlineImage extends DBObject
 		if (!is_null($iTransactionId))
 		{
 			// Attach new (temporary) inline images
-
+			
 			$sTempId = utils::GetUploadTempId($iTransactionId);
 			// The object is being created from a form, check if there are pending inline images for this object
 			$sOQL = 'SELECT InlineImage WHERE temp_id = :temp_id';
@@ -366,10 +366,10 @@ CombodoInlineImage.FixImagesWidth();
 JS
 			;
 		}
-
+		
 		return $sJS;
 	}
-
+	
 	/**
 	 * Check if an the given mimeType is an image that can be processed by the system
 	 *
@@ -382,7 +382,7 @@ JS
 	public static function IsImage($sMimeType)
 	{
 		if (!function_exists('gd_info')) return false; // no image processing capability on this system
-
+	
 		$bRet = false;
 		$aInfo = gd_info(); // What are the capabilities
 		switch($sMimeType)
@@ -390,19 +390,19 @@ JS
 			case 'image/gif':
 				return $aInfo['GIF Read Support'];
 				break;
-
+					
 			case 'image/jpeg':
 				return $aInfo['JPEG Support'];
 				break;
-
+					
 			case 'image/png':
 				return $aInfo['PNG Support'];
 				break;
-
+	
 		}
 		return $bRet;
 	}
-
+	
 	/**
 	 * Resize an image so that it fits the maximum width/height defined in the config file
 	 * @param ormDocument $oImage The original image stored as an array (content / mimetype / filename)
@@ -444,7 +444,7 @@ JS
 		}
 		return $sRet;
 	}
-
+	
 	/**
 	 * Get the fragment of javascript needed to complete the initialization of
 	 * CKEditor when creating/modifying an object