Exclude combodo-db-tools module from packages by default

.doc/README.md

@@ -1,103 +0,0 @@
-# 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 with `ClassName::` 
-   * for methods always suffix them with `()`, 
-   * do not reference variables since they are not documented. If you have to, always prefix them with `$`
- 
-examples: 
-```
-/** 
- * @see DBObject
- * @see DBObject::Get()
- * @see DBObject::$foo
- */
-```   
-
-#### Do not use inline tags, they do not work properly, example: 
-```
-/** 
- * This is a texts with an inline tag {@see [FQSEN] [<description>]} it must never be used 
- */
-```
-   
-#### The `@example` tag must respect this very precise syntax 
- * the sentence in the first line (next to the tag) is the title, it  must be enclosed by double quotes 
- * the following lines are the sample code. 
- * 💔 since we simply hack the official tag, this syntax must be respected carefully 💔
-example: 
-```
-/** 
-* @example "This is the title of the multiline example"
-* $foo = DBObject::Get('foo');
-* DBObject::Set('foo', ++$foo);
-*/
-```  
-    
-## How content is included into the documentation
-
-**For a class** those requirements have to be respected: 
- - the file containing the class must be listed in `/phpdoc/files/file[]` of  `.doc/phpdoc-objects-manipulation.dist.xml`
- - the class **must not** have the tag `@internal`
- - the class **must** have at least one of: `@api`, `@api-advanced`, `@overwritable-hook`, `@extension-hook` 
-
-Then, **for a method** of an eligible class: 
- - **public** methods **must** have at least one of: `@api`, `@api-advanced`, `@overwritable-hook`, `@extension-hook` 
- - **protected** methods **must** have at least one of: `@overwritable-hook`, `@extension-hook` 
- - **private** methods are **always excluded** 
-
-**Class properties** and **constants** are never documented (this is subject to change).
-
-
-
-
-## A note about the rendering engine
-  
-:notebook: as spaces are used to mark code, the templates (`.doc/phpdoc-templates/combodo-wiki/*`) have very few indentation, thus they are awful to read (sorry).
-
-
-
-
-## Installation
-```
-cd .doc
-composer require phpdocumentor/phpdocumentor:~2 --dev
-```
-
-## Generation
-`./bin/build-doc-object-manipulation` and `./bin/build-doc-extensions` contains examples of doc. generation, beware: they have to be called from the .doc directory:
-```shell
-cd /path/to/itop/.doc
-./bin/build-doc-object-manipulation
-``` 
-
-the resulting documentation is written into `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

@@ -1,6 +0,0 @@
-#!/bin/sh -x
-
-rm -rf /tmp/phpdoc-twig-cache/ &&  rm -rf data/phpdocumentor/output/extensions/ &&  rm -rf data/phpdocumentor/temp/extensions/ && .doc/vendor/bin/phpdoc -c .doc/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

@@ -1,7 +0,0 @@
-#!/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

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

.doc/phpdoc-extensions.dist.xml

@@ -1,20 +0,0 @@
-<?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

@@ -1,58 +0,0 @@
-<?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

@@ -1,136 +0,0 @@
-{% 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

@@ -1,31 +0,0 @@
-{% 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

@@ -1,95 +0,0 @@
-{% 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

@@ -1,49 +0,0 @@
-{% 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

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

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

@@ -1,122 +0,0 @@
-{% 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

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

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

@@ -1,5 +0,0 @@
-# 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

@@ -1,34 +0,0 @@
-{% 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

@@ -1,12 +0,0 @@
-{% 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

@@ -1,26 +0,0 @@
-{% 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

@@ -1,26 +0,0 @@
-{% 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

@@ -1,56 +0,0 @@
-{% 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

@@ -1,20 +0,0 @@
-{% 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

@@ -1,22 +0,0 @@
-{% 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

@@ -1,24 +0,0 @@
-{% 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

@@ -1,24 +0,0 @@
-{% 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

@@ -1,11 +0,0 @@
-{% 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

@@ -1,121 +0,0 @@
-{% 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

@@ -1,5 +0,0 @@
-{% 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

@@ -1,51 +0,0 @@
-{% 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

@@ -1,49 +0,0 @@
-
-====== 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

@@ -1,27 +0,0 @@
-<?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>

.editorconfig

@@ -1,711 +0,0 @@
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = false
-max_line_length = 140
-tab_width = 4
-ij_continuation_indent_size = 8
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
-ij_smart_tabs = false
-ij_visual_guides = 80, 120, 140
-ij_wrap_on_typing = true
-
-[*.css]
-indent_style = tab
-ij_smart_tabs = true
-ij_css_align_closing_brace_with_properties = false
-ij_css_blank_lines_around_nested_selector = 1
-ij_css_blank_lines_between_blocks = 1
-ij_css_brace_placement = 0
-ij_css_hex_color_long_format = false
-ij_css_hex_color_lower_case = false
-ij_css_hex_color_short_format = false
-ij_css_hex_color_upper_case = false
-ij_css_keep_blank_lines_in_code = 2
-ij_css_keep_indents_on_empty_lines = false
-ij_css_keep_single_line_blocks = false
-ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_css_space_after_colon = true
-ij_css_space_before_opening_brace = true
-ij_css_value_alignment = 0
-
-[*.csv]
-max_line_length = 2147483647
-ij_wrap_on_typing = false
-ij_csv_wrap_long_lines = false
-
-[*.feature]
-indent_size = 2
-ij_gherkin_keep_indents_on_empty_lines = false
-
-[*.less]
-indent_size = 2
-ij_less_align_closing_brace_with_properties = false
-ij_less_blank_lines_around_nested_selector = 1
-ij_less_blank_lines_between_blocks = 1
-ij_less_brace_placement = 0
-ij_less_hex_color_long_format = false
-ij_less_hex_color_lower_case = false
-ij_less_hex_color_short_format = false
-ij_less_hex_color_upper_case = false
-ij_less_keep_blank_lines_in_code = 2
-ij_less_keep_indents_on_empty_lines = false
-ij_less_keep_single_line_blocks = false
-ij_less_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_less_space_after_colon = true
-ij_less_space_before_opening_brace = true
-ij_less_value_alignment = 0
-
-[*.sass]
-indent_size = 2
-ij_sass_align_closing_brace_with_properties = false
-ij_sass_blank_lines_around_nested_selector = 1
-ij_sass_blank_lines_between_blocks = 1
-ij_sass_brace_placement = 0
-ij_sass_hex_color_long_format = false
-ij_sass_hex_color_lower_case = false
-ij_sass_hex_color_short_format = false
-ij_sass_hex_color_upper_case = false
-ij_sass_keep_blank_lines_in_code = 2
-ij_sass_keep_indents_on_empty_lines = false
-ij_sass_keep_single_line_blocks = false
-ij_sass_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_sass_space_after_colon = true
-ij_sass_space_before_opening_brace = true
-ij_sass_value_alignment = 0
-
-[*.scss]
-indent_style = tab
-ij_scss_align_closing_brace_with_properties = false
-ij_scss_blank_lines_around_nested_selector = 1
-ij_scss_blank_lines_between_blocks = 1
-ij_scss_brace_placement = 0
-ij_scss_hex_color_long_format = false
-ij_scss_hex_color_lower_case = false
-ij_scss_hex_color_short_format = false
-ij_scss_hex_color_upper_case = false
-ij_scss_keep_blank_lines_in_code = 2
-ij_scss_keep_indents_on_empty_lines = false
-ij_scss_keep_single_line_blocks = false
-ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_scss_space_after_colon = true
-ij_scss_space_before_opening_brace = true
-ij_scss_value_alignment = 0
-
-[*.twig]
-indent_style = tab
-ij_smart_tabs = true
-ij_wrap_on_typing = false
-ij_twig_keep_indents_on_empty_lines = false
-ij_twig_spaces_inside_delimiters = true
-ij_twig_spaces_inside_variable_delimiters = true
-
-[.editorconfig]
-ij_editorconfig_align_group_field_declarations = false
-ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = true
-ij_editorconfig_space_before_colon = false
-ij_editorconfig_space_before_comma = false
-ij_editorconfig_spaces_around_assignment_operators = true
-
-[{*.cjs,*.js}]
-indent_style = tab
-ij_continuation_indent_size = 4
-ij_smart_tabs = true
-ij_javascript_align_imports = false
-ij_javascript_align_multiline_array_initializer_expression = false
-ij_javascript_align_multiline_binary_operation = false
-ij_javascript_align_multiline_chained_methods = false
-ij_javascript_align_multiline_extends_list = false
-ij_javascript_align_multiline_for = true
-ij_javascript_align_multiline_parameters = true
-ij_javascript_align_multiline_parameters_in_calls = false
-ij_javascript_align_multiline_ternary_operation = false
-ij_javascript_align_object_properties = 0
-ij_javascript_align_union_types = false
-ij_javascript_align_var_statements = 0
-ij_javascript_array_initializer_new_line_after_left_brace = false
-ij_javascript_array_initializer_right_brace_on_new_line = false
-ij_javascript_array_initializer_wrap = off
-ij_javascript_assignment_wrap = off
-ij_javascript_binary_operation_sign_on_next_line = false
-ij_javascript_binary_operation_wrap = off
-ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**/*
-ij_javascript_blank_lines_after_imports = 1
-ij_javascript_blank_lines_around_class = 1
-ij_javascript_blank_lines_around_field = 0
-ij_javascript_blank_lines_around_function = 1
-ij_javascript_blank_lines_around_method = 1
-ij_javascript_block_brace_style = next_line
-ij_javascript_call_parameters_new_line_after_left_paren = false
-ij_javascript_call_parameters_right_paren_on_new_line = false
-ij_javascript_call_parameters_wrap = off
-ij_javascript_catch_on_new_line = false
-ij_javascript_chained_call_dot_on_new_line = true
-ij_javascript_class_brace_style = end_of_line
-ij_javascript_comma_on_new_line = false
-ij_javascript_do_while_brace_force = never
-ij_javascript_else_on_new_line = true
-ij_javascript_enforce_trailing_comma = keep
-ij_javascript_extends_keyword_wrap = off
-ij_javascript_extends_list_wrap = off
-ij_javascript_field_prefix = _
-ij_javascript_file_name_style = relaxed
-ij_javascript_finally_on_new_line = false
-ij_javascript_for_brace_force = never
-ij_javascript_for_statement_new_line_after_left_paren = false
-ij_javascript_for_statement_right_paren_on_new_line = false
-ij_javascript_for_statement_wrap = off
-ij_javascript_force_quote_style = false
-ij_javascript_force_semicolon_style = false
-ij_javascript_function_expression_brace_style = end_of_line
-ij_javascript_if_brace_force = always
-ij_javascript_import_merge_members = global
-ij_javascript_import_prefer_absolute_path = global
-ij_javascript_import_sort_members = true
-ij_javascript_import_sort_module_name = false
-ij_javascript_import_use_node_resolution = true
-ij_javascript_imports_wrap = on_every_item
-ij_javascript_indent_case_from_switch = true
-ij_javascript_indent_chained_calls = true
-ij_javascript_indent_package_children = 0
-ij_javascript_jsx_attribute_value = braces
-ij_javascript_keep_blank_lines_in_code = 2
-ij_javascript_keep_first_column_comment = true
-ij_javascript_keep_indents_on_empty_lines = false
-ij_javascript_keep_line_breaks = true
-ij_javascript_keep_simple_blocks_in_one_line = false
-ij_javascript_keep_simple_methods_in_one_line = false
-ij_javascript_line_comment_add_space = true
-ij_javascript_line_comment_at_first_column = false
-ij_javascript_method_brace_style = end_of_line
-ij_javascript_method_call_chain_wrap = off
-ij_javascript_method_parameters_new_line_after_left_paren = false
-ij_javascript_method_parameters_right_paren_on_new_line = false
-ij_javascript_method_parameters_wrap = off
-ij_javascript_object_literal_wrap = on_every_item
-ij_javascript_parentheses_expression_new_line_after_left_paren = false
-ij_javascript_parentheses_expression_right_paren_on_new_line = false
-ij_javascript_place_assignment_sign_on_next_line = false
-ij_javascript_prefer_as_type_cast = false
-ij_javascript_prefer_parameters_wrap = false
-ij_javascript_reformat_c_style_comments = false
-ij_javascript_space_after_colon = true
-ij_javascript_space_after_comma = true
-ij_javascript_space_after_dots_in_rest_parameter = false
-ij_javascript_space_after_generator_mult = true
-ij_javascript_space_after_property_colon = true
-ij_javascript_space_after_quest = true
-ij_javascript_space_after_type_colon = true
-ij_javascript_space_after_unary_not = false
-ij_javascript_space_before_async_arrow_lparen = true
-ij_javascript_space_before_catch_keyword = true
-ij_javascript_space_before_catch_left_brace = true
-ij_javascript_space_before_catch_parentheses = true
-ij_javascript_space_before_class_lbrace = true
-ij_javascript_space_before_class_left_brace = true
-ij_javascript_space_before_colon = true
-ij_javascript_space_before_comma = false
-ij_javascript_space_before_do_left_brace = true
-ij_javascript_space_before_else_keyword = true
-ij_javascript_space_before_else_left_brace = true
-ij_javascript_space_before_finally_keyword = true
-ij_javascript_space_before_finally_left_brace = true
-ij_javascript_space_before_for_left_brace = true
-ij_javascript_space_before_for_parentheses = true
-ij_javascript_space_before_for_semicolon = false
-ij_javascript_space_before_function_left_parenth = true
-ij_javascript_space_before_generator_mult = false
-ij_javascript_space_before_if_left_brace = true
-ij_javascript_space_before_if_parentheses = true
-ij_javascript_space_before_method_call_parentheses = false
-ij_javascript_space_before_method_left_brace = true
-ij_javascript_space_before_method_parentheses = false
-ij_javascript_space_before_property_colon = false
-ij_javascript_space_before_quest = true
-ij_javascript_space_before_switch_left_brace = true
-ij_javascript_space_before_switch_parentheses = true
-ij_javascript_space_before_try_left_brace = true
-ij_javascript_space_before_type_colon = false
-ij_javascript_space_before_unary_not = false
-ij_javascript_space_before_while_keyword = true
-ij_javascript_space_before_while_left_brace = true
-ij_javascript_space_before_while_parentheses = true
-ij_javascript_spaces_around_additive_operators = false
-ij_javascript_spaces_around_arrow_function_operator = true
-ij_javascript_spaces_around_assignment_operators = true
-ij_javascript_spaces_around_bitwise_operators = true
-ij_javascript_spaces_around_equality_operators = true
-ij_javascript_spaces_around_logical_operators = true
-ij_javascript_spaces_around_multiplicative_operators = true
-ij_javascript_spaces_around_relational_operators = true
-ij_javascript_spaces_around_shift_operators = true
-ij_javascript_spaces_around_unary_operator = false
-ij_javascript_spaces_within_array_initializer_brackets = false
-ij_javascript_spaces_within_brackets = false
-ij_javascript_spaces_within_catch_parentheses = false
-ij_javascript_spaces_within_for_parentheses = false
-ij_javascript_spaces_within_if_parentheses = false
-ij_javascript_spaces_within_imports = false
-ij_javascript_spaces_within_interpolation_expressions = false
-ij_javascript_spaces_within_method_call_parentheses = false
-ij_javascript_spaces_within_method_parentheses = false
-ij_javascript_spaces_within_object_literal_braces = false
-ij_javascript_spaces_within_object_type_braces = true
-ij_javascript_spaces_within_parentheses = false
-ij_javascript_spaces_within_switch_parentheses = false
-ij_javascript_spaces_within_type_assertion = false
-ij_javascript_spaces_within_union_types = true
-ij_javascript_spaces_within_while_parentheses = false
-ij_javascript_special_else_if_treatment = true
-ij_javascript_ternary_operation_signs_on_next_line = false
-ij_javascript_ternary_operation_wrap = off
-ij_javascript_union_types_wrap = on_every_item
-ij_javascript_use_chained_calls_group_indents = true
-ij_javascript_use_double_quotes = true
-ij_javascript_use_explicit_js_extension = global
-ij_javascript_use_path_mapping = always
-ij_javascript_use_public_modifier = false
-ij_javascript_use_semicolon_after_statement = true
-ij_javascript_var_declaration_wrap = normal
-ij_javascript_while_brace_force = never
-ij_javascript_while_on_new_line = false
-ij_javascript_wrap_comments = false
-
-[{*.module,*.hphp,*.phtml,*.php5,*.php4,*.php,*.ctp,*.inc}]
-indent_style = tab
-ij_continuation_indent_size = 4
-ij_smart_tabs = true
-ij_wrap_on_typing = false
-ij_php_align_assignments = false
-ij_php_align_class_constants = false
-ij_php_align_group_field_declarations = false
-ij_php_align_inline_comments = false
-ij_php_align_key_value_pairs = false
-ij_php_align_multiline_array_initializer_expression = false
-ij_php_align_multiline_binary_operation = false
-ij_php_align_multiline_chained_methods = false
-ij_php_align_multiline_extends_list = false
-ij_php_align_multiline_for = true
-ij_php_align_multiline_parameters = false
-ij_php_align_multiline_parameters_in_calls = false
-ij_php_align_multiline_ternary_operation = false
-ij_php_align_phpdoc_comments = false
-ij_php_align_phpdoc_param_names = false
-ij_php_api_weight = 1
-ij_php_array_initializer_new_line_after_left_brace = true
-ij_php_array_initializer_right_brace_on_new_line = true
-ij_php_array_initializer_wrap = on_every_item
-ij_php_assignment_wrap = off
-ij_php_author_weight = 7
-ij_php_binary_operation_sign_on_next_line = false
-ij_php_binary_operation_wrap = off
-ij_php_blank_lines_after_class_header = 0
-ij_php_blank_lines_after_function = 1
-ij_php_blank_lines_after_imports = 1
-ij_php_blank_lines_after_opening_tag = 0
-ij_php_blank_lines_after_package = 1
-ij_php_blank_lines_around_class = 1
-ij_php_blank_lines_around_constants = 0
-ij_php_blank_lines_around_field = 0
-ij_php_blank_lines_around_method = 1
-ij_php_blank_lines_before_class_end = 0
-ij_php_blank_lines_before_imports = 1
-ij_php_blank_lines_before_method_body = 0
-ij_php_blank_lines_before_package = 1
-ij_php_blank_lines_before_return_statement = 1
-ij_php_block_brace_style = next_line
-ij_php_call_parameters_new_line_after_left_paren = false
-ij_php_call_parameters_right_paren_on_new_line = false
-ij_php_call_parameters_wrap = normal
-ij_php_catch_on_new_line = true
-ij_php_category_weight = 28
-ij_php_class_brace_style = next_line
-ij_php_comma_after_last_array_element = true
-ij_php_concat_spaces = false
-ij_php_copyright_weight = 28
-ij_php_deprecated_weight = 28
-ij_php_do_while_brace_force = always
-ij_php_else_if_style = as_is
-ij_php_else_on_new_line = true
-ij_php_example_weight = 3
-ij_php_extends_keyword_wrap = off
-ij_php_extends_list_wrap = off
-ij_php_fields_default_visibility = private
-ij_php_filesource_weight = 28
-ij_php_finally_on_new_line = true
-ij_php_for_brace_force = always
-ij_php_for_statement_new_line_after_left_paren = false
-ij_php_for_statement_right_paren_on_new_line = false
-ij_php_for_statement_wrap = off
-ij_php_force_short_declaration_array_style = false
-ij_php_global_weight = 28
-ij_php_group_use_wrap = on_every_item
-ij_php_if_brace_force = always
-ij_php_if_lparen_on_next_line = false
-ij_php_if_rparen_on_next_line = false
-ij_php_ignore_weight = 28
-ij_php_import_sorting = alphabetic
-ij_php_indent_break_from_case = true
-ij_php_indent_case_from_switch = true
-ij_php_indent_code_in_php_tags = false
-ij_php_internal_weight = 0
-ij_php_keep_blank_lines_after_lbrace = 2
-ij_php_keep_blank_lines_before_right_brace = 2
-ij_php_keep_blank_lines_in_code = 2
-ij_php_keep_blank_lines_in_declarations = 2
-ij_php_keep_control_statement_in_one_line = true
-ij_php_keep_first_column_comment = true
-ij_php_keep_indents_on_empty_lines = false
-ij_php_keep_line_breaks = true
-ij_php_keep_rparen_and_lbrace_on_one_line = true
-ij_php_keep_simple_methods_in_one_line = false
-ij_php_lambda_brace_style = end_of_line
-ij_php_license_weight = 28
-ij_php_line_comment_add_space = false
-ij_php_line_comment_at_first_column = true
-ij_php_link_weight = 28
-ij_php_lower_case_boolean_const = true
-ij_php_lower_case_null_const = true
-ij_php_method_brace_style = next_line
-ij_php_method_call_chain_wrap = off
-ij_php_method_parameters_new_line_after_left_paren = true
-ij_php_method_parameters_right_paren_on_new_line = true
-ij_php_method_parameters_wrap = normal
-ij_php_method_weight = 28
-ij_php_modifier_list_wrap = false
-ij_php_multiline_chained_calls_semicolon_on_new_line = false
-ij_php_namespace_brace_style = 1
-ij_php_null_type_position = in_the_end
-ij_php_package_weight = 28
-ij_php_param_weight = 4
-ij_php_parentheses_expression_new_line_after_left_paren = false
-ij_php_parentheses_expression_right_paren_on_new_line = false
-ij_php_phpdoc_blank_line_before_tags = true
-ij_php_phpdoc_blank_lines_around_parameters = true
-ij_php_phpdoc_keep_blank_lines = true
-ij_php_phpdoc_param_spaces_between_name_and_description = 1
-ij_php_phpdoc_param_spaces_between_tag_and_type = 1
-ij_php_phpdoc_param_spaces_between_type_and_name = 1
-ij_php_phpdoc_use_fqcn = true
-ij_php_phpdoc_wrap_long_lines = true
-ij_php_place_assignment_sign_on_next_line = false
-ij_php_place_parens_for_constructor = 0
-ij_php_property_read_weight = 28
-ij_php_property_weight = 28
-ij_php_property_write_weight = 28
-ij_php_return_type_on_new_line = false
-ij_php_return_weight = 5
-ij_php_see_weight = 2
-ij_php_since_weight = 28
-ij_php_sort_phpdoc_elements = true
-ij_php_space_after_colon = true
-ij_php_space_after_colon_in_return_type = true
-ij_php_space_after_comma = true
-ij_php_space_after_for_semicolon = true
-ij_php_space_after_quest = true
-ij_php_space_after_type_cast = false
-ij_php_space_after_unary_not = false
-ij_php_space_before_array_initializer_left_brace = false
-ij_php_space_before_catch_keyword = true
-ij_php_space_before_catch_left_brace = true
-ij_php_space_before_catch_parentheses = true
-ij_php_space_before_class_left_brace = true
-ij_php_space_before_closure_left_parenthesis = true
-ij_php_space_before_colon = true
-ij_php_space_before_colon_in_return_type = false
-ij_php_space_before_comma = false
-ij_php_space_before_do_left_brace = true
-ij_php_space_before_else_keyword = true
-ij_php_space_before_else_left_brace = true
-ij_php_space_before_finally_keyword = true
-ij_php_space_before_finally_left_brace = true
-ij_php_space_before_for_left_brace = true
-ij_php_space_before_for_parentheses = true
-ij_php_space_before_for_semicolon = false
-ij_php_space_before_if_left_brace = true
-ij_php_space_before_if_parentheses = true
-ij_php_space_before_method_call_parentheses = false
-ij_php_space_before_method_left_brace = true
-ij_php_space_before_method_parentheses = false
-ij_php_space_before_quest = true
-ij_php_space_before_switch_left_brace = true
-ij_php_space_before_switch_parentheses = true
-ij_php_space_before_try_left_brace = true
-ij_php_space_before_unary_not = false
-ij_php_space_before_while_keyword = true
-ij_php_space_before_while_left_brace = true
-ij_php_space_before_while_parentheses = true
-ij_php_space_between_ternary_quest_and_colon = false
-ij_php_spaces_around_additive_operators = true
-ij_php_spaces_around_arrow = false
-ij_php_spaces_around_assignment_in_declare = false
-ij_php_spaces_around_assignment_operators = true
-ij_php_spaces_around_bitwise_operators = true
-ij_php_spaces_around_equality_operators = true
-ij_php_spaces_around_logical_operators = true
-ij_php_spaces_around_multiplicative_operators = true
-ij_php_spaces_around_null_coalesce_operator = true
-ij_php_spaces_around_relational_operators = true
-ij_php_spaces_around_shift_operators = true
-ij_php_spaces_around_unary_operator = false
-ij_php_spaces_around_var_within_brackets = false
-ij_php_spaces_within_array_initializer_braces = false
-ij_php_spaces_within_brackets = false
-ij_php_spaces_within_catch_parentheses = false
-ij_php_spaces_within_for_parentheses = false
-ij_php_spaces_within_if_parentheses = false
-ij_php_spaces_within_method_call_parentheses = false
-ij_php_spaces_within_method_parentheses = false
-ij_php_spaces_within_parentheses = false
-ij_php_spaces_within_short_echo_tags = true
-ij_php_spaces_within_switch_parentheses = false
-ij_php_spaces_within_while_parentheses = false
-ij_php_special_else_if_treatment = false
-ij_php_subpackage_weight = 28
-ij_php_ternary_operation_signs_on_next_line = false
-ij_php_ternary_operation_wrap = off
-ij_php_throws_weight = 6
-ij_php_todo_weight = 28
-ij_php_unknown_tag_weight = 28
-ij_php_upper_case_boolean_const = false
-ij_php_upper_case_null_const = false
-ij_php_uses_weight = 28
-ij_php_var_weight = 28
-ij_php_variable_naming_style = mixed
-ij_php_version_weight = 28
-ij_php_while_brace_force = always
-ij_php_while_on_new_line = false
-
-[{*.sht,*.htm,*.html,*.shtm,*.shtml}]
-indent_style = tab
-ij_smart_tabs = true
-ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-ij_html_align_attributes = true
-ij_html_align_text = false
-ij_html_attribute_wrap = normal
-ij_html_block_comment_at_first_column = true
-ij_html_do_not_align_children_of_min_lines = 0
-ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
-ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot,style,script,head
-ij_html_enforce_quotes = false
-ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
-ij_html_keep_blank_lines = 2
-ij_html_keep_indents_on_empty_lines = false
-ij_html_keep_line_breaks = true
-ij_html_keep_line_breaks_in_text = true
-ij_html_keep_whitespaces = false
-ij_html_keep_whitespaces_inside = span,pre,textarea
-ij_html_line_comment_at_first_column = true
-ij_html_new_line_after_last_attribute = never
-ij_html_new_line_before_first_attribute = never
-ij_html_quote_style = double
-ij_html_remove_new_line_before_tags = br
-ij_html_space_after_tag_name = false
-ij_html_space_around_equality_in_attribute = false
-ij_html_space_inside_empty_tag = false
-ij_html_text_wrap = normal
-
-[{*.ts,*.ats}]
-ij_continuation_indent_size = 4
-ij_typescript_align_imports = false
-ij_typescript_align_multiline_array_initializer_expression = false
-ij_typescript_align_multiline_binary_operation = false
-ij_typescript_align_multiline_chained_methods = false
-ij_typescript_align_multiline_extends_list = false
-ij_typescript_align_multiline_for = true
-ij_typescript_align_multiline_parameters = true
-ij_typescript_align_multiline_parameters_in_calls = false
-ij_typescript_align_multiline_ternary_operation = false
-ij_typescript_align_object_properties = 0
-ij_typescript_align_union_types = false
-ij_typescript_align_var_statements = 0
-ij_typescript_array_initializer_new_line_after_left_brace = false
-ij_typescript_array_initializer_right_brace_on_new_line = false
-ij_typescript_array_initializer_wrap = off
-ij_typescript_assignment_wrap = off
-ij_typescript_binary_operation_sign_on_next_line = false
-ij_typescript_binary_operation_wrap = off
-ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**/*
-ij_typescript_blank_lines_after_imports = 1
-ij_typescript_blank_lines_around_class = 1
-ij_typescript_blank_lines_around_field = 0
-ij_typescript_blank_lines_around_field_in_interface = 0
-ij_typescript_blank_lines_around_function = 1
-ij_typescript_blank_lines_around_method = 1
-ij_typescript_blank_lines_around_method_in_interface = 1
-ij_typescript_block_brace_style = end_of_line
-ij_typescript_call_parameters_new_line_after_left_paren = false
-ij_typescript_call_parameters_right_paren_on_new_line = false
-ij_typescript_call_parameters_wrap = off
-ij_typescript_catch_on_new_line = false
-ij_typescript_chained_call_dot_on_new_line = true
-ij_typescript_class_brace_style = end_of_line
-ij_typescript_comma_on_new_line = false
-ij_typescript_do_while_brace_force = never
-ij_typescript_else_on_new_line = false
-ij_typescript_enforce_trailing_comma = keep
-ij_typescript_extends_keyword_wrap = off
-ij_typescript_extends_list_wrap = off
-ij_typescript_field_prefix = _
-ij_typescript_file_name_style = relaxed
-ij_typescript_finally_on_new_line = false
-ij_typescript_for_brace_force = never
-ij_typescript_for_statement_new_line_after_left_paren = false
-ij_typescript_for_statement_right_paren_on_new_line = false
-ij_typescript_for_statement_wrap = off
-ij_typescript_force_quote_style = false
-ij_typescript_force_semicolon_style = false
-ij_typescript_function_expression_brace_style = end_of_line
-ij_typescript_if_brace_force = never
-ij_typescript_import_merge_members = global
-ij_typescript_import_prefer_absolute_path = global
-ij_typescript_import_sort_members = true
-ij_typescript_import_sort_module_name = false
-ij_typescript_import_use_node_resolution = true
-ij_typescript_imports_wrap = on_every_item
-ij_typescript_indent_case_from_switch = true
-ij_typescript_indent_chained_calls = true
-ij_typescript_indent_package_children = 0
-ij_typescript_jsdoc_include_types = false
-ij_typescript_jsx_attribute_value = braces
-ij_typescript_keep_blank_lines_in_code = 2
-ij_typescript_keep_first_column_comment = true
-ij_typescript_keep_indents_on_empty_lines = false
-ij_typescript_keep_line_breaks = true
-ij_typescript_keep_simple_blocks_in_one_line = false
-ij_typescript_keep_simple_methods_in_one_line = false
-ij_typescript_line_comment_add_space = true
-ij_typescript_line_comment_at_first_column = false
-ij_typescript_method_brace_style = end_of_line
-ij_typescript_method_call_chain_wrap = off
-ij_typescript_method_parameters_new_line_after_left_paren = false
-ij_typescript_method_parameters_right_paren_on_new_line = false
-ij_typescript_method_parameters_wrap = off
-ij_typescript_object_literal_wrap = on_every_item
-ij_typescript_parentheses_expression_new_line_after_left_paren = false
-ij_typescript_parentheses_expression_right_paren_on_new_line = false
-ij_typescript_place_assignment_sign_on_next_line = false
-ij_typescript_prefer_as_type_cast = false
-ij_typescript_prefer_parameters_wrap = false
-ij_typescript_reformat_c_style_comments = false
-ij_typescript_space_after_colon = true
-ij_typescript_space_after_comma = true
-ij_typescript_space_after_dots_in_rest_parameter = false
-ij_typescript_space_after_generator_mult = true
-ij_typescript_space_after_property_colon = true
-ij_typescript_space_after_quest = true
-ij_typescript_space_after_type_colon = true
-ij_typescript_space_after_unary_not = false
-ij_typescript_space_before_async_arrow_lparen = true
-ij_typescript_space_before_catch_keyword = true
-ij_typescript_space_before_catch_left_brace = true
-ij_typescript_space_before_catch_parentheses = true
-ij_typescript_space_before_class_lbrace = true
-ij_typescript_space_before_class_left_brace = true
-ij_typescript_space_before_colon = true
-ij_typescript_space_before_comma = false
-ij_typescript_space_before_do_left_brace = true
-ij_typescript_space_before_else_keyword = true
-ij_typescript_space_before_else_left_brace = true
-ij_typescript_space_before_finally_keyword = true
-ij_typescript_space_before_finally_left_brace = true
-ij_typescript_space_before_for_left_brace = true
-ij_typescript_space_before_for_parentheses = true
-ij_typescript_space_before_for_semicolon = false
-ij_typescript_space_before_function_left_parenth = true
-ij_typescript_space_before_generator_mult = false
-ij_typescript_space_before_if_left_brace = true
-ij_typescript_space_before_if_parentheses = true
-ij_typescript_space_before_method_call_parentheses = false
-ij_typescript_space_before_method_left_brace = true
-ij_typescript_space_before_method_parentheses = false
-ij_typescript_space_before_property_colon = false
-ij_typescript_space_before_quest = true
-ij_typescript_space_before_switch_left_brace = true
-ij_typescript_space_before_switch_parentheses = true
-ij_typescript_space_before_try_left_brace = true
-ij_typescript_space_before_type_colon = false
-ij_typescript_space_before_unary_not = false
-ij_typescript_space_before_while_keyword = true
-ij_typescript_space_before_while_left_brace = true
-ij_typescript_space_before_while_parentheses = true
-ij_typescript_spaces_around_additive_operators = true
-ij_typescript_spaces_around_arrow_function_operator = true
-ij_typescript_spaces_around_assignment_operators = true
-ij_typescript_spaces_around_bitwise_operators = true
-ij_typescript_spaces_around_equality_operators = true
-ij_typescript_spaces_around_logical_operators = true
-ij_typescript_spaces_around_multiplicative_operators = true
-ij_typescript_spaces_around_relational_operators = true
-ij_typescript_spaces_around_shift_operators = true
-ij_typescript_spaces_around_unary_operator = false
-ij_typescript_spaces_within_array_initializer_brackets = false
-ij_typescript_spaces_within_brackets = false
-ij_typescript_spaces_within_catch_parentheses = false
-ij_typescript_spaces_within_for_parentheses = false
-ij_typescript_spaces_within_if_parentheses = false
-ij_typescript_spaces_within_imports = false
-ij_typescript_spaces_within_interpolation_expressions = false
-ij_typescript_spaces_within_method_call_parentheses = false
-ij_typescript_spaces_within_method_parentheses = false
-ij_typescript_spaces_within_object_literal_braces = false
-ij_typescript_spaces_within_object_type_braces = true
-ij_typescript_spaces_within_parentheses = false
-ij_typescript_spaces_within_switch_parentheses = false
-ij_typescript_spaces_within_type_assertion = false
-ij_typescript_spaces_within_union_types = true
-ij_typescript_spaces_within_while_parentheses = false
-ij_typescript_special_else_if_treatment = true
-ij_typescript_ternary_operation_signs_on_next_line = false
-ij_typescript_ternary_operation_wrap = off
-ij_typescript_union_types_wrap = on_every_item
-ij_typescript_use_chained_calls_group_indents = false
-ij_typescript_use_double_quotes = true
-ij_typescript_use_explicit_js_extension = global
-ij_typescript_use_path_mapping = always
-ij_typescript_use_public_modifier = false
-ij_typescript_use_semicolon_after_statement = true
-ij_typescript_var_declaration_wrap = normal
-ij_typescript_while_brace_force = never
-ij_typescript_while_on_new_line = false
-ij_typescript_wrap_comments = false
-
-[{*.yml,*.yaml}]
-indent_size = 2
-ij_continuation_indent_size = 2
-ij_yaml_keep_indents_on_empty_lines = false
-ij_yaml_keep_line_breaks = true
-
-[{*.zsh,*.bash,*.sh}]
-ij_shell_binary_ops_start_line = false
-ij_shell_keep_column_alignment_padding = false
-ij_shell_minify_program = false
-ij_shell_redirect_followed_by_space = false
-ij_shell_switch_cases_indented = false
-
-[{.stylelintrc,.eslintrc,.babelrc,jest.config,*.bowerrc,*.jsb3,*.jsb2,*.json}]
-indent_size = 2
-ij_json_keep_blank_lines_in_code = 0
-ij_json_keep_indents_on_empty_lines = false
-ij_json_keep_line_breaks = true
-ij_json_space_after_colon = true
-ij_json_space_after_comma = true
-ij_json_space_before_colon = true
-ij_json_space_before_comma = false
-ij_json_spaces_within_braces = false
-ij_json_spaces_within_brackets = false
-ij_json_wrap_long_lines = false
-
-[{phpunit.xml.dist,*.jhm,*.rng,*.wsdl,*.fxml,*.xslt,*.jrxml,*.ant,*.xul,*.xsl,*.xsd,*.tld,*.jnlp,*.xml}]
-indent_size = 2
-indent_style = tab
-tab_width = 2
-ij_smart_tabs = true
-ij_xml_block_comment_at_first_column = true
-ij_xml_keep_indents_on_empty_lines = false
-ij_xml_line_comment_at_first_column = true

.gitflow

@@ -1,9 +0,0 @@
-[gitflow "branch"]
-master = master
-develop = develop
-[gitflow "prefix"]
-feature = feature/
-release = release/
-hotfix = hotfix/
-versiontag =
-support = support/

.gitignore

@@ -1,17 +1,9 @@
 
 # no slash at the end to handle also symlinks
 /toolkit
+/conf
 /env-*
 
-# maintenance mode (N°2240)
-/.maintenance
-
-# listing prevention in conf directory
-/conf/**
-!/conf/.htaccess
-!/conf/index.php
-!/conf/web.config
-
 # composer reserver directory, from sources, populate/update using "composer install"
 vendor/*
 test/vendor/*
@@ -41,8 +33,7 @@ test/vendor/*
 !/.idea/inspectionProfiles
 !/.idea/inspectionProfiles/*
 
-#phpdocumentor temp file
-ast.dump
+
 
 # CMake
 cmake-build-*/
@@ -130,4 +121,3 @@ local.properties
 .cache-main
 .scala_dependencies
 .worksheet
-

.idea/codeStyles/Project.xml

@@ -1,44 +1,19 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="140" />
-    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
-    <option name="SOFT_MARGINS" value="140" />
-    <HTMLCodeStyleSettings>
-      <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,body,thead,tbody,tfoot,style,script,head" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
-    </JSCodeStyleSettings>
     <PHPCodeStyleSettings>
       <option name="CONCAT_SPACES" value="false" />
-      <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
       <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
       <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
       <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
-      <option name="THROWS_WEIGHT" value="6" />
-      <option name="PARAM_WEIGHT" value="4" />
-      <option name="RETURN_WEIGHT" value="5" />
-      <option name="AUTHOR_WEIGHT" value="7" />
-      <option name="INTERNAL_WEIGHT" value="0" />
-      <option name="API_WEIGHT" value="1" />
-      <option name="EXAMPLE_WEIGHT" value="3" />
-      <option name="SEE_WEIGHT" value="2" />
       <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
       <option name="LOWER_CASE_NULL_CONST" value="true" />
       <option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
       <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
       <option name="PHPDOC_USE_FQCN" value="true" />
     </PHPCodeStyleSettings>
-    <XML>
-      <option name="XML_TEXT_WRAP" value="0" />
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_KEEP_WHITE_SPACES_INSIDE_CDATA" value="true" />
-    </XML>
     <codeStyleSettings language="JavaScript">
       <option name="BRACE_STYLE" value="2" />
       <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="SPACE_AROUND_ADDITIVE_OPERATORS" value="false" />
       <option name="IF_BRACE_FORCE" value="3" />
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
@@ -48,9 +23,8 @@
       <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
       <option name="BRACE_STYLE" value="2" />
       <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="CATCH_ON_NEW_LINE" value="true" />
-      <option name="FINALLY_ON_NEW_LINE" value="true" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
       <option name="CALL_PARAMETERS_WRAP" value="1" />
       <option name="METHOD_PARAMETERS_WRAP" value="1" />
       <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
@@ -67,8 +41,5 @@
         <option name="SMART_TABS" value="true" />
       </indentOptions>
     </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="WRAP_ON_TYPING" value="1" />
-    </codeStyleSettings>
   </code_scheme>
 </component>

.idea/encodings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+  <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

.idea/inspectionProfiles/Combodo.xml

@@ -1,170 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Combodo" />
-    <inspection_tool class="CascadeStringReplacementInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ForgottenDebugOutputInspection" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="configuration">
-        <list>
-          <option value="\Codeception\Util\Debug::debug" />
-          <option value="\Codeception\Util\Debug::pause" />
-          <option value="\Doctrine\Common\Util\Debug::dump" />
-          <option value="\Doctrine\Common\Util\Debug::export" />
-          <option value="\Illuminate\Support\Debug\Dumper::dump" />
-          <option value="\Symfony\Component\Debug\Debug::enable" />
-          <option value="\Symfony\Component\Debug\DebugClassLoader::enable" />
-          <option value="\Symfony\Component\Debug\ErrorHandler::register" />
-          <option value="\Symfony\Component\Debug\ExceptionHandler::register" />
-          <option value="\TYPO3\CMS\Core\Utility\DebugUtility::debug" />
-          <option value="\Zend\Debug\Debug::dump" />
-          <option value="\Zend\Di\Display\Console::export" />
-          <option value="dd" />
-          <option value="debug_print_backtrace" />
-          <option value="debug_zval_dump" />
-          <option value="dpm" />
-          <option value="dpq" />
-          <option value="dsm" />
-          <option value="dump" />
-          <option value="dvm" />
-          <option value="error_log" />
-          <option value="kpr" />
-          <option value="phpinfo" />
-          <option value="print_r" />
-          <option value="var_dump" />
-          <option value="var_export" />
-          <option value="xdebug_break" />
-          <option value="xdebug_call_class" />
-          <option value="xdebug_call_file" />
-          <option value="xdebug_call_function" />
-          <option value="xdebug_call_line" />
-          <option value="xdebug_code_coverage_started" />
-          <option value="xdebug_debug_zval" />
-          <option value="xdebug_debug_zval_stdout" />
-          <option value="xdebug_dump_superglobals" />
-          <option value="xdebug_enable" />
-          <option value="xdebug_get_code_coverage" />
-          <option value="xdebug_get_collected_errors" />
-          <option value="xdebug_get_declared_vars" />
-          <option value="xdebug_get_function_stack" />
-          <option value="xdebug_get_headers" />
-          <option value="xdebug_get_monitored_functions" />
-          <option value="xdebug_get_profiler_filename" />
-          <option value="xdebug_get_stack_depth" />
-          <option value="xdebug_get_tracefile_name" />
-          <option value="xdebug_is_enabled" />
-          <option value="xdebug_memory_usage" />
-          <option value="xdebug_peak_memory_usage" />
-          <option value="xdebug_print_function_stack" />
-          <option value="xdebug_start_code_coverage" />
-          <option value="xdebug_start_error_collection" />
-          <option value="xdebug_start_function_monitor" />
-          <option value="xdebug_start_trace" />
-          <option value="xdebug_stop_code_coverage" />
-          <option value="xdebug_stop_error_collection" />
-          <option value="xdebug_stop_function_monitor" />
-          <option value="xdebug_stop_trace" />
-          <option value="xdebug_time_index" />
-          <option value="xdebug_var_dump" />
-        </list>
-      </option>
-      <option name="migratedIntoUserSpace" value="true" />
-    </inspection_tool>
-    <inspection_tool class="HtmlRequiredAltAttribute" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="HtmlRequiredLangAttribute" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MysqlParsingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PhpComposerExtensionStubsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpShortOpenTagInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedMethodInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedLocalVariableInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_INSIDE_LIST" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="optionConfiguration">
-        <list>
-          <option value="barryvdh/laravel-debugbar" />
-          <option value="behat/behat" />
-          <option value="brianium/paratest" />
-          <option value="codeception/codeception" />
-          <option value="codedungeon/phpunit-result-printer" />
-          <option value="composer/composer" />
-          <option value="doctrine/coding-standard" />
-          <option value="filp/whoops" />
-          <option value="friendsofphp/php-cs-fixer" />
-          <option value="humbug/humbug" />
-          <option value="infection/infection" />
-          <option value="jakub-onderka/php-parallel-lint" />
-          <option value="johnkary/phpunit-speedtrap" />
-          <option value="kalessil/production-dependencies-guard" />
-          <option value="mikey179/vfsStream" />
-          <option value="mockery/mockery" />
-          <option value="mybuilder/phpunit-accelerator" />
-          <option value="orchestra/testbench" />
-          <option value="pdepend/pdepend" />
-          <option value="phan/phan" />
-          <option value="phing/phing" />
-          <option value="phpcompatibility/php-compatibility" />
-          <option value="phpmd/phpmd" />
-          <option value="phpro/grumphp" />
-          <option value="phpspec/phpspec" />
-          <option value="phpspec/prophecy" />
-          <option value="phpstan/phpstan" />
-          <option value="phpunit/phpunit" />
-          <option value="povils/phpmnd" />
-          <option value="roave/security-advisories" />
-          <option value="satooshi/php-coveralls" />
-          <option value="sebastian/phpcpd" />
-          <option value="slevomat/coding-standard" />
-          <option value="spatie/phpunit-watcher" />
-          <option value="squizlabs/php_codesniffer" />
-          <option value="sstalle/php7cc" />
-          <option value="symfony/debug" />
-          <option value="symfony/maker-bundle" />
-          <option value="symfony/phpunit-bridge" />
-          <option value="symfony/var-dumper" />
-          <option value="vimeo/psalm" />
-          <option value="wimg/php-compatibility" />
-          <option value="wp-coding-standards/wpcs" />
-          <option value="yiisoft/yii2-coding-standards" />
-          <option value="yiisoft/yii2-debug" />
-          <option value="yiisoft/yii2-gii" />
-          <option value="zendframework/zend-coding-standard" />
-          <option value="zendframework/zend-debug" />
-          <option value="zendframework/zend-test" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="SqlAddNotNullColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlAmbiguousColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlAutoIncrementDuplicateInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlCheckUsingColumnsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlConstantConditionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDeprecateTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDerivedTableAliasInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDropIndexedColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlIdentifierInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlInsertValuesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlNullComparisonInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlPostgresqlSelectFromProcedureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlResolveInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlShouldBeInGroupByInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlSideEffectsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlSignatureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlStorageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlUnusedVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,19 +1,154 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
+    <inspection_tool class="BladeControlDirectives" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckEmptyScriptTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckImageSize" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckNodeTest" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckTagEmptyBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckValidXmlInScriptTagBody" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptArgumentsOutsideFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptFunctionSignatures" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptInfiniteLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptLiteralNotFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptSillyAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptSwitchStatementWithNoDefaultBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptUnusedLocalSymbols" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComposeFileStructure" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssFloatPxLength" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidAtRule" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidCharsetRule" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidElement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidHtmlTagReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidMediaFeature" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPropertyValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPseudoSelector" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssMissingComma" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssNegativeValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssNoGenericFontName" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOptimizeSimilarProperties" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOverwrittenProperties" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssRedundantUnit" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnitlessNumber" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnknownProperty" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myCustomPropertiesEnabled" value="false" />
+      <option name="myIgnoreVendorSpecificProperties" value="false" />
+      <option name="myCustomPropertiesList">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
     </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
+    <inspection_tool class="CssUnknownTarget" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedClass" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomPropertySet" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CucumberExamplesColon" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CucumberMissedExamples" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CucumberTableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CucumberUndefinedStep" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DockerFileArgumentCount" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DuplicateKeyInSection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateSectionInFile" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyEventHandler" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FileHeaderInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="GherkinBrokenTableInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="GherkinMisplacedBackground" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="HamlNestedTagContent" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HardwiredNamespacePrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlDeprecatedTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlExtraClosingTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlFormInputWithoutLabel" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlMissingClosingTag" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="HtmlPresentationalElement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAnchorTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
     </inspection_tool>
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
+    <inspection_tool class="HtmlUnknownBooleanAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownTag" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="6">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
     </inspection_tool>
+    <inspection_tool class="HtmlUnknownTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ImplicitTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="BITS" value="1720" />
+      <option name="FLAG_EXPLICIT_CONVERSION" value="true" />
+      <option name="IGNORE_NODESET_TO_BOOLEAN_VIA_STRING" value="true" />
+    </inspection_tool>
+    <inspection_tool class="IndexZeroUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInArrayLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInObjectLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MissingSinceTagDocInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="MysqlParsingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NonAsciiCharacters" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocMissingReturnTagInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocMissingThrowsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpIncludeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpRedundantClosingTagInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedClassConstantInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedClassInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedConstantInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedFieldInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedFunctionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedGotoLabelInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedMethodInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedNamespaceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUnusedParameterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="CHECK_ANY" value="false" />
+    </inspection_tool>
+    <inspection_tool class="RequiredAttributes" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myAdditionalRequiredHtmlAttributes" value="" />
+    </inspection_tool>
+    <inspection_tool class="SqlAddNotNullColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlAmbiguousColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlAutoIncrementDuplicateInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlCheckUsingColumnsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlConstantConditionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDeprecateTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDerivedTableAliasInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDropIndexedColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlIdentifierInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlInsertValuesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlNullComparisonInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlPostgresqlSelectFromProcedureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlResolveInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlShouldBeInGroupByInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlSignatureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlStorageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlUnusedVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TaskProblemsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptPreferShortImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDefaultAttributeValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlUnboundNsPrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlUnusedNamespaceDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XsltUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XsltVariableShadowing" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Combodo" />
-    <version value="1.0" />
-  </settings>
-</component>

.jenkins/bin/init/append_files.sh

@@ -10,7 +10,5 @@ mkdir -p toolkit
 rm -rf toolkit/*
 
 # fill target dirs
-curl https://www.combodo.com/documentation/iTopDataModelToolkit-2.3.zip > toolkit.zip
-unzip toolkit.zip
-rm toolkit.zip
+curl http://www.combodo.com/documentation/iTopDataModelToolkit-2.3.zip | tar xvz --directory toolkit
 cp -r .jenkins/configuration/default-environment/unattended_install/* toolkit

.jenkins/bin/init/composer_install.sh

@@ -3,7 +3,7 @@
 set -x
 
 # on the root dir
-# composer install -a # => Not needed anymore (libs were added to git with N°2435)
+composer install
 
 
 # under the test dir

.jenkins/bin/init/debug.sh

@@ -2,8 +2,6 @@
 
 set -x
 
-
-
 whoami
 pwd
 ls

.jenkins/bin/tests/phpunit.sh

@@ -3,20 +3,6 @@ set -x
 
 cd test
 
-export DEBUG_UNIT_TEST=0
-RUN_NONREG_TESTS=0
+export DEBUG_UNIT_TEST="0"
 
-if [ $# -ge 1 -a "x$1" == "xtrue" ]
-then
-  export DEBUG_UNIT_TEST=1
-else
-  export DEBUG_UNIT_TEST=0
-fi
-
-if [ $# -ge 2 -a "x$2" == "xtrue" ]
-then
-  php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --teamcity
-else
-  #echo php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --teamcity
-  php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --exclude-group OQL --teamcity
-fi
+php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --teamcity

.jenkins/bin/unattended_install/default_env.sh

@@ -2,7 +2,5 @@
 
 set -x
 
-chmod 666 conf/production/config-itop.php
-
 cd toolkit
-php unattended_install.php --response_file=default-params.xml --clean=true
+php unattended_install.php default-params.xml

.jenkins/configuration/default-environment/unattended_install/default-config-itop.php

@@ -80,7 +80,7 @@ $MySettings = array(
 
 	'db_host' => '',
 
-	'db_name' => 'itop_ci',
+	'db_name' => 'itop_ci_main',
 
 	'db_pwd' => 'IKnowYouSeeMeInJenkinsConf',
 
@@ -94,6 +94,10 @@ $MySettings = array(
 
 	'default_language' => 'EN US',
 
+	// disable_attachments_download_legacy_portal: Disable attachments download from legacy portal
+	//	default: true
+	'disable_attachments_download_legacy_portal' => true,
+
 	// draft_attachments_lifetime: Lifetime (in seconds) of drafts' attachments and inline images: after this duration, the garbage collector will delete them.
 	//	default: 3600
 	'draft_attachments_lifetime' => 3600,
@@ -247,9 +251,6 @@ $MySettings = array(
  *
  */
 $MyModuleSettings = array(
-	'authent-local' => array (
-		'password_validation.pattern' => '',
-	),
 	'itop-attachments' => array (
 		'allowed_classes' => array (
 			0 => 'Ticket',

.jenkins/configuration/default-environment/unattended_install/default-params.xml

@@ -7,7 +7,7 @@
     </preinstall>
     <source_dir>datamodels/2.x/</source_dir>
     <datamodel_version>2.5.0</datamodel_version>
-    <previous_configuration_file>default-config-itop.php</previous_configuration_file>
+    <previous_configuration_file>/var/lib/jenkins/workspace/iTop-CI/unattended_install/default-config-itop.php</previous_configuration_file>
     <extensions_dir>extensions</extensions_dir>
     <target_env>production</target_env>
     <workspace_dir></workspace_dir>

.jenkins/configuration/default-environment/unattended_install/unattended_install.php

@@ -1,22 +1,4 @@
 <?php
-/**
- * Copyright (C) 2013-2019 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
 //this scrit will be run under the ./toolkit directory, relatively to the document root
 
 require_once('../approot.inc.php');

CONTRIBUTING.md

@@ -1,128 +0,0 @@
-# Contributing to iTop
-
-You want to contribute to iTop? Many thanks to you! 🎉 👍
-
-Here are some guidelines that will help us integrate your work!
-
-
-## Contributions
-
-### Subjects
-You are welcome to create pull requests on any of those subjects:
-
-* 🐛 `:bug:` bug fix
-* 🌐 `:globe_with_meridians:` translation / i18n / l10n
-
-If you want to implement a **new feature**, please [create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) for review.   
-If you ever want to begin implementation, do so in a fork, and add a link to the corresponding commits in the ticket.
-
-For all **security related subjects**, please see our [security policy](SECURITY.md).
-
-All **datamodel modification** should be done in an extension. Beware that such change would 
-impact all existing customers, and could prevent them from 
-upgrading!
-Combodo has a long experience of datamodel changes: they are very disruptive! 
-This is why we avoid them in iTop core, especially the changes on existing objects/fields.   
-If you have an idea you're sure would benefit to all of iTop users, you may 
-[create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) to submit it, but be warned that there are lots of good 
-reasons to refuse such changes.
-
-### License
-iTop is distributed under the AGPL-3.0 license (see the [license.txt] file),
-your code must comply with this license.
-
-If you want to use another license, you may [create an extension][wiki new ext].
-
-[license.txt]: https://github.com/Combodo/iTop/blob/develop/license.txt
-[wiki new ext]: https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Astart#by_writing_your_own_extension
-
-
-## Branch model
-
-TL;DR:
-> **create a fork from iTop main repository,  
-> create a branch based on the develop branch**
-
-We are using the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model. That means we have in our repo those
-main branches:
-
-- develop: ongoing development version
-- release/\*: if present, that means we are working on a beta version
-- master: previous stable version
-- support/\*: maintenance branches for older versions
-
-For example, if no beta version is currently ongoing we could have:
-
-- develop containing future 2.8.0 version
-- master containing 2.7.x maintenance version
-- support/2.6 containing 2.6.x maintenance version
-- support/2.5 containing 2.5.x maintenance version
-
-In this example, when 2.8.0-beta is shipped that will become:
-
-- develop: future 2.9.0 version
-- release/2.8: 2.8.0-beta
-- master: 2.7.x maintenance version
-- support/2.6 containing 2.6.x maintenance version
-- support/2.5 containing 2.5.x maintenance version
-
-And when 2.8.0 final will be out:
-
-- develop: future 2.9.0 version
-- master: 2.8.x maintenance version
-- support/2.7 : 2.7.x maintenance version
-- support/2.6 containing 2.6.x maintenance version
-- support/2.5 containing 2.5.x maintenance version
-
-Most of the time you should based your developments on the develop branch.  
-That may be different if you want to fix a bug, please use develop anyway and ask in your PR if rebase is possible.
-
-
-## Coding
-
-### PHP styleguide
-
-Please follow [our guidelines](https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Acoding_standards).
-
-### 🌐 Translations
-
-A [dedicated page](https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Atranslation) is available in the official wiki.
-
-### Tests
-
-Please create tests that covers as much as possible the code you're submitting.
-
-Our tests are located in the `test/` directory, containing a PHPUnit config file : `phpunit.xml.dist`.
-
-### Git Commit Messages
-
-* Describe the functional change instead of the technical modifications
-* Use the present tense ("Add feature" not "Added feature")
-* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
-* Limit the first line to 72 characters or less
-* Please start the commit message with an applicable emoji code (following the [Gitmoji guide](https://gitmoji.carloscuesta.me/)).  
- Beware to use the code (for example `:bug:`) and not the character (🐛) as Unicode support in git clients is very poor for now...  
- Emoji examples :
-    * 🌐 `:globe_with_meridians:` for translations
-    * 🎨 `:art:` when improving the format/structure of the code
-    * ⚡️ `:zap:` when improving performance
-    * 🐛 `:bug:` when fixing a bug
-    * 🔥 `:fire:` when removing code or files
-    * 💚 `:green_heart:` when fixing the CI build
-    * ✅ `:white_check_mark:` when adding tests
-    * 🔒 `:lock:` when dealing with security
-    * ⬆️ `:arrow_up:` when upgrading dependencies
-    * ⬇️ `:arrow_down:` when downgrading dependencies
-    * ♻️ `:recycle:` code refactoring
-    * 💄 `:lipstick:` Updating the UI and style files.  
-  
-
-## Pull request
-
-When your code is working, please:
-
-* stash as much as possible your commits,
-* rebase your branch on our repo last commit,
-* create a pull request.
-
-Detailed procedure to work on fork and create PR is available [in GitHub help pages](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).

Jenkinsfile

@@ -1,9 +1,5 @@
 pipeline {
   agent any
-    parameters {
-        booleanParam(name: 'debugMode', defaultValue: 'false', description: 'Debug mode?')
-        booleanParam(name: 'runNonRegOQLTests', defaultValue: 'false', description: 'Do You want to run legacy OQL regression tests?')
-    }
   stages {
 
     stage('init') {
@@ -40,7 +36,7 @@ pipeline {
       parallel {
         stage('phpunit') {
           steps {
-            sh './.jenkins/bin/tests/phpunit.sh ${debugMode} ${runNonRegOQLTests}'
+            sh './.jenkins/bin/tests/phpunit.sh'
           }
         }
       }

README.md

@@ -1,146 +0,0 @@
-<p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
-    <img src="https://www.combodo.com/logos/logo-itop.svg">
-</a></p>
-
-
-# iTop - ITSM & CMDB
- 
-iTop stands for *IT Operations Portal*.
-It is a complete open source, ITIL, web based service management tool including a fully customizable CMDB, a helpdesk system and a document management tool. 
-iTop also offers mass import tools and web services to integrate with your IT
-
-## Features
-- Fully configurable [Configuration Management (CMDB)][10]
-- [HelpDesk][11] and Incident Management
-- [Service and Contract Management][12]
-- [Change][13] Management
-- Configurable [SLA][14] Management
-- Graphical [impact analysis][15]
-- [CSV import][16] tool for any data
-- Consistency [audit][17] to check data quality
-- [Data synchronization][18] (for data federation)
-
-
-## Resources
-
- - [iTop Forums][1]: community support
- - [iTop Tickets][2]: for feature requests and bug reports
- - [Releases download][3]
- - [Documentation][4] covering both iTop and its official extensions
- - [iTop Hub][5] : discover and install extensions !
-
-
-
-[1]: https://sourceforge.net/p/itop/discussion/
-[2]: https://sourceforge.net/p/itop/tickets/
-[3]: https://sourceforge.net/projects/itop/files/itop/
-[4]: https://www.itophub.io/wiki
-[5]: https://store.itophub.io/en_US/
-
-[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
-[12]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#service_management
-[13]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#change_management
-[14]: https://www.itophub.io/wiki/page?id=latest%3Aimplementation%3Astart#service_level_agreements_and_targets
-[15]: https://www.itophub.io/wiki/page?id=latest%3Auser%3Aactions#relations
-[16]: https://www.itophub.io/wiki/page?id=latest%3Auser%3Abulk_modify#uploading_data
-[17]: https://www.itophub.io/wiki/page?id=latest%3Aadmin%3Aaudit
-[18]: https://www.itophub.io/wiki/page?id=latest%3Aadvancedtopics%3Adata_synchro_overview
-
-
-
-## Last releases
-
-### Versions 2.6.*
- - 2.6.0 published on January 9, 2019
- - [Changes since the previous version][58]
- - [New features][59]
- - [Migration notes][60]
- - [Download iTop 2.6.1][61]
-
-[58]: https://www.itophub.io/wiki/page?id=2_6_0:release:change_log
-[59]: https://www.itophub.io/wiki/page?id=2_6_0:release:2_6_whats_new
-[60]: https://www.itophub.io/wiki/page?id=2_6_0:install:250_to_260_migration_notes
-[61]: https://sourceforge.net/projects/itop/files/itop/2.6.1
-
-
-### Versions 2.5.*
- - 2.5.0 published on July 11, 2018
- - [Changes since the previous version][54]
- - [New features][55]
- - [Migration notes][56]
- - [Download iTop 2.5.1][57]
-
-[54]: https://www.itophub.io/wiki/page?id=2_5_0:release:change_log
-[55]: https://www.itophub.io/wiki/page?id=2_5_0:release:2_5_whats_new
-[56]: https://www.itophub.io/wiki/page?id=2_5_0:install:240_to_250_migration_notes
-[57]: https://sourceforge.net/projects/itop/files/itop/2.5.1
- 
-
-### Versions 2.4.*
- - 2.4.0 published on November 16, 2017
- - [Changes since the previous version][50]
- - [New features][51]
- - [Migration notes][52]
- - [Download iTop 2.4.1][53]
-
-[50]: https://www.itophub.io/wiki/page?id=2_4_0:release:change_log
-[51]: https://www.itophub.io/wiki/page?id=2_4_0:release:2_4_whats_new
-[52]: https://www.itophub.io/wiki/page?id=2_4_0:install:230_to_240_migration_notes
-[53]: https://sourceforge.net/projects/itop/files/itop/2.4.1
-
-
-
-## About Us
-
-iTop development is sponsored, led and supported by [Combodo][0].
-
-[0]: https://www.combodo.com
-
-
-## Contributors
-
-We would like to give a special thank you to the people from the community who contributed to this project, including:
-
-### Names
- - Alves, David
- - Beck, Pedro
- - Bilger, Jean-François
- - Bostoen, Jeffrey
- - Cardoso, Anderson
- - Cassaro, Bruno
- - Casteleyn, Thomas
- - Castro, Randall Badilla
- - Colantoni, Maria Laura
- - Dvořák, Lukáš
- - Goethals, Stefan
- - Gumble, David
- - Hippler, Lars
- - Khamit, Shamil
- - Kincel, Martin
- - Konečný, Kamil
- - Kunin, Vladimir
- - Lassiter, Dennis
- - Lucas, Jonathan
- - Malik, Remie
- - Rosenke, Stephan
- - Seki, Shoji
- - Shilov, Vladimir
- - Tulio, Marco
- - Turrubiates, Miguel
-
-### Aliases
- - chifu1234
- - cprobst
- - Karkoff1212
- - larhip
- - Laura
- - Purple Grape
- - Schlobinux
- - theBigOne
- - ulmerspatz
-
-### Companies
- - Hardis
- - ITOMIG
-

SECURITY.md

@@ -1,36 +0,0 @@
-# 🔒 Reporting vulnerabilities
-
-We take all security bugs seriously. Thank you for improving the security of iTop! We appreciate your efforts and
-responsible disclosure and will make every effort to acknowledge your contributions.
-
-
-## ✉️ How to report
-
-### iTop vulnerabilities
-Please send a procedure to reproduce iTop vulnerabilities to [itop-security@combodo.com](mailto:itop-security@combodo.com).
-
-You can send us a standard "given / then / when" report, including iTop version, impacts, and maybe installed modules or data if they are 
-needed to reproduce.
-
-### Dependencies vulnerabilities
-Report security bugs in third-party modules to the person or team maintaining the module, and notify us of this report by sending an email 
-to [itop-security@combodo.com](mailto:itop-security@combodo.com).
-
-
-
-## 📆 Disclosure Policy
-
-Report sent to us will be acknowledged within the week.
-
-Then, a Combodo developer will be assigned to the reported issue and will:
-
-* confirm the problem and determine the affected iTop versions
-* audit the code to search any potential similar problems
-* try to find a workaround if any
-* create fixes for all releases still under maintenance
-* send you the commit(s) for review
-* send you the next version(s) that will contain the fix, and the estimated release dates
-
-Security issues always take precedence over bug fixes and feature work.
-
-The assignee will keep you informed of the resolution progress, and may ask you for additional information or guidance.

addons/userrights/userrightsmatrix.class.inc.php

@@ -121,15 +121,20 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
 		// Maybe we should check that no other user with userid == 0 exists
-		CMDBObject::SetTrackInfo('Initialization');
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
 		$oUser->Set('contactid', 1); // one is for root !
 		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
 
+		// Create a change to record the history of the User object
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$oChange->Set("userinfo", "Initialization");
+		$iChangeId = $oChange->DBInsert();
+
 		// Now record the admin user object
-		$iUserId = $oUser->DBInsertNoReload();
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
 		$this->SetupUser($iUserId, true);
 		return true;
 	}

addons/userrights/userrightsprofile.class.inc.php

@@ -437,6 +437,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	{
 		CMDBObject::SetTrackInfo('Initialization');
 
+		$oChange = CMDBObject::GetCurrentChange();
+
 		$iContactId = 0;
 		// Support drastic data model changes: no organization class (or not writable)!
 		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
@@ -444,7 +446,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oOrg = new Organization();
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
-			$iOrgId = $oOrg->DBInsertNoReload();
+			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
 
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
@@ -461,7 +463,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 					$oContact->Set('phone', '+00 000 000 000');
 				}
 				$oContact->Set('email', 'my.email@foo.org');
-				$iContactId = $oContact->DBInsertNoReload();
+				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
 			}
 		}
 
@@ -480,12 +482,14 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		if (is_object($oAdminProfile))
 		{
 			$oUserProfile = new URP_UserProfile();
+			//$oUserProfile->Set('userid', $iUserId);
 			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
 			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
 			$oSet = DBObjectSet::FromObject($oUserProfile);
 			$oUser->Set('profile_list', $oSet);
 		}
-		$iUserId = $oUser->DBInsertNoReload();
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
 		return true;
 	}
 

addons/userrights/userrightsprofile.db.class.inc.php

@@ -533,10 +533,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
 		// Create a change to record the history of the User object
-		/** @var \CMDBChange $oChange */
 		$oChange = MetaModel::NewObject("CMDBChange");
 		$oChange->Set("date", time());
 		$oChange->Set("userinfo", "Initialization");
+		$iChangeId = $oChange->DBInsert();
 
 		$iContactId = 0;
 		// Support drastic data model changes: no organization class (or not writable)!
@@ -545,8 +545,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oOrg = new Organization();
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
-			$oOrg::SetCurrentChange($oChange);
-			$iOrgId = $oOrg->DBInsertNoReload();
+			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
 
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
@@ -563,8 +562,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 					$oContact->Set('phone', '+00 000 000 000');
 				}
 				$oContact->Set('email', 'my.email@foo.org');
-				$oContact::SetCurrentChange($oChange);
-				$iContactId = $oContact->DBInsertNoReload();
+				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
 			}
 		}
 
@@ -583,13 +581,14 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		if (is_object($oAdminProfile))
 		{
 			$oUserProfile = new URP_UserProfile();
+			//$oUserProfile->Set('userid', $iUserId);
 			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
 			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
 			$oSet = DBObjectSet::FromObject($oUserProfile);
 			$oUser->Set('profile_list', $oSet);
 		}
-		$oUser::SetCurrentChange($oChange);
-		$iUserId = $oUser->DBInsertNoReload();
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
 		return true;
 	}
 

addons/userrights/userrightsprojection.class.inc.php

@@ -593,12 +593,25 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		$oChange = MetaModel::NewObject("CMDBChange");
 		$oChange->Set("date", time());
 		$oChange->Set("userinfo", "Initialization");
+		$iChangeId = $oChange->DBInsert();
 
 		$oOrg = new Organization();
 		$oOrg->Set('name', 'My Company/Department');
 		$oOrg->Set('code', 'SOMECODE');
-		$oOrg::SetCurrentChange($oChange);
-		$iOrgId = $oOrg->DBInsertNoReload();
+//		$oOrg->Set('status', 'implementation');
+		//$oOrg->Set('parent_id', xxx);
+		$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip strong security */);
+
+		// Location : optional
+		//$oLocation = new bizLocation();
+		//$oLocation->Set('name', 'MyOffice');
+		//$oLocation->Set('status', 'implementation');
+		//$oLocation->Set('org_id', $iOrgId);
+		//$oLocation->Set('severity', 'high');
+		//$oLocation->Set('address', 'my building in my city');
+		//$oLocation->Set('country', 'my country');
+		//$oLocation->Set('parent_location_id', xxx);
+		//$iLocationId = $oLocation->DBInsertNoReload();
 
 		$oContact = new Person();
 		$oContact->Set('name', 'My last name');
@@ -606,24 +619,24 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		//$oContact->Set('status', 'available');
 		$oContact->Set('org_id', $iOrgId);
 		$oContact->Set('email', 'my.email@foo.org');
-		$oContact::SetCurrentChange($oChange);
-		$iContactId = $oContact->DBInsertNoReload();
+		//$oContact->Set('phone', '');
+		//$oContact->Set('location_id', $iLocationId);
+		//$oContact->Set('employee_number', '');
+		$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
 		
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
 		$oUser->Set('contactid', $iContactId);
 		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
-		$oUser::SetCurrentChange($oChange);
-		$iUserId = $oUser->DBInsertNoReload();
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
 		
 		// Add this user to the very specific 'admin' profile
 		$oUserProfile = new URP_UserProfile();
 		$oUserProfile->Set('userid', $iUserId);
 		$oUserProfile->Set('profileid', ADMIN_PROFILE_ID);
 		$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-		$oUserProfile::SetCurrentChange($oChange);
-		$oUserProfile->DBInsertNoReload();
+		$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
 		return true;
 	}
 

application/ajaxwebpage.class.inc.php

@@ -30,7 +30,7 @@ class ajax_page extends WebPage implements iTabbedPage
 {
     /**
      * Jquery style ready script
-     * @var array
+     * @var Hash     
      */	  
 	protected $m_sReadyScript;
 	protected $m_oTabs;
@@ -214,11 +214,8 @@ PrepareWidgets();
 EOF
 			);
 		}
-	    $this->outputCollapsibleSectionInit();
-
-	    $oKPI = new ExecutionKPI();
-	    $s_captured_output = $this->ob_get_clean_safe();
-	    if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
+        $s_captured_output = $this->ob_get_clean_safe();
+		  if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
         {
         	// inline content != attachment && html => filter all scripts for malicious XSS scripts
         	echo self::FilterXSS($this->s_content);
@@ -288,16 +285,10 @@ EOF
         	echo self::FilterXSS($s_captured_output);
         }
 
-	    $oKPI->ComputeAndReport('Echoing');
-
         if (class_exists('DBSearch'))
         {
             DBSearch::RecordQueryTrace();
         }
-	    if (class_exists('ExecutionKPI'))
-	    {
-		    ExecutionKPI::ReportStats();
-	    }
     }
 
     /**

application/applicationcontext.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2018 Combodo SARL
+// Copyright (C) 2010-2012 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * Class ApplicationContext
  *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -31,12 +31,6 @@ require_once(APPROOT."/application/utils.inc.php");
  */ 
 interface iDBObjectURLMaker
 {
-    /**
-     * @param string $sClass
-     * @param string $iId
-     *
-     * @return string
-     */
 	public static function MakeObjectURL($sClass, $iId);
 }
 
@@ -45,13 +39,6 @@ interface iDBObjectURLMaker
  */ 
 class iTopStandardURLMaker implements iDBObjectURLMaker
 {
-    /**
-     * @param string $sClass
-     * @param string $iId
-     *
-     * @return string
-     * @throws \Exception
-     */
 	public static function MakeObjectURL($sClass, $iId)
 	{
 		$sPage = DBObject::ComputeStandardUIPage($sClass);
@@ -66,13 +53,6 @@ class iTopStandardURLMaker implements iDBObjectURLMaker
  */ 
 class PortalURLMaker implements iDBObjectURLMaker
 {
-    /**
-     * @param string $sClass
-     * @param string $iId
-     *
-     * @return string
-     * @throws \Exception
-     */
 	public static function MakeObjectURL($sClass, $iId)
 	{
 		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
@@ -94,20 +74,10 @@ class PortalURLMaker implements iDBObjectURLMaker
  */
 class ApplicationContext
 {
-    public static $m_sUrlMakerClass = null;
-    protected static $m_aPluginProperties = null;
-    protected static $aDefaultValues; // Cache shared among all instances
-
 	protected $aNames;
 	protected $aValues;
-
-    /**
-     * ApplicationContext constructor.
-     *
-     * @param bool $bReadContext
-     *
-     * @throws \Exception
-     */
+	protected static $aDefaultValues; // Cache shared among all instances
+	
 	public function __construct($bReadContext = true)
 	{
 		$this->aNames = array(
@@ -119,13 +89,11 @@ class ApplicationContext
 		}
 
 	}
-
-    /**
-     * Read the context directly in the PHP parameters (either POST or GET)
-     * return nothing
-     *
-     * @throws \Exception
-     */
+	
+	/**
+	 * Read the context directly in the PHP parameters (either POST or GET)
+	 * return nothing
+	 */
 	protected function ReadContext()
 	{
 		if (!isset(self::$aDefaultValues))
@@ -142,26 +110,20 @@ class ApplicationContext
 				}
 				// Hmm, there must be a better (more generic) way to handle the case below:
 				// When there is only one possible (allowed) organization, the context must be
-				// fixed to this org unless there is only one organization in the system then
-				// no filter is applied
+				// fixed to this org
 				if ($sName == 'org_id')
 				{
 					if (MetaModel::IsValidClass('Organization'))
 					{
 						$oSearchFilter = new DBObjectSearch('Organization');
+						$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 						$oSet = new CMDBObjectSet($oSearchFilter);
 						$iCount = $oSet->CountWithLimit(2);
-						if ($iCount > 1)
+						if ($iCount == 1)
 						{
-							$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-							$oSet = new CMDBObjectSet($oSearchFilter);
-							$iCount = $oSet->CountWithLimit(2);
-							if ($iCount == 1)
-							{
-								// Only one possible value for org_id, set it in the context
-								$oOrg = $oSet->Fetch();
-								self::$aDefaultValues[$sName] = $oOrg->GetKey();
-							}
+							// Only one possible value for org_id, set it in the context
+							$oOrg = $oSet->Fetch();
+							self::$aDefaultValues[$sName] = $oOrg->GetKey();
 						}
 					}					
 				}
@@ -169,15 +131,12 @@ class ApplicationContext
 		}
 		$this->aValues = self::$aDefaultValues;
 	}
-
-    /**
-     * Returns the current value for the given parameter
-     *
-     * @param string $sParamName Name of the parameter to read
-     * @param string $defaultValue
-     *
-     * @return mixed The value for this parameter
-     */
+	
+	/**
+	 * Returns the current value for the given parameter
+	 * @param string $sParamName Name of the parameter to read
+	 * @return mixed The value for this parameter
+	 */
 	public function GetCurrentValue($sParamName, $defaultValue = '')
 	{
 		if (isset($this->aValues[$sParamName]))
@@ -189,7 +148,7 @@ class ApplicationContext
 	
 	/**
 	 * Returns the context as string with the format name1=value1&name2=value2....
-	 * @return string The context as a string to be appended to an href property
+	 * return string The context as a string to be appended to an href property
 	 */
 	public function GetForLink()
 	{
@@ -203,7 +162,7 @@ class ApplicationContext
 	
 	/**
 	 * Returns the context as sequence of input tags to be inserted inside a <form> tag
-	 * @return string The context as a sequence of <input type="hidden" /> tags
+	 * return string The context as a sequence of <input type="hidden" /> tags
 	 */
 	public function GetForForm()
 	{
@@ -217,7 +176,7 @@ class ApplicationContext
 
 	/**
 	 * Returns the context as a hash array 'parameter_name' => value
-	 * @return array The context information
+	 * return array The context information
 	 */
 	public function GetAsHash()
 	{
@@ -240,7 +199,8 @@ class ApplicationContext
 	/**
 	 * Removes the specified parameter from the context, for example when the same parameter
 	 * is already a search parameter
-	 * @param string $sParamName Name of the parameter to remove
+	 * @param string $sParamName Name of the parameter to remove	 	 
+	 * @return none
 	 */	
 	public function Reset($sParamName)
 	{
@@ -252,11 +212,6 @@ class ApplicationContext
 
 	/**
 	 * Initializes the given object with the default values provided by the context
-	 *
-	 * @param \DBObject $oObj
-	 *
-	 * @throws \Exception
-	 * @throws \CoreUnexpectedValue
 	 */
 	public function InitObjectFromContext(DBObject &$oObj)
 	{
@@ -283,11 +238,13 @@ class ApplicationContext
 			}
 		}		
 	}
+	
+	static $m_sUrlMakerClass = null;
 
 	/**
 	 * Set the current application url provider
-	 * @param string $sClass Class implementing iDBObjectURLMaker
-	 * @return string
+	 * @param sClass string Class implementing iDBObjectURLMaker	 
+	 * @return void
 	 */
 	public static function SetUrlMakerClass($sClass = 'iTopStandardURLMaker')
 	{
@@ -321,14 +278,7 @@ class ApplicationContext
 
 	/**
 	 * Get the current application url provider
-	 *
-	 * @param string $sObjClass
-	 * @param string $sObjKey
-	 * @param null $sUrlMakerClass
-	 * @param bool $bWithNavigationContext
-	 *
 	 * @return string the name of the class
-	 * @throws \Exception
 	 */
    public static function MakeObjectUrl($sObjClass, $sObjKey, $sUrlMakerClass = null, $bWithNavigationContext = true)
    {
@@ -356,6 +306,8 @@ class ApplicationContext
 		}	
 	}
 
+	protected static $m_aPluginProperties = null;
+
 	/**
 	 * Load plugin properties for the current session
 	 * @return void
@@ -374,9 +326,9 @@ class ApplicationContext
 
 	/**
 	 * Set plugin properties
-	 * @param string $sPluginClass Class implementing any plugin interface
-	 * @param string $sProperty Name of the property
-	 * @param mixed $value Value (numeric or string)
+	 * @param sPluginClass string Class implementing any plugin interface
+	 * @param sProperty string Name of the property
+	 * @param value scalar Value (numeric or string)
 	 * @return void
 	 */
 	public static function SetPluginProperty($sPluginClass, $sProperty, $value)
@@ -389,7 +341,7 @@ class ApplicationContext
 
 	/**
 	 * Get plugin properties
-	 * @param string $sPluginClass Class implementing any plugin interface
+	 * @param sPluginClass string Class implementing any plugin interface
 	 * @return array of sProperty=>value pairs
 	 */
 	public static function GetPluginProperties($sPluginClass)
@@ -407,3 +359,4 @@ class ApplicationContext
 	}
 
 }
+?>

application/csvpage.class.inc.php

@@ -32,7 +32,7 @@ class CSVPage extends WebPage
     function __construct($s_title)
     {
         parent::__construct($s_title);
-	    $this->add_header("Content-type: text/plain; charset=".self::PAGES_CHARSET);
+		$this->add_header("Content-type: text/plain; charset=utf-8");
 		$this->add_header("Cache-control: no-cache");
 		//$this->add_header("Content-Transfer-Encoding: binary");
     }	

application/dashboardlayout.class.inc.php

@@ -59,7 +59,6 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 		$bNoVisibleFound = true;
 		while($idx < count($aKeys) && $bNoVisibleFound)
 		{
-			/** @var \Dashlet $oDashlet */
 			$oDashlet = $aDashlets[$aKeys[$idx]];
 			if ($oDashlet->IsVisible())
 			{
@@ -99,13 +98,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 		return $aCells;		
 		
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $aCells
-	 * @param bool $bEditMode
-	 * @param array $aExtraParams
-	 */
+	
 	public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = array())
 	{
 		// Trim the list of cells to remove the invisible/empty ones at the end of the array
@@ -129,7 +122,6 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 					$aDashlets = $aCells[$iCellIdx];
 					if (count($aDashlets) > 0)
 					{
-						/** @var \Dashlet $oDashlet */
 						foreach($aDashlets as $oDashlet)
 						{
 							if ($oDashlet->IsVisible())

application/datamodel.application.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
   <portals>
+    <portal id="legacy_portal" _delta="define">
+      <url>portal/index.php</url>
+      <rank>1.0</rank>
+      <handler/>
+      <allow>
+      </allow>
+      <deny/>
+    </portal>
     <portal id="backoffice" _delta="define">
       <url>pages/UI.php</url>
       <rank>2.0</rank>
@@ -15,10 +23,5 @@
     <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
       <rank>80</rank>
     </menu>
-    <menu id="System" xsi:type="MenuGroup" _delta="define">
-      <rank>100</rank>
-      <enable_class>ResourceSystemMenu</enable_class>
-      <enable_action>UR_ACTION_MODIFY</enable_action>
-    </menu>
   </menus>
 </itop_design>

application/datatable.class.inc.php

@@ -1,20 +1,25 @@
 <?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * Data Table to display a set of objects in a tabular manner in HTML
  *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 class DataTable
@@ -31,13 +36,8 @@ class DataTable
 	/**
 	 * @param $iListId mixed Unique ID for this div/table in the page
 	 * @param $oSet DBObjectSet The set of data to display
-	 * @param $aClassAliases array The list of classes/aliases to be displayed in this set $sAlias => $sClassName
+	 * @param $aClassAliases Hash The list of classes/aliases to be displayed in this set $sAlias => $sClassName
 	 * @param $sTableId mixed A string (or null) identifying this table in order to persist its settings
-	 *
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
 	 */
 	public function __construct($iListId, $oSet, $aClassAliases, $sTableId = null)
 	{
@@ -50,19 +50,7 @@ class DataTable
 		$this->oDefaultSettings = null;
 		$this->bShowObsoleteData = $oSet->GetShowObsoleteData();
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param \DataTableSettings $oSettings
-	 * @param $bActionsMenu
-	 * @param $sSelectMode
-	 * @param $bViewLink
-	 * @param $aExtraParams
-	 *
-	 * @return string
-	 * @throws \CoreException
-	 * @throws \MySQLException
-	 */
+	
 	public function Display(WebPage $oPage, DataTableSettings $oSettings, $bActionsMenu, $sSelectMode, $bViewLink, $aExtraParams)
 	{
 		$this->oDefaultSettings = $oSettings;
@@ -131,23 +119,7 @@ class DataTable
 		
 		return $this->GetAsHTML($oPage, $oCustomSettings->iDefaultPageSize, $oCustomSettings->iDefaultPageSize, 0, $oCustomSettings->aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams);
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $iPageSize
-	 * @param $iDefaultPageSize
-	 * @param $iPageIndex
-	 * @param $aColumns
-	 * @param $bActionsMenu
-	 * @param $bToolkitMenu
-	 * @param $sSelectMode
-	 * @param $bViewLink
-	 * @param $aExtraParams
-	 *
-	 * @return string
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 */
+	
 	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
 	{
 		$sObjectsCount = $this->GetObjectCount($oPage, $sSelectMode);
@@ -212,10 +184,6 @@ class DataTable
 	 */
 	public function GetAsHTMLTableRows(WebPage $oPage, $iPageSize, $aColumns, $sSelectMode, $bViewLink, $aExtraParams)
 	{
-		if ($iPageSize < 1)
-		{
-			$iPageSize = -1; // convention: no pagination
-		}
 		$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
 		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
 		
@@ -226,13 +194,7 @@ class DataTable
 		}
 		return $sHtml;
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $sSelectMode
-	 *
-	 * @return string
-	 */
+	
 	protected function GetObjectCount(WebPage $oPage, $sSelectMode)
 	{
 		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
@@ -245,15 +207,6 @@ class DataTable
 		}
 		return $sHtml;		
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $iPageSize
-	 * @param $iDefaultPageSize
-	 * @param $iPageIndex
-	 *
-	 * @return string
-	 */
 	protected function GetPager(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex)
 	{
 		$sHtml = '';
@@ -269,21 +222,14 @@ class DataTable
 		}
 		
 		$sCombo = '<select class="pagesize">';
-		if($iPageSize < 1)
+		for($iPage = 1; $iPage < 5; $iPage++)
 		{
-			$sCombo .= "<option selected=\"selected\" value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
+			$iNbItems = $iPage * $iDefaultPageSize;
+			$sSelected = ($iNbItems == $iPageSize) ? 'selected="selected"' : '';
+			$sCombo .= "<option  $sSelected value=\"$iNbItems\">$iNbItems</option>";
 		}
-		else
-		{
-			for($iPage = 1; $iPage < 5; $iPage++)
-			{
-				$iNbItems = $iPage * $iDefaultPageSize;
-				$sSelected = ($iNbItems == $iPageSize) ? 'selected="selected"' : '';
-				$sCombo .= "<option  $sSelected value=\"$iNbItems\">$iNbItems</option>";
-			}
-			$sCombo .= "<option value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
-		}
-
+		$sSelected = ($iPageSize < 1) ? 'selected="selected"' : '';
+		$sCombo .= "<option  $sSelected value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
 		$sCombo .= '</select>';
 		
 		$sPages = Dict::S('UI:Pagination:PagesLabel');
@@ -338,17 +284,7 @@ class DataTable
 EOF;
 		return $sHtml;
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $aExtraParams
-	 *
-	 * @return string
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 */
+	
 	protected function GetActionsMenu(WebPage $oPage, $aExtraParams)
 	{
 		$oMenuBlock = new MenuBlock($this->oSet->GetFilter(), 'list');
@@ -356,20 +292,13 @@ EOF;
 		$sHtml = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $this->iListId);
 		return $sHtml;
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $aExtraParams
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
+	
 	protected function GetToolkitMenu(WebPage $oPage, $aExtraParams)
 	{
 		if (!$oPage->IsPrintableVersion())
 		{
 			$sMenuTitle = Dict::S('UI:ConfigureThisList');
-			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li><i class="fas fa-tools"></i><i class="fas fa-caret-down"></i><ul>';
+			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li><img src="../images/toolkit_menu.png?t='.utils::GetCacheBusterTimestamp().'"><ul>';
 	
 			$oMenuItem1 = new JSPopupMenuItem('iTop::ConfigureList', $sMenuTitle, "$('#datatable_dlg_".$this->iListId."').dialog('open');");
 			$aActions = array(
@@ -386,15 +315,7 @@ EOF;
 		}
 		return $sHtml;
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $aColumns
-	 * @param $bViewLink
-	 * @param $iDefaultPageSize
-	 *
-	 * @return string
-	 */
+	
 	protected function GetTableConfigDlg(WebPage $oPage, $aColumns, $bViewLink, $iDefaultPageSize)
 	{
 		$sHtml = "<div id=\"datatable_dlg_{$this->iListId}\" style=\"display: none;\">";
@@ -430,27 +351,13 @@ EOF;
 
 		return $sHtml;
 	}
-
-	/**
-	 * @param $oSetting
-	 *
-	 * @return array
-	 */
+	
 	public function GetAsHash($oSetting)
 	{
 		$aSettings = array('iDefaultPageSize' => $oSetting->iDefaultPageSize, 'oColumns' => $oSetting->aColumns);
 		return $aSettings;
 	}
-
-	/**
-	 * @param $aColumns
-	 * @param $sSelectMode
-	 * @param $bViewLink
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 */
+	
 	protected function GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink)
 	{
 		$aAttribs = array();
@@ -483,21 +390,7 @@ EOF;
 		}
 		return $aAttribs;
 	}
-
-	/**
-	 * @param $aColumns
-	 * @param $sSelectMode
-	 * @param $iPageSize
-	 * @param $bViewLink
-	 * @param $aExtraParams
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
+	
 	protected function GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
 	{
 		$bLocalize = true;
@@ -580,24 +473,7 @@ EOF;
 		}
 		return $aValues;
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $aColumns
-	 * @param $sSelectMode
-	 * @param $iPageSize
-	 * @param $bViewLink
-	 * @param $aExtraParams
-	 *
-	 * @return string
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \DictExceptionMissingString
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
+	
 	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
 	{
 		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
@@ -698,16 +574,11 @@ EOF
 		}
 		return $sHtml;
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $iDefaultPageSize
-	 * @param $iStart
-	 */
+	
 	public function UpdatePager(WebPage $oPage, $iDefaultPageSize, $iStart)
 	{
-		$iPageSize = $iDefaultPageSize;
-		$iPageIndex = 0;
+		$iPageSize = ($iDefaultPageSize < 1) ? 1 : $iDefaultPageSize;
+		$iPageIndex = 1 + floor($iStart / $iPageSize);
 		$sHtml = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
 		$oPage->add_ready_script("$('#pager{$this->iListId}').html('".json_encode($sHtml)."');");
 		if ($iDefaultPageSize < 1)
@@ -727,48 +598,11 @@ EOF
  */
 class PrintableDataTable extends DataTable
 {
-	/**
-	 * @param \WebPage $oPage
-	 * @param $iPageSize
-	 * @param $iDefaultPageSize
-	 * @param $iPageIndex
-	 * @param $aColumns
-	 * @param $bActionsMenu
-	 * @param $bToolkitMenu
-	 * @param $sSelectMode
-	 * @param $bViewLink
-	 * @param $aExtraParams
-	 *
-	 * @return string
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \DictExceptionMissingString
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
 	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
 	{
 		return $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, -1, $bViewLink, $aExtraParams);
 	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param $aColumns
-	 * @param $sSelectMode
-	 * @param $iPageSize
-	 * @param $bViewLink
-	 * @param $aExtraParams
-	 *
-	 * @return string
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \DictExceptionMissingString
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
+	
 	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
 	{
 		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
@@ -793,13 +627,7 @@ class DataTableSettings implements Serializable
 	public $iDefaultPageSize;
 	public $aColumns;
 
-
-	/**
-	 * DataTableSettings constructor.
-	 *
-	 * @param $aClassAliases
-	 * @param null $sTableId
-	 */
+	
 	public function __construct($aClassAliases, $sTableId = null)
 	{
 		$this->aClassAliases = $aClassAliases;
@@ -807,22 +635,14 @@ class DataTableSettings implements Serializable
 		$this->iDefaultPageSize = 10;
 		$this->aColumns = array();
 	}
-
-	/**
-	 * @param $iDefaultPageSize
-	 * @param $aSortOrder
-	 * @param $aColumns
-	 */
+	
 	protected function Init($iDefaultPageSize, $aSortOrder, $aColumns)
 	{
 		$this->iDefaultPageSize = $iDefaultPageSize;
 		$this->aColumns = $aColumns;
 		$this->FixVisibleColumns();
 	}
-
-	/**
-	 * @return string
-	 */
+	
 	public function serialize()
 	{
 		// Save only the 'visible' columns
@@ -848,12 +668,7 @@ class DataTableSettings implements Serializable
 			)
 		);
 	}
-
-	/**
-	 * @param string $sData
-	 *
-	 * @throws \Exception
-	 */
+	
 	public function unserialize($sData)
 	{
 		$aData = unserialize($sData);
@@ -886,16 +701,7 @@ class DataTableSettings implements Serializable
 		}
 		$this->FixVisibleColumns();		
 	}
-
-	/**
-	 * @param $aClassAliases
-	 * @param $bViewLink
-	 * @param $aDefaultLists
-	 *
-	 * @return \DataTableSettings
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 */
+	
 	static public function GetDataModelSettings($aClassAliases, $bViewLink, $aDefaultLists)
 	{
 		$oSettings = new DataTableSettings($aClassAliases);
@@ -945,18 +751,11 @@ class DataTableSettings implements Serializable
 		$oSettings->Init($iDefaultPageSize, $aSortOrder, $aColumns);
 		return $oSettings;
 	}
-
-	/**
-	 * @throws \CoreException
-	 */
+	
 	protected function FixVisibleColumns()
 	{
 		foreach($this->aClassAliases as $sAlias => $sClass)
 		{
-			if (!isset($this->aColumns[$sAlias]))
-			{
-				continue;
-			}
 			foreach($this->aColumns[$sAlias] as $sAttCode => $aData)
 			{
 				// Remove non-existent columns
@@ -972,7 +771,7 @@ class DataTableSettings implements Serializable
 			$aTempData = array();
 			foreach($aList as $sAttCode => $oAttDef)
 			{
-				if ( (!array_key_exists($sAttCode, $this->aColumns[$sAlias])) && (!($oAttDef instanceof AttributeLinkedSet || $oAttDef instanceof AttributeDashboard)))
+				if ( (!array_key_exists($sAttCode, $this->aColumns[$sAlias])) && (!$oAttDef instanceof AttributeLinkSet))
 				{
 					$aFieldData = $this->GetFieldData($sAlias, $sAttCode, $oAttDef, false /* bChecked */, 'none');
 					if ($aFieldData) $aTempData[$aFieldData['label']] = $aFieldData;
@@ -985,15 +784,7 @@ class DataTableSettings implements Serializable
 			}
 		}		
 	}
-
-	/**
-	 * @param $aClassAliases
-	 * @param null $sTableId
-	 * @param bool $bOnlyOnTable
-	 *
-	 * @return \DataTableSettings|null
-	 * @throws \Exception
-	 */
+	
 	static public function GetTableSettings($aClassAliases, $sTableId = null, $bOnlyOnTable = false)
 	{
 		$pref = null;
@@ -1022,10 +813,7 @@ class DataTableSettings implements Serializable
 		
 		return $oSettings;
 	}
-
-	/**
-	 * @return array
-	 */
+	
 	public function GetSortOrder()
 	{
 		$aSortOrder = array();
@@ -1043,12 +831,7 @@ class DataTableSettings implements Serializable
 		}
 		return $aSortOrder;
 	}
-
-	/**
-	 * @param null $sTargetTableId
-	 *
-	 * @return bool
-	 */
+	
 	public function Save($sTargetTableId = null)
 	{
 		$sSaveId = is_null($sTargetTableId) ? $this->sTableId : $sTargetTableId;
@@ -1059,9 +842,6 @@ class DataTableSettings implements Serializable
 		return true;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function SaveAsDefault()
 	{
 		$sSettings = $this->serialize();
@@ -1091,12 +871,7 @@ class DataTableSettings implements Serializable
 		}
 		return true;
 	}
-
-	/**
-	 * @param null $sTableId
-	 *
-	 * @return string
-	 */
+	
 	protected function GetPrefsKey($sTableId = null)
 	{
 		if ($sTableId == null) $sTableId = '*';
@@ -1107,18 +882,7 @@ class DataTableSettings implements Serializable
 		}
 		return implode('/', $aKeys).'|'.$sTableId;
 	}
-
-	/**
-	 * @param $sAlias
-	 * @param $sAttCode
-	 * @param $oAttDef
-	 * @param $bChecked
-	 * @param $sSort
-	 *
-	 * @return array|bool
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 */
+	
 	protected function GetFieldData($sAlias, $sAttCode, $oAttDef, $bChecked, $sSort)
 	{
 		$ret = false;
@@ -1168,4 +932,4 @@ class DataTableSettings implements Serializable
 		}
 		return $ret;		
 	}
-}
+}

application/displayblock.class.inc.php

@@ -1,20 +1,26 @@
 <?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * DisplayBlock and derived class
  *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 require_once(APPROOT.'/application/webpage.class.inc.php');
@@ -85,7 +91,7 @@ class DisplayBlock
 	{
 		$oDummyFilter = new DBObjectSearch($oSet->GetClass());
 		$aKeys = array();
-		$oSet->OptimizeColumnLoad(array($oSet->GetClassAlias() => array())); // No need to load all the columns just to get the id
+		$oSet->OptimizeColumnLoad(array('id')); // No need to load all the columns just to get the id
 		while($oObject = $oSet->Fetch())
 		{
 			$aKeys[] = $oObject->GetKey();	
@@ -214,26 +220,9 @@ class DisplayBlock
 		$aExtraParams['currentId'] = $sId;
 		$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
 		
-		if (isset($aExtraParams['query_params']))
-		{
-			$aQueryParams = $aExtraParams['query_params'];
-		}
-		else
-		{
-			if (isset($aExtraParams['this->id']) && isset($aExtraParams['this->class']))
-			{
-				$sClass = $aExtraParams['this->class'];
-				$iKey = $aExtraParams['this->id'];
-				$oObj = MetaModel::GetObject($sClass, $iKey);
-				$aQueryParams = array('this->object()' => $oObj);
-			}
-			else
-			{
-				$aQueryParams = array();
-			}
-		}
 
-		$sFilter = addslashes($this->m_oFilter->serialize(false, $aQueryParams)); // Used either for asynchronous or auto_reload
+
+		$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
 		if (!$this->m_bAsynchronous)
 		{
 			// render now
@@ -243,7 +232,7 @@ class DisplayBlock
 				$sHtml .= $this->GetRenderContent($oPage, $aExtraParams, $sId);
 			} catch (Exception $e)
 			{
-				IssueLog::Error('Exception during GetDisplay: ' . $e->getMessage());
+
 			}
 			$sHtml .= "</div>\n";
 		}
@@ -325,31 +314,20 @@ class DisplayBlock
 	 * @throws MySQLException
 	 * @throws Exception
 	 */
-	public function GetRenderContent(WebPage $oPage, $aExtraParams, $sId)
+	public function GetRenderContent(WebPage $oPage, $aExtraParams = array(), $sId)
 	{
 		$sHtml = '';
 		// Add the extra params into the filter if they make sense for such a filter
 		$bDoSearch = utils::ReadParam('dosearch', false);
-		$aQueryParams = array();
-		if (isset($aExtraParams['query_params']))
-		{
-			$aQueryParams = $aExtraParams['query_params'];
-		}
-		else
-		{
-			if (isset($aExtraParams['this->id']) && isset($aExtraParams['this->class']))
-			{
-				$sClass = $aExtraParams['this->class'];
-				$iKey = $aExtraParams['this->id'];
-				$oObj = MetaModel::GetObject($sClass, $iKey);
-				$aQueryParams = array('this->object()' => $oObj);
-			}
-		}
 		if ($this->m_oSet == null)
 		{
-
+			$aQueryParams = array();
+			if (isset($aExtraParams['query_params']))
+			{
+				$aQueryParams = $aExtraParams['query_params'];
+			}
 			// In case of search, the context filtering is done by the search itself
-			if (($this->m_sStyle != 'links') && ($this->m_sStyle != 'search') && ($this->m_sStyle != 'list_search'))
+			if (($this->m_sStyle != 'links') && ($this->m_sStyle != 'search'))
 			{
 				$oAppContext = new ApplicationContext();
 				$sClass = $this->m_oFilter->GetClass();
@@ -479,25 +457,14 @@ class DisplayBlock
 					$oSubsetSearch = $this->m_oFilter->DeepClone();
 					$oCondition = new BinaryExpression($oGroupByExp, '=', new ScalarExpression($aValues[$iRow]));
 					$oSubsetSearch->AddConditionExpression($oCondition);
-					if (isset($aExtraParams['query_params']))
-					{
-						$aQueryParams = $aExtraParams['query_params'];
-					}
-					else
-					{
-						$aQueryParams = array();
-					}
-					$sFilter = rawurlencode($oSubsetSearch->serialize(false, $aQueryParams));
+					$sFilter = urlencode($oSubsetSearch->serialize());
 
 					$aData[] = array ('group' => $aLabels[$iRow],
 									  'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter\">$iCount</a>"); // TO DO: add the context information
 				}
 				$aAttribs =array(
 					'group' => array('label' => $sGroupByLabel, 'description' => ''),
-					'value' => array(
-						'label' => Dict::S('UI:GroupBy:'.$sAggregationFunction),
-						'description' => Dict::Format('UI:GroupBy:'.$sAggregationFunction.'+', $sAggregationAttr),
-					),
+					'value' => array('label'=> Dict::S('UI:GroupBy:'.$sAggregationFunction), 'description' => Dict::Format('UI:GroupBy:'.$sAggregationFunction.'+', $sAggregationAttr))
 				);
 				$sFormat = isset($aExtraParams['format']) ? $aExtraParams['format'] : 'UI:Pagination:HeaderNoSelection';
 				$sHtml .= $oPage->GetP(Dict::Format($sFormat, $iTotalCount));
@@ -613,7 +580,6 @@ class DisplayBlock
 			}
 			break;
 
-			case 'list_search':
 			case 'list':
 			$aClasses = $this->m_oSet->GetSelectedClasses();
 			$aAuthorizedClasses = array();
@@ -696,7 +662,7 @@ class DisplayBlock
 							'breadcrumb_label' => MetaModel::GetName($this->m_oSet->GetClass()),
 							'breadcrumb_max_count' => utils::GetConfig()->Get('breadcrumb.max_count'),
 							'breadcrumb_instance_id' => MetaModel::GetConfig()->GetItopInstanceid(),
-							'breadcrumb_icon' => utils::GetAbsoluteUrlAppRoot().'images/breadcrumb-search.png',
+							'breadcrumb_icon' => utils::GetAbsoluteUrlAppRoot().'images/breadcrumb-search.png'
 						));
 
 						$oPage->add_ready_script("$('body').trigger('update_history.itop', [$seventAttachedData])");
@@ -749,7 +715,7 @@ class DisplayBlock
 			$sClass = $this->m_oFilter->GetClass();
 			$oAppContext = new ApplicationContext();
 			$bContextFilter = isset($aExtraParams['context_filter']) ? isset($aExtraParams['context_filter']) != 0 : false;
-			if ($bContextFilter && is_null($this->m_oSet))
+			if ($bContextFilter)
 			{
 				foreach($oAppContext->GetNames() as $sFilterCode)
 				{
@@ -768,7 +734,7 @@ class DisplayBlock
 				$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
 			}
 			$iCount = $this->m_oSet->Count();
-			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize());
+			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($this->m_oFilter->serialize());
 			$sHtml .= '<p><a class="actions" href="'.$sHyperlink.'">';
 			// Note: border set to 0 due to various browser interpretations (IE9 adding a 2px border)
 			$sHtml .= MetaModel::GetClassIcon($sClass, true, 'float;left;margin-right:10px;border:0;');
@@ -857,7 +823,7 @@ class DisplayBlock
 						}
 						$sHyperlink = utils::GetAbsoluteUrlAppRoot()
 							.'pages/UI.php?operation=search&'.$oAppContext->GetForLink()
-							.'&filter='.rawurlencode($oSingleGroupByValueFilter->serialize());
+							.'&filter='.urlencode($oSingleGroupByValueFilter->serialize());
 						$aCounts[$sStateValue] = "<a href=\"$sHyperlink\">{$aCounts[$sStateValue]}</a>";
 					}
 				}
@@ -866,7 +832,7 @@ class DisplayBlock
 			$sHtml .= '<tr><td>'.implode('</td><td>', $aCounts).'</td></tr></table></div>';
 			// Title & summary
 			$iCount = $this->m_oSet->Count();
-			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize());
+			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($this->m_oFilter->serialize());
 			$sHtml .= '<h1>'.Dict::S(str_replace('_', ':', $sTitle)).'</h1>';
 			$sHtml .= '<a class="summary" href="'.$sHyperlink.'">'.Dict::Format(str_replace('_', ':', $sLabel), $iCount).'</a>';
 			$sHtml .= '<div style="clear:both;"></div>';
@@ -877,7 +843,7 @@ class DisplayBlock
 
 			$sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv'; 
 			$sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($sCsvFile);
-			$sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
+			$sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($this->m_oFilter->serialize()).'&format=csv';
 			// Pass the parameters via POST, since expression may be very long
 			$aParamsToPost = array(
 				'expression' => $this->m_oFilter->ToOQL(true),
@@ -947,10 +913,10 @@ class DisplayBlock
 	
 			$sChartType = isset($aExtraParams['chart_type']) ? $aExtraParams['chart_type'] : 'pie';
 			$sTitle = isset($aExtraParams['chart_title']) ? '<h1 style="text-align:center">'.htmlentities(Dict::S($aExtraParams['chart_title']), ENT_QUOTES, 'UTF-8').'</h1>' : '';
-			$sHtml = "$sTitle<div style=\"height:200px;width:100%\" class=\"dashboard_chart\" id=\"my_chart_$sId{$iChartCounter}\"><div style=\"height:200px;line-height:200px;vertical-align:center;text-align:center;width:100%\"><img src=\"../images/indicator.gif\"></div></div>\n";
+			$sHtml = "$sTitle<div style=\"height:200px;width:100%\" id=\"my_chart_$sId{$iChartCounter}\"><div style=\"height:200px;line-height:200px;vertical-align:center;text-align:center;width:100%\"><img src=\"../images/indicator.gif\"></div></div>\n";
 			$sGroupBy = isset($aExtraParams['group_by']) ? $aExtraParams['group_by'] : '';
 			$sGroupByExpr = isset($aExtraParams['group_by_expr']) ? '&params[group_by_expr]='.$aExtraParams['group_by_expr'] : '';
-			$sFilter = $this->m_oFilter->serialize(false, $aQueryParams);
+			$sFilter = $this->m_oFilter->serialize();
 			$oContext = new ApplicationContext();
 			$sContextParam = $oContext->GetForLink();
 			$sAggregationFunction = isset($aExtraParams['aggregation_function']) ? $aExtraParams['aggregation_function'] : '';
@@ -961,11 +927,11 @@ class DisplayBlock
 
 			if (isset($aExtraParams['group_by_label']))
 			{
-				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam);
+				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
 			}
 			else
 			{
-				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam);
+				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
 			}
 
 			$oPage->add_ready_script(
@@ -1005,7 +971,7 @@ EOF
 					$oSubsetSearch = $this->m_oFilter->DeepClone();
 					$oCondition = new BinaryExpression($oGroupByExp, '=', new ScalarExpression($sValue));
 					$oSubsetSearch->AddConditionExpression($oCondition);
-					$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).'&'.$sContextParam;
+					$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".urlencode($oSubsetSearch->serialize()).'&'.$sContextParam;
 				}
 				$sJSURLs = json_encode($aURLs);
 			}
@@ -1023,7 +989,6 @@ EOF
 				$sJson = json_encode($aValues);
 				$oPage->add_ready_script(
 <<<EOF
-
 var chart = c3.generate({
     bindto: d3.select('#my_chart_$sId'),
     data: {
@@ -1071,12 +1036,6 @@ var chart = c3.generate({
 	  }
 	}
 });
-
-if (typeof(charts) === "undefined")
-{
-  charts = [];
-}
-charts.push(chart);
 EOF
 				);
 				break;
@@ -1115,12 +1074,6 @@ var chart = c3.generate({
 	  }
 	}
 });
-
-if (typeof(charts) === "undefined")
-{
-  charts = [];
-}
-charts.push(chart);
 EOF
 				);
 				break;				
@@ -1169,26 +1122,16 @@ EOF
 		}
 		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
 		{
-			// Used either for asynchronous or auto_reload
-			// does a json_encode twice to get a string usable as function parameter
-			$sFilterBefore = $this->m_oFilter->serialize();
-			$sFilter = json_encode($sFilterBefore);
-			$sExtraParams = json_encode(json_encode($aExtraParams));
+			$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
+			$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
 
-			$oPage->add_script(
-				<<<JS
-if (typeof window.oAutoReloadBlock == "undefined") {
-    window.oAutoReloadBlock = {};
-}
-if (typeof window.oAutoReloadBlock['$sId'] != "undefined") {
-    clearInterval(window.oAutoReloadBlock['$sId']);
-}
-
-window.oAutoReloadBlock['$sId'] = setInterval(function() {
-	ReloadBlock('$sId', '{$this->m_sStyle}', $sFilter, $sExtraParams);
-}, '$iReloadInterval');
-JS
-			);
+			$oPage->add_script('if (typeof window.oAutoReloadBlock == "undefined") {
+				    window.oAutoReloadBlock = {};
+				}
+				if (typeof window.oAutoReloadBlock[\''.$sId.'\'] != "undefined") {
+				    clearInterval(window.oAutoReloadBlock[\''.$sId.'\']);
+				}
+				window.oAutoReloadBlock[\''.$sId.'\'] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
 		}
 
 		return $sHtml;
@@ -1448,7 +1391,7 @@ class HistoryBlock extends DisplayBlock
 			default:
 			if ($bTruncated)
 			{
-				$sFilter = htmlentities($this->m_oFilter->serialize(), ENT_QUOTES, 'UTF-8');
+				$sFilter = $this->m_oFilter->serialize();
 				$sHtml .= '<div id="history_container"><p>';
 				$sHtml .= Dict::Format('UI:TruncatedResults', $this->iLimitCount, $oSet->Count());
 				$sHtml .= ' ';
@@ -1726,7 +1669,6 @@ class MenuBlock extends DisplayBlock
 					*/
 				}
 				$this->AddMenuSeparator($aActions);
-				/** @var \iApplicationUIExtension $oExtensionInstance */
 				foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
 				{
 					$oSet->Rewind();
@@ -1822,7 +1764,6 @@ class MenuBlock extends DisplayBlock
 		}
 		
 		$this->AddMenuSeparator($aActions);
-		/** @var \iApplicationUIExtension $oExtensionInstance */
 		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
 		{
 			$oSet->Rewind();
@@ -1880,11 +1821,11 @@ class MenuBlock extends DisplayBlock
 		{
 			if (count($aFavoriteActions) > 0)
 			{
-				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:OtherActions')."<i class=\"fas fa-caret-down\"></i>"."\n<ul>\n";
+				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:OtherActions')."\n<ul>\n";
 			}
 			else
 			{
-				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."<i class=\"fas fa-caret-down\"></i>"."\n<ul>\n";
+				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
 			}
 
 			$sHtml .= $oPage->RenderPopupMenuItems($aActions, $aFavoriteActions);
@@ -1892,8 +1833,7 @@ class MenuBlock extends DisplayBlock
 			if ($this->m_sStyle == 'details')
 			{
 				$sSearchAction = "window.location=\"{$sRootUrl}pages/UI.php?operation=search_form&do_search=0&class=$sClass{$sContext}\"";
-				$sHtml .= "<div class=\"actions_button icon_actions_button\" title=\"".htmlentities(Dict::Format('UI:SearchFor_Class',
-						MetaModel::GetName($sClass)), ENT_QUOTES, 'UTF-8')."\"><span class=\"search-button fas fa-search\" onclick='$sSearchAction'></span></div>";
+				$sHtml .= "<div class=\"actions_button icon_actions_button\" title=\"".htmlentities(Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass)), ENT_QUOTES, 'UTF-8')."\"><span class=\"search-button fa fa-search\" onclick='$sSearchAction'></span></div>";
 			}
 
 
@@ -1904,8 +1844,7 @@ class MenuBlock extends DisplayBlock
             }
 			if (!$oPage->IsPrintableVersion() && ($sRefreshAction!=''))
 			{
-				$sHtml .= "<div class=\"actions_button icon_actions_button\" title=\"".htmlentities(Dict::S('UI:Button:Refresh'),
-						ENT_QUOTES, 'UTF-8')."\"><span class=\"refresh-button fas fa-sync\" onclick=\"$sRefreshAction\"></span></div>";
+				$sHtml .= "<div class=\"actions_button icon_actions_button\" title=\"".htmlentities(Dict::S('UI:Button:Refresh'), ENT_QUOTES, 'UTF-8')."\"><span class=\"refresh-button fa fa-refresh\" onclick=\"$sRefreshAction\"></span></div>";
 			}
 
 

application/forms.class.inc.php

@@ -378,9 +378,9 @@ $('#$sDialogId').dialog({
 				}
 			}
 		} },
-		{ text: "$sCancelButtonLabel", click: function() { $(this).dialog( "close" ); $(this).remove(); } },
+		{ text: "$sCancelButtonLabel", click: function() { KillAllMenus(); $(this).dialog( "close" ); $(this).remove(); } },
 		],
-		close: function() { $(this).remove(); }
+		close: function() { KillAllMenus(); $(this).remove(); }
 	});
 	var oForm = $('#$sDialogId form');
 	var sFormId = oForm.attr('id');
@@ -395,7 +395,6 @@ EOF
 		{
 			foreach($aFields as $oField)
 			{
-				/** @var \DesignerFormField $oField */
 				$oField->ReadParam($aValues);
 			}
 		}
@@ -680,34 +679,17 @@ class DesignerTabularForm extends DesignerForm
 
 class DesignerFormField
 {
-	/** @var string $sLabel */
 	protected $sLabel;
-	/** @var string $sCode */
 	protected $sCode;
-	/** @var mixed $defaultValue */
 	protected $defaultValue;
-	/** @var \DesignerForm $oForm */
 	protected $oForm;
-	/** @var bool $bMandatory */
 	protected $bMandatory;
-	/** @var bool $bReadOnly */
 	protected $bReadOnly;
-	/** @var bool $bAutoApply */
 	protected $bAutoApply;
-	/** @var array $aCSSClasses */
 	protected $aCSSClasses;
-	/** @var bool $bDisplayed */
 	protected $bDisplayed;
-	/** @var array $aWidgetExtraParams */
 	protected $aWidgetExtraParams;
-
-	/**
-	 * DesignerFormField constructor.
-	 *
-	 * @param string $sCode
-	 * @param string $sLabel
-	 * @param mixed $defaultValue
-	 */
+	
 	public function __construct($sCode, $sLabel, $defaultValue)
 	{
 		$this->sLabel = $sLabel;
@@ -720,120 +702,75 @@ class DesignerFormField
 		$this->bDisplayed = true;
 		$this->aWidgetExtraParams = array();
 	}
-
-	/**
-	 * @return string
-	 */
+	
 	public function GetCode()
 	{
 		return $this->sCode;
 	}
-
-    /**
-     * @param \DesignerForm $oForm
-     */
-	public function SetForm(DesignerForm $oForm)
+	
+	public function SetForm($oForm)
 	{
 		$this->oForm = $oForm;
 	}
+	
 
-	/**
-	 * @param bool $bMandatory
-	 */
 	public function SetMandatory($bMandatory = true)
 	{
 		$this->bMandatory = $bMandatory;
 	}
 
-	/**
-	 * @param bool $bReadOnly
-	 */
 	public function SetReadOnly($bReadOnly = true)
 	{
 		$this->bReadOnly = $bReadOnly;
 	}
-
-	/**
-	 * @return bool
-	 */
+	
 	public function IsReadOnly()
 	{
 		return ($this->oForm->IsReadOnly() || $this->bReadOnly);
 	}
 
-	/**
-	 * @param bool $bAutoApply
-	 */
 	public function SetAutoApply($bAutoApply)
 	{
 		$this->bAutoApply = $bAutoApply;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function IsAutoApply()
 	{
 		return $this->bAutoApply;
 	}
 
-	/**
-	 * @param bool $bDisplayed
-	 */
 	public function SetDisplayed($bDisplayed)
 	{
 		$this->bDisplayed = $bDisplayed;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function IsDisplayed()
 	{
 		return $this->bDisplayed;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function GetFieldId()
 	{
 		return $this->oForm->GetFieldId($this->sCode);
 	}
-
-	/**
-	 * @return string
-	 */
+	
 	public function GetWidgetClass()
 	{
 		return 'property_field';
 	}
-
-	/**
-	 * @return array
-	 */
+	
 	public function GetWidgetExtraParams()
 	{
 		return $this->aWidgetExtraParams;
 	}
-
-	/**
-	 * @param \WebPage $oP
-	 * @param string $sFormId
-	 * @param string $sRenderMode
-	 *
-	 * @return array
-	 */
+	
 	public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog')
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		return array('label' => $this->sLabel, 'value' => "<input type=\"text\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($this->defaultValue, ENT_QUOTES, 'UTF-8')."\">");
 	}
-
-	/**
-	 * @param array $aValues
-	 */
+	
 	public function ReadParam(&$aValues)
 	{
 		if ($this->IsReadOnly())
@@ -860,18 +797,12 @@ class DesignerFormField
 			}
 		}
 	}
-
-	/**
-	 * @return bool
-	 */
+	
 	public function IsVisible()
 	{
 		return true;
 	}
-
-	/**
-	 * @param string $sCSSClass
-	 */
+	
 	public function AddCSSClass($sCSSClass)
 	{
 		$this->aCSSClasses[] = $sCSSClass;
@@ -879,8 +810,6 @@ class DesignerFormField
 	
 	/**
 	 * A way to set/change the default value after constructing the field
-	 *
-	 * @param array $aAllDefaultValue
 	 */
 	public function SetDefaultValueFrom($aAllDefaultValue)
 	{
@@ -889,12 +818,7 @@ class DesignerFormField
 			$this->defaultValue = $aAllDefaultValue[$this->GetCode()];
 		}
 	}
-
-	/**
-	 * @param $sFieldCode
-	 *
-	 * @return \DesignerFormField|false
-	 */
+	
 	public function FindField($sFieldCode)
 	{
 		if ($this->sCode == $sFieldCode)
@@ -904,17 +828,11 @@ class DesignerFormField
 		return false;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function GetHandlerEquals()
 	{
 		return 'null';
 	}
 
-	/**
-	 * @return string
-	 */
 	public function GetHandlerGetValue()
 	{
 		return 'null';
@@ -923,43 +841,25 @@ class DesignerFormField
 
 class DesignerLabelField extends DesignerFormField
 {
-	/** @var int $iCount A counter to automatically make the field code */
-	protected static $iCount = 0;
-	/** @var string $sDescription */
 	protected $sDescription;
-
-	/**
-	 * @inheritdoc
-	 */
+	
 	public function __construct($sLabel, $sDescription)
 	{
-		// Increase counter
-		static::$iCount++;
-
-		parent::__construct('label_number_' . static::$iCount, $sLabel, '');
+		parent::__construct('', $sLabel, '');
 		$this->sDescription = $sDescription;
 	}
-
-	/**
-	 * @inheritdoc
-	 */
+	
 	public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog')
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		return array('label' => $this->sLabel, 'value' => $this->sDescription);
 	}
-
-	/**
-	 * @inheritdoc
-	 */
+	
 	public function ReadParam(&$aValues)
 	{
 	}
-
-	/**
-	 * @inheritdoc
-	 */
+	
 	public function IsVisible()
 	{
 		return true;
@@ -1430,8 +1330,7 @@ class DesignerIconSelectionField extends DesignerFormField
 		$sPostUploadTo = ($this->sUploadUrl == null) ? 'null' : "'{$this->sUploadUrl}'";
 		if (!$this->IsReadOnly())
 		{
-			$sDefaultValue = ($this->defaultValue !== '') ? $this->defaultValue : $this->aAllowedValues[$idx]['value'];
-			$sValue = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"{$sDefaultValue}\"/>";
+			$sValue = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"{$this->defaultValue}\"/>";
 			$oP->add_ready_script(
 <<<EOF
 	$('#$sId').icon_select({current_idx: $idx, items: $sJSItems, post_upload_to: $sPostUploadTo});
@@ -1493,7 +1392,6 @@ class RunTimeIconSelectionField extends DesignerIconSelectionField
 			$sAvailableIcons .= '   static $sKey = '.var_export($sKey, true).';'.PHP_EOL;
 			$sAvailableIcons .= '   static $aIconFiles = '.var_export($aFiles, true).';'.PHP_EOL;
 			$sAvailableIcons .= '}'.PHP_EOL;
-			SetupUtils::builddir(dirname($sCacheFile));
 			file_put_contents($sCacheFile, $sAvailableIcons, LOCK_EX);
 		}
 		return $aFiles;

application/loginbasic.class.inc.php

@@ -1,124 +0,0 @@
-<?php
-/**
- * Class LoginBasic
- *
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class LoginBasic extends AbstractLoginFSMExtension
-{
-	/**
-	 * Return the list of supported login modes for this plugin
-	 *
-	 * @return array of supported login modes
-	 */
-	public function ListSupportedLoginModes()
-	{
-		return array('basic');
-	}
-
-	protected function OnModeDetection(&$iErrorCode)
-	{
-		if (!isset($_SESSION['login_mode']))
-		{
-			if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
-			{
-				$_SESSION['login_mode'] = 'basic';
-			}
-			elseif (isset($_SERVER['PHP_AUTH_USER']))
-			{
-				$_SESSION['login_mode'] = 'basic';
-			}
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnReadCredentials(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'basic')
-		{
-			list($sAuthUser, $sAuthPwd) = $this->GetAuthUserAndPassword();
-			$_SESSION['login_temp_auth_user'] =  $sAuthUser;
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-
-	protected function OnCheckCredentials(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'basic')
-		{
-			list($sAuthUser, $sAuthPwd) = $this->GetAuthUserAndPassword();
-			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $_SESSION['login_mode'], 'internal'))
-			{
-				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
-				return LoginWebPage::LOGIN_FSM_ERROR;
-			}
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCredentialsOK(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'basic')
-		{
-			list($sAuthUser) = $this->GetAuthUserAndPassword();
-			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnError(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'basic')
-		{
-			LoginWebPage::HTTP401Error();
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnConnected(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'basic')
-		{
-			$_SESSION['can_logoff'] = true;
-			return LoginWebPage::CheckLoggedUser($iErrorCode);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	private function GetAuthUserAndPassword()
-	{
-		$sAuthUser = '';
-		$sAuthPwd = null;
-		if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
-		{
-			list($sAuthUser, $sAuthPwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
-		}
-		else
-		{
-			if (isset($_SERVER['PHP_AUTH_USER']))
-			{
-				$sAuthUser = $_SERVER['PHP_AUTH_USER'];
-				// Unfortunately, the RFC is not clear about the encoding...
-				// IE and FF supply the user and password encoded in ISO-8859-1 whereas Chrome provides them encoded in UTF-8
-				// So let's try to guess if it's an UTF-8 string or not... fortunately all encodings share the same ASCII base
-				if (!LoginWebPage::LooksLikeUTF8($sAuthUser))
-				{
-					// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
-					// Supposed to be harmless in case of a plain ASCII string...
-					$sAuthUser = iconv('iso-8859-1', 'utf-8', $sAuthUser);
-				}
-				$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
-				if (!LoginWebPage::LooksLikeUTF8($sAuthPwd))
-				{
-					// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
-					// Supposed to be harmless in case of a plain ASCII string...
-					$sAuthPwd = iconv('iso-8859-1', 'utf-8', $sAuthPwd);
-				}
-			}
-		}
-		return array($sAuthUser, $sAuthPwd);
-	}
-}

application/logindefault.class.inc.php

@@ -1,129 +0,0 @@
-<?php
-/**
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Class LoginDefaultBefore
- */
-class LoginDefaultBefore extends AbstractLoginFSMExtension
-{
-	/**
-	 * Must be executed before the other login plugins
-	 *
-	 * @return array of supported login modes
-	 */
-	public function ListSupportedLoginModes()
-	{
-		return array('before');
-	}
-
-	protected function OnStart(&$iErrorCode)
-	{
-		$iErrorCode = LoginWebPage::EXIT_CODE_OK;
-
-		unset($_SESSION['login_temp_auth_user']);
-
-		// Check if proposed login mode is present and allowed
-		$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
-		$sProposedLoginMode = utils::ReadParam('login_mode', '');
-		$index = array_search($sProposedLoginMode, $aAllowedLoginTypes);
-		if ($index !== false)
-		{
-			// Force login mode
-			$_SESSION['login_mode'] = $sProposedLoginMode;
-		}
-		else
-		{
-			unset($_SESSION['login_mode']);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnReadCredentials(&$iErrorCode)
-	{
-		// Check if proposed login mode is present and allowed
-		$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
-		$sProposedLoginMode = utils::ReadParam('login_mode', '');
-		$index = array_search($sProposedLoginMode, $aAllowedLoginTypes);
-		if ($index !== false)
-		{
-			// Force login mode
-			LoginWebPage::SetLoginModeAndReload($sProposedLoginMode);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-}
-
-/**
- * Class LoginDefaultAfter
- */
-class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExtension
-{
-
-
-	/**
-	 * Must be executed after the other login plugins
-	 *
-	 * @return array of supported login modes
-	 */
-	public function ListSupportedLoginModes()
-	{
-		return array('after');
-	}
-
-	protected function OnError(&$iErrorCode)
-	{
-		self::ResetLoginSession();
-		$iOnExit = LoginWebPage::getIOnExit();
-		if ($iOnExit == LoginWebPage::EXIT_RETURN)
-		{
-			return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
-		}
-		elseif ($iOnExit == LoginWebPage::EXIT_HTTP_401)
-		{
-			LoginWebPage::HTTP401Error(); // Error, exit
-		}
-		// LoginWebPage::EXIT_PROMPT
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCredentialsOk(&$iErrorCode)
-	{
-		if (!isset($_SESSION['login_mode']))
-		{
-			// If no plugin validated the user, exit
-			self::ResetLoginSession();
-			exit();
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * Execute all actions to log out properly
-	 */
-	public function LogoutAction()
-	{
-		self::ResetLoginSession();
-	}
-
-	protected function OnConnected(&$iErrorCode)
-	{
-		unset($_SESSION['login_temp_auth_user']);
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	// Hard reset of the session
-	private static function ResetLoginSession()
-	{
-		LoginWebPage::ResetSession();
-		foreach (array_keys($_SESSION) as $sKey)
-		{
-			if (utils::StartsWith($sKey, 'login_'))
-			{
-				unset($_SESSION[$sKey]);
-			}
-		}
-	}
-}

application/loginexternal.class.inc.php

@@ -1,80 +0,0 @@
-<?php
-
-/**
- * Class LoginExternal
- *
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class LoginExternal extends AbstractLoginFSMExtension
-{
-
-	/**
-	 * Return the list of supported login modes for this plugin
-	 *
-	 * @return array of supported login modes
-	 */
-	public function ListSupportedLoginModes()
-	{
-		return array('external');
-	}
-
-	protected function OnModeDetection(&$iErrorCode)
-	{
-		if (!isset($_SESSION['login_mode']))
-		{
-			$sAuthUser = $this->GetAuthUser();
-			if ($sAuthUser && (strlen($sAuthUser) > 0))
-			{
-				$_SESSION['login_mode'] = 'external';
-			}
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCheckCredentials(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'external')
-		{
-			$sAuthUser = $this->GetAuthUser();
-			if (!UserRights::CheckCredentials($sAuthUser, '', $_SESSION['login_mode'], 'external'))
-			{
-				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
-				return LoginWebPage::LOGIN_FSM_ERROR;
-			}
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCredentialsOK(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'external')
-		{
-			$sAuthUser = $this->GetAuthUser();
-			LoginWebPage::OnLoginSuccess($sAuthUser, 'external', $_SESSION['login_mode']);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnConnected(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'external')
-		{
-			$_SESSION['can_logoff'] = false;
-			return LoginWebPage::CheckLoggedUser($iErrorCode);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function GetAuthUser()
-	{
-		$sExtAuthVar = MetaModel::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
-		eval('$sAuthUser = isset('.$sExtAuthVar.') ? '.$sExtAuthVar.' : false;'); // Retrieve the value
-		/** @var string $sAuthUser */
-		return $sAuthUser; // Retrieve the value
-	}
-}

application/loginform.class.inc.php

@@ -1,138 +0,0 @@
-<?php
-
-/**
- * Class LoginForm
- *
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
-{
-	private $bForceFormOnError = false;
-
-	/**
-	 * Return the list of supported login modes for this plugin
-	 *
-	 * @return array of supported login modes
-	 */
-	public function ListSupportedLoginModes()
-	{
-		return array('form');
-	}
-
-	protected function OnReadCredentials(&$iErrorCode)
-	{
-		if (!isset($_SESSION['login_mode']) || ($_SESSION['login_mode'] == 'form'))
-		{
-			$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))
-				{
-					// X-Combodo-Ajax is a special header automatically added to all ajax requests
-					// Let's reply that we're currently logged-out
-					header('HTTP/1.0 401 Unauthorized');
-					exit;
-				}
-
-				// No credentials yet, display the form
-				$oPage = LoginWebPage::NewLoginWebPage();
-				$oPage->DisplayLoginForm($this->bForceFormOnError);
-				$oPage->output();
-				$this->bForceFormOnError = false;
-				exit;
-			}
-
-			$_SESSION['login_temp_auth_user'] =  $sAuthUser;
-			$_SESSION['login_mode'] = 'form';
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCheckCredentials(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'form')
-		{
-			$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
-			$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
-			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $_SESSION['login_mode'], 'internal'))
-			{
-				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
-				return LoginWebPage::LOGIN_FSM_ERROR;
-			}
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCredentialsOK(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'form')
-		{
-			if (isset($_SESSION['auth_user']))
-			{
-				// If FSM reenter this state (example 2FA) then the auth_user is not resubmitted
-				$sAuthUser = $_SESSION['auth_user'];
-			}
-			else
-			{
-				$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
-			}
-			// Store 'auth_user' in session for further use
-			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnError(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'form')
-		{
-			$this->bForceFormOnError = true;
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnConnected(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'form')
-		{
-			$_SESSION['can_logoff'] = true;
-			return LoginWebPage::CheckLoggedUser($iErrorCode);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	/**
-	 * @return LoginTwigContext
-	 * @throws \Exception
-	 */
-	public function GetTwigContext()
-	{
-		$oLoginContext = new LoginTwigContext();
-		$oLoginContext->AddPostedVar('auth_user');
-		$oLoginContext->AddPostedVar('auth_pwd');
-
-		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
-		$sAuthPwd = utils::ReadParam('suggest_pwd', '', true, 'raw_data');
-
-		$aData = array(
-			'sAuthUser' => $sAuthUser,
-			'sAuthPwd' => $sAuthPwd,
-		);
-		$oLoginContext->AddBlockExtension('login_input', new LoginBlockExtension('extensionblock/loginforminput.html.twig', $aData));
-		$oLoginContext->AddBlockExtension('login_submit', new LoginBlockExtension('extensionblock/loginformsubmit.html.twig'));
-		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('extensionblock/loginformfooter.html.twig'));
-
-		$bEnableResetPassword = empty(MetaModel::GetConfig()->Get('forgot_password')) ? true : MetaModel::GetConfig()->Get('forgot_password');
-		$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
-		$aData = array(
-			'bEnableResetPassword' => $bEnableResetPassword,
-			'sResetPasswordUrl' => $sResetPasswordUrl,
-		);
-		$oLoginContext->AddBlockExtension('login_links', new LoginBlockExtension('extensionblock/loginformlinks.html.twig', $aData));
-
-		return $oLoginContext;
-	}
-}

application/logintwig.class.inc.php

@@ -1,321 +0,0 @@
-<?php
-
-/**
- *
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-use Combodo\iTop\TwigExtension;
-
-/**
- * Twig context for modules extending the login screen
- * Class LoginTwigContext
- */
-class LoginTwigContext
-{
-	/** @var array */
-	private $aBlockExtension;
-	/** @var array */
-	private $aPostedVars;
-	/** @var string  */
-	private $sTwigLoaderPath;
-	/** @var array */
-	private $aCSSFiles;
-	/** @var array */
-	private $aJsFiles;
-	private $sTwigNameSpace;
-
-	/**
-	 * Build a context to display the twig files used
-	 * to extend the login screens
-	 *
-	 * LoginTwigContext constructor.
-	 * @api
-	 */
-	public function __construct()
-	{
-		$this->aBlockExtension = array();
-		$this->aPostedVars = array();
-		$this->sTwigLoaderPath = null;
-		$this->aCSSFiles = array();
-		$this->aJsFiles = array();
-		$this->sTwigNameSpace = null;
-	}
-
-	/**
-	 * Set the absolute path on disk of the folder containing the twig templates
-	 *
-	 * @param string $sPath absolute path of twig templates directory
-	 * @api
-	 */
-	public function SetLoaderPath($sPath)
-	{
-		$this->sTwigLoaderPath = $sPath;
-	}
-
-	/**
-	 * Add a Twig block extension
-	 *
-	 * @param string $sBlockName
-	 * @param LoginBlockExtension $oBlockExtension
-	 */
-	public function AddBlockExtension($sBlockName, $oBlockExtension)
-	{
-		$this->aBlockExtension[$sBlockName] = $oBlockExtension;
-	}
-
-	/**
-	 * Add a variable intended to be posted on URL (and managed) by the module.
-	 * Declaring the posted variables will prevent the core engine to manipulate these variables.
-	 *
-	 * @param string $sPostedVar Name of the posted variable
-	 * @api
-	 */
-	public function AddPostedVar($sPostedVar)
-	{
-		$this->aPostedVars[] = $sPostedVar;
-	}
-
-	/**
-	 * Add the URL of a CSS file to link to the login screen
-	 *
-	 * @param string $sFile URL of the CSS file to link
-	 * @api
-	 */
-	public function AddCSSFile($sFile)
-	{
-		$this->aCSSFiles[] = $sFile;
-	}
-
-	/**
-	 * Add the URL of a javascript file to link to the login screen
-	 * @param string $sFile URL of the javascript file to link
-	 * @api
-	 */
-	public function AddJsFile($sFile)
-	{
-		$this->aJsFiles[] = $sFile;
-	}
-
-	/**
-	 * @param string $sBlockName
-	 *
-	 * @return \LoginBlockExtension
-	 */
-	public function GetBlockExtension($sBlockName)
-	{
-		/** @var LoginBlockExtension $oBlockExtension */
-		$oBlockExtension = isset($this->aBlockExtension[$sBlockName]) ? $this->aBlockExtension[$sBlockName] : null;
-		return $oBlockExtension;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function GetPostedVars()
-	{
-		return $this->aPostedVars;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function GetTwigLoaderPath()
-	{
-		return $this->sTwigLoaderPath;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function GetCSSFiles()
-	{
-		return $this->aCSSFiles;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function GetJsFiles()
-	{
-		return $this->aJsFiles;
-	}
-
-}
-
-/**
- * Twig block description for login screen extension
- * The login screen can be extended by adding twig templates
- * to specific blocks of the login screens
- *
- * Class LoginBlockExtension
- */
-class LoginBlockExtension
-{
-	private $sTwig;
-	private $aData;
-
-	/**
-	 * Create a new twig extension block
-	 * The given twig template can be HTML, CSS or JavaScript.
-	 * CSS goes to the block named 'css' and is inline in the page.
-	 * JavaScript goes to the blocks named 'script' or 'ready_script' and are inline in the page.
-	 * HTML goes to everywhere else
-	 *
-	 * LoginBlockExtension constructor.
-	 *
-	 * @param string $sTwig name of the twig file relative to the path given to the LoginTwigContext
-	 * @param array $aData Data given to the twig template (into the variable {{ aData }})
-	 * @api
-	 */
-	public function __construct($sTwig, $aData = array())
-	{
-		$this->sTwig = $sTwig;
-		$this->aData = $aData;
-	}
-
-	public function GetTwig()
-	{
-		return $this->sTwig;
-	}
-
-	public function GetData()
-	{
-		return $this->aData;
-	}
-}
-
-/**
- * Used by LoginWebPage to display the login screen
- * Class LoginTwigRenderer
- */
-class LoginTwigRenderer
-{
-	private $aLoginPluginList;
-	private $aPluginFormData;
-	private $aPostedVars;
-	private $oTwig;
-
-	public function __construct()
-	{
-		$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginUIExtension', false);
-		$this->aPluginFormData = array();
-		$aTwigLoaders = array();
-		$this->aPostedVars = array();
-		foreach ($this->aLoginPluginList as $oLoginPlugin)
-		{
-			/** @var \iLoginUIExtension $oLoginPlugin */
-			$oLoginContext = $oLoginPlugin->GetTwigContext();
-			if (is_null($oLoginContext))
-			{
-				continue;
-			}
-			$this->aPluginFormData[] = $oLoginContext;
-			$sTwigLoaderPath = $oLoginContext->GetTwigLoaderPath();
-			if ($sTwigLoaderPath != null)
-			{
-				$oExtensionLoader = new Twig_Loader_Filesystem();
-				$oExtensionLoader->setPaths($sTwigLoaderPath);
-				$aTwigLoaders[] = $oExtensionLoader;
-			}
-			$this->aPostedVars = array_merge($this->aPostedVars, $oLoginContext->GetPostedVars());
-		}
-
-		$oCoreLoader = new Twig_Loader_Filesystem(array(), APPROOT.'templates');
-		$aCoreTemplatesPaths = array('login', 'login/password');
-		// Having this path declared after the plugins let the plugins replace the core templates
-		$oCoreLoader->setPaths($aCoreTemplatesPaths);
-		// Having the core templates accessible within a different namespace offer the possibility to extend them while replacing them
-		$oCoreLoader->setPaths($aCoreTemplatesPaths, 'ItopCore');
-		$aTwigLoaders[] = $oCoreLoader;
-
-		$oLoader = new Twig_Loader_Chain($aTwigLoaders);
-		$this->oTwig = new Twig_Environment($oLoader);
-		TwigExtension::RegisterTwigExtensions($this->oTwig);
-	}
-
-	public function GetDefaultVars()
-	{
-		$sLogo = 'itop-logo-external.png';
-		$sBrandingLogo = 'login-logo.png';
-
-		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
-		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
-		$sDisplayIcon = utils::GetAbsoluteUrlAppRoot().'images/'.$sLogo.'?t='.utils::GetCacheBusterTimestamp();
-		if (file_exists(MODULESROOT.'branding/'.$sBrandingLogo))
-		{
-			$sDisplayIcon = utils::GetAbsoluteUrlModulesRoot().'branding/'.$sBrandingLogo.'?t='.utils::GetCacheBusterTimestamp();
-		}
-
-		$aVars = array(
-			'sAppRootUrl' => utils::GetAbsoluteUrlAppRoot(),
-			'aPluginFormData' => $this->GetPluginFormData(),
-			'sItopVersion' => ITOP_VERSION,
-			'sVersionShort' => $sVersionShort,
-			'sIconUrl' => $sIconUrl,
-			'sDisplayIcon' => $sDisplayIcon,
-		);
-
-		return $aVars;
-	}
-
-	public function Render(NiceWebPage $oPage, $sTwigFile, $aVars = array())
-	{
-		$oTemplate = $this->GetTwig()->load($sTwigFile);
-		$oPage->add($oTemplate->renderBlock('body', $aVars));
-		$oPage->add_script($oTemplate->renderBlock('script', $aVars));
-		$oPage->add_ready_script($oTemplate->renderBlock('ready_script', $aVars));
-		$oPage->add_style($oTemplate->renderBlock('css', $aVars));
-
-		// Render CSS links
-		foreach ($this->aPluginFormData as $oFormData)
-		{
-			/** @var \LoginTwigContext $oFormData */
-			$aCSSFiles = $oFormData->GetCSSFiles();
-			foreach ($aCSSFiles as $sCSSFile)
-			{
-				$oPage->add_linked_stylesheet($sCSSFile);
-			}
-			$aJsFiles = $oFormData->GetJsFiles();
-			foreach ($aJsFiles as $sJsFile)
-			{
-				$oPage->add_linked_script($sJsFile);
-
-			}
-		}
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function GetLoginPluginList()
-	{
-		return $this->aLoginPluginList;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function GetPluginFormData()
-	{
-		return $this->aPluginFormData;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function GetPostedVars()
-	{
-		return $this->aPostedVars;
-	}
-
-	/**
-	 * @return \Twig_Environment
-	 */
-	public function GetTwig()
-	{
-		return $this->oTwig;
-	}
-}

application/loginurl.class.inc.php

@@ -1,93 +0,0 @@
-<?php
-
-/**
- * Class LoginURL
- *
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class LoginURL extends AbstractLoginFSMExtension
-{
-	/**
-	 * @var bool
-	 */
-	private $bErrorOccurred = false;
-
-	/**
-	 * Return the list of supported login modes for this plugin
-	 *
-	 * @return array of supported login modes
-	 */
-	public function ListSupportedLoginModes()
-	{
-		return array('url');
-	}
-
-	protected function OnModeDetection(&$iErrorCode)
-	{
-		if (!isset($_SESSION['login_mode']) && !$this->bErrorOccurred)
-		{
-			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-			if (!empty($sAuthUser) && !empty($sAuthPwd))
-			{
-				$_SESSION['login_mode'] = 'url';
-			}
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnReadCredentials(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'url')
-		{
-			$_SESSION['login_temp_auth_user'] =  utils::ReadParam('auth_user', '', false, 'raw_data');
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCheckCredentials(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'url')
-		{
-			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $_SESSION['login_mode'], 'internal'))
-			{
-				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
-				return LoginWebPage::LOGIN_FSM_ERROR;
-			}
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnCredentialsOK(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'url')
-		{
-			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnError(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'url')
-		{
-			$this->bErrorOccurred = true;
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-
-	protected function OnConnected(&$iErrorCode)
-	{
-		if ($_SESSION['login_mode'] == 'url')
-		{
-			$_SESSION['can_logoff'] = true;
-			return LoginWebPage::CheckLoggedUser($iErrorCode);
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
-}

application/maintenancemsg.php

@@ -1,93 +0,0 @@
-<?php
-/**
- * Copyright (C) 2013-2019 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-
-//
-// Maintenance message display functions
-// Only included by approot.inc.php
-//
-
-/**
- * Use a setup page to display the maintenance message
- * @param $sTitle
- * @param $sMessage
- */
-function _MaintenanceSetupPageMessage($sTitle, $sMessage)
-{
-	// Web Page
-	@include_once(APPROOT.'setup/setuppage.class.inc.php');
-	if (class_exists('SetupPage'))
-	{
-		$oP = new SetupPage($sTitle);
-		$oP->p("<h2 class=\"center\">$sMessage</h2>");
-		$oP->add_ready_script(
-<<<JS
-// Reload in 30s to check if maintenance is over
-setTimeout(function(){ window.location.reload(); }, 30000);
-JS
-
-		);
-		$oP->output();
-	}
-	else
-	{
-		_MaintenanceTextMessage($sMessage);
-	}
-}
-
-/**
- * Use simple text to display the maintenance message
- * @param $sMessage
- */
-function _MaintenanceTextMessage($sMessage)
-{
-	echo $sMessage;
-}
-
-/**
- * Use a simple HTML to display the maintenance message
- * @param $sMessage
- */
-function _MaintenanceHtmlMessage($sMessage)
-{
-	echo '<html><body><div>'.$sMessage.'</div></body></html>';
-}
-
-/**
- * Use a simple JSON to display the maintenance message
- *
- * @param $sTitle
- * @param $sMessage
- */
-function _MaintenanceJsonMessage($sTitle, $sMessage)
-{
-	@include_once(APPROOT."/application/ajaxwebpage.class.inc.php");
-	if (class_exists('ajax_page'))
-	{
-		$oP = new ajax_page($sTitle);
-		$oP->add_header('Access-Control-Allow-Origin: *');
-		$oP->SetContentType('application/json');
-		$oP->add('{"code":100, "message":"'.$sMessage.'"}');
-		$oP->Output();
-	}
-	else
-	{
-		_MaintenanceTextMessage($sMessage);
-	}
-}

application/menunode.class.inc.php

@@ -1,20 +1,27 @@
 <?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * Construction and display of the application's main menu
  *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -77,11 +84,14 @@ class ApplicationMenu
 		{
 			// Build menus from module handlers
 			//
-			/** @var \ModuleHandlerApiInterface $oPHPClass */
-			foreach(MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass)
-            {
-                $oPHPClass::OnMenuCreation();
-            }
+			foreach(get_declared_classes() as $sPHPClass)
+			{
+				if (is_subclass_of($sPHPClass, 'ModuleHandlerAPI'))
+				{
+					$aCallSpec = array($sPHPClass, 'OnMenuCreation');
+					call_user_func($aCallSpec);
+				}
+			}
 
 			// Build menus from the menus themselves (e.g. the ShortcutContainerMenuNode will do that)
 			//
@@ -115,11 +125,9 @@ class ApplicationMenu
 	}
 
 	/**
-	 * Check whether a menu Id is enabled or not
-	 *
+	 * Check wether a menu Id is enabled or not
 	 * @param $sMenuId
-	 *
-	 * @throws \Exception
+	 * @throws DictExceptionMissingString
 	 */
 	static public function CheckMenuIdEnabled($sMenuId)
 	{
@@ -159,9 +167,7 @@ class ApplicationMenu
 			}
 			else
 			{
-				/** @var \MenuNode $oNode */
-				$oNode = self::$aMenusIndex[$iParentIndex]['node'];
-				$sParentId = $oNode->GetMenuId();
+				$sParentId = self::$aMenusIndex[$iParentIndex]['node']->GetMenuId();
 				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
 			}
 
@@ -175,9 +181,7 @@ class ApplicationMenu
 		else
 		{
 			// the menu already exists, let's combine the conditions that make it visible
-			/** @var \MenuNode $oNode */
-			$oNode = self::$aMenusIndex[$index]['node'];
-			$oNode->AddCondition($oMenuNode);
+			self::$aMenusIndex[$index]['node']->AddCondition($oMenuNode);
 		}
 
 		return $index;
@@ -194,7 +198,7 @@ class ApplicationMenu
 
 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
-	 * @param \WebPage $oPage
+	 * @param $oPage
 	 * @param $aExtraParams
 	 * @throws DictExceptionMissingString
 	 */
@@ -204,13 +208,12 @@ class ApplicationMenu
 		// 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('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'">'.$oMenuNode->GetTitle().'</h3>');
 			$oPage->AddToMenu('<div>');
 			$oPage->AddToMenu('<ul>');
 			$aChildren = self::GetChildren($aMenu['index']);
@@ -218,18 +221,16 @@ class ApplicationMenu
 			$oPage->AddToMenu('</ul>');
 			if ($bActive)
 			{
-				$iActiveAccordion = $iAccordion;
+$oPage->add_ready_script(
+<<<EOF
+	// Accordion Menu
+	$("#accordion").css({display:'block'}).accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: true,  active: $iAccordion, icons: false, animate:true }); // collapsible will be enabled once the item will be selected
+EOF
+				);
 			}
 			$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
-		);
 	}
 
 	/**
@@ -263,7 +264,7 @@ EOF
 
 	/**
 	 * Handles the display of the sub-menus (called recursively if necessary)
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aMenus
 	 * @param array $aExtraParams
 	 * @param int $iActiveMenu
@@ -277,39 +278,21 @@ EOF
 		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';
-				}
+				$sCSSClass = (count($aChildren) > 0) ? ' class="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 = $oMenu->GetTitle();
-					$sItemHtml .= "<a href={$sURL}>{$sTitle}</a>";
+					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'><a href="'.$oMenu->GetHyperlink($aExtraParams).'">'.$oMenu->GetTitle().'</a></li>');
 				}
 				else
 				{
-					$sItemHtml .= $oMenu->GetTitle();
+					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'>'.$oMenu->GetTitle().'</li>');
 				}
-				$sItemHtml .= '</li>';
-				$oPage->AddToMenu($sItemHtml);
 				if ($iActiveMenu == $index)
 				{
 					$bActive = true;
@@ -373,7 +356,6 @@ EOF
 	static public function GetMenuIndexById($sTitle)
 	{
 		$index = -1;
-		/** @var MenuNode[] $aMenu */
 		foreach(self::$aMenusIndex as $aMenu)
 		{
 			if ($aMenu['node']->GetMenuId() == $sTitle)
@@ -610,24 +592,13 @@ abstract class MenuNode
 
 	/**
 	 * @param $aExtraParams
-	 *
 	 * @return string
-	 * @throws \Exception
 	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		$aExtraParams['c[menu]'] = $this->GetMenuId();
 		return $this->AddParams(utils::GetAbsoluteUrlAppRoot().'pages/UI.php', $aExtraParams);
 	}
-
-	/**
-	 * @return bool true if the link should be opened in a new window
-	 * @since 2.7.0 N°1283
-	 */
-	public function IsHyperLinkInNewWindow()
-	{
-		return false;
-	}
 	
 	/**
 	 * Add a limiting display condition for the same menu node. The conditions will be combined with a AND
@@ -866,7 +837,7 @@ class OQLMenuNode extends MenuNode
 	
 	/**
 	 * Set some extra parameters to be passed to the display block to fine tune its appearence
-	 * @param array $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
+	 * @param Hash $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
 	 */
 	public function SetParameters($aParams)
 	{
@@ -979,7 +950,7 @@ class SearchMenuNode extends MenuNode
 	}
 
 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 * @return mixed|void
 	 * @throws DictExceptionMissingString
@@ -988,7 +959,7 @@ class SearchMenuNode extends MenuNode
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
-		$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', utils::GetAbsoluteUrlAppRoot().'images/breadcrumb-search.png');
+		$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', utils::GetAbsoluteUrlAppRoot().'images/search.png');
 
 		$oSearch = new DBObjectSearch($this->sClass);
 		$aParams = array_merge(array('table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);
@@ -1011,12 +982,8 @@ class WebPageMenuNode extends MenuNode
 	 */
 	protected $sHyperlink;
 
-	/** @var bool */
-	protected $bIsLinkInNewWindow;
-
 	/**
 	 * Create a menu item that points to any web page (not only UI.php)
-	 *
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
 	 * @param string $sHyperlink URL to the page to load. Use relative URL if you want to keep the application portable !
 	 * @param integer $iParentIndex ID of the parent menu
@@ -1025,17 +992,12 @@ class WebPageMenuNode extends MenuNode
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
 	 * @param string $sEnableStimulus
-	 * @param bool $bIsLinkInNewWindow for the {@link WebPageMenuNode::IsHyperLinkInNewWindow} method
 	 */
-	public function __construct(
-		$sMenuId, $sHyperlink, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null,
-		$iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null, $bIsLinkInNewWindow = false
-	)
+	public function __construct($sMenuId, $sHyperlink, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sHyperlink = $sHyperlink;
 		$this->aReflectionProperties['url'] = $sHyperlink;
-		$this->bIsLinkInNewWindow = $bIsLinkInNewWindow;
 	}
 
 	/**
@@ -1048,11 +1010,6 @@ class WebPageMenuNode extends MenuNode
 		return $this->AddParams( $this->sHyperlink, $aExtraParams);
 	}
 
-	public function IsHyperLinkInNewWindow()
-	{
-		return $this->bIsLinkInNewWindow;
-	}
-
 	/**
 	 * @param WebPage $oPage
 	 * @param array $aExtraParams
@@ -1097,9 +1054,7 @@ class NewObjectMenuNode extends MenuNode
 
 	/**
 	 * @param string[] $aExtraParams
-	 *
 	 * @return string
-	 * @throws \Exception
 	 */
 	public function GetHyperlink($aExtraParams)
 	{
@@ -1188,11 +1143,37 @@ class DashboardMenuNode extends MenuNode
 	 */
 	public function GetDashboard()
 	{
-		return RuntimeDashboard::GetDashboard($this->sDashboardFile, $this->sMenuId);
+		$sDashboardDefinition = @file_get_contents($this->sDashboardFile);		
+		if ($sDashboardDefinition !== false)
+		{
+			$bCustomized = false;
+			
+			// Search for an eventual user defined dashboard, overloading the existing one
+			$oUDSearch = new DBObjectSearch('UserDashboard');
+			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
+			$oUDSearch->AddCondition('menu_code', $this->sMenuId, '=');
+			$oUDSet = new DBObjectSet($oUDSearch);
+			if ($oUDSet->Count() > 0)
+			{
+				// Assuming there is at most one couple {user, menu}!
+				$oUserDashboard = $oUDSet->Fetch();
+				$sDashboardDefinition = $oUserDashboard->Get('contents');
+				$bCustomized = true;
+				
+			}
+			$oDashboard = new RuntimeDashboard($this->sMenuId);
+			$oDashboard->FromXml($sDashboardDefinition);
+			$oDashboard->SetCustomFlag($bCustomized);
+		}
+		else
+		{
+			$oDashboard = null;
+		}
+		return $oDashboard;
 	}
 
 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string[] $aExtraParams
 	 * @throws CoreException
 	 * @throws Exception
@@ -1205,9 +1186,38 @@ class DashboardMenuNode extends MenuNode
 		{
 			$sDivId = preg_replace('/[^a-zA-Z0-9_]/', '', $this->sMenuId);
 			$oPage->add('<div class="dashboard_contents" id="'.$sDivId.'">');
-			$oDashboard->SetReloadURL($this->GetHyperlink($aExtraParams));
 			$oDashboard->Render($oPage, false, $aExtraParams);
 			$oPage->add('</div>');
+			$oDashboard->RenderEditionTools($oPage);
+
+			if ($oDashboard->GetAutoReload())
+			{
+				$sId = $this->sMenuId;
+				$sExtraParams = json_encode($aExtraParams);
+				$iReloadInterval = 1000 * $oDashboard->GetAutoReloadInterval();
+				$oPage->add_script(
+<<<EOF
+					setInterval("ReloadDashboard('$sDivId');", $iReloadInterval);
+
+					function ReloadDashboard(sDivId)
+					{
+						var oExtraParams = $sExtraParams;
+						// Do not reload when a dialog box is active
+						if (!($('.ui-dialog:visible').length > 0))
+						{
+							$('.dashboard_contents#'+sDivId).block();
+							$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+							   { operation: 'reload_dashboard', dashboard_id: '$sId', extra_params: oExtraParams},
+							   function(data){
+								 $('.dashboard_contents#'+sDivId).html(data);
+								 $('.dashboard_contents#'+sDivId).unblock();
+								}
+							 );
+						}
+					}
+EOF
+				);
+			}
 
 			$bEdit = utils::ReadParam('edit', false);
 			if ($bEdit)

application/newsroomprovider.class.inc.php

@@ -1,159 +0,0 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * A provider for messages to be displayed in the iTop Newsroom
- */
-interface iNewsroomProvider
-{
-	/**
-	 * Inject the current configuration in the provider
-	 * @param Config $oConfig
-	 * @return void
-	 */
-	public function SetConfig(Config $oConfig);
-
-	/**
-	 * Tells if this provider is enabled for the given user
-	 * @param User $oUser The user for who to check if the provider is applicable.
-	 * return bool
-	 */
-	public function IsApplicable(User $oUser = null);
-	
-	/**
-	 * The human readable (localized) label for this provider
-	 * @return string
-	 */
-	public function GetLabel();
-	
-	/**
-	 * The URL to query (from the browser, using jsonp) to fetch all unread messages
-	 * @return string
-	 */
-	public function GetFetchURL();
-	
-	/**
-	 * The URL to navigate to in order to display all messages
-	 * @return string
-	 */
-	public function GetViewAllURL();
-	
-	/**
-	 * The URL to query(from the browser, using jsonp) to mark all unread messages as read
-	 * @return string
-	 */
-	public function GetMarkAllAsReadURL();
-	
-	/**
-	 * Return the URL to configure the preferences for this provider or null is there is nothing to configure
-	 * @return string|null
-	 */
-	public function GetPreferencesUrl();
-	
-	/**
-	 * Return an array key => value to be replaced in URL of the messages
-	 * Example: '%itop_root%' => utils::GetAbsoluteUrlAppRoot();
-	 * @return string[]
-	 */
-	public function GetPlaceholders();
-	
-	/**
-	 * The duration between to refreshes of the cache (in seconds)
-	 * @return int
-	 */
-	public function GetTTL();
-}
-
-/**
- * Basic implementation of a Newsroom provider, to be overloaded by your own provider implementation
- *
- */
-abstract class NewsroomProviderBase implements iNewsroomProvider
-{
-	/**
-	 * The current configuration parameters
-	 * @var Config
-	 */
-	protected $oConfig;
-	
-	public function __construct()
-	{
-		$this->oConfig = null;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::SetConfig()
-	 */
-	public function SetConfig(Config $oConfig)
-	{
-		$this->oConfig = $oConfig;		
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetPreferencesUrl()
-	 */
-	public function GetPreferencesUrl()
-	{
-		return null; // No preferences
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetLabel()
-	 */
-	public abstract function GetLabel();
-	
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetFetchURL()
-	 */
-	public abstract function GetFetchURL();
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetMarkAllURL()
-	 */
-	public abstract function GetMarkAllAsReadURL();
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetViewAllURL()
-	 */
-	public abstract function GetViewAllURL();
-
-	public function IsApplicable(User $oUser = null)
-	{
-		return false;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetPlaceholders()
-	 */
-	public function GetPlaceholders()
-	{
-		return array(); // By default, empty set of placeholders
-	}
-	
-	public function GetTTL()
-	{
-		return 10*60; // Refresh every 10 minutes
-	}
-}

application/nicewebpage.class.inc.php

@@ -37,23 +37,16 @@ class NiceWebPage extends WebPage
     {
         parent::__construct($s_title, $bPrintable);
 		$this->m_aReadyScripts = array();
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.min.js');
-		if(utils::IsDevelopmentEnvironment()) // Needed since many other plugins still rely on oldies like $.browser
-		{
-			$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate.dev.js');
-		}
-		else
-		{
-			$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate.prod.min.js');
-		}
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.12.4.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.4.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
+		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
 		// table sorting
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.pager.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablehover.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/table-selectable-lines.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
@@ -68,14 +61,11 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_field.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_tag_set.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_hierarchical_key.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/clipboard.min.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/clipboardwidget.js');
 
 	    $this->add_dict_entries('UI:Combo');
 
@@ -123,7 +113,7 @@ class NiceWebPage extends WebPage
 	$("table.listResults").tableHover(); // hover tables
 EOF
 		);
-	    $this->LoadTheme();
+		$this->add_saas("css/light-grey.scss");
 
 		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
      	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
@@ -233,8 +223,7 @@ EOF
 		foreach($aChoices as $sKey => $sValue)
 		{
 			$sSelected = ($sKey == $sDefaultValue) ? " SELECTED" : "";
-			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"".htmlspecialchars($sKey)."\"$sSelected>".htmlentities($sValue,
-					ENT_QUOTES, self::PAGES_CHARSET)."</option>");
+			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"".htmlspecialchars($sKey)."\"$sSelected>".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."</option>");
 		}
 		$this->add("</select>");
 	}
@@ -256,10 +245,6 @@ EOF
 		}
 		parent::output();
 	}
-
-	protected function LoadTheme()
-	{
-		$sCssThemeUrl = ThemeHandler::GetTheme();
-		$this->add_linked_stylesheet($sCssThemeUrl);
-	}
 }
+
+?>

application/pdfpage.class.inc.php

@@ -1,53 +1,15 @@
 <?php
-/**
- * Copyright (C) 2013-2019 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-require_once(APPROOT.'application/utils.inc.php');
+require_once(APPROOT.'lib/tcpdf/tcpdf.php');
 
 /**
  * Custom class derived from TCPDF for providing custom headers and footers
- *
  * @author denis
  *
  */
 class iTopPDF extends TCPDF
 {
 	protected $sDocumentTitle;
-
-	/**
-	 * Shortcut for {@link TCPDF::SetFont}, to use the font configured
-	 *
-	 * @param string $style
-	 * @param int $size
-	 * @param string $fontfile
-	 * @param string $subset
-	 * @param bool $out
-	 *
-	 * @uses \TCPDF::SetFont()
-	 * @uses \iTopPDF::GetPdfFont()
-	 * @since 2.7
-	 */
-	public function SetFontParams($style, $size, $fontfile='', $subset='default', $out=true)
-	{
-		$siTopFont = self::GetPdfFont();
-		$this->SetFont($siTopFont, $style, $size, $fontfile, $subset, $out);
-	}
-
+	
 	public function SetDocumentTitle($sDocumentTitle)
 	{
 		$this->sDocumentTitle = $sDocumentTitle;
@@ -55,29 +17,26 @@ class iTopPDF extends TCPDF
 
 	/**
 	 * Builds the custom header. Called for each new page.
-	 *
 	 * @see TCPDF::Header()
 	 */
 	public function Header()
 	{
 		// Title
 		// Set font
-		$this->SetFontParams('B', 10);
-
+		$this->SetFont('dejavusans', 'B', 10);
+		
 		$iPageNumberWidth = 25;
 		$aMargins = $this->getMargins();
-
+		
 		// Display the title (centered)
 		$this->SetXY($aMargins['left'] + $iPageNumberWidth, 0);
-		$this->MultiCell($this->getPageWidth() - $aMargins['left'] - $aMargins['right'] - 2 * $iPageNumberWidth, 15, $this->sDocumentTitle,
-			0, 'C', false, 0 /* $ln */, '', '', true, 0, false, true, 15, 'M' /* $valign */);
-		$this->SetFontParams('', 10);
-
+		$this->MultiCell($this->getPageWidth() - $aMargins['left'] - $aMargins['right'] - 2*$iPageNumberWidth, 15, $this->sDocumentTitle, 0, 'C', false, 0 /* $ln */, '', '', true, 0, false, true, 15, 'M' /* $valign */);
+		$this->SetFont('dejavusans', '', 10);
+		
 		// Display the page number (right aligned)
 		// Warning: the 'R'ight alignment does not work when using placeholders like $this->getAliasNumPage() or $this->getAliasNbPages()
-		$this->MultiCell($iPageNumberWidth, 15, Dict::Format('Core:BulkExport:PDF:PageNumber', $this->page), 0, 'R', false, 0 /* $ln */, '',
-			'', true, 0, false, true, 15, 'M' /* $valign */);
-
+		$this->MultiCell($iPageNumberWidth, 15, 'Page '.$this->page, 0, 'R', false, 0 /* $ln */, '', '', true, 0, false, true, 15, 'M' /* $valign */);
+		
 		// Branding logo
 		$sBrandingIcon = APPROOT.'images/itop-logo.png';
 		if (file_exists(MODULESROOT.'branding/main-logo.png'))
@@ -92,18 +51,6 @@ class iTopPDF extends TCPDF
 	{
 		// No footer
 	}
-
-	/**
-	 * dejavusans is a UTF-8 Unicode font. Standard PDF fonts like helvetica or times new roman are NOT UTF-8
-	 * @return string font in the config file (export_pdf_font)
-	 */
-	public static function GetPdfFont()
-	{
-		$oConfig = utils::GetConfig();
-		$sPdfFont = $oConfig->Get('export_pdf_font');
-
-		return $sPdfFont;
-	}
 }
 
 /**
@@ -111,45 +58,49 @@ class iTopPDF extends TCPDF
  */
 class PDFPage extends WebPage
 {
-	/** @var \iTopPDF Instance of the TCPDF object for creating the PDF */
+	/**
+	 * Instance of the TCPDF object for creating the PDF
+	 * @var TCPDF
+	 */
 	protected $oPdf;
-
+	
 	public function __construct($s_title, $sPageFormat = 'A4', $sPageOrientation = 'L')
 	{
 		parent::__construct($s_title);
-		define(K_PATH_FONTS, APPROOT.'lib/combodo/tcpdf/fonts');
-		$this->oPdf = new iTopPDF($sPageOrientation, 'mm', $sPageFormat, true, self::PAGES_CHARSET, false);
-
+		define(K_PATH_FONTS, APPROOT.'lib/tcpdf/fonts');
+		$this->oPdf = new iTopPDF($sPageOrientation, 'mm', $sPageFormat, true, 'UTF-8', false);
+		
 		// set document information
 		$this->oPdf->SetCreator(PDF_CREATOR);
 		$this->oPdf->SetAuthor('iTop');
 		$this->oPdf->SetTitle($s_title);
 		$this->oPdf->SetDocumentTitle($s_title);
-
+		
 		$this->oPdf->setFontSubsetting(true);
-
+		
+		// Set font
 		// dejavusans is a UTF-8 Unicode font. Standard PDF fonts like helvetica or times new roman are NOT UTF-8
-		$this->oPdf->SetFontParams('', 10, '', true);
-
+		$this->oPdf->SetFont('dejavusans', '', 10, '', true);
+		
 		// set auto page breaks
 		$this->oPdf->SetAutoPageBreak(true, 15); // 15 mm break margin at the bottom
 		$this->oPdf->SetTopMargin(15);
-
+		
 		// Add a page, we're ready to start
 		$this->oPdf->AddPage();
-
+		
 		$this->SetContentDisposition('inline', $s_title.'.pdf');
 		$this->SetDefaultStyle();
-
+		
 	}
-
+	
 	/**
 	 * Sets a default style (suitable for printing) to be included each time $this->oPdf->writeHTML() is called
 	 */
 	protected function SetDefaultStyle()
 	{
 		$this->add_style(
-			<<<EOF
+<<<EOF
 table {
 	padding: 2pt;
 }
@@ -173,21 +124,19 @@ td.icon {
 	width: 30px;
 }
 EOF
-		);
+		);		
 	}
-
+	
 	/**
 	 * Get access to the underlying TCPDF object
-	 *
-	 * @return \iTopPDF
+	 * @return TCPDF
 	 */
 	public function get_tcpdf()
 	{
 		$this->flush();
-
 		return $this->oPdf;
 	}
-
+	
 	/**
 	 * Writes the currently buffered HTML content into the PDF. This can be useful:
 	 * - to sync the flow in case you want to access the underlying TCPDF object for some specific/graphic output
@@ -207,42 +156,39 @@ EOF
 			$this->s_content = '';
 		}
 	}
-
+	
 	/**
 	 * Whether or not the page is a PDF page
-	 *
 	 * @return boolean
 	 */
 	public function is_pdf()
 	{
 		return true;
 	}
-
+	
 	/**
 	 * Generates the PDF document and returns the PDF content as a string
-	 *
 	 * @return string
 	 * @see WebPage::output()
 	 */
 	public function output()
 	{
 		$this->add_header('Content-type: application/x-pdf');
-		if (!empty($this->sContentDisposition))
-		{
+    	if (!empty($this->sContentDisposition))
+    	{
 			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
-		}
-		foreach ($this->a_headers as $s_header)
-		{
-			header($s_header);
-		}
-		$this->flush();
+    	}
+    	foreach($this->a_headers as $s_header)
+        {
+            header($s_header);
+        }
+        $this->flush();
 		echo $this->oPdf->Output($this->s_title.'.pdf', 'S');
 	}
-
+	
 	public function get_pdf()
 	{
 		$this->flush();
-
 		return $this->oPdf->Output($this->s_title.'.pdf', 'S');
 	}
 }

application/query.class.inc.php

@@ -47,12 +47,13 @@ abstract class Query extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
+		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'fields')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
 		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
 		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
@@ -77,9 +78,6 @@ class QueryOQL extends Query
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		// Rolled back to AttributeText until AttributeQueryAttCodeSet can manage fields order correctly
-		//MetaModel::Init_AddAttribute(new AttributeQueryAttCodeSet("fields", array("allowed_values"=>null,"max_items" => 1000, "query_field" => "oql", "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array('oql'))));
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
@@ -138,41 +136,6 @@ class QueryOQL extends Query
 		}
 		return $aFieldsMap;
 	}
-
-// Rolled back until 'fields' can be properly managed by AttributeQueryAttCodeSet
-//
-//	public function ComputeValues()
-//	{
-//		parent::ComputeValues();
-//
-//		// Remove unwanted attribute codes
-//		$aChanges = $this->ListChanges();
-//		if (isset($aChanges['fields']))
-//		{
-//			$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'fields');
-//			$aArgs = array('this' => $this);
-//			$aAllowedValues = $oAttDef->GetAllowedValues($aArgs);
-//
-//			/** @var \ormSet $oValue */
-//			$oValue = $this->Get('fields');
-//			$aValues = $oValue->GetValues();
-//			$bChanged = false;
-//			foreach($aValues as $key => $sValue)
-//			{
-//				if (!isset($aAllowedValues[$sValue]))
-//				{
-//					unset($aValues[$key]);
-//					$bChanged = true;
-//				}
-//			}
-//			if ($bChanged)
-//			{
-//				$oValue->SetValues($aValues);
-//				$this->Set('fields', $oValue);
-//			}
-//		}
-//	}
-
 }
 
 ?>

application/startup.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.
@@ -15,44 +15,18 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-require_once(APPROOT.'/core/cmdbobject.class.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-require_once(APPROOT.'/core/contexttag.class.inc.php');
 
 
 /**
  * File to include to initialize the datamodel in memory
  *
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-// This storage is freed on error (case of allowed memory exhausted)
-$sReservedMemory = str_repeat('*', 1024 * 1024);
-register_shutdown_function(function()
-{
-	global $sReservedMemory;
-	$sReservedMemory = null;
-	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
-	{
-		IssueLog::error($err['message']);
-		if (strpos($err['message'], 'Allowed memory size of') !== false)
-		{
-			$sLimit = ini_get('memory_limit');
-			echo "<p>iTop: Allowed memory size of $sLimit exhausted, contact your administrator to increase 'memory_limit' in php.ini</p>\n";
-		}
-		elseif (strpos($err['message'], 'Maximum execution time') !== false)
-		{
-			$sLimit = ini_get('max_execution_time');
-			echo "<p>iTop: Maximum execution time of $sLimit exceeded, contact your administrator to increase 'max_execution_time' in php.ini</p>\n";
-		}
-		else
-		{
-			echo "<p>iTop: An error occurred, check server error log for more information.</p>\n";
-		}
-	}
-});
-
+require_once(APPROOT.'/core/cmdbobject.class.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/core/contexttag.class.inc.php');
 session_name('itop-'.md5(APPROOT));
 session_start();
 $sSwitchEnv = utils::ReadParam('switch_env', null);
@@ -85,4 +59,4 @@ else
 	$_SESSION['itop_env'] = ITOP_DEFAULT_ENV;
 }
 $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
-MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);
+MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);

application/template.class.inc.php

@@ -399,7 +399,6 @@ class ObjectDetailsTemplate extends DisplayTemplate
 		$aPlugInProperties = $aMatches[1];
 		foreach($aPlugInProperties as $sPlugInClass)
 		{
-			/** @var \iApplicationUIExtension $oInstance */
 			$oInstance = MetaModel::GetPlugins('iApplicationUIExtension', $sPlugInClass);
 			if ($oInstance != null) // Safety check...
 			{

application/themehandler.class.inc.php

@@ -1,74 +0,0 @@
-<?php
-/**
- *
- *  * Copyright (C) 2013-2019 Combodo SARL
- *  *
- *  * This file is part of iTop.
- *  *
- *  * iTop is free software; you can redistribute it and/or modify
- *  * it under the terms of the GNU Affero General Public License as published by
- *  * the Free Software Foundation, either version 3 of the License, or
- *  * (at your option) any later version.
- *  *
- *  * iTop is distributed in the hope that it will be useful,
- *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  * GNU Affero General Public License for more details.
- *  *
- *  * You should have received a copy of the GNU Affero General Public License
- *  
- */
-
-use ScssPhp\ScssPhp\Compiler;
-
-class ThemeHandler{
-
-	public static function GetTheme()
-	{
-		$sThemeId = MetaModel::GetConfig()->Get('backoffice_default_theme');
-		$sEnvPath =  APPROOT.'env-' . utils::GetCurrentEnvironment() .'/';
-		$sThemePath = $sEnvPath.'/branding/themes/'.$sThemeId.'/';
-		$aThemeParameters = json_decode(file_get_contents($sThemePath.'theme-parameters.json'), true);
-		$sThemeCssPath = $sThemePath.'main.css';
-		
-		$sTheme = '';
-		$iStyleLastModified = 0;
-		clearstatcache();
-		// Loading files to import and stylesheet to compile, also getting most recent modification time on overall files
-		foreach ($aThemeParameters['imports'] as $sImport)
-		{
-			$sTheme.= '@import "' . $sImport . '";' . "\n";
-			
-			$iImportLastModified = filemtime($sEnvPath.$sImport);
-			$iStyleLastModified = $iStyleLastModified < $iImportLastModified ? $iImportLastModified : $iStyleLastModified;
-		}
-		foreach ($aThemeParameters['stylesheets'] as $sStylesheet)
-		{
-			$sTheme.= '@import "' . $sStylesheet . '";'."\n";
-			
-			$iStylesheetLastModified = filemtime($sEnvPath.$sStylesheet);
-			$iStyleLastModified = $iStyleLastModified < $iStylesheetLastModified ? $iStylesheetLastModified : $iStyleLastModified;
-		}
-		
-		// Checking if our compiled css is outdated
-		if (!file_exists($sThemeCssPath) || (is_writable($sThemePath) && (filemtime($sThemeCssPath) < $iStyleLastModified)))
-		{
-			$oScss = new Compiler();
-			$oScss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\Expanded');
-			// Setting our xml variables
-			$oScss->setVariables($aThemeParameters['variables']);
-			// Setting our import path to env-*
-			$oScss->setImportPaths($sEnvPath);
-			// Temporary disabling max exec time while compiling
-			$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
-			set_time_limit(0);
-			// Compiling our theme
-			$sThemeCss = $oScss->compile($sTheme);
-			set_time_limit($iCurrentMaxExecTime);
-			file_put_contents($sThemePath.'main.css', $sThemeCss);
-		}
-		// Return absolute url to theme compiled css
-		return utils::GetAbsoluteUrlModulesRoot().'/branding/themes/'.$sThemeId.'/main.css';
-	}
-}
-

application/transaction.class.inc.php

@@ -119,7 +119,7 @@ class privUITransactionSession
 		// Strictly speaking, the two lines below should be grouped together
 		// by a critical section
 		// sem_acquire($rSemIdentified);
-		$id = static::GetUserPrefix() . str_replace(array('.', ' '), '', microtime()); //1 + count($_SESSION['transactions']);
+		$id = str_replace(array('.', ' '), '', microtime()); //1 + count($_SESSION['transactions']);
 		$_SESSION['transactions'][$id] = true;
 		// sem_release($rSemIdentified);
 		
@@ -174,17 +174,6 @@ class privUITransactionSession
 			// sem_release($rSemIdentified);
 		}		
 	}
-
-	/**
-	 * Returns a string to prefix transaction ID with info from the current user.
-	 *
-	 * @return string
-	 */
-	protected static function GetUserPrefix()
-	{
-		$sPrefix = 'u'.UserRights::GetUserId();
-		return $sPrefix.'-';
-	}
 }
 
 /**
@@ -195,8 +184,9 @@ class privUITransactionSession
 class privUITransactionFile
 {
 	/**
-	 * @return int The new transaction identifier
-	 * @throws \Exception
+	 * Create a new transaction id, store it in the session and return its id
+	 * @param void
+	 * @return int The identifier of the new transaction
 	 */
 	public static function GetNewTransactionId()
 	{
@@ -206,9 +196,7 @@ class privUITransactionFile
 			{
 				throw new Exception('The directory "'.APPROOT.'data" must be writable to the application.');
 			}
-			// condition avoids race condition N°2345
-			// See https://github.com/kalessil/phpinspectionsea/blob/master/docs/probable-bugs.md#mkdir-race-condition
-			if (!mkdir($concurrentDirectory = APPROOT.'data/transactions') && !is_dir($concurrentDirectory))
+			if (!@mkdir(APPROOT.'data/transactions'))
 			{
 				throw new Exception('Failed to create the directory "'.APPROOT.'data/transactions". Ajust the rights on the parent directory or let an administrator create the transactions directory and give the web sever enough rights to write into it.');
 			}
@@ -218,7 +206,7 @@ class privUITransactionFile
 			throw new Exception('The directory "'.APPROOT.'data/transactions" must be writable to the application.');
 		}
 		self::CleanupOldTransactions();
-		$id = basename(tempnam(APPROOT.'data/transactions', static::GetUserPrefix()));
+		$id = basename(tempnam(APPROOT.'data/transactions', self::GetUserPrefix()));
 		self::Info('GetNewTransactionId: Created transaction: '.$id);
 
 		return (string)$id;
@@ -322,11 +310,6 @@ class privUITransactionFile
 		return $aResult;
 	}
 
-	/**
-	 * Returns a prefix based on the user login instead of its ID for a better usage in tempnam()
-	 *
-	 * @inheritdoc
-	 */
 	protected static function GetUserPrefix()
 	{
 		$sPrefix = substr(UserRights::GetUser(), 0, 10);

application/twigextension.class.inc.php

@@ -1,140 +0,0 @@
-<?php
-
-namespace Combodo\iTop;
-
-use AttributeDateTime;
-use Dict;
-use Exception;
-use MetaModel;
-use Twig_Environment;
-use Twig_SimpleFilter;
-use Twig_SimpleFunction;
-use utils;
-
-class TwigExtension
-{
-	/**
-	 * Registers Twig extensions such as filters or functions.
-	 * It allows us to access some stuff directly in twig.
-	 *
-	 * @param \Twig_Environment $oTwigEnv
-	 */
-	public static function RegisterTwigExtensions(Twig_Environment &$oTwigEnv)
-	{
-		// Filter to translate a string via the Dict::S function
-		// Usage in twig: {{ 'String:ToTranslate'|dict_s }}
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('dict_s',
-				function ($sStringCode, $sDefault = null, $bUserLanguageOnly = false) {
-					return Dict::S($sStringCode, $sDefault, $bUserLanguageOnly);
-				})
-		);
-
-		// Filter to format a string via the Dict::Format function
-		// Usage in twig: {{ 'String:ToTranslate'|dict_format() }}
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('dict_format',
-				function ($sStringCode, $sParam01 = null, $sParam02 = null, $sParam03 = null, $sParam04 = null) {
-					return Dict::Format($sStringCode, $sParam01, $sParam02, $sParam03, $sParam04);
-				})
-		);
-
-		// Filter to format output
-		// example a DateTime is converted to user format
-		// Usage in twig: {{ 'String:ToFormat'|output_format }}
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('date_format',
-				function ($sDate) {
-					try
-					{
-						if (preg_match('@^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$@', trim($sDate)))
-						{
-							return AttributeDateTime::GetFormat()->Format($sDate);
-						}
-					}
-					catch (Exception $e)
-					{
-					}
-					return $sDate;
-				})
-		);
-
-
-		// Filter to format output
-		// example a DateTime is converted to user format
-		// Usage in twig: {{ 'String:ToFormat'|output_format }}
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('size_format',
-				function ($sSize) {
-					return utils::BytesToFriendlyFormat($sSize);
-				})
-		);
-
-		// Filter to enable base64 encode/decode
-		// Usage in twig: {{ 'String to encode'|base64_encode }}
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('base64_encode', 'base64_encode'));
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('base64_decode', 'base64_decode'));
-
-		// Filter to enable json decode  (encode already exists)
-		// Usage in twig: {{ aSomeArray|json_decode }}
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('json_decode', function ($sJsonString, $bAssoc = false) {
-				return json_decode($sJsonString, $bAssoc);
-			})
-		);
-
-		// Filter to add itopversion to an url
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
-			if (strpos($sUrl, '?') === false)
-			{
-				$sUrl = $sUrl."?itopversion=".ITOP_VERSION;
-			}
-			else
-			{
-				$sUrl = $sUrl."&itopversion=".ITOP_VERSION;
-			}
-
-			return $sUrl;
-		}));
-
-		// Filter to add a module's version to an url
-		$oTwigEnv->addFilter(new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) {
-			$sModuleVersion = utils::GetCompiledModuleVersion($sModuleName);
-
-			if (strpos($sUrl, '?') === false)
-			{
-				$sUrl = $sUrl."?moduleversion=".$sModuleVersion;
-			}
-			else
-			{
-				$sUrl = $sUrl."&moduleversion=".$sModuleVersion;
-			}
-
-			return $sUrl;
-		}));
-
-		// Function to check our current environment
-		// Usage in twig:   {% if is_development_environment() %}
-		$oTwigEnv->addFunction(new Twig_SimpleFunction('is_development_environment', function()
-		{
-			return utils::IsDevelopmentEnvironment();
-		}));
-
-		// Function to get configuration parameter
-		// Usage in twig: {{ get_config_parameter('foo') }}
-		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_config_parameter', function($sParamName)
-		{
-			$oConfig = MetaModel::GetConfig();
-			return $oConfig->Get($sParamName);
-		}));
-
-		// Function to get the URL of a static page in a module
-		// Usage in twig: {{ get_static_page_module_url('itop-my-module', 'path-to-my-page') }}
-		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_static_page_module_url', function($sModuleName, $sPage)
-		{
-			return utils::GetAbsoluteUrlModulesRoot().$sModuleName.'/'.$sPage;
-		}));
-
-		// Function to get the URL of a php page in a module
-		// Usage in twig: {{ get_page_module_url('itop-my-module', 'path-to-my-my-page.php') }}
-		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_page_module_url', function($sModuleName, $sPage)
-		{
-			return utils::GetAbsoluteUrlModulePage($sModuleName, $sPage);
-		}));
-	}
-}

application/ui.extkeywidget.class.inc.php

@@ -208,14 +208,6 @@ class UIExtKeyWidget
 					{
 						// When there is only once choice, select it by default
 						$sSelected = 'selected';
-						if($value != $key)
-						{
-							$oPage->add_ready_script(
-								<<<EOF
-$('#$this->iId').attr('data-validate','dependencies');
-EOF
-							);
-						}
 					}
 					else
 					{
@@ -274,7 +266,7 @@ EOF
 
 			// the input for the auto-complete
 			$sHTMLValue .= "<input class=\"field_autocomplete\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
-			$sHTMLValue .= "<span class=\"field_input_btn\"><div class=\"mini_button\"  id=\"mini_search_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.Search();\"><i class=\"fas fa-search\"></i></div></span>";
+			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_search_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_search.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.Search();\"/></span>";
 
 			// another hidden input to store & pass the object's Id
 			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" />\n";
@@ -298,7 +290,7 @@ EOF
 		}
 		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false)
 		{
-			$sHTMLValue .= "<span class=\"field_input_btn\"><div class=\"mini_button\" id=\"mini_tree_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"><i class=\"fas fa-sitemap\"></i></div></span>";
+			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_tree_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_tree.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"/></span>";
 			$oPage->add_ready_script(
 <<<EOF
 			if ($('#ac_tree_{$this->iId}').length == 0)
@@ -312,7 +304,7 @@ EOF
 		{
 			$sCallbackName = (MetaModel::IsAbstract($this->sTargetClass)) ? 'SelectObjectClass' : 'CreateObject';
 
-			$sHTMLValue .= "<span class=\"field_input_btn\"><div class=\"mini_button\" id=\"mini_add_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"><i class=\"fas fa-plus\"></i></div></span>";
+			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_add_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_add.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"/></span>";
 			$oPage->add_ready_script(
 <<<EOF
 		if ($('#ajax_{$this->iId}').length == 0)
@@ -340,8 +332,7 @@ EOF
 		if ( ($oCurrObject != null) && ($this->sAttCode != ''))
 		{
 			$oAttDef = MetaModel::GetAttributeDef(get_class($oCurrObject), $this->sAttCode);
-			/** @var \DBObject $oCurrObject */
-			$aArgs = $oCurrObject->ToArgsForQuery();
+			$aArgs = array('this' => $oCurrObject);
 			$aParams = array('query_params' => $aArgs);
 			$oSet = $oAttDef->GetAllowedValuesAsObjectSet($aArgs);
 			$oFilter = $oSet->GetFilter();
@@ -411,7 +402,7 @@ EOF
 		// Current extkey value, so we can display event if it is not available anymore (eg. archived).
 		$iCurrentExtKeyId = (is_null($oObj)) ? 0 : $oObj->Get($this->sAttCode);
 
-		$oBlock = new DisplayBlock($oFilter, 'list_search', false, array('query_params' => array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId)));
+		$oBlock = new DisplayBlock($oFilter, 'list', false, array('query_params' => array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId)));
 		$oBlock->Display($oP, $this->iId.'_results', array('this' => $oObj, 'cssCount'=> '#count_'.$this->iId, 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single', 'table_id' => 'select_'.$this->sAttCode)); // Don't display the 'Actions' menu on the results
 	}
 

application/ui.htmleditorwidget.class.inc.php

@@ -74,7 +74,7 @@ class UIHTMLEditorWidget
 		$sLanguage = strtolower(trim(UserRights::GetUserLanguage()));
 		$aConfig['language'] = $sLanguage;
 		$aConfig['contentsLanguage'] = $sLanguage;
-		$aConfig['extraPlugins'] = 'disabler,codesnippet';
+		$aConfig['extraPlugins'] = 'disabler';
 		$sWidthSpec = addslashes(trim($this->m_oAttDef->GetWidth()));
 		if ($sWidthSpec != '')
 		{
@@ -101,7 +101,7 @@ class UIHTMLEditorWidget
 		$oPage->add_ready_script(
 				<<<EOF
 $('#$iId').bind('update', function(evt){
-	BlockField('cke_$iId', $('#$iId').prop('disabled'));
+	BlockField('cke_$iId', $('#$iId').attr('disabled'));
 	//Delayed execution - ckeditor must be properly initialized before setting readonly
 	var retryCount = 0;
 	var oMe = $('#$iId');

application/ui.linksdirectwidget.class.inc.php

@@ -286,13 +286,11 @@ class UILinksWidgetDirect
 	 * @param DBObject $oCurrentObj
 	 * @param $aAlreadyLinked
 	 *
-	 * @param array $aPrefillFormParam
-	 *
 	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
+	 * @throws \Exception
 	 * @throws \OQLException
 	 */
-	public function GetObjectsSelectionDlg($oPage, $oCurrentObj, $aAlreadyLinked, $aPrefillFormParam = array())
+	public function GetObjectsSelectionDlg($oPage, $oCurrentObj, $aAlreadyLinked)
 	{
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
 
@@ -335,8 +333,6 @@ class UILinksWidgetDirect
 
 			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
 			$oFilter->SetInternalParams($aArgs);
-			$aPrefillFormParam['filter'] = $oFilter;
-			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
 		}
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
@@ -363,17 +359,13 @@ class UILinksWidgetDirect
 
 	/**
 	 * Search for objects to be linked to the current object (i.e "remote" objects)
-	 *
 	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
 	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of $this->sLinkedClass
 	 * @param array $aAlreadyLinked Array of indentifiers of objects which are already linke to the current object (or about to be linked)
 	 * @param DBObject $oCurrentObj The object currently being edited... if known...
-	 * @param array $aPrefillFormParam
-	 *
-	 * @throws \CoreException
-	 * @throws \OQLException
+	 * @throws Exception
 	 */
-	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinked = array(), $oCurrentObj = null, $aPrefillFormParam = array())
+	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinked = array(), $oCurrentObj = null)
 	{
 		if ($sRemoteClass == '')
 		{
@@ -403,19 +395,16 @@ class UILinksWidgetDirect
 				$oFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
 			}
 		}
+		if (count($aAlreadyLinked) > 0)
+		{
+			$oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
+		}
 		if ($oCurrentObj != null)
 		{
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 
 			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
 			$oFilter->SetInternalParams($aArgs);
-			
-			$aPrefillFormParam['filter'] = $oFilter;
-			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
-		}
-		if (count($aAlreadyLinked) > 0)
-		{
-			$oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
 		}
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
 		$oBlock->Display($oP, "ResultsToAdd_{$this->sInputid}", array('menu' => false, 'cssCount'=> '#count_'.$this->sInputid , 'selection_mode' => true, 'table_id' => 'add_'.$this->sInputid)); // Don't display the 'Actions' menu on the results

application/ui.linkswidget.class.inc.php

@@ -346,7 +346,7 @@ EOF
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
 	 */
-	public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj)
+	public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
 	{
 		$sHtmlValue = '';
 		$sHtmlValue .= "<div id=\"linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";

application/ui.passwordwidget.class.inc.php

@@ -73,17 +73,17 @@ class UIPasswordWidget
 		$oPage->add_ready_script("$('#{$this->iId}_confirm').bind('keyup change', function(evt, sFormId) { return ValidatePasswordField('$this->iId', sFormId) } );"); // Bind to a custom event: validate
 		$oPage->add_ready_script("$('#{$this->iId}').bind('update', function(evt, sFormId)
 			{
-				if ($(this).prop('disabled'))
+				if ($(this).attr('disabled'))
 				{
-					$('#{$this->iId}_confirm').prop('disabled', true);
-					$('#{$this->iId}_changed').prop('disabled', true);
-					$('#{$this->iId}_reset').prop('disabled', true);
+					$('#{$this->iId}_confirm').attr('disabled', 'disabled');
+					$('#{$this->iId}_changed').attr('disabled', 'disabled');
+					$('#{$this->iId}_reset').attr('disabled', 'disabled');
 				}
 				else
 				{
-					$('#{$this->iId}_confirm').prop('disabled', false);
-					$('#{$this->iId}_changed').prop('disabled', false);
-					$('#{$this->iId}_reset').prop('disabled', false);
+					$('#{$this->iId}_confirm').removeAttr('disabled');
+					$('#{$this->iId}_changed').removeAttr('disabled');
+					$('#{$this->iId}_reset').removeAttr('disabled');
 				}
 			}
 		);"); // Bind to a custom event: update to handle enabling/disabling

application/webpage.class.inc.php

@@ -1,80 +1,45 @@
 <?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * Class WebPage
  *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+
 /**
  * Generic interface common to CLI and Web pages
  */
 Interface Page
 {
-	/**
-	 * Outputs (via some echo) the complete HTML page by assembling all its elements
-	 *
-	 * @return mixed
-	 */
 	public function output();
 
-	/**
-	 * Add any text or HTML fragment to the body of the page
-	 *
-	 * @param string $sText
-	 *
-	 * @return mixed
-	 */
 	public function add($sText);
 
-	/**
-	 * Add a paragraph to the body of the page
-	 *
-	 * @param string $sText
-	 *
-	 * @return mixed
-	 */
 	public function p($sText);
 
-	/**
-	 * Add a pre-formatted text to the body of the page
-	 *
-	 * @param string $sText
-	 *
-	 * @return mixed
-	 */
 	public function pre($sText);
 
-	/**
-	 * Add a comment
-	 *
-	 * @param string $sText
-	 *
-	 * @return mixed
-	 */
 	public function add_comment($sText);
 
-	/**
-	 * Adds a tabular content to the web page
-	 *
-	 * @param string[] $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
-	 * @param string[] $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A
-	 *     column 'pkey' is expected for each row
-	 * @param array $aParams Hash array. Extra parameters for the table.
-	 *
-	 * @return void
-	 */
 	public function table($aConfig, $aData, $aParams = array());
 }
 
@@ -95,10 +60,6 @@ Interface Page
  */
 class WebPage implements Page
 {
-	/**
-	 * @since 2.7.0 N°2529
-	 */
-	const PAGES_CHARSET = 'utf-8';
 	protected $s_title;
 	protected $s_content;
 	protected $s_deferred_content;
@@ -119,14 +80,7 @@ class WebPage implements Page
 	protected $s_sOutputFormat;
 	protected $a_OutputOptions;
 	protected $bPrintable;
-	protected $bHasCollapsibleSection;
 
-	/**
-	 * WebPage constructor.
-	 *
-	 * @param string $s_title
-	 * @param bool $bPrintable
-	 */
 	public function __construct($s_title, $bPrintable = false)
 	{
 		$this->s_title = $s_title;
@@ -148,15 +102,12 @@ class WebPage implements Page
 		$this->bTrashUnexpectedOutput = false;
 		$this->s_OutputFormat = utils::ReadParam('output_format', 'html');
 		$this->a_OutputOptions = array();
-		$this->bHasCollapsibleSection = false;
 		$this->bPrintable = $bPrintable;
 		ob_start(); // Start capturing the output
 	}
 
 	/**
 	 * Change the title of the page after its creation
-	 *
-	 * @param string $s_title
 	 */
 	public function set_title($s_title)
 	{
@@ -165,9 +116,6 @@ class WebPage implements Page
 
 	/**
 	 * Specify a default URL and a default target for all links on a page
-	 *
-	 * @param string $s_href
-	 * @param string $s_target
 	 */
 	public function set_base($s_href = '', $s_target = '')
 	{
@@ -176,7 +124,7 @@ class WebPage implements Page
 	}
 
 	/**
-	 * @inheritDoc
+	 * Add any text or HTML fragment to the body of the page
 	 */
 	public function add($s_html)
 	{
@@ -187,9 +135,6 @@ class WebPage implements Page
 	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
 	 * This is useful to add hidden content, DIVs or FORMs that should not
 	 * be embedded into each other.
-	 *
-	 * @param string $s_html
-	 * @param string $sId
 	 */
 	public function add_at_the_end($s_html, $sId = '')
 	{
@@ -197,7 +142,7 @@ class WebPage implements Page
 	}
 
 	/**
-	 * @inheritDoc
+	 * Add a paragraph to the body of the page
 	 */
 	public function p($s_html)
 	{
@@ -205,7 +150,7 @@ class WebPage implements Page
 	}
 
 	/**
-	 * @inheritDoc
+	 * Add a pre-formatted text to the body of the page
 	 */
 	public function pre($s_html)
 	{
@@ -213,7 +158,7 @@ class WebPage implements Page
 	}
 
 	/**
-	 * @inheritDoc
+	 * Add a comment
 	 */
 	public function add_comment($sText)
 	{
@@ -222,10 +167,6 @@ class WebPage implements Page
 
 	/**
 	 * Add a paragraph to the body of the page
-	 *
-	 * @param string $s_html
-	 *
-	 * @return string
 	 */
 	public function GetP($s_html)
 	{
@@ -233,22 +174,20 @@ class WebPage implements Page
 	}
 
 	/**
-	 * @inheritDoc
-	 * @throws \Exception
+	 * Adds a tabular content to the web page
+	 *
+	 * @param string[] $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
+	 * @param string[] $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A
+	 *     column 'pkey' is expected for each row
+	 * @param array $aParams Hash array. Extra parameters for the table.
+	 *
+	 * @return void
 	 */
 	public function table($aConfig, $aData, $aParams = array())
 	{
 		$this->add($this->GetTable($aConfig, $aData, $aParams));
 	}
 
-	/**
-	 * @param array $aConfig
-	 * @param array $aData
-	 * @param array $aParams
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
 	public function GetTable($aConfig, $aData, $aParams = array())
 	{
 		$oAppContext = new ApplicationContext();
@@ -276,12 +215,6 @@ class WebPage implements Page
 		return $sHtml;
 	}
 
-	/**
-	 * @param array $aRow
-	 * @param array $aConfig
-	 *
-	 * @return string
-	 */
 	public function GetTableRow($aRow, $aConfig)
 	{
 		$sHtml = '';
@@ -306,8 +239,6 @@ class WebPage implements Page
 
 	/**
 	 * Add some Javascript to the header of the page
-	 *
-	 * @param string $s_script
 	 */
 	public function add_script($s_script)
 	{
@@ -316,8 +247,6 @@ class WebPage implements Page
 
 	/**
 	 * Add some Javascript to the header of the page
-	 *
-	 * @param $s_script
 	 */
 	public function add_ready_script($s_script)
 	{
@@ -350,18 +279,12 @@ class WebPage implements Page
 		$this->a_dict_entries_prefixes[] = $s_entriesPrefix;
 	}
 
-	/**
-	 * @return string
-	 */
 	protected function get_dict_signature()
 	{
 		return str_replace('_', '', Dict::GetUserLanguage()).'-'.md5(implode(',',
 					$this->a_dict_entries).'|'.implode(',', $this->a_dict_entries_prefixes));
 	}
 
-	/**
-	 * @return string
-	 */
 	protected function get_dict_file_content()
 	{
 		$aEntries = array();
@@ -381,8 +304,6 @@ class WebPage implements Page
 
 	/**
 	 * Add some CSS definitions to the header of the page
-	 *
-	 * @param string $s_style
 	 */
 	public function add_style($s_style)
 	{
@@ -390,10 +311,7 @@ class WebPage implements Page
 	}
 
 	/**
-	 * Add a script (as an include, i.e. link) to the header of the page.<br>
-	 * Handles duplicates : calling twice with the same script will add the script only once
-	 *
-	 * @param string $s_linked_script
+	 * Add a script (as an include, i.e. link) to the header of the page
 	 */
 	public function add_linked_script($s_linked_script)
 	{
@@ -402,20 +320,12 @@ class WebPage implements Page
 
 	/**
 	 * Add a CSS stylesheet (as an include, i.e. link) to the header of the page
-	 *
-	 * @param string $s_linked_stylesheet
-	 * @param string $s_condition
 	 */
 	public function add_linked_stylesheet($s_linked_stylesheet, $s_condition = "")
 	{
 		$this->a_linked_stylesheets[] = array('link' => $s_linked_stylesheet, 'condition' => $s_condition);
 	}
 
-	/**
-	 * @param string $sSaasRelPath
-	 *
-	 * @throws \Exception
-	 */
 	public function add_saas($sSaasRelPath)
 	{
 		$sCssRelPath = utils::GetCSSFromSASS($sSaasRelPath);
@@ -431,8 +341,6 @@ class WebPage implements Page
 
 	/**
 	 * Add some custom header to the page
-	 *
-	 * @param string $s_header
 	 */
 	public function add_header($s_header)
 	{
@@ -450,8 +358,6 @@ class WebPage implements Page
 
 	/**
 	 * Build a special kind of TABLE useful for displaying the details of an object from a hash array of data
-	 *
-	 * @param array $aFields
 	 */
 	public function details($aFields)
 	{
@@ -497,22 +403,15 @@ class WebPage implements Page
 
 	/**
 	 * Build a special kind of TABLE useful for displaying the details of an object from a hash array of data
-	 *
-	 * @param array $aFields
-	 *
-	 * @return string
 	 */
 	public function GetDetails($aFields)
 	{
-		$sHtml = "<div class=\"details\">\n";
+		$sHtml = "<div class=\"details\" id='search-widget-results-outer'>\n";
 		foreach ($aFields as $aAttrib)
 		{
+			$sDataAttCode = isset($aAttrib['attcode']) ? "data-attcode=\"{$aAttrib['attcode']}\"" : '';
 			$sLayout = isset($aAttrib['layout']) ? $aAttrib['layout'] : 'small';
-			$sDataAttributeCode = isset($aAttrib['attcode']) ? 'data-attribute-code="'.$aAttrib['attcode'].'"' : '';
-			$sDataAttributeType = isset($aAttrib['atttype']) ? 'data-attribute-type="'.$aAttrib['atttype'].'"' : '';
-			$sDataValueRaw = isset($aAttrib['value_raw']) ? 'data-value-raw="'.$aAttrib['value_raw'].'"' : '';
-
-			$sHtml .= "<div class=\"field_container field_{$sLayout}\" $sDataAttributeCode $sDataAttributeType $sDataValueRaw>\n";
+			$sHtml .= "<div class=\"field_container field_{$sLayout}\" $sDataAttCode>\n";
 			$sHtml .= "<div class=\"field_label label\">{$aAttrib['label']}</div>\n";
 
 			$sHtml .= "<div class=\"field_data\">\n";
@@ -548,7 +447,7 @@ class WebPage implements Page
 	/**
 	 * Build a set of radio buttons suitable for editing a field/attribute of an object (including its validation)
 	 *
-	 * @param $aAllowedValues array Array of value => display_value
+	 * @param $aAllowedValues hash Array of value => display_value
 	 * @param $value mixed Current value for the field/attribute
 	 * @param $iId mixed Unique Id for the input control in the page
 	 * @param $sFieldName string The name of the field, attr_<$sFieldName> will hold the value for the field
@@ -568,13 +467,13 @@ class WebPage implements Page
 			if ((count($aAllowedValues) == 1) && ($bMandatory == 'true'))
 			{
 				// When there is only once choice, select it by default
-				$sSelected = 'checked';
+				$sSelected = ' checked';
 			}
 			else
 			{
-				$sSelected = ($value == $key) ? 'checked' : '';
+				$sSelected = ($value == $key) ? ' checked' : '';
 			}
-			$sHTMLValue .= "<input type=\"radio\" id=\"{$iId}_{$key}\" name=\"radio_$sFieldName\" onChange=\"$('#{$iId}').val(this.value).trigger('change');\" value=\"$key\" $sSelected><label class=\"radio\" for=\"{$iId}_{$key}\">&nbsp;$display_value</label>&nbsp;";
+			$sHTMLValue .= "<input type=\"radio\" id=\"{$iId}_{$key}\" name=\"radio_$sFieldName\" onChange=\"$('#{$iId}').val(this.value).trigger('change');\" value=\"$key\"$sSelected><label class=\"radio\" for=\"{$iId}_{$key}\">&nbsp;$display_value</label>&nbsp;";
 			if ($bVertical)
 			{
 				if ($idx == 0)
@@ -613,8 +512,6 @@ class WebPage implements Page
 	 * Possible improvement: I've noticed that several output buffers are stacked,
 	 * if they are not empty, the output will be corrupted. The solution would
 	 * consist in unstacking all of them (and concatenate the contents).
-	 *
-	 * @throws \Exception
 	 */
 	protected function ob_get_clean_safe()
 	{
@@ -652,8 +549,7 @@ class WebPage implements Page
 	}
 
 	/**
-	 * @inheritDoc
-	 * @throws \Exception
+	 * Outputs (via some echo) the complete HTML page by assembling all its elements
 	 */
 	public function output()
 	{
@@ -671,7 +567,31 @@ class WebPage implements Page
 		echo "<title>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</title>\n";
 		echo $this->get_base_tag();
 
-		// First put stylesheets so they can be loaded before browser interprets JS files, otherwise visual glitch can occur.
+		$this->output_dict_entries();
+
+		foreach ($this->a_linked_scripts as $s_script)
+		{
+			// Make sure that the URL to the script contains the application's version number
+			// so that the new script do NOT get reloaded from the cache when the application is upgraded
+			if (strpos($s_script, '?') === false)
+			{
+				$s_script .= "?t=".utils::GetCacheBusterTimestamp();
+			}
+			else
+			{
+				$s_script .= "&t=".utils::GetCacheBusterTimestamp();
+			}
+			echo "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
+		}
+		if (count($this->a_scripts) > 0)
+		{
+			echo "<script type=\"text/javascript\">\n";
+			foreach ($this->a_scripts as $s_script)
+			{
+				echo "$s_script\n";
+			}
+			echo "</script>\n";
+		}
 		foreach ($this->a_linked_stylesheets as $a_stylesheet)
 		{
 			if (strpos($a_stylesheet['link'], '?') === false)
@@ -693,7 +613,6 @@ class WebPage implements Page
 			}
 		}
 
-		// Then inline styles
 		if (count($this->a_styles) > 0)
 		{
 			echo "<style>\n";
@@ -703,43 +622,10 @@ class WebPage implements Page
 			}
 			echo "</style>\n";
 		}
-
-		// Favicon
 		if (class_exists('MetaModel') && MetaModel::GetConfig())
 		{
 			echo "<link rel=\"shortcut icon\" href=\"".utils::GetAbsoluteUrlAppRoot()."images/favicon.ico?t=".utils::GetCacheBusterTimestamp()."\" />\n";
 		}
-
-		// Dict entries for JS
-		$this->output_dict_entries();
-
-		// JS files
-		foreach ($this->a_linked_scripts as $s_script)
-		{
-			// Make sure that the URL to the script contains the application's version number
-			// so that the new script do NOT get reloaded from the cache when the application is upgraded
-			if (strpos($s_script, '?') === false)
-			{
-				$s_script .= "?t=".utils::GetCacheBusterTimestamp();
-			}
-			else
-			{
-				$s_script .= "&t=".utils::GetCacheBusterTimestamp();
-			}
-			echo "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
-		}
-
-		// JS inline scripts
-		if (count($this->a_scripts) > 0)
-		{
-			echo "<script type=\"text/javascript\">\n";
-			foreach ($this->a_scripts as $s_script)
-			{
-				echo "$s_script\n";
-			}
-			echo "</script>\n";
-		}
-
 		echo "</head>\n";
 		echo "<body>\n";
 		echo self::FilterXSS($this->s_content);
@@ -763,9 +649,6 @@ class WebPage implements Page
 
 	/**
 	 * Build a series of hidden field[s] from an array
-	 *
-	 * @param string $sLabel
-	 * @param array $aData
 	 */
 	public function add_input_hidden($sLabel, $aData)
 	{
@@ -944,55 +827,43 @@ class WebPage implements Page
 		}
 	}
 
-	/**
-	 * @param array $aActions
-	 * @param array $aFavoriteActions
-	 *
-	 * @return string
-	 */
 	public function RenderPopupMenuItems($aActions, $aFavoriteActions = array())
 	{
 		$sPrevUrl = '';
 		$sHtml = '';
 		if (!$this->IsPrintableVersion())
 		{
-			foreach ($aActions as $sActionId => $aAction)
+			foreach ($aActions as $aAction)
 			{
-				$sDataActionId = 'data-action-id="'.$sActionId.'"';
-				$sClass = isset($aAction['css_classes']) ? 'class="'.implode(' ', $aAction['css_classes']).'"' : '';
-				$sOnClick = isset($aAction['onclick']) ? 'onclick="'.htmlspecialchars($aAction['onclick'], ENT_QUOTES,
+				$sClass = isset($aAction['css_classes']) ? ' class="'.implode(' ', $aAction['css_classes']).'"' : '';
+				$sOnClick = isset($aAction['onclick']) ? ' onclick="'.htmlspecialchars($aAction['onclick'], ENT_QUOTES,
 						"UTF-8").'"' : '';
-				$sTarget = isset($aAction['target']) ? "target=\"{$aAction['target']}\"" : "";
+				$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
 				if (empty($aAction['url']))
 				{
 					if ($sPrevUrl != '') // Don't output consecutively two separators...
 					{
-						$sHtml .= "<li $sDataActionId>{$aAction['label']}</li>";
+						$sHtml .= "<li>{$aAction['label']}</li>";
 					}
 					$sPrevUrl = '';
 				}
 				else
 				{
-					$sHtml .= "<li $sDataActionId><a $sTarget href=\"{$aAction['url']}\" $sClass $sOnClick>{$aAction['label']}</a></li>";
+					$sHtml .= "<li><a $sTarget href=\"{$aAction['url']}\"$sClass $sOnClick>{$aAction['label']}</a></li>";
 					$sPrevUrl = $aAction['url'];
 				}
 			}
 			$sHtml .= "</ul></li></ul></div>";
-			foreach (array_reverse($aFavoriteActions) as $sActionId => $aAction)
+			foreach (array_reverse($aFavoriteActions) as $aAction)
 			{
 				$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
-				$sHtml .= "<div class=\"actions_button\" data-action-id=\"$sActionId\"><a $sTarget href='{$aAction['url']}'>{$aAction['label']}</a></div>";
+				$sHtml .= "<div class=\"actions_button\"><a $sTarget href='{$aAction['url']}'>{$aAction['label']}</a></div>";
 			}
 		}
 
 		return $sHtml;
 	}
 
-	/**
-	 * @param bool $bReturnOutput
-	 *
-	 * @throws \Exception
-	 */
 	protected function output_dict_entries($bReturnOutput = false)
 	{
 		if ((count($this->a_dict_entries) > 0) || (count($this->a_dict_entries_prefixes) > 0))
@@ -1013,126 +884,17 @@ class WebPage implements Page
 			}
 		}
 	}
-
-
-	/**
-	 * Adds init scripts for the collapsible sections
-	 */
-	protected function outputCollapsibleSectionInit()
-	{
-		if (!$this->bHasCollapsibleSection)
-		{
-			return;
-		}
-
-		$this->add_script(<<<'EOD'
-function initCollapsibleSection(iSectionId, bOpenedByDefault, sSectionStateStorageKey)
-{
-var bStoredSectionState = JSON.parse(localStorage.getItem(sSectionStateStorageKey));
-var bIsSectionOpenedInitially = (bStoredSectionState == null) ? bOpenedByDefault : bStoredSectionState;
-
-if (bIsSectionOpenedInitially) {
-	$("#LnkCollapse_"+iSectionId).toggleClass("open");
-	$("#Collapse_"+iSectionId).toggle();
-}
-
-$("#LnkCollapse_"+iSectionId).click(function(e) {
-	localStorage.setItem(sSectionStateStorageKey, !($("#Collapse_"+iSectionId).is(":visible")));
-	$("#LnkCollapse_"+iSectionId).toggleClass("open");
-	$("#Collapse_"+iSectionId).slideToggle("normal");
-	e.preventDefault(); // we don't want to do anything more (see #1030 : a non wanted tab switching was triggered)
-});
-}
-EOD
-		);
-	}
-
-	/**
-	 * @param string $sSectionLabel
-	 * @param bool $bOpenedByDefault
-	 * @param string $sSectionStateStorageBusinessKey
-	 *
-	 * @throws \Exception
-	 */
-	public function StartCollapsibleSection($sSectionLabel, $bOpenedByDefault = false, $sSectionStateStorageBusinessKey = '')
-	{
-		$this->add($this->GetStartCollapsibleSection($sSectionLabel, $bOpenedByDefault,	$sSectionStateStorageBusinessKey));
-	}
-
-	/**
-	 * @param string $sSectionLabel
-	 * @param bool $bOpenedByDefault
-	 * @param string $sSectionStateStorageBusinessKey
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function GetStartCollapsibleSection($sSectionLabel, $bOpenedByDefault = false, $sSectionStateStorageBusinessKey = '')
-	{
-		$this->bHasCollapsibleSection = true;
-		$sHtml = '';
-		static $iSectionId = 0;
-		$sHtml .= '<a id="LnkCollapse_'.$iSectionId.'" class="CollapsibleLabel" href="#">'.$sSectionLabel.'</a></br>'."\n";
-		$sHtml .= '<div id="Collapse_'.$iSectionId.'" style="display:none">'."\n";
-
-		$oConfig = MetaModel::GetConfig();
-		$sSectionStateStorageKey = $oConfig->GetItopInstanceid().'/'.$sSectionStateStorageBusinessKey.'/collapsible-'.$iSectionId;
-		$sSectionStateStorageKey = json_encode($sSectionStateStorageKey);
-		$sOpenedByDefault = ($bOpenedByDefault) ? 'true' : 'false';
-		$this->add_ready_script("initCollapsibleSection($iSectionId, $sOpenedByDefault, '$sSectionStateStorageKey');");
-
-		$iSectionId++;
-
-		return $sHtml;
-	}
-
-	public function EndCollapsibleSection()
-	{
-		$this->add($this->GetEndCollapsibleSection());
-	}
-
-	/**
-	 * @return string
-	 */
-	public function GetEndCollapsibleSection()
-	{
-		return "</div>";
-	}
-
 }
 
 
 interface iTabbedPage
 {
-	/**
-	 * @param string $sTabContainer
-	 * @param string $sPrefix
-	 *
-	 * @return mixed
-	 */
 	public function AddTabContainer($sTabContainer, $sPrefix = '');
 
-	/**
-	 * @param string $sTabContainer
-	 * @param string $sTabLabel
-	 * @param string $sHtml
-	 *
-	 * @return mixed
-	 */
 	public function AddToTab($sTabContainer, $sTabLabel, $sHtml);
 
-	/**
-	 * @param string $sTabContainer
-	 *
-	 * @return mixed
-	 */
 	public function SetCurrentTabContainer($sTabContainer = '');
 
-	/**
-	 * @param string $sTabLabel
-	 *
-	 * @return mixed
-	 */
 	public function SetCurrentTab($sTabLabel = '');
 
 	/**
@@ -1153,20 +915,11 @@ interface iTabbedPage
 
 	public function GetCurrentTab();
 
-	/**
-	 * @param string$sTabLabel
-	 * @param string|null $sTabContainer
-	 *
-	 * @return mixed
-	 */
 	public function RemoveTab($sTabLabel, $sTabContainer = null);
 
 	/**
 	 * Finds the tab whose title matches a given pattern
 	 *
-	 * @param string $sPattern
-	 * @param string|null $sTabContainer
-	 *
 	 * @return mixed The name of the tab as a string or false if not found
 	 */
 	public function FindTab($sPattern, $sTabContainer = null);
@@ -1188,12 +941,6 @@ class TabManager
 		$this->m_sCurrentTab = '';
 	}
 
-	/**
-	 * @param string $sTabContainer
-	 * @param string $sPrefix
-	 *
-	 * @return string
-	 */
 	public function AddTabContainer($sTabContainer, $sPrefix = '')
 	{
 		$this->m_aTabs[$sTabContainer] = array('prefix' => $sPrefix, 'tabs' => array());
@@ -1201,20 +948,12 @@ class TabManager
 		return "\$Tabs:$sTabContainer\$";
 	}
 
-	/**
-	 * @param string $sHtml
-	 *
-	 * @throws \Exception
-	 */
 	public function AddToCurrentTab($sHtml)
 	{
 		$this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
 	}
 
-	/**
-	 * @return int
-	 */
-	public function GetCurrentTabLength()
+	public function GetCurrentTabLength($sHtml)
 	{
 		$iLength = isset($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']) ? strlen($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']) : 0;
 
@@ -1240,33 +979,16 @@ class TabManager
 		return $sResult;
 	}
 
-	/**
-	 * @param string $sTabContainer
-	 * @param string $sTab
-	 *
-	 * @return bool
-	 */
 	public function TabExists($sTabContainer, $sTab)
 	{
 		return isset($this->m_aTabs[$sTabContainer]['tabs'][$sTab]);
 	}
 
-	/**
-	 * @return int
-	 */
 	public function TabsContainerCount()
 	{
 		return count($this->m_aTabs);
 	}
 
-	/**
-	 * @param string $sTabContainer
-	 * @param string $sTabLabel
-	 * @param string $sHtml
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
 	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
 	{
 		if (!isset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]))
@@ -1290,11 +1012,6 @@ class TabManager
 		return ''; // Nothing to add to the page for now
 	}
 
-	/**
-	 * @param string $sTabContainer
-	 *
-	 * @return string
-	 */
 	public function SetCurrentTabContainer($sTabContainer = '')
 	{
 		$sPreviousTabContainer = $this->m_sCurrentTabContainer;
@@ -1303,11 +1020,6 @@ class TabManager
 		return $sPreviousTabContainer;
 	}
 
-	/**
-	 * @param string $sTabLabel
-	 *
-	 * @return string
-	 */
 	public function SetCurrentTab($sTabLabel = '')
 	{
 		$sPreviousTab = $this->m_sCurrentTab;
@@ -1325,11 +1037,9 @@ class TabManager
 	 *
 	 * @param string $sTabLabel The (localised) label of the tab
 	 * @param string $sUrl The URL to load (on the same server)
-	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. false will cause
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause
 	 *     the tab to be reloaded upon each activation.
 	 *
-	 * @return string
-	 *
 	 * @since 2.0.3
 	 */
 	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
@@ -1344,26 +1054,17 @@ class TabManager
 		return ''; // Nothing to add to the page for now
 	}
 
-	/**
-	 * @return string
-	 */
+
 	public function GetCurrentTabContainer()
 	{
 		return $this->m_sCurrentTabContainer;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function GetCurrentTab()
 	{
 		return $this->m_sCurrentTab;
 	}
 
-	/**
-	 * @param string $sTabLabel
-	 * @param string|null $sTabContainer
-	 */
 	public function RemoveTab($sTabLabel, $sTabContainer = null)
 	{
 		if ($sTabContainer == null)
@@ -1386,9 +1087,6 @@ class TabManager
 	/**
 	 * Finds the tab whose title matches a given pattern
 	 *
-	 * @param string $sPattern
-	 * @param string|null $sTabContainer
-	 *
 	 * @return mixed The actual name of the tab (as a string) or false if not found
 	 */
 	public function FindTab($sPattern, $sTabContainer = null)
@@ -1415,11 +1113,6 @@ class TabManager
 	 * DOES NOT WORK: apparently in the *old* version of jquery
 	 * that we are using this is not supported... TO DO upgrade
 	 * the whole jquery bundle...
-	 *
-	 * @param string $sTabContainer
-	 * @param string $sTabLabel
-	 *
-	 * @return string
 	 */
 	public function SelectTab($sTabContainer, $sTabLabel)
 	{
@@ -1446,12 +1139,6 @@ class TabManager
 		return "window.setTimeout(\"$('$sSelector').tabs('select', $tab_index);\", 100);"; // Let the time to the tabs widget to initialize
 	}
 
-	/**
-	 * @param string $sContent
-	 * @param \WebPage $oPage
-	 *
-	 * @return mixed
-	 */
 	public function RenderIntoContent($sContent, WebPage $oPage)
 	{
 		// Render the tabs in the page (if any)

application/wizardhelper.class.inc.php

@@ -154,7 +154,7 @@ class WizardHelper
 					}
 					else
 					{
-						// May happen for security reasons (portal, see ticket N°1074)
+						// May happen for security reasons (portal, see ticket #1074)
 						$oObj->Set($sAttCode, $value);
 					}
 				}
@@ -174,30 +174,6 @@ class WizardHelper
 					}
 					$oObj->Set($sAttCode, $value);
 				}
-				else if ($oAttDef instanceof AttributeTagSet) // AttributeDate is derived from AttributeDateTime
-				{
-					if (is_null($value))
-					{
-						// happens if field is hidden (see N°1827)
-						$value = array();
-					}
-					else
-					{
-						$value = json_decode($value, true);
-					}
-					$oTagSet = new ormTagSet(get_class($oObj), $sAttCode, $oAttDef->GetMaxItems());
-					$oTagSet->SetValues($value['orig_value']);
-					$oTagSet->ApplyDelta($value);
-					$oObj->Set($sAttCode, $oTagSet);
-				}
-				else if ($oAttDef instanceof AttributeSet) // AttributeDate is derived from AttributeDateTime
-				{
-					$value = json_decode($value, true);
-					$oTagSet = new ormSet(get_class($oObj), $sAttCode, $oAttDef->GetMaxItems());
-					$oTagSet->SetValues($value['orig_value']);
-					$oTagSet->ApplyDelta($value);
-					$oObj->Set($sAttCode, $oTagSet);
-				}
 				else
 				{
 					$oObj->Set($sAttCode, $value);
@@ -229,10 +205,11 @@ class WizardHelper
 				// this as to be handled as an array of objects
 				// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
 				// NOT YET IMPLEMENTED !!
+				$sLinkedClass = $oAttDef->GetLinkedClass();
 				$oSet = $value;
 				$aData = array();
 				$aFields = $this->GetLinkedWizardStructure($oAttDef);
-				while($oLinkedObj = $oSet->fetch())
+				while($oSet->fetch())
 				{
 					foreach($aFields as $sLinkedAttCode)
 					{

application/xlsxwriter.class.php

@@ -40,7 +40,7 @@ Class XLSXWriter
 	
 	protected function tempFilename()
 	{
-		$filename = tempnam(SetupUtils::GettmpDir(), 'xlsx_writer_');
+		$filename = tempnam("/tmp", "xlsx_writer_");
 		$this->temp_files[] = $filename;
 		return $filename;
 	}

application/xmlpage.class.inc.php

@@ -42,7 +42,7 @@ class XMLPage extends WebPage
 		parent::__construct($s_title);
 		$this->m_bPassThrough = $bPassThrough;
 		$this->m_bHeaderSent = false;
-		$this->add_header("Content-type: text/xml; charset=".self::PAGES_CHARSET);
+		$this->add_header("Content-type: text/xml; charset=utf-8");
 		$this->add_header("Cache-control: no-cache");
 		$this->add_header("Content-location: export.xml");
 	}	
@@ -53,9 +53,8 @@ class XMLPage extends WebPage
 		{
 			// Get the unexpected output but do nothing with it
 			$sTrash = $this->ob_get_clean_safe();
-
-			$sCharset = self::PAGES_CHARSET;
-			$this->s_content = "<?xml version=\"1.0\" encoding=\"$sCharset\"?".">\n".trim($this->s_content);
+					
+			$this->s_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n".trim($this->s_content);
 			$this->add_header("Content-Length: ".strlen($this->s_content));
 			foreach($this->a_headers as $s_header)
 			{
@@ -88,8 +87,7 @@ class XMLPage extends WebPage
 				{
 					header($s_header);
 				}
-				$sCharset = self::PAGES_CHARSET;
-				echo "<?xml version=\"1.0\" encoding=\"$sCharset\"?".">\n";
+				echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n";
 				echo trim($s_captured_output);
 				echo trim($this->s_content);
 				echo $sText;

approot.inc.php

@@ -2,5 +2,14 @@
 
 define('APPROOT', dirname(__FILE__).'/');
 define('APPCONF', APPROOT.'conf/');
+define('ITOP_DEFAULT_ENV', 'production');
 
-require_once APPROOT.'bootstrap.inc.php';
+if (function_exists('microtime'))
+{
+	$fItopStarted = microtime(true); 
+}
+else
+{
+	$fItopStarted = 1000 * time();
+}
+?>

bootstrap.inc.php

@@ -1,92 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2019 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-define('ITOP_DEFAULT_ENV', 'production');
-define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
-define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
-
-if (function_exists('microtime'))
-{
-	$fItopStarted = microtime(true);
-}
-else
-{
-	$fItopStarted = 1000 * time();
-}
-
-if (! isset($GLOBALS['bBypassAutoload']) || $GLOBALS['bBypassAutoload'] == false)
-{
-	require_once APPROOT.'/lib/autoload.php';
-}
-
-//
-// Maintenance mode
-//
-
-// Use 'maintenance' parameter to bypass maintenance mode
-if (!isset($bBypassMaintenance))
-{
-	$bBypassMaintenance = isset($_REQUEST['maintenance']) ? boolval($_REQUEST['maintenance']) : false;
-}
-
-if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
-{
-	$sTitle = 'Maintenance';
-	$sMessage = 'This application is currently under maintenance.';
-
-	http_response_code(503);
-	// Display message depending on the request
-	include(APPROOT.'application/maintenancemsg.php');
-	$sSAPIName = strtoupper(trim(php_sapi_name()));
-
-	switch (true)
-	{
-		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/pages/ajax.searchform.php'):
-			_MaintenanceHtmlMessage($sMessage);
-			break;
-
-		case $sSAPIName == 'CLI':
-		case array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER):
-		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/webservices/soapserver.php'):
-		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/webservices/rest.php'):
-			_MaintenanceTextMessage($sMessage);
-			break;
-
-		case isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] == 'application/json'):
-			_MaintenanceJsonMessage($sTitle, $sMessage);
-			break;
-
-		default:
-			_MaintenanceSetupPageMessage($sTitle, $sMessage);
-			break;
-	}
-	exit();
-}
-
-/**
- * helper to test if a string ends with another
- * @param $haystack
- * @param $needle
- *
- * @return bool
- */
-function EndsWith($haystack, $needle) {
-	return substr_compare($haystack, $needle, -strlen($needle)) === 0;
-}

composer.json

@@ -1,77 +1,19 @@
 {
-  "type": "project",
-  "license": "AGPLv3",
   "require": {
     "php": ">=5.6.0",
+    "ext-mysql": "*",
+    "ext-ldap": "*",
+    "ext-mcrypt": "*",
+    "ext-cli": "*",
     "ext-soap": "*",
     "ext-json": "*",
+    "ext-zip": "*",
     "ext-mysqli": "*",
-    "ext-dom": "*",
-    "ext-iconv": "*",
-    "ext-gd": "*",
-    "ext-ctype": "*",
-
-    "scssphp/scssphp": "1.0.0",
-    "swiftmailer/swiftmailer": "5.4.9",
-    "pelago/emogrifier": "2.1.0",
-    "combodo/tcpdf": "6.3.0",
-    "pear/archive_tar": "1.4.7",
-
-    "symfony/console": "3.4.*",
-    "symfony/dotenv": "3.4.*",
-    "symfony/framework-bundle": "3.4.*",
-    "symfony/twig-bundle": "3.4.*",
-    "symfony/yaml": "3.4.*",
-    "symfony/polyfill-php70": "1.*"
-  },
-  "require-dev": {
-    "symfony/stopwatch": "3.4.*",
-    "symfony/web-profiler-bundle": "3.4.*"
-  },
-  "suggest": {
-    "ext-libsodium": "Required to use the AttributeEncryptedString.",
-    "ext-openssl": "Can be used as a polyfill if libsodium is not installed",
-    "ext-mcrypt": "Can be used as a polyfill if either libsodium and openssl are not installed (libsodium and openssl are more secure)",
-    "ext-ldap": "Required to use LDAP as an identity provider",
-    "ext-posix": "Not required by the core, but some extensions uses it.",
-    "ext-imap": "Required by the extension \"Mail to ticket automation\""
+    "ext-gd": "*"
   },
   "config": {
     "platform": {
       "php": "5.6.0"
-    },
-    "vendor-dir": "lib",
-    "preferred-install": {
-      "*": "dist"
-    },
-    "sort-packages": true
-  },
-  "autoload": {
-    "classmap": [
-      "core",
-      "application"
-    ],
-    "exclude-from-classmap": [
-      "core/dbobjectsearch.class.php",
-      "core/legacy/dbobjectsearchlegacy.class.php",
-      "core/querybuildercontext.class.inc.php",
-      "core/legacy/querybuildercontextlegacy.class.inc.php",
-      "core/querybuilderexpressions.class.inc.php",
-      "core/legacy/querybuilderexpressionslegacy.class.inc.php",
-      "application/loginform.class.inc.php",
-      "application/loginbasic.class.inc.php",
-      "application/logindefault.class.inc.php",
-      "application/loginexternal.class.inc.php",
-      "application/loginurl.class.inc.php"
-    ]
-  },
-  "conflict": {
-    "symfony/symfony": "*"
-  },
-  "extra": {
-    "symfony": {
-      "allow-contrib": false,
-      "require": "3.4.*"
     }
   }
 }

composer.readme

@@ -1,2 +0,0 @@
-To regenerate the autoload, run:
-composer dump-autoload -a