N°2847 - Fix "Add some criterion..." message on OQL menus

- Hide main action buttons
- Remove activity tab entry form
- Send caselogs value with global form

.editorconfig

@@ -6,20 +6,19 @@ end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
-max_line_length = 300
+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 = 300
+ij_visual_guides = 80,120
 ij_wrap_on_typing = true
 
 [*.css]
 indent_style = tab
 ij_smart_tabs = true
-ij_visual_guides = none
 ij_css_align_closing_brace_with_properties = false
 ij_css_blank_lines_around_nested_selector = 1
 ij_css_blank_lines_between_blocks = 1
@@ -39,9 +38,7 @@ ij_css_use_double_quotes = true
 ij_css_value_alignment = do_not_align
 
 [*.scss]
-indent_size = 2
-tab_width = 2
-ij_visual_guides = none
+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
@@ -61,8 +58,8 @@ ij_scss_use_double_quotes = true
 ij_scss_value_alignment = 0
 
 [*.twig]
+indent_style = tab
 ij_smart_tabs = true
-ij_visual_guides = none
 ij_wrap_on_typing = false
 ij_twig_keep_indents_on_empty_lines = false
 ij_twig_spaces_inside_comments_delimiters = true
@@ -70,7 +67,6 @@ ij_twig_spaces_inside_delimiters = true
 ij_twig_spaces_inside_variable_delimiters = true
 
 [.editorconfig]
-ij_visual_guides = none
 ij_editorconfig_align_group_field_declarations = false
 ij_editorconfig_space_after_colon = false
 ij_editorconfig_space_after_comma = true
@@ -78,19 +74,17 @@ ij_editorconfig_space_before_colon = false
 ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
 
-[{*.ant, *.fxml, *.jhm, *.jnlp, *.jrxml, *.rng, *.tld, *.wsdl, *.xml, *.xsd, *.xsl, *.xslt, *.xul, phpunit.xml.dist}]
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}]
 indent_size = 2
 tab_width = 2
 ij_smart_tabs = true
-ij_visual_guides = none
-ij_wrap_on_typing = false
 ij_xml_align_attributes = true
 ij_xml_align_text = false
 ij_xml_attribute_wrap = normal
 ij_xml_block_comment_at_first_column = true
 ij_xml_keep_blank_lines = 2
 ij_xml_keep_indents_on_empty_lines = false
-ij_xml_keep_line_breaks = true
+ij_xml_keep_line_breaks = false
 ij_xml_keep_line_breaks_in_text = true
 ij_xml_keep_whitespaces = false
 ij_xml_keep_whitespaces_around_cdata = preserve
@@ -99,24 +93,21 @@ ij_xml_line_comment_at_first_column = true
 ij_xml_space_after_tag_name = false
 ij_xml_space_around_equals_in_attribute = false
 ij_xml_space_inside_empty_tag = false
-ij_xml_text_wrap = off
+ij_xml_text_wrap = normal
 
 [{*.bash,*.sh,*.zsh}]
 indent_size = 2
 tab_width = 2
-ij_visual_guides = none
 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
-ij_shell_use_unix_line_separator = true
 
 [{*.cjs,*.js}]
 indent_style = tab
 ij_continuation_indent_size = 4
 ij_smart_tabs = true
-ij_visual_guides = none
 ij_javascript_align_imports = false
 ij_javascript_align_multiline_array_initializer_expression = false
 ij_javascript_align_multiline_binary_operation = false
@@ -280,7 +271,7 @@ ij_javascript_while_brace_force = always
 ij_javascript_while_on_new_line = false
 ij_javascript_wrap_comments = false
 
-[{*.ctp, *.hphp, *.inc, *.module, *.php, *.php4, *.php5, *.phtml}]
+[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
 indent_style = tab
 ij_continuation_indent_size = 4
 ij_smart_tabs = true
@@ -289,8 +280,8 @@ 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 = true
-ij_php_align_multiline_array_initializer_expression = true
+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
@@ -306,7 +297,6 @@ 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_attributes_wrap = off
 ij_php_author_weight = 8
 ij_php_binary_operation_sign_on_next_line = false
 ij_php_binary_operation_wrap = off
@@ -395,7 +385,6 @@ ij_php_new_line_after_php_opening_tag = false
 ij_php_null_type_position = in_the_end
 ij_php_package_weight = 28
 ij_php_param_weight = 5
-ij_php_parameters_attributes_wrap = off
 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
@@ -417,7 +406,6 @@ ij_php_see_weight = 3
 ij_php_since_weight = 28
 ij_php_sort_phpdoc_elements = true
 ij_php_space_after_colon = true
-ij_php_space_after_colon_in_named_argument = true
 ij_php_space_after_colon_in_return_type = true
 ij_php_space_after_comma = true
 ij_php_space_after_for_semicolon = true
@@ -431,7 +419,6 @@ 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_named_argument = false
 ij_php_space_before_colon_in_return_type = false
 ij_php_space_before_comma = false
 ij_php_space_before_do_left_brace = true
@@ -499,7 +486,6 @@ ij_php_while_on_new_line = false
 
 [{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}]
 indent_size = 2
-ij_visual_guides = none
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false
 ij_json_keep_line_breaks = true
@@ -514,7 +500,6 @@ ij_json_wrap_long_lines = false
 [{*.htm,*.html,*.sht,*.shtm,*.shtml}]
 indent_style = tab
 ij_smart_tabs = true
-ij_visual_guides = none
 ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
 ij_html_align_attributes = true
 ij_html_align_text = false
@@ -542,30 +527,10 @@ ij_html_space_inside_empty_tag = false
 ij_html_text_wrap = normal
 ij_html_uniform_ident = false
 
-[{*.markdown,*.md}]
-ij_visual_guides = none
-ij_markdown_force_one_space_after_blockquote_symbol = true
-ij_markdown_force_one_space_after_header_symbol = true
-ij_markdown_force_one_space_after_list_bullet = true
-ij_markdown_force_one_space_between_words = true
-ij_markdown_keep_indents_on_empty_lines = false
-ij_markdown_max_lines_around_block_elements = 1
-ij_markdown_max_lines_around_header = 1
-ij_markdown_max_lines_between_paragraphs = 1
-ij_markdown_min_lines_around_block_elements = 1
-ij_markdown_min_lines_around_header = 1
-ij_markdown_min_lines_between_paragraphs = 1
-
 [{*.yaml,*.yml}]
 indent_size = 2
-ij_visual_guides = none
-ij_yaml_align_values_properties = do_not_align
-ij_yaml_autoinsert_sequence_marker = true
-ij_yaml_block_mapping_on_new_line = false
-ij_yaml_indent_sequence_value = true
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true
-ij_yaml_sequence_on_new_line = false
-ij_yaml_space_before_colon = false
+ij_yaml_space_before_colon = true
 ij_yaml_spaces_within_braces = true
 ij_yaml_spaces_within_brackets = true

.gitattributes

@@ -1,48 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.bash text eol=lf
-*.bat text eol=lf
-*.cmd text eol=lf
-*.css text eol=lf
-*.scss text eol=lf
-*.dist text eol=lf
-.editorconfig text eol=lf
-.env* text eol=lf
-.gitignore text eol=lf
-.htaccess text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.ini text eol=lf
-*.js text eol=lf
-*.json text eol=lf
-*.lock text eol=lf
-*.md text eol=lf
-*.php text eol=lf
-*.php_cs text eol=lf
-*.php8 text eol=lf
-*.plex text eol=lf
-*.sh text eol=lf
-*.svg text eol=lf
-*.ts text eol=lf
-*.twig text eol=lf
-*.txt text eol=lf
-*.xml text eol=lf
-*.xsd text eol=lf
-*.yaml text eol=lf
-*.yml text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpeg binary
-*.jpg binary
-*.gif binary
-*.ico binary
-*.pdf binary
-*.swf binary
-*.zip binary
-*.ttf binary
-*.woff binary
-*.woff2 binary

.gitignore

@@ -1,4 +1,15 @@
 
+################################### Temporary ignore rules during 2.8 UI/UX dev - START
+/css/backoffice/main.css
+
+# Sass converter
+/**/.sass-cache/
+################################### Temporary ignore rules during 2.8 UI/UX dev - END
+
+
+
+
+
 # no slash at the end to handle also symlinks
 /toolkit
 /env-*
@@ -8,7 +19,7 @@
 
 # composer reserver directory, from sources, populate/update using "composer install"
 vendor/*
-tests/*/vendor/*
+test/vendor/*
 
 # all conf but listing prevention
 /conf/**
@@ -32,13 +43,9 @@ tests/*/vendor/*
 !/log/index.php
 !/log/web.config
 
-# PHPUnit cache file
-/tests/php-unit-tests/.phpunit.result.cache
-
 
 # Jetbrains
 /.idea/**
-!/.idea/IntelliLang.xml
 
 # doc. generation
 /.doc/vendor
@@ -133,3 +140,5 @@ local.properties
 .cache-main
 .scala_dependencies
 .worksheet
+
+/css/setup.css

.idea/IntelliLang.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="LanguageInjectionConfiguration">
-    <injection language="InjectablePHP" injector-id="xml">
-      <display-name>iTop - Class method code</display-name>
-      <place><![CDATA[xmlTag().withLocalName(string().equalTo("code"))]]></place>
-      <xpath-condition>name(..) = 'method' and count(/itop_design) = 1</xpath-condition>
-    </injection>
-    <injection language="InjectablePHP" injector-id="xml">
-      <display-name>iTop - Snippet code</display-name>
-      <place><![CDATA[xmlTag().withLocalName(string().equalTo("snippet"))]]></place>
-      <xpath-condition>name(..) = 'snippets' and count(/itop_design) = 1</xpath-condition>
-    </injection>
-  </component>
-</project>

.make/composer/rmDeniedTestDir.php

@@ -36,38 +36,22 @@ clearstatcache();
 $oiTopComposer = new iTopComposer();
 $aDeniedButStillPresent = $oiTopComposer->ListDeniedButStillPresent();
 
-echo "\n";
 foreach ($aDeniedButStillPresent as $sDir)
 {
-	if (false === iTopComposer::IsTestDir($sDir))
+	if (! preg_match('#[tT]ests?/?$#', $sDir))
 	{
-		echo "ERROR found INVALID denied test dir: '$sDir'\n";
+		echo "\nfound INVALID denied test dir: '$sDir'\n";
 		throw new \Exception("$sDir must end with /Test/ or /test/");
 	}
 
-	if (false === file_exists($sDir)) {
-		echo "INFO $sDir is in denied list, but not existing on disk => skipping !\n";
-		continue;
-	}
-
-	try {
+	try
+	{
 		SetupUtils::rrmdir($sDir);
-		echo "OK Remove denied test dir: '$sDir'\n";
+		echo "Remove denied test dir: '$sDir'\n";
 	}
-	catch (\Exception $e) {
+	catch (\Exception $e)
+	{
 		echo "\nFAILED to remove denied test dir: '$sDir'\n";
 	}
-}
 
-
-$aAllowedAndDeniedDirs = array_merge(
-	$oiTopComposer->ListAllowedTestDir(),
-	$oiTopComposer->ListDeniedTestDir()
-);
-$aExistingDirs = $oiTopComposer->ListAllTestDir();
-$aMissing = array_diff($aExistingDirs, $aAllowedAndDeniedDirs);
-if (false === empty($aMissing)) {
-	echo "Some new tests dirs exists !\n"
-		.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
-		.'  List of dirs:'."\n".var_export($aMissing, true);
 }

.make/license/updateLicenses.php

@@ -1,42 +1,20 @@
 <?php
 /**
- * script used to sort license file (useful for autogeneration)
- *
- * Requirements :
- *  * bash (on Windows, use Git Bash)
- *  * composer (if you use the phar version, mind to create a `Composer` alias !)
- *  * JQ command
- *    to install on Windows :
- *       `curl -L -o /usr/bin/jq.exe https://github.com/stedolan/jq/releases/latest/download/jq-win64.exe`
- *    this is a Windows port : https://stedolan.github.io/jq/
- *
- * Licenses sources :
- *  * `composer licenses --format json` (see https://getcomposer.org/doc/03-cli.md#licenses)
- *  * keep every existing nodes with `/licenses/license[11]/product/@scope` not in ['lib', 'datamodels']
- *    ⚠ If licenses were added manually, they might be removed by this tool ! Be very careful to check for the result before pushing !
- *
- * To launch, check requirements and run `php updateLicenses.php`
- * The target license file path is in `$xmlFilePath`
+ * script used to sort license file (usefull for autogeneration)
+ * Example: php 
  */
 
-$iTopFolder = __DIR__."/../../";
-$xmlFilePath = $iTopFolder."setup/licenses/community-licenses.xml";
+$iTopFolder = __DIR__ . "/../../" ;
+$xmlFilePath = $iTopFolder . "setup/licenses/community-licenses.xml";
 
-$jqExec = shell_exec("jq -V"); // a param is mandatory otherwise the script will freeze
-if ((null === $jqExec) || (false === $jqExec)) {
-	echo "/!\ JQ is required but cannot be launched :( \n";
-	echo "Check this script PHPDoc block for instructions\n";
-	die(-1);
-}
-
-
-function get_scope($product_node) {
+function get_scope($product_node)
+{
 	$scope = $product_node->getAttribute("scope");
 
-	if ($scope === "") {   //put iTop first
+	if ($scope === "")
+	{   //put iTop first
 		return "aaaaaaaaa";
 	}
-
 	return $scope;
 }
 
@@ -73,83 +51,39 @@ function get_license_nodes($file_path)
 	$xp = new DOMXPath($dom);
 
 	$licenseList = $xp->query('/licenses/license');
-	$licenses    = iterator_to_array($licenseList);
+	$licenses = iterator_to_array($licenseList);
 
 	usort($licenses, 'sort_by_product');
-
 	return $licenses;
 }
 
-/** @noinspection SuspiciousAssignmentsInspection */
-function fix_product_name(DOMNode &$oProductNode)
-{
-	$sProductNameOrig = $oProductNode->nodeValue;
-
-	// sample : `C:\Dev\wamp64\www\itop-27\.make\license/../..//lib/symfony/polyfill-ctype`
-	$sProductNameFixed = remove_dir_from_string($sProductNameOrig, 'lib/');
-
-	// sample : `C:\Dev\wamp64\www\itop-27\.make\license/../..//datamodels/2.x/authent-cas/vendor/apereo/phpcas`
-	$sProductNameFixed = remove_dir_from_string($sProductNameFixed, 'vendor/');
-
-	$oProductNode->nodeValue = $sProductNameFixed;
-}
-
-function remove_dir_from_string($sString, $sNeedle)
-{
-	if (strpos($sString, $sNeedle) === false) {
-		return $sString;
-	}
-
-	$sStringTmp   = strstr($sString, $sNeedle);
-	$sStringFixed = str_replace($sNeedle, '', $sStringTmp);
-
-	// DEBUG trace O:)
-//	echo "$sNeedle = $sString => $sStringFixed\n";
-
-	return $sStringFixed;
-}
-
 $old_licenses = get_license_nodes($xmlFilePath);
 
 //generate file with updated licenses
 $generated_license_file_path = __DIR__."/provfile.xml";
-echo "- Generating licences...";
-exec("bash ".__DIR__."/gen-community-license.sh $iTopFolder > ".$generated_license_file_path);
-echo "OK!\n";
-
-echo "- Get licenses nodes...";
+exec("bash " . __DIR__ . "/gen-community-license.sh $iTopFolder > ". $generated_license_file_path);
 $new_licenses = get_license_nodes($generated_license_file_path);
-unlink($generated_license_file_path);
+exec("rm -f ". $generated_license_file_path);
 
 foreach ($old_licenses as $b) {
 	$aProductNode = get_product_node($b);
 
-	if (get_scope($aProductNode) !== "lib" && get_scope($aProductNode) !== "datamodels") {
+	if (get_scope($aProductNode) !== "lib" && get_scope($aProductNode) !== "datamodels" )
+	{
 		$new_licenses[] = $b;
 	}
 }
 
 usort($new_licenses, 'sort_by_product');
-echo "OK!\n";
 
-echo "- Overwritting Combodo license file...";
 $new_dom = new DOMDocument("1.0");
 $new_dom->formatOutput = true;
 $root = $new_dom->createElement("licenses");
 $new_dom->appendChild($root);
 
 foreach ($new_licenses as $b) {
-	$node = $new_dom->importNode($b, true);
-
-	// N°3870 fix when running script in Windows
-	// fix should be in gen-community-license.sh but it is easier to do it here !
-	if (strncasecmp(PHP_OS, 'WIN', 3) === 0) {
-		$oProductNodeOrig = get_product_node($node);
-		fix_product_name($oProductNodeOrig);
-	}
-
-	$root->appendChild($node);
+	$node = $new_dom->importNode($b,true);
+	$root->appendChild($new_dom->importNode($b,true));
 }
 
-$new_dom->save($xmlFilePath);
-echo "OK!\n";
+$new_dom->save($xmlFilePath);

.make/release/changelog.php

@@ -1,77 +0,0 @@
-<?php
-/**
- * Usage :
- * `php changelog.php 2.7.4`
- *
- * As argument is passed the git ref (tag name or sha1) we want to use as reference
- *
- * Outputs :
- *
- * 1. List of bugs as CSV :
- * bug ref;link
- * Example :
- * <code>
- * Bug_ref;Bug_URL;sha1
- * 1234;https://support.combodo.com/pages/UI.php?operation=details&class=Bug&id=1234;949b213f9|b1ca1f263|a1271da74
- * </code>
- *
- * 2. List of commits sha1/message without bug ref
- * Example :
- * <code>
- * sha1;subject
- * a6aa183e2;:bookmark: Prepare 2.7.5
- * </code>
- */
-
-
-if (count($argv) === 1) {
-	echo '⚠ You must pass the base tag/sha1 as parameter';
-	exit(1);
-}
-$sBaseReference = $argv[1];
-
-
-//--- Get log
-$sGitLogCommand = 'git log --decorate --pretty="%h;%s" --date-order --no-merges '.$sBaseReference.'..HEAD';
-$sGitLogRaw = shell_exec($sGitLogCommand);
-
-
-//--- Analyze log
-$aGitLogLines = preg_split('/\n/', trim($sGitLogRaw));;
-$aLogLinesWithBugRef = [];
-$aLogLineNoBug = [];
-foreach ($aGitLogLines as $sLogLine) {
-	$sBugRef = preg_match('/[nN]°(\d{3,4})/', $sLogLine, $aLineBugRef);
-	if (($sBugRef === false) || empty($aLineBugRef)) {
-		$aLogLineNoBug[] = $sLogLine;
-		continue;
-	}
-
-	$iBugId = $aLineBugRef[1];
-	$sSha = substr($sLogLine, 0, 9);
-
-	if (array_key_exists($iBugId, $aLogLinesWithBugRef)) {
-		$aBugShaRefs = $aLogLinesWithBugRef[$iBugId];
-		$aBugShaRefs[] = $sSha;
-		$aLogLinesWithBugRef[$iBugId] = $aBugShaRefs;
-	} else {
-		$aLogLinesWithBugRef[$iBugId] = [$sSha];
-	}
-}
-$aBugsList = array_keys($aLogLinesWithBugRef);
-sort($aBugsList, SORT_NUMERIC);
-
-
-//-- Output results
-echo "# Bugs included\n";
-echo "Bug_ref;Bug_URL;sha1\n";
-foreach ($aBugsList as $sBugRef) {
-	$sShaRefs = implode('|', $aLogLinesWithBugRef[$sBugRef]);
-	echo "{$sBugRef};https://support.combodo.com/pages/UI.php?operation=details&class=Bug&id={$sBugRef};$sShaRefs\n";
-}
-echo "\n";
-echo "# Logs line without bug referenced\n";
-echo "sha1;subject\n";
-foreach ($aLogLineNoBug as $sLogLine) {
-	echo "$sLogLine\n";
-}

.make/release/update-versions.php

@@ -27,7 +27,6 @@ $aFilesUpdaters = array(
 	new iTopVersionFileUpdater(),
 	new CssVariablesFileUpdater(),
 	new DatamodelsModulesFiles(),
-	new ConstantFileUpdater('ITOP_CORE_VERSION', 'approot.inc.php'),
 );
 
 if (count($argv) === 1)

.make/release/update.classes.inc.php

@@ -69,40 +69,6 @@ abstract class AbstractSingleFileVersionUpdater extends FileVersionUpdater
 	}
 }
 
-/**
- * @since 2.7.7 3.0.1 3.1.0 N°4714
- */
-class ConstantFileUpdater extends AbstractSingleFileVersionUpdater {
-	/** @var string */
-	private $sConstantName;
-
-	/**
-	 * @param $sConstantName constant to search, for example `ITOP_CORE_VERSION`
-	 * @param $sFileToUpdate file containing constant definition
-	 */
-	public function __construct($sConstantName, $sFileToUpdate)
-	{
-		$this->sConstantName = $sConstantName;
-		parent::__construct($sFileToUpdate);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function UpdateFileContent($sVersionLabel, $sFileContent, $sFileFullPath)
-	{
-		$sConstantSearchPattern = <<<REGEXP
-/define\('{$this->sConstantName}', ?'[^']+'\);/
-REGEXP;
-
-		return preg_replace(
-			$sConstantSearchPattern,
-			"define('{$this->sConstantName}', '{$sVersionLabel}');",
-			$sFileContent
-		);
-	}
-}
-
 class iTopVersionFileUpdater extends AbstractSingleFileVersionUpdater
 {
 	public function __construct()

CONTRIBUTING.md

@@ -52,23 +52,23 @@ Here are the branches we use and their meaning :
 
 For example, if no version is currently prepared for shipping we could have:
 
-- `develop` containing future 2.8.0 version
+- `develop` containing future 3.0.0 version
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.x maintenance version
 - `support/2.5`: 2.5.x maintenance version
 
-In this example, when 2.8.0-beta is shipped that will become:
+In this example, when 3.0.0-beta is shipped that will become:
 
-- `develop`: future 2.9.0 version
-- `release/2.8`: 2.8.0-beta
+- `develop`: future 3.1.0 version
+- `release/3.0.0`: 3.0.0-beta
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.x maintenance version
 - `support/2.5`: 2.5.x maintenance version
 
-And when 2.8.0 final will be out:
+And when 3.0.0 final will be out:
 
-- `develop`: future 2.9.0 version
-- `support/2.8`: 2.8.x maintenance version (will host developments for 2.8.1)
+- `develop`: future 3.1.0 version
+- `support/2.8`: 2.8.x maintenance version (will host developments for 3.0.1)
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.x maintenance version
 - `support/2.5`: 2.5.x maintenance version
@@ -111,9 +111,9 @@ Our tests are located in the `test/` directory, containing a PHPUnit config file
 * 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.dev/)).  
-  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 :
+* 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
@@ -132,7 +132,7 @@ Our tests are located in the `test/` directory, containing a PHPUnit config file
 
 When your code is working, please:
 
-* squash as much as possible your commits,
+* stash as much as possible your commits,
 * rebase your branch on our repo last commit,
 * create a pull request.
 

Jenkinsfile

@@ -1,14 +1,6 @@
 def infra
 
 node(){
-    properties([
-            buildDiscarder(
-                    logRotator(
-                            daysToKeepStr: "28",
-                            numToKeepStr: "500")
-            )
-    ])
-
   checkout scm
 
   infra = load '/var/lib/jenkins/workspace/itop-test-infra_master/src/Infra.groovy'

README.md

@@ -23,10 +23,10 @@ iTop also offers mass import tools and web services to integrate with your IT
 
 ## Latest release
 
-- [Changes since the previous version][62]
-- [New features][63]
-- [Installation notes][64]
-- [Download][65]
+ - [Changes since the previous version][62]
+ - [New features][63]
+ - [Installation notes][64]
+ - [Download][65]
 
 [62]: https://www.itophub.io/wiki/page?id=latest:release:change_log
 [63]: https://www.itophub.io/wiki/page?id=latest:release:start
@@ -39,16 +39,17 @@ iTop also offers mass import tools and web services to integrate with your IT
  - [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 !
-
+ - [Software requirements][4]
+ - [Documentation][5] covering both iTop and its official extensions
+ - [iTop Hub][6] : 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/
+[4]: https://www.itophub.io/wiki/page?id=latest:install:upgrading_itop
+[5]: https://www.itophub.io/wiki
+[6]: 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
@@ -77,10 +78,10 @@ We would like to give a special thank you to the people from the community who c
  - Alves, David
  - Beck, Pedro
  - Bilger, Jean-François
- - Bostoen, Jeffrey
+ - Bostoen, Jeffrey (a.k.a @jbostoen)
  - Cardoso, Anderson
  - Cassaro, Bruno
- - Casteleyn, Thomas
+ - Casteleyn, Thomas (a.k.a @Hipska)
  - Castro, Randall Badilla
  - Colantoni, Maria Laura
  - Couronné, Guy
@@ -95,9 +96,9 @@ We would like to give a special thank you to the people from the community who c
  - Lassiter, Dennis
  - Lazcano, Federico
  - Lucas, Jonathan
-- Malik, Remie
-- Mindêllo de Andrade, Lucas (a.k.a @rokam)
-- Rosenke, Stephan
+ - Malik, Remie
+ - Mindêllo de Andrade, Lucas (a.k.a @rokam)
+ - Rosenke, Stephan
  - Seki, Shoji
  - Shilov, Vladimir
  - Tulio, Marco

SECURITY.md

@@ -9,7 +9,7 @@ responsible disclosure and will make every effort to acknowledge your contributi
 ### 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 
+You can send us a standard "given / when / then" report, including iTop version, impacts, and maybe installed modules or data if they are 
 needed to reproduce.
 
 ### Dependencies vulnerabilities

addons/userrights/userrightsprofile.class.inc.php

@@ -23,7 +23,7 @@ define('PORTAL_PROFILE_NAME', 'Portal user');
 class UserRightsBaseClassGUI extends cmdbAbstractObject
 {
 	// Whenever something changes, reload the privileges
-
+	
 	protected function AfterInsert()
 	{
 		UserRights::FlushPrivileges();
@@ -55,7 +55,6 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_profiles",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -73,7 +72,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	}
 
 	protected static $m_aCacheProfiles = null;
-
+	
 	public static function DoCreateProfile($sName, $sDescription)
 	{
 		if (is_null(self::$m_aCacheProfiles))
@@ -85,7 +84,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			{
 				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
 			}
-		}
+		}	
 
 		$sCacheKey = $sName;
 		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
@@ -96,10 +95,10 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$oNewObj->Set('name', $sName);
 		$oNewObj->Set('description', $sDescription);
 		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheProfiles[$sCacheKey] = $iId;
+		self::$m_aCacheProfiles[$sCacheKey] = $iId;	
 		return $iId;
 	}
-
+	
 	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
 	{
 		$bGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
@@ -116,7 +115,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 	}
-
+	
 	function DoShowGrantSumary($oPage)
 	{
 		if ($this->GetRawName() == "Administrator")
@@ -128,7 +127,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 
 		// Note: for sure, we assume that the instance is derived from UserRightsProfile
 		$oUserRights = UserRights::GetModuleInstance();
-
+	
 		$aDisplayData = array();
 		foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass)
 		{
@@ -137,12 +136,12 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			{
 				$bGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
 				if ($bGrant === true)
-				{
+				{ 
 					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
-
+			
 			$aDisplayData[] = array(
 				'class' => MetaModel::GetName($sClass),
 				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'r'),
@@ -154,7 +153,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 				'stimuli' => $sStimuli,
 			);
 		}
-
+	
 		$aDisplayConfig = array();
 		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
 		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
@@ -170,11 +169,9 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
-		if (!$bEditMode)
-		{
-			$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
-			$this->DoShowGrantSumary($oPage);
-		}
+
+		$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
+		$this->DoShowGrantSumary($oPage);
 	}
 
 	public static function GetReadOnlyAttributes()
@@ -214,7 +211,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
 	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
 	 * @return integer Flags: the binary combination of the flags applicable to this attribute
-	 */
+	 */	 	  	 	
 	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
 	{
 		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
@@ -243,7 +240,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userprofile",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -349,7 +345,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userorg",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -397,7 +392,7 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 	{
 		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
 
-		$oUser = UserRights::GetUserObject();
+		$oUser = UserRights::GetUserObject();		
 		$oAddon = UserRights::GetModuleInstance();
 		$aOrgs = $oAddon->GetUserOrgs($oUser, '');
 		if (count($aOrgs) > 0)
@@ -521,7 +516,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 				$oSearch->AllowAllData();
 				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
 				$oSearch->AddConditionExpression($oCondition);
-
+				
 				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
 				while ($oUserOrg = $oUserOrgSet->Fetch())
 				{
@@ -646,10 +641,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// load and cache permissions for the current user on the given class
 		//
 		$iUser = $oUser->GetKey();
-		if (isset($this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode])){
-			$aTest = $this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
-			if (is_array($aTest)) return $aTest;
-		}
+		$aTest = @$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
+		if (is_array($aTest)) return $aTest;
 
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
@@ -815,8 +808,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	/**
 	 * Find out which attribute is corresponding the the dimension 'owner org'
-	 * returns null if no such attribute has been found (no filtering should occur)
-	 */
+	 * returns null if no such attribute has been found (no filtering should occur)	 
+	 */	 	
 	public static function GetOwnerOrganizationAttCode($sClass)
 	{
 		$sAttCode = null;

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

@@ -77,7 +77,6 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_profiles",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -312,11 +311,9 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
-		if (!$bEditMode)
-		{
-			$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
-			$this->DoShowGrantSumary($oPage);		
-		}
+
+		$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
+		$this->DoShowGrantSumary($oPage);
 	}
 }
 
@@ -336,7 +333,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userprofile",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -376,7 +372,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userorg",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -417,7 +412,6 @@ class URP_ActionGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_actions",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -454,7 +448,6 @@ class URP_StimulusGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_stimulus",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -491,7 +484,6 @@ class URP_AttributeGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_attributes",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();

addons/userrights/userrightsprojection.class.inc.php

@@ -58,7 +58,6 @@ class URP_Profiles extends UserRightsBaseClass
 			"db_table" => "priv_urp_profiles",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -144,11 +143,9 @@ class URP_Profiles extends UserRightsBaseClass
 	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
-		if (!$bEditMode)
-		{
-			$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
-			$this->DoShowGrantSumary($oPage);		
-		}
+
+		$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
+		$this->DoShowGrantSumary($oPage);
 	}
 }
 
@@ -167,7 +164,6 @@ class URP_Dimensions extends UserRightsBaseClass
 			"db_table" => "priv_urp_dimensions",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -280,7 +276,6 @@ class URP_UserProfile extends UserRightsBaseClass
 			"db_table" => "priv_urp_userprofile",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -321,7 +316,6 @@ class URP_ProfileProjection extends UserRightsBaseClass
 			"db_table" => "priv_urp_profileprojection",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -402,7 +396,6 @@ class URP_ClassProjection extends UserRightsBaseClass
 			"db_table" => "priv_urp_classprojection",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -474,7 +467,6 @@ class URP_ActionGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_actions",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -511,7 +503,6 @@ class URP_StimulusGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_stimulus",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -548,7 +539,6 @@ class URP_AttributeGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_attributes",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();

application/Html2Text.php

@@ -30,8 +30,11 @@ function mb_str_replace($search, $replace, $subject, &$count = 0) {
 		$replacements = array_pad($replacements, count($searches), '');
 		foreach ($searches as $key => $search) {
 			$parts = mb_split(preg_quote($search), $subject);
-			$count += count($parts) - 1;
-			$subject = implode($replacements[$key], $parts);
+			if (is_array($parts))
+			{
+				$count += count($parts) - 1;
+				$subject = implode($replacements[$key], $parts);
+			}
 		}
 	} else {
 		// Call mb_str_replace for each subject in array, recursively

application/ajaxwebpage.class.inc.php

@@ -1,415 +1,16 @@
 <?php
 /**
- * Copyright (C) 2013-2020 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
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/AjaxPage.php
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
 
-require_once(APPROOT."/application/webpage.class.inc.php");
- 
-class ajax_page extends WebPage implements iTabbedPage
+/**
+ * Class ajax_page
+ * @deprecated will be removed in 3.1.0 - moved to AjaxPage
+ */
+class ajax_page extends AjaxPage
 {
-    /**
-     * Jquery style ready script
-     * @var array
-     */
-	protected $m_sReadyScript;
-	protected $m_oTabs;
-	private $m_sMenu; // If set, then the menu will be updated
 
-	/**
-	 * constructor for the web page
-	 *
-	 * @param string $s_title Not used
-	 */
-	function __construct($s_title) {
-		$sPrintable = utils::ReadParam('printable', '0');
-		$bPrintable = ($sPrintable == '1');
-
-		parent::__construct($s_title, $bPrintable);
-		$this->m_sReadyScript = "";
-		//$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->no_cache();
-		$this->add_xframe_options();
-		$this->m_oTabs = new TabManager();
-		$this->sContentType = 'text/html';
-		$this->sContentDisposition = 'inline';
-		$this->m_sMenu = "";
-
-		utils::InitArchiveMode();
-	}
-
-	/**
-	 * @inheritDoc
-	 * @throws \Exception
-	 */
-	public function AddTabContainer($sTabContainer, $sPrefix = '')
-	{
-		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
-	}
-
-	/**
-	 * @inheritDoc
-	 * @throws \Exception
-	 */
-	public function AddToTab($sTabContainer, $sTabCode, $sHtml)
-	{
-		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabCode, $sHtml));
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function SetCurrentTabContainer($sTabContainer = '')
-	{
-		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function SetCurrentTab($sTabCode = '', $sTabTitle = null)
-	{
-		return $this->m_oTabs->SetCurrentTab($sTabCode, $sTabTitle);
-	}
-
-	/**
-	 * @inheritDoc
-	 * @throws \Exception
-	 */
-	public function AddAjaxTab($sTabCode, $sUrl, $bCache = true, $sTabTitle = null)
-	{
-		$this->add($this->m_oTabs->AddAjaxTab($sTabCode, $sUrl, $bCache, $sTabTitle));
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetCurrentTab()
-	{
-		return $this->m_oTabs->GetCurrentTab();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function RemoveTab($sTabCode, $sTabContainer = null)
-	{
-		$this->m_oTabs->RemoveTab($sTabCode, $sTabContainer);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function FindTab($sPattern, $sTabContainer = null)
-	{
-		return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
-	}
-
-	/**
-	 * Make the given tab the active one, as if it were clicked
-	 * 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...
-	 */
-	public function SelectTab($sTabContainer, $sTabCode)
-	{
-		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabCode));
-	}
-
-	/**
-	 * @param string $sHtml
-	 */
-	public function AddToMenu($sHtml)
-	{
-		$this->m_sMenu .= $sHtml;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function output()
-    {
-    	if (!empty($this->sContentType))
-    	{
-			$this->add_header('Content-type: '.$this->sContentType);
-    	}
-    	if (!empty($this->sContentDisposition))
-    	{
-			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
-    	}
-        foreach($this->a_headers as $s_header)
-        {
-            header($s_header);
-        }
-		if ($this->m_oTabs->TabsContainerCount() > 0)
-		{
-			$this->add_ready_script(
-<<<EOF
-			// The "tab widgets" to handle.
-			var tabs = $('div[id^=tabbedContent]');
-			  
-			// Ugly patch for a change in the behavior of jQuery UI:
-			// Before jQuery UI 1.9, tabs were always considered as "local" (opposed to Ajax)
-			// when their href was beginning by #. Starting with 1.9, a <base> tag in the page
-			// is taken into account and causes "local" tabs to be considered as Ajax
-			// unless their URL is equal to the URL of the page...
-			if ($('base').length > 0)
-			{
-				$('div[id^=tabbedContent] > ul > li > a').each(function() {
-					var sHash = location.hash;
-					var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
-		    		$(this).attr("href", sCleanLocation+$(this).attr("href"));
-				});
-			}
-			if ($.bbq)
-			{
-				// This selector will be reused when selecting actual tab widget A elements.
-				var tab_a_selector = 'ul.ui-tabs-nav a';
-				  
-				// Enable tabs on all tab widgets. The `event` property must be overridden so
-				// that the tabs aren't changed on click, and any custom event name can be
-				// specified. Note that if you define a callback for the 'select' event, it
-				// will be executed for the selected tab whenever the hash changes.
-				tabs.tabs({ event: 'change' });
-				  
-				// Define our own click handler for the tabs, overriding the default.
-				tabs.find( tab_a_selector ).click(function()
-				{
-					var state = {};
-							  
-					// Get the id of this tab widget.
-					var id = $(this).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
-					  
-					// Get the index of this tab.
-					var idx = $(this).parent().prevAll().length;
-					
-					// Set the state!
-					state[ id ] = idx;
-					$.bbq.pushState( state );
-				});
-			}
-			else
-			{
-				tabs.tabs();
-			}
-EOF
-);
-		}
-		// Render the tabs in the page (if any)
-		$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
-		
-		// Additional UI widgets to be activated inside the ajax fragment
-		// Important: Testing the content type is not enough because some ajax handlers have not correctly positionned the flag (e.g json response corrupted by the script)
-		if (($this->sContentType == 'text/html') && (preg_match('/class="date-pick"/', $this->s_content) || preg_match('/class="datetime-pick"/', $this->s_content)) )
-		{
-			$this->add_ready_script(
-<<<EOF
-PrepareWidgets();
-EOF
-			);
-		}
-	    $this->outputCollapsibleSectionInit();
-
-	    $oKPI = new ExecutionKPI();
-	    $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);
-        }
-        else
-        {
-        	echo $this->s_content;
-        }
-        if (!empty($this->m_sMenu))
-        {
-           $uid = time();
-           echo "<div id=\"accordion_temp_$uid\">\n";
-           echo "<div id=\"accordion\">\n";
-           echo "<!-- Beginning of the accordion menu -->\n";
-           echo self::FilterXSS($this->m_sMenu);
-           echo "<!-- End of the accordion menu-->\n";
-           echo "</div>\n";
-           echo "</div>\n";
-
-	        echo "<script type=\"text/javascript\">\n";
-	        echo "$('#inner_menu').html($('#accordion_temp_$uid').html());\n";
-	        echo "$('#accordion_temp_$uid').remove();\n";
-	        echo "\n</script>\n";
-        }
-
-        //echo $this->s_deferred_content;
-        if (count($this->a_scripts) > 0)
-        {
-        	echo "<script type=\"text/javascript\">\n";
-        	echo implode("\n", $this->a_scripts);
-        	echo "\n</script>\n";
-        }
-        if (count($this->a_linked_scripts) > 0)
-        {
-        	echo "<script type=\"text/javascript\">\n";
-        	foreach($this->a_linked_scripts as $sScriptUrl)
-        	{
-        		echo '$.getScript('.json_encode($sScriptUrl).");\n";
-        	}
-        	echo "\n</script>\n";
-        }
-        if (!empty($this->s_deferred_content))
-        {
-            echo "<script type=\"text/javascript\">\n";
-            echo "\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');\n";
-            echo "\n</script>\n";
-        }
-        if (!empty($this->m_sReadyScript))
-        {
-	        echo "<script type=\"text/javascript\">\n";
-	        echo $this->m_sReadyScript; // Ready Scripts are output as simple scripts
-	        echo "\n</script>\n";
-        }
-        if(count($this->a_linked_stylesheets) > 0)
-        {
-        	echo "<script type=\"text/javascript\">";
-        	foreach($this->a_linked_stylesheets as $aStylesheet)
-	        {
-		        $sStylesheetUrl = $aStylesheet['link'];
-	        	echo "if (!$('link[href=\"{$sStylesheetUrl}\"]').length) $('<link href=\"{$sStylesheetUrl}\" rel=\"stylesheet\">').appendTo('head');\n";
-	        }
-        	echo "\n</script>\n";
-        }
-        
-		if (trim($s_captured_output) != "")
-        {
-        	echo self::FilterXSS($s_captured_output);
-        }
-
-	    $oKPI->ComputeAndReport('Echoing');
-
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-	    if (class_exists('ExecutionKPI'))
-	    {
-		    ExecutionKPI::ReportStats();
-	    }
-    }
-
-    /**
-     * Adds a paragraph with a smaller font into the page
-     * NOT implemented (i.e does nothing)
-     * @param string $sText Content of the (small) paragraph     
-     * @return void
-     */	 	      
-    public function small_p($sText)
-    {
-	}
-
-	/**
-	 * @inheritDoc
-	 * @throws \Exception
-	 */
-	public function add($sHtml)
-    {
-        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
-        {
-            $this->m_oTabs->AddToTab($this->m_oTabs->GetCurrentTabContainer(), $this->m_oTabs->GetCurrentTab(), $sHtml);
-        }
-        else
-        {
-            parent::add($sHtml);
-        }
-    }
-
-	/**
-	 * @inheritDoc
-	 */
-	public function start_capture()
-    {
-    	$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
-		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
-		
-		if (!empty($sCurrentTabContainer) && !empty($sCurrentTab))
-		{
-			$iOffset = $this->m_oTabs->GetCurrentTabLength();
-			return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
-		}
-		else
-		{
-			return parent::start_capture();
-		}
-    }
-
-	/**
-	 * @inheritDoc
-	 */
-	public function end_capture($offset)
-    {
-		if (is_array($offset))
-		{
-			if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab']))
-			{
-				$sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
-			}
-			else
-			{
-				$sCaptured = '';
-			}
-		}
-		else
-		{
-			$sCaptured = parent::end_capture($offset);
-		}
-		return $sCaptured;
-    }
-
-	/**
-	 * @inheritDoc
-	 */
-	public function add_at_the_end($s_html, $sId = '')
-    {
-    	if ($sId != '')
-    	{
-	    	$this->add_script("$('#{$sId}').remove();"); // Remove any previous instance of the same Id
-    	}
-        $this->s_deferred_content .= $s_html;
-    }
-
-	/**
-	 * @inheritDoc
-	 */
-	public function add_ready_script($sScript)
-	{
-		$this->m_sReadyScript .= $sScript."\n";
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function GetUniqueId()
-	{
-		assert(false);
-		return 0;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public static function FilterXSS($sHTML)
-	{
-		return str_ireplace(array('<script', '</script>'), array('<!-- <removed-script', '</removed-script> -->'), $sHTML);
-	}
 }
 

application/application.inc.php

@@ -37,4 +37,3 @@ require_once(APPROOT.'/application/utils.inc.php');
 class ApplicationException extends CoreException
 {
 }
-?>

application/applicationcontext.class.inc.php

@@ -24,19 +24,23 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\UI\Component\Input\InputFactory;
+use Combodo\iTop\Application\UI\Layout\UIContentBlock;
+use Combodo\iTop\Application\UI\UIBlock;
+
 require_once(APPROOT."/application/utils.inc.php");
 
 /**
  * Interface for directing end-users to the relevant application
- */ 
+ */
 interface iDBObjectURLMaker
 {
-    /**
-     * @param string $sClass
-     * @param string $iId
-     *
-     * @return string
-     */
+	/**
+	 * @param string $sClass
+	 * @param string $iId
+	 *
+	 * @return string
+	 */
 	public static function MakeObjectURL($sClass, $iId);
 }
 
@@ -200,23 +204,46 @@ class ApplicationContext
 		}
 		return implode("&", $aParams);
 	}
-	
+	/**
+	 * @since 3.0.0 N°2534 - dashboard: bug with autorefresh that deactivates filtering on organisation
+	 * Returns the params as c[menu]:..., c[org_id]:....
+	 * @return string The params
+	 */
+	public function GetForPostParams()
+	{
+		return json_encode($this->aValues);
+	}
+
 	/**
 	 * 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
 	 */
 	public function GetForForm()
 	{
 		$sContext = "";
-		foreach($this->aValues as $sName => $sValue)
-		{
+		foreach ($this->aValues as $sName => $sValue) {
 			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n";
 		}
 		return $sContext;
 	}
 
+	/**
+	 * Returns the context as sequence of input tags to be inserted inside a <form> tag
+	 *
+	 */
+	public function GetForFormBlock(): UIBlock
+	{
+		$oContext = new UIContentBlock();
+		foreach ($this->aValues as $sName => $sValue) {
+			$oContext->AddSubBlock(InputFactory::MakeForHidden('c[$sName]', utils::HtmlEntities($sValue)));
+		}
+		return $oContext;
+	}
+
 	/**
 	 * Returns the context as a hash array 'parameter_name' => value
+	 *
 	 * @return array The context information
 	 */
 	public function GetAsHash()

application/applicationextension.inc.php

@@ -29,9 +29,9 @@ require_once(APPROOT.'application/newsroomprovider.class.inc.php');
  * You may implement such interfaces in a module file (e.g. main.mymodule.php)
  *
  * @api
- * @package     LoginExtensibilityAPI
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @package     Extensibility
  * @since       2.7.0
  */
 interface iLoginExtension
@@ -39,16 +39,12 @@ interface iLoginExtension
 	/**
 	 * Return the list of supported login modes for this plugin
 	 *
-	 * @api
-	 *
 	 * @return array of supported login modes
 	 */
 	public function ListSupportedLoginModes();
 }
 
 /**
- * @api
- * @package     LoginExtensibilityAPI
  * @since 2.7.0
  */
 interface iLoginFSMExtension extends iLoginExtension
@@ -60,7 +56,6 @@ interface iLoginFSMExtension extends iLoginExtension
 	 * if LoginWebPage::LOGIN_FSM_RETURN_OK is returned then the login is OK and terminated
 	 * if LoginWebPage::LOGIN_FSM_RETURN_IGNORE is returned then the FSM will proceed to next plugin or state
 	 *
-	 * @api
 	 * @param string $sLoginState (see LoginWebPage::LOGIN_STATE_...)
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
@@ -70,8 +65,6 @@ interface iLoginFSMExtension extends iLoginExtension
 }
 
 /**
- * @api
- * @package     LoginExtensibilityAPI
  * @since 2.7.0
  */
 abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
@@ -79,14 +72,15 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	/**
 	 * @inheritDoc
 	 */
-	abstract public function ListSupportedLoginModes();
+	public abstract function ListSupportedLoginModes();
 
 	/**
 	 * @inheritDoc
 	 */
 	public function LoginAction($sLoginState, &$iErrorCode)
 	{
-		switch ($sLoginState) {
+		switch ($sLoginState)
+		{
 			case LoginWebPage::LOGIN_STATE_START:
 				return $this->OnStart($iErrorCode);
 
@@ -118,7 +112,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	/**
 	 * Initialization
 	 *
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -132,7 +125,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * Detect login mode explicitly without respecting configured order (legacy mode)
 	 * In most case do nothing here
 	 *
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -149,7 +141,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * 1 - display login form
 	 * 2 - read the values posted by the user
 	 *
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -163,7 +154,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	 * Control the validity of the data provided by the user
 	 * Automatic user provisioning can be done here
 	 *
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -174,7 +164,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	}
 
 	/**
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -185,7 +174,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	}
 
 	/**
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -196,7 +184,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	}
 
 	/**
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -207,7 +194,6 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 	}
 
 	/**
-	 * @api
 	 * @param int $iErrorCode (see LoginWebPage::EXIT_CODE_...)
 	 *
 	 * @return int LoginWebPage::LOGIN_FSM_RETURN_ERROR, LoginWebPage::LOGIN_FSM_RETURN_OK or LoginWebPage::LOGIN_FSM_RETURN_IGNORE
@@ -219,28 +205,22 @@ abstract class AbstractLoginFSMExtension implements iLoginFSMExtension
 }
 
 /**
- * @api
- * @package     LoginExtensibilityAPI
  * @since 2.7.0
  */
 interface iLogoutExtension extends iLoginExtension
 {
 	/**
 	 * Execute all actions to log out properly
-	 * @api
 	 */
 	public function LogoutAction();
 }
 
 /**
- * @api
- * @package     UIExtensibilityAPI
  * @since 2.7.0
  */
 interface iLoginUIExtension extends iLoginExtension
 {
 	/**
-	 * @api
 	 * @return LoginTwigContext
 	 */
 	public function GetTwigContext();
@@ -248,20 +228,18 @@ interface iLoginUIExtension extends iLoginExtension
 
 /**
  * @api
- * @package     PreferencesExtensibilityAPI
+ * @package     Extensibility
  * @since 2.7.0
  */
 interface iPreferencesExtension
 {
 	/**
-	 * @api
 	 * @param \WebPage $oPage
 	 *
 	 */
 	public function DisplayPreferences(WebPage $oPage);
 
 	/**
-	 * @api
 	 * @param \WebPage $oPage
 	 * @param string $sOperation
 	 *
@@ -274,7 +252,7 @@ interface iPreferencesExtension
  * Extend this class instead of implementing iPreferencesExtension if you don't need to overload all methods
  *
  * @api
- * @package     PreferencesExtensibilityAPI
+ * @package     Extensibility
  * @since       2.7.0
  */
 abstract class AbstractPreferencesExtension implements iPreferencesExtension
@@ -320,7 +298,7 @@ abstract class AbstractPreferencesExtension implements iPreferencesExtension
  * A recommended pattern is to cache data by the mean of static members.
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  */
 interface iApplicationUIExtension
 {
@@ -342,7 +320,6 @@ interface iApplicationUIExtension
 	 * }
 	 * </code>
 	 *
-	 * @api
 	 * @param DBObject $oObject The object being displayed
 	 * @param WebPage $oPage The output context
 	 * @param boolean $bEditMode True if the edition form is being displayed
@@ -356,7 +333,6 @@ interface iApplicationUIExtension
 	 *
 	 * The method is called rigth after all the tabs have been displayed
 	 *
-	 * @api
 	 * @param DBObject $oObject The object being displayed
 	 * @param WebPage $oPage The output context
 	 * @param boolean $bEditMode True if the edition form is being displayed
@@ -371,7 +347,6 @@ interface iApplicationUIExtension
 	 * The method is called after the changes from the standard form have been
 	 * taken into account, and before saving the changes into the database.
 	 *
-	 * @api
 	 * @param DBObject $oObject The object being edited
 	 * @param string $sFormPrefix Prefix given to the HTML form inputs
 	 *
@@ -386,7 +361,6 @@ interface iApplicationUIExtension
 	 * javascript into the edition form, and if that code requires to store temporary data
 	 * (this is the case when a file must be uploaded).
 	 *
-	 * @api
 	 * @param string $sTempId Unique temporary identifier made of session_id and transaction_id. It identifies the object in a unique way.
 	 *
 	 * @return void
@@ -398,7 +372,6 @@ interface iApplicationUIExtension
 	 *
 	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
 	 *
-	 * @api
 	 * @param DBObject $oObject The object being displayed
 	 *
 	 * @return string[] desc
@@ -410,7 +383,6 @@ interface iApplicationUIExtension
 	 *
 	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
 	 *
-	 * @api
 	 * @param DBObject $oObject The object being displayed
 	 *
 	 * @return string Path of the icon, relative to the modules directory.
@@ -430,7 +402,6 @@ interface iApplicationUIExtension
 	 * * HILIGHT_CLASS_OK
 	 * * HILIGHT_CLASS_NONE
 	 *
-	 * @api
 	 * @param DBObject $oObject The object being displayed
 	 *
 	 * @return integer The value representing the mood of the object
@@ -457,7 +428,6 @@ interface iApplicationUIExtension
 	 *
 	 * See also iPopupMenuExtension for greater flexibility
 	 *
-	 * @api
 	 * @param DBObjectSet $oSet A set of persistent objects (DBObject)
 	 *
 	 * @return string[string]
@@ -469,7 +439,7 @@ interface iApplicationUIExtension
  * Extend this class instead of implementing iApplicationUIExtension if you don't need to overload
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since       2.7.0
  */
 abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
@@ -543,7 +513,7 @@ abstract class AbstractApplicationUIExtension implements iApplicationUIExtension
  * or through the GUI.
  *
  * @api
- * @package     ORMExtensibilityAPI
+ * @package     Extensibility
  */
 interface iApplicationObjectExtension
 {
@@ -556,7 +526,6 @@ interface iApplicationObjectExtension
 	 * If the extension returns false, then the framework will perform the usual evaluation.
 	 * Otherwise, the answer is definitively "yes, the object has changed".
 	 *
-	 * @api
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return boolean True if something has changed for the target object
@@ -569,7 +538,6 @@ interface iApplicationObjectExtension
 	 * The GUI calls this verb and reports any issue.
 	 * Anyhow, this API can be called in other contexts such as the CSV import tool.
 	 *
-	 * @api
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
@@ -583,7 +551,6 @@ interface iApplicationObjectExtension
 	 *
 	 * Please not that it is not possible to cascade deletion by this mean: only stopper issues can be handled.
 	 *
-	 * @api
 	 * @param \cmdbAbstractObject $oObject The target object
 	 *
 	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
@@ -599,7 +566,6 @@ interface iApplicationObjectExtension
 	 * * {@see DBObject::ListPreviousValuesForUpdatedAttributes()} : list of changed attributes and their values before the change
 	 * * {@see DBObject::Get()} : for a given attribute the new value that was persisted
 	 *
-	 * @api
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -615,7 +581,6 @@ interface iApplicationObjectExtension
 	 *
 	 * The method is called right <b>after</b> the object has been written to the database.
 	 *
-	 * @api
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -629,7 +594,6 @@ interface iApplicationObjectExtension
 	 *
 	 * The method is called right <b>before</b> the object will be deleted from the database.
 	 *
-	 * @api
 	 * @param \cmdbAbstractObject $oObject The target object
 	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information
 	 *     once for all the changes made within the current page
@@ -643,7 +607,7 @@ interface iApplicationObjectExtension
  * Extend this class instead of iApplicationObjectExtension if you don't need to overload all methods
  *
  * @api
- * @package     ORMExtensibilityAPI
+ * @package     Extensibility
  * @since       2.7.0
  */
 abstract class AbstractApplicationObjectExtension implements iApplicationObjectExtension
@@ -703,7 +667,7 @@ abstract class AbstractApplicationObjectExtension implements iApplicationObjectE
  * by the application, as long as the class definition is included somewhere in the code
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 interface iPopupMenuExtension
@@ -712,21 +676,18 @@ interface iPopupMenuExtension
 	 * Insert an item into the Actions menu of a list
 	 *
 	 * $param is a DBObjectSet containing the list of objects
-	 * @api
 	 */
 	const MENU_OBJLIST_ACTIONS = 1;
 	/**
 	 * Insert an item into the Toolkit menu of a list
 	 *
 	 * $param is a DBObjectSet containing the list of objects
-	 * @api
 	 */
 	const MENU_OBJLIST_TOOLKIT = 2;
 	/**
 	 * Insert an item into the Actions menu on an object details page
 	 *
 	 * $param is a DBObject instance: the object currently displayed
-	 * @api
 	 */
 	const MENU_OBJDETAILS_ACTIONS = 3;
 	/**
@@ -736,14 +697,12 @@ interface iPopupMenuExtension
 	 * is being displayed.
 	 *
 	 * $param is a Dashboard instance: the dashboard currently displayed
-	 * @api
 	 */
 	const MENU_DASHBOARD_ACTIONS = 4;
 	/**
 	 * Insert an item into the User menu (upper right corner)
 	 *
 	 * $param is null
-	 * @api
 	 */
 	const MENU_USER_ACTIONS = 5;
 	/**
@@ -751,7 +710,6 @@ interface iPopupMenuExtension
 	 *
 	 * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object on
 	 * the current line)
-	 * @api
 	 */
 	const PORTAL_OBJLISTITEM_ACTIONS = 7;
 	/**
@@ -759,7 +717,6 @@ interface iPopupMenuExtension
 	 *
 	 * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object
 	 * currently displayed)
-	 * @api
 	 */
 	const PORTAL_OBJDETAILS_ACTIONS = 8;
 
@@ -797,7 +754,6 @@ interface iPopupMenuExtension
 	 * This method is called by the framework for each menu.
 	 * The items will be inserted in the menu in the order of the returned array.
 	 *
-	 * @api
 	 * @param int $iMenuId The identifier of the type of menu, as listed by the constants MENU_xxx
 	 * @param mixed $param Depends on $iMenuId, see the constants defined above
 	 *
@@ -810,7 +766,7 @@ interface iPopupMenuExtension
  * Base class for the various types of custom menus
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 abstract class ApplicationPopupMenuItem
@@ -871,7 +827,6 @@ abstract class ApplicationPopupMenuItem
 	}
 
 	/**
-	 * @api
 	 * @param $aCssClasses
 	 */
 	public function SetCssClasses($aCssClasses)
@@ -882,7 +837,6 @@ abstract class ApplicationPopupMenuItem
 	/**
 	 * Adds a CSS class to the CSS classes that will be put on the menu item
 	 *
-	 * @api
 	 * @param $sCssClass
 	 */
 	public function AddCssClass($sCssClass)
@@ -909,36 +863,47 @@ abstract class ApplicationPopupMenuItem
  * Class for adding an item into a popup menu that browses to the given URL
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 class URLPopupMenuItem extends ApplicationPopupMenuItem
 {
 	/** @ignore */
-	protected $sURL;
+	protected $sUrl;
 	/** @ignore */
 	protected $sTarget;
 
 	/**
 	 * Constructor
 	 *
-	 * @api
 	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
 	 * @param string $sLabel The display label of the menu (must be localized)
-	 * @param string $sURL If the menu is an hyperlink, provide the absolute hyperlink here
+	 * @param string $sUrl If the menu is an hyperlink, provide the absolute hyperlink here
 	 * @param string $sTarget In case the menu is an hyperlink and a specific target is needed (_blank for example), pass it here
 	 */
-	public function __construct($sUID, $sLabel, $sURL, $sTarget = '_top')
+	public function __construct($sUID, $sLabel, $sUrl, $sTarget = '_top')
 	{
 		parent::__construct($sUID, $sLabel);
-		$this->sURL = $sURL;
+		$this->sUrl = $sUrl;
 		$this->sTarget = $sTarget;
 	}
 
 	/** @ignore */
 	public function GetMenuItem()
 	{
-		return array('label' => $this->GetLabel(), 'url' => $this->sURL, 'target' => $this->sTarget, 'css_classes' => $this->aCssClasses);
+		return array('label' => $this->GetLabel(), 'url' => $this->GetUrl(), 'target' => $this-> GetTarget(), 'css_classes' => $this->aCssClasses);
+	}
+	
+	/** @ignore */
+	public function GetUrl()
+	{
+		return $this->sUrl;
+	}
+
+	/** @ignore */
+	public function GetTarget()
+	{
+		return $this->sTarget;
 	}
 }
 
@@ -946,13 +911,15 @@ class URLPopupMenuItem extends ApplicationPopupMenuItem
  * Class for adding an item into a popup menu that triggers some Javascript code
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 class JSPopupMenuItem extends ApplicationPopupMenuItem
 {
 	/** @ignore */
-	protected $sJSCode;
+	protected $sJsCode;
+	/** @ignore */
+	protected $sUrl;
 	/** @ignore */
 	protected $aIncludeJSFiles;
 
@@ -970,7 +937,8 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 	public function __construct($sUID, $sLabel, $sJSCode, $aIncludeJSFiles = array())
 	{
 		parent::__construct($sUID, $sLabel);
-		$this->sJSCode = $sJSCode;
+		$this->sJsCode = $sJSCode;
+		$this->sUrl = '#';
 		$this->aIncludeJSFiles = $aIncludeJSFiles;
 	}
 
@@ -980,9 +948,9 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 		// Note: the semicolumn is a must here!
 		return array(
 			'label' => $this->GetLabel(),
-			'onclick' => $this->sJSCode.'; return false;',
-			'url' => '#',
-			'css_classes' => $this->aCssClasses,
+			'onclick' => $this->GetJsCode().'; return false;',
+			'url' => $this->GetUrl(),
+			'css_classes' => $this->GetCssClasses(),
 		);
 	}
 
@@ -991,6 +959,18 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 	{
 		return $this->aIncludeJSFiles;
 	}
+	
+	/** @ignore */
+	public function GetJsCode()
+	{
+		return $this->sJsCode;
+	}
+	
+	/** @ignore */
+	public function GetUrl()
+	{
+		return $this->sUrl;
+	}
 }
 
 /**
@@ -998,7 +978,7 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
  * will automatically reduce several consecutive separators to just one
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
@@ -1007,7 +987,6 @@ class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
 
 	/**
 	 * Constructor
-	 * @api
 	 */
 	public function __construct()
 	{
@@ -1025,7 +1004,7 @@ class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
  * Class for adding an item as a button that browses to the given URL
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 class URLButtonItem extends URLPopupMenuItem
@@ -1037,7 +1016,7 @@ class URLButtonItem extends URLPopupMenuItem
  * Class for adding an item as a button that runs some JS code
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 class JSButtonItem extends JSPopupMenuItem
@@ -1061,15 +1040,14 @@ class JSButtonItem extends JSPopupMenuItem
  * the specified place and can use the passed iTopWebPage object to add javascript or CSS definitions
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0
  */
 interface iPageUIExtension
 {
 	/**
-	 * Add content to the North pane
+	 * Add content to the header of the page
 	 *
-	 * @api
 	 * @param iTopWebPage $oPage The page to insert stuff into.
 	 *
 	 * @return string The HTML content to add into the page
@@ -1077,9 +1055,8 @@ interface iPageUIExtension
 	public function GetNorthPaneHtml(iTopWebPage $oPage);
 
 	/**
-	 * Add content to the South pane
+	 * Add content to the footer of the page
 	 *
-	 * @api
 	 * @param iTopWebPage $oPage The page to insert stuff into.
 	 *
 	 * @return string The HTML content to add into the page
@@ -1089,7 +1066,6 @@ interface iPageUIExtension
 	/**
 	 * Add content to the "admin banner"
 	 *
-	 * @api
 	 * @param iTopWebPage $oPage The page to insert stuff into.
 	 *
 	 * @return string The HTML content to add into the page
@@ -1101,7 +1077,7 @@ interface iPageUIExtension
  * Extend this class instead of iPageUIExtension if you don't need to overload all methods
  *
  * @api
- * @package     UIExtensibilityAPI
+ * @package     Extensibility
  * @since       2.7.0
  */
 abstract class AbstractPageUIExtension implements iPageUIExtension
@@ -1135,11 +1111,11 @@ abstract class AbstractPageUIExtension implements iPageUIExtension
 /**
  * Implement this interface to add content to any enhanced portal page
  *
- * @api
- * @package     PortalExtensibilityAPI
+ * IMPORTANT! Experimental API, may be removed at anytime, we don't recommend to use it just now!
  *
- * @since 2.4.0 interface creation
- * @since 2.7.0 change method signatures due to Silex to Symfony migration
+ * @api
+ * @package     Extensibility
+ * @since 2.4.0
  */
 interface iPortalUIExtension
 {
@@ -1150,7 +1126,6 @@ interface iPortalUIExtension
 	/**
 	 * Returns an array of CSS file urls
 	 *
-	 * @api
 	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return array
@@ -1160,7 +1135,6 @@ interface iPortalUIExtension
 	/**
 	 * Returns inline (raw) CSS
 	 *
-	 * @api
 	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
@@ -1170,7 +1144,6 @@ interface iPortalUIExtension
 	/**
 	 * Returns an array of JS file urls
 	 *
-	 * @api
 	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return array
@@ -1180,7 +1153,6 @@ interface iPortalUIExtension
 	/**
 	 * Returns raw JS code
 	 *
-	 * @api
 	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
@@ -1190,7 +1162,6 @@ interface iPortalUIExtension
 	/**
 	 * Returns raw HTML code to put at the end of the <body> tag
 	 *
-	 * @api
 	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
@@ -1200,7 +1171,6 @@ interface iPortalUIExtension
 	/**
 	 * Returns raw HTML code to put at the end of the #main-wrapper element
 	 *
-	 * @api
 	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
@@ -1210,7 +1180,6 @@ interface iPortalUIExtension
 	/**
 	 * Returns raw HTML code to put at the end of the #topbar and #sidebar elements
 	 *
-	 * @api
 	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
@@ -1219,11 +1188,7 @@ interface iPortalUIExtension
 }
 
 /**
- * Extend this class instead of iPortalUIExtension if you don't need to overload all methods
- *
- * @api
- * @package     PortalExtensibilityAPI
- * @since       2.4.0
+ * IMPORTANT! Experimental API, may be removed at anytime, we don't recommend to use it just now!
  */
 abstract class AbstractPortalUIExtension implements iPortalUIExtension
 {
@@ -1288,7 +1253,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
  * Implement this interface to add new operations to the REST/JSON web service
  *
  * @api
- * @package     RESTExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0.1
  */
 interface iRestServiceProvider
@@ -1296,7 +1261,6 @@ interface iRestServiceProvider
 	/**
 	 * Enumerate services delivered by this class
 	 *
-	 * @api
 	 * @param string $sVersion The version (e.g. 1.0) supported by the services
 	 *
 	 * @return array An array of hash 'verb' => verb, 'description' => description
@@ -1306,7 +1270,6 @@ interface iRestServiceProvider
 	/**
 	 * Enumerate services delivered by this class
 	 *
-	 * @api
 	 * @param string $sVersion The version (e.g. 1.0) supported by the services
 	 * @param string $sVerb
 	 * @param array $aParams
@@ -1320,90 +1283,69 @@ interface iRestServiceProvider
  * Minimal REST response structure. Derive this structure to add response data and error codes.
  *
  * @api
- * @package     RESTExtensibilityAPI
+ * @package     Extensibility
  * @since 2.0.1
  */
 class RestResult
 {
 	/**
 	 * Result: no issue has been encountered
-	 * @api
 	 */
 	const OK = 0;
 	/**
 	 * Result: missing/wrong credentials or the user does not have enough rights to perform the requested operation
-	 * @api
 	 */
 	const UNAUTHORIZED = 1;
 	/**
 	 * Result: the parameter 'version' is missing
-	 * @api
 	 */
 	const MISSING_VERSION = 2;
 	/**
 	 * Result: the parameter 'json_data' is missing
-	 * @api
 	 */
 	const MISSING_JSON = 3;
 	/**
 	 * Result: the input structure is not a valid JSON string
-	 * @api
 	 */
 	const INVALID_JSON = 4;
 	/**
 	 * Result: the parameter 'auth_user' is missing, authentication aborted
-	 * @api
 	 */
 	const MISSING_AUTH_USER = 5;
 	/**
 	 * Result: the parameter 'auth_pwd' is missing, authentication aborted
-	 * @api
 	 */
 	const MISSING_AUTH_PWD = 6;
 	/**
 	 * Result: no operation is available for the specified version
-	 * @api
 	 */
 	const UNSUPPORTED_VERSION = 10;
 	/**
 	 * Result: the requested operation is not valid for the specified version
-	 * @api
 	 */
 	const UNKNOWN_OPERATION = 11;
 	/**
 	 * Result: the requested operation cannot be performed because it can cause data (integrity) loss
-	 * @api
 	 */
 	const UNSAFE = 12;
 	/**
 	 * Result: the request page number is not valid. It must be an integer greater than 0
-	 * @api
 	 */
 	const INVALID_PAGE = 13;
 	/**
 	 * Result: the operation could not be performed, see the message for troubleshooting
-	 * @api
 	 */
 	const INTERNAL_ERROR = 100;
 
 	/**
 	 * Default constructor - ok!
-	 * @api
 	 */
 	public function __construct()
 	{
 		$this->code = RestResult::OK;
 	}
 
-	/**
-	 * @var int
-	 * @api
-	 */
 	public $code;
-	/**
-	 * @var string
-	 * @api
-	 */
 	public $message;
 }
 
@@ -1411,7 +1353,7 @@ class RestResult
  * Helpers for implementing REST services
  *
  * @api
- * @package     RESTExtensibilityAPI
+ * @package     Extensibility
  */
 class RestUtils
 {
@@ -1560,7 +1502,6 @@ class RestUtils
 	/**
 	 * Read and interpret object search criteria from a Rest/Json structure
 	 *
-	 * @api
 	 * @param string $sClass Name of the class
 	 * @param StdClass $oCriteria Hash of attribute code => value (can be a substructure or a scalar, depending on the nature of the
 	 *     attriute)
@@ -1670,7 +1611,6 @@ class RestUtils
 	/**
 	 * Search objects from a polymorph search specification (Rest/Json)
 	 *
-	 * @api
 	 * @param string $sClass Name of the class
 	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
 	 * @param int $iLimit The limit of results to return
@@ -1857,28 +1797,4 @@ class RestUtils
 interface iModuleExtension
 {
 	public function __construct();
-}
-
-/**
- * KPI logging extensibility point
- *
- * KPI Logger extension
- */
-interface iKPILoggerExtension
-{
-    /**
-     * Init the statistics collected
-     *
-     * @return void
-     */
-    public function InitStats();
-
-    /**
-     * Add a new KPI to the stats
-     * 
-     * @param \Combodo\iTop\Core\Kpi\KpiLogData $oKPILogData
-     *
-     * @return mixed
-     */
-    public function LogOperation($oKPILogData);
 }

application/audit.rule.class.inc.php

@@ -43,7 +43,6 @@ class AuditRule extends cmdbAbstractObject
 			"db_table" => "priv_auditrule",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));

application/capturewebpage.class.inc.php

@@ -1,84 +1,7 @@
 <?php
-// Copyright (C) 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/>
-
 /**
- * Adapter class: when an API requires WebPage and you want to produce something else
- *
- * @copyright   Copyright (C) 2016 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CaptureWebPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CaptureWebPage extends WebPage
-{
-	protected $aReadyScripts;
-
-	function __construct()
-	{
-		parent::__construct('capture web page');
-		$this->aReadyScripts = array();
-	}
-
-	public function GetHtml()
-	{
-		$trash = $this->ob_get_clean_safe();
-		return $this->s_content;
-	}
-
-	public function GetJS()
-	{
-		$sRet = implode("\n", $this->a_scripts);
-		if (!empty($this->s_deferred_content))
-		{
-			$sRet .= "\n\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');";
-		}
-		return $sRet;
-	}
-
-	public function GetReadyJS()
-	{
-		return "\$(document).ready(function() {\n".implode("\n", $this->aReadyScripts)."\n});";
-	}
-
-	public function GetCSS()
-	{
-		return $this->a_styles;
-	}
-
-	public function GetJSFiles()
-	{
-		return $this->a_linked_scripts;
-	}
-
-	public function GetCSSFiles()
-	{
-		return $this->a_linked_stylesheets;
-	}
-
-	public function output()
-	{
-		throw new Exception(__method__.' should not be called');
-	}
-
-	public function add_ready_script($sScript)
-	{
-		$this->aReadyScripts[] = $sScript;
-	}
-}
-
+ 

application/clipage.class.inc.php

@@ -1,97 +1,7 @@
 <?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/>
-
-
 /**
- * CLI page 
- * The page adds the content-type text/XML and the encoding into the headers
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CLIPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CLIPage implements Page
-{
-    function __construct($s_title)
-    {
-    }	
-
-    public function output()
-    {
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-        if (class_exists('ExecutionKPI'))
-        {
-            ExecutionKPI::ReportStats();
-        }
-    }
-
-	public function add($sText)
-	{
-		echo $sText;
-	}	
-
-	public function p($sText)
-	{
-		echo $sText."\n";
-	}	
-
-	public function pre($sText)
-	{
-		echo $sText."\n";
-	}	
-
-	public function add_comment($sText)
-	{
-		echo "#".$sText."\n";
-	}	
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-		$aCells = array();
-		foreach($aConfig as $sName=>$aDef)
-		{
-			if (strlen($aDef['description']) > 0)
-			{
-				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
-			}
-			else
-			{
-				$aCells[] = $aDef['label'];
-			}
-		}
-		echo implode(';', $aCells)."\n";
-
-		foreach($aData as $aRow)
-		{
-			$aCells = array();
-			foreach($aConfig as $sName=>$aAttribs)
-			{
-				$sValue = $aRow["$sName"];
-				$aCells[] = $sValue;
-			}
-			echo implode(';', $aCells)."\n";
-		}
-	}
-}
-
-?>
+ 

application/csvpage.class.inc.php

@@ -1,111 +1,7 @@
 <?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/>
-
-
 /**
- * Simple web page with no includes or fancy formatting, useful to generateXML documents
- * The page adds the content-type text/XML and the encoding into the headers
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CSVPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CSVPage extends WebPage
-{
-	function __construct($s_title) {
-		parent::__construct($s_title);
-		$this->add_header("Content-type: text/plain; charset=".self::PAGES_CHARSET);
-		$this->no_cache();
-		$this->add_xframe_options();
-		//$this->add_header("Content-Transfer-Encoding: binary");
-	}
-
-    public function output()
-    {
-			$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
-
-			// Get the unexpected output but do nothing with it
-			$sTrash = $this->ob_get_clean_safe();
-
-        foreach($this->a_headers as $s_header)
-        {
-            header($s_header);
-        }
-        echo trim($this->s_content);
-        echo "\n";
-
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-        if (class_exists('ExecutionKPI'))
-        {
-            ExecutionKPI::ReportStats();
-        }
-    }
-
-	public function small_p($sText)
-	{
-	}
-
-	public function add($sText)
-	{
-		$this->s_content .= $sText;
-	}	
-
-	public function p($sText)
-	{
-		$this->s_content .= $sText."\n";
-	}	
-
-	public function add_comment($sText)
-	{
-		$this->s_content .= "#".$sText."\n";
-	}	
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-		$aCells = array();
-		foreach($aConfig as $sName=>$aDef)
-		{
-			if (strlen($aDef['description']) > 0)
-			{
-				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
-			}
-			else
-			{
-				$aCells[] = $aDef['label'];
-			}
-		}
-		$this->s_content .= implode(';', $aCells)."\n";
-
-		foreach($aData as $aRow)
-		{
-			$aCells = array();
-			foreach($aConfig as $sName=>$aAttribs)
-			{
-				$sValue = $aRow["$sName"];
-				$aCells[] = $sValue;
-			}
-			$this->s_content .= implode(';', $aCells)."\n";
-		}
-	}
-}
-
+ 

application/dashboard.class.inc.php

@@ -17,6 +17,11 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\UI\Component\Button\ButtonFactory;
+use Combodo\iTop\Application\UI\Component\Toolbar\Toolbar;
+
+use Combodo\iTop\Application\UI\Component\DataTable\DataTableSettings;
+
 require_once(APPROOT.'application/dashboardlayout.class.inc.php');
 require_once(APPROOT.'application/dashlet.class.inc.php');
 require_once(APPROOT.'core/modelreflection.class.inc.php');
@@ -491,7 +496,7 @@ abstract class Dashboard
 		$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
 	} );
 
-	$('#select_layout').buttonset();
+	$('#select_layout').controlgroup();
 	$('#select_dashlet').droppable({
 		accept: '.dashlet',
 		drop: function(event, ui) {
@@ -529,28 +534,37 @@ EOF
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
 	{
-		if (!array_key_exists('dashboard_div_id', $aExtraParams))
-		{
+		if (!array_key_exists('dashboard_div_id', $aExtraParams)) {
 			$aExtraParams['dashboard_div_id'] = utils::Sanitize($this->GetId(), '', 'element_identifier');
 		}
 
-		$oPage->add('<div class="dashboard-title-line"><div class="dashboard-title">'.htmlentities(Dict::S($this->sTitle), ENT_QUOTES, 'UTF-8', false).'</div></div>');
+		$sTitleForHTML = utils::HtmlEntities(Dict::S($this->sTitle));
+
+		$sHtml = "<div class=\"ibo-top-bar--toolbar-dashboard-title\">{$sTitleForHTML}</div>";
+		if ($oPage instanceof iTopWebPage) {
+			$oTopBar = $oPage->GetTopBarLayout();
+			$oToolbar = new Toolbar();
+			$oTopBar->SetToolbar($oToolbar);
+			$oToolbar->AddHtml($sHtml);
+		} else {
+			$oPage->add_script(<<<JS
+$(".ibo-top-bar--toolbar-dashboard-title").html("$sTitleForHTML");
+JS
+			);
+		}
 
 		/** @var \DashboardLayoutMultiCol $oLayout */
 		$oLayout = new $this->sLayoutClass();
 
-		foreach($this->aCells as $iCellIdx => $aDashlets)
-		{
-			foreach($aDashlets as $oDashlet)
-			{
+		foreach ($this->aCells as $iCellIdx => $aDashlets) {
+			foreach ($aDashlets as $oDashlet) {
 				$aDashletCoordinates = $oLayout->GetDashletCoordinates($iCellIdx);
 				$this->PrepareDashletForRendering($oDashlet, $aDashletCoordinates, $aExtraParams);
 			}
 		}
 
 		$oLayout->Render($oPage, $this->aCells, $bEditMode, $aExtraParams);
-		if (!$bEditMode)
-		{
+		if (!$bEditMode) {
 			$oPage->add_linked_script('../js/dashlet.js');
 			$oPage->add_linked_script('../js/dashboard.js');
 		}
@@ -852,29 +866,28 @@ class RuntimeDashboard extends Dashboard
 	{
 		$bCustomized = false;
 
-		$sDashboardFileSanitized = utils::RealPath($sDashboardFile, APPROOT);
-		if (false === $sDashboardFileSanitized) {
-			throw new SecurityException('Invalid dashboard file !');
-		}
-
-		if (!appUserPreferences::GetPref('display_original_dashboard_'.$sDashBoardId, false)) {
+		if (!appUserPreferences::GetPref('display_original_dashboard_'.$sDashBoardId, false))
+		{
 			// Search for an eventual user defined dashboard
 			$oUDSearch = new DBObjectSearch('UserDashboard');
 			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
 			$oUDSearch->AddCondition('menu_code', $sDashBoardId, '=');
 			$oUDSet = new DBObjectSet($oUDSearch);
-			if ($oUDSet->Count() > 0) {
+			if ($oUDSet->Count() > 0)
+			{
 				// Assuming there is at most one couple {user, menu}!
 				$oUserDashboard = $oUDSet->Fetch();
 				$sDashboardDefinition = $oUserDashboard->Get('contents');
 				$bCustomized = true;
-			} else {
-				$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
+			}
+			else
+			{
+				$sDashboardDefinition = @file_get_contents($sDashboardFile);
 			}
 		}
 		else
 		{
-			$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
+			$sDashboardDefinition = @file_get_contents($sDashboardFile);
 		}
 
 		if ($sDashboardDefinition !== false)
@@ -882,7 +895,7 @@ class RuntimeDashboard extends Dashboard
 			$oDashboard = new RuntimeDashboard($sDashBoardId);
 			$oDashboard->FromXml($sDashboardDefinition);
 			$oDashboard->SetCustomFlag($bCustomized);
-			$oDashboard->SetDefinitionFile($sDashboardFileSanitized);
+			$oDashboard->SetDefinitionFile($sDashboardFile);
 		}
 		else
 		{
@@ -929,6 +942,9 @@ class RuntimeDashboard extends Dashboard
 				$sExtraParams = json_encode($aAjaxParams);
 				$iReloadInterval = 1000 * $this->GetAutoReloadInterval();
 				$sReloadURL = $this->GetReloadURL();
+				$oAppContext = new ApplicationContext();
+				$sContext=$oAppContext->GetForPostParams();
+				//$sContext is named "c"  because it use the existing code for context parameters c[org_id] and c[menu]
 				$oPage->add_script(
 <<<EOF
 				if (typeof(AutoReloadDashboardId$sDivId) !== 'undefined')
@@ -942,14 +958,14 @@ class RuntimeDashboard extends Dashboard
 				function ReloadDashboard$sDivId()
 				{
 					// Do not reload when a dialog box is active
-					if (!($('.ui-dialog:visible').length > 0) && $('.dashboard_contents#$sDivId').is(':visible'))
+					if (!($('.ui-dialog:visible').length > 0) && $('.ibo-dashboard#$sDivId').is(':visible'))
 					{
-						$('.dashboard_contents#$sDivId').block();
+						$('.ibo-dashboard#$sDivId').block();
 						$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-						   { operation: 'reload_dashboard', dashboard_id: '$sId', file: '$sFile', extra_params: $sExtraParams, reload_url: '$sReloadURL'},
+						   { operation: 'reload_dashboard', dashboard_id: '$sId', file: '$sFile', extra_params: $sExtraParams, c: $sContext, reload_url: '$sReloadURL'},
 						   function(data){
-							 $('.dashboard_contents#$sDivId').html(data);
-							 $('.dashboard_contents#$sDivId').unblock();
+							 $('.ibo-dashboard#$sDivId').html(data);
+							 $('.ibo-dashboard#$sDivId').unblock();
 							}
 						 );
 					}
@@ -979,52 +995,58 @@ EOF
 	}
 
 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aAjaxParams
+	 *
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
 	 */
-	protected function RenderSelector($oPage, $aAjaxParams = array())
+	protected function RenderSelector(WebPage $oPage, $aAjaxParams = array())
 	{
 		$sId = $this->GetId();
 		$sDivId = utils::Sanitize($sId, '', 'element_identifier');
 		$sExtraParams = json_encode($aAjaxParams);
 
-		$sSelectorHtml = '<div class="dashboard-selector">';
-		if ($this->HasCustomDashboard())
-		{
+		$sSelectorHtml = '<div class="ibo-top-bar--toolbar-dashboard-selector">';
+		if ($this->HasCustomDashboard()) {
 			$bStandardSelected = appUserPreferences::GetPref('display_original_dashboard_'.$sId, false);
 			$sStandard = Dict::S('UI:Toggle:StandardDashboard');
 			$sSelectorHtml .= '<div class="selector-label">'.$sStandard.'</div>';
 			$sSelectorHtml .= '<label class="switch"><input type="checkbox" onchange="ToggleDashboardSelector'.$sDivId.'();" '.($bStandardSelected ? '' : 'checked').'><span class="slider round"></span></label></input></label>';
 			$sCustom = Dict::S('UI:Toggle:CustomDashboard');
 			$sSelectorHtml .= '<div class="selector-label">'.$sCustom.'</div>';
-
 		}
 		$sSelectorHtml .= '</div>';
-		$sSelectorHtml = addslashes($sSelectorHtml);
 		$sFile = addslashes($this->GetDefinitionFile());
 		$sReloadURL = $this->GetReloadURL();
 
-		$oPage->add_ready_script(
-<<<EOF
-	$('.dashboard-title').after('$sSelectorHtml');
-EOF
-		);
+		if ($oPage instanceof iTopWebPage) {
+			$oToolbar = $oPage->GetTopBarLayout()->GetToolbar();
+			$oToolbar->AddHtml($sSelectorHtml);
 
-		$oPage->add_script(
-<<<EOF
+			$oPage->add_script(
+				<<<EOF
 			function ToggleDashboardSelector$sDivId()
 			{
-				$('.dashboard_contents#$sDivId').block();
+				$('.ibo-dashboard#$sDivId').block();
 				$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
 				   { operation: 'toggle_dashboard', dashboard_id: '$sId', file: '$sFile', extra_params: $sExtraParams, reload_url: '$sReloadURL' },
 				   function(data) {
-					 $('.dashboard_contents#$sDivId').html(data);
-					 $('.dashboard_contents#$sDivId').unblock();
+					 $('.ibo-dashboard#$sDivId').html(data);
+					 $('.ibo-dashboard#$sDivId').unblock();
 					}
 				 );
 			}
 EOF
-		);
+			);
+		} else {
+			$sSelectorHtml = addslashes($sSelectorHtml);
+			$oPage->add_script(<<<JS
+$(".ibo-top-bar--toolbar-dashboard-selector").replaceWith("$sSelectorHtml");
+JS
+			);
+		}
 	}
 
 	/**
@@ -1056,43 +1078,67 @@ EOF
 	 */
 	protected function RenderEditionTools(WebPage $oPage, $aExtraParams)
 	{
+		if (!($oPage instanceof iTopWebPage)) {
+			return;
+		}
+
 		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.iframe-transport.js');
 		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.fileupload.js');
-		$sEditMenu = "<div id=\"DashboardMenu\"><ul><li><i class=\"top-right-icon icon-additional-arrow fas fa-pencil-alt\"></i><ul>";
-	
+		$sId = utils::Sanitize($this->GetId(), '', 'element_identifier');
+
+		$sMenuTogglerId = "ibo-dashboard-menu-toggler-{$sId}";
+		$sPopoverMenuId = "ibo-dashboard-menu-popover-{$sId}";
+		$sName = 'UI:Dashboard:Actions';
+		$oToolbar = $oPage->GetTopBarLayout()->GetToolbar();
+		$oActionButton = ButtonFactory::MakeLinkNeutral('', '', 'fas fa-ellipsis-v', $sName, '', $sMenuTogglerId);
+		$oActionButton->AddCSSClasses("ibo-top-bar--toolbar-dashboard-menu-toggler");
+
+		$oToolbar->AddSubBlock($oActionButton);
+
 		$aActions = array();
 		$sFile = addslashes($this->sDefinitionFile);
 		$sJSExtraParams = json_encode($aExtraParams);
 		$bCanEdit = true;
-		if ($this->HasCustomDashboard())
-		{
+		if ($this->HasCustomDashboard()) {
 			$bCanEdit = !appUserPreferences::GetPref('display_original_dashboard_'.$this->GetId(), false);
 		}
-		if ($bCanEdit)
-		{
+		if ($bCanEdit) {
 			$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:Edit'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
 			$aActions[$oEdit->GetUID()] = $oEdit->GetMenuItem();
 		}
 
-		if ($this->bCustomized)
-		{
+		if ($this->bCustomized) {
 			$oRevert = new JSPopupMenuItem('UI:Dashboard:RevertConfirm', Dict::S('UI:Dashboard:Revert'),
-											"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false");
+				"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false");
 			$aActions[$oRevert->GetUID()] = $oRevert->GetMenuItem();
 		}
+
 		utils::GetPopupMenuItems($oPage, iPopupMenuExtension::MENU_DASHBOARD_ACTIONS, $this, $aActions);
-		$sEditMenu .= $oPage->RenderPopupMenuItems($aActions);
-		$sEditMenu = addslashes($sEditMenu);
-		$sReloadURL = $this->GetReloadURL();
-		$oPage->add_ready_script(
-<<<EOF
-	$('.dashboard-title').after('$sEditMenu');
-	$('#DashboardMenu>ul').popupmenu();
+
+		$oToolbar->AddSubBlock($oPage->GetPopoverMenu($sPopoverMenuId, $aActions));
+		$oActionButton->AddCSSClasses('ibo-action-button')
+			->SetJsCode(<<<JS
+$("#{$sPopoverMenuId}").popover_menu({toggler: "#{$sMenuTogglerId}"});
+$('#{$sMenuTogglerId}').on('click', function(oEvent) {
+	var oEventTarget = $('#{$sMenuTogglerId}');
+	var aEventTargetPos = oEventTarget.position();
+	var popover = $("#{$sPopoverMenuId}");
 	
-EOF
-		);
+	popover.css({
+		// 'top': (aEventTargetPos.top + parseInt(oEventTarget.css('marginTop'), 10) + oEventTarget.height()) + 'px',
+		// 'left': (aEventTargetPos.left + parseInt(oEventTarget.css('marginLeft'), 10) + oEventTarget.width() - popover.width()) + 'px',
+		'top': (aEventTargetPos.top + oEventTarget.outerHeight(true)) + 'px',
+		'left': (aEventTargetPos.left + oEventTarget.outerWidth(true) - popover.width()) + 'px',
+		'z-index': 10060
+	});
+	popover.popover_menu("togglePopup");
+});
+JS
+			);
+
+		$sReloadURL = $this->GetReloadURL();
 		$oPage->add_script(
-<<<EOF
+			<<<EOF
 function EditDashboard(sId, sDashboardFile, aExtraParams)
 {
 	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'dashboard_editor', id: sId, file: sDashboardFile, extra_params: aExtraParams, reload_url: '$sReloadURL'},
@@ -1478,29 +1524,6 @@ JS
 		return $this->sDefinitionFile;
 	}
 
-	/**
-	 * @param string $sDashboardFileRelative can also be an absolute path (compatibility with old URL)
-	 *
-	 * @return string full path to the Dashboard file
-	 * @throws \SecurityException if path isn't under approot
-	 * @uses utils::RealPath()
-	 * @since 2.7.8 3.0.3 3.1.0 N°4449 remove FPD
-	 */
-	public static function GetDashboardFileFromRelativePath($sDashboardFileRelative)
-	{
-		if (utils::RealPath($sDashboardFileRelative, APPROOT)) {
-			// compatibility with old URL containing absolute path !
-			return $sDashboardFileRelative;
-		}
-
-		$sDashboardFile = APPROOT.$sDashboardFileRelative;
-		if (false === utils::RealPath($sDashboardFile, APPROOT)) {
-			throw new SecurityException('Invalid dashboard file !');
-		}
-
-		return $sDashboardFile;
-	}
-
 	/**
 	 * @param string $sDefinitionFile
 	 */
@@ -1599,12 +1622,10 @@ JS
 	{
 		$sDataTableId = Dashlet::APPUSERPREFERENCES_PREFIX.$sDashletId;
 		$aClassAliases = array();
-		try{
+		try {
 			$oFilter = $oDashlet->GetDBSearch($aExtraParams);
 			$aClassAliases = $oFilter->GetSelectedClasses();
-		}
-		catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			//on error, return default value
 			return null;
 		}

application/dashboardlayout.class.inc.php

@@ -15,15 +15,17 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\UI\Component\Html\Html;
+use Combodo\iTop\Application\UI\Layout\Dashboard\DashboardColumn;
+use Combodo\iTop\Application\UI\Layout\Dashboard\DashboardLayout as UIDashboardLayout;
+use Combodo\iTop\Application\UI\Layout\Dashboard\DashboardRow;
 
 /**
  * Dashboard presentation
- * 
+ *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
- */ 
-
-
+ */
 abstract class DashboardLayout
 {
 	abstract public function Render($oPage, $aDashlets, $bEditMode = false);
@@ -114,61 +116,52 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 		// Trim the list of cells to remove the invisible/empty ones at the end of the array
 		$aCells = $this->TrimCellsArray($aCells);
 
-		$oPage->add('<table style="width:100%;table-layout:fixed;"><tbody>');
+		$oDashboardLayout = new UIDashboardLayout();
+		$oPage->AddUiBlock($oDashboardLayout);
+
 		$iCellIdx = 0;
-		$fColSize = 100 / $this->iNbCols;
-		$sStyle = $bEditMode ? 'border: 1px #ccc dashed; width:'.$fColSize.'%;' : 'width: '.$fColSize.'%;';
-		$sClass = $bEditMode ? 'layout_cell edit_mode' : 'dashboard';
 		$iNbRows = ceil(count($aCells) / $this->iNbCols);
 
-		for($iRows = 0; $iRows < $iNbRows; $iRows++)
-		{
-			$oPage->add("<tr data-dashboard-row-index=\"$iRows\">");
-			for($iCols = 0; $iCols < $this->iNbCols; $iCols++)
-			{
-				$sCellClass = ($iRows == $iNbRows-1) ? $sClass.' layout_last_used_rank' : $sClass;
-				$oPage->add("<td style=\"$sStyle\" class=\"$sCellClass\" data-dashboard-column-index=\"$iCols\" data-dashboard-cell-index=\"$iCellIdx\">");
-				if (array_key_exists($iCellIdx, $aCells))
-				{
+		for ($iRows = 0; $iRows < $iNbRows; $iRows++) {
+			$oDashboardRow = new DashboardRow();
+			$oDashboardLayout->AddDashboardRow($oDashboardRow);
+
+			for ($iCols = 0; $iCols < $this->iNbCols; $iCols++) {
+				$oDashboardColumn = new DashboardColumn($bEditMode);
+				$oDashboardColumn->SetCellIndex($iCellIdx);
+				$oDashboardRow->AddDashboardColumn($oDashboardColumn);
+
+				if (array_key_exists($iCellIdx, $aCells)) {
 					$aDashlets = $aCells[$iCellIdx];
-					if (count($aDashlets) > 0)
-					{
+					if (count($aDashlets) > 0) {
 						/** @var \Dashlet $oDashlet */
-						foreach($aDashlets as $oDashlet)
-						{
-							if ($oDashlet::IsVisible())
-							{
-								$oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams);
+						foreach ($aDashlets as $oDashlet) {
+							if ($oDashlet::IsVisible()) {
+								$oDashboardColumn->AddUIBlock($oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams));
 							}
 						}
+					} else {
+						$oDashboardColumn->AddUIBlock(new Html('&nbsp;'));
 					}
-					else
-					{
-						$oPage->add('&nbsp;');
-					}
+				} else {
+					$oDashboardColumn->AddUIBlock(new Html('&nbsp;'));
 				}
-				else
-				{
-					$oPage->add('&nbsp;');
-				}
-				$oPage->add('</td>');
 				$iCellIdx++;
 			}
-			$oPage->add('</tr>');
 		}
+
 		if ($bEditMode) // Add one row for extensibility
 		{
-			$sStyle = 'style="border: 1px #ccc dashed; width:'.$fColSize.'%;" class="layout_cell edit_mode layout_extension" data-dashboard-cell-index="'.$iCellIdx.'"';
-			$oPage->add("<tr data-dashboard-row-index=\"$iRows\">");
-			for($iCols = 0; $iCols < $this->iNbCols; $iCols++)
-			{
-				$oPage->add("<td $sStyle data-dashboard-column-index=\"$iCols\">");
-				$oPage->add('&nbsp;');
-				$oPage->add('</td>');
+			$oDashboardRow = new DashboardRow();
+			$oDashboardLayout->AddDashboardRow($oDashboardRow);
+
+			for ($iCols = 0; $iCols < $this->iNbCols; $iCols++) {
+				$oDashboardColumn = new DashboardColumn($bEditMode, true);
+				$oDashboardRow->AddDashboardColumn($oDashboardColumn);
+				$oDashboardColumn->AddUIBlock(new Html('&nbsp;'));
 			}
-			$oPage->add('</tr>');
 		}
-		$oPage->add('</tbody></table>');
+		return;
 	}
 
 	/**

application/dashlet.class.inc.php

@@ -16,6 +16,13 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
+use Combodo\iTop\Application\UI\Component\Dashlet\DashletContainer;
+use Combodo\iTop\Application\UI\Component\Dashlet\DashletFactory;
+use Combodo\iTop\Application\UI\Component\Html\Html;
+use Combodo\iTop\Application\UI\Component\Panel\PanelFactory;
+use Combodo\iTop\Application\UI\iUIBlock;
+use Combodo\iTop\Application\UI\UIBlock;
+
 require_once(APPROOT.'application/forms.class.inc.php');
 
 /**
@@ -50,7 +57,7 @@ abstract class Dashlet
 		$this->bRedrawNeeded = true; // By default: redraw each time a property changes
 		$this->bFormRedrawNeeded = false; // By default: no need to redraw the form (independent fields)
 		$this->aProperties = array(); // By default: there is no property
-		$this->aCSSClasses = array('dashlet');
+		$this->aCSSClasses = array('ibo-dashlet');
 		$this->sDashletType = get_class($this);
 	}
 
@@ -66,21 +73,17 @@ abstract class Dashlet
 	{
 		$refValue = $this->aProperties[$sProperty];
 		$sRefType = gettype($refValue);
-		if (gettype($sValue) == $sRefType)
-		{
+
+		if (gettype($sValue) == $sRefType) {
 			// Do not change anything in that case!
 			$ret = $sValue;
-		}
-		elseif ($sRefType == 'boolean')
-		{
+		} elseif ($sRefType == 'boolean') {
 			$ret = ($sValue == 'true');
-		}
-		elseif ($sRefType == 'array')
-		{
+		} elseif ($sRefType == 'array') {
 			$ret = explode(',', $sValue);
-		}
-		else
-		{
+		} elseif (is_array($sValue)) {
+			$ret = $sValue;
+		} else {
 			$ret = $sValue;
 			settype($ret, $sRefType);
 		}
@@ -191,10 +194,8 @@ abstract class Dashlet
 	 */
 	public function FromParams($aParams)
 	{
-		foreach ($this->aProperties as $sProperty => $value)
-		{
-			if (array_key_exists($sProperty, $aParams))
-			{
+		foreach ($this->aProperties as $sProperty => $value) {
+			if (array_key_exists($sProperty, $aParams)) {
 				$this->aProperties[$sProperty] = $aParams[$sProperty];
 			}
 		}
@@ -207,79 +208,59 @@ abstract class Dashlet
 	 * @param bool $bEnclosingDiv
 	 * @param array $aExtraParams
 	 */
-	public function DoRender($oPage, $bEditMode = false, $bEnclosingDiv = true, $aExtraParams = array())
+	public function DoRender($oPage, $bEditMode = false, $bEnclosingDiv = true, $aExtraParams = array()): UIBlock
 	{
-		$sCSSClasses = implode(' ', $this->aCSSClasses);
 		$sId = $this->GetID();
-		if ($bEnclosingDiv)
-		{
-			if ($bEditMode)
-			{
-				$oPage->add('<div class="'.$sCSSClasses.'" id="dashlet_'.$sId.'">');
+
+		$sCSSClasses = implode(' ', $this->aCSSClasses);
+		if ($bEnclosingDiv) {
+			if ($bEditMode) {
+				$oDashletContainer = new DashletContainer("dashlet_{$sId}");
+			} else {
+				$oDashletContainer = new DashletContainer();
 			}
-			else
-			{
-				$oPage->add('<div class="'.$sCSSClasses.'">');
-			}
-		}
-		else
-		{
-			foreach ($this->aCSSClasses as $sCSSClass)
-			{
+			$oDashletContainer->AddCSSClasses($sCSSClasses);
+		} else {
+			$oDashletContainer = new DashletContainer();
+
+			foreach ($this->aCSSClasses as $sCSSClass) {
 				$oPage->add_ready_script("$('#dashlet_".$sId."').addClass('$sCSSClass');");
 			}
 		}
 
-		try
-		{
-			if (get_class($this->oModelReflection) == 'ModelReflectionRuntime')
-			{
-				$this->Render($oPage, $bEditMode, $aExtraParams);
+		try {
+			if (get_class($this->oModelReflection) == 'ModelReflectionRuntime') {
+				$oBlock = $this->Render($oPage, $bEditMode, $aExtraParams);
+			} else {
+				$oBlock = $this->RenderNoData($oPage, $bEditMode, $aExtraParams);
 			}
-			else
-			{
-				$this->RenderNoData($oPage, $bEditMode, $aExtraParams);
-			}
-		}
-		catch(UnknownClassOqlException $e)
-		{
+			$oDashletContainer->AddSubBlock($oBlock);
+		} catch (UnknownClassOqlException $e) {
 			// Maybe the class is part of a non-installed module, fail silently
 			// Except in Edit mode
-			if ($bEditMode)
-			{
-				$oPage->add('<div class="dashlet-content">');
-				$oPage->add('<h2>'.$e->GetUserFriendlyDescription().'</h2>');
-				$oPage->add('</div>');
+			if ($bEditMode) {
+				$oDashletContainer->AddCSSClasses("dashlet-content");
+				$oDashletContainer->AddHtml('<h2>'.$e->GetUserFriendlyDescription().'</h2>');
 			}
-		}
-		catch(OqlException $e)
-		{
-			$oPage->add('<div class="dashlet-content">');
-			$oPage->p(utils::HtmlEntities($e->GetUserFriendlyDescription()));
-			$oPage->add('</div>');
-		}
-		catch(Exception $e)
-		{
-			$oPage->add('<div class="dashlet-content">');
-			$oPage->p($e->getMessage());
-			$oPage->add('</div>');
+		} catch (OqlException $e) {
+			$oDashletContainer->AddCSSClasses("dashlet-content");
+			$oDashletContainer->AddHtml('<p>'.$e->GetUserFriendlyDescription().'</p>');
+		} catch (Exception $e) {
+			$oDashletContainer->AddCSSClasses("dashlet-content");
+			$oDashletContainer->AddHtml('<p>'.$e->getMessage().'</p>');
 		}
 
-		if ($bEnclosingDiv)
-		{
-			$oPage->add('</div>');
-		}
-
-		if ($bEditMode)
-		{
+		if ($bEditMode) {
 			$sClass = get_class($this);
 			$sType = $this->sDashletType;
 			$oPage->add_ready_script(
-<<<EOF
+				<<<EOF
 $('#dashlet_$sId').dashlet({dashlet_id: '$sId', dashlet_class: '$sClass', 'dashlet_type': '$sType'});
 EOF
 			);
 		}
+
+		return $oDashletContainer;
 	}
 
 	/**
@@ -303,7 +284,7 @@ EOF
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *
-	 * @return mixed
+	 * @return iUIBlock
 	 */
 	abstract public function Render($oPage, $bEditMode = false, $aExtraParams = array());
 
@@ -313,10 +294,12 @@ EOF
 	 * @param \WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
+	 *
+	 * @return iUIBlock
 	 */
 	public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
 	{
-		$this->Render($oPage, $bEditMode, $aExtraParams);
+		return $this->Render($oPage, $bEditMode, $aExtraParams);
 	}
 
 	/**
@@ -459,21 +442,17 @@ EOF
 					$sAttType = $aTargetAttCodes[$sTargetAttCode];
 					$sExtFieldAttCode = $sTargetAttCode;
 				}
-
-				$aForbidenAttType = [
-					'AttributeLinkedSet',
-					'AttributeFriendlyName',
-
-					'iAttributeNoGroupBy', //we cannot only use iAttributeNoGroupBy since this method is also used by the designer who do not have access to the classes' PHP reflection API. So the known classes has to be listed altogether
-					'AttributeOneWayPassword',
-					'AttributeEncryptedString',
-					'AttributePassword',
-				];
-				foreach ($aForbidenAttType as $sForbidenAttType) {
-					if (is_a($sAttType, $sForbidenAttType, true))
-					{
-						continue 2;
-					}
+				if (is_a($sAttType, 'AttributeLinkedSet', true))
+				{
+					continue;
+				}
+				if (is_a($sAttType, 'AttributeFriendlyName', true))
+				{
+					continue;
+				}
+				if (is_a($sAttType, 'AttributeOneWayPassword', true))
+				{
+					continue;
 				}
 
 				$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
@@ -623,12 +602,12 @@ class DashletUnknown extends Dashlet
 		$sIconUrl = utils::HtmlEntities(utils::GetAbsoluteUrlAppRoot().$aInfos['icon']);
 		$sExplainText = ($bEditMode) ? Dict::Format('UI:DashletUnknown:RenderText:Edit', $this->GetDashletType()) : Dict::S('UI:DashletUnknown:RenderText:View');
 
-		$oPage->add('<div class="dashlet-content">');
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
 
-		$oPage->add('<div class="dashlet-ukn-image"><img src="'.$sIconUrl.'" /></div>');
-		$oPage->add('<div class="dashlet-ukn-text">'.$sExplainText.'</div>');
+		$oDashletContainer->AddHtml('<div class="dashlet-ukn-image"><img src="'.$sIconUrl.'" /></div>');
+		$oDashletContainer->AddHtml('<div class="dashlet-ukn-text">'.$sExplainText.'</div>');
 
-		$oPage->add('</div>');
+		return $oDashletContainer;
 	}
 
 	/**
@@ -643,12 +622,12 @@ class DashletUnknown extends Dashlet
 		$sIconUrl = utils::HtmlEntities(utils::GetAbsoluteUrlAppRoot().$aInfos['icon']);
 		$sExplainText = Dict::Format('UI:DashletUnknown:RenderNoDataText:Edit', $this->GetDashletType());
 
-		$oPage->add('<div class="dashlet-content">');
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
 
-		$oPage->add('<div class="dashlet-ukn-image"><img src="'.$sIconUrl.'" /></div>');
-		$oPage->add('<div class="dashlet-ukn-text">'.$sExplainText.'</div>');
+		$oDashletContainer->AddHtml('<div class="dashlet-ukn-image"><img src="'.$sIconUrl.'" /></div>');
+		$oDashletContainer->AddHtml('<div class="dashlet-ukn-text">'.$sExplainText.'</div>');
 
-		$oPage->add('</div>');
+		return $oDashletContainer;
 	}
 
 	/**
@@ -767,9 +746,9 @@ class DashletProxy extends DashletUnknown
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array())
 	{
 		// This should never be called.
-		$oPage->add('<div class="dashlet-content">');
-		$oPage->add('<div>This dashlet is not supposed to be rendered as it is just a proxy for third-party widgets.</div>');
-		$oPage->add('</div>');
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
+		$oDashletContainer->AddHtml('<div>This dashlet is not supposed to be rendered as it is just a proxy for third-party widgets.</div>');
+		return $oDashletContainer;
 	}
 
 	/**
@@ -784,12 +763,14 @@ class DashletProxy extends DashletUnknown
 		$sIconUrl = utils::HtmlEntities(utils::GetAbsoluteUrlAppRoot().$aInfos['icon']);
 		$sExplainText = Dict::Format('UI:DashletProxy:RenderNoDataText:Edit', $this->GetDashletType());
 
-		$oPage->add('<div class="dashlet-content">');
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
 
-		$oPage->add('<div class="dashlet-pxy-image"><img src="'.$sIconUrl.'" /></div>');
-		$oPage->add('<div class="dashlet-pxy-text">'.$sExplainText.'</div>');
+		$sHtml = '';
+		$sHtml .= '<div class="dashlet-pxy-image"><img src="'.$sIconUrl.'" /></div>';
+		$sHtml .= '<div class="dashlet-pxy-text">'.$sExplainText.'</div>';
 
-		$oPage->add('</div>');
+		$oDashletContainer->AddHtml($sHtml);
+		return $oDashletContainer;
 	}
 
 	/**
@@ -820,7 +801,7 @@ class DashletEmptyCell extends Dashlet
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array())
 	{
-		$oPage->add('&nbsp;');
+		return new Html('&nbsp;');
 	}
 
 	/**
@@ -870,8 +851,9 @@ class DashletPlainText extends Dashlet
 		$sText = utils::HtmlEntities($this->aProperties['text']);
 		$sText = str_replace(array("\r\n", "\n", "\r"), "<br/>", $sText);
 
-		$sId = 'plaintext_'.($bEditMode? 'edit_' : '').$this->sId;
-		$oPage->add('<div id="'.$sId.'" class="dashlet-content">'.$sText.'</div>');
+		$sId = 'plaintext_'.($bEditMode ? 'edit_' : '').$this->sId;
+
+		return DashletFactory::MakeForDashletText($sId, $sText);
 	}
 
 	/**
@@ -922,12 +904,8 @@ class DashletObjectList extends Dashlet
 		$sTitle = $this->aProperties['title'];
 		$sShowMenu = $this->aProperties['menu'] ? '1' : '0';
 
-		$oPage->add('<div class="dashlet-content">');
-		$sHtmlTitle = utils::HtmlEntities(Dict::S($sTitle)); // done in the itop block
-		if ($sHtmlTitle != '')
-		{
-			$oPage->add('<div class="main_header"><h1>&nbsp;'.$sHtmlTitle.'</h1></div>');
-		}
+		$oPanel = PanelFactory::MakeNeutral(Dict::S($sTitle));
+
 		$oFilter = $this->GetDBSearch($aExtraParams);
 		$oBlock = new DisplayBlock($oFilter, 'list');
 		$aParams = array(
@@ -935,28 +913,9 @@ class DashletObjectList extends Dashlet
 			'table_id' => self::APPUSERPREFERENCES_PREFIX.$this->sId,
 		);
 		$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occurring in the same DOM)
-		$oBlock->Display($oPage, $sBlockId, array_merge($aExtraParams, $aParams));
-		$oPage->add('</div>');
-	}
+		$oBlock->DisplayIntoContentBlock($oPanel, $oPage, $sBlockId, array_merge($aExtraParams, $aParams));
 
-	public function GetDBSearch($aExtraParams = array())
-	{
-		$sQuery = $this->aProperties['query'];
-		if (isset($aExtraParams['query_params']))
-		{
-			$aQueryParams = $aExtraParams['query_params'];
-		}
-		elseif (isset($aExtraParams['this->class']) && isset($aExtraParams['this->id']))
-		{
-			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
-			$aQueryParams = $oObj->ToArgsForQuery();
-		}
-		else
-		{
-			$aQueryParams = array();
-		}
-
-		return DBObjectSearch::FromOQL($sQuery, $aQueryParams);
+		return $oPanel;
 	}
 
 	/**
@@ -970,22 +929,35 @@ class DashletObjectList extends Dashlet
 
 		$oPage->add('<div class="dashlet-content">');
 		$sHtmlTitle = utils::HtmlEntities($this->oModelReflection->DictString($sTitle)); // done in the itop block
-		if ($sHtmlTitle != '')
-		{
+		if ($sHtmlTitle != '') {
 			$oPage->add('<h1>'.$sHtmlTitle.'</h1>');
 		}
 		$oQuery = $this->oModelReflection->GetQuery($sQuery);
 		$sClass = $oQuery->GetClass();
 		$oPage->add('<div id="block_fake_'.$this->sId.'" class="display_block">');
 		$oPage->p(Dict::S('UI:NoObjectToDisplay'));
-		if ($bShowMenu)
-		{
+		if ($bShowMenu) {
 			$oPage->p('<a>'.Dict::Format('UI:ClickToCreateNew', $this->oModelReflection->GetName($sClass)).'</a>');
 		}
 		$oPage->add('</div>');
 		$oPage->add('</div>');
 	}
 
+	public function GetDBSearch($aExtraParams = array())
+	{
+		$sQuery = $this->aProperties['query'];
+		if (isset($aExtraParams['query_params'])) {
+			$aQueryParams = $aExtraParams['query_params'];
+		} elseif (isset($aExtraParams['this->class']) && isset($aExtraParams['this->id'])) {
+			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
+			$aQueryParams = $oObj->ToArgsForQuery();
+		} else {
+			$aQueryParams = array();
+		}
+
+		return DBObjectSearch::FromOQL($sQuery, $aQueryParams);
+	}
+
 	/**
 	 * @inheritdoc
 	 */
@@ -1203,93 +1175,81 @@ abstract class DashletGroupBy extends Dashlet
 		$sStyle = $this->aProperties['style'];
 
 		// First perform the query - if the OQL is not ok, it will generate an exception : no need to go further
-		if (isset($aExtraParams['query_params']))
-		{
+		if (isset($aExtraParams['query_params'])) {
 			$aQueryParams = $aExtraParams['query_params'];
-		}
-		elseif (isset($aExtraParams['this->class']) && isset($aExtraParams['this->id']))
-		{
+		} elseif (isset($aExtraParams['this->class']) && isset($aExtraParams['this->id'])) {
 			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
 			$aQueryParams = $oObj->ToArgsForQuery();
-		}
-		else
-		{
+		} else {
 			$aQueryParams = array();
 		}
 		$oFilter = DBObjectSearch::FromOQL($sQuery, $aQueryParams);
 		$oFilter->SetShowObsoleteData(utils::ShowObsoleteData());
 
 		$sClass = $oFilter->GetClass();
-		if (!$this->oModelReflection->IsValidAttCode($sClass, $this->sGroupByAttCode))
-		{
-			$oPage->add('<p>'.Dict::S('UI:DashletGroupBy:MissingGroupBy').'</p>');
+		if (!$this->oModelReflection->IsValidAttCode($sClass, $this->sGroupByAttCode)) {
+			return new Html('<p>'.Dict::S('UI:DashletGroupBy:MissingGroupBy').'</p>');
 		}
-		else
-		{
-			switch($sStyle)
-			{
-				case 'bars':
-					$sType = 'chart';
-					$aParams = array(
-						'chart_type' => 'bars',
-						'chart_title' => $sTitle,
-						'group_by' => $this->sGroupByExpr,
-						'group_by_label' => $this->sGroupByLabel,
-						'aggregation_function' => $this->sAggregationFunction,
-						'aggregation_attribute' => $this->sAggregationAttribute,
-						'limit' => $this->sLimit,
-						'order_direction' => $this->sOrderDirection,
-						'order_by' => $this->sOrderBy,
-					);
-					$sHtmlTitle = ''; // done in the itop block
-					break;
 
-				case 'pie':
-					$sType = 'chart';
-					$aParams = array(
-						'chart_type' => 'pie',
-						'chart_title' => $sTitle,
-						'group_by' => $this->sGroupByExpr,
-						'group_by_label' => $this->sGroupByLabel,
-						'aggregation_function' => $this->sAggregationFunction,
-						'aggregation_attribute' => $this->sAggregationAttribute,
-						'limit' => $this->sLimit,
-						'order_direction' => $this->sOrderDirection,
-						'order_by' => $this->sOrderBy,
-					);
-					$sHtmlTitle = ''; // done in the itop block
-					break;
+		switch ($sStyle) {
+			case 'bars':
+				$sType = 'chart';
+				$aParams = array(
+					'chart_type' => 'bars',
+					'chart_title' => $sTitle,
+					'group_by' => $this->sGroupByExpr,
+					'group_by_label' => $this->sGroupByLabel,
+					'aggregation_function' => $this->sAggregationFunction,
+					'aggregation_attribute' => $this->sAggregationAttribute,
+					'limit' => $this->sLimit,
+					'order_direction' => $this->sOrderDirection,
+					'order_by' => $this->sOrderBy,
+				);
+				$sHtmlTitle = ''; // done in the itop block
+				break;
 
-				case 'table':
-				default:
-					$sHtmlTitle = utils::HtmlEntities(Dict::S($sTitle)); // done in the itop block
-					$sType = 'count';
-					$aParams = array(
-						'group_by' => $this->sGroupByExpr,
-						'group_by_label' => $this->sGroupByLabel,
-						'aggregation_function' => $this->sAggregationFunction,
-						'aggregation_attribute' => $this->sAggregationAttribute,
-						'limit' => $this->sLimit,
-						'order_direction' => $this->sOrderDirection,
-						'order_by' => $this->sOrderBy,
-					);
-					break;
-			}
+			case 'pie':
+				$sType = 'chart';
+				$aParams = array(
+					'chart_type' => 'pie',
+					'chart_title' => $sTitle,
+					'group_by' => $this->sGroupByExpr,
+					'group_by_label' => $this->sGroupByLabel,
+					'aggregation_function' => $this->sAggregationFunction,
+					'aggregation_attribute' => $this->sAggregationAttribute,
+					'limit' => $this->sLimit,
+					'order_direction' => $this->sOrderDirection,
+					'order_by' => $this->sOrderBy,
+				);
+				$sHtmlTitle = ''; // done in the itop block
+				break;
 
-			$oPage->add('<div class="dashlet-content">');
-			if ($sHtmlTitle != '')
-			{
-				$oPage->add('<div class="main_header"><h1>&nbsp;'.$sHtmlTitle.'</h1></div>');
-			}
-			$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
-			$oBlock = new DisplayBlock($oFilter, $sType);
-			$oBlock->Display($oPage, $sBlockId, array_merge($aExtraParams, $aParams));
-			if($bEditMode)
-			{
-				$oPage->add('<div class="dashlet-blocker"></div>');
-			}
-			$oPage->add('</div>');
+			case 'table':
+			default:
+				$sHtmlTitle = utils::HtmlEntities(Dict::S($sTitle)); // done in the itop block
+				$sType = 'count';
+				$aParams = array(
+					'group_by' => $this->sGroupByExpr,
+					'group_by_label' => $this->sGroupByLabel,
+					'aggregation_function' => $this->sAggregationFunction,
+					'aggregation_attribute' => $this->sAggregationAttribute,
+					'limit' => $this->sLimit,
+					'order_direction' => $this->sOrderDirection,
+					'order_by' => $this->sOrderBy,
+				);
+				break;
 		}
+
+		$oPanel = PanelFactory::MakeNeutral(Dict::S($sTitle));
+
+
+		$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occurring in the same DOM)
+		$oBlock = new DisplayBlock($oFilter, $sType);
+		$oBlock->DisplayIntoContentBlock($oPanel, $oPage, $sBlockId, array_merge($aExtraParams, $aParams));
+		if ($bEditMode) {
+			$oPanel->AddHtml('<div class="dashlet-blocker"></div>');
+		}
+		return $oPanel;
 	}
 
 	/**
@@ -1372,9 +1332,9 @@ abstract class DashletGroupBy extends Dashlet
 	 */
 	public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
 	{
-		$oPage->add('<div class="dashlet-content">');
-		$oPage->add('error!');
-		$oPage->add('</div>');
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
+		$oDashletContainer->AddHtml('error!');
+		return $oDashletContainer;
 	}
 
 	/**
@@ -1695,26 +1655,27 @@ class DashletGroupByPie extends DashletGroupBy
 	 */
 	public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
 	{
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
+
 		$sTitle = $this->aProperties['title'];
 
 		$sBlockId = 'block_fake_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
 
 		$HTMLsTitle = ($sTitle != '') ? '<h1 style="text-align:center">'.utils::HtmlEntities($sTitle).'</h1>' : '';
-		$oPage->add("<div style=\"background-color:#fff;padding:0.25em;\">$HTMLsTitle<div id=\"$sBlockId\" style=\"background-color:#fff;\"></div></div>");
+		$oDashletContainer->AddHtml("<div style=\"background-color:#fff;padding:0.25em;\">$HTMLsTitle<div id=\"$sBlockId\" style=\"background-color:#fff;\"></div></div>");
 
 		$aDisplayValues = $this->MakeSimulatedData();
 
 		$aColumns = array();
 		$aNames = array();
-		foreach($aDisplayValues as $idx => $aValue)
-		{
+		foreach ($aDisplayValues as $idx => $aValue) {
 			$aColumns[] = array('series_'.$idx, (int)$aValue['value']);
 			$aNames['series_'.$idx] = $aValue['label'];
 		}
 		$sJSColumns = json_encode($aColumns);
 		$sJSNames = json_encode($aNames);
 		$oPage->add_ready_script(
-<<<EOF
+			<<<EOF
 window.setTimeout(function() {
 var chart = c3.generate({
     bindto: '#{$sBlockId}',
@@ -1735,6 +1696,8 @@ var chart = c3.generate({
 });}, 100);
 EOF
 		);
+
+		return $oDashletContainer;
 	}
 }
 
@@ -1767,25 +1730,26 @@ class DashletGroupByBars extends DashletGroupBy
 	 */
 	public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
 	{
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
+
 		$sTitle = $this->aProperties['title'];
 
 		$sBlockId = 'block_fake_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
 
 		$HTMLsTitle = ($sTitle != '') ? '<h1 style="text-align:center">'.utils::HtmlEntities($sTitle).'</h1>' : '';
-		$oPage->add("<div style=\"background-color:#fff;padding:0.25em;\">$HTMLsTitle<div id=\"$sBlockId\" style=\"background-color:#fff;\"></div></div>");
+		$oDashletContainer->AddHtml("<div style=\"background-color:#fff;padding:0.25em;\">$HTMLsTitle<div id=\"$sBlockId\" style=\"background-color:#fff;\"></div></div>");
 
 		$aDisplayValues = $this->MakeSimulatedData();
 
 		$aNames = array();
-		foreach($aDisplayValues as $idx => $aValue)
-		{
+		foreach ($aDisplayValues as $idx => $aValue) {
 			$aNames[$idx] = $aValue['label'];
 		}
 		$sJSNames = json_encode($aNames);
 
 		$sJson = json_encode($aDisplayValues);
 		$oPage->add_ready_script(
-<<<EOF
+			<<<EOF
 window.setTimeout(function() {
 	var chart = c3.generate({
     bindto: '#{$sBlockId}',
@@ -1833,6 +1797,8 @@ window.setTimeout(function() {
 }, 100);
 EOF
 		);
+
+		return $oDashletContainer;
 	}
 }
 
@@ -1864,40 +1830,44 @@ class DashletGroupByTable extends DashletGroupBy
 	 */
 	public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
 	{
+		$oDashletContainer = new DashletContainer();
 
 		$aDisplayValues = $this->MakeSimulatedData();
 		$iTotal = 0;
-		foreach($aDisplayValues as $iRow => $aDisplayData)
-		{
+		foreach ($aDisplayValues as $iRow => $aDisplayData) {
 			$iTotal += $aDisplayData['value'];
 		}
 
 
 		$sBlockId = 'block_fake_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
 
-		$oPage->add('<div id="'.$sBlockId.'" class="display_block">');
-		$oPage->add('<div class="dashlet-content">');
-		$oPage->add('<p>'.Dict::Format('UI:Pagination:HeaderNoSelection', $iTotal).'</p>');
-		$oPage->add('<table class="listResults">');
-		$oPage->add('<thead>');
-		$oPage->add('<tr>');
-		$oPage->add('<th class="header" title="">'.$this->sGroupByLabel.'</th>');
-		$oPage->add('<th class="header" title="'.Dict::S('UI:GroupBy:Count+').'">'.Dict::S('UI:GroupBy:Count').'</th>');
-		$oPage->add('</tr>');
-		$oPage->add('</thead>');
-		$oPage->add('<tbody>');
-		foreach($aDisplayValues as $aDisplayData)
-		{
-			$oPage->add('<tr class="even">');
-			$oPage->add('<td class=""><span title="Active">'.$aDisplayData['label'].'</span></td>');
-			$oPage->add('<td class=""><a>'.$aDisplayData['value'].'</a></td>');
-			$oPage->add('</tr>');
+		$sHtml = '';
+		$sHtml .= '<div id="'.$sBlockId.'" class="display_block">';
+		$sHtml .= '<div class="dashlet-content">';
+		$sHtml .= '<p>'.Dict::Format('UI:Pagination:HeaderNoSelection', $iTotal).'</p>';
+		$sHtml .= '<table class="listResults">';
+		$sHtml .= '<thead>';
+		$sHtml .= '<tr>';
+		$sHtml .= '<th class="header" title="">'.$this->sGroupByLabel.'</th>';
+		$sHtml .= '<th class="header" title="'.Dict::S('UI:GroupBy:Count+').'">'.Dict::S('UI:GroupBy:Count').'</th>';
+		$sHtml .= '</tr>';
+		$sHtml .= '</thead>';
+		$sHtml .= '<tbody>';
+		foreach ($aDisplayValues as $aDisplayData) {
+			$sHtml .= '<tr class="even">';
+			$sHtml .= '<td class=""><span title="Active">'.$aDisplayData['label'].'</span></td>';
+			$sHtml .= '<td class=""><a>'.$aDisplayData['value'].'</a></td>';
+			$sHtml .= '</tr>';
 		}
-		$oPage->add('</tbody>');
-		$oPage->add('</table>');
-		$oPage->add('</div>');
+		$sHtml .= '</tbody>';
+		$sHtml .= '</table>';
+		$sHtml .= '</div>';
 
-		$oPage->add('</div>');
+		$sHtml .= '</div>';
+
+		$oDashletContainer->AddHtml($sHtml);
+
+		return $oDashletContainer;
 	}
 }
 
@@ -1926,14 +1896,7 @@ class DashletHeaderStatic extends Dashlet
 		$oIconSelect = $this->oModelReflection->GetIconSelectionField('icon');
 		$sIconPath = utils::HtmlEntities($oIconSelect->MakeFileUrl($sIcon));
 
-		$oPage->add('<div class="dashlet-content">');
-		$oPage->add('<div class="main_header">');
-
-		$oPage->add('<img src="'.$sIconPath.'">');
-		$oPage->add('<div class="main_header"><h1>&nbsp;'.$this->oModelReflection->DictString($sTitle).'</h1></div>');
-
-		$oPage->add('</div>');
-		$oPage->add('</div>');
+		return DashletFactory::MakeForDashletHeaderStatic($this->oModelReflection->DictString($sTitle), $sIconPath);
 	}
 
 	/**
@@ -2060,8 +2023,7 @@ class DashletHeaderDynamic extends Dashlet
 		$sIconPath = utils::HtmlEntities($oIconSelect->MakeFileUrl($sIcon));
 
 		$aValues = $this->GetValues();
-		if (count($aValues) > 0)
-		{
+		if (count($aValues) > 0) {
 			// Stats grouped by <group_by>
 			$sCSV = implode(',', $aValues);
 			$aParams = array(
@@ -2071,9 +2033,7 @@ class DashletHeaderDynamic extends Dashlet
 				'status_codes[block]' => $sCSV,
 				'context_filter' => 1,
 			);
-		}
-		else
-		{
+		} else {
 			// Simple stats
 			$aParams = array(
 				'title[block]' => $sTitle,
@@ -2082,31 +2042,29 @@ class DashletHeaderDynamic extends Dashlet
 			);
 		}
 
-		$oPage->add('<div class="dashlet-content">');
-		$oPage->add('<div class="main_header">');
+		$oPanel = PanelFactory::MakeEnhancedNeutral(Dict::S(str_replace('_', ':', $sTitle)), $sIconPath);
 
-		$oPage->add('<img src="'.$sIconPath.'">');
-
-		if (isset($aExtraParams['query_params']))
-		{
+		if (isset($aExtraParams['query_params'])) {
 			$aQueryParams = $aExtraParams['query_params'];
-		}
-		elseif (isset($aExtraParams['this->class']))
-		{
+		} elseif (isset($aExtraParams['this->class'])) {
 			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
 			$aQueryParams = $oObj->ToArgsForQuery();
-		}
-		else
-		{
+		} else {
 			$aQueryParams = array();
 		}
 		$oFilter = DBObjectSearch::FromOQL($sQuery, $aQueryParams);
 		$oBlock = new DisplayBlock($oFilter, 'summary');
 		$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
-		$oBlock->Display($oPage, $sBlockId, array_merge($aExtraParams, $aParams));
+		$oBlock->DisplayIntoContentBlock($oPanel, $oPage, $sBlockId, array_merge($aExtraParams, $aParams));
 
-		$oPage->add('</div>');
-		$oPage->add('</div>');
+		$oSubTitle = $oPanel->GetSubTitle();
+		$oSet = new DBObjectSet($oFilter);
+		$iCount = $oSet->Count();
+		$oAppContext = new ApplicationContext();
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($oFilter->serialize());
+		$oSubTitle->AddHtml('<a class="summary" href="'.$sHyperlink.'">'.Dict::Format(str_replace('_', ':', $sSubtitle), $iCount).'</a>');
+
+		return $oPanel;
 	}
 
 	/**
@@ -2126,46 +2084,48 @@ class DashletHeaderDynamic extends Dashlet
 		$oIconSelect = $this->oModelReflection->GetIconSelectionField('icon');
 		$sIconPath = utils::HtmlEntities($oIconSelect->MakeFileUrl($sIcon));
 
-		$oPage->add('<div class="dashlet-content">');
-		$oPage->add('<div class="main_header">');
+		$oDashletContainer = new DashletContainer(null, 'dashlet-content');
 
-		$oPage->add('<img src="'.$sIconPath.'">');
+		$sHtml = '';
+		$sHtml .= '<img src="'.$sIconPath.'">';
 
 		$sBlockId = 'block_fake_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
 
 		$iTotal = 0;
 		$aValues = $this->GetValues();
 
-		$oPage->add('<div class="display_block" id="'.$sBlockId.'">');
-		$oPage->add('<div class="summary-details">');
-		$oPage->add('<table><tbody>');
-		$oPage->add('<tr>');
-		foreach ($aValues as $sValue)
-		{
+		$sHtml .= '<div class="display_block" id="'.$sBlockId.'">';
+		$sHtml .= '<div class="summary-details">';
+		$sHtml .= '<table><tbody>';
+		$sHtml .= '<tr>';
+		foreach ($aValues as $sValue) {
 			$sValueLabel = $this->oModelReflection->GetValueLabel($sClass, $sGroupBy, $sValue);
-			$oPage->add('	<th>'.$sValueLabel.'</th>');
+			$sHtml .= '	<th>'.$sValueLabel.'</th>';
 		}
-		$oPage->add('</tr>');
-		$oPage->add('<tr>');
-		foreach ($aValues as $sValue)
-		{
-			$iCount = (int) rand(2, 100);
+		$sHtml .= '</tr>';
+		$sHtml .= '<tr>';
+		foreach ($aValues as $sValue) {
+			$iCount = (int)rand(2, 100);
 			$iTotal += $iCount;
-			$oPage->add('	<td>'.$iCount.'</td>');
+			$sHtml .= '	<td>'.$iCount.'</td>';
 		}
-		$oPage->add('</tr>');
-		$oPage->add('</tbody></table>');
-		$oPage->add('</div>');
+		$sHtml .= '</tr>';
+		$sHtml .= '</tbody></table>';
+		$sHtml .= '</div>';
 
 		$sTitle = $this->oModelReflection->DictString($sTitle);
 		$sSubtitle = $this->oModelReflection->DictFormat($sSubtitle, $iTotal);
 
-		$oPage->add('<h1>'.utils::HtmlEntities($sTitle).'</h1>');
-		$oPage->add('<a class="summary">'.utils::HtmlEntities($sSubtitle).'</a>');
-		$oPage->add('</div>');
+		$sHtml .= '<h1>'.utils::HtmlEntities($sTitle).'</h1>';
+		$sHtml .= '<a class="summary">'.utils::HtmlEntities($sSubtitle).'</a>';
+		$sHtml .= '</div>';
+
+		$sHtml .= '</div>';
+
+		$oDashletContainer->AddHtml($sHtml);
+
+		return $oDashletContainer;
 
-		$oPage->add('</div>');
-		$oPage->add('</div>');
 	}
 
 	/**
@@ -2310,8 +2270,8 @@ class DashletBadge extends Dashlet
 	{
 		parent::__construct($oModelReflection, $sId);
 		$this->aProperties['class'] = 'Contact';
-		$this->aCSSClasses[] = 'dashlet-inline';
-		$this->aCSSClasses[] = 'dashlet-badge';
+		$this->aCSSClasses[] = 'ibo-dashlet--is-inline';
+		$this->aCSSClasses[] = 'ibo-dashlet-badge';
 	}
 
 	/**
@@ -2321,17 +2281,16 @@ class DashletBadge extends Dashlet
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array())
 	{
+		$oDashletContainer = new DashletContainer($this->sId, 'dashlet-content');
+
 		$sClass = $this->aProperties['class'];
-
-		$oPage->add('<div class="dashlet-content">');
-
 		$oFilter = new DBObjectSearch($sClass);
 		$oBlock = new DisplayBlock($oFilter, 'actions');
 		$aExtraParams['context_filter'] = 1;
 		$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occurring in the same DOM)
-		$oBlock->Display($oPage, $sBlockId, $aExtraParams);
+		$oBlock->DisplayIntoContentBlock($oDashletContainer, $oPage, $sBlockId, $aExtraParams);
 
-		$oPage->add('</div>');
+		return $oDashletContainer;
 	}
 
 	/**
@@ -2339,25 +2298,25 @@ class DashletBadge extends Dashlet
 	 */
 	public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
 	{
-		$sClass = $this->aProperties['class'];
+		$oDashletContainer = new DashletContainer($this->sId, 'dashlet-content');
 
+		$sClass = $this->aProperties['class'];
 		$sIconUrl = $this->oModelReflection->GetClassIcon($sClass, false);
 		$sClassLabel = $this->oModelReflection->GetName($sClass);
 
-		$oPage->add('<div class="dashlet-content">');
+		$sHtml = '';
+		$sHtml .= '<div id="block_fake_'.$this->sId.'" class="display_block">';
+		$sHtml .= '<p>';
+		$sHtml .= '   <a class="actions"><img src="'.utils::HtmlEntities($sIconUrl).'" style="vertical-align:middle;float;left;margin-right:10px;border:0;">'.$sClassLabel.': 947</a>';
+		$sHtml .= '</p>';
+		$sHtml .= '<p>';
+		$sHtml .= '   <a>'.Dict::Format('UI:ClickToCreateNew', $sClassLabel).'</a>';
+		$sHtml .= '</p>';
+		$sHtml .= '</div>';
 
-		$oPage->add('<div id="block_fake_'.$this->sId.'" class="display_block">');
-		$oPage->add('<p>');
-		$oPage->add('   <a class="actions"><img src="'.utils::HtmlEntities($sIconUrl).'" style="vertical-align:middle;float;left;margin-right:10px;border:0;">'.$sClassLabel.': 947</a>');
-		$oPage->add('</p>');
-		$oPage->add('<p>');
-		$oPage->add('   <a>'.Dict::Format('UI:ClickToCreateNew', $sClassLabel).'</a>');
-		$oPage->add('   <br/>');
-		$oPage->add('   <a>'.Dict::Format('UI:SearchFor_Class', $sClassLabel).'</a>');
-		$oPage->add('</p>');
-		$oPage->add('</div>');
+		$oDashletContainer->AddHtml($sHtml);
 
-		$oPage->add('</div>');
+		return $oDashletContainer;
 	}
 
 	static protected $aClassList = null;

application/datamodel.application.xml

@@ -1,5 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
+  <classes>
+    <class id="AbstractResource" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <comment>/* Resource access control abstraction. Can be herited by abstract resource access control classes. Generaly controlled using UR_ACTION_MODIFY access right. */</comment>
+        <abstract>true</abstract>
+      </properties>
+      <presentation/>
+      <methods/>
+    </class>
+    <class id="ResourceAdminMenu" _delta="define">
+      <parent>AbstractResource</parent>
+      <properties>
+        <comment>/* AdminTools menu access control. */</comment>
+        <abstract>true</abstract>
+        <category>grant_by_profile</category>
+      </properties>
+      <presentation/>
+      <methods/>
+    </class>
+    <class id="ResourceRunQueriesMenu" _delta="define">
+      <parent>AbstractResource</parent>
+      <properties>
+        <comment>/* RunQueriesMenu menu access control. */</comment>
+        <abstract>true</abstract>
+        <category>grant_by_profile</category>
+      </properties>
+      <presentation/>
+      <methods/>
+    </class>
+    <class id="ResourceSystemMenu" _delta="define">
+      <parent>AbstractResource</parent>
+      <properties>
+        <comment>/* System menu access control. */</comment>
+        <abstract>true</abstract>
+        <category>grant_by_profile</category>
+      </properties>
+      <presentation/>
+      <methods/>
+    </class>
+  </classes>
   <portals>
     <portal id="backoffice" _delta="define">
       <url>pages/UI.php</url>
@@ -12,13 +53,351 @@
     </portal>
   </portals>
   <menus>
+    <menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define">
+      <rank>10</rank>
+	    <style>
+		    <decoration_classes>fas fa-home</decoration_classes>
+	    </style>
+    </menu>
+    <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>10</rank>
+      <parent>WelcomeMenu</parent>
+      <definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="MyShortcuts" xsi:type="ShortcutContainerMenuNode" _delta="define">
+      <rank>20</rank>
+      <parent>WelcomeMenu</parent>
+    </menu>
+    <menu id="UserManagement" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>10</rank>
+      <parent>AdminTools</parent>
+      <template_file/>
+    </menu>
+    <menu id="UserAccountsMenu" xsi:type="OQLMenuNode" _delta="define">
+      <rank>11</rank>
+      <parent>UserManagement</parent>
+      <oql><![CDATA[SELECT User]]></oql>
+      <do_search>1</do_search>
+      <search_form_open>1</search_form_open>
+      <enable_class>User</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="ProfilesMenu" xsi:type="OQLMenuNode" _delta="define">
+      <rank>12</rank>
+      <parent>UserManagement</parent>
+      <oql><![CDATA[SELECT URP_Profiles]]></oql>
+      <do_search>1</do_search>
+      <enable_class>URP_Profiles</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="AuditCategories" xsi:type="OQLMenuNode" _delta="define">
+      <rank>20</rank>
+      <parent>AdminTools</parent>
+      <oql><![CDATA[SELECT AuditCategory]]></oql>
+      <do_search>1</do_search>
+      <enable_class>AuditCategory</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="Queries" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>30</rank>
+      <parent>AdminTools</parent>
+      <template_file/>
+    </menu>
+    <menu id="RunQueriesMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>31</rank>
+      <parent>Queries</parent>
+      <url>$pages/run_query.php</url>
+      <enable_class>ResourceRunQueriesMenu</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="QueryMenu" xsi:type="OQLMenuNode" _delta="define">
+      <rank>32</rank>
+      <parent>Queries</parent>
+      <oql><![CDATA[SELECT Query]]></oql>
+      <do_search>1</do_search>
+      <enable_class>Query</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="ExportMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>33</rank>
+      <parent>Queries</parent>
+      <url>$webservices/export-v2.php?interactive=1</url>
+      <enable_class>ResourceAdminMenu</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="DataModelMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>40</rank>
+      <parent>AdminTools</parent>
+      <url>$pages/schema.php</url>
+      <enable_class>ResourceRunQueriesMenu</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="UniversalSearchMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>35</rank>
+      <parent>Queries</parent>
+      <url>$pages/UniversalSearch.php</url>
+      <enable_class>ResourceAdminMenu</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="ConfigurationTools" xsi:type="MenuGroup" _delta="define_if_not_exists">
+      <rank>90</rank>
+	    <style>
+		    <decoration_classes>fas fa-cog</decoration_classes>
+	    </style>
+    </menu>
+    <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
+      <rank>20</rank>
+      <parent>ConfigurationTools</parent>
+      <oql><![CDATA[SELECT SynchroDataSource]]></oql>
+      <do_search>1</do_search>
+      <enable_class>SynchroDataSource</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
+    <menu id="NotificationsMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>40</rank>
+      <parent>ConfigurationTools</parent>
+      <url>$pages/notifications.php</url>
+      <enable_class>Trigger</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
     <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
       <rank>80</rank>
+	    <style>
+		    <decoration_classes>fas fa-tools</decoration_classes>
+	    </style>
     </menu>
     <menu id="SystemTools" xsi:type="MenuGroup" _delta="define">
       <rank>100</rank>
       <enable_class>ResourceSystemMenu</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
+	    <style>
+		    <decoration_classes>fas fa-terminal</decoration_classes>
+	    </style>
     </menu>
   </menus>
+  <meta>
+    <classes>
+      <class id="cmdbAbstractObject" _delta="define">
+        <methods>
+          <method id="Set">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>deny</operation>
+                  <types>
+                    <type id="AttributeStopWatch"/>
+                    <type id="AttributeSubItem"/>
+                    <type id="AttributeExternalField"/>
+                    <type id="AttributeLinkedSetIndirect"/>
+                    <type id="AttributeLinkedSet"/>
+                    <type id="AttributeImage"/>
+                    <type id="AttributeBlob"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+              <argument id="2">
+                <type>string</type>
+                <mandatory>true</mandatory>
+              </argument>
+            </arguments>
+          </method>
+          <method id="SetIfNull">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>deny</operation>
+                  <types>
+                    <type id="AttributeStopWatch"/>
+                    <type id="AttributeSubItem"/>
+                    <type id="AttributeExternalField"/>
+                    <type id="AttributeLinkedSetIndirect"/>
+                    <type id="AttributeLinkedSet"/>
+                    <type id="AttributeImage"/>
+                    <type id="AttributeBlob"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+              <argument id="2">
+                <type>string</type>
+                <mandatory>true</mandatory>
+              </argument>
+            </arguments>
+          </method>
+          <method id="SetCurrentDate">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>allow</operation>
+                  <types>
+                    <type id="AttributeDate"/>
+                    <type id="AttributeDateTime"/>
+                    <type id="AttributeString"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+            </arguments>
+          </method>
+          <method id="SetCurrentUser">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>allow</operation>
+                  <types>
+                    <type id="AttributeExternalKey"/>
+                    <type id="AttributeInteger"/>
+                    <type id="AttributeString"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+            </arguments>
+          </method>
+          <method id="SetCurrentPerson">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>allow</operation>
+                  <types>
+                    <type id="AttributeExternalKey"/>
+                    <type id="AttributeInteger"/>
+                    <type id="AttributeString"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+            </arguments>
+          </method>
+          <method id="SetElapsedTime">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>allow</operation>
+                  <types>
+                    <type id="AttributeDuration"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+              <argument id="2">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>allow</operation>
+                  <types>
+                    <type id="AttributeDate"/>
+                    <type id="AttributeDateTime"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+              <argument id="3">
+                <type>string</type>
+                <mandatory>false</mandatory>
+              </argument>
+            </arguments>
+          </method>
+          <method id="Reset">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>deny</operation>
+                  <types>
+                    <type id="AttributeStopWatch"/>
+                    <type id="AttributeSubItem"/>
+                    <type id="AttributeExternalField"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+            </arguments>
+          </method>
+          <method id="ResetStopWatch">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>allow</operation>
+                  <types>
+                    <type id="AttributeStopWatch"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+            </arguments>
+          </method>
+          <method id="Copy">
+            <arguments>
+              <argument id="1">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+                <type_restrictions>
+                  <operation>deny</operation>
+                  <types>
+                    <type id="AttributeStopWatch"/>
+                    <type id="AttributeSubItem"/>
+                    <type id="AttributeExternalField"/>
+                  </types>
+                </type_restrictions>
+              </argument>
+              <argument id="2">
+                <type>attcode</type>
+                <mandatory>true</mandatory>
+              </argument>
+            </arguments>
+          </method>
+          <method id="ApplyStimulus">
+            <arguments>
+              <argument id="1">
+                <type>string</type>
+                <mandatory>true</mandatory>
+              </argument>
+            </arguments>
+          </method>
+          <method id="PrefillCreationForm">
+            <arguments>
+              <argument id="1">
+                <type>reference</type>
+                <mandatory>true</mandatory>
+              </argument>
+            </arguments>
+          </method>
+          <method id="PrefillTransitionForm">
+            <arguments>
+              <argument id="1">
+                <type>reference</type>
+                <mandatory>true</mandatory>
+              </argument>
+            </arguments>
+          </method>
+          <method id="PrefillSearchForm">
+            <arguments>
+              <argument id="1">
+                <type>reference</type>
+                <mandatory>true</mandatory>
+              </argument>
+            </arguments>
+          </method>
+        </methods>
+      </class>
+    </classes>
+  </meta>
 </itop_design>

application/datatable.class.inc.php

@@ -1,4 +1,7 @@
 <?php
+
+use Combodo\iTop\Renderer\BlockRenderer;
+
 /**
  * Copyright (C) 2013-2020 Combodo SARL
  *
@@ -25,7 +28,7 @@ class DataTable
 	protected $sTableId;	// identifier for saving the settings (combined with the class aliases)
 	protected $oSet;		// The set of objects to display
 	protected $aClassAliases;	// The aliases (alias => class) inside the set
-	protected $iNbObjects;		// Total number of objects inthe set
+	protected $iNbObjects;		// Total number of objects in the set
 	protected $bUseCustomSettings;	// Whether or not the current display uses custom settings
 	protected $oDefaultSettings;	// the default settings for displaying such a list
 	protected $bShowObsoleteData;
@@ -157,17 +160,17 @@ class DataTable
 		$sPager = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
 		$sActionsMenu = '';
 		$sToolkitMenu = '';
-		if ($bActionsMenu)
-		{
+		if ($bActionsMenu) {
 			$sActionsMenu = $this->GetActionsMenu($oPage, $aExtraParams);
 		}
-		if ($bToolkitMenu)
-		{
-			$sToolkitMenu = $this->GetToolkitMenu($oPage, $aExtraParams);
-		}
+//		if ($bToolkitMenu)
+//		{
+//			$sToolkitMenu = $this->GetToolkitMenu($oPage, $aExtraParams);
+//		}
+
 		$sDataTable = $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
 		$sConfigDlg = $this->GetTableConfigDlg($oPage, $aColumns, $bViewLink, $iDefaultPageSize);
-		
+
 		$sHtml = "<table id=\"{$this->sDatatableContainerId}\" class=\"datatable\">";
 		$sHtml .= "<tr><td>";
 		$sHtml .= "<table style=\"width:100%;\">";
@@ -208,7 +211,7 @@ class DataTable
 
 		return $sHtml;
 	}
-	
+
 	/**
 	 * When refreshing the body of a paginated table, get the rows of the table (inside the TBODY)
 	 * return string The HTML rows to insert inside the <tbody> node
@@ -355,9 +358,18 @@ EOF;
 	protected function GetActionsMenu(WebPage $oPage, $aExtraParams)
 	{
 		$oMenuBlock = new MenuBlock($this->oSet->GetFilter(), 'list');
-		
-		$sHtml = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $this->iListId);
-		return $sHtml;
+
+		$oBlock = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $this->iListId);
+		foreach ($oBlock->GetCssFilesUrlRecursively(true) as $sFileAbsUrl) {
+			$oPage->add_linked_stylesheet($sFileAbsUrl);
+		}
+		// JS files
+		foreach ($oBlock->GetJsFilesUrlRecursively(true) as $sFileAbsUrl) {
+			$oPage->add_linked_script($sFileAbsUrl);
+		}
+
+		$oPage->RenderInlineScriptsAndCSSRecursively($oBlock);
+		return BlockRenderer::RenderBlockTemplates($oBlock);
 	}
 
 	/**
@@ -372,7 +384,7 @@ EOF;
 		if (!$oPage->IsPrintableVersion())
 		{
 			$sMenuTitle = Dict::S('UI:ConfigureThisList');
-			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li aria-label="'.Dict::S('UI:Menu:Toolkit').'"><i class="fas fa-tools"></i><i class="fas fa-caret-down"></i><ul>';
+			$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>';
 	
 			$oMenuItem1 = new JSPopupMenuItem('iTop::ConfigureList', $sMenuTitle, "$('#datatable_dlg_".$this->iListId."').dialog('open');");
 			$aActions = array(
@@ -513,6 +525,7 @@ EOF;
 		return $aAttribs;
 	}
 
+
 	/**
 	 * @param $aColumns
 	 * @param $sSelectMode
@@ -860,396 +873,3 @@ class PrintableDataTable extends DataTable
 		return $sHtml;
 	}
 }
-
-class DataTableSettings implements Serializable
-{
-	public $aClassAliases;
-	public $sTableId;
-	public $iDefaultPageSize;
-	public $aColumns;
-
-
-	/**
-	 * DataTableSettings constructor.
-	 *
-	 * @param $aClassAliases
-	 * @param null $sTableId
-	 */
-	public function __construct($aClassAliases, $sTableId = null)
-	{
-		$this->aClassAliases = $aClassAliases;
-		$this->sTableId = $sTableId;
-		$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
-		$aColumns = array();
-		foreach($this->aClassAliases as $sAlias => $sClass)
-		{
-			$aColumns[$sAlias] = array();
-			foreach($this->aColumns[$sAlias] as $sAttCode => $aData)
-			{
-				unset($aData['label']); // Don't save the display name
-				unset($aData['alias']); // Don't save the alias (redundant)
-				unset($aData['code']); // Don't save the code (redundant)
-				if ($aData['checked'])
-				{
-					$aColumns[$sAlias][$sAttCode] = $aData;
-				}
-			}
-		}
-		return serialize(
-			array(
-				'iDefaultPageSize' => $this->iDefaultPageSize,
-				'aColumns' => $aColumns,		
-			)
-		);
-	}
-
-	/**
-	 * @param string $sData
-	 *
-	 * @throws \Exception
-	 */
-	public function unserialize($sData)
-	{
-		$aData = unserialize($sData);
-		$this->iDefaultPageSize = $aData['iDefaultPageSize'];
-		$this->aColumns = $aData['aColumns'];
-		foreach($this->aClassAliases as $sAlias => $sClass)
-		{
-			foreach($this->aColumns[$sAlias] as $sAttCode => $aData)
-			{
-				$aFieldData = false;
-				if ($sAttCode == '_key_')
-				{
-					$aFieldData = $this->GetFieldData($sAlias, $sAttCode, null, true /* bChecked */, $aData['sort']);
-				}
-				else if (MetaModel::isValidAttCode($sClass, $sAttCode))
-				{
-					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-					$aFieldData = $this->GetFieldData($sAlias, $sAttCode, $oAttDef, true /* bChecked */, $aData['sort']);
-				}
-
-				if ($aFieldData)
-				{
-					$this->aColumns[$sAlias][$sAttCode] = $aFieldData;
-				}
-				else
-				{
-					unset($this->aColumns[$sAlias][$sAttCode]);
-				}
-			}
-		}
-		$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);
-		// Retrieve the class specific settings for each class/alias based on the 'list' ZList
-		//TODO let the caller pass some other default settings (another Zlist, extre fields...)
-		$aColumns = array();
-		foreach($aClassAliases as $sAlias => $sClass)
-		{
-			if ($aDefaultLists == null)
-			{
-				$aList = cmdbAbstract::FlattenZList(MetaModel::GetZListItems($sClass, 'list'));
-			}
-			else
-			{
-				$aList = $aDefaultLists[$sAlias];
-			}
-			
-			$aSortOrder = MetaModel::GetOrderByDefault($sClass);
-			if ($bViewLink)
-			{
-				$sSort = 'none';
-				if(array_key_exists('friendlyname', $aSortOrder))
-				{
-					$sSort = $aSortOrder['friendlyname'] ? 'asc' : 'desc';
-				}
-				$sNormalizedFName = MetaModel::NormalizeFieldSpec($sClass, 'friendlyname');
-				if(array_key_exists($sNormalizedFName, $aSortOrder))
-				{
-					$sSort = $aSortOrder[$sNormalizedFName] ? 'asc' : 'desc';
-				}
-				
-				$aColumns[$sAlias]['_key_'] = $oSettings->GetFieldData($sAlias, '_key_', null, true /* bChecked */, $sSort);
-			}
-			foreach($aList as $sAttCode)
-			{
-				$sSort = 'none';
-				if(array_key_exists($sAttCode, $aSortOrder))
-				{
-					$sSort = $aSortOrder[$sAttCode] ? 'asc' : 'desc';
-				}
-				$oAttDef = Metamodel::GetAttributeDef($sClass, $sAttCode);
-				$aFieldData = $oSettings->GetFieldData($sAlias, $sAttCode, $oAttDef, true /* bChecked */, $sSort);
-				if ($aFieldData) $aColumns[$sAlias][$sAttCode] = $aFieldData;
-			}
-		}
-		$iDefaultPageSize = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
-		$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
-				// TODO: check if the existing ones are still valid (in case their type changed)
-				if (($sAttCode != '_key_') && (!MetaModel::IsValidAttCode($sClass, $sAttCode)))
-				{
-					unset($this->aColumns[$sAlias][$sAttCode]);
-				}
-			}
-			$aList = MetaModel::ListAttributeDefs($sClass);
-			
-			// Add the other (non visible ones), sorted in alphabetical order
-			$aTempData = array();
-			foreach($aList as $sAttCode => $oAttDef)
-			{
-				if ( (!array_key_exists($sAttCode, $this->aColumns[$sAlias])) && (!($oAttDef instanceof AttributeLinkedSet || $oAttDef instanceof AttributeDashboard)))
-				{
-					$aFieldData = $this->GetFieldData($sAlias, $sAttCode, $oAttDef, false /* bChecked */, 'none');
-					if ($aFieldData) $aTempData[$aFieldData['label']] = $aFieldData;
-				}
-			}
-			ksort($aTempData);
-			foreach($aTempData as $sLabel => $aFieldData)
-			{
-				$this->aColumns[$sAlias][$aFieldData['code']] = $aFieldData;
-			}
-		}		
-	}
-
-	/**
-	 * @param $aClassAliases
-	 * @param null $sTableId
-	 * @param bool $bOnlyOnTable
-	 *
-	 * @return \DataTableSettings|null
-	 * @throws \Exception
-	 */
-	static public function GetTableSettings($aClassAliases, $sTableId = null, $bOnlyOnTable = false)
-	{
-		$pref = null;
-		$oSettings = new DataTableSettings($aClassAliases, $sTableId);
-
-		if ($sTableId != null)
-		{
-			// An identified table, let's fetch its own settings (if any)
-			$pref = appUserPreferences::GetPref($oSettings->GetPrefsKey($sTableId), null);
-		}
-		
-		if ($pref == null)
-		{
-			if (!$bOnlyOnTable)
-			{
-				// Try the global preferred values for this class / set of classes
-				$pref = appUserPreferences::GetPref($oSettings->GetPrefsKey(null), null);
-			}
-			if ($pref == null)
-			{
-				// no such settings, use the default values provided by the data model
-				return null;
-			}
-		}
-		$oSettings->unserialize($pref);
-		
-		return $oSettings;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function GetSortOrder()
-	{
-		$aSortOrder = array();
-		foreach($this->aColumns as $sAlias => $aColumns)
-		{
-			foreach($aColumns as $aColumn)
-			{
-				if ($aColumn['sort'] != 'none')
-				{
-					$sCode = ($aColumn['code'] == '_key_') ? 'friendlyname' : $aColumn['code'];
-					$aSortOrder[$sCode] = ($aColumn['sort']=='asc'); // true for ascending, false for descending
-				}
-			}
-			break; // TODO: For now the Set object supports only sorting on the first class of the set
-		}
-		return $aSortOrder;
-	}
-
-	/**
-	 * @param null $sTargetTableId
-	 *
-	 * @return bool
-	 */
-	public function Save($sTargetTableId = null)
-	{
-		$sSaveId = is_null($sTargetTableId) ? $this->sTableId : $sTargetTableId;
-		if ($sSaveId == null) return false; // Cannot save, the table is not identified, use SaveAsDefault instead
-		
-		$sSettings = $this->serialize();
-		appUserPreferences::SetPref($this->GetPrefsKey($sSaveId), $sSettings);
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function SaveAsDefault()
-	{
-		$sSettings = $this->serialize();
-		appUserPreferences::SetPref($this->GetPrefsKey(null), $sSettings);
-		return true;
-	}
-	
-
-	/**
-	 * Clear the preferences for this particular table
-	 * @param $bResetAll boolean If true,the settings for all tables of the same class(es)/alias(es) are reset
-	 */
-	public function ResetToDefault($bResetAll)
-	{
-		if (($this->sTableId == null) && (!$bResetAll)) return false; // Cannot reset, the table is not identified, use force $bResetAll instead
-		if ($bResetAll)
-		{
-			// Turn the key into a suitable PCRE pattern
-			$sKey = $this->GetPrefsKey(null);
-			$sPattern = str_replace(array('|'), array('\\|'), $sKey); // escape the | character
-			$sPattern = '#^'.str_replace(array('*'), array('.*'), $sPattern).'$#'; // Don't use slash as the delimiter since it's used in our key to delimit aliases
-			appUserPreferences::UnsetPref($sPattern, true);
-		}
-		else
-		{
-			appUserPreferences::UnsetPref($this->GetPrefsKey($this->sTableId), false);
-		}
-		return true;
-	}
-
-	/**
-	 * @param null $sTableId
-	 *
-	 * @return string
-	 */
-	protected function GetPrefsKey($sTableId = null)
-	{
-		return static::GetAppUserPreferenceKey($this->aClassAliases, $sTableId);
-	}
-
-	public static function GetAppUserPreferenceKey($aClassAliases, $sTableId)
-	{
-		if ($sTableId === null)
-		{
-			$sTableId = '*';
-		}
-
-		$aKeys = array();
-		foreach($aClassAliases as $sAlias => $sClass)
-		{
-			$aKeys[] = $sAlias.'-'.$sClass;
-		}
-		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;
-		if ($sAttCode == '_key_')
-		{
-			$sLabel = Dict::Format('UI:ExtKey_AsLink', MetaModel::GetName($this->aClassAliases[$sAlias]));
-			$ret = array(
-				'label' => $sLabel,
-				'checked' => true,
-				'disabled' => true,
-				'alias' => $sAlias,
-				'code' => $sAttCode,
-				'sort' => $sSort,
-			);
-		}
-		else if (!$oAttDef->IsLinkSet())
-		{
-			$sLabel = $oAttDef->GetLabel();
-			if ($oAttDef->IsExternalKey())
-			{
-				$sLabel = Dict::Format('UI:ExtKey_AsLink', $oAttDef->GetLabel());
-			}
-			else if ($oAttDef->IsExternalField())
-			{
-				if ($oAttDef->IsFriendlyName())
-				{
-					$sLabel = Dict::Format('UI:ExtKey_AsFriendlyName', $oAttDef->GetLabel());
-				}
-				else
-				{
-					$oExtAttDef = $oAttDef->GetExtAttDef();
-					$sLabel = Dict::Format('UI:ExtField_AsRemoteField', $oAttDef->GetLabel(), $oExtAttDef->GetLabel());
-				}
-			}
-			elseif ($oAttDef instanceof AttributeFriendlyName)
-			{
-				$sLabel = Dict::Format('UI:ExtKey_AsFriendlyName', $oAttDef->GetLabel());
-			}
-			$ret = array(
-				'label' => $sLabel,
-				'checked' => $bChecked,
-				'disabled' => false,
-				'alias' => $sAlias,
-				'code' => $sAttCode,
-				'sort' => $sSort,
-			);
-		}
-		return $ret;		
-	}
-}

application/errorpage.class.inc.php

@@ -1,82 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/ErrorPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-
-class ErrorPage extends NiceWebPage
-{
-	public function __construct($sTitle)
-	{
-		parent::__construct($sTitle);
-		$this->add_linked_script("../js/jquery.blockUI.js");
-		$this->add_linked_script("../setup/setup.js");
-		$this->add_saas("css/setup.scss");
-	}
-
-	public function info($sText)
-	{
-		$this->add("<p class=\"info\">$sText</p>\n");
-		$this->log_info($sText);
-	}
-
-	public function ok($sText)
-	{
-		$this->add("<div class=\"message message-valid\"><span class=\"message-title\">Success:</span>$sText</div>");
-		$this->log_ok($sText);
-	}
-
-	public function warning($sText)
-	{
-		$this->add("<div class=\"message message-warning\"><span class=\"message-title\">Warning:</span>$sText</div>");
-		$this->log_warning($sText);
-	}
-
-	public function error($sText)
-	{
-		$this->add("<div class=\"message message-error\">$sText</div>");
-		$this->log_error($sText);
-	}
-
-	public function output()
-	{
-		$sLogo = utils::GetAbsoluteUrlAppRoot().'/images/itop-logo.png';
-		$sTimeStamp = utils::GetCacheBusterTimestamp();
-		$sTitle = utils::HtmlEntities($this->s_title);
-		$this->s_content = <<<HTML
-<div id="header" class="error_page">
-	<h1><a href="http://www.combodo.com/itop" target="_blank"><img title="iTop by Combodo" alt=" " src="{$sLogo}?t={$sTimeStamp}"></a>&nbsp;{$sTitle}</h1>
-</div>
-<div id="setup" class="error_page">
-	{$this->s_content}
-</div>
-HTML;
-		return parent::output();
-	}
-
-	public static function log_error($sText)
-	{
-		IssueLog::Error($sText);
-	}
-
-	public static function log_warning($sText)
-	{
-		IssueLog::Warning($sText);
-	}
-
-	public static function log_info($sText)
-	{
-		IssueLog::Info($sText);
-	}
-
-	public static function log_ok($sText)
-	{
-		IssueLog::Ok($sText);
-	}
-
-	public static function log($sText)
-	{
-		IssueLog::Ok($sText);
-	}
-}
+ 

application/forms.class.inc.php

@@ -1223,7 +1223,7 @@ class DesignerComboField extends DesignerFormField
 		$sChecked = $this->defaultValue ? 'checked' : '';
 		$sMandatory = $this->bMandatory ? 'true' :  'false';
 		$sReadOnly = $this->IsReadOnly() ? 'disabled="disabled"' :  '';
-		if ($this->IsSorted() )
+		if ($this->IsSorted())
 		{
 			asort($this->aAllowedValues);
 		}
@@ -1271,14 +1271,18 @@ class DesignerComboField extends DesignerFormField
 					$sHtml .= "<option value=\"\">".$this->sNullLabel."</option>";
 				}
 			}
-			foreach ($this->aAllowedValues as $sKey => $sDisplayValue) {
-				if ($this->bMultipleSelection) {
+			foreach($this->aAllowedValues as $sKey => $sDisplayValue)
+			{
+				if ($this->bMultipleSelection)
+				{
 					$sSelected = in_array($sKey, $this->defaultValue) ? 'selected' : '';
-				} else {
+				}
+				else
+				{
 					$sSelected = ($sKey == $this->defaultValue) ? 'selected' : '';
 				}
 				// Quick and dirty: display the menu parents as a tree
-				$sHtmlValue = str_replace(' ', '&nbsp;', $sDisplayValue);
+				$sHtmlValue = str_replace(' ', '&nbsp;', htmlentities($sDisplayValue, ENT_QUOTES, 'UTF-8'));
 				$sHtml .= "<option value=\"".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."\" $sSelected>$sHtmlValue</option>";
 			}
 			$sHtml .= "</select>";

application/iotask.class.inc.php

@@ -44,7 +44,6 @@ class InputOutputTask extends cmdbAbstractObject
 			"db_table" => "priv_iotask",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));

application/itopwizardwebpage.class.inc.php

@@ -1,57 +1,7 @@
 <?php
-// Copyright (C) 2010-2012 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/>
-
-
 /**
- * Class iTopWizardWebPage
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/iTopWizardWebPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-require_once('itopwebpage.class.inc.php');
-/**
- * Web page to display a wizard in the iTop framework
- */
-class iTopWizardWebPage extends iTopWebPage
-{
-	var $m_iCurrentStep;
-	var $m_aSteps;
-    public function __construct($sTitle, $currentOrganization, $iCurrentStep, $aSteps)
-    {
-    	parent::__construct($sTitle." - step $iCurrentStep of ".count($aSteps)." - ".$aSteps[$iCurrentStep - 1], $currentOrganization);
-		$this->m_iCurrentStep = $iCurrentStep;
-		$this->m_aSteps = $aSteps;
-    }
-    
-    public function output()
-    {
-    	$aSteps = array();
-    	$iIndex = 0;
-    	foreach($this->m_aSteps as $sStepTitle)
-    	{
-    		$iIndex++;
-    		$sStyle = ($iIndex == $this->m_iCurrentStep) ? 'wizActiveStep' : 'wizStep';
-    		$aSteps[] = "<div class=\"$sStyle\"><span>$sStepTitle</span></div>";
-    	}
-    	$sWizardHeader = "<div class=\"wizHeader\"><h1>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n".implode("<div class=\"wizSeparator\"><img align=\"bottom\" src=\"../images/wizArrow.gif\"></div>", $aSteps)."<br style=\"clear:both;\"/></div>\n";
-    	$this->s_content = "$sWizardHeader<div class=\"wizContainer\">".$this->s_content."</div>";
-    	parent::output();
-	}
-}
-?>
+ 

application/loginbasic.class.inc.php

@@ -51,7 +51,7 @@ class LoginBasic extends AbstractLoginFSMExtension
 
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'basic')
+		if ($_SESSION['login_mode'] == 'basic')
 		{
 			list($sAuthUser, $sAuthPwd) = $this->GetAuthUserAndPassword();
 			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $_SESSION['login_mode'], 'internal'))
@@ -59,17 +59,15 @@ class LoginBasic extends AbstractLoginFSMExtension
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			// Save the checked user
-			$_SESSION['auth_user'] = $sAuthUser;
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'basic')
+		if ($_SESSION['login_mode'] == 'basic')
 		{
-			$sAuthUser = $_SESSION['auth_user'];
+			list($sAuthUser) = $this->GetAuthUserAndPassword();
 			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -77,13 +75,8 @@ class LoginBasic extends AbstractLoginFSMExtension
 
 	protected function OnError(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'basic')
+		if ($_SESSION['login_mode'] == 'basic')
 		{
-            $iOnExit = LoginWebPage::getIOnExit();
-            if ($iOnExit === LoginWebPage::EXIT_RETURN)
-            {
-                return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
-            }
 			LoginWebPage::HTTP401Error();
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -91,7 +84,7 @@ class LoginBasic extends AbstractLoginFSMExtension
 
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'basic')
+		if ($_SESSION['login_mode'] == 'basic')
 		{
 			$_SESSION['can_logoff'] = true;
 			return LoginWebPage::CheckLoggedUser($iErrorCode);

application/logindefault.class.inc.php

@@ -77,7 +77,7 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	{
 		self::ResetLoginSession();
 		$iOnExit = LoginWebPage::getIOnExit();
-		if ($iOnExit === LoginWebPage::EXIT_RETURN)
+		if ($iOnExit == LoginWebPage::EXIT_RETURN)
 		{
 			return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
 		}
@@ -93,12 +93,6 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	{
 		if (!isset($_SESSION['login_mode']))
 		{
-            // N°6358 - if EXIT_RETURN was asked, send an error
-            if (LoginWebPage::getIOnExit() === LoginWebPage::EXIT_RETURN) {
-                $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
-                return LoginWebPage::LOGIN_FSM_ERROR;
-            }
-
 			// If no plugin validated the user, exit
 			self::ResetLoginSession();
 			exit();

application/loginexternal.class.inc.php

@@ -35,7 +35,7 @@ class LoginExternal extends AbstractLoginFSMExtension
 
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'external')
+		if ($_SESSION['login_mode'] == 'external')
 		{
 			$sAuthUser = $this->GetAuthUser();
 			if (!UserRights::CheckCredentials($sAuthUser, '', $_SESSION['login_mode'], 'external'))
@@ -43,17 +43,15 @@ class LoginExternal extends AbstractLoginFSMExtension
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			// Save the checked user
-			$_SESSION['auth_user'] = $sAuthUser;
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'external')
+		if ($_SESSION['login_mode'] == 'external')
 		{
-			$sAuthUser = $_SESSION['auth_user'];
+			$sAuthUser = $this->GetAuthUser();
 			LoginWebPage::OnLoginSuccess($sAuthUser, 'external', $_SESSION['login_mode']);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -61,7 +59,7 @@ class LoginExternal extends AbstractLoginFSMExtension
 
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'external')
+		if ($_SESSION['login_mode'] == 'external')
 		{
 			$_SESSION['can_logoff'] = false;
 			return LoginWebPage::CheckLoggedUser($iErrorCode);
@@ -71,13 +69,8 @@ class LoginExternal extends AbstractLoginFSMExtension
 
 	protected function OnError(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'external')
+		if ($_SESSION['login_mode'] == 'external')
 		{
-            $iOnExit = LoginWebPage::getIOnExit();
-            if ($iOnExit === LoginWebPage::EXIT_RETURN)
-            {
-                return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
-            }
 			LoginWebPage::HTTP401Error();
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;

application/loginform.class.inc.php

@@ -43,10 +43,6 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 					exit;
 				}
 
-                if (LoginWebPage::getIOnExit() === LoginWebPage::EXIT_RETURN) {
-                    return LoginWebPage::LOGIN_FSM_CONTINUE;
-                }
-
 				// No credentials yet, display the form
 				$oPage = LoginWebPage::NewLoginWebPage();
 				$oPage->DisplayLoginForm($this->bForceFormOnError);
@@ -66,7 +62,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'form')
+		if ($_SESSION['login_mode'] == 'form')
 		{
 			$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
 			$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, 'raw_data');
@@ -75,8 +71,6 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			// Save the checked user
-			$_SESSION['auth_user'] = $sAuthUser;
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
@@ -86,9 +80,17 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'form')
+		if ($_SESSION['login_mode'] == 'form')
 		{
-			$sAuthUser = $_SESSION['auth_user'];
+			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']);
 		}
@@ -100,7 +102,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnError(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'form')
+		if ($_SESSION['login_mode'] == 'form')
 		{
 			$this->bForceFormOnError = true;
 		}
@@ -112,7 +114,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 	 */
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'form')
+		if ($_SESSION['login_mode'] == 'form')
 		{
 			$_SESSION['can_logoff'] = true;
 			return LoginWebPage::CheckLoggedUser($iErrorCode);

application/logintwig.class.inc.php

@@ -224,7 +224,7 @@ class LoginTwigRenderer
 		}
 
 		$oCoreLoader = new Twig_Loader_Filesystem(array(), APPROOT.'templates');
-		$aCoreTemplatesPaths = array('login', 'login/password');
+		$aCoreTemplatesPaths = array('pages/login', 'pages/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

application/loginurl.class.inc.php

@@ -40,7 +40,7 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnReadCredentials(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'url')
+		if ($_SESSION['login_mode'] == 'url')
 		{
 			$_SESSION['login_temp_auth_user'] =  utils::ReadParam('auth_user', '', false, 'raw_data');
 		}
@@ -49,7 +49,7 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'url')
+		if ($_SESSION['login_mode'] == 'url')
 		{
 			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 			$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
@@ -58,17 +58,15 @@ class LoginURL extends AbstractLoginFSMExtension
 				$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
 				return LoginWebPage::LOGIN_FSM_ERROR;
 			}
-			// Save the checked user
-			$_SESSION['auth_user'] = $sAuthUser;
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'url')
+		if ($_SESSION['login_mode'] == 'url')
 		{
-			$sAuthUser = $_SESSION['auth_user'];
+			$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 			LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
@@ -76,7 +74,7 @@ class LoginURL extends AbstractLoginFSMExtension
 
 	protected function OnError(&$iErrorCode)
 	{
-		if (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'url')
+		if ($_SESSION['login_mode'] == 'url')
 		{
 			$this->bErrorOccurred = true;
 		}

application/loginwebpage.class.inc.php

@@ -32,7 +32,7 @@ class LoginWebPage extends NiceWebPage
 {
 	const EXIT_PROMPT = 0;
 	const EXIT_HTTP_401 = 1;
-	const EXIT_RETURN = 2; // Non interactive mode (ajax, rest, ...)
+	const EXIT_RETURN = 2;
 	
 	const EXIT_CODE_OK = 0;
 	const EXIT_CODE_MISSINGLOGIN = 1;
@@ -84,15 +84,16 @@ class LoginWebPage extends NiceWebPage
 
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
-		$this->no_cache();
-		$this->add_xframe_options();
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 	}
 	
 	public function SetStyleSheet()
 	{
 		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/login.css');
 		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css');
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/v4-shims.min.css');
 	}
 
 	public static function SetLoginFailedMessage($sMessage)
@@ -100,6 +101,44 @@ class LoginWebPage extends NiceWebPage
 		self::$m_sLoginFailedMessage = $sMessage;
 	}
 
+	/**
+	 * @param $oUser
+	 * @param array $aProfiles
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 */
+	public static function SynchronizeProfiles(&$oUser, array $aProfiles, $sOrigin)
+	{
+		$oProfilesSet = $oUser->Get(‘profile_list’);
+		//delete old profiles
+		$aExistingProfiles = [];
+		while ($oProfile = $oProfilesSet->Fetch())
+		{
+			array_push($aExistingProfiles, $oProfile->Get('profileid'));
+			$iArrayKey = array_search($oProfile->Get('profileid'), $aProfiles);
+			if (!$iArrayKey)
+			{
+				$oProfilesSet->RemoveItem($oProfile->Get('profileid'));
+			}
+			else
+			{
+				unset($aProfiles[$iArrayKey]);
+			}
+		}
+		//add profiles not already linked with user
+		foreach ($aProfiles as $iProfileId)
+		{
+			$oLink = new URP_UserProfile();
+			$oLink->Set('profileid', $iProfileId);
+			$oLink->Set('reason', $sOrigin);
+
+			$oProfilesSet->AddItem(MetaModel::NewObject('URP_UserProfile', array('profileid' => $iProfileId, 'reason' => $sOrigin)));
+		}
+		$oUser->Set('profile_list', $oProfilesSet);
+	}
+
 	public function DisplayLoginHeader($bMainAppLogo = false)
 	{
 		$sLogo = 'itop-logo-external.png';
@@ -208,7 +247,7 @@ class LoginWebPage extends NiceWebPage
 				}
 
 				// This token allows the user to change the password without knowing the previous one
-				$sToken = bin2hex(random_bytes(32));
+				$sToken = substr(md5(APPROOT.uniqid()), 0, 16);
 				$oUser->Set('reset_pwd_token', $sToken);
 				CMDBObject::SetTrackInfo('Reset password');
 				$oUser->AllowWrite(true);
@@ -352,20 +391,14 @@ class LoginWebPage extends NiceWebPage
 		$this->output();
 	}
 
-	public static function ResetSession($bFullCleanup = false)
+	public static function ResetSession()
 	{
-        if ($bFullCleanup) {
-            // Unset all of the session variables.
-            foreach (array_keys($_SESSION) as $sKey) {
-                unset($_SESSION[$sKey]);
-            }
-        } else {
-            unset($_SESSION['auth_user']);
-            unset($_SESSION['login_state']);
-            unset($_SESSION['can_logoff']);
-            unset($_SESSION['archive_mode']);
-            unset($_SESSION['impersonate_user']);
-        }
+		// Unset all of the session variables.
+		unset($_SESSION['auth_user']);
+		unset($_SESSION['login_state']);
+		unset($_SESSION['can_logoff']);
+		unset($_SESSION['archive_mode']);
+		unset($_SESSION['impersonate_user']);
 		UserRights::_ResetSessionCache();
 		// If it's desired to kill the session, also delete the session cookie.
 		// Note: This will destroy the session, and not just the session data!
@@ -691,7 +724,7 @@ class LoginWebPage extends NiceWebPage
 
 	public static function HTTPReload()
 	{
-		$sOriginURL = utils::GetCurrentAbsoluteUrl();
+		$sOriginURL = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 		if (!utils::StartsWith($sOriginURL, utils::GetAbsoluteUrlAppRoot()))
 		{
 			// If the found URL does not start with the configured AppRoot URL
@@ -892,20 +925,12 @@ class LoginWebPage extends NiceWebPage
 			}
 
 			// Now synchronize the profiles
-			$oProfilesSet = DBObjectSet::FromScratch('URP_UserProfile');
 			$sOrigin = 'External User provisioning';
 			if (isset($_SESSION['login_mode']))
 			{
 				$sOrigin .= " ({$_SESSION['login_mode']})";
 			}
-			foreach ($aProfiles as $iProfileId)
-			{
-				$oLink = new URP_UserProfile();
-				$oLink->Set('profileid', $iProfileId);
-				$oLink->Set('reason', $sOrigin);
-				$oProfilesSet->AddObject($oLink);
-			}
-			$oUser->Set('profile_list', $oProfilesSet);
+			$aExistingProfiles = self::SynchronizeProfiles($oUser, $aProfiles, $sOrigin);
 			if ($oUser->IsModified())
 			{
 				$oUser->DBWrite();
@@ -937,7 +962,7 @@ class LoginWebPage extends NiceWebPage
 		}
 		else
 		{
-			if ($iOnExit === self::EXIT_RETURN)
+			if ($iOnExit == self::EXIT_RETURN)
 			{
 				return self::EXIT_CODE_PORTALUSERNOTAUTHORIZED;
 			}
@@ -993,7 +1018,7 @@ class LoginWebPage extends NiceWebPage
 		{
 			if ($bMustBeAdmin && !UserRights::IsAdministrator())
 			{
-				if ($iOnExit === self::EXIT_RETURN)
+				if ($iOnExit == self::EXIT_RETURN)
 				{
 					return self::EXIT_CODE_MUSTBEADMIN;
 				}
@@ -1009,7 +1034,7 @@ class LoginWebPage extends NiceWebPage
 			}
 			$iRet = call_user_func(array(self::$sHandlerClass, 'ChangeLocation'), $sRequestedPortalId, $iOnExit);
 		}
-		if ($iOnExit === self::EXIT_RETURN)
+		if ($iOnExit == self::EXIT_RETURN)
 		{
 			return $iRet;
 		}

application/menunode.class.inc.php

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\UI\Component\Title\TitleFactory;
+
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/application/template.class.inc.php');
 require_once(APPROOT."/application/user.dashboard.class.inc.php");
@@ -51,7 +53,10 @@ require_once(APPROOT."/application/user.dashboard.class.inc.php");
  * new OQLMenuNode('PersonsMenu', 'SELECT bizPerson', $oContactsMenu->GetIndex(), 0);
  *
  */
- 
+
+/**
+ * Class ApplicationMenu
+ */
 class ApplicationMenu
 {
 	/**
@@ -71,7 +76,10 @@ class ApplicationMenu
 	 */
 	static $sFavoriteSiloQuery = 'SELECT Organization';
 
-	static public function LoadAdditionalMenus()
+	/**
+	 * @return void
+	 */
+	public static function LoadAdditionalMenus()
 	{
 		if (!self::$bAdditionalMenusLoaded)
 		{
@@ -97,10 +105,10 @@ class ApplicationMenu
 
 	/**
 	 * Set the query used to limit the list of displayed organizations in the drop-down menu
-	 * @param $sOQL string The OQL query returning a list of Organization objects
+	 * @param string $sOQL The OQL query returning a list of Organization objects
 	 * @return void
 	 */
-	static public function SetFavoriteSiloQuery($sOQL)
+	public static function SetFavoriteSiloQuery($sOQL)
 	{
 		self::$sFavoriteSiloQuery = $sOQL;
 	}
@@ -109,7 +117,7 @@ class ApplicationMenu
 	 * Get the query used to limit the list of displayed organizations in the drop-down menu
 	 * @return string The OQL query returning a list of Organization objects
 	 */
-	static public function GetFavoriteSiloQuery()
+	public static function GetFavoriteSiloQuery()
 	{
 		return self::$sFavoriteSiloQuery;
 	}
@@ -117,11 +125,11 @@ class ApplicationMenu
 	/**
 	 * Check whether a menu Id is enabled or not
 	 *
-	 * @param $sMenuId
+	 * @param string $sMenuId
 	 *
 	 * @throws \Exception
 	 */
-	static public function CheckMenuIdEnabled($sMenuId)
+	public static function CheckMenuIdEnabled($sMenuId)
 	{
 		self::LoadAdditionalMenus();
 		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
@@ -140,11 +148,11 @@ class ApplicationMenu
 	 * Main function to add a menu entry into the application, can be called during the definition
 	 * of the data model objects
 	 * @param MenuNode $oMenuNode
-	 * @param $iParentIndex
-	 * @param $fRank
+	 * @param int $iParentIndex
+	 * @param float $fRank
 	 * @return int
 	 */
-	static public function InsertMenu(MenuNode $oMenuNode, $iParentIndex, $fRank)
+	public static function InsertMenu(MenuNode $oMenuNode, $iParentIndex, $fRank)
 	{
 		$index = self::GetMenuIndexById($oMenuNode->GetMenuId());
 		if ($index == -1)
@@ -185,20 +193,154 @@ class ApplicationMenu
 
 	/**
 	 * Reflection API - Get menu entries
+	 *
+	 * @return array
 	 */
-	static public function ReflectionMenuNodes()
+	public static function ReflectionMenuNodes()
 	{
 		self::LoadAdditionalMenus();
 		return self::$aMenusIndex;
 	}
 
+	/**
+	 * Get entries count for all the menus
+	 *
+	 * @param array $aExtraParams
+	 *
+	 * @return array
+	 * @throws \DictExceptionMissingString
+	 * @since 3.0.0
+	 */
+	public static function GetMenusCount($aExtraParams = array())
+	{
+		$aMenuGroups = static::GetMenuGroups($aExtraParams);
+
+		$aMenusCount = [];
+		foreach ($aMenuGroups as $aMenuGroup) {
+			$aSubMenuNodes = $aMenuGroup['aSubMenuNodes'];
+			$aMenusCount = array_merge($aMenusCount, static::GetSubMenusCount($aSubMenuNodes));
+		}
+
+		return $aMenusCount;
+	}
+
+	/**
+	 * Recurse sub menus for counts
+	 *
+	 * @param array $aSubMenuNodes
+	 *
+	 * @return array
+	 * @since 3.0.0
+	 */
+	private static function GetSubMenusCount(array $aSubMenuNodes)
+	{
+		$aSubMenusCount = [];
+		foreach ($aSubMenuNodes as $aSubMenuNode) {
+			if ($aSubMenuNode['bHasCount']) {
+				$oMenuNode = static::GetMenuNode(static::GetMenuIndexById($aSubMenuNode['sId']));
+				$aSubMenusCount[$aSubMenuNode['sId']] = $oMenuNode->GetEntriesCount();
+			}
+			$aSubMenusCount = array_merge($aSubMenusCount, static::GetSubMenusCount($aSubMenuNode['aSubMenuNodes']));
+		}
+		return $aSubMenusCount;
+	}
+
+	/**
+	 * Return an array of menu groups
+	 *
+	 * @param array $aExtraParams
+	 *
+	 * @return array
+	 * @throws \DictExceptionMissingString
+	 * @since 3.0.0
+	 */
+	public static function GetMenuGroups($aExtraParams = array())
+	{
+		self::LoadAdditionalMenus();
+
+		// Sort the root menu based on the rank
+		usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
+
+		$aMenuGroups = [];
+		foreach(static::$aRootMenus as $aMenuGroup)
+		{
+			if(!static::CanDisplayMenu($aMenuGroup))
+			{
+				continue;
+			}
+
+			$sMenuGroupIdx = $aMenuGroup['index'];
+			/** @var \MenuGroup $oMenuNode */
+			$oMenuNode = static::GetMenuNode($sMenuGroupIdx);
+
+			$aMenuGroups[] = [
+				'sId' => $oMenuNode->GetMenuID(),
+				'sIconCssClasses' => $oMenuNode->GetDecorationClasses(),
+				'sInitials' => $oMenuNode->GetInitials(),
+				'sTitle' => $oMenuNode->GetTitle(),
+				'aSubMenuNodes' => static::GetSubMenuNodes($sMenuGroupIdx, $aExtraParams),
+			];
+		}
+
+		return $aMenuGroups;
+	}
+
+	/**
+	 * Return an array of sub-menu nodes for $sMenuGroupIdx
+	 *
+	 * @param string $sMenuGroupIdx
+	 * @param array $aExtraParams
+	 *
+	 * @return array
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 * @since 3.0.0
+	 */
+	public static function GetSubMenuNodes($sMenuGroupIdx, $aExtraParams = array())
+	{
+		$aSubMenuItems = self::GetChildren($sMenuGroupIdx);
+
+		// Sort the children based on the rank
+		usort($aSubMenuItems, array('ApplicationMenu', 'CompareOnRank'));
+
+		$aSubMenuNodes = [];
+		foreach($aSubMenuItems as $aSubMenuItem)
+		{
+			if(!static::CanDisplayMenu($aSubMenuItem))
+			{
+				continue;
+			}
+
+			$sSubMenuItemIdx = $aSubMenuItem['index'];
+			$oSubMenuNode = static::GetMenuNode($sSubMenuItemIdx);
+
+			if(!$oSubMenuNode->IsEnabled())
+			{
+				continue;
+			}
+
+			$aSubMenuNodes[] = [
+				'sId' => $oSubMenuNode->GetMenuId(),
+				'sTitle' => $oSubMenuNode->GetTitle(),
+				'bHasCount' => $oSubMenuNode->HasCount(),
+				'sUrl' => $oSubMenuNode->GetHyperlink($aExtraParams),
+				'bOpenInNewWindow' => $oSubMenuNode->IsHyperLinkInNewWindow(),
+				'aSubMenuNodes' => static::GetSubMenuNodes($sSubMenuItemIdx, $aExtraParams),
+			];
+		}
+
+		return $aSubMenuNodes;
+	}
+
 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
 	 * @param \WebPage $oPage
-	 * @param $aExtraParams
+	 * @param array $aExtraParams
 	 * @throws DictExceptionMissingString
+	 *
+	 * @deprecated Will be removed in 3.0.0, use static::GetMenuGroups() instead
 	 */
-	static public function DisplayMenu($oPage, $aExtraParams)
+	public static function DisplayMenu($oPage, $aExtraParams)
 	{
 		self::LoadAdditionalMenus();
 		// Sort the root menu based on the rank
@@ -237,7 +379,7 @@ EOF
 	 * @param array $aMenu menu entry
 	 * @return bool true if at least one menu is enabled
 	 */
-	static private function CanDisplayMenu($aMenu)
+	private static function CanDisplayMenu($aMenu)
 	{
 		$oMenuNode = self::GetMenuNode($aMenu['index']);
 		if ($oMenuNode->IsEnabled())
@@ -269,11 +411,12 @@ EOF
 	 * @param array $aExtraParams
 	 * @param int $iActiveMenu
 	 *
-	 * @return true if the currently selected menu is one of the submenus
+	 * @return bool True if the currently selected menu is one of the submenus
 	 * @throws DictExceptionMissingString
 	 * @throws \Exception
+	 * @deprecated Will be removed in 3.0.0, use static::GetSubMenuNodes() instead
 	 */
-	static protected function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
+	protected static function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
 	{
 		// Sort the menu based on the rank
 		$bActive = false;
@@ -330,11 +473,11 @@ EOF
 
 	/**
 	 * Helper function to sort the menus based on their rank
-	 * @param $a
-	 * @param $b
+	 * @param array $a
+	 * @param array $b
 	 * @return int
 	 */
-	static public function CompareOnRank($a, $b)
+	public static function CompareOnRank($a, $b)
 	{
 		$result = 1;
 		if ($a['rank'] == $b['rank'])
@@ -353,7 +496,7 @@ EOF
 	 * @param int $index
 	 * @return MenuNode|null
 	 */
-	static public function GetMenuNode($index)
+	public static function GetMenuNode($index)
 	{
 		return isset(self::$aMenusIndex[$index]) ? self::$aMenusIndex[$index]['node'] : null;
 	}
@@ -363,7 +506,7 @@ EOF
 	 * @param int $index
 	 * @return array
 	 */
-	static public function GetChildren($index)
+	public static function GetChildren($index)
 	{
 		return self::$aMenusIndex[$index]['children'];
 	}
@@ -373,7 +516,7 @@ EOF
 	 * @param string $sTitle Title of the menu (as passed when creating the menu)
 	 * @return integer ID of the menu, or -1 if not found
 	 */
-	static public function GetMenuIndexById($sTitle)
+	public static function GetMenuIndexById($sTitle)
 	{
 		$index = -1;
 		/** @var MenuNode[] $aMenu */
@@ -392,7 +535,7 @@ EOF
 	 * Retrieves the currently active menu (if any, otherwise the first menu is the default)
 	 * @return string The Id of the currently active menu
 	 */
-	static public function GetActiveNodeId()
+	public static function GetActiveNodeId()
 	{
 		$oAppContext = new ApplicationContext();
 		$sMenuId = $oAppContext->GetCurrentValue('menu', null);		
@@ -406,7 +549,7 @@ EOF
 	/**
 	 * @return null|string
 	 */
-	static public function GetDefaultMenuId()
+	public static function GetDefaultMenuId()
 	{
 		static $sDefaultMenuId = null;
 		if (is_null($sDefaultMenuId))
@@ -426,7 +569,7 @@ EOF
 	 * @param $sMenuId
 	 * @return string
 	 */
-	static public function GetRootMenuId($sMenuId)
+	public static function GetRootMenuId($sMenuId)
 	{
 		$iMenuIndex = self::GetMenuIndexById($sMenuId);
 		if ($iMenuIndex == -1)
@@ -563,29 +706,45 @@ abstract class MenuNode
 
 	/**
 	 * @return string
-	 * @throws DictExceptionMissingString
 	 */
 	public function GetTitle()
 	{
 		return Dict::S("Menu:$this->sMenuId", str_replace('_', ' ', $this->sMenuId));
 	}
 
+	/**
+	 * Indicates if the page corresponding to this menu node is countable
+	 *
+	 * @return bool true if corresponding page is countable
+	 * @since 3.0.0
+	 */
+	public function HasCount()
+	{
+		return false;
+	}
+
+	/**
+	 * Get the number of entries of the page corresponding to this menu item.
+	 *
+	 * @return int the number of entries
+	 * @since 3.0.0
+	 */
+	public function GetEntriesCount()
+	{
+		return 0;
+	}
+
 	/**
 	 * @return string
-	 * @throws DictExceptionMissingString
 	 */
 	public function GetLabel()
 	{
 		$sRet = Dict::S("Menu:$this->sMenuId+", "");
-		if ($sRet === '')
-		{
-			if ($this->iParentIndex != -1)
-			{
+		if ($sRet === '') {
+			if ($this->iParentIndex != -1) {
 				$oParentMenu = ApplicationMenu::GetMenuNode($this->iParentIndex);
 				$sRet = $oParentMenu->GetTitle().' / '.$this->GetTitle();
-			}
-			else
-			{
+			} else {
 				$sRet = $this->GetTitle();
 			}
 			//$sRet = $this->GetTitle();
@@ -600,7 +759,10 @@ abstract class MenuNode
 	{
 		return $this->index;
 	}
-	
+
+	/**
+	 * @return void
+	 */
 	public function PopulateChildMenus()
 	{
 		foreach (ApplicationMenu::GetChildren($this->GetIndex()) as $aMenu)
@@ -725,18 +887,64 @@ abstract class MenuNode
  */
 class MenuGroup extends MenuNode
 {
+	/** @var string DEFAULT_DECORATION_CLASSES Set to null by default so it is replaced by initials when none is specified */
+	const DEFAULT_DECORATION_CLASSES = null;
+
+	/** @var string The CSS classes used to display the menu group's icon */
+	protected $sDecorationClasses = self::DEFAULT_DECORATION_CLASSES;
+
 	/**
 	 * Create a top-level menu group and inserts it into the application's main menu
+	 *
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
 	 * @param float $fRank Number used to order the list, the groups are sorted based on this value
+	 * @param string|null $sDecorationClasses CSS classes used to display the menu group's icon
 	 * @param string $sEnableClass Name of class of object
 	 * @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
 	 */
-	public function __construct($sMenuId, $fRank, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	public function __construct($sMenuId, $fRank, $sDecorationClasses = null, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, -1 /* no parent, groups are at root level */, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+
+		if(!empty($sDecorationClasses))
+		{
+			$this->sDecorationClasses = $sDecorationClasses;
+		}
+	}
+
+	/**
+	 * Return true if the menu group has some decoration classes
+	 *
+	 * @return bool
+	 * @since 3.0.0
+	 */
+	public function HasDecorationClasses()
+	{
+		return (empty($this->GetDecorationClasses()) === false);
+	}
+
+	/**
+	 * Return the CSS classes used for decorating the menu group (typically the icon in the navigation menu)
+	 *
+	 * @return string
+	 * @since 3.0.0
+	 */
+	public function GetDecorationClasses()
+	{
+		return $this->sDecorationClasses;
+	}
+
+	/**
+	 * Returns the initials of the menu group, used by the rendering in case there is no decoration classes
+	 *
+	 * @return string
+	 * @since 3.0.0
+	 */
+	public function GetInitials()
+	{
+		return mb_substr($this->GetTitle(), 0, 1);
 	}
 
 	/**
@@ -913,30 +1121,51 @@ class OQLMenuNode extends MenuNode
 	{
 		$sUsageId = utils::GetSafeId($sUsageId);
 		$oSearch = DBObjectSearch::FromOQL($sOql);
-		$sIcon = MetaModel::GetClassIcon($oSearch->GetClass());
+		//$sIcon = MetaModel::GetClassIcon($oSearch->GetClass(), false);
 
-		if ($bSearchPane)
-		{
+		if ($bSearchPane) {
 			$aParams = array_merge(array('open' => $bSearchOpen, 'table_id' => $sUsageId), $aExtraParams);
 			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
 		}
-		
-		$oPage->add("<p class=\"page-header\">$sIcon ".utils::HtmlEntities(Dict::S($sTitle))."</p>");
-		
+
+		//$oPage->add("<p class=\"page-header\">$sIcon ".utils::HtmlEntities(Dict::S($sTitle))."</p>");
+		$oPage->add("<div class='sf_results_area'>");
+		$oTitle = TitleFactory::MakeForPage($sTitle);
+		$oPage->AddUiBlock($oTitle);
+
 		$aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
 		$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
 		$oBlock->Display($oPage, $sUsageId);
 
-		if ($bEnableBreadcrumb && ($oPage instanceof iTopWebPage))
-		{
+		$oPage->add("</div>");
+		
+		if ($bEnableBreadcrumb && ($oPage instanceof iTopWebPage)) {
 			// Breadcrumb
 			//$iCount = $oBlock->GetDisplayedCount();
 			$sPageId = "ui-search-".$oSearch->GetClass();
 			$sLabel = MetaModel::GetName($oSearch->GetClass());
-			$oPage->SetBreadCrumbEntry($sPageId, $sLabel, $sTitle, '', '../images/breadcrumb-search.png');
+			$oPage->SetBreadCrumbEntry($sPageId, $sLabel, $sTitle, '', 'fas fa-list', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
 		}
 	}
+
+	public function HasCount()
+	{
+		return true;
+	}
+
+	public function GetEntriesCount()
+	{
+		// Count the entries up to 99
+
+		$oSet = new DBObjectSet(DBSearch::FromOQL($this->sOQL));
+		$iCount = $oSet->CountWithLimit(99);
+		if ($iCount > 99) {
+			$iCount = "99+";
+		}
+
+		return $iCount;
+	}
 }
 
 /**
@@ -981,7 +1210,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(), '', '', 'fas fa-search', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
 
 		$oSearch = new DBObjectSearch($this->sClass);
 		$aParams = array_merge(array('table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);
@@ -1191,7 +1420,7 @@ class DashboardMenuNode extends MenuNode
 		if ($oDashboard != null)
 		{
 			$sDivId = utils::Sanitize($this->sMenuId, '', 'element_identifier');
-			$oPage->add('<div class="dashboard_contents" id="'.$sDivId.'">');
+			$oPage->add('<div class="ibo-dashboard" id="'.$sDivId.'">');
 			$aExtraParams['dashboard_div_id'] = $sDivId;
 			$oDashboard->SetReloadURL($this->GetHyperlink($aExtraParams));
 			$oDashboard->Render($oPage, false, $aExtraParams);
@@ -1218,13 +1447,13 @@ class DashboardMenuNode extends MenuNode
 				}
 				if ($this->sMenuId == ApplicationMenu::GetDefaultMenuId())
 				{
-					$sIcon = '../images/breadcrumb_home.png';
+					$sIcon = 'fas fa-home';
 				}
 				else
 				{
-					$sIcon = '../images/breadcrumb-dashboard.png';
+					$sIcon = 'fas fa-chart-pie';
 				}
-				$oPage->SetBreadCrumbEntry("ui-dashboard-".$this->sMenuId, $this->GetTitle(), $sDescription, '', $sIcon);
+				$oPage->SetBreadCrumbEntry("ui-dashboard-".$this->sMenuId, $this->GetTitle(), $sDescription, '', $sIcon, iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
 			}
 		}
 		else

application/nicewebpage.class.inc.php

@@ -1,262 +1,7 @@
 <?php
 /**
- * Copyright (C) 2013-2020 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
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/NiceWebPage.php
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-/**
- * Web page with some associated CSS and scripts (jquery) for a fancier display
- */
-class NiceWebPage extends WebPage
-{
-	var $m_aReadyScripts;
-	var $m_sRootUrl;
-	
-    public function __construct($s_title, $bPrintable = false)
-    {
-        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/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');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/searchformforeignkeys.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/latinise/latinise.min.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler_history.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
-	    $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');
-
-	    $this->add_ready_script(
-<<< EOF
-	//add new widget called TruncatedList to properly display truncated lists when they are sorted
-	$.tablesorter.addWidget({ 
-		// give the widget a id 
-		id: "truncatedList", 
-		// format is called when the on init and when a sorting has finished 
-		format: function(table)
-		{ 
-			// Check if there is a "truncated" line
-			this.truncatedList = false;  
-			if ($("tr td.truncated",table).length > 0)
-			{
-				this.truncatedList = true;
-			}
-			if (this.truncatedList)
-			{
-				$("tr td",table).removeClass('truncated');
-				$("tr:last td",table).addClass('truncated');
-			}
-		} 
-	});
-	
-	$.tablesorter.addWidget({ 
-		// give the widget a id 
-		id: "myZebra", 
-		// format is called when the on init and when a sorting has finished 
-		format: function(table)
-		{
-			// Replace the 'red even' lines by 'red_even' since most browser do not support 2 classes selector in CSS, etc..
-			$("tbody tr:even",table).addClass('even');
-			$("tbody tr.red:even",table).removeClass('red').removeClass('even').addClass('red_even');
-			$("tbody tr.orange:even",table).removeClass('orange').removeClass('even').addClass('orange_even');
-			$("tbody tr.green:even",table).removeClass('green').removeClass('even').addClass('green_even');
-			// In case we sort again the table, we need to remove the added 'even' classes on odd rows
-			$("tbody tr:odd",table).removeClass('even');
-			$("tbody tr.red_even:odd",table).removeClass('even').removeClass('red_even').addClass('red');
-			$("tbody tr.orange_even:odd",table).removeClass('even').removeClass('orange_even').addClass('orange');
-			$("tbody tr.green_even:odd",table).removeClass('even').removeClass('green_even').addClass('green');
-		} 
-	});
-	$("table.listResults").tableHover(); // hover tables
-EOF
-		);
-	    $this->LoadTheme();
-
-		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
-     	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
-    	$sAbsURLModulesRoot = addslashes($this->GetAbsoluteUrlModulesRoot());
-    	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
-
-		$sAppContext = addslashes($this->GetApplicationContext());
-
-		$this->add_script(
-<<<EOF
-function GetAbsoluteUrlAppRoot()
-{
-	return '$sAbsURLAppRoot';
-}
-
-function GetAbsoluteUrlModulesRoot()
-{
-	return '$sAbsURLModulesRoot';
-}
-
-function GetAbsoluteUrlModulePage(sModule, sPage, aArguments)
-{
-	// aArguments is optional, it default to an empty hash
-	aArguments = typeof aArguments !== 'undefined' ? aArguments : {};
-
-	var sUrl = '$sAbsURLAppRoot'+'pages/exec.php?exec_module='+sModule+'&exec_page='+sPage+'&exec_env='+'$sEnvironment';
-	for (var sArgName in aArguments)
-	{
-		if (aArguments.hasOwnProperty(sArgName))
-		{
-			sUrl = sUrl + '&'+sArgName+'='+aArguments[sArgname];
-		}
-	}
-	return sUrl;
-}
-
-function AddAppContext(sURL)
-{
-	var sContext = '$sAppContext';
-	if (sContext.length > 0)
-	{
-		if (sURL.indexOf('?') == -1)
-		{
-			return sURL+'?'+sContext;
-		}				
-		return sURL+'&'+sContext;
-	}
-	return sURL;
-}
-EOF
-		);
-	}
-	
-    public function SetRootUrl($sRootUrl)
-    {
-    	$this->m_sRootUrl = $sRootUrl;
-    }
-    
-	public function small_p($sText)
-	{
-		$this->add("<p style=\"font-size:smaller\">$sText</p>\n");
-	}
-
-	public function GetAbsoluteUrlAppRoot()
-	{
-		return utils::GetAbsoluteUrlAppRoot();
-	}
-
-	public function GetAbsoluteUrlModulesRoot()
-	{
-		return utils::GetAbsoluteUrlModulesRoot();
-	}
-
-	function GetApplicationContext()
-	{
-		$oAppContext = new ApplicationContext();
-		return $oAppContext->GetForLink();
-	}
-
-	// By Rom, used by CSVImport and Advanced search
-	public function MakeClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
-	{
-		// $aTopLevelClasses = array('bizService', 'bizContact', 'logInfra', 'bizDocument');
-		// These are classes wich root class is cmdbAbstractObject ! 
-		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
-		$aValidClasses = array();
-		foreach(MetaModel::GetClasses('bizmodel') as $sClassName)
-		{
-			if (is_null($iActionCode) || UserRights::IsActionAllowed($sClassName, $iActionCode))
-			{
-				$sSelected = ($sClassName == $sDefaultValue) ? " SELECTED" : "";
-				$sDescription = MetaModel::GetClassDescription($sClassName);
-				$sDisplayName = MetaModel::GetName($sClassName);
-				$aValidClasses[$sDisplayName] = "<option style=\"width: ".$iWidthPx." px;\" title=\"$sDescription\" value=\"$sClassName\"$sSelected>$sDisplayName</option>";
-			}
-		}
-		ksort($aValidClasses);
-		$this->add(implode("\n", $aValidClasses));
-		
-		$this->add("</select>");
-	}
-
-	// By Rom, used by Advanced search
-	public function add_select($aChoices, $sName, $sDefaultValue, $iWidthPx)
-	{
-		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
-		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("</select>");
-	}
-	
-	public function add_ready_script($sScript)
-	{
-		$this->m_aReadyScripts[] = $sScript;
-	}
-	
-		/**
-	 * Outputs (via some echo) the complete HTML page by assembling all its elements
-	 */
-    public function output()
-    {
-		//$this->set_base($this->m_sRootUrl.'pages/');
-        if (count($this->m_aReadyScripts)>0)
-        {
-			$this->add_script("\$(document).ready(function() {\n".implode("\n", $this->m_aReadyScripts)."\n});");
-		}
-		parent::output();
-	}
-
-	/**
-	 * @throws \Exception
-	 * @since 2.7.0
-	 */
-	protected function LoadTheme()
-	{
-		$sCssThemeUrl = ThemeHandler::GetCurrentThemeUrl();
-		$this->add_linked_stylesheet($sCssThemeUrl);
-	}
-}
+ 

application/pdfpage.class.inc.php

@@ -1,248 +1,7 @@
 <?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
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/PDFPage.php
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-require_once(APPROOT.'application/utils.inc.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.0
-	 */
-	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;
-	}
-
-	/**
-	 * Builds the custom header. Called for each new page.
-	 *
-	 * @see TCPDF::Header()
-	 */
-	public function Header()
-	{
-		// Title
-		// Set font
-		$this->SetFontParams('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);
-
-		// 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 */);
-
-		// Branding logo
-		$sBrandingIcon = APPROOT.'images/itop-logo.png';
-		if (file_exists(MODULESROOT.'branding/main-logo.png'))
-		{
-			$sBrandingIcon = MODULESROOT.'branding/main-logo.png';
-		}
-		$this->Image($sBrandingIcon, $aMargins['left'], 5, 0, 10);
-	}
-
-	// Page footer
-	public function Footer()
-	{
-		// 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;
-	}
-}
-
-/**
- * Special class of WebPage for printing into a PDF document
- */
-class PDFPage extends WebPage
-{
-	/** @var \iTopPDF Instance of the TCPDF object for creating the PDF */
-	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);
-
-		// 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);
-
-		// 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);
-
-		// 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
-table {
-	padding: 2pt;
-}
-table.listResults td {
-	border: 0.5pt solid #000 ;
-}
-table.listResults th {
-	background-color: #eee;
-	border: 0.5pt solid #000 ;
-}
-a {
-	text-decoration: none;
-	color: #000;
-}
-table.section td {
-	vertical-align: middle;
-	font-size: 10pt;
-	background-color:#eee;
-}
-td.icon {
-	width: 30px;
-}
-EOF
-		);
-	}
-
-	/**
-	 * Get access to the underlying TCPDF object
-	 *
-	 * @return \iTopPDF
-	 */
-	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
-	 * - to process the HTML by smaller chunks instead of processing the whole page at once for performance reasons
-	 */
-	public function flush()
-	{
-		if (strlen($this->s_content) > 0)
-		{
-			$sHtml = '';
-			if (count($this->a_styles) > 0)
-			{
-				$sHtml .= "<style>\n".implode("\n", $this->a_styles)."\n</style>\n";
-			}
-			$sHtml .= $this->s_content;
-			$this->oPdf->writeHTML($sHtml); // The style(s) must be supplied each time we call writeHtml
-			$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))
-		{
-			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
-		}
-		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

@@ -40,7 +40,6 @@ abstract class Query extends cmdbAbstractObject
 			"db_table" => "priv_query",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -72,7 +71,6 @@ class QueryOQL extends Query
 			"db_table" => "priv_query_oql",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();

application/shortcut.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\UI\Component\DataTable\DataTableSettings;
 
 
 /**
@@ -39,7 +40,6 @@ abstract class Shortcut extends DBObject implements iDisplay
 			"db_table" => "priv_shortcut",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -161,7 +161,6 @@ class ShortcutOQL extends Shortcut
 			"db_table" => "priv_shortcut_oql",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();

application/startup.inc.php

@@ -35,25 +35,29 @@ register_shutdown_function(function()
 	$sReservedMemory = null;
 	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
 	{
-		// Remove stack trace from MySQLException (since 2.7.2 see N°3174)
+		// Remove stack trace from MySQLException
 		$sMessage = $err['message'];
-		if (strpos($sMessage, 'MySQLException') !== false) {
+		if (strpos($sMessage, 'MySQLException') !== false)
+		{
 			$iStackTracePos = strpos($sMessage, 'Stack trace:');
-			if ($iStackTracePos !== false) {
+			if ($iStackTracePos !== false)
+			{
 				$sMessage = substr($sMessage, 0, $iStackTracePos);
 			}
 		}
-		// Log additional info but message from $err (since 2.7.6 N°4174)
-		$aErrToLog = $err;
-		unset($aErrToLog['message']);
-		IssueLog::error($sMessage, null, $aErrToLog);
-		if (strpos($err['message'], 'Allowed memory size of') !== false) {
+		IssueLog::error($sMessage);
+		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) {
+		}
+		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 {
+		}
+		else
+		{
 			echo "<p>iTop: An error occurred, check server error log for more information.</p>\n";
 		}
 	}
@@ -91,10 +95,4 @@ else
 	$_SESSION['itop_env'] = ITOP_DEFAULT_ENV;
 }
 $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
-try {
-    MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);
-}
-catch (MySQLException $e) {
-    IssueLog::Debug($e->getMessage());
-    throw new MySQLException('Could not connect to the DB server', []);
-}
+MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);

application/template.class.inc.php

@@ -20,6 +20,8 @@
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 /**
  * This class manages the special template format used internally to build the iTop web pages
+ *
+ * @deprecated Since 3.0.0
  */
 class DisplayTemplate
 {

application/themehandler.class.inc.php

@@ -25,6 +25,15 @@
  */
 class ThemeHandler
 {
+	const IMAGE_EXTENSIONS = ['png', 'gif', 'jpg', 'jpeg'];
+
+	private static $oCompileCSSService;
+
+	public static function GetAppRootWithSlashes()
+	{
+		return str_replace('\\', '/', APPROOT);
+	}
+
 	/**
 	 * Return default theme name and parameters
 	 *
@@ -33,19 +42,19 @@ class ThemeHandler
 	 */
 	public static function GetDefaultThemeInformation()
 	{
-		return array(
+		return [
 			'name' => 'light-grey',
-			'parameters' => array(
-				'variables' => array(),
-				'imports' => array(
+			'parameters' => [
+				'variables' => [],
+				'imports' => [
 					'css-variables' => '../css/css-variables.scss',
-				),
-				'stylesheets' => array(
+				],
+				'stylesheets' => [
 					'jqueryui' => '../css/ui-lightness/jqueryui.scss',
 					'main' => '../css/light-grey.scss',
-				),
-			),
-		);
+				],
+			],
+		];
 	}
 
 	/**
@@ -112,37 +121,49 @@ class ThemeHandler
 				SetupUtils::builddir($sDefaultThemeDirPath);
 			}
 			
-			static::CompileTheme($sThemeId, $aDefaultTheme['parameters']);
+			static::CompileTheme($sThemeId, false, "", $aDefaultTheme['parameters']);
 		}
 
 		// Return absolute url to theme compiled css
-		return utils::GetAbsoluteUrlModulesRoot().'/branding/themes/'.$sThemeId.'/main.css';
+		return utils::GetAbsoluteUrlModulesRoot().'branding/themes/'.$sThemeId.'/main.css';
 	}
 
 	/**
-	 * Compile the $sThemeId theme
+	 * Compile the $sThemeId theme, the actual compilation is skipped when either
+	 * 1) The produced CSS file exists and is more recent than any of its components (imports, stylesheets)
+	 * 2) The produced CSS file exists and its signature is equal to the expected signature (imports, stylesheets, variables)
 	 *
 	 * @param string $sThemeId
+	 * @param boolean $bSetup
+	 * @param string $sSetupCompilationTimestamp : setup compilation timestamp in micro secunds
 	 * @param array|null $aThemeParameters Parameters (variables, imports, stylesheets) for the theme, if not passed, will be retrieved from compiled DM
 	 * @param array|null $aImportsPaths Paths where imports can be found. Must end with '/'
 	 * @param string|null $sWorkingPath Path of the folder used during compilation. Must end with a '/'
 	 *
 	 * @throws \CoreException
+	 * @return boolean: indicate whether theme compilation occured
 	 */
-	public static function CompileTheme($sThemeId, $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null)
+	public static function CompileTheme($sThemeId, $bSetup=false, $sSetupCompilationTimestamp="", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null)
 	{
+		if ($sSetupCompilationTimestamp==="")
+		{
+			$sSetupCompilationTimestamp = microtime(true);
+		}
+
+		$sSetupCompilationTimestampInSecunds = (strpos($sSetupCompilationTimestamp, '.') !==false) ? explode('.', $sSetupCompilationTimestamp)[0] : $sSetupCompilationTimestamp;
+
+		$sEnv = APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
+
 		// Default working path
 		if($sWorkingPath === null)
 		{
-			$sWorkingPath = APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
+			$sWorkingPath = $sEnv;
 		}
 
 		// Default import paths (env-*)
 		if($aImportsPaths === null)
 		{
-			$aImportsPaths = array(
-				APPROOT.'env-'.utils::GetCurrentEnvironment().'/',
-			);
+			$aImportsPaths = [ $sEnv];
 		}
 
 		// Note: We do NOT check that the folder exists!
@@ -152,6 +173,11 @@ class ThemeHandler
 		// Save parameters if passed... (typically during DM compilation)
 		if(is_array($aThemeParameters))
 		{
+			if (!is_dir($sThemeFolderPath))
+			{
+				mkdir($sWorkingPath.'/branding/');
+				mkdir($sWorkingPath.'/branding/themes/');
+			}
 			file_put_contents($sThemeFolderPath.'/theme-parameters.json', json_encode($aThemeParameters));
 		}
 		// ... Otherwise, retrieve them from compiled DM (typically when switching current theme in the config. file)
@@ -164,31 +190,588 @@ class ThemeHandler
 			}
 		}
 
+		$aThemeParametersWithVersion = self::CloneThemeParameterAndIncludeVersion($aThemeParameters, $sSetupCompilationTimestampInSecunds);
+
 		$sTmpThemeScssContent = '';
 		$iStyleLastModified = 0;
 		clearstatcache();
 		// Loading files to import and stylesheet to compile, also getting most recent modification time on overall files
+
+		$aStylesheetFiles = [];
 		foreach ($aThemeParameters['imports'] as $sImport)
 		{
 			$sTmpThemeScssContent .= '@import "'.$sImport.'";'."\n";
 
-			$iImportLastModified = @filemtime($sWorkingPath.$sImport);
+			$sFile = static::FindStylesheetFile($sImport, $aImportsPaths);
+			$iImportLastModified = @filemtime($sFile);
+			$aStylesheetFiles[] = $sFile;
 			$iStyleLastModified = $iStyleLastModified < $iImportLastModified ? $iImportLastModified : $iStyleLastModified;
 		}
 		foreach ($aThemeParameters['stylesheets'] as $sStylesheet)
 		{
 			$sTmpThemeScssContent .= '@import "'.$sStylesheet.'";'."\n";
 
-			$iStylesheetLastModified = @filemtime($sWorkingPath.$sStylesheet);
+			$sFile = static::FindStylesheetFile($sStylesheet, $aImportsPaths);
+			$iStylesheetLastModified = @filemtime($sFile);
+			$aStylesheetFiles[] = $sFile;
 			$iStyleLastModified = $iStyleLastModified < $iStylesheetLastModified ? $iStylesheetLastModified : $iStyleLastModified;
 		}
 
-		// Checking if our compiled css is outdated
-		if (!file_exists($sThemeCssPath) || (is_writable($sThemeFolderPath) && (@filemtime($sThemeCssPath) < $iStyleLastModified)))
+		$aIncludedImages=static::GetIncludedImages($aThemeParametersWithVersion, $aStylesheetFiles, $sThemeId);
+		foreach ($aIncludedImages as $sImage)
 		{
-			$sTmpThemeCssContent = utils::CompileCSSFromSASS($sTmpThemeScssContent, $aImportsPaths, $aThemeParameters['variables']);
-			file_put_contents($sThemeCssPath, $sTmpThemeCssContent);
+			if (is_file($sImage))
+			{
+				$iStylesheetLastModified = @filemtime($sImage);
+				$iStyleLastModified = $iStyleLastModified < $iStylesheetLastModified ? $iStylesheetLastModified : $iStyleLastModified;
+			}
 		}
+
+		// Checking if our compiled css is outdated
+		$iFilemetime = @filemtime($sThemeCssPath);
+		$bFileExists = file_exists($sThemeCssPath);
+		$bVarSignatureChanged=false;
+		if ($bFileExists && $bSetup)
+		{
+			$sPrecompiledSignature = static::GetSignature($sThemeCssPath);
+			//check variable signature has changed which is independant from any file modification
+			if (!empty($sPrecompiledSignature)){
+				$sPreviousVariableSignature = static::GetVarSignature($sPrecompiledSignature);
+				$sCurrentVariableSignature = md5(json_encode($aThemeParameters['variables']));
+				$bVarSignatureChanged= ($sPreviousVariableSignature!==$sCurrentVariableSignature);
+			}
+		}
+
+		if (!$bFileExists || $bVarSignatureChanged || (is_writable($sThemeFolderPath) && ($iFilemetime < $iStyleLastModified)))
+		{
+			// Dates don't match. Second chance: check if the already compiled stylesheet exists and is consistent based on its signature
+			$sActualSignature = static::ComputeSignature($aThemeParameters, $aImportsPaths, $aIncludedImages);
+
+			if ($bFileExists && !$bSetup)
+			{
+				$sPrecompiledSignature = static::GetSignature($sThemeCssPath);
+			}
+
+			if (!empty($sPrecompiledSignature) && $sActualSignature == $sPrecompiledSignature)
+			{
+				touch($sThemeCssPath); // Stylesheet is up to date, mark it as more recent to speedup next time
+			}
+			else
+			{
+				// Alas, we really need to recompile
+				// Add the signature to the generated CSS file so that the file can be used as a precompiled stylesheet if needed
+				$sSignatureComment =
+					<<<CSS
+/*
+=== SIGNATURE BEGIN ===
+$sActualSignature
+=== SIGNATURE END ===
+*/
+
+CSS;
+				if (!static::$oCompileCSSService)
+				{
+					static::$oCompileCSSService = new CompileCSSService();
+				}
+				//store it again to change $version with latest compiled time
+				$sTmpThemeCssContent = static::$oCompileCSSService->CompileCSSFromSASS($sTmpThemeScssContent, $aImportsPaths,
+					$aThemeParametersWithVersion);
+				file_put_contents($sThemeFolderPath.'/theme-parameters.json', json_encode($aThemeParameters));
+				file_put_contents($sThemeCssPath, $sSignatureComment.$sTmpThemeCssContent);
+				SetupLog::Info("Theme $sThemeId file compiled.");
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Compute the signature of a theme defined by its theme parameters. The signature is a JSON structure of
+	 * 1) one MD5 of all the variables/values (JSON encoded)
+	 * 2) the MD5 of each stylesheet file
+	 * 3) the MD5 of each import file
+	 * 3) the MD5 of each images referenced in style sheets
+	 *
+	 * @param string[] $aThemeParameters
+	 * @param string[] $aImportsPaths
+	 * @param string[] $aIncludedImages
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	public static function ComputeSignature($aThemeParameters, $aImportsPaths, $aIncludedImages)
+	{
+		$aSignature = [
+			'variables' => md5(json_encode($aThemeParameters['variables'])),
+			'stylesheets' => [],
+			'imports' => [],
+			'images' => []
+		];
+
+		foreach ($aThemeParameters['imports'] as $key => $sImport)
+		{
+			$sFile = static::FindStylesheetFile($sImport, $aImportsPaths);
+			$aSignature['stylesheets'][$key] = md5_file($sFile);
+		}
+		foreach ($aThemeParameters['stylesheets'] as $key => $sStylesheet)
+		{
+			$sFile = static::FindStylesheetFile($sStylesheet, $aImportsPaths);
+			$aSignature['stylesheets'][$key] = md5_file($sFile);
+		}
+		foreach ($aIncludedImages as $sImage)
+		{
+			if (is_file($sImage)) {
+				$sUri = str_replace(self::GetAppRootWithSlashes(), '', $sImage);
+				$aSignature['images'][$sUri] = md5_file($sImage);
+			}
+		}
+
+		return json_encode($aSignature);
+	}
+
+	/**
+	 * Search for images referenced in stylesheet files
+	 *
+	 * @param array $aThemeParametersVariables
+	 * @param array $aStylesheetFiles
+	 * @param string $sThemeId : used only for logging purpose
+	 *
+	 * @return array complete path of the images, but with slashes as dir separator instead of DIRECTORY_SEPARATOR
+	 * @since 3.0.0
+	 */
+	public static function GetIncludedImages($aThemeParametersVariables, $aStylesheetFiles, $sThemeId)
+	{
+		$sTargetThemeFolderPath = static::GetCompiledThemeFolderAbsolutePath($sThemeId);
+
+		$aCompleteUrls = [];
+		$aToCompleteUrls = [];
+		$aMissingVariables = [];
+		$aFoundVariables = ['version'=>''];
+		$aMap = [
+			'aCompleteUrls' => $aCompleteUrls,
+			'aToCompleteUrls' => $aToCompleteUrls,
+			'aMissingVariables' => $aMissingVariables,
+			'aFoundVariables' => $aFoundVariables,
+		];
+
+		foreach ($aStylesheetFiles as $sStylesheetFile)
+		{
+			$aRes = static::GetAllUrlFromScss($aThemeParametersVariables, $sStylesheetFile);
+			/** @var array $aVal */
+			foreach($aMap as $key => $aVal)
+			{
+				if (array_key_exists($key, $aMap))
+				{
+					$aMap[$key] = array_merge($aVal, $aRes[$key]);
+				}
+			}
+		}
+
+		$aMap = static::ResolveUncompleteUrlsFromScss($aMap, $aThemeParametersVariables, $aStylesheetFiles);
+		$aImages = [];
+
+		foreach ($aMap ['aCompleteUrls'] as $sUri => $sUrl)
+		{
+			$sImg = $sUrl;
+			if (preg_match("/(.*)\?/", $sUrl, $aMatches))
+			{
+				$sImg=$aMatches[1];
+			}
+
+			if (static::HasImageExtension($sImg)
+				&& ! array_key_exists($sImg, $aImages))
+			{
+				$sFilePath = realpath($sImg);
+				if ($sFilePath !== false) {
+					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
+					$aImages[$sImg] = $sFilePathWithSlashes;
+					continue;
+				}
+
+				$sCanonicalPath = static::CanonicalizePath($sTargetThemeFolderPath.'/'.$sImg);
+				$sFilePath = realpath($sCanonicalPath);
+				if ($sFilePath !== false) {
+					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
+					$aImages[$sImg] = $sFilePathWithSlashes;
+					continue;
+				}
+
+				SetupLog::Warning("Cannot find $sCanonicalPath ($sImg) during SCSS $sThemeId precompilation");
+			}
+		}
+
+		return array_values($aImages);
+	}
+
+	/**
+	 * Reduce path without using realpath (works only when file exists)
+	 * @param $path
+	 *
+	 * @return string
+	 */
+	public static function CanonicalizePath($path)
+	{
+		$path = explode('/', str_replace('//','/', $path));
+		$stack = array();
+		foreach ($path as $seg) {
+			if ($seg == '..') {
+				// Ignore this segment, remove last segment from stack
+				array_pop($stack);
+				continue;
+			}
+
+			if ($seg == '.') {
+				// Ignore this segment
+				continue;
+			}
+
+			$stack[] = $seg;
+		}
+
+		return implode('/', $stack);
+	}
+
+	/**
+	 * Complete url using provided variables. Example with $var=1: XX + $var => XX1
+	 * @param $aMap
+	 * @param $aThemeParametersVariables
+	 * @param $aStylesheetFile
+	 *
+	 * @return mixed
+	 */
+	public static function ResolveUncompleteUrlsFromScss($aMap, $aThemeParametersVariables, $aStylesheetFile)
+	{
+		$sContent="";
+		foreach ($aStylesheetFile as $sStylesheetFile)
+		{
+			if (is_file($sStylesheetFile))
+			{
+				$sContent .= '\n' . file_get_contents($sStylesheetFile);
+			}
+		}
+
+		$aMissingVariables=$aMap['aMissingVariables'];
+		$aFoundVariables=$aMap['aFoundVariables'];
+		$aToCompleteUrls=$aMap['aToCompleteUrls'];
+		$aCompleteUrls=$aMap['aCompleteUrls'];
+		list($aMissingVariables, $aFoundVariables) = static::FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent, true);
+		list($aToCompleteUrls, $aCompleteUrls) = static::ResolveUrls($aFoundVariables, $aToCompleteUrls, $aCompleteUrls);
+		$aMap['aMissingVariables']=$aMissingVariables;
+		$aMap['aFoundVariables']=$aFoundVariables;
+		$aMap['aToCompleteUrls']=$aToCompleteUrls;
+		$aMap['aCompleteUrls']=$aCompleteUrls;
+		return $aMap;
+	}
+
+	/**
+	 * Find missing variable values from SCSS content based on their name.
+	 *
+	 * @param $aThemeParametersVariables
+	 * @param $aMissingVariables
+	 * @param $aFoundVariables
+	 * @param $sContent : scss content
+	 * @param bool $bForceEmptyValueWhenNotFound
+	 *
+	 * @return array
+	 */
+	public static function FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent, $bForceEmptyValueWhenNotFound=false)
+	{
+		$aNewMissingVars = [];
+		if (!empty($aMissingVariables))
+		{
+			foreach ($aMissingVariables as $var)
+			{
+				if (array_key_exists($var, $aThemeParametersVariables))
+				{
+					$aFoundVariables[$var] = $aThemeParametersVariables[$var];
+				}
+				else
+				{
+					if (preg_match_all("/\\\$$var\s*:\s*[\"']{0,1}(.*)[\"']{0,1};/", $sContent, $aValues))
+					{
+						$sValue = $aValues[1][0];
+						if (preg_match_all("/([^!]+)!/", $sValue, $aSubValues))
+						{
+							$sValue = trim($aSubValues[1][0], ' "\'');
+						}
+
+						if (strpos($sValue, '$') === false)
+						{
+							$aFoundVariables[$var] = $sValue;
+						}
+						else{
+							$aNewMissingVars[] = $var;
+						}
+					}
+					else
+					{
+						if ($bForceEmptyValueWhenNotFound)
+						{
+							$aFoundVariables[$var] = '';
+						}
+						else
+						{
+							$aNewMissingVars[] = $var;
+						}
+					}
+				}
+			}
+		}
+
+		return [ $aNewMissingVars, $aFoundVariables ];
+	}
+
+	/**
+	 * @param $aFoundVariables
+	 * @param array $aToCompleteUrls
+	 * @param array $aCompleteUrls
+	 *
+	 * @return array
+	 */
+	public static function ResolveUrls($aFoundVariables, array $aToCompleteUrls, array $aCompleteUrls)
+	{
+		if (!empty($aFoundVariables))
+		{
+			$aFoundVariablesWithEmptyValue = [];
+			foreach ($aFoundVariables as $aFoundVariable => $sValue)
+			{
+				$aFoundVariablesWithEmptyValue[$aFoundVariable] = '';
+			}
+
+			foreach ($aToCompleteUrls as $sUrlTemplate)
+			{
+				unset($aToCompleteUrls[$sUrlTemplate]);
+				$sResolvedUrl = static::ResolveUrl($sUrlTemplate, $aFoundVariables);
+				if ($sResolvedUrl == false)
+				{
+					$aToCompleteUrls[$sUrlTemplate] = $sUrlTemplate;
+				}
+				else
+				{
+					$sUri = static::ResolveUrl($sUrlTemplate, $aFoundVariablesWithEmptyValue);
+					$aExplodedUri = explode('?', $sUri);
+					if (empty($aExplodedUri))
+					{
+						$aCompleteUrls[$sUri] = $sResolvedUrl;
+					}
+					else
+					{
+						$aCompleteUrls[$aExplodedUri[0]] = $sResolvedUrl;
+					}
+				}
+			}
+		}
+
+		return [ $aToCompleteUrls, $aCompleteUrls];
+	}
+
+	/**
+	 * Find all referenced URLs from a SCSS file.
+	 * @param $aThemeParametersVariables
+	 * @param $sStylesheetFile
+	 *
+	 * @return array
+	 */
+	public static function GetAllUrlFromScss($aThemeParametersVariables, $sStylesheetFile)
+	{
+		$aCompleteUrls = [];
+		$aToCompleteUrls = [];
+		$aMissingVariables = [];
+		$aFoundVariables = [];
+
+		if (is_file($sStylesheetFile))
+		{
+			$sContent = file_get_contents($sStylesheetFile);
+			if (preg_match_all("/url\s*\((.*)\)/", $sContent, $aMatches))
+			{
+				foreach ($aMatches[1] as $path)
+				{
+					if (!array_key_exists($path, $aCompleteUrls)
+						&& !array_key_exists($path, $aToCompleteUrls))
+					{
+						if (preg_match_all("/\\$([\w\-_]+)/", $path, $aCurrentVars))
+						{
+							/** @var string $aCurrentVars */
+							foreach ($aCurrentVars[1] as $var)
+							{
+								if (!array_key_exists($var, $aMissingVariables))
+								{
+									$aMissingVariables[$var] = $var;
+								}
+							}
+							$aToCompleteUrls[$path] = $path;
+						}
+						else
+						{
+							$aCompleteUrls[$path] = trim($path, "\"'");
+						}
+					}
+				}
+			}
+			if (!empty($aMissingVariables))
+			{
+				list($aMissingVariables, $aFoundVariables) = static::FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent);
+				list($aToCompleteUrls, $aCompleteUrls) = static::ResolveUrls($aFoundVariables, $aToCompleteUrls, $aCompleteUrls);
+			}
+		}
+
+		return  [
+			'aCompleteUrls' => $aCompleteUrls,
+			'aToCompleteUrls' => $aToCompleteUrls,
+			'aMissingVariables' => $aMissingVariables,
+			'aFoundVariables' => $aFoundVariables
+		];
+	}
+
+	/**
+	 * Calculate url based on its template + variables.
+	 * @param $sUrlTemplate
+	 * @param $aFoundVariables
+	 *
+	 * @return bool|string
+	 */
+	public static function ResolveUrl($sUrlTemplate, $aFoundVariables)
+	{
+		$aPattern= [];
+		$aReplacement= [];
+		foreach ($aFoundVariables as $aFoundVariable => $aFoundVariableValue)
+		{
+			//XX + $key + YY
+			$aPattern[]="/['\"]\s*\+\s*\\\$" . $aFoundVariable . "[\s\+]+\s*['\"]/";
+			$aReplacement[]=$aFoundVariableValue;
+			//$key + YY
+			$aPattern[]="/\\\$" . $aFoundVariable. "[\s\+]+\s*['\"]/";
+			$aReplacement[]=$aFoundVariableValue;
+			//XX + $key
+			$aPattern[]="/['\"]\s*[\+\s]+\\\$" . $aFoundVariable . "$/";
+			$aReplacement[]=$aFoundVariableValue;
+		}
+		$sResolvedUrl=preg_replace($aPattern, $aReplacement, $sUrlTemplate);
+		if (strpos($sResolvedUrl, "+")!==false)
+		{
+			return false;
+		}
+		return trim($sResolvedUrl, "\"'");
+	}
+
+	/**
+	 * indicate whether a string ends with image suffix.
+	 * @param $path
+	 *
+	 * @return bool
+	 */
+	private static function HasImageExtension($path)
+	{
+		foreach (static::IMAGE_EXTENSIONS as $sExt)
+		{
+			if (endsWith($path, $sExt))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * Extract the signature for a generated CSS file. The signature MUST be alone one line immediately
+	 * followed (on the next line) by the === SIGNATURE END === pattern
+	 *
+	 * Note the signature can be place anywhere in the CSS file (obviously inside a CSS comment !) but the
+	 * function will be faster if the signature is at the beginning of the file (since the file is scanned from the start)
+	 *
+	 * @param $sFilepath
+	 *
+	 * @return string
+	 */
+	public static function GetSignature($sFilepath)
+	{
+		$sPreviousLine = '';
+		$hFile = @fopen($sFilepath, "r");
+		if ($hFile !== false)
+		{
+			$sLine = '';
+			do
+			{
+				$sPreviousLine = $sLine;
+				$sLine = rtrim(fgets($hFile)); // Remove the trailing \n
+			}
+			while (($sLine !== false) && ($sLine != '=== SIGNATURE END ==='));
+			fclose($hFile);
+		}
+		return $sPreviousLine;
+	}
+
+	public static function GetVarSignature($JsonSignature)
+	{
+		$aJsonArray = json_decode($JsonSignature, true);
+		if (array_key_exists('variables', $aJsonArray))
+		{
+			return $aJsonArray['variables'];
+		}
+		return false;
+	}
+
+	/**
+	 * Find the given file in the list of ImportsPaths directory
+	 * @param string $sFile
+	 * @param string[] $aImportsPaths
+	 * @throws Exception
+	 * @return string
+	 */
+	public static function FindStylesheetFile($sFile, $aImportsPaths)
+	{
+		foreach($aImportsPaths as $sPath)
+		{
+			$sImportedFile = realpath($sPath.'/'.$sFile);
+			if (file_exists($sImportedFile))
+			{
+				return $sImportedFile;
+			}
+		}
+		return ''; // Not found, fail silently, maybe the SCSS compiler knowns better...
+	}
+
+	public static function MockCompileCSSService($oCompileCSSServiceMock)
+	{
+		static::$oCompileCSSService = $oCompileCSSServiceMock;
+	}
+
+	/**
+	 * Clone variable array and include $version with bSetupCompilationTimestamp value
+	 * @param $aThemeParameters
+	 * @param $bSetupCompilationTimestamp
+	 *
+	 * @return array
+	 */
+	public static function CloneThemeParameterAndIncludeVersion($aThemeParameters, $bSetupCompilationTimestamp)
+	{
+		$aThemeParametersVariable = [];
+		if (array_key_exists('variables', $aThemeParameters))
+		{
+			if (is_array($aThemeParameters['variables']))
+			{
+				$aThemeParametersVariable = array_merge([], $aThemeParameters['variables']);
+			}
+		}
+
+		$aThemeParametersVariable['$version'] = $bSetupCompilationTimestamp;
+		return $aThemeParametersVariable;
 	}
 }
 
+class CompileCSSService
+{
+	/**
+	 * CompileCSSService constructor.
+	 */
+	public function __construct()
+	{
+	}
+
+	public function CompileCSSFromSASS($sSassContent, $aImportPaths =  [], $aVariables = []){
+		return utils::CompileCSSFromSASS($sSassContent, $aImportPaths, $aVariables);
+	}
+
+}
+

application/transaction.class.inc.php

@@ -26,6 +26,8 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
+
+
 class privUITransaction
 {
 	/**
@@ -97,10 +99,9 @@ class privUITransaction
 }
 
 /**
- * The original mechanism for storing transaction information as an array in the $_SESSION variable
+ * The original (and by default) mechanism for storing transaction information
+ * as an array in the $_SESSION variable
  *
- * Warning, since 2.6.0 the session is regenerated on each login (see PR #20) !
- * Also, we saw some problems when using memcached as the PHP session implementation (see N°1835)
  */
 class privUITransactionSession
 {
@@ -193,35 +194,9 @@ class privUITransactionSession
  */
 class privUITransactionFile
 {
-	/** @var int Value to use when no user logged */
-	const UNAUTHENTICATED_USER_ID = -666;
-
 	/**
-	 * @return int current user id, or {@see self::UNAUTHENTICATED_USER_ID} if no user logged
-	 *
-	 * @since 2.6.5 2.7.6 3.0.0 N°4289 method creation
-	 */
-	private static function GetCurrentUserId()
-	{
-		$iCurrentUserId = UserRights::GetConnectedUserId();
-		if ('' === $iCurrentUserId) {
-			$iCurrentUserId = static::UNAUTHENTICATED_USER_ID;
-		}
-
-		return $iCurrentUserId;
-	}
-
-	/**
-	 * Create a new transaction id, store it in the session and return its id
-	 *
-	 * @param void
-	 *
 	 * @return int The new transaction identifier
-	 *
-	 * @throws \SecurityException
 	 * @throws \Exception
-	 *
-	 * @since 2.6.5 2.7.6 3.0.0 security hardening + throws SecurityException if no user logged
 	 */
 	public static function GetNewTransactionId()
 	{
@@ -238,36 +213,24 @@ class privUITransactionFile
 				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.');
 			}
 		}
-
 		if (!is_writable(APPROOT.'data/transactions'))
 		{
 			throw new Exception('The directory "'.APPROOT.'data/transactions" must be writable to the application.');
 		}
-
-		$iCurrentUserId = static::GetCurrentUserId();
-
 		self::CleanupOldTransactions();
+		$id = basename(tempnam(APPROOT.'data/transactions', static::GetUserPrefix()));
+		self::Info('GetNewTransactionId: Created transaction: '.$id);
 
-		$sTransactionIdFullPath = tempnam(APPROOT.'data/transactions', static::GetUserPrefix());
-		file_put_contents($sTransactionIdFullPath, $iCurrentUserId, LOCK_EX);
-
-		$sTransactionIdFileName = basename($sTransactionIdFullPath);
-		self::Info('GetNewTransactionId: Created transaction: '.$sTransactionIdFileName);
-
-		return $sTransactionIdFileName;
+		return (string)$id;
 	}
 
 	/**
 	 * Check whether a transaction is valid or not and (optionally) remove the valid transaction from
 	 * the session so that another call to IsTransactionValid for the same transaction id
 	 * will return false
-	 *
 	 * @param int $id Identifier of the transaction, as returned by GetNewTransactionId
 	 * @param bool $bRemoveTransaction True if the transaction must be removed
-	 *
 	 * @return bool True if the transaction is valid, false otherwise
-	 *
-	 * @since 2.6.5 2.7.6 3.0.0 N°4289 security hardening
 	 */
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
@@ -281,72 +244,64 @@ class privUITransactionFile
 
 		clearstatcache(true, $sFilepath);
 		$bResult = file_exists($sFilepath);
-
-		if (false === $bResult) {
-			self::Info("IsTransactionValid: Transaction '$id' not found. Pending transactions:\n".implode("\n", self::GetPendingTransactions()));
-			return false;
-		}
-
-		$iCurrentUserId = static::GetCurrentUserId();
-		$sTransactionIdUserId = file_get_contents($sFilepath);
-		if ($iCurrentUserId != $sTransactionIdUserId) {
-			self::Info("IsTransactionValid: Transaction '$id' not existing for current user. Pending transactions:\n".implode("\n", self::GetPendingTransactions()));
-			return false;
-		}
-
-		if ($bRemoveTransaction)
+		if ($bResult)
 		{
-			$bResult = @unlink($sFilepath);
-			if (!$bResult)
+			if ($bRemoveTransaction)
 			{
-				self::Error('IsTransactionValid: FAILED to remove transaction '.$id);
-			}
-			else
-			{
-				self::Info('IsTransactionValid: OK. Removed transaction: '.$id);
+				$bResult = @unlink($sFilepath);
+				if (!$bResult)
+				{
+					self::Error('IsTransactionValid: FAILED to remove transaction '.$id);
+				}
+				else
+				{
+					self::Info('IsTransactionValid: OK. Removed transaction: '.$id);
+				}
 			}
 		}
-
+		else
+		{
+			self::Info("IsTransactionValid: Transaction '$id' not found. Pending transactions for this user:\n".implode("\n", self::GetPendingTransactions()));
+		}
 		return $bResult;
 	}
 
 	/**
 	 * Removes the transaction specified by its id
 	 * @param int $id The Identifier (as returned by GetNewTransactionId) of the transaction to be removed.
-	 * @return bool true if the token can be removed
-	 *
-	 * @since 2.6.5 2.7.6 3.0.0 N°4289 security hardening
+	 * @return void
 	 */
 	public static function RemoveTransaction($id)
 	{
-		/** @noinspection PhpRedundantOptionalArgumentInspection */
-		$bResult = static::IsTransactionValid($id, true);
-		if (false === $bResult) {
-			self::Error("RemoveTransaction: Transaction '$id' is invalid. Pending transactions:\n"
-				.implode("\n", self::GetPendingTransactions()));
-			return false;
+		$bSuccess = true;
+		$sFilepath = APPROOT.'data/transactions/'.$id;
+		clearstatcache(true, $sFilepath);
+		if(!file_exists($sFilepath))
+		{
+			$bSuccess = false;
+			self::Error("RemoveTransaction: Transaction '$id' not found. Pending transactions for this user:\n".implode("\n", self::GetPendingTransactions()));
 		}
-
-		return true;
+		$bSuccess = @unlink($sFilepath);
+		if (!$bSuccess)
+		{
+			self::Error('RemoveTransaction: FAILED to remove transaction '.$id);
+		}
+		else
+		{
+			self::Info('RemoveTransaction: OK '.$id);
+		}
+		return $bSuccess;
 	}
 
 	/**
 	 * Cleanup old transactions which have been pending since more than 24 hours
 	 * Use filemtime instead of filectime since filectime may be affected by operations on the directory (like changing the access rights)
 	 */
-	protected static function CleanupOldTransactions($sTransactionDir = null)
+	protected static function CleanupOldTransactions()
 	{
-		$iThreshold = (int) MetaModel::GetConfig()->Get('transactions_gc_threshold');
-		$iThreshold = min(100, $iThreshold);
-		$iThreshold = max(1, $iThreshold);
-		if ((100 != $iThreshold) && (rand(1, 100) > $iThreshold)) {
-			return;
-		}
-
-		clearstatcache();
 		$iLimit = time() - 24*3600;
-		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : APPROOT.'data/transactions/*';
-		$aTransactions = glob($sPattern);
+		clearstatcache();
+		$aTransactions = glob(APPROOT.'data/transactions/*-*');
 		foreach($aTransactions as $sFileName)
 		{
 			if (filemtime($sFileName) < $iLimit)
@@ -400,35 +355,22 @@ class privUITransactionFile
 	{
 		self::Write('Error | '.$sText);
 	}
-
-	protected static function IsLogEnabled() {
-		$oConfig = MetaModel::GetConfig();
-		if (is_null($oConfig)) {
-			return false;
-		}
-
-		$bLogTransactions = $oConfig->Get('log_transactions');
-		if (true === $bLogTransactions) {
-			return true;
-		}
-
-		return false;
-	}
-
+	
 	protected static function Write($sText)
 	{
-		if (false === static::IsLogEnabled()) {
-			return;
-		}
-
+		$bLogEnabled = MetaModel::GetConfig()->Get('log_transactions');
+		if ($bLogEnabled)
+		{
 		$hLogFile = @fopen(APPROOT.'log/transactions.log', 'a');
-		if ($hLogFile !== false) {
+		if ($hLogFile !== false)
+		{
 			flock($hLogFile, LOCK_EX);
 			$sDate = date('Y-m-d H:i:s');
 			fwrite($hLogFile, "$sDate | $sText\n");
 			fflush($hLogFile);
 			flock($hLogFile, LOCK_UN);
 			fclose($hLogFile);
+			}
 		}
 	}
 }

application/twigextension.class.inc.php

@@ -5,6 +5,7 @@ namespace Combodo\iTop;
 use AttributeDateTime;
 use Dict;
 use Exception;
+use MetaModel;
 use Twig_Environment;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
@@ -114,6 +115,14 @@ class TwigExtension
 			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)

application/ui.extkeywidget.class.inc.php

@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 /**
@@ -68,14 +67,11 @@ class UIExtKeyWidget
 	protected $iId;
 	protected $sTargetClass;
 	protected $sAttCode;
+	//@deprecated
 	protected $bSearchMode;
 
 	//public function __construct($sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
-
-	/**
-	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Add default value for $aArgs for PHP 8.0 compat
-	 */
-	public static function DisplayFromAttCode($oPage, $sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName = '', $sFormPrefix = '', $aArgs = [], $bSearchMode = false)
+	static public function DisplayFromAttCode($oPage, $sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName = '', $sFormPrefix = '', $aArgs, $bSearchMode = false)
 	{
 		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 		$sTargetClass = $oAttDef->GetTargetClass();
@@ -90,7 +86,29 @@ class UIExtKeyWidget
 			$sDisplayStyle = 'select'; // In search mode, always use a drop-down list
 		}
 		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
-		return $oWidget->Display($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix, $aArgs, null, $sDisplayStyle);
+		if(!$bSearchMode)
+		{
+			switch($sDisplayStyle)
+			{
+				case 'radio':
+				case 'radio_horizontal':
+				case 'radio_vertical':
+
+				return $oWidget->DisplayRadio($oPage, $iMaxComboLength, $bAllowTargetCreation, $oAllowedValues, $value, $sFieldName, $sDisplayStyle);
+					break;
+
+				case 'select':
+				case 'list':
+				default:
+					return $oWidget->DisplaySelect($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value,
+						$bMandatory, $sFieldName, $sFormPrefix, $aArgs);
+			}
+		}
+		else
+		{
+			return $oWidget->Display($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix, $aArgs, null, $sDisplayStyle);
+		}
+
 	}
 
 	public function __construct($sTargetClass, $iInputId, $sAttCode = '', $bSearchMode = false)
@@ -102,6 +120,291 @@ class UIExtKeyWidget
 	}
 
 	/**
+	 * @since 3.0.0 N°2508 - Include Obsolescence icon within list and autocomplete
+	 * Get the HTML fragment corresponding to the ext key editing widget
+	 * @param WebPage $oP The web page used for all the output
+	 * @param array $aArgs Extra context arguments
+	 * @return string The HTML fragment to be inserted into the page
+	 */
+	public function DisplaySelect(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array())
+	{
+		$sTitle = addslashes($sTitle);
+		$oPage->add_linked_script('../js/extkeywidget.js');
+		$oPage->add_linked_script('../js/forms-json-utils.js');
+
+		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
+		$bExtensions = true;
+		$sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$sAttrFieldPrefix = ($this->bSearchMode) ? '' : 'attr_';
+
+		$sHTMLValue = "<div class=\"field_input_zone field_input_extkey ibo-input-wrapper ibo-input-select-wrapper\" data-validation=\"untouched\">";
+		$sFilter = addslashes($oAllowedValues->GetFilter()->ToOQL());
+		if($this->bSearchMode)
+		{
+			$sWizHelper = 'null';
+			$sWizHelperJSON = "''";
+			$sJSSearchMode = 'true';
+		}
+		else
+		{
+			if (isset($aArgs['wizHelper']))
+			{
+				$sWizHelper = $aArgs['wizHelper'];
+			}
+			else
+			{
+				$sWizHelper = 'oWizardHelper'.$sFormPrefix;
+			}
+			$sWizHelperJSON = $sWizHelper.'.UpdateWizardToJSON()';
+			$sJSSearchMode = 'false';
+		}
+		if (is_null($oAllowedValues))
+		{
+			throw new Exception('Implementation: null value for allowed values definition');
+		}
+		$oAllowedValues->SetShowObsoleteData(utils::ShowObsoleteData());
+		// Don't automatically launch the search if the table is huge
+		$bDoSearch = !utils::IsHighCardinality($this->sTargetClass);
+		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
+
+		// We just need to compare the number of entries with MaxComboLength, so no need to get the real count.
+		if (!$oAllowedValues->CountExceeds($iMaxComboLength))
+		{
+			// Discrete list of values, use a SELECT or RADIO buttons depending on the config
+			$sHelpText = ''; //$this->oAttDef->GetHelpOnEdition();
+			//$sHTMLValue .= "<div class=\"field_select_wrapper\">\n";
+			$aOptions = [];
+			$sDisplayValue = "";
+
+			$aOption = [];
+			$aOption['value'] = "";
+			$aOption['label'] = Dict::S('UI:SelectOne');
+			array_push($aOptions,$aOption);
+
+			$oAllowedValues->Rewind();
+			$bAddingValue=false;
+
+			$aComplementAttributeSpec = MetaModel::GetComplementAttributeSpec($oAllowedValues->GetClass());
+			$sFormatAdditionalField = $aComplementAttributeSpec[0];
+			$aAdditionalField = $aComplementAttributeSpec[1];
+
+			if (count($aAdditionalField)>0)
+			{
+				$bAddingValue=true;
+			}
+			while($oObj = $oAllowedValues->Fetch())
+			{
+				$aOption=[];
+				$aOption['value'] = $oObj->GetKey();
+				$aOption['label'] = $oObj->GetName();//.'<span class=\"object-ref-icon fas fa-eye-slash object-obsolete fa-1x fa-fw\"></span>';
+
+				if (($oAllowedValues->Count() == 1) && ($bMandatory == 'true') )
+				{
+					// When there is only once choice, select it by default
+					$sDisplayValue=$oObj->GetName();
+					if($value != $oObj->GetKey())
+					{
+						$oPage->add_ready_script(
+							<<<EOF
+$('#$this->iId').attr('data-validate','dependencies');
+EOF
+						);
+					}
+				}
+				else
+				{
+					if ((is_array($value) && in_array($oObj->GetKey(), $value)) || ($value == $oObj->GetKey()))
+					{
+						$sDisplayValue=$oObj->GetKey();
+					//	$sHTMLValue.="<div class='item' data-value='".$oObj->GetKey)."'>".$oObj->GetName()."</div>";
+					}
+				}
+				if ($oObj->IsObsolete()){
+					$aOption['obsolescence_flag'] ="1";
+				}
+				if ($bAddingValue)
+				{
+					$aArguments = [];
+					foreach ($aAdditionalField as $sAdditionalField)
+					{
+						array_push($aArguments,$oObj->Get($sAdditionalField));
+					}
+					$aOption['additional_field'] = vsprintf($sFormatAdditionalField, $aArguments);
+				}
+				array_push($aOptions,$aOption);
+			}
+			$sHTMLValue .= "<select title=\"$sHelpText\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" id=\"$this->iId\"></select>";
+			$sJsonOptions=json_encode($aOptions);
+			$oPage->add_ready_script(
+				<<<EOF
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
+		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
+		oACWidget_{$this->iId}.AddSelectize('$sJsonOptions','$sDisplayValue');
+		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
+		$('#$this->iId').bind('change', function() { $(this).trigger('extkeychange') } );
+
+EOF
+			);
+		}
+		else
+		{
+			// Too many choices, use an autocomplete
+			// Check that the given value is allowed
+			$oSearch = $oAllowedValues->GetFilter();
+			$oSearch->AddCondition('id', $value);
+			$oSet = new DBObjectSet($oSearch);
+			if ($oSet->Count() == 0)
+			{
+				$value = null;
+			}
+
+			if (is_null($value) || ($value == 0)) // Null values are displayed as ''
+			{
+				$sDisplayValue = isset($aArgs['sDefaultValue']) ? $aArgs['sDefaultValue'] : '';
+			}
+			else
+			{
+				$sDisplayValue = $this->GetObjectName($value);
+			}
+			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 2; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
+
+			// the input for the auto-complete
+			$sHTMLValue .= "<input class=\"field_autocomplete ibo-input ibo-input-select ibo-input-select-autocomplete\" type=\"text\"  id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
+			$sHTMLValue .= "<div class=\"field_input_btn ibo-input-select--action-button ibo-input-select--action-button--search\"  id=\"mini_search_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.Search();\"><i class=\"fas fa-search\"></i></div>";
+
+			// 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";
+
+			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';
+			// Scripts to start the autocomplete and bind some events to it
+			$oPage->add_ready_script(
+				<<<EOF
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
+		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
+		oACWidget_{$this->iId}.AddAutocomplete($iMinChars, $sWizHelperJSON);
+		if ($('#ac_dlg_{$this->iId}').length == 0)
+		{
+			$('body').append('<div id="ac_dlg_{$this->iId}"></div>');
+		}
+EOF
+			);
+		}
+		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false)
+		{
+			$sHTMLValue .= "<div class=\"field_input_btn ibo-input-select--action-button ibo-input-select--action-button--hierarchy\" id=\"mini_tree_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"><i class=\"fas fa-sitemap\"></i></div>";
+			$oPage->add_ready_script(
+				<<<JS
+			if ($('#ac_tree_{$this->iId}').length == 0)
+			{
+				$('body').append('<div id="ac_tree_{$this->iId}"></div>');
+			}		
+JS
+			);
+		}
+		if ($bCreate && $bExtensions)
+		{
+			$sCallbackName = (MetaModel::IsAbstract($this->sTargetClass)) ? 'SelectObjectClass' : 'CreateObject';
+
+			$sHTMLValue .= "<div class=\"field_input_btn ibo-input-select--action-button ibo-input-select--action-button--create\" id=\"mini_add_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"><i class=\"fas fa-plus\"></i></div>";
+			$oPage->add_ready_script(
+				<<<JS
+		if ($('#ajax_{$this->iId}').length == 0)
+		{
+			$('body').append('<div id="ajax_{$this->iId}"></div>');
+		}
+JS
+			);
+		}
+		$sHTMLValue .= "</div>";
+		$sHTMLValue .= "<span class=\"form_validation ibo-field-validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
+
+		return $sHTMLValue;
+	}
+
+	/**
+	 * @since 3.0.0 N°2508 - Include Obsolescence icon within list and autocomplete
+	 * Get the HTML fragment corresponding to the ext key editing widget
+	 * @param WebPage $oP The web page used for all the output
+	 * @param array $aArgs Extra context arguments
+	 * @return string The HTML fragment to be inserted into the page
+	 */
+	public function DisplayRadio(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, DBObjectset $oAllowedValues, $value, $sFieldName, $sDisplayStyle)
+	{
+		$oPage->add_linked_script('../js/forms-json-utils.js');
+
+		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
+		$bExtensions = true;
+		$sAttrFieldPrefix = ($this->bSearchMode) ? '' : 'attr_';
+
+		$sHTMLValue = "<div class=\"field_input_zone field_input_extkey\">";
+
+		if (is_null($oAllowedValues))
+		{
+			throw new Exception('Implementation: null value for allowed values definition');
+		}
+		$oAllowedValues->SetShowObsoleteData(utils::ShowObsoleteData());
+
+		// We just need to compare the number of entries with MaxComboLength, so no need to get the real count.
+		if (!$oAllowedValues->CountExceeds($iMaxComboLength))
+		{
+			// Discrete list of values, use a SELECT or RADIO buttons depending on the config
+			$sValidationField = null;
+
+			$bVertical = ($sDisplayStyle != 'radio_horizontal');
+			$bExtensions = false;
+			$oAllowedValues->Rewind();
+			$aAllowedValues = array();
+			while($oObj = $oAllowedValues->Fetch())
+			{
+				$aAllowedValues[$oObj->GetKey()] = $oObj->GetName();
+			}
+			$sHTMLValue .= $oPage->GetRadioButtons($aAllowedValues, $value, $this->iId, "{$sAttrFieldPrefix}{$sFieldName}", false /*  $bMandatory will be placed manually */, $bVertical, $sValidationField);
+			$aEventsList[] ='change';
+		}
+		else
+		{
+			$sHTMLValue .= "unable to display. Too much values";
+		}
+		$sHTMLValue .= '<div class="ibo-input-select--action-buttons">';
+		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>";
+			$oPage->add_ready_script(
+				<<<JS
+			if ($('#ac_tree_{$this->iId}').length == 0)
+			{
+				$('body').append('<div id="ac_tree_{$this->iId}"></div>');
+			}		
+JS
+			);
+		}
+		if ($bCreate && $bExtensions)
+		{
+			$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>";
+			$oPage->add_ready_script(
+				<<<JS
+		if ($('#ajax_{$this->iId}').length == 0)
+		{
+			$('body').append('<div id="ajax_{$this->iId}"></div>');
+		}
+JS
+			);
+		}
+		$sHTMLValue .= "</div>";
+		$sHTMLValue .= "</div>";
+
+		// Note: This test is no longer necessary as we changed the markup to extract validation decoration in the standard .field_input_xxx container
+		//if (($sDisplayStyle == 'select') || ($sDisplayStyle == 'list'))
+		//{
+		$sHTMLValue .= "<span class=\"form_validation ibo-field-validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
+		//}
+
+		return $sHTMLValue;
+	}
+	/**
+	 * @deprecated Use DisplayBob
 	 * Get the HTML fragment corresponding to the ext key editing widget
 	 * @param WebPage $oP The web page used for all the output
 	 * @param array $aArgs Extra context arguments
@@ -243,7 +546,7 @@ EOF
 					$oPage->add_ready_script("$('.multiselect').multiselect($sJSOptions);");
 				}
 				$oPage->add_ready_script(
-<<<EOF
+					<<<EOF
 		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
 		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
 		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
@@ -273,10 +576,10 @@ EOF
 			{
 				$sDisplayValue = $this->GetObjectName($value);
 			}
-			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 3; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
+			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 2; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
 
 			// the input for the auto-complete
-			$sHTMLValue .= "<input class=\"field_autocomplete\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
+			$sHTMLValue .= "<input class=\"field_autocomplete ibo-input-select\" 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>";
 
 			// another hidden input to store & pass the object's Id
@@ -285,106 +588,100 @@ EOF
 			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';
 			// Scripts to start the autocomplete and bind some events to it
 			$oPage->add_ready_script(
-<<<EOF
+				<<<EOF
 		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
 		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
-		$('#label_$this->iId').autocomplete(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', { scroll:true, minChars:{$iMinChars}, autoFill:false, matchContains:true, mustMatch: true, keyHolder:'#{$this->iId}', extraParams:{operation:'ac_extkey', sTargetClass:'{$this->sTargetClass}',sFilter:'$sFilter',bSearchMode:$JSSearchMode, json: function() { return $sWizHelperJSON; } }});
-		$('#label_$this->iId').keyup(function() { if ($(this).val() == '') { $('#$this->iId').val(''); } } ); // Useful for search forms: empty value in the "label", means no value, immediatly !
-		$('#label_$this->iId').result( function(event, data, formatted) { OnAutoComplete('{$this->iId}', event, data, formatted); } );
-		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
+		oACWidget_{$this->iId}.AddAutocomplete($iMinChars, $sWizHelperJSON);
 		if ($('#ac_dlg_{$this->iId}').length == 0)
 		{
 			$('body').append('<div id="ac_dlg_{$this->iId}"></div>');
 		}
 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\"><div class=\"ibo-input-select--action-button\" id=\"mini_tree_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"><i class=\"fas fa-sitemap\"></i></div></span>";
 			$oPage->add_ready_script(
-<<<EOF
+<<<JS
 			if ($('#ac_tree_{$this->iId}').length == 0)
 			{
 				$('body').append('<div id="ac_tree_{$this->iId}"></div>');
 			}		
-EOF
+JS
 );
 		}
 		if ($bCreate && $bExtensions)
 		{
 			$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\"><div class=\"ibo-input-select--action-button\" id=\"mini_add_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"><i class=\"fas fa-plus\"></i></div></span>";
 			$oPage->add_ready_script(
-<<<EOF
+<<<JS
 		if ($('#ajax_{$this->iId}').length == 0)
 		{
 			$('body').append('<div id="ajax_{$this->iId}"></div>');
 		}
-EOF
+JS
 );
 		}
         $sHTMLValue .= "</div>";
-
-		// Note: This test is no longer necessary as we changed the markup to extract validation decoration in the standard .field_input_xxx container
-		//if (($sDisplayStyle == 'select') || ($sDisplayStyle == 'list'))
-		//{
-			$sHTMLValue .= "<span class=\"form_validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
-		//}
+		$sHTMLValue .= "<span class=\"form_validation ibo-field-validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
 
 		return $sHTMLValue;
 	}
 
 	public function GetSearchDialog(WebPage $oPage, $sTitle, $oCurrObject = null)
 	{
-		$sHTML = '<div class="wizContainer" style="vertical-align:top;"><div id="dc_'.$this->iId.'">';
+		$oPage->add('<div class="wizContainer" style="vertical-align:top;"><div id="dc_'.$this->iId.'">');
 
-		if ( ($oCurrObject != null) && ($this->sAttCode != ''))
-		{
+		if (($oCurrObject != null) && ($this->sAttCode != '')) {
 			$oAttDef = MetaModel::GetAttributeDef(get_class($oCurrObject), $this->sAttCode);
 			/** @var \DBObject $oCurrObject */
 			$aArgs = $oCurrObject->ToArgsForQuery();
 			$aParams = array('query_params' => $aArgs);
 			$oSet = $oAttDef->GetAllowedValuesAsObjectSet($aArgs);
 			$oFilter = $oSet->GetFilter();
-		}
-		else
-		{
+		} else {
 			$aParams = array();
 			$oFilter = new DBObjectSearch($this->sTargetClass);
 		}
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
-		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId,
-            array(
-                'menu' => false,
-                'currentId' => $this->iId,
-                'table_id' => "dr_{$this->iId}",
-                'table_inner_id' => "{$this->iId}_results",
-                'selection_mode' => true,
-                'selection_type' => 'single',
-                'cssCount' => '#count_'.$this->iId)
-        );
-		$sHTML .= "<form id=\"fr_{$this->iId}\" OnSubmit=\"return oACWidget_{$this->iId}.DoOk();\">\n";
-		$sHTML .= "<div id=\"dr_{$this->iId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
-		$sHTML .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
-		$sHTML .= "</div>\n";
-		$sHTML .= "<input type=\"button\" id=\"btn_cancel_{$this->iId}\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#ac_dlg_{$this->iId}').dialog('close');\">&nbsp;&nbsp;";
-		$sHTML .= "<input type=\"button\" id=\"btn_ok_{$this->iId}\" value=\"".Dict::S('UI:Button:Ok')."\"  onClick=\"oACWidget_{$this->iId}.DoOk();\">";
-		$sHTML .= "<input type=\"hidden\" id=\"count_{$this->iId}\" value=\"0\">";
-		$sHTML .= "</form>\n";
-		$sHTML .= '</div></div>';
+		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, $this->iId,
+			array(
+				'menu' => false,
+				'currentId' => $this->iId,
+				'table_id' => "dr_{$this->iId}",
+				'table_inner_id' => "{$this->iId}_results",
+				'selection_mode' => true,
+				'selection_type' => 'single',
+				'cssCount' => '#count_'.$this->iId
+			)
+		));
+		$sCancel = Dict::S('UI:Button:Cancel');
+		$sOK = Dict::S('UI:Button:Ok');
+		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$oPage->add(<<<HTML
+<form id="fr_{$this->iId}" OnSubmit="return oACWidget_{$this->iId}.DoOk();">
+		<div id="dr_{$this->iId}" style="vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;">
+		<div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+		</div>
+		<input type="button" id="btn_cancel_{$this->iId}" value="{$sCancel}" onClick="$('#ac_dlg_{$this->iId}').dialog('close');">&nbsp;&nbsp;
+		<input type="button" id="btn_ok_{$this->iId}_results" value="{$sOK}"  onClick="oACWidget_{$this->iId}.DoOk();">
+		<input type="hidden" id="count_{$this->iId}_results" value="0">
+		</form>
+		</div></div>
+HTML
+		);
 
-		$sDialogTitleSanitized = addslashes(utils::HtmlToText($sTitle));
-		$oPage->add_ready_script(
-<<<EOF
-		$('#ac_dlg_{$this->iId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, title: '$sDialogTitleSanitized', resizeStop: oACWidget_{$this->iId}.UpdateSizes, close: oACWidget_{$this->iId}.OnClose });
+		$sDialogTitle = addslashes($sTitle);
+		$oPage->add_ready_script(<<<JS
+		$('#ac_dlg_{$this->iId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, title: '$sDialogTitle', resizeStop: oACWidget_{$this->iId}.UpdateSizes, close: oACWidget_{$this->iId}.OnClose });
 		$('#fs_{$this->iId}').bind('submit.uiAutocomplete', oACWidget_{$this->iId}.DoSearchObjects);
 		$('#dc_{$this->iId}').resize(oACWidget_{$this->iId}.UpdateSizes);
-EOF
-);
-		$oPage->add($sHTML);
+JS
+		);
 	}
 
 	/**
@@ -430,10 +727,8 @@ EOF
      *
      * @throws CoreException
      * @throws OQLException
-     *
-     * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $oObj for PHP 8.0 compatibility
      */
-	public function AutoComplete(WebPage $oP, $sFilter, $oObj, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null)
+	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null)
 	{
 		if (is_null($sFilter))
 		{
@@ -442,32 +737,53 @@ EOF
 
         // Current extkey value, so we can display event if it is not available anymore (eg. archived).
         $iCurrentExtKeyId = (is_null($oObj) || $this->sAttCode === '') ? 0 : $oObj->Get($this->sAttCode);
-
 		$oValuesSet = new ValueSetObjects($sFilter, 'friendlyname'); // Bypass GetName() to avoid the encoding by htmlentities
 		$iMax = 150;
 		$oValuesSet->SetLimit($iMax);
 		$oValuesSet->SetSort(false);
 		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oValuesSet->SetLimit($iMax);
-		$aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains');
+		$aValuesContains = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'start_with');
 		asort($aValuesContains);
-		$aValues = array();
-		foreach($aValuesContains as $sKey => $sFriendlyName)
+		$aValues = $aValuesContains;
+		if (sizeof($aValues) < $iMax)
 		{
-			if (!isset($aValues[$sKey]))
+			$aValuesContains = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains,	'contains');
+			asort($aValuesContains);
+			$iSize = sizeof($aValuesContains);
+			foreach ($aValuesContains as $sKey => $sFriendlyName)
 			{
-				$aValues[$sKey] = $sFriendlyName;
+				if (!isset($aValues[$sKey]))
+				{
+					$aValues[$sKey] = $sFriendlyName;
+					if (++$iSize >= $iMax)
+					{
+						break;
+					}
+				}
 			}
 		}
+		elseif (!in_array($sContains, $aValues))
+		{
+			$aValuesEquals = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains,	'equals');
+			$aValues = array_merge($aValuesEquals, $aValues);
+		}
 
 		switch($sOutputFormat)
 		{
 			case static::ENUM_OUTPUT_FORMAT_JSON:
 
 			    $aJsonMap = array();
-			    foreach ($aValues as $sKey => $sLabel)
+			    foreach ($aValues as $sKey => $aValue)
                 {
-                    $aJsonMap[] = array('value' => $sKey, 'label' => $sLabel);
+                    if ($aValue['additional_field'] != '')
+                    {
+	                    $aJsonMap[] = array('value' => $sKey, 'label' => $aValue['label'], 'obsolescence_flag' => $aValue['obsolescence_flag'], 'additional_field' => $aValue['additional_field']);
+                    }
+                    else
+                    {
+	                    $aJsonMap[] = array('value' => $sKey, 'label' => $aValue['label'], 'obsolescence_flag' => $aValue['obsolescence_flag']);
+                    }
                 }
 
 			    $oP->SetContentType('application/json');
@@ -475,9 +791,9 @@ EOF
 				break;
 
 			case static::ENUM_OUTPUT_FORMAT_CSV:
-				foreach($aValues as $sKey => $sFriendlyName)
+				foreach($aValues as $sKey => $aValue)
 				{
-					$oP->add(trim($sFriendlyName)."\t".$sKey."\n");
+					$oP->add(trim($aValue['label'])."\t".$sKey."\n");
 				}
 				break;
 			default:

application/ui.linksdirectwidget.class.inc.php

@@ -85,15 +85,9 @@ class UILinksWidgetDirect
 	 * @param array $aArgs
 	 * @param string $sFormPrefix
 	 * @param DBObject $oCurrentObj
-	 *
-	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (handling wrong values at method start)
 	 */
-	public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj)
+	public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
 	{
-		if (empty($aArgs)) {
-			$aArgs = [];
-		}
-
 		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		switch($oLinksetDef->GetEditMode())
 		{
@@ -143,10 +137,8 @@ class UILinksWidgetDirect
 	 * @param string $sFormPrefix
 	 * @param DBObject $oCurrentObj
 	 * @param bool $bDisplayMenu
-	 *
-	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (protected method, always called with default value)
 	 */
-	protected function DisplayAsBlock(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $bDisplayMenu)
+	protected function DisplayAsBlock(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $bDisplayMenu)
 	{
 		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$sTargetClass = $oLinksetDef->GetLinkedClass();
@@ -192,7 +184,7 @@ class UILinksWidgetDirect
 		// For security reasons: check that the "proposed" class is actually a subclass of the linked class
 		// and that the current user is allowed to create objects of this class
 		$sRealClass = '';
-		$oPage->add('<div class="wizContainer" style="vertical-align:top;"><div>');
+		//$oPage->add('<div class="wizContainer" style="vertical-align:top;"><div>');
 		$aSubClasses = MetaModel::EnumChildClasses($this->sLinkedClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
 		$aPossibleClasses = array();
 		foreach($aSubClasses as $sCandidateClass)
@@ -247,10 +239,8 @@ class UILinksWidgetDirect
 	 * @param string $sFormPrefix
 	 * @param DBObject $oCurrentObj
 	 * @param array $aButtons
-	 *
-	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (protected method, caller already handles it)
 	 */
-	protected function DisplayEditInPlace(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $aButtons = array('create', 'delete'))
+	protected function DisplayEditInPlace(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $aButtons = array('create', 'delete'))
 	{
 		$aAttribs = $this->GetTableConfig();
 
@@ -304,20 +294,17 @@ class UILinksWidgetDirect
 	 */
 	public function GetObjectsSelectionDlg($oPage, $oCurrentObj, $aAlreadyLinked, $aPrefillFormParam = array())
 	{
-		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+		//$oPage->add("<div class=\"wizContainer\" style=\"vertical-align:top;\">\n");
 
 		$oHiddenFilter = new DBObjectSearch($this->sLinkedClass);
-		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($this->sLinkedClass, $this->sClass))
-		{
+		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($this->sLinkedClass, $this->sClass)) {
 			// Prevent linking to self if the linked object is of the same family
 			// and already present in the database
-			if (!$oCurrentObj->IsNew())
-			{
+			if (!$oCurrentObj->IsNew()) {
 				$oHiddenFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
 			}
 		}
-		if (count($aAlreadyLinked) > 0)
-		{
+		if (count($aAlreadyLinked) > 0) {
 			$oHiddenFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
 		}
 		$oHiddenCriteria = $oHiddenFilter->GetCriteria();
@@ -329,18 +316,14 @@ class UILinksWidgetDirect
 		if ($valuesDef === null)
 		{
 			$oFilter = new DBObjectSearch($this->sLinkedClass);
-		}
-		else
-		{
-			if (!$valuesDef instanceof ValueSetObjects)
-			{
+		} else {
+			if (!$valuesDef instanceof ValueSetObjects) {
 				throw new Exception('Error: only ValueSetObjects are supported for "allowed_values" in AttributeLinkedSet ('.$this->sClass.'/'.$this->sAttCode.').');
 			}
 			$oFilter = DBObjectSearch::FromOQL($valuesDef->GetFilterExpression());
 		}
 
-		if ($oCurrentObj != null)
-		{
+		if ($oCurrentObj != null) {
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 
 			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
@@ -349,7 +332,7 @@ class UILinksWidgetDirect
 			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
 		}
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
+		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
 			array(
 				'result_list_outer_selector' => "SearchResultsToAdd_{$this->sInputid}",
 				'table_id' => "add_{$this->sInputid}",
@@ -359,16 +342,21 @@ class UILinksWidgetDirect
 				'query_params' => $oFilter->GetInternalParams(),
 				'hidden_criteria' => $sHiddenCriteria,
 			)
-        );
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->sInputid}\">\n";
-		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->sInputid}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
-		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
-		$sHtml .= "</div>\n";
-		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->sInputid}\" value=\"0\"/>";
-		$sHtml .= "<button type=\"button\" class=\"cancel\">".Dict::S('UI:Button:Cancel')."</button>&nbsp;&nbsp;<button type=\"button\" class=\"ok\" disabled=\"disabled\">".Dict::S('UI:Button:Add')."</button>";
-		$sHtml .= "</div>\n";
-		$sHtml .= "</form>\n";
-		$oPage->add($sHtml);
+		));
+		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$sCancel = Dict::S('UI:Button:Cancel');
+		$sAdd = Dict::S('UI:Button:Add');
+
+		$oPage->add(<<<HTML
+<form id="ObjectsAddForm_{$this->sInputid}">
+    <div id="SearchResultsToAdd_{$this->sInputid}" style="vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;">
+        <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+    </div>
+    <input type="hidden" id="count_{$this->sInputid}" value="0"/>
+    <button type="button" class="cancel">{$sCancel}</button>&nbsp;&nbsp;<button type="button" class="ok" disabled="disabled">{$sAdd}</button>
+</form>
+HTML
+		);
 	}
 
 	/**

application/ui.linkswidget.class.inc.php

@@ -24,7 +24,10 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-require_once(APPROOT.'application/webpage.class.inc.php');
+use Combodo\iTop\Application\UI\Component\DataTable\DataTableFactory;
+use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\FormTableRow\FormTableRow;
+use Combodo\iTop\Renderer\BlockRenderer;
+
 require_once(APPROOT.'application/displayblock.class.inc.php');
 
 class UILinksWidget 
@@ -39,6 +42,7 @@ class UILinksWidget
 	protected $m_sLinkedClass;
 	protected $m_sRemoteClass;
 	protected $m_bDuplicatesAllowed;
+	/** @var string[] list of editables attcodes */
 	protected $m_aEditableFields;
 	protected $m_aTableConfig;
 
@@ -46,7 +50,7 @@ class UILinksWidget
 	 * UILinksWidget constructor.
 	 *
 	 * @param string $sClass
-	 * @param string $sAttCode
+	 * @param string $sAttCode AttributeLinkedSetIndirect attcode
 	 * @param int $iInputId
 	 * @param string $sNameSuffix
 	 * @param bool $bDuplicatesAllowed
@@ -73,41 +77,36 @@ class UILinksWidget
 		/** @var AttributeExternalKey $oLinkingAttDef */
 		$oLinkingAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
 		$this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
-		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
-		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
-		$sDefaultState = MetaModel::GetDefaultState($this->m_sClass);		
 
 		$this->m_aEditableFields = array();
 		$this->m_aTableConfig = array();
-		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_iInputId.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
+		$this->m_aTableConfig['form::checkbox'] = array(
+			'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_iInputId.".OnSelectChange();\">",
+			'description' => Dict::S('UI:SelectAllToggle+'),
+		);
 
-		foreach(MetaModel::FlattenZList(MetaModel::GetZListItems($this->m_sLinkedClass, 'list')) as $sAttCode)
+		$aLnkAttDefsToDisplay = MetaModel::GetZListAttDefsFilteredForIndirectLinkClass($sClass, $sAttCode);
+		foreach ($aLnkAttDefsToDisplay as $oLnkAttDef)
 		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sAttCode);
-			if ($sStateAttCode == $sAttCode)
-			{
-				// State attribute is always hidden from the UI
-			}
-			else if ($oAttDef->IsWritable() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $this->m_sExtKeyToRemote) && ($sAttCode != 'finalclass'))
-			{
-				$iFlags = MetaModel::GetAttributeFlags($this->m_sLinkedClass, $sDefaultState, $sAttCode);				
-				if ( !($iFlags & OPT_ATT_HIDDEN) && !($iFlags & OPT_ATT_READONLY) )
-				{
-					$this->m_aEditableFields[] = $sAttCode;
-					$this->m_aTableConfig[$sAttCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());				
-				}
-			}
+			$sLnkAttCode = $oLnkAttDef->GetCode();
+			$this->m_aEditableFields[] = $sLnkAttCode;
+			$this->m_aTableConfig[$sLnkAttCode] = array('label' => $oLnkAttDef->GetLabel(), 'description' => $oLnkAttDef->GetDescription());
 		}
-		
-		$this->m_aTableConfig['static::key'] = array( 'label' => MetaModel::GetName($this->m_sRemoteClass), 'description' => MetaModel::GetClassDescription($this->m_sRemoteClass));
-		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+
+		$this->m_aTableConfig['static::key'] = array(
+			'label' => MetaModel::GetName($this->m_sRemoteClass),
+			'description' => MetaModel::GetClassDescription($this->m_sRemoteClass),
+		);
+		$this->m_aEditableFields[] = $this->m_sExtKeyToRemote;
+
+		$aRemoteAttDefsToDisplay = MetaModel::GetZListAttDefsFilteredForIndirectRemoteClass($this->m_sRemoteClass);
+		foreach ($aRemoteAttDefsToDisplay as $oRemoteAttDef)
 		{
-			// TO DO: check the state of the attribute: hidden or visible ?
-			if ($sFieldCode != 'finalclass')
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sRemoteClass, $sFieldCode);
-				$this->m_aTableConfig['static::'.$sFieldCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
-			}
+			$sRemoteAttCode = $oRemoteAttDef->GetCode();
+			$this->m_aTableConfig['static::'.$sRemoteAttCode] = array(
+				'label' => $oRemoteAttDef->GetLabel(),
+				'description' => $oRemoteAttDef->GetDescription(),
+			);
 		}
 	}
 
@@ -116,7 +115,7 @@ class UILinksWidget
 	 *
 	 * @param WebPage $oP Web page used for the ouput
 	 * @param DBObject $oLinkedObj Remote object
-	 * @param mixed $linkObjOrId Either the object linked or a unique number for new link records to add
+	 * @param DBObject|int $linkObjOrId Either the lnk object or a unique number for new link records to add
 	 * @param array $aArgs Extra context arguments
 	 * @param DBObject $oCurrentObj The object to which all the elements of the linked set refer to
 	 * @param int $iUniqueId A unique identifier of new links
@@ -134,43 +133,39 @@ class UILinksWidget
 		$aRow = array();
 		$aFieldsMap = array();
 		$iKey = 0;
-		if(is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
+
+		if (is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
 		{
 			$iKey = $linkObjOrId->GetKey();
-			$iRemoteObjKey =  $linkObjOrId->Get($this->m_sExtKeyToRemote);
+			$iRemoteObjKey = $linkObjOrId->Get($this->m_sExtKeyToRemote);
 			$sPrefix .= "[$iKey][";
 			$sNameSuffix = "]"; // To make a tabular form
 			$aArgs['prefix'] = $sPrefix;
 			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$iKey}";
 			$aArgs['this'] = $linkObjOrId;
 
-			if($bReadOnly)
-            {
-                $aRow['form::checkbox'] = "";
-                foreach($this->m_aEditableFields as $sFieldCode)
-                {
-                    $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
-                    $aRow[$sFieldCode] = $sDisplayValue;
-                }
-            }
-            else
-            {
-                $aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"$iKey\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$iKey\">";
-                foreach($this->m_aEditableFields as $sFieldCode)
-                {
-                    $sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId->GetKey().']';
-                    $sSafeId = utils::GetSafeId($sFieldId);
-                    $sValue = $linkObjOrId->Get($sFieldCode);
-                    $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
-                    $oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-                    $aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
-                        cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId, $sNameSuffix, 0, $aArgs).
-	                    '</div></div></div>';
-                    $aFieldsMap[$sFieldCode] = $sSafeId;
-                }
-            }
+			if ($bReadOnly)
+			{
+				$aRow['form::checkbox'] = "";
+				foreach ($this->m_aEditableFields as $sFieldCode)
+				{
+					$sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
+					$aRow[$sFieldCode] = $sDisplayValue;
+				}
+			}
+			else
+			{
+				$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"$iKey\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$iKey\">";
+				foreach ($this->m_aEditableFields as $sFieldCode)
+				{
+					$sSafeFieldId = $this->GetFieldId($linkObjOrId->GetKey(), $sFieldCode);
+					$this->AddRowForFieldCode($aRow, $sFieldCode, $aArgs, $linkObjOrId, $oP, $sNameSuffix, $sSafeFieldId);
+					$aFieldsMap[$sFieldCode] = $sSafeFieldId;
+				}
+			}
 
 			$sState = $linkObjOrId->GetState();
+			$sRemoteKeySafeFieldId = $this->GetFieldId($aArgs['this']->GetKey(), $this->m_sExtKeyToRemote);;
 		}
 		else
 		{
@@ -180,15 +175,18 @@ class UILinksWidget
 				// New link existing only in memory
 				$oNewLinkObj = $linkObjOrId;
 				$iRemoteObjKey = $oNewLinkObj->Get($this->m_sExtKeyToRemote);
-				$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object also fills the related external fields
+				$oNewLinkObj->Set($this->m_sExtKeyToMe,
+					$oCurrentObj); // Setting the extkey with the object also fills the related external fields
 			}
 			else
 			{
 				$iRemoteObjKey = $linkObjOrId;
 				$oNewLinkObj = MetaModel::NewObject($this->m_sLinkedClass);
 				$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, $iRemoteObjKey);
-				$oNewLinkObj->Set($this->m_sExtKeyToRemote, $oRemoteObj); // Setting the extkey with the object alsoo fills the related external fields
-				$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object also fills the related external fields
+				$oNewLinkObj->Set($this->m_sExtKeyToRemote,
+					$oRemoteObj); // Setting the extkey with the object alsoo fills the related external fields
+				$oNewLinkObj->Set($this->m_sExtKeyToMe,
+					$oCurrentObj); // Setting the extkey with the object also fills the related external fields
 			}
 			$sPrefix .= "[-$iUniqueId][";
 			$sNameSuffix = "]"; // To make a tabular form
@@ -222,112 +220,150 @@ EOF
 
 			foreach($this->m_aEditableFields as $sFieldCode)
 			{
-				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.-$iUniqueId.']';
-				$sSafeId = utils::GetSafeId($sFieldId);
+				$sSafeFieldId = $this->GetFieldId($iUniqueId, $sFieldCode);
+				$this->AddRowForFieldCode($aRow, $sFieldCode, $aArgs, $oNewLinkObj, $oP, $sNameSuffix, $sSafeFieldId);
+				$aFieldsMap[$sFieldCode] = $sSafeFieldId;
+
 				$sValue = $oNewLinkObj->Get($sFieldCode);
-				$sDisplayValue = $oNewLinkObj->GetEditValue($sFieldCode);
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-				$aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
-					cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId /* id */, $sNameSuffix, 0, $aArgs).
-					'</div></div></div>';
-				$aFieldsMap[$sFieldCode] = $sSafeId;
-				$oP->add_ready_script(<<<EOF
+				$oP->add_ready_script(
+					<<<JS
 oWidget{$this->m_iInputId}.OnValueChange($iKey, $iUniqueId, '$sFieldCode', '$sValue');
-EOF
-					);
+JS
+				);
 			}
+
 			$sState = '';
+			$sRemoteKeySafeFieldId = $this->GetFieldId($iUniqueId, $this->m_sExtKeyToRemote);
 		}
 
-		if(!$bReadOnly)
-        {
-            $sExtKeyToMeId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToMe);
-            $aFieldsMap[$this->m_sExtKeyToMe] = $sExtKeyToMeId;
-            $aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToMeId\" value=\"".$oCurrentObj->GetKey()."\">";
-
-            $sExtKeyToRemoteId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToRemote);
-            $aFieldsMap[$this->m_sExtKeyToRemote] = $sExtKeyToRemoteId;
-            $aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToRemoteId\" value=\"$iRemoteObjKey\">";
-        }
-
-		$iFieldsCount = count($aFieldsMap);
-		$sJsonFieldsMap = json_encode($aFieldsMap);
-		
-		$oP->add_script(
-<<<EOF
-var {$aArgs['wizHelper']} = new WizardHelper('{$this->m_sLinkedClass}', '', '$sState');
-{$aArgs['wizHelper']}.SetFieldsMap($sJsonFieldsMap);
-{$aArgs['wizHelper']}.SetFieldsCount($iFieldsCount);
-EOF
-		);
-		$aRow['static::key'] = $oLinkedObj->GetHyperLink();
-		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+		if (!$bReadOnly)
 		{
-			$aRow['static::'.$sFieldCode] = $oLinkedObj->GetAsHTML($sFieldCode);
+			$sExtKeyToMeId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToMe);
+			$aFieldsMap[$this->m_sExtKeyToMe] = $sExtKeyToMeId;
+			$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToMeId\" value=\"".$oCurrentObj->GetKey()."\">";
+
+			$sExtKeyToRemoteId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToRemote);
+			$aFieldsMap[$this->m_sExtKeyToRemote] = $sExtKeyToRemoteId;
+			$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToRemoteId\" value=\"$iRemoteObjKey\">";
 		}
+
+		// Adding fields from remote class
+		// all fields are embedded in a span + added to $aFieldsMap array so that we can refresh them after extkey change
+		$aRemoteFieldsMap = [];
+		foreach (MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+		{
+			$sSafeFieldId = $this->GetFieldId($aArgs['this']->GetKey(), $sFieldCode);
+			$aRow['static::'.$sFieldCode] = "<span id='field_$sSafeFieldId'>".$oLinkedObj->GetAsHTML($sFieldCode).'</span>';
+			$aRemoteFieldsMap[$sFieldCode] = $sSafeFieldId;
+		}
+		// id field is needed so that remote object could be load server side
+		$aRemoteFieldsMap['id'] = $sRemoteKeySafeFieldId;
+
+		// Generate WizardHelper to update dependant fields
+		$this->AddWizardHelperInit($oP, $aArgs['wizHelper'], $this->m_sLinkedClass, $sState, $aFieldsMap);
+		//instantiate specific WizarHelper instance for remote class fields refresh
+		$bHasExtKeyUpdatingRemoteClassFields = (
+			array_key_exists('replaceDependenciesByRemoteClassFields', $aArgs)
+			&& ($aArgs['replaceDependenciesByRemoteClassFields'])
+		);
+		if ($bHasExtKeyUpdatingRemoteClassFields)
+		{
+			$this->AddWizardHelperInit($oP, $aArgs['wizHelperRemote'], $this->m_sRemoteClass, $sState, $aRemoteFieldsMap);
+		}
+
 		return $aRow;
 	}
 
-	/**
-	 * Display one row of the whole form
-	 * @param WebPage $oP
-	 * @param array $aConfig
-	 * @param array $aRow
-	 * @param int $iRowId
-	 * @return string
-	 */
-	protected function DisplayFormRow(WebPage $oP, $aConfig, $aRow, $iRowId)
+	private function AddRowForFieldCode(&$aRow, $sFieldCode, &$aArgs, $oLnk, $oP, $sNameSuffix, $sSafeFieldId): void
 	{
-		$sHtml = '';
-		$sHtml .= "<tr id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_row_$iRowId\">\n";
-		foreach($aConfig as $sName=>$void)
+		if (($sFieldCode === $this->m_sExtKeyToRemote))
 		{
-			$sHtml .= "<td>".$aRow[$sName]."</td>\n";
+			// current field is the lnk extkey to the remote class
+			$aArgs['replaceDependenciesByRemoteClassFields'] = true;
+			$sRowFieldCode = 'static::key';
+			$aArgs['wizHelperRemote'] = $aArgs['wizHelper'].'_remote';
+			$aRemoteAttDefs = MetaModel::GetZListAttDefsFilteredForIndirectRemoteClass($this->m_sRemoteClass);
+			$aRemoteCodes = array_map(
+				function ($value) {
+					return $value->GetCode();
+				},
+				$aRemoteAttDefs
+			);
+			$aArgs['remoteCodes'] = $aRemoteCodes;
 		}
-		$sHtml .= "</tr>\n";
-		
-		return $sHtml;
+		else
+		{
+			$aArgs['replaceDependenciesByRemoteClassFields'] = false;
+			$sRowFieldCode = $sFieldCode;
+		}
+		$sValue = $oLnk->Get($sFieldCode);
+		$sDisplayValue = $oLnk->GetEditValue($sFieldCode);
+		$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
+
+		$aRow[$sRowFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'
+			.cmdbAbstractObject::GetFormElementForField(
+				$oP,
+				$this->m_sLinkedClass,
+				$sFieldCode,
+				$oAttDef,
+				$sValue,
+				$sDisplayValue,
+				$sSafeFieldId,
+				$sNameSuffix,
+				0,
+				$aArgs
+			)
+			.'</div></div></div>';
 	}
-	
+
+	private function GetFieldId($iLnkId, $sFieldCode, $bSafe = true)
+	{
+		$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$iLnkId.']';
+
+		return ($bSafe) ? utils::GetSafeId($sFieldId) : $sFieldId;
+	}
+
+	private function AddWizardHelperInit($oP, $sWizardHelperVarName, $sWizardHelperClass, $sState, $aFieldsMap): void
+	{
+		$iFieldsCount = count($aFieldsMap);
+		$sJsonFieldsMap = json_encode($aFieldsMap);
+
+		$oP->add_script(
+			<<<JS
+var $sWizardHelperVarName = new WizardHelper('$sWizardHelperClass', '', '$sState');
+$sWizardHelperVarName.SetFieldsMap($sJsonFieldsMap);
+$sWizardHelperVarName.SetFieldsCount($iFieldsCount);
+$sWizardHelperVarName.SetReturnNotEditableFields(true);
+$sWizardHelperVarName.SetWizHelperJsVarName('$sWizardHelperVarName');
+JS
+		);
+	}
+
 	/**
 	 * Display the table with the form for editing all the links at once
+	 *
 	 * @param WebPage $oP The web page used for the output
 	 * @param array $aConfig The table's header configuration
 	 * @param array $aData The tabular data to be displayed
+	 *
 	 * @return string Html fragment representing the form table
+	 * @throws \ReflectionException
+	 * @throws \Twig\Error\LoaderError
+	 * @throws \Twig\Error\RuntimeError
+	 * @throws \Twig\Error\SyntaxError
 	 */
 	protected function DisplayFormTable(WebPage $oP, $aConfig, $aData)
 	{
-		$sHtml = "<input type=\"hidden\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\">";
-		$sHtml .= "<table class=\"listResults\">\n";
-		// Header
-		$sHtml .= "<thead>\n";
-		$sHtml .= "<tr>\n";
-		foreach($aConfig as $sName=>$aDef)
+		$oTable = DataTableFactory::MakeForForm("{$this->m_sAttCode}{$this->m_sNameSuffix}", $aConfig);
+
+		foreach ($aData as $iRowId => $aRow)
 		{
-			$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
-		}
-		$sHtml .= "</tr>\n";
-		$sHtml .= "</thead>\n";
-		
-		// Content
-		$sHtml .= "</tbody>\n";
-		$sEmptyRowStyle = '';
-		if (count($aData) != 0)
-		{
-			$sEmptyRowStyle = 'style="display:none;"';
+			$oRow = new FormTableRow("{$this->m_sAttCode}{$this->m_sNameSuffix}", $aConfig, $aRow, $iRowId);
+			$oTable->AddRow($oRow);
 		}
 
-		foreach($aData as $iRowId => $aRow)
-		{
-			$sHtml .= $this->DisplayFormRow($oP, $aConfig, $aRow, $iRowId);
-		}		
-		$sHtml .= "<tr $sEmptyRowStyle id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."</td></tr>";
-		$sHtml .= "</tbody>\n";
-		
-		// Footer
-		$sHtml .= "</table>\n";
-		
+		$sHtml = BlockRenderer::RenderBlockTemplates($oTable);
+
 		return $sHtml;
 	}
 
@@ -360,20 +396,21 @@ EOF
 		$bDoSearch = !utils::IsHighCardinality($this->m_sRemoteClass);
 		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
 		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
-		$oPage->add_ready_script(<<<EOF
-		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}', $sJSDoSearch);
-		oWidget{$this->m_iInputId}.Init();
-EOF
+		$oPage->add_ready_script(<<<JS
+oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}', $sJSDoSearch);
+oWidget{$this->m_iInputId}.Init();
+JS
 		);
 
-		while($oCurrentLink = $oValue->Fetch())
+		while ($oCurrentLink = $oValue->Fetch())
 		{
-		    // We try to retrieve the remote object as usual
-			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote), false /* Must not be found */);
+			// We try to retrieve the remote object as usual
+			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote),
+				false /* Must not be found */);
 			// If successful, it means that we can edit its link
-			if($oLinkedObj !== null)
-            {
-                $bReadOnly = false;
+			if ($oLinkedObj !== null)
+			{
+				$bReadOnly = false;
             }
             // Else we retrieve it without restrictions (silos) and will display its link as readonly
             else
@@ -393,6 +430,7 @@ EOF
             $aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs, $oCurrentObj, $key, $bReadOnly);
 		}
 		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
+		// To prevent adding forms inside the main form
 
 		$sHtmlValue .= "<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget{$this->m_iInputId}.RemoveSelected();\" >";
 		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget{$this->m_iInputId}.AddObjects();\"><span id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_indicatorAdd\"></span></span>\n";
@@ -443,53 +481,55 @@ EOF
 	 */
 	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array(), $aPrefillFormParam = array())
 	{
-		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+		//$oPage->add("<div class=\"wizContainer\" style=\"vertical-align:top;\">\n");
 
 		$oAlreadyLinkedFilter = new DBObjectSearch($this->m_sRemoteClass);
-		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
-		{
+		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0) {
 			$oAlreadyLinkedFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
 			$oAlreadyLinkedExpression = $oAlreadyLinkedFilter->GetCriteria();
-			$sAlreadyLinkedExpression = $oAlreadyLinkedExpression->Render();
-		}
-		else
-		{
+			$sAlreadyLinkedExpression = $oAlreadyLinkedExpression->RenderExpression();
+		} else {
 			$sAlreadyLinkedExpression = '';
 		}
 
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 
-		if(!empty($oCurrentObj))
-		{
+		if (!empty($oCurrentObj)) {
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 			$aPrefillFormParam['filter'] = $oFilter;
 			$aPrefillFormParam['dest_class'] = $this->m_sRemoteClass;
 			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
 		}
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 			array(
 				'menu' => false,
 				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
-				'table_id' => 'add_'.$this->m_sAttCode,
+				'table_id' => "add_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'selection_mode' => true,
 				'json' => $sJson,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
 				'query_params' => $oFilter->GetInternalParams(),
 				'hidden_criteria' => $sAlreadyLinkedExpression,
-			));
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
-		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
-		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
-		$sHtml .= "</div>\n";
-		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
-		$sHtml .= "</div>\n";
-		$sHtml .= "</form>\n";
-		$oPage->add($sHtml);
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."'});");
+			)));
+		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$sCancel = Dict::S('UI:Button:Cancel');
+		$sAdd = Dict::S('UI:Button:Add');
+
+		$oPage->add(<<<HTML
+<form id="ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}">
+    <div id="SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}" style="vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;">
+        <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+    </div>
+    <input type="hidden" id="count_{$this->m_sAttCode}{$this->m_sNameSuffix}" value="0"/>
+    <input type="button" value="{$sCancel}" onClick="$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');">&nbsp;&nbsp;
+    <input id="btn_ok_add_{$this->m_sAttCode}{$this->m_sNameSuffix}" disabled="disabled" type="button" onclick="return oWidget{$this->m_iInputId}.DoAddObjects(this.id);" value="{$sAdd}">
+</form>
+HTML
+		);
+
+		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."' , autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
 	}
@@ -547,7 +587,8 @@ EOF
 			if (is_object($oLinkedObj))
 			{
 				$aRow = $this->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
-				$oP->add($this->DisplayFormRow($oP, $this->m_aTableConfig, $aRow, -$iAdditionId));
+				$oRow = new FormTableRow("{$this->m_sAttCode}{$this->m_sNameSuffix}", $this->m_aTableConfig, $aRow, -$iAdditionId);
+				$oP->AddUiBlock($oRow);
 				$iAdditionId++;
 			}
 			else

application/ui.passwordwidget.class.inc.php

@@ -24,7 +24,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UIPasswordWidget 
@@ -66,7 +65,7 @@ class UIPasswordWidget
 		$sHtmlValue .= '<input type="hidden" id="'.$this->iId.'_changed" name="attr_'.$sCode.'[changed]" value="'.$sChangedValue.'"/>';
 		$sHtmlValue .= '</div>';
 
-		$sHtmlValue .= '<span class="form_validation" id="v_'.$this->iId.'"></span><span class="field_status" id="fstatus_'.$this->iId.'"></span>';
+		$sHtmlValue .= '<span class="form_validation ibo-field-validation" id="v_'.$this->iId.'"></span><span class="field_status" id="fstatus_'.$this->iId.'"></span>';
 
 		$oPage->add_ready_script("$('#$this->iId').bind('keyup change', function(evt) { return PasswordFieldChanged('$this->iId') } );"); // Bind to a custom event: validate
 		$oPage->add_ready_script("$('#$this->iId').bind('keyup change validate', function(evt, sFormId) { return ValidatePasswordField('$this->iId', sFormId) } );"); // Bind to a custom event: validate

application/ui.searchformforeignkeys.class.inc.php

@@ -21,7 +21,6 @@
  */
 
 
-require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys
@@ -41,12 +40,11 @@ class UISearchFormForeignKeys
 	 */
 	public function ShowModalSearchForeignKeys($oPage, $sTitle)
 	{
-		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
 
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_iInputId}",
+		$oPage->AddUiBlock($oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_iInputId}",
 			array(
 				'menu' => false,
 				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_iInputId}",
@@ -55,16 +53,23 @@ class UISearchFormForeignKeys
 				'selection_mode' => true,
 				'cssCount' => "#count_{$this->m_iInputId}",
 				'query_params' => $oFilter->GetInternalParams(),
-			));
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_iInputId}\">\n";
-		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_iInputId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
-		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
-		$sHtml .= "</div>\n";
-		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_iInputId}\" value=\"0\"/>";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_iInputId}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_iInputId}\" disabled=\"disabled\" type=\"button\" onclick=\"return oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
-		$sHtml .= "</div>\n";
-		$sHtml .= "</form>\n";
-		$oPage->add($sHtml);
+			)));
+		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$sCancel = Dict::S('UI:Button:Cancel');
+		$sAdd = Dict::S('UI:Button:Add');
+
+		$oPage->add(<<<HTML
+<form id="ObjectsAddForm_{$this->m_iInputId}">
+    <div id="SearchResultsToAdd_{$this->m_iInputId}" style="vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;">
+        <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+    </div>
+    <input type="hidden" id="count_{$this->m_iInputId}" value="0"/>
+    <input type="button" value="{$sCancel}" onClick="$('#dlg_{$this->m_iInputId}').dialog('close');">&nbsp;&nbsp;
+    <input id="btn_ok_add_{$this->m_iInputId}" disabled="disabled" type="button" onclick="return oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);" value="{$sAdd}">
+</form>
+HTML
+		);
+
 		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes });");
 		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId} form').bind('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);");
@@ -112,4 +117,4 @@ class UISearchFormForeignKeys
 			array('menu' => false, 'cssCount' => "#count_{$this->m_iInputId}", 'selection_mode' => true, 'table_id' => "add_{$this->m_iInputId}"));
 	}
 
-}
+}

application/user.preferences.class.inc.php

@@ -35,15 +35,20 @@ require_once(APPROOT.'/core/userrights.class.inc.php');
 class appUserPreferences extends DBObject
 {
 	private static $oUserPrefs = null; // Local cache
-	
+
 	/**
 	 * Get the value of the given property/preference
 	 * If not set, the default value will be returned
+	 *
 	 * @param string $sCode Code/Name of the property to set
-	 * @param string $sDefaultValue The default value
-	 * @return string The value of the property for the current user
+	 * @param mixed $defaultValue The default value
+	 *
+	 * @return mixed The value of the property for the current user
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
 	 */
-	public static function GetPref($sCode, $sDefaultValue)
+	public static function GetPref($sCode, $defaultValue)
 	{
 		if (self::$oUserPrefs == null)
 		{
@@ -56,29 +61,35 @@ class appUserPreferences extends DBObject
 		}
 		else
 		{
-			return $sDefaultValue;
+			return $defaultValue;
 		}
 	}
-	
+
 	/**
 	 * Set the value for a given preference, and stores it into the database
+	 *
 	 * @param string $sCode Code/Name of the property/preference to set
-	 * @param string $sValue Value to set
+	 * @param mixed $value Value to set
+	 *
+	 * @return void
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
 	 */
-	public static function SetPref($sCode, $sValue)
+	public static function SetPref($sCode, $value)
 	{
 		if (self::$oUserPrefs == null)
 		{
 			self::Load();
 		}
 		$aPrefs = self::$oUserPrefs->Get('preferences');
-		if (array_key_exists($sCode, $aPrefs) && ($aPrefs[$sCode] === $sValue))
+		if (array_key_exists($sCode, $aPrefs) && ($aPrefs[$sCode] === $value))
 		{
 			// Do not write it again
 		}
 		else
 		{
-			$aPrefs[$sCode] = $sValue;
+			$aPrefs[$sCode] = $value;
 			self::$oUserPrefs->Set('preferences', $aPrefs);
 			self::Save();
 		}
@@ -86,8 +97,14 @@ class appUserPreferences extends DBObject
 
 	/**
 	 * Clears the value for a given preference (or list of preferences that matches a pattern), and updates the database
+	 *
 	 * @param string $sCodeOrPattern Code/Pattern of the properties/preferences to reset
 	 * @param boolean $bPattern Whether or not the supplied code is a PCRE pattern
+	 *
+	 * @return void
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
 	 */
 	public static function UnsetPref($sCodeOrPattern, $bPattern = false)
 	{
@@ -119,10 +136,14 @@ class appUserPreferences extends DBObject
 			self::Save();
 		}
 	}
-	
+
 	/**
 	 * Call this function to get all the preferences for the user, packed as a JSON object
+	 *
 	 * @return string JSON representation of the preferences
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
 	 */
 	public static function GetAsJSON()
 	{
@@ -136,19 +157,29 @@ class appUserPreferences extends DBObject
 
 	/**
 	 * Call this function if the user has changed (like when doing a logoff...)
+	 *
+	 * @return void
 	 */
 	public static function ResetPreferences()
 	{
 		self::$oUserPrefs = null;
 	}
+
 	/**
 	 * Call this function to ERASE all the preferences from the current user
+	 *
+	 * @return void
 	 */
 	public static function ClearPreferences()
 	{
 		self::$oUserPrefs = null;
 	}
-	
+
+	/**
+	 * Save preferences in the DB
+	 *
+	 * @return void;
+	 */
 	protected static function Save()
 	{
 		if (self::$oUserPrefs != null)
@@ -161,10 +192,15 @@ class appUserPreferences extends DBObject
 			}
 		}
 	}
-	
+
 	/**
 	 * Loads the preferences for the current user, creating the record in the database
 	 * if needed
+	 *
+	 * @return void;
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
 	 */
 	protected static function Load()
 	{
@@ -193,6 +229,9 @@ class appUserPreferences extends DBObject
 		self::$oUserPrefs = $oObj;
 	}
 
+	/**
+	 * @throws \CoreException
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -213,9 +252,22 @@ class appUserPreferences extends DBObject
 	}
 
 	/**
-	* Overloading this function here to secure a fix done right before the release
-	* The real fix should be to implement this verb in DBObject	
-	*/
+	 * Overloading this function here to secure a fix done right before the release
+	 * The real fix should be to implement this verb in DBObject
+	 *
+	 * @param \CMDBChange $oChange
+	 * @param bool|null $bSkipStrongSecurity
+	 * @param \DeletionPlan|null $oDeletionPlan
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DeleteException
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 */
 	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
 	{
 		utils::PushArchiveMode(false);

application/utils.inc.php

@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-use Combodo\iTop\Service\Module\ModuleService;
 use ScssPhp\ScssPhp\Compiler;
 
 
@@ -45,6 +44,57 @@ class FileUploadException extends Exception
  */
 class utils
 {
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_INTEGER = 'integer';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_CLASS = 'class';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_STRING = 'string';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_CONTEXT_PARAM = 'context_param';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_PARAMETER = 'parameter';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_FIELD_NAME = 'field_name';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_TRANSACTION_ID = 'transaction_id';
+	/**
+	 * @var string For XML / HTML node identifiers
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER = 'element_identifier';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const ENUM_SANITIZATION_FILTER_RAW_DATA = 'raw_data';
+	/**
+	 * @var string
+	 * @since 3.0.0
+	 */
+	public const DEFAULT_SANITIZATION_FILTER = self::ENUM_SANITIZATION_FILTER_RAW_DATA;
+
 	/**
 	 * Cache when getting config from disk or set externally (using {@link SetConfig})
 	 * @internal
@@ -284,32 +334,32 @@ class utils
 	 *
 	 * @since 2.5.2 2.6.0 new 'transaction_id' filter
 	 * @since 2.7.0 new 'element_identifier' filter
-	 * @since 2.7.7, 3.0.2, 3.1.0 N°4899 - new 'url' filter
+	 *
+	 * @throws \CoreException
 	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
 		switch ($sSanitizationFilter)
 		{
-			case 'integer':
+			case static::ENUM_SANITIZATION_FILTER_INTEGER:
 				$retValue = filter_var($value, FILTER_SANITIZE_NUMBER_INT);
 				break;
 
-			case 'class':
+			case static::ENUM_SANITIZATION_FILTER_CLASS:
 				$retValue = $value;
-				if (!MetaModel::IsValidClass($value))
-				{
-					$retValue = false;
+				if (($value != '') && !MetaModel::IsValidClass($value)) {
+					throw new CoreException(Dict::Format('UI:OQL:UnknownClassNoFix', utils::HtmlEntities($value)));
 				}
 				break;
 
-			case 'string':
+			case static::ENUM_SANITIZATION_FILTER_STRING:
 				$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
 				break;
 
-			case 'context_param':
-			case 'parameter':
-			case 'field_name':
-			case 'transaction_id':
+			case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
+			case static::ENUM_SANITIZATION_FILTER_PARAMETER:
+			case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
+			case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
 				if (is_array($value))
 				{
 					$retValue = array();
@@ -327,7 +377,7 @@ class utils
 				{
 					switch ($sSanitizationFilter)
 					{
-						case 'transaction_id':
+						case static::ENUM_SANITIZATION_FILTER_TRANSACTION_ID:
 							// same as parameter type but keep the dot character
 							// see N°1835 : when using file transaction_id on Windows you get *.tmp tokens
 							// it must be included at the regexp beginning otherwise you'll get an invalid character error
@@ -335,18 +385,18 @@ class utils
 								array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
 							break;
 
-						case 'parameter':
+						case static::ENUM_SANITIZATION_FILTER_PARAMETER:
 							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
 								array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
 							// characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
 							break;
 
-						case 'field_name':
+						case static::ENUM_SANITIZATION_FILTER_FIELD_NAME:
 							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
 								array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
 							break;
 
-						case 'context_param':
+						case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
 							$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
 								array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
 							break;
@@ -355,19 +405,12 @@ class utils
 				}
 				break;
 
-			// For XML / HTML node identifiers
-			case 'element_identifier':
-				$retValue = preg_replace('/[^a-zA-Z0-9_]/', '', $value);
-				break;
-
-			// For URL
-			case 'url':
-                // N°6350 - returns only valid URLs
-				$retValue = filter_var($value, FILTER_VALIDATE_URL);
+			case static::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER:
+				$retValue = preg_replace('/[^a-zA-Z0-9_-]/', '', $value);
 				break;
 
 			default:
-			case 'raw_data':
+			case static::ENUM_SANITIZATION_FILTER_RAW_DATA:
 				$retValue = $value;
 			// Do nothing
 		}
@@ -571,93 +614,48 @@ class utils
 
 	public static function ReadFromFile($sFileName)
 	{
-		if (!file_exists($sFileName)) {
-			return false;
-		}
-
+		if (!file_exists($sFileName)) return false;
 		return file_get_contents($sFileName);
 	}
 
 	/**
-	 * @param mixed $value The value as read from php.ini (eg 256k, 2M, 1G etc.)
-	 *
-	 * @return int conversion to number of bytes
-	 *
-	 * @since 2.7.5 3.0.0 convert to int numeric values
-	 *
-	 * @link https://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes Shorthand bytes value reference in PHP.net FAQ
+	 * Helper function to convert a value expressed in a 'user friendly format'
+	 * as in php.ini, e.g. 256k, 2M, 1G etc. Into a number of bytes
+	 * @param mixed $value The value as read from php.ini
+	 * @return number
 	 */
-	public static function ConvertToBytes($value)
+	public static function ConvertToBytes( $value )
 	{
-		if (!is_numeric($value)) {
-			$iLength = strlen($value);
-			$iReturn = substr($value, 0, $iLength - 1);
-			$sUnit = strtoupper(substr($value, $iLength - 1));
-			switch ($sUnit) {
-				case 'G':
-					$iReturn *= 1024;
-				case 'M':
-					$iReturn *= 1024;
-				case 'K':
-					$iReturn *= 1024;
-			}
-		} else {
-			$iReturn = (int)$value;
-		}
-
-		return $iReturn;
-	}
-
-	/**
-	 * Checks if the memory limit is at least what is required
-	 *
-	 * @param int $iMemoryLimit set limit in bytes, use {@link utils::ConvertToBytes()} to convert current php.ini value
-	 * @param int $iRequiredLimit required limit in bytes
-	 *
-	 * @return bool
-	 */
-	public static function IsMemoryLimitOk($iMemoryLimit, $iRequiredLimit)
-	{
-		if ($iMemoryLimit === -1) {
-			// -1 means : no limit (see https://www.php.net/manual/fr/ini.core.php#ini.memory-limit)
-			return true;
-		}
-
-		return ($iMemoryLimit >= $iRequiredLimit);
-	}
-
-	/**
-	 * Set memory_limit to required value
-	 *
-	 * @param string $sRequiredLimit required limit, for example '512M'
-	 *
-	 * @return bool|null null if nothing was done, true if modifying memory_limit was successful, false otherwise
-	 *
-	 * @uses utils::ConvertToBytes()
-	 * @uses \ini_get('memory_limit')
-	 * @uses \ini_set()
-	 * @uses utils::ConvertToBytes()
-	 *
-	 * @since 2.7.5 N°3806
-	 */
-	public static function SetMinMemoryLimit($sRequiredLimit)
-	{
-		$iRequiredLimit = static::ConvertToBytes($sRequiredLimit);
-		$sMemoryLimit = trim(ini_get('memory_limit'));
-		if (empty($sMemoryLimit)) {
-			// On some PHP installations, memory_limit does not exist as a PHP setting!
-			// (encountered on a 5.2.0 under Windows)
-			// In that case, ini_set will not work
-			return false;
-		}
-		$iMemoryLimit = static::ConvertToBytes($sMemoryLimit);
-
-		if (static::IsMemoryLimitOk($iMemoryLimit, $iRequiredLimit)) {
-			return null;
-		}
-
-		return ini_set('memory_limit', $iRequiredLimit);
-	}
+		$iReturn = $value;
+	    if ( !is_numeric( $value ) )
+		{
+	        $iLength = strlen( $value );
+	        $iReturn = substr( $value, 0, $iLength - 1 );
+	        $sUnit = strtoupper( substr( $value, $iLength - 1 ) );
+	        switch ( $sUnit )
+			{
+	            case 'G':
+	                $iReturn *= 1024;
+	            case 'M':
+	                $iReturn *= 1024;
+	            case 'K':
+	                $iReturn *= 1024;
+	        }
+	    }
+        return $iReturn;
+    }
+  
+  /**
+   * Checks if the memory limit is at least what is required
+   *
+   * @param int $memoryLimit set limit in bytes
+   * @param int $requiredLimit required limit in bytes
+   * @return bool
+   */
+  public static function IsMemoryLimitOk($memoryLimit, $requiredLimit)
+  {
+      return ($memoryLimit >= $requiredLimit) || ($memoryLimit == -1);
+  }
 
 	/**
 	 * Format a value into a more friendly format (KB, MB, GB, TB) instead a juste a Bytes amount.
@@ -786,7 +784,7 @@ class utils
 	 * @throws \ConfigException
 	 * @throws \CoreException
 	 *
-	 * @since 2.7.0 N°2478 this method will now always call {@link MetaModel::GetConfig} first, and cache in this class is only set when loading from disk
+	 * @since 2.7.0 N°2478 always call {@link MetaModel::GetConfig} first, cache is only set when loading from disk
 	 */
 	public static function GetConfig()
 	{
@@ -820,57 +818,40 @@ class utils
 		return new Config();
 	}
 
-	public static function InitTimeZone() {
-		$oConfig = self::GetConfig();
+	public static function InitTimeZone($oConfig = null)
+	{
+		if (is_null($oConfig))
+		{
+			$oConfig = self::GetConfig();
+		}
 		$sItopTimeZone = $oConfig->Get('timezone');
-
 		if (!empty($sItopTimeZone))
 		{
 			date_default_timezone_set($sItopTimeZone);
 		}
-		else
-		{
-			// Leave as is... up to the admin to set a value somewhere...
-			// see http://php.net/manual/en/datetime.configuration.php#ini.date.timezone
-		}
-	}
-
-	/**
-	 * @return bool The boolean value of the conf. "behind_reverse_proxy" (except if there is no REMOTE_ADDR int his case, it return false)
-	 *
-	 * @since 2.7.4
-	 */
-	public static function IsProxyTrusted()
-	{
-		if (empty($_SERVER['REMOTE_ADDR'])) {
-			return false;
-		}
-
-		$bTrustProxies = (bool) self::GetConfig()->Get('behind_reverse_proxy');
-
-		return $bTrustProxies;
+		//		else
+		//		{
+		//			// Leave as is... up to the admin to set a value somewhere...
+		//			// see http://php.net/manual/en/datetime.configuration.php#ini.date.timezone
+		//		}
 	}
 
     /**
      * Returns the absolute URL to the application root path
      *
-     * @param bool $bForceTrustProxy
-     *
      * @return string The absolute URL to the application root, without the first slash
      *
      * @throws \Exception
-     *
-     * @since 2.7.4 $bForceTrustProxy param added
      */
-	public static function GetAbsoluteUrlAppRoot($bForceTrustProxy = false)
+	public static function GetAbsoluteUrlAppRoot()
 	{
 		static $sUrl = null;
-		if ($sUrl === null || $bForceTrustProxy)
+		if ($sUrl === null)
 		{
 			$sUrl = self::GetConfig()->Get('app_root_url');
 			if ($sUrl == '')
 			{
-				$sUrl = self::GetDefaultUrlAppRoot($bForceTrustProxy);
+				$sUrl = self::GetDefaultUrlAppRoot();
 			}
 			elseif (strpos($sUrl, SERVER_NAME_PLACEHOLDER) > -1)
 			{
@@ -894,116 +875,31 @@ class utils
 	 * For most usages, when an root url is needed, use utils::GetAbsoluteUrlAppRoot() instead as uses this only as a fallback when the
 	 * app_root_url conf parameter is not defined.
 	 *
-	 * @param bool $bForceTrustProxy
-	 *
 	 * @return string
 	 *
 	 * @throws \Exception
-	 *
-	 * @since 2.7.4 $bForceTrustProxy param added
-	 */
-	public static function GetDefaultUrlAppRoot($bForceTrustProxy = false)
-	{
-		$sAbsoluteUrl = self::GetCurrentAbsoluteUrl($bForceTrustProxy, true);
-
-		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
-		$sAppRoot       = realpath(APPROOT);
-
-		return self::GetAppRootUrl($sCurrentScript, $sAppRoot, $sAbsoluteUrl);
-	}
-
-
-	/**
-	 * Build the current absolute URL from the server's variables.
-	 *
-	 * For almost every usage, you should use the more secure utils::GetAbsoluteUrlAppRoot() : instead of reading the current uri, it provide you the configured application's root URL (this is done during the setup and chn be changed in the configuration file)
-	 *
-	 * @see utils::GetAbsoluteUrlAppRoot
-	 *
-	 * @param bool $bForceTrustProxy
-	 * @param bool $bTrimQueryString
-	 *
-	 * @return string
-	 *
-	 * @since 2.7.4
-	 */
-	public static function GetCurrentAbsoluteUrl($bForceTrustProxy = false, $bTrimQueryString = false)
+     */
+    public static function GetDefaultUrlAppRoot()
 	{
 		// Build an absolute URL to this page on this server/port
-		$sServerName = self::GetServerName($bForceTrustProxy);
-		$bIsSecure = self::IsConnectionSecure($bForceTrustProxy);
-		$sProtocol = $bIsSecure ? 'https' : 'http';
-		$iPort = self::GetServerPort($bForceTrustProxy);
-		if ($bIsSecure) {
-			$sPort = ($iPort == 443) ? '' : ':'.$iPort;
-		} else {
+		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
+		$sProtocol = self::IsConnectionSecure() ? 'https' : 'http';
+		$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
+		if ($sProtocol == 'http')
+		{
 			$sPort = ($iPort == 80) ? '' : ':'.$iPort;
 		}
-
-		$sPath = self::GetRequestUri($bForceTrustProxy);
-
-		if ($bTrimQueryString) {
-			// remove all the parameters from the query string
-			$iQuestionMarkPos = strpos($sPath, '?');
-			if ($iQuestionMarkPos !== false) {
-				$sPath = substr($sPath, 0, $iQuestionMarkPos);
-			}
+		else
+		{
+			$sPort = ($iPort == 443) ? '' : ':'.$iPort;
 		}
-
-		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
-
-		return $sAbsoluteUrl;
-	}
-
-	/**
-	 * @param bool $bForceTrustProxy
-	 *
-	 * @return string
-	 *
-	 * @since 2.7.4
-	 */
-	public static function GetServerName($bForceTrustProxy = false)
-	{
-		$bTrustProxy = $bForceTrustProxy || self::IsProxyTrusted();
-
-		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-
-		if ($bTrustProxy) {
-			$sServerName = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $sServerName;
-		}
-
-		return $sServerName;
-	}
-
-	/**
-	 * @param bool $bForceTrustProxy
-	 *
-	 * @return int|mixed
-	 * @since 2.7.4
-	 */
-	public static function GetServerPort($bForceTrustProxy = false)
-	{
-		$bTrustProxy = $bForceTrustProxy || self::IsProxyTrusted();
-
-		$sServerPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
-
-		if ($bTrustProxy) {
-			$sServerPort = isset($_SERVER['HTTP_X_FORWARDED_PORT']) ? $_SERVER['HTTP_X_FORWARDED_PORT'] : $sServerPort;
-		}
-
-		return $sServerPort;
-	}
-
-	/**
-	 * @return string
-	 *
-	 * @since 2.7.4
-	 */
-	public static function GetRequestUri()
-	{
 		// $_SERVER['REQUEST_URI'] is empty when running on IIS
 		// Let's use Ivan Tcholakov's fix (found on www.dokeos.com)
-		if (empty($_SERVER['REQUEST_URI']))
+		if (!empty($_SERVER['REQUEST_URI']))
+		{
+			$sPath = $_SERVER['REQUEST_URI'];
+		}
+		else
 		{
 			$sPath = $_SERVER['SCRIPT_NAME'];
 			if (!empty($_SERVER['QUERY_STRING']))
@@ -1014,7 +910,18 @@ class utils
 		}
 		$sPath = $_SERVER['REQUEST_URI'];
 
-		return $sPath;
+		// remove all the parameters from the query string
+		$iQuestionMarkPos = strpos($sPath, '?');
+		if ($iQuestionMarkPos !== false)
+		{
+			$sPath = substr($sPath, 0, $iQuestionMarkPos);
+		}
+		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
+
+		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
+		$sAppRoot       = realpath(APPROOT);
+
+		return self::GetAppRootUrl($sCurrentScript, $sAppRoot, $sAbsoluteUrl);
 	}
 
 	/**
@@ -1055,39 +962,44 @@ class utils
 		return $sAppRootUrl;
 	}
 
+	/**
+	 * Return the complete revision number of the application
+	 *
+	 * @return string
+	 * @since 3.0.0
+	 */
+	public static function GetAppRevisionNumber()
+	{
+		if (ITOP_REVISION == 'svn')
+		{
+			// This is NOT a version built using the build system, just display the main version
+			$sRevisionNumber = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
+		}
+		else
+		{
+			// This is a build made from SVN, let display the full information
+			$sRevisionNumber = Dict::Format('UI:iTopVersion:Long', ITOP_APPLICATION, ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
+		}
+
+		return $sRevisionNumber;
+	}
+
 	/**
 	 * Helper to handle the variety of HTTP servers
 	 * See N°286 (fixed in [896]), and N°634 (this fix)
-	 *
+	 * 	 
 	 * Though the official specs says 'a non empty string', some servers like IIS do set it to 'off' !
 	 * nginx set it to an empty string
-	 * Others might leave it unset (no array entry)
-	 *
-	 * @param bool $bForceTrustProxy
-	 *
-	 * @return bool
-	 *
-	 * @since 2.7.4 reverse proxies handling
-	 */
-	public static function IsConnectionSecure($bForceTrustProxy = false)
+	 * Others might leave it unset (no array entry)	 
+	 */	 	
+	public static function IsConnectionSecure()
 	{
 		$bSecured = false;
 
-		$bTrustProxy = $bForceTrustProxy || self::IsProxyTrusted();
-
-		if ($bTrustProxy && !empty($_SERVER['HTTP_X_FORWARDED_PROTO']))
-		{
-			$bSecured = ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https');
-		}
-		elseif ($bTrustProxy && !empty($_SERVER['HTTP_X_FORWARDED_PROTOCOL']))
-		{
-			$bSecured = ($_SERVER['HTTP_X_FORWARDED_PROTOCOL'] === 'https');
-		}
-		elseif ((!empty($_SERVER['HTTPS'])) && (strtolower($_SERVER['HTTPS']) != 'off'))
+		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off'))
 		{
 			$bSecured = true;
 		}
-
 		return $bSecured;
 	}
 
@@ -1105,16 +1017,11 @@ class utils
 
 	/**
 	 * Get the _SESSION variable for logging purpose
-	 * @return false|string
+	 * @return string
 	 */
 	public static function GetSessionLog()
 	{
-		ob_start();
-		print_r($_SESSION);
-		$sSessionLog = ob_get_contents();
-		ob_end_clean();
-
-		return $sSessionLog;
+		return print_r($_SESSION, true);
 	}
 
 	 static function DebugBacktrace($iLimit = 5)
@@ -1158,19 +1065,19 @@ class utils
 			throw new Exception("The path to php must not be empty. Please set a value for 'php_path' in your configuration file.");
 		}
 
-		$sAuthUser = self::ReadParam('auth_user', '', 'raw_data');
-		$sAuthPwd = self::ReadParam('auth_pwd', '', 'raw_data');
-		$sParamFile = self::GetParamSourceFile('auth_user');
-		if (is_null($sParamFile))
-		{
+		if (!isset($aArguments['auth_user'])) {
+			$sAuthUser = self::ReadParam('auth_user', '', 'raw_data');
 			$aArguments['auth_user'] = $sAuthUser;
+		}
+		if (!isset($aArguments['auth_pwd'])) {
+			$sAuthPwd = self::ReadParam('auth_pwd', '', 'raw_data');
 			$aArguments['auth_pwd'] = $sAuthPwd;
 		}
-		else
-		{
+		if (!isset($aArguments['param_file'])) {
+			$sParamFile = self::ReadParam('param_file', '', 'raw_data');
 			$aArguments['param_file'] = $sParamFile;
 		}
-		
+
 		$aArgs = array();
 		foreach($aArguments as $sName => $value)
 		{
@@ -1322,6 +1229,7 @@ class utils
 				new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")"),
 				new SeparatorPopupMenuItem(),
 				new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $sUrl.'&printable=1', '_blank'),
+				new JSPopupMenuItem('UI:Menu:SwitchTabMode', Dict::S('UI:Menu:SwitchTabMode'), "SwitchTabMode()"),
 			);
 			break;
 
@@ -1331,19 +1239,19 @@ class utils
 				$oDashboard = $param;
 				$sDashboardId = $oDashboard->GetId();
 				$sDashboardFile = $oDashboard->GetDefinitionFile();
-				$sDashboardFileRelative = utils::LocalPath($sDashboardFile);
 				$sDlgTitle = addslashes(Dict::S('UI:ImportDashboardTitle'));
 				$sDlgText = addslashes(Dict::S('UI:ImportDashboardText'));
 				$sCloseBtn = addslashes(Dict::S('UI:Button:Cancel'));
-				$sDashboardFileJS = addslashes($sDashboardFileRelative);
-				$sDashboardFileURL = urlencode($sDashboardFileRelative);
+				$sDashboardFileJS = addslashes($sDashboardFile);
+				$sDashboardFileURL = urlencode($sDashboardFile);
 				$sUploadDashboardTransactId = utils::GetNewTransactionId();
 				$aResult = array(
 					new SeparatorPopupMenuItem(),
 					new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sDashboardId.'&file='.$sDashboardFileURL),
 					new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sDashboardId', file: '$sDashboardFileJS', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn', transaction: '$sUploadDashboardTransactId' })"),
 				);
-				if ($oDashboard->GetReloadURL()) {
+				if ($oDashboard->GetReloadURL())
+				{
 					$aResult[] = new SeparatorPopupMenuItem();
 					$aResult[] = new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $oDashboard->GetReloadURL().'&printable=1', '_blank');
 				}
@@ -1552,13 +1460,12 @@ class utils
 			// For instance fopen does not allow to work around the bug: http://stackoverflow.com/questions/18191672/php-curl-ssl-routinesssl23-get-server-helloreason1112
 			// by setting the SSLVERSION to 3 as done below.
 			$aHeaders = explode("\n", $sOptionnalHeaders);
+			// N°3267 - Webservices: Fix optional headers not being taken into account
+			//          See https://www.php.net/curl_setopt CURLOPT_HTTPHEADER
 			$aHTTPHeaders = array();
 			foreach($aHeaders as $sHeaderString)
 			{
-				if(preg_match('/^([^:]): (.+)$/', $sHeaderString, $aMatches))
-				{
-					$aHTTPHeaders[$aMatches[1]] = $aMatches[2];
-				}
+				$aHTTPHeaders[] = trim($sHeaderString);
 			}
 			// Default options, can be overloaded/extended with the 4th parameter of this method, see above $aCurlOptions
 			$aOptions = array(
@@ -1790,7 +1697,7 @@ class utils
 		set_time_limit(0);
 		// Compiling SASS
 		$sCss = $oSass->compile($sSassContent);
-		set_time_limit($iCurrentMaxExecTime);
+		set_time_limit(intval($iCurrentMaxExecTime));
 
 		return $sCss;
 	}
@@ -1947,38 +1854,68 @@ class utils
 	 */
 	public static function GetCurrentModuleName($iCallDepth = 0)
 	{
-        return ModuleService::GetInstance()->GetCurrentModuleName($iCallDepth + 1);
+		$sCurrentModuleName = '';
+		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
+		
+		foreach(GetModulesInfo() as $sModuleName => $aInfo)
+		{
+			if ($aInfo['root_dir'] !== '')
+			{
+				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
+				
+				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
+				{
+					$sCurrentModuleName = $sModuleName;
+					break;
+				}
+			}
+		}
+		return $sCurrentModuleName;
 	}
 	
 	/**
-	 * **Warning** : returned result can be invalid as we're using backtrace to find the module dir name
-	 *
-	 * @param int $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
-	 *
-	 * @return string the relative (to MODULESROOT) path of the root directory of the module containing the file where the call to
-	 *     this function is made
-	 *     or an empty string if no such module is found (or not called within a module file)
-	 *
-	 * @uses \debug_backtrace()
+	 * Returns the relative (to MODULESROOT) path of the root directory of the module containing the file where the call to
+	 * this function is made
+	 * or an empty string if no such module is found (or not called within a module file)
+	 * @param number $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
+	 * @return string
 	 */
 	public static function GetCurrentModuleDir($iCallDepth)
 	{
-		return ModuleService::GetInstance()->GetCurrentModuleDir($iCallDepth);
+		$sCurrentModuleDir = '';
+		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
+	
+		foreach(GetModulesInfo() as $sModuleName => $aInfo)
+		{
+			if ($aInfo['root_dir'] !== '')
+			{
+				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
+	
+				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
+				{
+					$sCurrentModuleDir = basename($sRootDir);
+					break;
+				}
+			}
+		}
+		return $sCurrentModuleDir;
 	}
 
 	/**
-	 * **Warning** : as this method uses {@see GetCurrentModuleDir} it produces hazardous results.
-	 * You should better uses directly {@see GetAbsoluteUrlModulesRoot} and add the module dir name yourself ! See N°4573
-	 *
 	 * @return string the base URL for all files in the current module from which this method is called
 	 * or an empty string if no such module is found (or not called within a module file)
 	 * @throws \Exception
-	 *
-	 * @uses GetCurrentModuleDir
 	 */
 	public static function GetCurrentModuleUrl()
 	{
-		return ModuleService::GetInstance()->GetCurrentModuleUrl(1);
+		$sDir = static::GetCurrentModuleDir(1);
+		if ( $sDir !== '')
+		{
+			return static::GetAbsoluteUrlModulesRoot().'/'.$sDir;
+		}
+		return '';
 	}
 	
 	/**
@@ -1988,7 +1925,8 @@ class utils
 	 */
 	public static function GetCurrentModuleSetting($sProperty, $defaultvalue = null)
 	{
-        return ModuleService::GetInstance()->GetCurrentModuleSetting($sProperty, $defaultvalue);
+		$sModuleName = static::GetCurrentModuleName(1);
+		return MetaModel::GetModuleSetting($sModuleName, $sProperty, $defaultvalue);
 	}
 	
 	/**
@@ -1997,7 +1935,12 @@ class utils
 	 */
 	public static function GetCompiledModuleVersion($sModuleName)
 	{
-        return ModuleService::GetInstance()->GetCompiledModuleVersion($sModuleName);
+		$aModulesInfo = GetModulesInfo();
+		if (array_key_exists($sModuleName, $aModulesInfo))
+		{
+			return $aModulesInfo[$sModuleName]['version'];
+		}
+		return null;
 	}
 	
 	/**
@@ -2210,27 +2153,51 @@ class utils
 	 */
 	public static function GetCacheBusterTimestamp()
 	{
-		if(!defined('COMPILATION_TIMESTAMP'))
-		{
+		if (!defined('COMPILATION_TIMESTAMP')) {
 			return ITOP_VERSION;
 		}
+
 		return COMPILATION_TIMESTAMP;
 	}
 
 	/**
-	 * @return string eg : '2_7_0' if iTop core version is '2.7.5-2'
-	 * @throws \ApplicationException if constant value is invalid
-	 * @uses ITOP_CORE_VERSION
+	 * @return string eg : '2_7_0' ITOP_VERSION is '2.7.1-dev'
 	 */
-	public static function GetItopVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION)
-	{
-		$aExplodedVersion = explode('.', $sItopVersion);
+	public static function GetItopVersionWikiSyntax() {
+		$sMinorVersion = self::GetItopMinorVersion();
 
-		if ((false === isset($aExplodedVersion[0])) || (false === isset($aExplodedVersion[1]))) {
-			throw new ApplicationException('iTop version is wrongfully configured!');
+		return str_replace('.', '_', $sMinorVersion).'_0';
+	}
+
+	/**
+	 * @param string $sPatchVersion if non provided, will call GetItopPatchVersion
+	 *
+	 * @return string eg 2.7 if ITOP_VERSION is '2.7.0-dev'
+	 * @throws \Exception
+	 */
+	public static function GetItopMinorVersion($sPatchVersion = null) {
+		if (is_null($sPatchVersion)) {
+			$sPatchVersion = self::GetItopPatchVersion();
+		}
+		$aExplodedVersion = explode('.', $sPatchVersion);
+
+		if (count($aExplodedVersion) < 2) {
+			throw new Exception('iTop version is wrongfully configured!');
+		}
+		if (($aExplodedVersion[0] == '') || ($aExplodedVersion[1] == '')) {
+			throw new Exception('iTop version is wrongfully configured!');
 		}
 
-		return "{$aExplodedVersion[0]}_{$aExplodedVersion[1]}_0";
+		return sprintf('%d.%d', $aExplodedVersion[0], $aExplodedVersion[1]);
+	}
+
+	/**
+	 * @return string eg '2.7.0' if ITOP_VERSION is '2.7.0-dev'
+	 */
+	public static function GetItopPatchVersion() {
+		$aExplodedVersion = explode('-', ITOP_VERSION);
+
+		return $aExplodedVersion[0];
 	}
 
 	/**
@@ -2262,6 +2229,18 @@ class utils
 		return ITOP_REVISION  === 'svn';
 	}
 
+	/**
+	 * Check if debug is enabled in the current environment.
+	 * Currently just checking if the "debug=true" parameter is in the URL, but could be more complex.
+	 *
+	 * @return bool
+	 * @since 3.0.0
+	 */
+	public static function IsDebugEnabled()
+	{
+		return utils::ReadParam('debug') === 'true';
+	}
+
 	/**
 	 * @see https://php.net/manual/en/function.finfo-file.php
 	 *
@@ -2330,11 +2309,8 @@ class utils
 	}
 
 	/**
-	 * @param string $sPath for example `/var/www/html/itop/data/backups/manual/itop_27-2019-10-03_15_35.tar.gz`
-	 *    **Warning**, if path is a symlink, it will be resolved !
-	 *      So `C:\Dev\wamp64\www\itop-dev/env-production/itop-hub-connector/land.php`
-	 *      Will become `C:\Dev\wamp64\www\itop-dev\datamodels\2.x\itop-hub-connector\land.php`
-	 * @param string $sBasePath for example `/var/www/html/itop/data/`
+	 * @param string $sPath for example '/var/www/html/itop/data/backups/manual/itop_27-2019-10-03_15_35.tar.gz'
+	 * @param string $sBasePath for example '/var/www/html/itop/data/'
 	 *
 	 * @return bool|string false if path :
 	 *      * invalid
@@ -2342,10 +2318,7 @@ class utils
 	 *      * not contained in base path
 	 *    Otherwise return the real path (see realpath())
 	 *
-	 * @uses \realpath()
-	 * @uses static::StartsWith
 	 * @since 2.6.5 2.7.0 N°2538
-	 * @since 2.7.5 details in PHPDoc about symlink resolution
 	 */
 	final public static function RealPath($sPath, $sBasePath)
 	{
@@ -2431,12 +2404,17 @@ class utils
 		return str_replace(' ', '', ucwords(strtr($sInput, '_-', '  ')));
 	}
 
+	public static function FilterXSS($sHTML)
+	{
+		return str_ireplace('<script', '&lt;script', $sHTML);
+	}
+
 	/**
 	 * @param \cmdbAbstractObject $oCmdbAbstract
 	 * @param \Exception $oException
 	 *
 	 * @throws \Exception
-	 * @since 2.7.2/ 2.8.0
+	 * @since 2.7.2/ 3.0.0
 	 */
 	public static function EnrichRaisedException($oCmdbAbstract, $oException)
 	{
@@ -2454,12 +2432,9 @@ class utils
 	}
 
 	/**
-	 * @return bool : indicate whether we run under a windows environnement or not
-	 * @since 2.7.4 : N°3412
+	 * @since 3.0.0
 	 */
-	public static function IsWindowsEnvironment(){
-		return (substr(PHP_OS,0,3) === 'WIN');
+	public static function IsEasterEggAllowed(){
+		return (stripos(ITOP_VERSION, 'alpha') !== false) || utils::IsDevelopmentEnvironment();
 	}
-
-
 }

application/wizardhelper.class.inc.php

@@ -335,20 +335,41 @@ class WizardHelper
 		{
 			$sResult = $this->m_aData['m_oFieldsMap'][$sFieldName];
 		}
+
 		return $sResult;
 	}
-	
+
+	public function GetReturnNotEditableFields()
+	{
+		return $this->m_aData['m_bReturnNotEditableFields'] ?? false;
+	}
+
+	/**
+	 * @return string JS code to be executed for fields update
+	 * @since 3.0.0 N°3198
+	 */
+	public function GetJsForUpdateFields()
+	{
+		$sWizardHelperJsVar = ($this->m_aData['m_sWizHelperJsVarName']) ?? 'oWizardHelper'.$this->GetFormPrefix();
+		$sWizardHelperJson = $this->ToJSON();
+
+		return <<<JS
+{$sWizardHelperJsVar}.m_oData = {$sWizardHelperJson};
+{$sWizardHelperJsVar}.UpdateFields();
+JS;
+	}
+
 	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
 	{
 		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
 		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
-		foreach($aSet as $aLinkObj)
+		foreach ($aSet as $aLinkObj)
 		{
 			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach($aLinkObj as $sAttCode => $value)
+			foreach ($aLinkObj as $sAttCode => $value)
 			{
 				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
-				if (($oAttDef->IsExternalKey()) && ($value != '')  && ($value > 0))
+				if (($oAttDef->IsExternalKey()) && ($value != '') && ($value > 0))
 				{
 					// For external keys: load the target object so that external fields
 					// get filled too

application/xmlpage.class.inc.php

@@ -1,109 +1,7 @@
 <?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/>
-
-
 /**
- * Class XMLPage
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/XMLPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-/**
- * Simple web page with no includes or fancy formatting, useful to generateXML documents
- * The page adds the content-type text/XML and the encoding into the headers
- */
-class XMLPage extends WebPage
-{
-	/**
-	 * For big XML files, it's better NOT to store everything in memory and output the XML piece by piece
-	 */
-	var $m_bPassThrough;
-	var $m_bHeaderSent;
-	
-	function __construct($s_title, $bPassThrough = false)
-	{
-		parent::__construct($s_title);
-		$this->m_bPassThrough = $bPassThrough;
-		$this->m_bHeaderSent = false;
-		$this->add_header("Content-type: text/xml; charset=".self::PAGES_CHARSET);
-		$this->no_cache();
-		$this->add_xframe_options();
-		$this->add_header("Content-location: export.xml");
-	}
-
-	public function output()
-	{
-		if (!$this->m_bPassThrough)
-		{
-			// 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->add_header("Content-Length: ".strlen($this->s_content));
-			foreach($this->a_headers as $s_header)
-			{
-				header($s_header);
-			}
-			echo $this->s_content;
-		}
-		if (class_exists('DBSearch'))
-		{
-			DBSearch::RecordQueryTrace();
-		}
-	}
-
-	public function add($sText)
-	{
-		if (!$this->m_bPassThrough)
-		{
-			parent::add($sText);
-		}
-		else
-		{
-			if ($this->m_bHeaderSent)
-			{
-				echo $sText;
-			}
-			else
-			{
-				$s_captured_output = $this->ob_get_clean_safe();
-				foreach($this->a_headers as $s_header)
-				{
-					header($s_header);
-				}
-				$sCharset = self::PAGES_CHARSET;
-				echo "<?xml version=\"1.0\" encoding=\"$sCharset\"?".">\n";
-				echo trim($s_captured_output);
-				echo trim($this->s_content);
-				echo $sText;
-				$this->m_bHeaderSent = true;
-			}
-		}
-	}
-
-	public function small_p($sText)
-	{
-	}
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-	}
-}
+ 

approot.inc.php

@@ -3,18 +3,4 @@
 define('APPROOT', dirname(__FILE__).'/');
 define('APPCONF', APPROOT.'conf/');
 
-
-/**
- * Constant containing the iTop core version, whatever application was built
- *
- * Note that in iTop 3.0.0 we used {@see ITOP_DESIGN_LATEST_VERSION} to get core version.
- * When releasing, both constants should be updated : see `.make/release/update-versions.php` for that !
- *
- * @since 2.7.7 3.0.1 3.1.0 N°4714 constant creation
- * @used-by utils::GetItopVersionWikiSyntax()
- * @used-by iTopModulesPhpVersionIntegrationTest
- */
-define('ITOP_CORE_VERSION', '2.7.9');
-
-
 require_once APPROOT.'bootstrap.inc.php';

bootstrap.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * Copyright (C) 2013-2020 Combodo SARL
  *
  * This file is part of iTop.
  *
@@ -18,12 +18,33 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+
+/**
+ * Checks PHP version
+ *
+ * This is a hard-coded check that limits errors : we are stopping for anything < PHP 7.0.0
+ * The "real one" will be done in {@link \SetupUtils::CheckPhpVersion()}
+ *
+ * @since 3.0.0 N°2214
+ */
+$bIsValidPhpVersion = false;
+if (PHP_MAJOR_VERSION >= 7) {
+	$bIsValidPhpVersion = true;
+} else {
+	echo 'Your PHP version ('.PHP_VERSION.') isn\'t supported.';
+	exit(-1);
+}
+
+
 define('ITOP_DEFAULT_ENV', 'production');
 define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
 define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
 
-$fItopStarted = microtime(true);
-$iItopInitialMemory = memory_get_usage(true);
+if (function_exists('microtime')) {
+	$fItopStarted = microtime(true);
+} else {
+	$fItopStarted = 1000 * time();
+}
 
 if (! isset($GLOBALS['bBypassAutoload']) || $GLOBALS['bBypassAutoload'] == false)
 {

composer.json

@@ -1,8 +1,6 @@
 {
-  "name": "combodo/itop",
-  "description": "IT Operations Portal",
   "type": "project",
-  "license": "AGPL-3.0-only",
+  "license": "AGPLv3",
   "require": {
     "php": ">=7.1.3",
     "ext-ctype": "*",
@@ -12,29 +10,22 @@
     "ext-json": "*",
     "ext-mysqli": "*",
     "ext-soap": "*",
-    "combodo/tcpdf": "~6.4.4",
-    "firebase/php-jwt": "~6.4.0",
-    "guzzlehttp/guzzle": "^6.5.8",
-    "guzzlehttp/psr7": "~1.9.1",
-    "laminas/laminas-mail": "^2.11",
-    "laminas/laminas-servicemanager": "^3.5",
-    "league/oauth2-google": "^3.0",
-    "nikic/php-parser": "~4.13.2",
-    "pear/archive_tar": "~1.4.14",
-    "pelago/emogrifier": "~3.1.0",
+    "combodo/tcpdf": "6.3.5",
+    "nikic/php-parser": "^3.1",
+    "pear/archive_tar": "1.4.10",
+    "pelago/emogrifier": "2.1.0",
     "scssphp/scssphp": "1.0.6",
-    "swiftmailer/swiftmailer": "~6.3.0",
-    "symfony/console": "~3.4.47",
-    "symfony/dotenv": "~3.4.47",
-    "symfony/framework-bundle": "~3.4.47",
-    "symfony/twig-bundle": "~3.4.47",
-    "symfony/yaml": "~3.4.47",
-    "thenetworg/oauth2-azure": "^2.0",
-    "twig/twig": "~1.42.5"
+    "swiftmailer/swiftmailer": "5.4.12",
+    "symfony/console": "3.4.*",
+    "symfony/dotenv": "3.4.*",
+    "symfony/framework-bundle": "3.4.*",
+    "symfony/polyfill-php70": "1.*",
+    "symfony/twig-bundle": "3.4.*",
+    "symfony/yaml": "3.4.*"
   },
   "require-dev": {
-    "symfony/stopwatch": "~3.4.47",
-    "symfony/web-profiler-bundle": "~3.4.47"
+    "symfony/stopwatch": "3.4.*",
+    "symfony/web-profiler-bundle": "3.4.*"
   },
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
@@ -46,7 +37,7 @@
   },
   "config": {
     "platform": {
-      "php": "7.1.3"
+      "php": "7.2.0"
     },
     "vendor-dir": "lib",
     "preferred-install": {
@@ -62,8 +53,8 @@
       "sources/application",
       "sources/Composer",
       "sources/Controller",
-      "sources/Service",
-      "sources/Core"
+      "sources/Form",
+      "sources/Renderer"
     ],
     "exclude-from-classmap": [
       "core/dbobjectsearch.class.php",
@@ -72,6 +63,7 @@
       "core/legacy/querybuildercontextlegacy.class.inc.php",
       "core/querybuilderexpressions.class.inc.php",
       "core/legacy/querybuilderexpressionslegacy.class.inc.php",
+      "application/startup.inc.php",
       "application/loginform.class.inc.php",
       "application/loginbasic.class.inc.php",
       "application/logindefault.class.inc.php",

core/MyHelpers.class.inc.php

@@ -67,7 +67,8 @@ class MyHelpers
 	// format sss.mmmuuupppnnn 
 	public static function getmicrotime()
 	{ 
-		return microtime(true);
+		list($usec, $sec) = explode(" ",microtime()); 
+		return ((float)$usec + (float)$sec); 
 	}
 
 	/*
@@ -419,7 +420,6 @@ class MyHelpers
 		//}
 		return $sOutput;
 	}
-
 }
 
 /**
@@ -524,3 +524,5 @@ class Str
 		return (strtolower($sString) == $sString);
 	}
 }
+
+?>

core/action.class.inc.php

@@ -35,6 +35,10 @@ require_once(APPROOT.'/core/email.class.inc.php');
  */
 abstract class Action extends cmdbAbstractObject
 {
+	/**
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -47,7 +51,6 @@ abstract class Action extends cmdbAbstractObject
 			"db_table" => "priv_action",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -57,15 +60,32 @@ abstract class Action extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// - Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list'));
+		// - Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status'));
 		// Search criteria
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		// - Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status'));
+		// - Criteria of the advanced search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name'));
 	}
 
+	/**
+	 * Encapsulate the execution of the action and handle failure & logging
+	 *
+	 * @param \Trigger $oTrigger
+	 * @param array $aContextArgs
+	 *
+	 * @return mixed
+	 */
 	abstract public function DoExecute($oTrigger, $aContextArgs);
 
+	/**
+	 * @return bool
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function IsActive()
 	{
 		switch($this->Get('status'))
@@ -79,6 +99,13 @@ abstract class Action extends cmdbAbstractObject
 		}
 	}
 
+	/**
+	 * Return true if the current action status is set on "test"
+	 *
+	 * @return bool
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function IsBeingTested()
 	{
 		switch($this->Get('status'))
@@ -99,6 +126,10 @@ abstract class Action extends cmdbAbstractObject
  */
 abstract class ActionNotification extends Action
 {
+	/**
+	 * @inheritDoc
+	 * @throws \CoreException
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -111,17 +142,20 @@ abstract class ActionNotification extends Action
 			"db_table" => "priv_action_notification",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// - Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list'));
+		// - Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status'));
 		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		// - Criteria of the std search form
+//		MetaModel::Init_SetZListItems('standard_search', array('name'));
+		// - Criteria of the advanced search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name'));
 	}
 }
 
@@ -132,6 +166,9 @@ abstract class ActionNotification extends Action
  */
 class ActionEmail extends ActionNotification
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -144,7 +181,6 @@ class ActionEmail extends ActionNotification
 			"db_table" => "priv_action_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -152,7 +188,9 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("allowed_values"=>null, "sql"=>"test_recipient", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
 		MetaModel::Init_AddAttribute(new AttributeString("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("from_label", array("allowed_values"=>null, "sql"=>"from_label", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("allowed_values"=>null, "sql"=>"reply_to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("reply_to_label", array("allowed_values"=>null, "sql"=>"reply_to_label", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeOQL("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
@@ -161,11 +199,15 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
+		// - Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'from_label', 'reply_to', 'reply_to_label', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list'));
+		// - Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject'));
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		// - Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject'));
+		// - Criteria of the advanced search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name'));
 	}
 
 	// count the recipients found
@@ -175,11 +217,22 @@ class ActionEmail extends ActionNotification
 	// executed in the background, while making sure that any issue would be reported clearly
 	protected $m_aMailErrors; //array of strings explaining the issue
 
-	// returns a the list of emails as a string, or a detailed error description
+	/**
+	 * Return a the list of emails as a string, or a detailed error description
+	 *
+	 * @param string $sRecipAttCode
+	 * @param array $aArgs
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 */
 	protected function FindRecipients($sRecipAttCode, $aArgs)
 	{
 		$sOQL = $this->Get($sRecipAttCode);
-		if (strlen($sOQL) === 0) return '';
+		if (strlen($sOQL) == '') return '';
 
 		try
 		{
@@ -224,9 +277,7 @@ class ActionEmail extends ActionNotification
 	}
 
 	/**
-	 * @param \Trigger $oTrigger
-	 * @param array $aContextArgs
-	 *
+	 * @inheritDoc
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
 	 * @throws \CoreWarning
@@ -306,6 +357,7 @@ class ActionEmail extends ActionNotification
 	 *
 	 * @return string
 	 * @throws \CoreException
+	 * @throws \Exception
 	 */
 	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
 	{
@@ -314,58 +366,44 @@ class ActionEmail extends ActionNotification
 		{
 			$this->m_iRecipients = 0;
 			$this->m_aMailErrors = array();
-
-			// Determine recicipients
+			$bRes = false; // until we do succeed in sending the email
+	
+			// Determine recipients
 			//
 			$sTo = $this->FindRecipients('to', $aContextArgs);
 			$sCC = $this->FindRecipients('cc', $aContextArgs);
 			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
 
 			$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
+			$sFromLabel = MetaModel::ApplyParams($this->Get('from_label'), $aContextArgs);
 			$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
+			$sReplyToLabel = MetaModel::ApplyParams($this->Get('reply_to_label'), $aContextArgs);
 
 			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
 			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
-
+			
 			$oObj = $aContextArgs['this->object()'];
-			$sMessageId = sprintf('iTop_%s_%d_%F@%s.openitop.org',
-				get_class($oObj),
-				$oObj->GetKey(),
-				microtime(true /* get as float*/),
-				MetaModel::GetEnvironmentId()
-			);
+			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetEnvironmentId());
 			$sReference = '<'.$sMessageId.'>';
 		}
-		catch (Exception $e) {
-			/** @noinspection PhpUnhandledExceptionInspection */
-			throw $e;
-		}
-		finally {
-			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-		}
-
-		if (!is_null($oLog)) {
+		catch(Exception $e)
+		{
+  			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+  			throw $e;
+  		}
+		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+		
+		if (!is_null($oLog))
+		{
 			// Note: we have to secure this because those values are calculated
 			// inside the try statement, and we would like to keep track of as
 			// many data as we could while some variables may still be undefined
-			if (isset($sTo)) {
-				$oLog->Set('to', $sTo);
-			}
-			if (isset($sCC)) {
-				$oLog->Set('cc', $sCC);
-			}
-			if (isset($sBCC)) {
-				$oLog->Set('bcc', $sBCC);
-			}
-			if (isset($sFrom)) {
-				$oLog->Set('from', $sFrom);
-			}
-			if (isset($sSubject)) {
-				$oLog->Set('subject', $sSubject);
-			}
-			if (isset($sBody)) {
-				$oLog->Set('body', $sBody);
-			}
+			if (isset($sTo))       $oLog->Set('to', $sTo);
+			if (isset($sCC))       $oLog->Set('cc', $sCC);
+			if (isset($sBCC))      $oLog->Set('bcc', $sBCC);
+			if (isset($sFrom))     $oLog->Set('from', empty($sFromLabel) ? $sFrom : "$sFromLabel <$sFrom>");
+			if (isset($sSubject))  $oLog->Set('subject', $sSubject);
+			if (isset($sBody))     $oLog->Set('body', $sBody);
 		}
 		$sStyles = file_get_contents(APPROOT.'css/email.css');
 		$sStyles .= MetaModel::GetConfig()->Get('email_css');
@@ -383,15 +421,15 @@ class ActionEmail extends ActionNotification
 			$sTestBody .= "<li>TO: $sTo</li>\n";
 			$sTestBody .= "<li>CC: $sCC</li>\n";
 			$sTestBody .= "<li>BCC: $sBCC</li>\n";
-			$sTestBody .= "<li>From: $sFrom</li>\n";
-			$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
+			$sTestBody .= empty($sFromLabel) ? "<li>From: $sFrom</li>\n": "<li>From: $sFromLabel &lt;$sFrom&gt;</li>\n";
+			$sTestBody .= empty($sReplyToLabel) ? "<li>Reply-To: $sReplyTo</li>\n": "<li>Reply-To: $sReplyToLabel &lt;$sReplyTo&gt;</li>\n";
 			$sTestBody .= "<li>References: $sReference</li>\n";
 			$sTestBody .= "</ul>\n";
 			$sTestBody .= "</p>\n";
 			$sTestBody .= "</div>\n";
 			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
 			$oEmail->SetRecipientTO($this->Get('test_recipient'));
-			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetRecipientFrom($sFrom, $sFromLabel);
 			$oEmail->SetReferences($sReference);
 			$oEmail->SetMessageId($sMessageId);
 		}
@@ -402,8 +440,8 @@ class ActionEmail extends ActionNotification
 			$oEmail->SetRecipientTO($sTo);
 			$oEmail->SetRecipientCC($sCC);
 			$oEmail->SetRecipientBCC($sBCC);
-			$oEmail->SetRecipientFrom($sFrom);
-			$oEmail->SetRecipientReplyTo($sReplyTo);
+			$oEmail->SetRecipientFrom($sFrom, $sFromLabel);
+			$oEmail->SetRecipientReplyTo($sReplyTo, $sReplyToLabel);
 			$oEmail->SetReferences($sReference);
 			$oEmail->SetMessageId($sMessageId);
 		}

core/apc-service.class.inc.php

@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Class ApcService
- * @since 2.7.6 N°4125
- */
-class ApcService {
-	public function __construct() {
-	}
-
-	/**
-	 * @param string $function_name
-	 * @return bool
-	 * @see function_exists()
-	 */
-	public function function_exists($function_name) {
-		return function_exists($function_name);
-	}
-
-	/**
-	 * @param string|array $key
-	 * @return mixed
-	 * @see apc_fetch()
-	 */
-	function apc_fetch($key)
-	{
-		return apc_fetch($key);
-	}
-
-	/**
-	 * @param array|string $key
-	 * @param $var
-	 * @param int $ttl
-	 * @return array|bool
-	 * @see apc_store()
-	 */
-	function apc_store($key, $var = NULL, $ttl = 0)
-	{
-		return apc_store($key, $var, $ttl);
-	}
-}
-?>

core/asynctask.class.inc.php

@@ -65,6 +65,10 @@ class ExecAsyncTask implements iBackgroundProcess
  */
 abstract class AsyncTask extends DBObject
 {
+	/**
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -77,7 +81,6 @@ abstract class AsyncTask extends DBObject
 			"db_table" => "priv_async_task",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 
@@ -230,7 +233,7 @@ abstract class AsyncTask extends DBObject
 			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
 		}
 
-		$this->SetTrim('last_error', $sErrorMessage);
+		$this->Set('last_error', $sErrorMessage);
 		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
 		$this->Set('last_attempt', time());
 
@@ -285,11 +288,13 @@ abstract class AsyncTask extends DBObject
 
 	/**
 	 * Throws an exception (message and code)
+	 *
+	 * @return string
 	 */	 	
 	abstract public function DoProcess();
 
 	/**
-	 * Describes the error codes that DoProcess can return by the mean of exceptions	
+	 * Describes the error codes that DoProcess can return by the mean of exceptions
 	 */	
 	static public function EnumErrorCodes()
 	{
@@ -316,7 +321,6 @@ class AsyncSendEmail extends AsyncTask
 			"db_table" => "priv_async_send_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -352,6 +356,11 @@ class AsyncSendEmail extends AsyncTask
 		$oNew->DBInsert();
 	}
 
+	/**
+	 * @inheritDoc
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function DoProcess()
 	{
 		$sMessage = $this->Get('message');

core/attributedef.class.inc.php

@@ -31,13 +31,9 @@ require_once('ormlinkset.class.inc.php');
 require_once('ormset.class.inc.php');
 require_once('ormtagset.class.inc.php');
 require_once('htmlsanitizer.class.inc.php');
-require_once(APPROOT.'sources/autoload.php');
 require_once('customfieldshandler.class.inc.php');
 require_once('ormcustomfieldsvalue.class.inc.php');
 require_once('datetimeformat.class.inc.php');
-// This should be changed to a use when we go full-namespace
-require_once(APPROOT.'sources/form/validator/validator.class.inc.php');
-require_once(APPROOT.'sources/form/validator/notemptyextkeyvalidator.class.inc.php');
 
 /**
  * MissingColumnException - sent if an attribute is being created but the column is missing in the row
@@ -103,14 +99,6 @@ define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
 define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
 define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
 
-/**
- * Attributes implementing this interface won't be accepted as `group by` field
- * @since 2.7.4 N°3473
- */
-interface iAttributeNoGroupBy
-{
-	//no method, just a contract on implement
-}
 
 /**
  * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.)
@@ -303,7 +291,7 @@ abstract class AttributeDefinition
 	 * @param \DBObject $oHostObject
 	 * @param $value Object error if any, null otherwise
 	 *
-	 * @return bool
+	 * @return bool|string true for no errors, false or error message otherwise
 	 */
 	public function CheckValue(DBObject $oHostObject, $value)
 	{
@@ -1038,10 +1026,17 @@ abstract class AttributeDefinition
 			$oFormField->AddValidator(new Validator($this->GetValidationPattern()));
 		}
 
+		// Description
+		$sAttDescription = $this->GetDescription();
+		if(!empty($sAttDescription))
+		{
+			$oFormField->SetDescription($this->GetDescription());
+		}
+
 		// Metadata
 		$oFormField->AddMetadata('attribute-code', $this->GetCode());
 		$oFormField->AddMetadata('attribute-type', get_class($this));
-		$oFormField->AddMetadata('attribute-label', utils::HtmlEntities($this->GetLabel()));
+		$oFormField->AddMetadata('attribute-label', $this->GetLabel());
 		// - Attribute flags
 		$aPossibleAttFlags = MetaModel::EnumPossibleAttributeFlags();
 		foreach($aPossibleAttFlags as $sFlagCode => $iFlagValue)
@@ -1058,7 +1053,7 @@ abstract class AttributeDefinition
 		// - Value raw
 		if ($this::IsScalar())
 		{
-			$oFormField->AddMetadata('value-raw', utils::HtmlEntities($oObject->Get($this->GetCode())));
+			$oFormField->AddMetadata('value-raw', (string) $oObject->Get($this->GetCode()));
 		}
 
 		return $oFormField;
@@ -1278,6 +1273,15 @@ abstract class AttributeDefinition
 	{
 		return (string)$value;
 	}
+
+	/*
+	 * return string
+	 */
+	public function GetRenderForDataTable(string $sClassAlias) :string
+	{
+		$sRenderFunction = "return data;";
+		return $sRenderFunction;
+	}
 }
 
 class AttributeDashboard extends AttributeDefinition
@@ -2281,22 +2285,17 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet
 		/** @var \AttributeExternalKey $oExtKeyToRemote */
 		$oExtKeyToRemote = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
 		$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
-		foreach(MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
-		{
-			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect)
-			{
+		foreach(MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef) {
+			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect) {
 				continue;
 			}
-			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass())
-			{
+			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass()) {
 				continue;
 			}
-			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote())
-			{
+			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote()) {
 				continue;
 			}
-			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe())
-			{
+			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe()) {
 				continue;
 			}
 			$oRet = $oRemoteAttDef;
@@ -3769,7 +3768,7 @@ class AttributeFinalClass extends AttributeString
  *
  * @package     iTopORM
  */
-class AttributePassword extends AttributeString implements iAttributeNoGroupBy
+class AttributePassword extends AttributeString
 {
 	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
@@ -3845,7 +3844,7 @@ class AttributePassword extends AttributeString implements iAttributeNoGroupBy
  *
  * @package     iTopORM
  */
-class AttributeEncryptedString extends AttributeString implements iAttributeNoGroupBy
+class AttributeEncryptedString extends AttributeString
 {
 	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
@@ -5002,6 +5001,7 @@ class AttributePhoneNumber extends AttributeString
 
 		return '<a class="tel" href="'.$sUrl.'"><span class="text_decoration '.$sUrlDecorationClass.'"></span>'.parent::GetAsHTML($sValue).'</a>';
 	}
+
 }
 
 /**
@@ -6662,6 +6662,23 @@ class AttributeExternalKey extends AttributeDBFieldVoid
 		return (int)$proposedValue;
 	}
 
+	public function GetPrerequisiteAttributes($sClass = null)
+	{
+		$aAttributes = parent::GetPrerequisiteAttributes($sClass);
+		$oExpression = DBSearch::FromOQL($this->GetValuesDef()->GetFilterExpression())->GetCriteria();
+		foreach ($oExpression->GetParameters('this') as $sAttCode)
+		{
+			// Skip the id as it cannot change anyway
+			if ($sAttCode =='id') continue;
+
+			if (!in_array($sAttCode, $aAttributes))
+			{
+				$aAttributes[] = $sAttCode;
+			}
+		}
+		return $aAttributes;
+	}
+
 	public function GetMaximumComboLength()
 	{
 		return $this->GetOptional('max_combo_length', MetaModel::GetConfig()->Get('max_combo_length'));
@@ -6767,8 +6784,7 @@ class AttributeExternalKey extends AttributeDBFieldVoid
 
 	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
 	{
-		if (!is_null($oHostObject))
-		{
+		if (!is_null($oHostObject)) {
 			return $oHostObject->GetAsHTML($this->GetCode(), $oHostObject);
 		}
 
@@ -7970,25 +7986,6 @@ class AttributeImage extends AttributeBlob
 		return "Image";
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * @see AttributeBlob::MakeRealValue()
-	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oDoc = parent::MakeRealValue($proposedValue, $oHostObj);
-
-		if (($oDoc instanceof ormDocument)
-			&& (false === $oDoc->IsEmpty())
-			&& ($oDoc->GetMimeType() === 'image/svg+xml')) {
-			$sCleanSvg = HTMLSanitizer::Sanitize($oDoc->GetData(), 'svg_sanitizer');
-			$oDoc = new ormDocument($sCleanSvg, $oDoc->GetMimeType(), $oDoc->GetFileName());
-		}
-
-		// The validation of the MIME Type is done by CheckFormat below
-		return $oDoc;
-	}
-
 	/**
 	 * Check that the supplied ormDocument actually contains an image
 	 * {@inheritDoc}
@@ -9232,7 +9229,7 @@ class AttributeSubItem extends AttributeDefinition
 /**
  * One way encrypted (hashed) password
  */
-class AttributeOneWayPassword extends AttributeDefinition implements iAttributeNoGroupBy
+class AttributeOneWayPassword extends AttributeDefinition
 {
 	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
@@ -10324,6 +10321,7 @@ class AttributeEnumSet extends AttributeSet
 		return $sRes;
 	}
 
+
 	/**
 	 * @param ormSet $value
 	 * @param string $sSeparator
@@ -11605,7 +11603,17 @@ class AttributeFriendlyName extends AttributeDefinition
 
 	public function GetPrerequisiteAttributes($sClass = null)
 	{
-		return $this->GetOptional("depends_on", array());
+		// Code duplicated with AttributeObsolescenceFlag
+		$aAttributes = $this->GetOptional("depends_on", array());
+		$oExpression = $this->GetOQLExpression();
+		foreach ($oExpression->ListRequiredFields() as $sClass => $sAttCode)
+		{
+			if (!in_array($sAttCode, $aAttributes))
+			{
+				$aAttributes[] = $sAttCode;
+			}
+		}
+		return $aAttributes;
 	}
 
 	public static function IsScalar()
@@ -12837,7 +12845,17 @@ class AttributeObsolescenceFlag extends AttributeBoolean
 
 	public function GetPrerequisiteAttributes($sClass = null)
 	{
-		return $this->GetOptional("depends_on", array());
+		// Code duplicated with AttributeFriendlyName
+		$aAttributes = $this->GetOptional("depends_on", array());
+		$oExpression = $this->GetOQLExpression();
+		foreach ($oExpression->ListRequiredFields() as $sClass => $sAttCode)
+		{
+			if (!in_array($sAttCode, $aAttributes))
+			{
+				$aAttributes[] = $sAttCode;
+			}
+		}
+		return $aAttributes;
 	}
 
 	public function IsDirectField()

core/backgroundprocess.inc.php

@@ -185,12 +185,9 @@ abstract class AbstractWeeklyScheduledProcess implements iScheduledProcess
 			static::DEFAULT_MODULE_SETTING_ENABLED
 		);
 
-		$sItopTimeZone = $this->getOConfig()->Get('timezone');
-		$timezone = new DateTimeZone($sItopTimeZone);
-
 		if (!$bEnabled)
 		{
-			return new DateTime('3000-01-01', $timezone);
+			return new DateTime('3000-01-01');
 		}
 
 		// 1st - Interpret the list of days as ordered numbers (monday = 1)
@@ -209,7 +206,7 @@ abstract class AbstractWeeklyScheduledProcess implements iScheduledProcess
 			throw new ProcessInvalidConfigException($this->GetModuleName().": wrong format for setting '".static::MODULE_SETTING_TIME."' (found '$sProcessTime')");
 		}
 
-		$oNow = new DateTime($sCurrentTime, $timezone);
+		$oNow = new DateTime($sCurrentTime);
 		$iNextPos = false;
 		$sDay = $oNow->format('N');
 		for ($iDay = (int) $sDay; $iDay <= 7; $iDay++)
@@ -244,7 +241,6 @@ abstract class AbstractWeeklyScheduledProcess implements iScheduledProcess
 			$oRet->modify('+'.$iMove.' days');
 		}
 		list($sHours, $sMinutes) = explode(':', $sProcessTime);
-		/** @noinspection PhpElementIsNotAvailableInCurrentPhpVersionInspection non used new parameter in PHP 7.1 */
 		$oRet->setTime((int)$sHours, (int)$sMinutes);
 
 		return $oRet;

core/backgroundtask.class.inc.php

@@ -56,7 +56,6 @@ class BackgroundTask extends DBObject
 			"db_table" => "priv_backgroundtask",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 
@@ -72,7 +71,7 @@ class BackgroundTask extends DBObject
 		MetaModel::Init_AddAttribute(new AttributeDecimal("average_run_duration", array("allowed_values"=>null, "sql"=>"average_run_duration", "digits"=> 8, "decimals"=> 3, "default_value"=>"0", "is_null_allowed"=>true, "depends_on"=>array())));
 
 		MetaModel::Init_AddAttribute(new AttributeBoolean("running", array("allowed_values"=>null, "sql"=>"running", "default_value"=>false, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('active,paused'), "sql"=>"status", "default_value"=>'active', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('active,paused,removed'), "sql"=>"status", "default_value"=>'active', "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("system_user", array("allowed_values"=>null, "sql"=>"system_user", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 	}
 	

core/bulkchange.class.inc.php

@@ -948,7 +948,7 @@ class BulkChange
 		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 		foreach($this->m_aData as $iRow => $aRowData)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			if (isset($aResult[$iRow]["__STATUS__"]))
 			{
 				// An issue at the earlier steps - skip the rest
@@ -1067,13 +1067,13 @@ class BulkChange
 				$iObj = $oObj->GetKey();
 				if (!in_array($iObj, $aVisited))
 				{
-					set_time_limit($iLoopTimeLimit);
+					set_time_limit(intval($iLoopTimeLimit));
 					$iRow++;
 					$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
 				}
 			}
 		}
-		set_time_limit($iPreviousTimeLimit);
+		set_time_limit(itval($iPreviousTimeLimit));
 
 		// Fill in the blanks - the result matrix is expected to be 100% complete
 		//

core/cmdbchange.class.inc.php

@@ -52,12 +52,18 @@ class CMDBChange extends DBObject
 		//MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("allowed_values"=>null, "sql"=>"user_id", "targetclass"=>"User", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("origin", array("allowed_values"=>new ValueSetEnum('interactive,csv-interactive,csv-import.php,webservice-soap,webservice-rest,synchro-data-source,email-processing,custom-extension'), "sql"=>"origin", "default_value"=>"interactive", "is_null_allowed"=>true, "depends_on"=>array())));
 	}
 
-	// Helper to keep track of the author of a given change,
-	// taking into account a variety of cases (contact attached or not, impersonation)
-	static public function GetCurrentUserName()
+	/**
+	 * Helper to keep track of the author of a given change,
+	 * taking into account a variety of cases (contact attached or not, impersonation)
+	 *
+	 * @return string
+	 * @throws \OQLException
+	 */
+	public static function GetCurrentUserName()
 	{
 		if (UserRights::IsImpersonated())
 		{
@@ -70,6 +76,19 @@ class CMDBChange extends DBObject
 		return $sUserString;
 	}
 
+	/**
+	 * Return the current user
+	 *
+	 * @return string|null
+	 * @throws \OQLException
+	 * @since 3.0.0
+	 */
+	public static function GetCurrentUserId()
+	{
+		// Note: We might have use only UserRights::GetRealUserId() as it would have done the same thing in the end
+		return UserRights::IsImpersonated() ? UserRights::GetRealUserId() : UserRights::GetUserId();
+	}
+
 	public function GetUserName()
 	{
 		if (preg_match('/^(.*)\\(CSV\\)$/i', $this->Get('userinfo'), $aMatches))
@@ -83,5 +102,3 @@ class CMDBChange extends DBObject
 		return $sUser;
 	}
 }
-
-?>

core/cmdbchangeop.class.inc.php

@@ -31,7 +31,22 @@
  * @package     iTopORM
  */
 
-class CMDBChangeOp extends DBObject
+/**
+ * Interface iCMDBChangeOp
+ *
+ * @since 3.0.0
+ */
+interface iCMDBChangeOp
+{
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 *
+	 * @return string
+	 */
+	public function GetDescription();
+}
+
+class CMDBChangeOp extends DBObject implements iCMDBChangeOp
 {
 	public static function Init()
 	{
@@ -54,6 +69,7 @@ class CMDBChangeOp extends DBObject
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("change", array("allowed_values"=>null, "sql"=>"changeid", "targetclass"=>"CMDBChange", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("date", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"date")));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("userinfo", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"userinfo")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("user_id", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"user_id")));
 		MetaModel::Init_AddAttribute(new AttributeString("objclass", array("allowed_values"=>null, "sql"=>"objclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeObjectKey("objkey", array("allowed_values"=>null, "class_attcode"=>"objclass", "sql"=>"objkey", "is_null_allowed"=>false, "depends_on"=>array())));
 
@@ -62,37 +78,27 @@ class CMDBChangeOp extends DBObject
 	}
 
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */
+	 * @inheritDoc
+	 */	 
 	public function GetDescription()
 	{
 		return '';
 	}
 
 	/**
-	 * Safety net:
-	 * * if change isn't persisted yet, use the current change and persist it if needed
-	 * * in case the change is not given, let's guarantee that it will be set to the current ongoing change (or create a new one)
-	 *
-	 * @since 2.7.7 3.0.2 3.1.0 N°3717 do persist the current change if needed
-	 */
+	 * Safety net: in case the change is not given, let's guarantee that it will
+	 * be set to the current ongoing change (or create a new one)	
+	 */	
 	protected function OnInsert()
 	{
-		$iChange = $this->Get('change');
-		if (($iChange <= 0) || (is_null($iChange))) {
-			$oChange = CMDBObject::GetCurrentChange();
-			if ($oChange->IsNew()) {
-				$oChange->DBWrite();
-			}
-			$this->Set('change', $oChange);
+		if ($this->Get('change') <= 0)
+		{
+			$this->Set('change', CMDBObject::GetCurrentChange());
 		}
-
 		parent::OnInsert();
 	}
 }
 
-
-
 /**
  * Record the creation of an object  
  *
@@ -100,6 +106,9 @@ class CMDBChangeOp extends DBObject
  */
 class CMDBChangeOpCreate extends CMDBChangeOp
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -118,7 +127,7 @@ class CMDBChangeOpCreate extends CMDBChangeOp
 	}
 	
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
+	 * @inheritDoc
 	 */	 
 	public function GetDescription()
 	{
@@ -126,7 +135,6 @@ class CMDBChangeOpCreate extends CMDBChangeOp
 	}
 }
 
-
 /**
  * Record the deletion of an object 
  *
@@ -134,6 +142,9 @@ class CMDBChangeOpCreate extends CMDBChangeOp
  */
 class CMDBChangeOpDelete extends CMDBChangeOp
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -155,16 +166,16 @@ class CMDBChangeOpDelete extends CMDBChangeOp
 		// Last friendly name of the object
 		MetaModel::Init_AddAttribute(new AttributeString("fname", array("allowed_values"=>null, "sql"=>"fname", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 	}
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		return Dict::S('Change:ObjectDeleted');
 	}
 }
 
-
 /**
  * Record the modification of an attribute (abstract)
  *
@@ -172,6 +183,9 @@ class CMDBChangeOpDelete extends CMDBChangeOp
  */
 class CMDBChangeOpSetAttribute extends CMDBChangeOp
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -202,6 +216,9 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp
  */
 class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -224,10 +241,10 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		$sResult = '';
@@ -258,7 +275,10 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeTagSet extends CMDBChangeOpSetAttribute
 {
-    public static function Init()
+	/**
+	 * @inheritDoc
+	 */
+	public static function Init()
     {
         $aParams = array
         (
@@ -281,10 +301,10 @@ class CMDBChangeOpSetAttributeTagSet extends CMDBChangeOpSetAttribute
         MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
     }
 
-    /**
-     * Describe (as a text string) the modifications corresponding to this change
-     */
-    public function GetDescription()
+	/**
+	 * @inheritDoc
+	 */
+	public function GetDescription()
     {
         $sResult = '';
         $sTargetObjectClass = $this->Get('objclass');
@@ -315,6 +335,9 @@ class CMDBChangeOpSetAttributeTagSet extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeURL extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -337,10 +360,10 @@ class CMDBChangeOpSetAttributeURL extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		$sResult = '';
@@ -371,6 +394,9 @@ class CMDBChangeOpSetAttributeURL extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -392,10 +418,10 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		// Temporary, until we change the options of GetDescription() -needs a more global revision
@@ -438,11 +464,15 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 		return $sResult;
 	}
 }
+
 /**
  * Safely record the modification of one way encrypted password
  */
 class CMDBChangeOpSetAttributeOneWayPassword extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -464,10 +494,10 @@ class CMDBChangeOpSetAttributeOneWayPassword extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		// Temporary, until we change the options of GetDescription() -needs a more global revision
@@ -503,6 +533,9 @@ class CMDBChangeOpSetAttributeOneWayPassword extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -524,10 +557,10 @@ class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		// Temporary, until we change the options of GetDescription() -needs a more global revision
@@ -566,6 +599,9 @@ class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -587,10 +623,10 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		// Temporary, until we change the options of GetDescription() -needs a more global revision
@@ -631,6 +667,9 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeLongText extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -652,10 +691,10 @@ class CMDBChangeOpSetAttributeLongText extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		$sResult = '';
@@ -693,6 +732,9 @@ class CMDBChangeOpSetAttributeLongText extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeHTML extends CMDBChangeOpSetAttributeLongText
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -713,8 +755,9 @@ class CMDBChangeOpSetAttributeHTML extends CMDBChangeOpSetAttributeLongText
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
 	}
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
+	 * @inheritDoc
 	 */
 	public function GetDescription()
 	{
@@ -756,6 +799,9 @@ class CMDBChangeOpSetAttributeHTML extends CMDBChangeOpSetAttributeLongText
  */
 class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -777,10 +823,10 @@ class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		// Temporary, until we change the options of GetDescription() -needs a more global revision
@@ -807,14 +853,18 @@ class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
 			}
 			$oObj = $oMonoObjectSet->Fetch();
 			$oCaseLog = $oObj->Get($this->Get('attcode'));
-			$iMaxVisibleLength = MetaModel::getConfig()->Get('max_history_case_log_entry_length', 0);
 			$sTextEntry = '<div class="history_entry history_entry_truncated"><div class="history_html_content">'.$oCaseLog->GetEntryAt($this->Get('lastentry')).'</div></div>';
 
 			$sResult = Dict::Format('Change:AttName_EntryAdded', $sAttName, $sTextEntry);
 		}
 		return $sResult;
 	}
-	
+
+	/**
+	 * @param string $sRawText
+	 *
+	 * @return string
+	 */
 	protected function ToHtml($sRawText)
 	{
 		return str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sRawText, ENT_QUOTES, 'UTF-8'));
@@ -828,6 +878,9 @@ class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpPlugin extends CMDBChangeOp
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -849,10 +902,10 @@ class CMDBChangeOpPlugin extends CMDBChangeOp
 		*/
 		MetaModel::Init_InheritAttributes();
 	}
-	
+
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		return $this->Get('description');
@@ -866,6 +919,9 @@ class CMDBChangeOpPlugin extends CMDBChangeOp
  */
 abstract class CMDBChangeOpSetAttributeLinks extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -896,6 +952,9 @@ abstract class CMDBChangeOpSetAttributeLinks extends CMDBChangeOpSetAttribute
  */
 class CMDBChangeOpSetAttributeLinksAddRemove extends CMDBChangeOpSetAttributeLinks
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -916,8 +975,8 @@ class CMDBChangeOpSetAttributeLinksAddRemove extends CMDBChangeOpSetAttributeLin
 	}
 
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		$sResult = '';
@@ -960,6 +1019,9 @@ class CMDBChangeOpSetAttributeLinksAddRemove extends CMDBChangeOpSetAttributeLin
  */
 class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -980,8 +1042,8 @@ class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
 	}
 
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
+	 * @inheritDoc
+	 */
 	public function GetDescription()
 	{
 		$sResult = '';
@@ -1047,6 +1109,9 @@ class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
  */
 class CMDBChangeOpSetAttributeCustomFields extends CMDBChangeOpSetAttribute
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -1070,7 +1135,7 @@ class CMDBChangeOpSetAttributeCustomFields extends CMDBChangeOpSetAttribute
 	}
 
 	/**
-	 * Describe (as a text string) the modifications corresponding to this change
+	 * @inheritDoc
 	 */
 	public function GetDescription()
 	{

core/cmdbobject.class.inc.php

@@ -94,6 +94,7 @@ abstract class CMDBObject extends DBObject
 	// Note: this value is static, but that could be changed because it is sometimes a real issue (see update of interfaces / connected_to
 	protected static $m_oCurrChange = null;
 	protected static $m_sInfo = null; // null => the information is built in a standard way
+	protected static $m_sUserId = null; // null => the user doing the change is unknown
 	protected static $m_sOrigin = null; // null => the origin is 'interactive'
 
 	/**
@@ -114,26 +115,6 @@ abstract class CMDBObject extends DBObject
 		self::$m_oCurrChange = $oChange;
 	}
 
-	/**
-	 * @param string $sUserInfo
-	 * @param string $sOrigin
-	 * @param \DateTime $oDate
-	 *
-	 * @throws \CoreException
-	 *
-	 * @since 2.7.7 3.0.2 3.1.0 N°3717 new method to reset current change
-	 */
-	public static function SetCurrentChangeFromParams($sUserInfo, $sOrigin = null, $oDate = null)
-	{
-		static::SetTrackInfo($sUserInfo);
-		static::SetTrackOrigin($sOrigin);
-		static::CreateChange();
-
-		if (!is_null($oDate)) {
-			static::$m_oCurrChange->Set("date", $oDate);
-		}
-	}
-
 	//
 	// Todo: simplify the APIs and do not pass the current change as an argument anymore
 	//       SetTrackInfo to be invoked in very few cases (UI.php, CSV import, Data synchro)
@@ -165,8 +146,6 @@ abstract class CMDBObject extends DBObject
 	 *    $oMyChange->Set("userinfo", 'this is done by ... for ...');
 	 *    $iChangeId = $oMyChange->DBInsert();
 	 *
-	 * **warning** : this will do nothing if current change already exists !
-	 *
 	 * @see SetCurrentChange to specify a CMDBObject instance instead
 	 *
 	 * @param string $sInfo
@@ -177,9 +156,22 @@ abstract class CMDBObject extends DBObject
 	}
 
 	/**
-	 * Provides information about the origin of the change
+	 * Provide information about the user doing the change
 	 *
-	 * **warning** : this will do nothing if current change already exists !
+	 * @see static::SetTrackInfo
+	 * @see static::SetCurrentChange
+	 *
+	 * @param string $sId ID of the user doing the change, null if not done by a user (eg. background task)
+	 *
+	 * @since 3.0.0
+	 */
+	public static function SetTrackUserId($sId)
+	{
+		self::$m_sUserId = $sId;
+	}
+
+	/**
+	 * Provides information about the origin of the change
 	 *
 	 * @see SetTrackInfo
 	 * @see SetCurrentChange to specify a CMDBObject instance instead
@@ -191,18 +183,40 @@ abstract class CMDBObject extends DBObject
 	{
 		self::$m_sOrigin = $sOrigin;
 	}
-
+	
 	/**
 	 * Get the additional information (defaulting to user name)
-	 */
-	public static function GetTrackInfo()
+	 */	 	
+	protected static function GetTrackInfo()
 	{
-		if (is_null(self::$m_sInfo)) {
+		if (is_null(self::$m_sInfo))
+		{
 			return CMDBChange::GetCurrentUserName();
-		} else {
+		}
+		else
+		{
 			return self::$m_sInfo;
 		}
 	}
+
+	/**
+	 * Get the ID of the user doing the change (defaulting to null)
+	 *
+	 * @return string|null
+	 * @throws \OQLException
+	 * @since 3.0.0
+	 */
+	protected static function GetTrackUserId()
+	{
+		if (is_null(self::$m_sUserId))
+		{
+			return CMDBChange::GetCurrentUserId();
+		}
+		else
+		{
+			return self::$m_sUserId;
+		}
+	}
 	
 	/**
 	 * Get the 'origin' information (defaulting to 'interactive')
@@ -222,15 +236,24 @@ abstract class CMDBObject extends DBObject
 	/**
 	 * Set to {@link $m_oCurrChange} a standard change record (done here 99% of the time, and nearly once per page)
 	 *
-	 * @since 2.7.7 3.0.2 3.1.0 N°3717 {@see CMDBChange} **will be persisted later** in {@see \CMDBChangeOp::OnInsert} (was done previously directly here)
-	 *     This will avoid creating in DB CMDBChange lines without any corresponding CMDBChangeOp
+	 * The CMDBChange is persisted so that it has a key > 0, and any new CMDBChangeOp can link to it
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \CoreWarning
+	 * @throws \MySQLException
+	 * @throws \OQLException
 	 */
 	protected static function CreateChange()
 	{
 		self::$m_oCurrChange = MetaModel::NewObject("CMDBChange");
 		self::$m_oCurrChange->Set("date", time());
 		self::$m_oCurrChange->Set("userinfo", self::GetTrackInfo());
+		self::$m_oCurrChange->Set("user_id", self::GetTrackUserId());
 		self::$m_oCurrChange->Set("origin", self::GetTrackOrigin());
+		self::$m_oCurrChange->DBInsert();
 	}
 
 	/**
@@ -534,7 +557,14 @@ abstract class CMDBObject extends DBObject
 	/**
 	 * Helper to ultimately check user rights before writing (Insert, Update or Delete)
 	 * The check should never fail, because the UI should prevent from such a usage
-	 * Anyhow, if the user has found a workaround... the security gets enforced here	 	 
+	 * Anyhow, if the user has found a workaround... the security gets enforced here
+	 *
+	 * @deprecated 3.0.0 N°2591 will be removed in 3.1.0
+	 *
+	 * @param bool $bSkipStrongSecurity
+	 * @param int $iActionCode
+	 *
+	 * @throws \SecurityException
 	 */
 	protected function CheckUserRights($bSkipStrongSecurity, $iActionCode)
 	{
@@ -559,83 +589,6 @@ abstract class CMDBObject extends DBObject
 		}
 	}
 
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBInsert} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 *
-	 * @return int|null
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreWarning
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 * @throws \SecurityException
-	 */
-	public function DBInsertTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$ret = $this->DBInsertTracked_Internal();
-		return $ret;
-	}
-
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBInsertNoReload} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 *
-	 * @return int
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreWarning
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 * @throws \SecurityException
-	 */
-	public function DBInsertTrackedNoReload(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$ret = $this->DBInsertTracked_Internal(true);
-		return $ret;
-	}
-
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBInsert} or {@link DBInsertNoReload} instead
-	 *
-	 * @param bool $bDoNotReload
-	 *
-	 * @return integer Identifier of the created object
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreWarning
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	protected function DBInsertTracked_Internal($bDoNotReload = false)
-	{
-		if ($bDoNotReload)
-		{
-			$ret = $this->DBInsertNoReload();
-		}
-		else
-		{
-			$ret = $this->DBInsert();
-		}
-		return $ret;
-	}
-
 	public function DBClone($newKey = null)
 	{
 		return $this->DBCloneTracked_Internal();
@@ -668,24 +621,6 @@ abstract class CMDBObject extends DBObject
 		return $ret;
 	}
 
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBUpdate} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 *
-	 * @return int|void
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \SecurityException
-	 */
-	public function DBUpdateTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$this->DBUpdate();
-	}
 
 	/**
 	 * @param null $oDeletionPlan
@@ -705,31 +640,6 @@ abstract class CMDBObject extends DBObject
 		return $this->DBDeleteTracked_Internal($oDeletionPlan);
 	}
 
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBDelete} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 * @param null $oDeletionPlan
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \DeleteException
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 * @throws \OQLException
-	 * @throws \SecurityException
-	 */
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_DELETE);
-		$this->DBDeleteTracked_Internal($oDeletionPlan);
-	}
-
 	/**
 	 * @param null $oDeletionPlan
 	 *

core/cmdbsource.class.inc.php

@@ -39,7 +39,6 @@ class MySQLException extends CoreException
 	 */
 	public function __construct($sIssue, $aContext, $oException = null, $oMysqli = null)
 	{
-
 		if ($oException != null)
 		{
 			$aContext['mysql_errno'] = $oException->getCode();
@@ -59,11 +58,6 @@ class MySQLException extends CoreException
 			$aContext['mysql_error'] = CMDBSource::GetError();
 		}
 		parent::__construct($sIssue, $aContext);
-		//if is connection error, don't log the default message with password in
-		if (mysqli_connect_errno()) {
-			error_log($this->message);
-			error_reporting(0);
-		}
 	}
 }
 
@@ -113,18 +107,10 @@ class MySQLNoTransactionException extends MySQLException
 
 }
 
-/**
- * @since 2.7.8 3.0.3 3.1.0 N°5538
- */
-class MySQLTransactionNotClosedException extends MySQLException
-{
-
-}
-
 
 /**
  * CMDBSource
- * database access wrapper
+ * database access wrapper 
  *
  * @package     iTopORM
  */
@@ -162,17 +148,6 @@ class CMDBSource
 
 	/** @var mysqli $m_oMysqli */
 	protected static $m_oMysqli;
-	/**
-	 * The mysqli object is really hard to mock ! This attribute is used only in certain methods, so that we can mock only a very little subset of the mysqli object.
-	 * We are setting it in {@see Init}, by default it is a copy of {@see $m_oMysqli}
-	 * The mock can be injected using the setter {@see SetMySQLiForQuery}
-	 *
-	 * @var mysqli $oMySQLiForQuery
-	 * @see GetMySQLiForQuery
-	 * @see SetMySQLiForQuery
-	 * @since 2.7.5 N°3513 new var to allow mock in tests ({@see \Combodo\iTop\Test\UnitTest\Core\TransactionsTest})
-	 */
-	protected static $oMySQLiForQuery;
 
 	/**
 	 * @var int number of level for nested transactions : 0 if no transaction was ever opened, +1 for each 'START TRANSACTION' sent
@@ -239,7 +214,6 @@ class CMDBSource
 		self::$m_sDBTlsCA = empty($sTlsCA) ? null : $sTlsCA;
 
 		self::$m_oMysqli = self::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA, true);
-		self::SetMySQLiForQuery(self::$m_oMysqli);
 	}
 
 	/**
@@ -253,12 +227,12 @@ class CMDBSource
 	 *
 	 * @return \mysqli
 	 * @throws \MySQLException
-	 *
-	 * @uses IsOpenedDbConnectionUsingTls when asking for a TLS connection, to check if it was really opened using TLS
 	 */
 	public static function GetMysqliInstance(
 		$sDbHost, $sUser, $sPwd, $sSource = '', $bTlsEnabled = false, $sTlsCa = null, $bCheckTlsAfterConnection = false
 	) {
+		$oMysqli = null;
+
 		$sServer = null;
 		$iPort = null;
 		self::InitServerAndPort($sDbHost, $sServer, $iPort);
@@ -288,7 +262,7 @@ class CMDBSource
 		}
 		catch(mysqli_sql_exception $e)
 		{
-			throw new MySQLException('Could not connect to the DB server', array('host' => $sServer, 'user' => $sUser),$e);
+			throw new MySQLException('Could not connect to the DB server', array('host' => $sServer, 'user' => $sUser), $e);
 		}
 
 		if ($bTlsEnabled
@@ -357,41 +331,41 @@ class CMDBSource
 	 * parameters were used.<br>
 	 * This method can be called to ensure that the DB connection really uses TLS.
 	 *
-	 * <p>We're using our own mysqli instance to do the check as this check is done when creating the mysqli instance : the consumer
-	 * might want a dedicated object, and if so we don't want to overwrite the one saved in CMDBSource !<br>
-	 * This is the case for example with {@see \iTopMutex} !
+	 * <p>We're using this object connection : {@link self::$m_oMysqli}
 	 *
 	 * @param \mysqli $oMysqli
 	 *
-	 * @return boolean true if the connection was really established using TLS, false otherwise
+	 * @return boolean true if the connection was really established using TLS
 	 * @throws \MySQLException
 	 *
-	 * @used-by GetMysqliInstance
 	 * @uses IsMySqlVarNonEmpty
-	 * @uses 'ssl_version' MySQL var
-	 * @uses 'ssl_cipher' MySQL var
 	 */
 	private static function IsOpenedDbConnectionUsingTls($oMysqli)
 	{
-		$bNonEmptySslVersionVar = self::IsMySqlVarNonEmpty('ssl_version', $oMysqli);
-		$bNonEmptySslCipherVar = self::IsMySqlVarNonEmpty('ssl_cipher', $oMysqli);
+		if (self::$m_oMysqli == null)
+		{
+			self::$m_oMysqli = $oMysqli;
+		}
+
+		$bNonEmptySslVersionVar = self::IsMySqlVarNonEmpty('ssl_version');
+		$bNonEmptySslCipherVar = self::IsMySqlVarNonEmpty('ssl_cipher');
 
 		return ($bNonEmptySslVersionVar && $bNonEmptySslCipherVar);
 	}
 
 	/**
 	 * @param string $sVarName
-	 * @param mysqli $oMysqli connection to use for the query
 	 *
 	 * @return bool
 	 * @throws \MySQLException
-	 * @uses 'SHOW SESSION STATUS' queries
+	 *
+	 * @uses SHOW STATUS queries
 	 */
-	private static function IsMySqlVarNonEmpty($sVarName, $oMysqli)
+	private static function IsMySqlVarNonEmpty($sVarName)
 	{
 		try
 		{
-			$sResult = self::QueryToScalar("SHOW SESSION STATUS LIKE '$sVarName'", 1, $oMysqli);
+			$sResult = self::QueryToScalar("SHOW SESSION STATUS LIKE '$sVarName'", 1);
 		}
 		catch (MySQLQueryHasNoResultException $e)
 		{
@@ -455,12 +429,6 @@ class CMDBSource
 
 	}
 
-	/**
-	 * @return string
-	 * @throws \MySQLException
-	 *
-	 * @uses \CMDBSource::QueryToCol() so needs a connection opened !
-	 */
 	public static function GetDBVersion()
 	{
 		$aVersions = self::QueryToCol('SELECT Version() as version', 'version');
@@ -478,10 +446,8 @@ class CMDBSource
 	/**
 	 * Get the DB vendor between MySQL and its main forks
 	 * @return string
-	 *
-	 * @uses \CMDBSource::GetServerVariable() so needs a connection opened !
 	 */
-	public static function GetDBVendor()
+	static public function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
 		
@@ -564,24 +530,6 @@ class CMDBSource
 		return self::$m_oMysqli;
 	}
 
-	/**
-	 * @return
-	 */
-	private static function GetMySQLiForQuery()
-	{
-		return self::$oMySQLiForQuery;
-	}
-
-
-	/**
-	 * Used for test purpose (mysqli mock)
-	 * @param $oMySQLi
-	 */
-	private static function SetMySQLiForQuery($oMySQLi)
-	{
-		self::$oMySQLiForQuery = $oMySQLi;
-	}
-
 	public static function GetErrNo()
 	{
 		if (self::$m_oMysqli->errno != 0)
@@ -717,28 +665,22 @@ class CMDBSource
 	 */
 	private static function DBQuery($sSql)
 	{
-		$sShortSQL = substr(preg_replace("/\s+/", " ", substr($sSql, 0, 180)), 0, 150);
-		if (substr_compare($sShortSQL, "SELECT", 0, strlen("SELECT")) !== 0) {
-			IssueLog::Trace("$sShortSQL", 'cmdbsource');
-		}
-
 		$oKPI = new ExecutionKPI();
 		try
 		{
-			$oResult = self::GetMySQLiForQuery()->query($sSql);
+			$oResult = self::$m_oMysqli->query($sSql);
 		}
 		catch (mysqli_sql_exception $e)
 		{
 			self::LogDeadLock($e);
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
-		} finally {
-            $oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-        }
+		}
+		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
 		if ($oResult === false)
 		{
 			$aContext = array('query' => $sSql);
 
-			$iMySqlErrorNo = self::GetMySQLiForQuery()->errno;
+			$iMySqlErrorNo = self::$m_oMysqli->errno;
 			$aMySqlHasGoneAwayErrorCodes = MySQLHasGoneAwayException::getErrorCodes();
 			if (in_array($iMySqlErrorNo, $aMySqlHasGoneAwayErrorCodes))
 			{
@@ -760,7 +702,7 @@ class CMDBSource
 	private static function LogDeadLock(Exception $e)
 	{
 		// checks MySQL error code
-		$iMySqlErrorNo = self::GetMySQLiForQuery()->errno;
+		$iMySqlErrorNo = self::$m_oMysqli->errno;
 		if (!in_array($iMySqlErrorNo, array(self::MYSQL_ERRNO_WAIT_TIMEOUT, self::MYSQL_ERRNO_DEADLOCK)))
 		{
 			return;
@@ -768,7 +710,7 @@ class CMDBSource
 
 		// Get error info
 		$sUser = UserRights::GetUser();
-		$oError = self::GetMySQLiForQuery()->query('SHOW ENGINE INNODB STATUS');
+		$oError = self::$m_oMysqli->query('SHOW ENGINE INNODB STATUS');
 		if ($oError !== false)
 		{
 			$aData = $oError->fetch_all(MYSQLI_ASSOC);
@@ -790,7 +732,7 @@ class CMDBSource
 		);
 		DeadLockLog::Info($sMessage, $iMySqlErrorNo, $aLogContext);
 
-		IssueLog::Error($sMessage, LogChannels::DEADLOCK, $e->getMessage());
+		IssueLog::Error($sMessage, 'DeadLock', $e->getMessage());
 	}
 
 	/**
@@ -806,15 +748,10 @@ class CMDBSource
 	 */
 	private static function StartTransaction()
 	{
-		$aStackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT , 3);
-
 		$bHasExistingTransactions = self::IsInsideTransaction();
 		if (!$bHasExistingTransactions)
 		{
-			IssueLog::Trace("START TRANSACTION was sent to the DB", LogChannels::CMDB_SOURCE, ['stacktrace' => $aStackTrace]);
 			self::DBQuery('START TRANSACTION');
-		} else {
-			IssueLog::Trace("START TRANSACTION ignored as a transaction is already opened", LogChannels::CMDB_SOURCE, ['stacktrace' => $aStackTrace]);
 		}
 
 		self::AddTransactionLevel();
@@ -832,12 +769,9 @@ class CMDBSource
 	 */
 	private static function Commit()
 	{
-		$aStackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT , 3);
-		$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].'): '.$aStackTrace[2]['class'].'->'.$aStackTrace[2]['function'].'()';
 		if (!self::IsInsideTransaction())
 		{
 			// should not happen !
-			IssueLog::Error("No Transaction COMMIT $sCaller", 'cmdbsource');
 			throw new MySQLNoTransactionException('Trying to commit transaction whereas none have been started !', null);
 		}
 
@@ -845,10 +779,8 @@ class CMDBSource
 
 		if (self::IsInsideTransaction())
 		{
-			IssueLog::Trace("Ignore nested (".self::$m_iTransactionLevel.") COMMIT $sCaller", 'cmdbsource');
 			return;
 		}
-		IssueLog::Trace("COMMIT $sCaller", 'cmdbsource');
 		self::DBQuery('COMMIT');
 	}
 
@@ -867,22 +799,17 @@ class CMDBSource
 	 */
 	private static function Rollback()
 	{
-		$aStackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT , 3);
-		$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].'): '.$aStackTrace[2]['class'].'->'.$aStackTrace[2]['function'].'()';
 		if (!self::IsInsideTransaction())
 		{
 			// should not happen !
-			IssueLog::Error("No Transaction ROLLBACK $sCaller", 'cmdbsource');
 			throw new MySQLNoTransactionException('Trying to commit transaction whereas none have been started !', null);
 		}
 		self::RemoveLastTransactionLevel();
 		if (self::IsInsideTransaction())
 		{
-			IssueLog::Trace("Ignore nested (".self::$m_iTransactionLevel.") ROLLBACK $sCaller", 'cmdbsource');
 			return;
 		}
 
-		IssueLog::Trace("ROLLBACK $sCaller", 'cmdbsource');
 		self::DBQuery('ROLLBACK');
 	}
 
@@ -932,36 +859,6 @@ class CMDBSource
 		self::$m_iTransactionLevel = 0;
 	}
 
-	public static function IsDeadlockException(Exception $e)
-	{
-		while ($e instanceof Exception) {
-			if (($e instanceof MySQLException) && ($e->getCode() == 1213)) {
-				return true;
-			}
-			$e = $e->getPrevious();
-		}
-		return false;
-	}
-
-	/**
-	 *
-	 * @deprecated 2.7.0 N°1627 use ItopCounter instead
-	 *
-	 * @param string $sTable
-	 *
-	 * @return int
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public static function GetNextInsertId($sTable)
-	{
-		$sSQL = "SHOW TABLE STATUS LIKE '$sTable'";
-		$oResult = self::Query($sSQL);
-		$aRow = $oResult->fetch_assoc();
-
-		return $aRow['Auto_increment'];
-	}
-
 	public static function GetInsertId()
 	{
 		$iRes = self::$m_oMysqli->insert_id;
@@ -996,21 +893,17 @@ class CMDBSource
 	/**
 	 * @param string $sSql
 	 * @param int $iCol beginning at 0
-	 * @param mysqli $oMysqli if not null will query using this connection, otherwise will use {@see GetMySQLiForQuery}
 	 *
 	 * @return string corresponding cell content on the first line
 	 * @throws \MySQLException
 	 * @throws \MySQLQueryHasNoResultException
-	 * @since 2.7.5-2 2.7.6 3.0.0 N°4215 new optional mysqli param
 	 */
-	public static function QueryToScalar($sSql, $iCol = 0, $oMysqli = null)
+	public static function QueryToScalar($sSql, $iCol = 0)
 	{
-		$oMysqliToQuery = (is_null($oMysqli)) ? self::GetMySQLiForQuery() : $oMysqli;
-
 		$oKPI = new ExecutionKPI();
 		try
 		{
-			$oResult = $oMysqliToQuery->query($sSql);
+			$oResult = self::$m_oMysqli->query($sSql);
 		}
 		catch(mysqli_sql_exception $e)
 		{
@@ -1050,7 +943,7 @@ class CMDBSource
 		$oKPI = new ExecutionKPI();
 		try
 		{
-			$oResult = self::GetMySQLiForQuery()->query($sSql);
+			$oResult = self::$m_oMysqli->query($sSql);
 		}
 		catch(mysqli_sql_exception $e)
 		{
@@ -1132,7 +1025,7 @@ class CMDBSource
 	{
 		try
 		{
-			$oResult = self::GetMySQLiForQuery()->query($sSql);
+			$oResult = self::$m_oMysqli->query($sSql);
 		}
 		catch(mysqli_sql_exception $e)
 		{
@@ -1269,24 +1162,17 @@ class CMDBSource
 	}
 
 	/**
-	 * There may have some differences between DB ! For example in :
-	 *   * MySQL 5.7 we have `INT`
-	 *   * MariaDB >= 10.2 you get `int DEFAULT 'NULL'`
+	 * There may have some differences between DB : for example in MySQL 5.7 we have "INT", while in MariaDB >= 10.2 you get "int DEFAULT 'NULL'"
 	 *
-	 * We still need to do a case sensitive comparison for enum values !
+	 * We still do a case sensitive comparison for enum values !
 	 *
 	 * A better solution would be to generate SQL field definitions ({@link GetFieldSpec} method) based on the DB used... But for
 	 * now (N°2490 / SF #1756 / PR #91) we did implement this simpler solution
 	 *
-	 * @see GetFieldDataTypeAndOptions extracts all info from the SQL field definition
-	 *
+	 * @param string $sItopGeneratedFieldType
 	 * @param string $sDbFieldType
 	 *
-	 * @param string $sItopGeneratedFieldType
-	 *
 	 * @return bool true if same type and options (case sensitive comparison only for type options), false otherwise
-	 *
-	 * @throws \CoreException
 	 * @since 2.7.0 N°2490
 	 */
 	public static function IsSameFieldTypes($sItopGeneratedFieldType, $sDbFieldType)
@@ -1334,68 +1220,24 @@ class CMDBSource
 	}
 
 	/**
-	 * @see \self::GetEnumOptions() specific processing for ENUM fields
-	 *
-	 * @param string $sCompleteFieldType sql field type, for example `VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0`
+	 * @param string $sCompleteFieldType sql field type, for example 'VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0'
 	 *
 	 * @return string[] consisting of 3 items :
-	 *      1. data type : for example `VARCHAR`
-	 *      2. type value : for example `255`
-	 *      3. other options : for example `CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0`
-	 *
-	 * @throws \CoreException
+	 *      1. data type : for example 'VARCHAR'
+	 *      2. type value : for example '255'
+	 *      3. other options : for example ' CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0'
 	 */
 	private static function GetFieldDataTypeAndOptions($sCompleteFieldType)
 	{
 		preg_match('/^([a-zA-Z]+)(\(([^\)]+)\))?( .+)?/', $sCompleteFieldType, $aMatches);
 
 		$sDataType = isset($aMatches[1]) ? $aMatches[1] : '';
-
-		if (strcasecmp($sDataType, 'ENUM') === 0){
-			try{
-				return self::GetEnumOptions($sDataType, $sCompleteFieldType);
-			}catch(CoreException $e){
-				//do nothing ; especially do not block setup.
-				IssueLog::Warning("enum was not parsed properly: $sCompleteFieldType. it should not happen during setup.");
-			}
-		}
-
 		$sTypeOptions = isset($aMatches[2]) ? $aMatches[3] : '';
 		$sOtherOptions = isset($aMatches[4]) ? $aMatches[4] : '';
 
 		return array($sDataType, $sTypeOptions, $sOtherOptions);
 	}
 
-	/**
-	 * @param string $sDataType for example `ENUM`
-	 * @param string $sCompleteFieldType Example:
-	 *     `ENUM('CSP A','CSP (aaaa) M','NA','OEM(ROC)','OPEN(VL)','RETAIL (Boite)') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci`
-	 *
-	 * @return string[] consisting of 3 items :
-	 *      1. data type : ENUM or enum here
-	 *      2. type value : in-between EUM parenthesis
-	 *      3. other options : for example ' CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0'
-	 * @throws \CoreException
-	 * @since 2.7.4 N°3065 specific processing for enum fields : fix no alter table when enum values containing parenthesis
-	 * Handle ENUM options
-	 */
-	private static function GetEnumOptions($sDataType, $sCompleteFieldType)
-	{
-		$iFirstOpeningParenthesis = strpos($sCompleteFieldType, '(');
-		$iLastEndingParenthesis = strrpos($sCompleteFieldType, ')');
-
-		if ($iFirstOpeningParenthesis === false || $iLastEndingParenthesis === false ){
-			//should never happen as GetFieldDataTypeAndOptions regexp matched.
-			//except if regexp is modiied/broken somehow one day...
-			throw new CoreException("GetEnumOptions issue with $sDataType parsing : " . $sCompleteFieldType);
-		}
-
-		$sTypeOptions = substr($sCompleteFieldType, $iFirstOpeningParenthesis + 1, $iLastEndingParenthesis - 1);
-		$sOtherOptions = substr($sCompleteFieldType, $iLastEndingParenthesis + 1);
-
-		return array($sDataType, $sTypeOptions, $sOtherOptions);
-	}
-
 	/**
 	 * @param string $sTable
 	 * @param string $sField
@@ -1619,7 +1461,7 @@ class CMDBSource
 		$sSql = "SELECT * FROM `$sTable`";
 		try
 		{
-			$oResult = self::GetMySQLiForQuery()->query($sSql);
+			$oResult = self::$m_oMysqli->query($sSql);
 		}
 		catch(mysqli_sql_exception $e)
 		{

core/coreexception.class.inc.php

@@ -93,7 +93,7 @@ class CoreException extends Exception
 	 * getTraceAsString() cannot be overrided and it is limited as only current exception stack is returned.
 	 * we need stack of all previous exceptions
 	 * @uses __tostring() already does the work.
-	 * @since 2.7.2/ 2.8.0
+	 * @since 2.7.2/ 3.0.0
 	 */
 	public function getFullStackTraceAsString(){
 		return "" . $this;
@@ -149,14 +149,14 @@ class CoreCannotSaveObjectException extends CoreException
 	 *
 	 * @param array $aContextData containing at least those keys : issues, id, class
 	 */
-	public function __construct($aContextData, $oPrevious = null)
+	public function __construct($aContextData)
 	{
 		$this->aIssues = $aContextData['issues'];
 		$this->iObjectId = $aContextData['id'];
 		$this->sObjectClass = $aContextData['class'];
 
 		$sIssues = implode(', ', $this->aIssues);
-		parent::__construct($sIssues, $aContextData, '', $oPrevious);
+		parent::__construct($sIssues, $aContextData);
 	}
 
 	/**
@@ -165,15 +165,19 @@ class CoreCannotSaveObjectException extends CoreException
 	public function getHtmlMessage()
 	{
 		$sTitle = Dict::S('UI:Error:SaveFailed');
-		$sContent = "<span><strong>".utils::HtmlEntities($sTitle)."</strong></span>";
+		$sContent = "<span><strong>{$sTitle}</strong></span>";
 
-		if (count($this->aIssues) == 1) {
+		if (count($this->aIssues) == 1)
+		{
 			$sIssue = reset($this->aIssues);
-			$sContent .= " <span>".utils::HtmlEntities($sIssue)."</span>";
-		} else {
+			$sContent .= " <span>{$sIssue}</span>";
+		}
+		else
+		{
 			$sContent .= '<ul>';
-			foreach ($this->aIssues as $sError) {
-				$sContent .= "<li>".utils::HtmlEntities($sError)."</li>";
+			foreach ($this->aIssues as $sError)
+			{
+				$sContent .= "<li>$sError</li>";
 			}
 			$sContent .= '</ul>';
 		}

core/counter.class.inc.php

@@ -188,8 +188,8 @@ final class ItopCounter
 
 		if (!$hDBLink)
 		{
-            throw new MySQLException('Could not connect to the DB server '.mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno(), array('host' => $sDBHost, 'user' => $sDBUser));
-        }
+			throw new Exception("Could not connect to the DB server (host=$sDBHost, user=$sDBUser): ".mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno().')');
+		}
 
 		return $hDBLink;
 	}

core/csvbulkexport.class.inc.php

@@ -301,7 +301,7 @@ EOF
 		}
 		while($aRow = $oSet->FetchAssoc())
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$aData = array();
 			foreach($this->aStatusInfo['fields'] as $iCol => $aFieldSpec)
 			{
@@ -339,7 +339,7 @@ EOF
 		// Restore original date & time formats
 		AttributeDateTime::SetFormat($oPrevDateTimeFormat);
 		AttributeDate::SetFormat($oPrevDateFormat);
-		set_time_limit($iPreviousTimeLimit);
+		set_time_limit(intval($iPreviousTimeLimit));
 		$this->aStatusInfo['position'] += $this->iChunkSize;
 		if ($this->aStatusInfo['total'] == 0)
 		{

core/csvparser.class.inc.php

@@ -135,7 +135,7 @@ class CSVParser
 		// More time for the next row
 		if ($this->m_iTimeLimitPerRow !== null)
 		{
-			set_time_limit($this->m_iTimeLimitPerRow);
+			set_time_limit(intval($this->m_iTimeLimitPerRow));
 		}
 	}
 	protected function __AddCellTrimmed($c = null, $aFieldMap = null)
@@ -194,7 +194,7 @@ class CSVParser
 		{
 			// Give some time for the first row
 			$iTimeLimit = ini_get('max_execution_time');
-			set_time_limit($this->m_iTimeLimitPerRow);
+			set_time_limit(intval($this->m_iTimeLimitPerRow));
 		}
 		for($i = 0; $i <= $iDataLength ; $i++)
 		{
@@ -255,7 +255,7 @@ class CSVParser
 		if ($iTimeLimit !== null)
 		{
 			// Restore the previous time limit
-			set_time_limit($iTimeLimit);
+			set_time_limit(intval($iTimeLimit));
 		}
 		return $this->m_aDataSet;
 	}

core/datamodel.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">

core/dbobjectsearch.class.php

@@ -416,10 +416,6 @@ class DBObjectSearch extends DBSearch
 	 * @param string $sFilterCode
 	 * @param mixed $value
 	 * @param string $sOpCode operator to use : 'IN', 'NOT IN', 'Contains',' Begins with', 'Finishes with', ...
-	 *   If no operator is specified then :
-	 *     * for id field we will use "="
-	 *     * for other fields we will call the corresponding {@link AttributeDefinition::GetSmartConditionExpression} method impl
-	 *       to generate the expression
 	 * @param bool $bParseSearchString
 	 *
 	 * @throws \CoreException
@@ -911,10 +907,14 @@ class DBObjectSearch extends DBSearch
 	}
 
 	/**
-	 * @param DBObjectSearch $oFilter (can be modified)
-	 * @param $sExtKeyAttCode
+	 * Add a link to another filter, using an extkey already present in current filter
+	 *
+	 * @param DBObjectSearch $oFilter filter to join to (can be modified)
+	 * @param string $sExtKeyAttCode extkey present in current filter, that allows to points to $oFilter
 	 * @param int $iOperatorCode
-	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
+	 * @param array $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed.
+	 *          Doesn't change existing alias, use {@link \DBObjectSearch::RenameAlias()} for that.
+	 *
 	 * @throws CoreException
 	 * @throws CoreWarning
 	 */
@@ -1232,7 +1232,7 @@ class DBObjectSearch extends DBSearch
 				elseif (MetaModel::IsParentClass($oRightFilter->GetFirstJoinedClass(), $oLeftFilter->GetClass()))
 				{
 					// Specialize $oRightFilter
-					$oRightFilter->ChangeClass($oLeftFilter->GetFirstJoinedClass());
+					$oRightFilter->ChangeClass($oLeftFilter->GetClass());
 				}
 				else
 				{
@@ -1376,7 +1376,7 @@ class DBObjectSearch extends DBSearch
 
 			// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams($bExclude magic params)
 			$aNakedMagicArguments = array();
-			foreach (MetaModel::PrepareQueryArguments(array()) as $sArgName => $value)
+			foreach (MetaModel::PrepareQueryArguments(array(),array(), $this->GetExpectedArguments()) as $sArgName => $value)
 			{
 				$iPos = strpos($sArgName, '->object()');
 				if ($iPos === false)
@@ -1439,7 +1439,7 @@ class DBObjectSearch extends DBSearch
 			{
 				$aParams = array_merge($aContextParams, $this->m_aParams);
 			}
-			$aParams = MetaModel::PrepareQueryArguments($aParams);
+			$aParams = MetaModel::PrepareQueryArguments($aParams,array(), $this->GetExpectedArguments());
 		}
 		else
 		{
@@ -1632,7 +1632,7 @@ class DBObjectSearch extends DBSearch
 		$aRet = array('selects' => array(), 'joins' => array(), 'where' => array());
 
 		$aParams = array_merge($this->m_aParams);
-		$aParams = MetaModel::PrepareQueryArguments($aParams);
+		$aParams = MetaModel::PrepareQueryArguments($aParams, array(), $this->GetExpectedArguments());
 
 		foreach ($this->m_aSelectedClasses as $sAlias => $sClass)
 		{
@@ -1839,7 +1839,7 @@ class DBObjectSearch extends DBSearch
 	{
 		$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($this);
 		$oSQLQuery = $oSQLObjectQueryBuilder->MakeSQLObjectDeleteQuery();
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams(), $this->GetExpectedArguments());
 		$sRet = $oSQLQuery->RenderDelete($aScalarArgs);
 		return $sRet;
 	}
@@ -1855,7 +1855,7 @@ class DBObjectSearch extends DBSearch
 	{
 		$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($this);
 		$oSQLQuery = $oSQLObjectQueryBuilder->MakeSQLObjectUpdateQuery($aValues);
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams(), $this->GetExpectedArguments());
 		$sRet = $oSQLQuery->RenderUpdate($aScalarArgs);
 		return $sRet;
 	}
@@ -1874,7 +1874,7 @@ class DBObjectSearch extends DBSearch
 	{
 		$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($this);
 		$oSQLQuery = $oSQLObjectQueryBuilder->MakeSQLObjectUpdateQuery($aValues);
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams(), $this->GetExpectedArguments());
 		$sRet = $oSQLQuery->RenderInsert($aScalarArgs);
 		return $sRet;
 	}

core/dbobjectset.class.php

@@ -222,6 +222,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		if (!is_array($aAttToLoad))
 		{
 			$this->m_aAttToLoad = null;
+			trigger_error ( "OptimizeColumnLoad : wrong format actual :(".print_r($aAttToLoad, true)."). should be [alias=>[attributes]]",  E_USER_WARNING );
 			return;
 		}
 		foreach ($aAttToLoad as $sAlias => $aAttCodes)
@@ -229,6 +230,7 @@ class DBObjectSet implements iDBObjectSetIterator
 			if (!is_array($aAttCodes))
 			{
 				$this->m_aAttToLoad = null;
+				trigger_error ( "OptimizeColumnLoad : wrong format actual :(".print_r($aAttToLoad, true)."). should be [alias=>[attributes]]",  E_USER_WARNING );
 				return;
 			}
 		}
@@ -267,6 +269,7 @@ class DBObjectSet implements iDBObjectSetIterator
 					}
 				}
 			}
+
 			// Add the friendly name anytime
 			$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, 'friendlyname');
 			$aAttToLoadWithAttDef[$sClassAlias]['friendlyname'] = $oFriendlyNameAttDef;
@@ -763,10 +766,7 @@ class DBObjectSet implements iDBObjectSetIterator
 
 		try
 		{
-            $oKPI = new ExecutionKPI();
 			$this->m_oSQLResult = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, $this->GetRealSortOrder(), $this->m_iLimitCount, $this->m_iLimitStart, false);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 		} catch (MySQLException $e)
 		{
 			// 1116 = ER_TOO_MANY_TABLES
@@ -846,11 +846,8 @@ class DBObjectSet implements iDBObjectSetIterator
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
-            $oKPI = new ExecutionKPI();
 			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, 0, 0, true);
 			$resQuery = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, array(), 0, 0, true);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 			if (!$resQuery) return 0;
 
 			$aRow = CMDBSource::FetchArray($resQuery);
@@ -861,42 +858,6 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??
 	}
 
-    /**
-     * @param \DBSearch $oFilter
-     * @param array $aOrder
-     * @param int $iLimitCount
-     * @param int $iLimitStart
-     * @param bool $bCount
-     *
-     * @return string
-     */
-    private function GetPseudoOQL($oFilter, $aOrder, $iLimitCount, $iLimitStart, $bCount)
-    {
-        $sOQL = '';
-        if ($bCount) {
-            $sOQL .= 'COUNT ';
-        }
-        $sOQL .= $oFilter->ToOQL();
-
-        if ($iLimitCount > 0) {
-            $sOQL .= ' LIMIT ';
-            if ($iLimitStart > 0) {
-                $sOQL .= "$iLimitStart, ";
-            }
-            $sOQL .= "$iLimitCount";
-        }
-
-        if (count($aOrder) > 0) {
-            $sOQL .= ' ORDER BY ';
-            $aOrderBy = [];
-            foreach ($aOrder as $sAttCode => $bAsc) {
-                $aOrderBy[] = $sAttCode.' '.($bAsc ? 'ASC' : 'DESC');
-            }
-            $sOQL .= implode(', ', $aOrderBy);
-        }
-        return $sOQL;
-    }
-
 	/**
 	 * Check if the count exceeds a given limit
 	 *
@@ -913,11 +874,8 @@ class DBObjectSet implements iDBObjectSetIterator
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
-            $oKPI = new ExecutionKPI();
 			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
 			$resQuery = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, array(), $iLimit + 2, 0, true);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 			if ($resQuery)
 			{
 				$aRow = CMDBSource::FetchArray($resQuery);
@@ -928,7 +886,7 @@ class DBObjectSet implements iDBObjectSetIterator
 			{
 				$iCount = 0;
 			}
-        }
+		}
 		else
 		{
 			$iCount = $this->m_iNumTotalDBRows;
@@ -953,11 +911,8 @@ class DBObjectSet implements iDBObjectSetIterator
 	{
 		if (is_null($this->m_iNumTotalDBRows))
 		{
-            $oKPI = new ExecutionKPI();
 			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
 			$resQuery = CMDBSource::Query($sSQL);
-            $sOQL = $this->GetPseudoOQL($this->m_oFilter, array(), $iLimit + 2, 0, true);
-            $oKPI->ComputeStats('OQL Query Exec', $sOQL);
 			if ($resQuery)
 			{
 				$aRow = CMDBSource::FetchArray($resQuery);
@@ -968,7 +923,7 @@ class DBObjectSet implements iDBObjectSetIterator
 			{
 				$iCount = 0;
 			}
-        }
+		}
 		else
 		{
 			$iCount = $this->m_iNumTotalDBRows;
@@ -1360,34 +1315,6 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oNewSet;
 	}
 
-    /**
-     * Will be deprecated soon - use MetaModel::GetRelatedObjectsDown/Up instead to take redundancy into account
-     *
-     * @throws \Exception
-     */
-	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99)
-	{
-		$aRelatedObjs = array();
-
-		$aVisited = array(); // optimization for consecutive calls of MetaModel::GetRelatedObjects
-		$this->Seek(0);
-		while ($oObject = $this->Fetch())
-		{
-			$aMore = $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited);
-			foreach ($aMore as $sClass => $aRelated)
-			{
-				foreach ($aRelated as $iObj => $oObj)
-				{
-					if (!isset($aRelatedObjs[$sClass][$iObj]))
-					{
-						$aRelatedObjs[$sClass][$iObj] = $oObj;
-					}
-				}
-			}
-		}
-		return $aRelatedObjs;
-	}
-
     /**
      * Compute the "RelatedObjects" (forward or "down" direction) for the set
      * for the specified relation
@@ -1544,7 +1471,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	public function ListConstantFields()
 	{
 		// The complete list of arguments will include magic arguments (e.g. current_user->attcode)
-		$aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
+		$aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs, $this->m_oFilter->ListParameters());
 		$aConst = $this->m_oFilter->ListConstantFields();
 				
 		foreach($aConst as $sClassAlias => $aVals)
@@ -1563,7 +1490,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	
 	public function ApplyParameters()
 	{
-		$aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
+		$aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs, $this->m_oFilter->GetExpectedArguments());
 		$this->m_oFilter->ApplyParameters($aAllArgs);
 	}
 }

core/dbsearch.class.php

@@ -603,11 +603,11 @@ abstract class DBSearch
 			elseif (($iPos = strpos($sParam, '->')) !== false)
 			{
 				$sParamName = substr($sParam, 0, $iPos);
-				if (isset($aContextParams[$sParamName.'->object()']))
+				if (isset($aContextParams[$sParamName.'->object()']) || isset($aContextParams[$sParamName]))
 				{
 					$sAttCode = substr($sParam, $iPos + 2);
 					/** @var \DBObject $oObj */
-					$oObj = $aContextParams[$sParamName.'->object()'];
+					$oObj = isset($aContextParams[$sParamName.'->object()']) ? $aContextParams[$sParamName.'->object()'] : $aContextParams[$sParamName];
 					if ($oObj->IsModified())
 					{
 						if ($sAttCode == 'id')
@@ -754,14 +754,14 @@ abstract class DBSearch
      * @see DBSearch::ToOQL()
      *
 	 * @param string $sQuery The OQL to convert to a DBSearch
-	 * @param array $aParams array of <mixed> params index by <string> name
+	 * @param mixed[string]  $aParams array of <mixed> params index by <string> name
 	 * @param ModelReflection|null $oMetaModel The MetaModel to use when checking the consistency of the OQL
      *
 	 * @return DBObjectSearch|DBUnionSearch
      *
 	 * @throws OQLException
 	 */
-	public static function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel=null)
+	static public function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel=null)
 	{
 		if (empty($sQuery))
 		{
@@ -1004,8 +1004,10 @@ abstract class DBSearch
 	}
 
 	/**
-	 * Generate a SQL query from the current search
-	 *
+     * Generate a SQL query from the current search
+     *
+     * @internal
+     *
 	 * @param array $aOrderBy Array of '[<classalias>.]attcode' => bAscending
 	 * @param array $aArgs
 	 * @param null $aAttToLoad
@@ -1013,16 +1015,12 @@ abstract class DBSearch
 	 * @param int $iLimitCount
 	 * @param int $iLimitStart
 	 * @param bool $bGetCount
-	 * @param bool $bBeautifulSQL
-	 *
 	 * @return string
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @internal
-	 *
+	 * @throws CoreException
+	 * @throws Exception
+	 * @throws MissingQueryArgument
 	 */
-	public function MakeSelectQuery($aOrderBy = array(), $aArgs = array(), $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulSQL = true)
+	public function MakeSelectQuery($aOrderBy = array(), $aArgs = array(), $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false)
 	{
 		// Check the order by specification, and prefix with the class alias
 		// and make sure that the ordering columns are going to be selected
@@ -1087,7 +1085,8 @@ abstract class DBSearch
 		}
 		try
 		{
-			$sRes = $oSQLQuery->RenderSelect($aOrderSpec, $aScalarArgs, $iLimitCount, $iLimitStart, $bGetCount, $bBeautifulSQL);
+			// $bBeautifulSQL = self::$m_bTraceQueries || self::$m_bDebugQuery || self::$m_bIndentQueries;
+			$sRes = $oSQLQuery->RenderSelect($aOrderSpec, $aScalarArgs, $iLimitCount, $iLimitStart, $bGetCount, true);
 			if ($sClassAlias == '_itop_')
 			{
 				IssueLog::Info('SQL Query (_itop_): '.$sRes);
@@ -1187,30 +1186,6 @@ abstract class DBSearch
 				}
 			}
 		}
-
-		if (is_array($aGroupByExpr))
-		{
-			foreach($aGroupByExpr as $sAlias => $oGroupByExp)
-			{
-				/** @var \Expression $oGroupByExp */
-
-				$aFields = $oGroupByExp->ListRequiredFields();
-				foreach($aFields as $sFieldAlias)
-				{
-					$aMatches = array();
-					if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
-					{
-						$sFieldClass = $this->GetClassName($aMatches[1]);
-						$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
-						if ( $oAttDef instanceof iAttributeNoGroupBy)
-						{
-							throw new Exception("Grouping on '$sFieldClass' fields is not supported.");
-						}
-					}
-				}
-			}
-		}
-
 		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr);
 		$oSQLQuery->SetSourceOQL($oSearch->ToOQL());
 
@@ -1623,7 +1598,7 @@ abstract class DBSearch
 		$oSet = new DBObjectSet($this);
 		if (MetaModel::IsStandaloneClass($sClass))
 		{
-			$oSet->OptimizeColumnLoad(array($this->GetClassAlias() => array()));
+			$oSet->OptimizeColumnLoad(array($this->GetClassAlias() => array('')));
 			$aIds = array($sClass => $oSet->GetColumnAsArray('id'));
 		}
 		else

core/dbunionsearch.class.php

@@ -416,11 +416,7 @@ class DBUnionSearch extends DBSearch
 		$aSearches = array();
 		foreach ($this->aSearches as $oSearch)
 		{
-			if (!$oSearch->IsAllDataAllowed()) {
-				$aSearches[] = $oSearch->Filter($sClassAlias, $oFilter);
-			} else {
-				$aSearches[] = $oSearch;
-			}
+			$aSearches[] = $oSearch->Filter($sClassAlias, $oFilter);
 		}
 		return new DBUnionSearch($aSearches);
 	}

core/deletionplan.class.inc.php

@@ -116,7 +116,7 @@ class DeletionPlan
 		{
 			foreach($aToUpdate as $iId => $aData)
 			{
-				set_time_limit($iLoopTimeLimit);
+				set_time_limit(intval($iLoopTimeLimit));
 				$this->m_iToUpdate++;
 
 				$oObject = $aData['to_reset'];
@@ -142,7 +142,7 @@ class DeletionPlan
 				}
 			}
 		}
-		set_time_limit($iPreviousTimeLimit);
+		set_time_limit(intval($iPreviousTimeLimit));
 	}
 
 	public function GetIssues()

core/dict.class.inc.php

@@ -64,8 +64,6 @@ class Dict
 	protected static $m_aLanguages = array(); // array( code => array( 'description' => '...', 'localized_description' => '...') ...)
 	protected static $m_aData = array();
 	protected static $m_sApplicationPrefix = null;
-	/** @var \ApcService $m_oApcService  */
-	protected static $m_oApcService = null;
 
 	/**
 	 * @param $sLanguageCode
@@ -147,17 +145,15 @@ class Dict
 	{
 		// Attempt to find the string in the user language
 		//
-		$sLangCode = self::GetUserLanguage();
-		self::InitLangIfNeeded($sLangCode);
+		self::InitLangIfNeeded(self::GetUserLanguage());
 
-		if (!array_key_exists($sLangCode, self::$m_aData))
+		if (!array_key_exists(self::GetUserLanguage(), self::$m_aData))
 		{
-			IssueLog::Warning("Cannot find $sLangCode in dictionnaries. default labels displayed");
 			// It may happen, when something happens before the dictionaries get loaded
 			return $sStringCode;
 		}
-		$aCurrentDictionary = self::$m_aData[$sLangCode];
-		if (is_array($aCurrentDictionary) && array_key_exists($sStringCode, $aCurrentDictionary))
+		$aCurrentDictionary = self::$m_aData[self::GetUserLanguage()];
+		if (array_key_exists($sStringCode, $aCurrentDictionary))
 		{
 			return $aCurrentDictionary[$sStringCode];
 		}
@@ -168,7 +164,7 @@ class Dict
 			self::InitLangIfNeeded(self::$m_sDefaultLanguage);
 			
 			$aDefaultDictionary = self::$m_aData[self::$m_sDefaultLanguage];
-			if (is_array($aDefaultDictionary) && array_key_exists($sStringCode, $aDefaultDictionary))
+			if (array_key_exists($sStringCode, $aDefaultDictionary))
 			{
 				return $aDefaultDictionary[$sStringCode];
 			}
@@ -177,7 +173,7 @@ class Dict
 			self::InitLangIfNeeded('EN US');
 
 			$aDefaultDictionary = self::$m_aData['EN US'];
-			if (is_array($aDefaultDictionary) && array_key_exists($sStringCode, $aDefaultDictionary))
+			if (array_key_exists($sStringCode, $aDefaultDictionary))
 			{
 				return $aDefaultDictionary[$sStringCode];
 			}
@@ -236,26 +232,7 @@ class Dict
 	{
 		self::$m_aLanguages = $aLanguagesList;
 	}
-
-	/**
-	 * @since 2.7.6 N°4125
-	 * @return \ApcService
-	 */
-	public static function GetApcService() {
-		if (self::$m_oApcService === null){
-			self::$m_oApcService = new ApcService();
-		}
-		return self::$m_oApcService;
-	}
-
-	/**
-	 * @since 2.7.6 N°4125
-	 * @param \ApcService $m_oApcService
-	 */
-	public static function SetApcService($oApcService) {
-		self::$m_oApcService = $oApcService;
-	}
-
+	
 	/**
 	 * Load a language from the language dictionary, if not already loaded
 	 * @param string $sLangCode Language code
@@ -264,23 +241,20 @@ class Dict
 	public static function InitLangIfNeeded($sLangCode)
 	{
 		if (array_key_exists($sLangCode, self::$m_aData)) return true;
-
+		
 		$bResult = false;
-
-		if (self::GetApcService()->function_exists('apc_fetch')
-			&& (self::$m_sApplicationPrefix !== null))
+		
+		if (function_exists('apc_fetch') && (self::$m_sApplicationPrefix !== null))
 		{
 			// Note: For versions of APC older than 3.0.17, fetch() accepts only one parameter
 			//
-			self::$m_aData[$sLangCode] = self::GetApcService()->apc_fetch(self::$m_sApplicationPrefix.'-dict-'.$sLangCode);
-			if (self::$m_aData[$sLangCode] === false) {
+			self::$m_aData[$sLangCode] = apc_fetch(self::$m_sApplicationPrefix.'-dict-'.$sLangCode);
+			if (self::$m_aData[$sLangCode] === false)
+			{
 				unset(self::$m_aData[$sLangCode]);
-			} else if (! is_array(self::$m_aData[$sLangCode])) {
-				// N°4125: we dont fix dictionnary corrupted cache (on iTop side).
-				// but we log an error in a dedicated channel to let itop administrator be aware of a potential APCu issue to fix.
-				IssueLog::Error("APCu corrupted data (with $sLangCode dictionnary). APCu configuration and running version should be troubleshooted...", LogChannels::APC);
-				$bResult = true;
-			} else {
+			}
+			else
+			{
 				$bResult = true;
 			}
 		}
@@ -289,10 +263,9 @@ class Dict
 			$sDictFile = APPROOT.'env-'.utils::GetCurrentEnvironment().'/dictionaries/'.str_replace(' ', '-', strtolower($sLangCode)).'.dict.php';
 			require_once($sDictFile);
 			
-			if (self::GetApcService()->function_exists('apc_store')
-				&& (self::$m_sApplicationPrefix !== null))
+			if (function_exists('apc_store') && (self::$m_sApplicationPrefix !== null))
 			{
-				self::GetApcService()->apc_store(self::$m_sApplicationPrefix.'-dict-'.$sLangCode, self::$m_aData[$sLangCode]);
+				apc_store(self::$m_sApplicationPrefix.'-dict-'.$sLangCode, self::$m_aData[$sLangCode]);
 			}
 			$bResult = true;
 		}

core/displayablegraph.class.inc.php

@@ -874,7 +874,7 @@ class DisplayableGraph extends SimpleGraph
 		$oNodesIter = new RelationTypeIterator($oGraph, 'Node');
 		foreach($oNodesIter as $oNode)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			switch(get_class($oNode))
 			{
 				case 'RelationObjectNode':				
@@ -921,7 +921,7 @@ class DisplayableGraph extends SimpleGraph
 		$oEdgesIter = new RelationTypeIterator($oGraph, 'Edge');
 		foreach($oEdgesIter as $oEdge)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$oSourceNode = $oNewGraph->GetNode($oEdge->GetSourceNode()->GetId());
 			$oSinkNode = $oNewGraph->GetNode($oEdge->GetSinkNode()->GetId());
 			$oNewEdge = new DisplayableEdge($oNewGraph, $oEdge->GetId(), $oSourceNode, $oSinkNode);
@@ -932,7 +932,7 @@ class DisplayableGraph extends SimpleGraph
 		$aEdgeKeys = array();
 		foreach($oEdgesIter as $oEdge)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$sSourceId =  $oEdge->GetSourceNode()->GetId();
 			$sSinkId = $oEdge->GetSinkNode()->GetId();
 			if ($sSourceId == $sSinkId)
@@ -958,7 +958,7 @@ class DisplayableGraph extends SimpleGraph
 		$oNodesIter = new RelationTypeIterator($oNewGraph, 'Node');
 		foreach($oNodesIter as $oNode)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			if ($bDirectionDown && $oNode->GetProperty('source'))
 			{
 				$oNode->GroupSimilarNeighbours($oNewGraph, $iGroupingThreshold, true, $bDirectionDown);
@@ -973,7 +973,7 @@ class DisplayableGraph extends SimpleGraph
 		$iGroupIdx = 0;
 		foreach($oIterator as $oNode)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			if ($oNode instanceof DisplayableGroupNode)
 			{
 				if ($oNode->GetObjectCount() == 0)
@@ -995,7 +995,7 @@ class DisplayableGraph extends SimpleGraph
 		$aEdgeKeys = array();
 		foreach($oEdgesIter as $oEdge)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$sSourceId =  $oEdge->GetSourceNode()->GetId();
 			$sSinkId = $oEdge->GetSinkNode()->GetId();
 			if ($sSourceId == $sSinkId)
@@ -1017,7 +1017,7 @@ class DisplayableGraph extends SimpleGraph
 				}
 			}
 		}
-		set_time_limit($iPreviousTimeLimit);
+		set_time_limit(intval($iPreviousTimeLimit));
 		
 		return $oNewGraph;
 	}
@@ -1203,10 +1203,8 @@ class DisplayableGraph extends SimpleGraph
 	 * @param float $xMax Right coordinate of the bounding box to display the graph
 	 * @param float $yMin Top coordinate of the bounding box to display the graph
 	 * @param float $yMax Bottom coordinate of the bounding box to display the graph
-	 *
-	 * @since 2.7.7 3.0.2 3.1.0 N°4985 $sComments param is no longer optional
 	 */
-	function RenderAsPDF(PDFPage $oPage, $sComments, $sContextKey, $xMin = -1, $xMax = -1, $yMin = -1, $yMax = -1)
+	function RenderAsPDF(PDFPage $oPage, $sComments = '', $sContextKey, $xMin = -1, $xMax = -1, $yMin = -1, $yMax = -1)
 	{
 		$aContextDefs = static::GetContextDefinitions($sContextKey, false); // No need to develop the parameters
 		$oPdf = $oPage->get_tcpdf();
@@ -1259,14 +1257,14 @@ class DisplayableGraph extends SimpleGraph
 		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 		foreach($oIterator as $sId => $oEdge)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$oEdge->RenderAsPDF($oPdf, $this, $fScale, $aContextDefs);
 		}
 
 		$oIterator = new RelationTypeIterator($this, 'Node');
 		foreach($oIterator as $sId => $oNode)
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$oNode->RenderAsPDF($oPdf, $this, $fScale, $aContextDefs);
 		}
 
@@ -1433,25 +1431,83 @@ class DisplayableGraph extends SimpleGraph
 	 * @param int $iObjKey
 	 * @param string $sContextKey
 	 * @param array $aContextParams
-	 * @param bool $bLazyLoading since 2.7.7 3.0.1
 	 *
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
 	 */
-	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array(), $bLazyLoading = false)
-	{
-		list($aExcludedByClass, $aAdditionalContexts) = $this->DisplayFiltering($sContextKey, $aContextParams, $aExcludedObjects, $oP, $aResults, $bLazyLoading);
-		$iGroupingThreshold = utils::ReadParam('g', 5);
+	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array())
+	{	
+		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
+		$aExcludedByClass = array();
+		foreach($aExcludedObjects as $oObj)
+		{
+			if (!array_key_exists(get_class($oObj), $aExcludedByClass))
+			{
+				$aExcludedByClass[get_class($oObj)] = array();
+			}
+			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
+		}
+		$sSftShort = Dict::S('UI:ElementsDisplayed');
+		$sSearchToggle = Dict::S('UI:Search:Toggle');
+		$oP->add("<div class=\"not-printable\">\n");
+		$oP->add(
+<<<EOF
+ <div id="ds_flash" class="search_box">
+	<form id="dh_flash" class="search_form_handler closed">
+	<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fas fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
+	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
+EOF
+		);
+		
+		$oP->add_ready_script(
+<<<EOF
+	$("#dh_flash > .sf_title").click( function() {
+		$("#dh_flash").toggleClass('closed');
+	});
+    $('#ReloadMovieBtn').button().button('disable');
+EOF
+		);
+		$aSortedElements = array();
+		foreach($aResults as $sClassIdx => $aObjects)
+		{
+			foreach($aObjects as $oCurrObj)
+			{
+				$sSubClass = get_class($oCurrObj);
+				$aSortedElements[$sSubClass] = MetaModel::GetName($sSubClass);
+			}
+		}
+				
+		asort($aSortedElements);
+		$idx = 0;
+		foreach($aSortedElements as $sSubClass => $sClassName)
+		{
+			$oP->add("<span style=\"padding-right:2em; white-space:nowrap;\"><input type=\"checkbox\" id=\"exclude_$idx\" name=\"excluded[]\" value=\"$sSubClass\" checked onChange=\"$('#ReloadMovieBtn').button('enable')\"><label for=\"exclude_$idx\">&nbsp;".MetaModel::GetClassIcon($sSubClass)."&nbsp;$sClassName</label></span> ");
+			$idx++;
+		}
+		$oP->add("<p style=\"text-align:right\"><button type=\"button\" id=\"ReloadMovieBtn\" onClick=\"DoReload()\">".Dict::S('UI:Button:Refresh')."</button></p>");
+		$oP->add("</div></div></form>");
+		$oP->add("</div>\n");
+	 	$oP->add("</div>\n"); // class="not-printable"
 
+		$aAdditionalContexts = array();
+		foreach($aContextDefs as $sKey => $aDefinition)
+		{
+			$aAdditionalContexts[] = array('key' => $sKey, 'label' => Dict::S($aDefinition['dict']), 'oql' => $aDefinition['oql'], 'default' => (array_key_exists('default', $aDefinition)  && ($aDefinition['default'] == 'yes')));
+		}
+		
+		$sDirection = utils::ReadParam('d', 'horizontal');
+		$iGroupingThreshold = utils::ReadParam('g', 5);
+	
 		$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/fraphael.js');
 		$oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery.contextMenu.css');
 		$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.contextMenu.js');
 		$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/simple_graph.js');
-
 		try
 		{
 			$this->InitFromGraphviz();
+			$sExportAsPdfURL = '';
 			$sExportAsPdfURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_pdf&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
+			$oAppcontext = new ApplicationContext();
 			$sContext = $oAppContext->GetForLink();
 			$sDrillDownURL = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details&class=%1$s&id=%2$s&'.$sContext;
 			$sExportAsDocumentURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_attachment&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
@@ -1530,14 +1586,7 @@ class DisplayableGraph extends SimpleGraph
 				// Export as Attachment requires GD (for building the PDF) AND a valid objclass/objkey couple
 				unset($aParams['export_as_attachment']);
 			}
-			if ($oP->IsPrintableVersion() || !$bLazyLoading) {
-				$oP->add_ready_script(" $('#$sId').simple_graph(".json_encode($aParams).");");
-			} else {
-				$oP->add_script("function Load(){var aExcluded = [];	$('input[name^=excluded]').each( function() {if (!$(this).prop('checked'))	{	aExcluded.push($(this).val());		}} ); var params= $.extend(".json_encode($aParams).",  {excluded_classes: aExcluded}); $('#$sId').simple_graph(params);}");
-				$oP->add_ready_script("$('#impacted_objects_lists').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');$('#impacted_groups').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');");
-
-			}
-
+			$oP->add_ready_script("$('#$sId').simple_graph(".json_encode($aParams).");");
 		}
 		catch(Exception $e)
 		{
@@ -1569,86 +1618,5 @@ class DisplayableGraph extends SimpleGraph
 EOF
 		);
 	}
-
-	/**
-	 * @param $sContextKey
-	 * @param array $aContextParams
-	 * @param array $aExcludedObjects
-	 * @param \WebPage $oP
-	 * @param array $aResults
-	 * @param bool $bLazyLoading
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 * @since 2.7.7 & 3.0.1
-	 */
-	protected function DisplayFiltering($sContextKey, $aContextParams, $aExcludedObjects, $oP, $aResults, $bLazyLoading)
-	{
-		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
-		$aExcludedByClass = array();
-		foreach ($aExcludedObjects as $oObj) {
-			if (!array_key_exists(get_class($oObj), $aExcludedByClass)) {
-				$aExcludedByClass[get_class($oObj)] = array();
-			}
-			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
-		}
-		$sSftShort = Dict::S('UI:ElementsDisplayed');
-		$sSearchToggle = Dict::S('UI:Search:Toggle');
-		$oP->add("<div class=\"not-printable\">\n");
-		$oP->add(
-			<<<EOF
- <div id="ds_flash" class="search_box">
-	<form id="dh_flash" class="search_form_handler">
-	<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fas fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
-	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
-EOF
-		);
-
-		$oP->add_ready_script(
-			<<<EOF
-	$("#dh_flash > .sf_title").click( function() {
-		$("#dh_flash").toggleClass('closed');
-	});
-    $('#ReloadMovieBtn').button().button('disable');
-EOF
-		);
-		if ($bLazyLoading) {
-			$oP->add_ready_script("$('#ReloadMovieBtn').button('enable');");
-		} else {
-			$oP->add_ready_script("$('#dh_flash').addClass('closed');");
-		}
-		$aSortedElements = array();
-		foreach ($aResults as $sClassIdx => $aObjects) {
-			foreach ($aObjects as $oCurrObj) {
-				$sSubClass = get_class($oCurrObj);
-				$aSortedElements[$sSubClass] = MetaModel::GetName($sSubClass);
-			}
-		}
-
-		asort($aSortedElements);
-		$idx = 0;
-		foreach ($aSortedElements as $sSubClass => $sClassName) {
-			$oP->add("<span style=\"padding-right:2em; white-space:nowrap;\"><input type=\"checkbox\" id=\"exclude_$idx\" name=\"excluded[]\" value=\"$sSubClass\" checked onChange=\"$('#ReloadMovieBtn').button('enable')\"><label for=\"exclude_$idx\">&nbsp;".MetaModel::GetClassIcon($sSubClass)."&nbsp;$sClassName</label></span> ");
-			$idx++;
-		}
-		if ($bLazyLoading) {
-			$sOnCLick = "Load(); $('#ReloadMovieBtn').attr('onclick','DoReload()');$('#ReloadMovieBtn').html('".Dict::S('UI:Button:Refresh')."');";
-			$oP->add("<p style=\"text-align:right\"><button type=\"button\" id=\"ReloadMovieBtn\" onClick=\"$sOnCLick\">".Dict::S('Relation:impacts/LoadData')."</button></p>");
-		} else {
-			$sOnCLick = "DoReload()";
-			$oP->add("<p style=\"text-align:right\"><button type=\"button\" id=\"ReloadMovieBtn\" onClick=\"$sOnCLick\">".Dict::S('UI:Button:Refresh')."</button></p>");
-		}
-		$oP->add("</div></div></form>");
-		$oP->add("</div>\n");
-		$oP->add("</div>\n"); // class="not-printable"
-
-		$aAdditionalContexts = array();
-		foreach ($aContextDefs as $sKey => $aDefinition) {
-			$aAdditionalContexts[] = array('key' => $sKey, 'label' => Dict::S($aDefinition['dict']), 'oql' => $aDefinition['oql'], 'default' => (array_key_exists('default', $aDefinition) && ($aDefinition['default'] == 'yes')));
-		}
-
-		return array($aExcludedByClass, $aAdditionalContexts);
-	}
 	
 }

core/email.class.inc.php

@@ -24,69 +24,38 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Core\Email\EmailFactory;
-use Combodo\iTop\Core\Email\iEMail;
+Swift_Preferences::getInstance()->setCharset('UTF-8');
 
 
 define ('EMAIL_SEND_OK', 0);
 define ('EMAIL_SEND_PENDING', 1);
 define ('EMAIL_SEND_ERROR', 2);
 
-class EMail implements iEMail
+class EMail
 {
-	/**
-	 * @see self::LoadConfig()
-	 * @var Config
-	 * @since 2.7.7 3.0.2 3.1.0 N°3169 N°5102 Move attribute to children classes
-	 * @since 2.7.8 3.0.3 3.1.0 N°4947 pull up the attribute back to the Email class as config init is done here
-	 */
-	protected static $m_oConfig = null;
-	protected $oMailer;
-
 	// Serialization formats
 	const ORIGINAL_FORMAT = 1; // Original format, consisting in serializing the whole object, inculding the Swift Mailer's object.
-	// Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
+							   // Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
 	const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
+	
+	protected static $m_oConfig = null;
+	protected $m_aData; // For storing data to serialize
+
+	public function LoadConfig($sConfigFile = ITOP_DEFAULT_CONFIG_FILE)
+	{
+		if (is_null(self::$m_oConfig))
+		{
+			self::$m_oConfig = new Config($sConfigFile);
+		}
+	}
+
+	protected $m_oMessage;
 
 	public function __construct()
 	{
-		$this->oMailer = EmailFactory::GetMailer();
-	}
-
-	/**
-	 * Sets {@see m_oConfig} if current attribute is null
-	 *
-	 * @returns \Config the current {@see m_oConfig} value
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 *
-	 * @uses utils::GetConfig()
-	 *
-	 * @since 2.7.7 3.0.2 3.1.0 N°3169 N°5102 Move method to children classes
-	 * @since 2.7.8 3.0.3 3.1.0 N°4947 Pull up to the parent class, and remove `$sConfigFile` param
-	 */
-	public function LoadConfig()
-	{
-		if (is_null(static::$m_oConfig)) {
-			static::$m_oConfig = utils::GetConfig();
-		}
-
-		return static::$m_oConfig;
-	}
-
-	/**
-	 * @return void
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 * @since 2.7.8 3.0.3 3.1.0 N°4947 Method creation, to factorize same code in children classes
-	 */
-	protected function InitRecipientFrom()
-	{
-		$oConfig = $this->LoadConfig();
-		$this->SetRecipientFrom(
-			$oConfig->Get('email_default_sender_address'),
-			$oConfig->Get('email_default_sender_label')
-		);
+		$this->m_aData = array();
+		$this->m_oMessage = Swift_Message::newInstance();
+		$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
 	}
 
 	/**
@@ -97,96 +66,489 @@ class EMail implements iEMail
 	 */
 	public function SerializeV2()
 	{
-		return $this->oMailer->SerializeV2();
+		return serialize($this->m_aData);
 	}
-
+	
 	/**
 	 * Custom de-serialization method
-	 *
 	 * @param string $sSerializedMessage The serialized representation of the message
-	 *
-	 * @return \Email
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \Symfony\Component\CssSelector\Exception\SyntaxErrorException
 	 */
 	static public function UnSerializeV2($sSerializedMessage)
 	{
-		return EmailFactory::GetMailer()::UnSerializeV2($sSerializedMessage);
+		$aData = unserialize($sSerializedMessage);
+		$oMessage = new Email();
+		
+		if (array_key_exists('body', $aData))
+		{
+			$oMessage->SetBody($aData['body']['body'], $aData['body']['mimeType']);
+		}
+		if (array_key_exists('message_id', $aData))
+		{
+			$oMessage->SetMessageId($aData['message_id']);
+		}
+		if (array_key_exists('bcc', $aData))
+		{
+			$oMessage->SetRecipientBCC($aData['bcc']);
+		}
+		if (array_key_exists('cc', $aData))
+		{
+			$oMessage->SetRecipientCC($aData['cc']);
+		}
+		if (array_key_exists('from', $aData))
+		{
+			$oMessage->SetRecipientFrom($aData['from']['address'], $aData['from']['label']);
+		}
+		if (array_key_exists('reply_to', $aData))
+		{
+			$oMessage->SetRecipientReplyTo($aData['reply_to']['address'], $aData['reply_to']['label']);
+		}
+		if (array_key_exists('to', $aData))
+		{
+			$oMessage->SetRecipientTO($aData['to']);
+		}
+		if (array_key_exists('subject', $aData))
+		{
+			$oMessage->SetSubject($aData['subject']);
+		}
+		
+		
+		if (array_key_exists('headers', $aData))
+		{
+			foreach($aData['headers'] as $sKey => $sValue)
+			{
+				$oMessage->AddToHeader($sKey, $sValue);
+			}
+		}
+		if (array_key_exists('parts', $aData))
+		{
+			foreach($aData['parts'] as $aPart)
+			{
+				$oMessage->AddPart($aPart['text'], $aPart['mimeType']);
+			}
+		}
+		if (array_key_exists('attachments', $aData))
+		{
+			foreach($aData['attachments'] as $aAttachment)
+			{
+				$oMessage->AddAttachment(base64_decode($aAttachment['data']), $aAttachment['filename'], $aAttachment['mimeType']);
+			}
+		}
+		return $oMessage;
+	}
+	
+  	protected function SendAsynchronous(&$aIssues, $oLog = null)
+	{
+		try
+		{
+			AsyncSendEmail::AddToQueue($this, $oLog);
+		}
+		catch(Exception $e)
+		{
+			$aIssues = array($e->GetMessage());
+			return EMAIL_SEND_ERROR;
+		}
+		$aIssues = array();
+		return EMAIL_SEND_PENDING;
+	}
+
+	protected function SendSynchronous(&$aIssues, $oLog = null)
+	{
+		// If the body of the message is in HTML, embed all images based on attachments
+		$this->EmbedInlineImages();
+		
+		$this->LoadConfig();
+
+		$sTransport = self::$m_oConfig->Get('email_transport');
+		switch ($sTransport)
+		{
+		case 'SMTP':
+			$sHost = self::$m_oConfig->Get('email_transport_smtp.host');
+			$sPort = self::$m_oConfig->Get('email_transport_smtp.port');
+			$sEncryption = self::$m_oConfig->Get('email_transport_smtp.encryption');
+			$sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
+			$sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
+
+			$oTransport = Swift_SmtpTransport::newInstance($sHost, $sPort, $sEncryption);
+			if (strlen($sUserName) > 0)
+			{
+				$oTransport->setUsername($sUserName);
+				$oTransport->setPassword($sPassword);
+			}
+			break;
+
+		case 'Null':
+			$oTransport = Swift_NullTransport::newInstance();
+			break;
+		
+		case 'LogFile':
+			$oTransport = Swift_LogFileTransport::newInstance();
+			$oTransport->setLogFile(APPROOT.'log/mail.log');
+			break;
+			
+		case 'PHPMail':
+		default:
+			$oTransport = Swift_MailTransport::newInstance();
+		}
+
+		$oMailer = Swift_Mailer::newInstance($oTransport);
+
+		$aFailedRecipients = array();
+		$this->m_oMessage->setMaxLineLength(0);
+		$oKPI = new ExecutionKPI();
+		try
+		{
+			$iSent = $oMailer->send($this->m_oMessage, $aFailedRecipients);
+			if ($iSent === 0)
+			{
+				// Beware: it seems that $aFailedRecipients sometimes contains the recipients that actually received the message !!!
+				IssueLog::Warning('Email sending failed: Some recipients were invalid, aFailedRecipients contains: '.implode(', ', $aFailedRecipients));
+				$aIssues = array('Some recipients were invalid.');
+				$oKPI->ComputeStats('Email Sent', 'Error received');
+				return EMAIL_SEND_ERROR;
+			}
+			else
+			{
+				$aIssues = array();
+				$oKPI->ComputeStats('Email Sent', 'Succeded');
+				return EMAIL_SEND_OK;
+			}
+		}
+		catch (Exception $e)
+		{
+			$oKPI->ComputeStats('Email Sent', 'Error received');
+			throw $e;
+		}
+	}
+	
+	/**
+	 * Reprocess the body of the message (if it is an HTML message)
+	 * to replace the URL of images based on attachments by a link
+	 * to an embedded image (i.e. cid:....)
+	 */
+	protected function EmbedInlineImages()
+	{
+		if ($this->m_aData['body']['mimeType'] == 'text/html')
+		{
+			$oDOMDoc = new DOMDocument();
+			$oDOMDoc->preserveWhitespace = true;
+			@$oDOMDoc->loadHTML('<?xml encoding="UTF-8"?>'.$this->m_aData['body']['body']); // For loading HTML chunks where the character set is not specified
+
+			$oXPath = new DOMXPath($oDOMDoc);
+			$sXPath = '//img[@'.InlineImage::DOM_ATTR_ID.']';
+			$oImagesList = $oXPath->query($sXPath);
+
+			if ($oImagesList->length != 0)
+			{
+				foreach($oImagesList as $oImg)
+				{
+					$iAttId = $oImg->getAttribute(InlineImage::DOM_ATTR_ID);
+					$oAttachment = MetaModel::GetObject('InlineImage', $iAttId, false, true /* Allow All Data */);
+					if ($oAttachment)
+					{
+						$sImageSecret = $oImg->getAttribute('data-img-secret');
+						$sAttachmentSecret = $oAttachment->Get('secret');
+						if ($sImageSecret !== $sAttachmentSecret)
+						{
+							// @see N°1921
+							// If copying from another iTop we could get an IMG pointing to an InlineImage with wrong secret
+							continue;
+						}
+
+						$oDoc = $oAttachment->Get('contents');
+						$oSwiftImage = new Swift_Image($oDoc->GetData(), $oDoc->GetFileName(), $oDoc->GetMimeType());
+						$sCid = $this->m_oMessage->embed($oSwiftImage);
+						$oImg->setAttribute('src', $sCid);
+					}
+				}
+			}
+			$sHtmlBody = $oDOMDoc->saveHTML();
+			$this->m_oMessage->setBody($sHtmlBody, 'text/html', 'UTF-8');
+		}
 	}
 
 	public function Send(&$aIssues, $bForceSynchronous = false, $oLog = null)
 	{
-		return $this->oMailer->Send($aIssues, $bForceSynchronous, $oLog);
+		//select a default sender if none is provided.
+		if(empty($this->m_aData['from']['address']) && !empty($this->m_aData['to'])){
+			$this->SetRecipientFrom($this->m_aData['to']);
+		}
+
+		if ($bForceSynchronous)
+		{
+			return $this->SendSynchronous($aIssues, $oLog);
+		}
+		else
+		{
+			$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
+			if ($bConfigASYNC)
+			{
+				return $this->SendAsynchronous($aIssues, $oLog);
+			}
+			else
+			{
+				return $this->SendSynchronous($aIssues, $oLog);
+			}
+		}
 	}
 
 	public function AddToHeader($sKey, $sValue)
 	{
-		$this->oMailer->AddToHeader($sKey, $sValue);
+		if (!array_key_exists('headers', $this->m_aData))
+		{
+			$this->m_aData['headers'] = array();
+		}
+		$this->m_aData['headers'][$sKey] = $sValue;
+		
+		if (strlen($sValue) > 0)
+		{
+			$oHeaders = $this->m_oMessage->getHeaders();
+			switch(strtolower($sKey))
+			{
+				case 'return-path':
+					$this->m_oMessage->setReturnPath($sValue);
+					break;
+
+				default:
+					$oHeaders->addTextHeader($sKey, $sValue);
+			}
+		}
 	}
 
 	public function SetMessageId($sId)
 	{
-		$this->oMailer->SetMessageId($sId);
+		$this->m_aData['message_id'] = $sId;
+		
+		// Note: Swift will add the angle brackets for you
+		// so let's remove the angle brackets if present, for historical reasons
+		$sId = str_replace(array('<', '>'), '', $sId);
+		
+		$oMsgId = $this->m_oMessage->getHeaders()->get('Message-ID');
+		$oMsgId->SetId($sId);
 	}
 	
 	public function SetReferences($sReferences)
 	{
-		$this->oMailer->SetReferences($sReferences);
+		$this->AddToHeader('References', $sReferences);
 	}
 
 	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)
 	{
-		$this->oMailer->SetBody($sBody, $sMimeType, $sCustomStyles);
+		if (($sMimeType === 'text/html') && ($sCustomStyles !== null))
+		{
+			$emogrifier = new \Pelago\Emogrifier($sBody, $sCustomStyles);
+			$sBody = $emogrifier->emogrify(); // Adds html/body tags if not already present
+		}
+		$this->m_aData['body'] = array('body' => $sBody, 'mimeType' => $sMimeType);
+		$this->m_oMessage->setBody($sBody, $sMimeType);
 	}
 
 	public function AddPart($sText, $sMimeType = 'text/html')
 	{
-		$this->oMailer->AddPart($sText, $sMimeType);
+		if (!array_key_exists('parts', $this->m_aData))
+		{
+			$this->m_aData['parts'] = array();
+		}
+		$this->m_aData['parts'][] = array('text' => $sText, 'mimeType' => $sMimeType);
+		$this->m_oMessage->addPart($sText, $sMimeType);
 	}
 
 	public function AddAttachment($data, $sFileName, $sMimeType)
 	{
-		$this->oMailer->AddAttachment($data, $sFileName, $sMimeType);
+		if (!array_key_exists('attachments', $this->m_aData))
+		{
+			$this->m_aData['attachments'] = array();
+		}
+		$this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType);
+		$this->m_oMessage->attach(Swift_Attachment::newInstance($data, $sFileName, $sMimeType));
 	}
 
 	public function SetSubject($sSubject)
 	{
-		$this->oMailer->SetSubject($sSubject);
+		$this->m_aData['subject'] = $sSubject;
+		$this->m_oMessage->setSubject($sSubject);
 	}
 
 	public function GetSubject()
 	{
-		return $this->oMailer->GetSubject();
+		return $this->m_oMessage->getSubject();
 	}
 
+	/**
+	 * Helper to transform and sanitize addresses
+	 * - get rid of empty addresses	 
+	 */	 	
+	protected function AddressStringToArray($sAddressCSVList)
+	{
+		$aAddresses = array();
+		foreach(explode(',', $sAddressCSVList) as $sAddress)
+		{
+			$sAddress = trim($sAddress);
+			if (strlen($sAddress) > 0)
+			{
+				$aAddresses[] = $sAddress;
+			}
+		}
+		return $aAddresses;
+	}
+	
 	public function SetRecipientTO($sAddress)
 	{
-		$this->oMailer->SetRecipientTO($sAddress);
+		$this->m_aData['to'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setTo($aAddresses);
+		}
 	}
 
 	public function GetRecipientTO($bAsString = false)
 	{
-		return $this->oMailer->GetRecipientTO($bAsString);
+		$aRes = $this->m_oMessage->getTo();
+		if ($aRes === null)
+		{
+			// There is no "To" header field
+			$aRes = array();
+		}
+		if ($bAsString)
+		{
+			$aStrings = array();
+			foreach ($aRes as $sEmail => $sName)
+			{
+				if (is_null($sName))
+				{
+					$aStrings[] = $sEmail;
+				}
+				else
+				{
+					$sName = str_replace(array('<', '>'), '', $sName);
+					$aStrings[] = "$sName <$sEmail>";
+				}
+			}
+			return implode(', ', $aStrings);
+		}
+		else
+		{
+			return $aRes;
+		}
 	}
 
 	public function SetRecipientCC($sAddress)
 	{
-		$this->oMailer->SetRecipientCC($sAddress);
+		$this->m_aData['cc'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setCc($aAddresses);
+		}
 	}
 
 	public function SetRecipientBCC($sAddress)
 	{
-		$this->oMailer->SetRecipientBCC($sAddress);
+		$this->m_aData['bcc'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setBcc($aAddresses);
+		}
 	}
 
 	public function SetRecipientFrom($sAddress, $sLabel = '')
 	{
-		$this->oMailer->SetRecipientFrom($sAddress, $sLabel);
+		$this->m_aData['from'] = array('address' => $sAddress, 'label' => $sLabel);
+		if ($sLabel != '')
+		{
+			$this->m_oMessage->setFrom(array($sAddress => $sLabel));		
+		}
+		else if (!empty($sAddress))
+		{
+			$this->m_oMessage->setFrom($sAddress);
+		}
 	}
 
-	public function SetRecipientReplyTo($sAddress)
+	public function SetRecipientReplyTo($sAddress, $sLabel = '')
 	{
-		$this->oMailer->SetRecipientReplyTo($sAddress);
+		$this->m_aData['reply_to'] = array('address' => $sAddress, 'label' => $sLabel);
+		if ($sLabel != '')
+		{
+			$this->m_oMessage->setReplyTo(array($sAddress => $sLabel));
+		}
+		else if (!empty($sAddress))
+		{
+			$this->m_oMessage->setReplyTo($sAddress);
+		}
+	}
+
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Extension to SwiftMailer: "debug" transport that pretends messages have been sent,
+ * but just log them to a file.
+ *
+ * @package Swift
+ * @author  Denis Flaven
+ */
+class Swift_Transport_LogFileTransport extends Swift_Transport_NullTransport
+{
+	protected $sLogFile;
+	
+	/**
+	 * Sends the given message.
+	 *
+	 * @param Swift_Mime_Message $message
+	 * @param string[]           $failedRecipients An array of failures by-reference
+	 *
+	 * @return int     The number of sent emails
+	 */
+	public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+	{
+		$hFile = @fopen($this->sLogFile, 'a');
+		if ($hFile)
+		{
+			$sTxt = "================== ".date('Y-m-d H:i:s')." ==================\n";
+			$sTxt .= $message->toString()."\n";
+		
+			@fwrite($hFile, $sTxt);
+			@fclose($hFile);
+		}
+		
+		return parent::send($message, $failedRecipients);
+	}
+	
+	public function setLogFile($sFilename)
+	{
+		$this->sLogFile = $sFilename;
+	}
+}
+
+/**
+ * Pretends messages have been sent, but just log them to a file.
+ *
+ * @package Swift
+ * @author  Denis Flaven
+ */
+class Swift_LogFileTransport extends Swift_Transport_LogFileTransport
+{
+	/**
+	 * Create a new LogFileTransport.
+	 */
+	public function __construct()
+	{
+		call_user_func_array(
+		array($this, 'Swift_Transport_LogFileTransport::__construct'),
+		Swift_DependencyContainer::getInstance()
+		->createDependenciesFor('transport.null')
+		);
+	}
+
+	/**
+	 * Create a new LogFileTransport instance.
+	 *
+	 * @return Swift_LogFileTransport
+	 */
+	public static function newInstance()
+	{
+		return new self();
 	}
 }

core/event.class.inc.php

@@ -31,7 +31,6 @@ class Event extends DBObject implements iDisplay
 			"db_table" => "priv_event",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -127,7 +126,6 @@ class EventNotification extends Event
 			"db_table" => "priv_event_notification",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false),
 			'indexes' => array(
 				array('object_id'),
@@ -163,7 +161,6 @@ class EventNotificationEmail extends EventNotification
 			"db_table" => "priv_event_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -201,7 +198,6 @@ class EventIssue extends Event
 			"db_table" => "priv_event_issue",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -301,7 +297,6 @@ class EventWebService extends Event
 			"db_table" => "priv_event_webservice",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -337,7 +332,6 @@ class EventRestService extends Event
 			"db_table" => "priv_event_restservice",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);

core/excelbulkexport.class.inc.php

@@ -296,7 +296,7 @@ EOF
 		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 		while($aRow = $oSet->FetchAssoc())
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$aData = array();
 			foreach($this->aStatusInfo['fields'] as $iCol => $aFieldSpec)
 			{
@@ -314,7 +314,7 @@ EOF
 			fwrite($hFile, json_encode($aData)."\n");
 			$iCount++;
 		}
-		set_time_limit($iPreviousTimeLimit);
+		set_time_limit(intval($iPreviousTimeLimit));
 		$this->aStatusInfo['position'] += $this->iChunkSize;
 		if ($this->aStatusInfo['total'] == 0)
 		{

core/expressioncache.class.inc.php

@@ -118,7 +118,7 @@ EOF;
 	{
 		$sKey = static::GetKey($sClass, $sAttCode);
 		$oExpr = DBObjectSearch::GetPolymorphicExpression($sClass, $sAttCode);
-		return "'".$sKey."' => '".serialize($oExpr)."',\n";
+		return var_export($sKey, true)." => ".var_export(serialize($oExpr), true).",\n"; // Beware, string values can contain quotes, backslashes, etc!
 	}
 
 	/**

core/htmlbulkexport.class.inc.php

@@ -128,7 +128,7 @@ class HTMLBulkExport extends TabularBulkExport
 		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 		while($aRow = $oSet->FetchAssoc())
 		{
-			set_time_limit($iLoopTimeLimit);
+			set_time_limit(intval($iLoopTimeLimit));
 			$oMainObj = $aRow[$sFirstAlias];
 			$sHilightClass = '';
 			if ($oMainObj)
@@ -160,7 +160,7 @@ class HTMLBulkExport extends TabularBulkExport
 			$sData .= "</tr>";
 			$iCount++;
 		}
-		set_time_limit($iPreviousTimeLimit);
+		set_time_limit(intval($iPreviousTimeLimit));
 		$this->aStatusInfo['position'] += $this->iChunkSize;
 		if ($this->aStatusInfo['total'] == 0)
 		{

core/htmlsanitizer.class.inc.php

@@ -24,59 +24,52 @@ abstract class HTMLSanitizer
 	{
 		// Do nothing..
 	}
-	
+
 	/**
 	 * Sanitizes the given HTML document
 	 * @param string $sHTML
 	 * @return string
 	 */
 	abstract public function DoSanitize($sHTML);
-	
+
 	/**
 	 * Sanitize an HTML string with the configured sanitizer, falling back to HTMLDOMSanitizer in case of Exception or invalid configuration
-	 *
 	 * @param string $sHTML
-	 * @param string $sConfigKey
-	 *
 	 * @return string
-	 * @noinspection SelfClassReferencingInspection
 	 */
-	public static function Sanitize($sHTML, $sConfigKey = 'html_sanitizer')
+	public static function Sanitize($sHTML)
 	{
-		$sSanitizerClass = MetaModel::GetConfig()->Get($sConfigKey);
-		if (!class_exists($sSanitizerClass)) {
-			IssueLog::Warning('The configured "'.$sConfigKey.'" class "'.$sSanitizerClass.'" is not a valid class. Will use HTMLDOMSanitizer as the default sanitizer.');
+		$sSanitizerClass = MetaModel::GetConfig()->Get('html_sanitizer');
+		if(!class_exists($sSanitizerClass))
+		{
+			IssueLog::Warning('The configured "html_sanitizer" class "'.$sSanitizerClass.'" is not a valid class. Will use HTMLDOMSanitizer as the default sanitizer.');
+			$sSanitizerClass = 'HTMLDOMSanitizer';
+		}
+		else if(!is_subclass_of($sSanitizerClass, 'HTMLSanitizer'))
+		{
+			IssueLog::Warning('The configured "html_sanitizer" class "'.$sSanitizerClass.'" is not a subclass of HTMLSanitizer. Will use HTMLDOMSanitizer as the default sanitizer.');
 			$sSanitizerClass = 'HTMLDOMSanitizer';
-		} else if (false === is_subclass_of($sSanitizerClass, HTMLSanitizer::class)) {
-			if ($sConfigKey === 'html_sanitizer') {
-				IssueLog::Warning('The configured "'.$sConfigKey.'" class "'.$sSanitizerClass.'" is not a subclass of '.HTMLSanitizer::class.'. Will use HTMLDOMSanitizer as the default sanitizer.');
-				$sSanitizerClass = 'HTMLDOMSanitizer';
-			} else {
-				IssueLog::Error('The configured "'.$sConfigKey.'" class "'.$sSanitizerClass.'" is not a subclass of '.HTMLSanitizer::class.' ! Won\'t sanitize string.');
-
-				return $sHTML;
-			}
 		}
 
-		try {
+		try
+		{
 			$oSanitizer = new $sSanitizerClass();
 			$sCleanHTML = $oSanitizer->DoSanitize($sHTML);
 		}
-		catch(Exception $e) {
-			if ($sConfigKey === 'html_sanitizer') {
-				if ($sSanitizerClass !== HTMLDOMSanitizer::class) {
-					IssueLog::Warning('Failed to sanitize an HTML string with "'.$sSanitizerClass.'". The following exception occured: '.$e->getMessage());
-					IssueLog::Warning('Will try to sanitize with HTMLDOMSanitizer.');
-					// try again with the HTMLDOMSanitizer
-					$oSanitizer = new HTMLDOMSanitizer();
-					$sCleanHTML = $oSanitizer->DoSanitize($sHTML);
-				} else {
-					IssueLog::Error('Failed to sanitize an HTML string with "HTMLDOMSanitizer". The following exception occured: '.$e->getMessage());
-					IssueLog::Error('The HTML will NOT be sanitized.');
-					$sCleanHTML = $sHTML;
-				}
-			} else {
-				IssueLog::Error('Failed to sanitize string with "'.$sSanitizerClass.'", will return original value ! Exception: '.$e->getMessage());
+		catch(Exception $e)
+		{
+			if($sSanitizerClass != 'HTMLDOMSanitizer')
+			{
+				IssueLog::Warning('Failed to sanitize an HTML string with "'.$sSanitizerClass.'". The following exception occured: '.$e->getMessage());
+				IssueLog::Warning('Will try to sanitize with HTMLDOMSanitizer.');
+				// try again with the HTMLDOMSanitizer
+				$oSanitizer = new HTMLDOMSanitizer();
+				$sCleanHTML = $oSanitizer->DoSanitize($sHTML);
+			}
+			else
+			{
+				IssueLog::Error('Failed to sanitize an HTML string with "HTMLDOMSanitizer". The following exception occured: '.$e->getMessage());
+				IssueLog::Error('The HTML will NOT be sanitized.');
 				$sCleanHTML = $sHTML;
 			}
 		}
@@ -107,176 +100,64 @@ class HTMLNullSanitizer extends HTMLSanitizer
 
 }
 
-
 /**
- * Common implementation for sanitizer using DOM parsing
+ * A standard-compliant HTMLSanitizer based on the HTMLPurifier library by Edward Z. Yang
+ * Complete but quite slow
+ * http://htmlpurifier.org
  */
-abstract class DOMSanitizer extends HTMLSanitizer
+/*
+class HTMLPurifierSanitizer extends HTMLSanitizer
 {
-	/** @var DOMDocument */
-	protected $oDoc;
-	/**
-	 * @var string Class to use for InlineImage static method calls
-	 * @used-by \Combodo\iTop\Test\UnitTest\Core\Sanitizer\HTMLDOMSanitizerTest::testDoSanitizeCallInlineImageProcessImageTag
-	 */
-	protected $sInlineImageClassName;
+	protected static $oPurifier = null;
 
-	public function __construct($sInlineImageClassName = InlineImage::class)
+	public function __construct()
 	{
-		parent::__construct();
+		if (self::$oPurifier == null)
+		{
+			$sLibPath = APPROOT.'lib/htmlpurifier/HTMLPurifier.auto.php';
+			if (!file_exists($sLibPath))
+			{
+				throw new Exception("Missing library '$sLibPath', cannot use HTMLPurifierSanitizer.");
+			}
+			require_once($sLibPath);
 
-		$this->sInlineImageClassName = $sInlineImageClassName;
+			$oPurifierConfig = HTMLPurifier_Config::createDefault();
+			$oPurifierConfig->set('Core.Encoding', 'UTF-8'); // defaults to 'UTF-8'
+			$oPurifierConfig->set('HTML.Doctype', 'XHTML 1.0 Strict'); // defaults to 'XHTML 1.0 Transitional'
+			$oPurifierConfig->set('URI.AllowedSchemes', array (
+				'http' => true,
+				'https' => true,
+				'data' => true, // This one is not present by default
+			));
+			$sPurifierCache = APPROOT.'data/HTMLPurifier';
+			if (!is_dir($sPurifierCache))
+			{
+				mkdir($sPurifierCache);
+			}
+			if (!is_dir($sPurifierCache))
+			{
+				throw new Exception("Could not create the cache directory '$sPurifierCache'");
+			}
+			$oPurifierConfig->set('Cache.SerializerPath', $sPurifierCache); // no trailing slash
+			self::$oPurifier = new HTMLPurifier($oPurifierConfig);
+		}
 	}
 
-	abstract public function GetTagsWhiteList();
-
-	abstract public function GetTagsBlackList();
-
-	abstract public function GetAttrsWhiteList();
-
-	abstract public function GetAttrsBlackList();
-
-	abstract public function GetStylesWhiteList();
-
 	public function DoSanitize($sHTML)
 	{
-		$this->oDoc = new DOMDocument();
-		$this->oDoc->preserveWhitespace = true;
-
-		// MS outlook implements empty lines by the mean of <p><o:p></o:p></p>
-		// We have to transform that into <p><br></p> (which is how Thunderbird implements empty lines)
-		// Unfortunately, DOMDocument::loadHTML does not take the tag namespaces into account (once loaded there is no way to know if the tag did have a namespace)
-		// therefore we have to do the transformation upfront
-		$sHTML = preg_replace('@<o:p>(\s|&nbsp;)*</o:p>@', '<br>', $sHTML);
-
-		$this->LoadDoc($sHTML);
-
-		$this->CleanNode($this->oDoc);
-
-		$sCleanHtml = $this->PrintDoc();
-
+		$sCleanHtml = self::$oPurifier->purify($sHTML);
 		return $sCleanHtml;
 	}
-
-	abstract public function LoadDoc($sHTML);
-
-	/**
-	 * @return string cleaned source
-	 * @uses \DOMSanitizer::oDoc
-	 */
-	abstract public function PrintDoc();
-
-	protected function CleanNode(DOMNode $oElement)
-	{
-		$aAttrToRemove = array();
-		// Gather the attributes to remove
-		if ($oElement->hasAttributes()) {
-			foreach ($oElement->attributes as $oAttr) {
-				$sAttr = strtolower($oAttr->name);
-				if ((false === empty($this->GetAttrsBlackList()))
-					&& (in_array($sAttr, $this->GetAttrsBlackList(), true))) {
-					$aAttrToRemove[] = $oAttr->name;
-				} else if ((false === empty($this->GetTagsWhiteList()))
-					&& (false === in_array($sAttr, $this->GetTagsWhiteList()[strtolower($oElement->tagName)]))) {
-					$aAttrToRemove[] = $oAttr->name;
-				} else if (!$this->IsValidAttributeContent($sAttr, $oAttr->value)) {
-					// Invalid content
-					$aAttrToRemove[] = $oAttr->name;
-				} else if ($sAttr == 'style') {
-					// Special processing for style tags
-					$sCleanStyle = $this->CleanStyle($oAttr->value);
-					if ($sCleanStyle == '') {
-						// Invalid content
-						$aAttrToRemove[] = $oAttr->name;
-					} else {
-						$oElement->setAttribute($oAttr->name, $sCleanStyle);
-					}
-				}
-			}
-			// Now remove them
-			foreach($aAttrToRemove as $sName)
-			{
-				$oElement->removeAttribute($sName);
-			}
-		}
-		
-		if ($oElement->hasChildNodes())
-		{
-			$aChildElementsToRemove = array();
-			// Gather the child noes to remove
-			foreach($oElement->childNodes as $oNode) {
-				if ($oNode instanceof DOMElement) {
-					$sNodeTagName = strtolower($oNode->tagName);
-				}
-				if (($oNode instanceof DOMElement)
-					&& (false === empty($this->GetTagsBlackList()))
-					&& (in_array($sNodeTagName, $this->GetTagsBlackList(), true))) {
-					$aChildElementsToRemove[] = $oNode;
-				} else if (($oNode instanceof DOMElement)
-					&& (false === empty($this->GetTagsWhiteList()))
-					&& (false === array_key_exists($sNodeTagName, $this->GetTagsWhiteList()))) {
-					$aChildElementsToRemove[] = $oNode;
-				} else if ($oNode instanceof DOMComment) {
-					$aChildElementsToRemove[] = $oNode;
-				} else {
-					// Recurse
-					$this->CleanNode($oNode);
-					if (($oNode instanceof DOMElement) && (strtolower($oNode->tagName) == 'img')) {
-						$this->sInlineImageClassName::ProcessImageTag($oNode);
-					}
-				}
-			}
-			// Now remove them
-			foreach($aChildElementsToRemove as $oDomElement)
-			{
-				$oElement->removeChild($oDomElement);
-			}
-		}
-	}
-
-	protected function IsValidAttributeContent($sAttributeName, $sValue)
-	{
-		if ((false === empty($this->GetAttrsBlackList()))
-			&& (in_array($sAttributeName, $this->GetAttrsBlackList(), true))) {
-			return true;
-		}
-
-		if (array_key_exists($sAttributeName, $this->GetAttrsWhiteList())) {
-			return preg_match($this->GetAttrsWhiteList()[$sAttributeName], $sValue);
-		}
-
-		return true;
-	}
-
-	protected function CleanStyle($sStyle)
-	{
-		if (empty($this->GetStylesWhiteList())) {
-			return $sStyle;
-		}
-
-		$aAllowedStyles = array();
-		$aItems = explode(';', $sStyle);
-		{
-			foreach ($aItems as $sItem) {
-				$aElements = explode(':', trim($sItem));
-				if (in_array(trim(strtolower($aElements[0])), $this->GetStylesWhiteList())) {
-					$aAllowedStyles[] = trim($sItem);
-				}
-			}
-		}
-
-		return implode(';', $aAllowedStyles);
-	}
 }
+*/
 
-
-class HTMLDOMSanitizer extends DOMSanitizer
+class HTMLDOMSanitizer extends HTMLSanitizer
 {
 	protected $oDoc;
 
 	/**
-	 * @see https://www.itophub.io/wiki/page?id=2_6_0%3Aadmin%3Arich_text_limitations
 	 * @var array
+	 * @see https://www.itophub.io/wiki/page?id=2_6_0%3Aadmin%3Arich_text_limitations
 	 */
 	protected static $aTagsWhiteList = array(
 		'html' => array(),
@@ -333,8 +214,8 @@ class HTMLDOMSanitizer extends DOMSanitizer
 	);
 
 	/**
-	 * @see https://www.itophub.io/wiki/page?id=2_6_0%3Aadmin%3Arich_text_limitations
 	 * @var array
+	 * @see https://www.itophub.io/wiki/page?id=2_6_0%3Aadmin%3Arich_text_limitations
 	 */
 	protected static $aStylesWhiteList = array(
 		'background-color',
@@ -358,200 +239,164 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		'white-space',
 	);
 
-	public function __construct($sInlineImageClassName = InlineImage::class)
+	public function __construct()
 	{
-		parent::__construct($sInlineImageClassName);
+		parent::__construct();
 
 		// Building href validation pattern from url and email validation patterns as the patterns are not used the same way in HTML content than in standard attributes value.
 		// eg. "foo@bar.com" vs "mailto:foo@bar.com?subject=Title&body=Hello%20world"
-		if (!array_key_exists('href', self::$aAttrsWhiteList)) {
+		if (!array_key_exists('href', self::$aAttrsWhiteList))
+		{
 			// Regular urls
 			$sUrlPattern = utils::GetConfig()->Get('url_validation_pattern');
 
 			// Mailto urls
-			$sMailtoPattern = '(mailto:('.utils::GetConfig()->Get('email_validation_pattern').')(?:\?(?:subject|body)=([a-zA-Z0-9+\$_.-]*)(?:&(?:subject|body)=([a-zA-Z0-9+\$_.-]*))?)?)';
+			$sMailtoPattern = '(mailto:(' . utils::GetConfig()->Get('email_validation_pattern') . ')(?:\?(?:subject|body)=([a-zA-Z0-9+\$_.-]*)(?:&(?:subject|body)=([a-zA-Z0-9+\$_.-]*))?)?)';
 
 			// Notification placeholders
 			// eg. $this->caller_id$, $this->hyperlink()$, $this->hyperlink(portal)$, $APP_URL$, $MODULES_URL$, ...
 			// Note: Authorize both $xxx$ and %24xxx%24 as the latter one is encoded when used in HTML attributes (eg. a[href])
 			$sPlaceholderPattern = '(\$|%24)[\w-]*(->[\w]*(\([\w-]*?\))?)?(\$|%24)';
 
-			$sPattern = $sUrlPattern.'|'.$sMailtoPattern.'|'.$sPlaceholderPattern;
+			$sPattern = $sUrlPattern . '|' . $sMailtoPattern . '|' . $sPlaceholderPattern;
 			$sPattern = '/'.str_replace('/', '\/', $sPattern).'/i';
 			self::$aAttrsWhiteList['href'] = $sPattern;
 		}
 	}
 
-	public function GetTagsWhiteList()
+	public function DoSanitize($sHTML)
 	{
-		return static::$aTagsWhiteList;
-	}
-
-	public function GetTagsBlackList()
-	{
-		return [];
-	}
-
-	public function GetAttrsWhiteList()
-	{
-		return static::$aAttrsWhiteList;
-	}
-
-	public function GetAttrsBlackList()
-	{
-		return [];
-	}
-
-	public function GetStylesWhiteList()
-	{
-		return static::$aStylesWhiteList;
-	}
-
-	public function LoadDoc($sHTML)
-	{
-		@$this->oDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sHTML); // For loading HTML chunks where the character set is not specified
+		$this->oDoc = new DOMDocument();
 		$this->oDoc->preserveWhitespace = true;
-	}
 
-	public function PrintDoc()
-	{
+		// MS outlook implements empty lines by the mean of <p><o:p></o:p></p>
+		// We have to transform that into <p><br></p> (which is how Thunderbird implements empty lines)
+		// Unfortunately, DOMDocument::loadHTML does not take the tag namespaces into account (once loaded there is no way to know if the tag did have a namespace)
+		// therefore we have to do the transformation upfront
+		$sHTML = preg_replace('@<o:p>(\s|&nbsp;)*</o:p>@', '<br>', $sHTML);
+		// Replace badly encoded non breaking space
+		$sHTML = preg_replace('~\xc2\xa0~', ' ', $sHTML);
+
+		@$this->oDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sHTML); // For loading HTML chunks where the character set is not specified
+
+		$this->CleanNode($this->oDoc);
+
 		$oXPath = new DOMXPath($this->oDoc);
 		$sXPath = "//body";
 		$oNodesList = $oXPath->query($sXPath);
 
-		if ($oNodesList->length == 0) {
+		if ($oNodesList->length == 0)
+		{
 			// No body, save the whole document
 			$sCleanHtml = $this->oDoc->saveHTML();
-		} else {
+		}
+		else
+		{
 			// Export only the content of the body tag
 			$sCleanHtml = $this->oDoc->saveHTML($oNodesList->item(0));
 			// remove the body tag itself
-			$sCleanHtml = str_replace(array('<body>', '</body>'), '', $sCleanHtml);
+			$sCleanHtml = str_replace( array('<body>', '</body>'), '', $sCleanHtml);
 		}
 
 		return $sCleanHtml;
 	}
-}
 
-
-/**
- * @since 2.6.5 2.7.6 3.0.0 N°4360
- */
-class SVGDOMSanitizer extends DOMSanitizer
-{
-	public function GetTagsWhiteList()
+	protected function CleanNode(DOMNode $oElement)
 	{
-		return [];
+		$aAttrToRemove = array();
+		// Gather the attributes to remove
+		if ($oElement->hasAttributes())
+		{
+			foreach($oElement->attributes as $oAttr)
+			{
+				$sAttr = strtolower($oAttr->name);
+				if (!in_array($sAttr, self::$aTagsWhiteList[strtolower($oElement->tagName)]))
+				{
+					// Forbidden (or unknown) attribute
+					$aAttrToRemove[] = $oAttr->name;
+				}
+				else if (!$this->IsValidAttributeContent($sAttr, $oAttr->value))
+				{
+					// Invalid content
+					$aAttrToRemove[] = $oAttr->name;
+				}
+				else if ($sAttr == 'style')
+				{
+					// Special processing for style tags
+					$sCleanStyle = $this->CleanStyle($oAttr->value);
+					if ($sCleanStyle == '')
+					{
+						// Invalid content
+						$aAttrToRemove[] = $oAttr->name;
+					}
+					else
+					{
+						$oElement->setAttribute($oAttr->name, $sCleanStyle);
+					}
+				}
+			}
+			// Now remove them
+			foreach($aAttrToRemove as $sName)
+			{
+				$oElement->removeAttribute($sName);
+			}
+		}
+
+		if ($oElement->hasChildNodes())
+		{
+			$aChildElementsToRemove = array();
+			// Gather the child noes to remove
+			foreach($oElement->childNodes as $oNode)
+			{
+				if (($oNode instanceof DOMElement) && (!array_key_exists(strtolower($oNode->tagName), self::$aTagsWhiteList)))
+				{
+					$aChildElementsToRemove[] = $oNode;
+				}
+				else if ($oNode instanceof DOMComment)
+				{
+					$aChildElementsToRemove[] = $oNode;
+				}
+				else
+				{
+					// Recurse
+					$this->CleanNode($oNode);
+					if (($oNode instanceof DOMElement) && (strtolower($oNode->tagName) == 'img'))
+					{
+						InlineImage::ProcessImageTag($oNode);
+					}
+				}
+			}
+			// Now remove them
+			foreach($aChildElementsToRemove as $oDomElement)
+			{
+				$oElement->removeChild($oDomElement);
+			}
+		}
 	}
 
-	/**
-	 * @return string[]
-	 * @link https://developer.mozilla.org/en-US/docs/Web/SVG/Element/script
-	 */
-	public function GetTagsBlackList()
+	protected function CleanStyle($sStyle)
 	{
-		return [
-			'script',
-		];
+		$aAllowedStyles = array();
+		$aItems = explode(';', $sStyle);
+		{
+			foreach($aItems as $sItem)
+			{
+				$aElements = explode(':', trim($sItem));
+				if (in_array(trim(strtolower($aElements[0])), static::$aStylesWhiteList))
+				{
+					$aAllowedStyles[] = trim($sItem);
+				}
+			}
+		}
+		return implode(';', $aAllowedStyles);
 	}
 
-	public function GetAttrsWhiteList()
+	protected function IsValidAttributeContent($sAttributeName, $sValue)
 	{
-		return [];
-	}
-
-	/**
-	 * @return string[]
-	 * @link https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/Events#document_event_attributes
-	 */
-	public function GetAttrsBlackList()
-	{
-		return [
-			'onbegin',
-			'onbegin',
-			'onrepeat',
-			'onabort',
-			'onerror',
-			'onerror',
-			'onscroll',
-			'onunload',
-			'oncopy',
-			'oncut',
-			'onpaste',
-			'oncancel',
-			'oncanplay',
-			'oncanplaythrough',
-			'onchange',
-			'onclick',
-			'onclose',
-			'oncuechange',
-			'ondblclick',
-			'ondrag',
-			'ondragend',
-			'ondragenter',
-			'ondragleave',
-			'ondragover',
-			'ondragstart',
-			'ondrop',
-			'ondurationchange',
-			'onemptied',
-			'onended',
-			'onerror',
-			'onfocus',
-			'oninput',
-			'oninvalid',
-			'onkeydown',
-			'onkeypress',
-			'onkeyup',
-			'onload',
-			'onloadeddata',
-			'onloadedmetadata',
-			'onloadstart',
-			'onmousedown',
-			'onmouseenter',
-			'onmouseleave',
-			'onmousemove',
-			'onmouseout',
-			'onmouseover',
-			'onmouseup',
-			'onmousewheel',
-			'onpause',
-			'onplay',
-			'onplaying',
-			'onprogress',
-			'onratechange',
-			'onreset',
-			'onresize',
-			'onscroll',
-			'onseeked',
-			'onseeking',
-			'onselect',
-			'onshow',
-			'onstalled',
-			'onsubmit',
-			'onsuspend',
-			'ontimeupdate',
-			'ontoggle',
-			'onvolumechange',
-			'onwaiting',
-			'onactivate',
-			'onfocusin',
-			'onfocusout',
-		];
-	}
-
-	public function GetStylesWhiteList()
-	{
-		return [];
-	}
-
-	public function LoadDoc($sHTML)
-	{
-		@$this->oDoc->loadXml($sHTML, LIBXML_NOBLANKS);
-	}
-
-	public function PrintDoc()
-	{
-		return $this->oDoc->saveXML();
+		if (array_key_exists($sAttributeName, self::$aAttrsWhiteList))
+		{
+			return preg_match(self::$aAttrsWhiteList[$sAttributeName], $sValue);
+		}
+		return true;
 	}
 }